From be6dbdec66e6caf000c966a2e1e30f3acf199458 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 2 Oct 2023 13:31:25 +0200
Subject: [PATCH 0001/1286] 107155: Allow caching null objects

---
 src/app/core/cache/object-cache.reducer.ts    | 31 +++++++++++--------
 src/app/core/cache/object-cache.service.ts    | 16 +++++++---
 .../dspace-rest-response-parsing.service.ts   |  7 +++--
 src/app/core/index/index.effects.ts           |  4 +--
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index dc3f50db68..7f389344fb 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -166,20 +166,25 @@ export function objectCacheReducer(state = initialState, action: ObjectCacheActi
  *    the new state, with the object added, or overwritten.
  */
 function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheAction): ObjectCacheState {
-  const existing = state[action.payload.objectToCache._links.self.href] || {} as any;
+  const cacheLink = hasValue(action.payload.objectToCache) ? action.payload.objectToCache._links.self.href : action.payload.alternativeLink;
+  const existing = state[cacheLink] || {} as any;
   const newAltLinks = hasValue(action.payload.alternativeLink) ? [action.payload.alternativeLink] : [];
-  return Object.assign({}, state, {
-    [action.payload.objectToCache._links.self.href]: {
-      data: action.payload.objectToCache,
-      timeCompleted: action.payload.timeCompleted,
-      msToLive: action.payload.msToLive,
-      requestUUIDs: [action.payload.requestUUID, ...(existing.requestUUIDs || [])],
-      dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
-      isDirty: isNotEmpty(existing.patches),
-      patches: existing.patches || [],
-      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
-    } as ObjectCacheEntry
-  });
+  if (hasValue(cacheLink)) {
+    return Object.assign({}, state, {
+      [cacheLink]: {
+        data: action.payload.objectToCache,
+        timeCompleted: action.payload.timeCompleted,
+        msToLive: action.payload.msToLive,
+        requestUUIDs: [action.payload.requestUUID, ...(existing.requestUUIDs || [])],
+        dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
+        isDirty: isNotEmpty(existing.patches),
+        patches: existing.patches || [],
+        alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
+      } as ObjectCacheEntry
+    });
+  } else {
+    return state;
+  }
 }
 
 /**
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index 9ca0216210..0330a03f02 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -63,7 +63,9 @@ export class ObjectCacheService {
    *    An optional alternative link to this object
    */
   add(object: CacheableObject, msToLive: number, requestUUID: string, alternativeLink?: string): void {
-    object = this.linkService.removeResolvedLinks(object); // Ensure the object we're storing has no resolved links
+    if (hasValue(object)) {
+      object = this.linkService.removeResolvedLinks(object); // Ensure the object we're storing has no resolved links
+    }
     this.store.dispatch(new AddToObjectCacheAction(object, new Date().getTime(), msToLive, requestUUID, alternativeLink));
   }
 
@@ -139,11 +141,15 @@ export class ObjectCacheService {
         }
       ),
       map((entry: ObjectCacheEntry) => {
-        const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
-        if (typeof type !== 'function') {
-          throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
+        if (hasValue(entry.data)) {
+          const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
+          if (typeof type !== 'function') {
+            throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
+          }
+          return Object.assign(new type(), entry.data) as T;
+        } else {
+          return null;
         }
-        return Object.assign(new type(), entry.data) as T;
       })
     );
   }
diff --git a/src/app/core/data/dspace-rest-response-parsing.service.ts b/src/app/core/data/dspace-rest-response-parsing.service.ts
index 500afc4aff..2f79edd129 100644
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -109,6 +109,9 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
               if (hasValue(match)) {
                 embedAltUrl = new URLCombiner(embedAltUrl, `?size=${match.size}`).toString();
               }
+              if (data._embedded[property] == null) {
+                this.addToObjectCache(null, request, data, embedAltUrl);
+              }
               this.process<ObjectDomain>(data._embedded[property], request, embedAltUrl);
             });
         }
@@ -226,7 +229,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
    * @param alternativeURL  an alternative url that can be used to retrieve the object
    */
   addToObjectCache(co: CacheableObject, request: RestRequest, data: any, alternativeURL?: string): void {
-    if (!isCacheableObject(co)) {
+    if (hasValue(co) && !isCacheableObject(co)) {
       const type = hasValue(data) && hasValue(data.type) ? data.type : 'object';
       let dataJSON: string;
       if (hasValue(data._embedded)) {
@@ -240,7 +243,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
       return;
     }
 
-    if (alternativeURL === co._links.self.href) {
+    if (hasValue(co) && alternativeURL === co._links.self.href) {
       alternativeURL = undefined;
     }
 
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index 18d639023f..9ec013813d 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -27,7 +27,7 @@ export class UUIDIndexEffects {
    addObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
-      filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache.uuid)),
+      filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache) && hasValue(action.payload.objectToCache.uuid)),
       map((action: AddToObjectCacheAction) => {
         return new AddToIndexAction(
           IndexName.OBJECT,
@@ -46,7 +46,7 @@ export class UUIDIndexEffects {
       ofType(ObjectCacheActionTypes.ADD),
       map((action: AddToObjectCacheAction) => {
         const alternativeLink = action.payload.alternativeLink;
-        const selfLink = action.payload.objectToCache._links.self.href;
+        const selfLink = hasValue(action.payload.objectToCache) ? action.payload.objectToCache._links.self.href : alternativeLink;
         if (hasValue(alternativeLink) && alternativeLink !== selfLink) {
           return new AddToIndexAction(
             IndexName.ALTERNATIVE_OBJECT_LINK,

From 984c9bfc2a2271e65190e02902ea0589dcfe6c4f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 26 Oct 2023 16:33:14 +0200
Subject: [PATCH 0002/1286] 107155: Allow caching of embedded objects without
 selflink

---
 src/app/core/cache/object-cache.reducer.ts                | 2 +-
 src/app/core/data/dspace-rest-response-parsing.service.ts | 4 ++++
 src/app/core/index/index.effects.ts                       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index 7f389344fb..21dc729f1b 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -166,7 +166,7 @@ export function objectCacheReducer(state = initialState, action: ObjectCacheActi
  *    the new state, with the object added, or overwritten.
  */
 function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheAction): ObjectCacheState {
-  const cacheLink = hasValue(action.payload.objectToCache) ? action.payload.objectToCache._links.self.href : action.payload.alternativeLink;
+  const cacheLink = hasValue(action.payload.objectToCache?._links?.self) ? action.payload.objectToCache._links.self.href : action.payload.alternativeLink;
   const existing = state[cacheLink] || {} as any;
   const newAltLinks = hasValue(action.payload.alternativeLink) ? [action.payload.alternativeLink] : [];
   if (hasValue(cacheLink)) {
diff --git a/src/app/core/data/dspace-rest-response-parsing.service.ts b/src/app/core/data/dspace-rest-response-parsing.service.ts
index 2f79edd129..c0e1c70cae 100644
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -110,7 +110,11 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
                 embedAltUrl = new URLCombiner(embedAltUrl, `?size=${match.size}`).toString();
               }
               if (data._embedded[property] == null) {
+                // Embedded object is null, meaning it exists (not undefined), but had an empty response (204) -> cache it as null
                 this.addToObjectCache(null, request, data, embedAltUrl);
+              } else if (!isCacheableObject(data._embedded[property])) {
+                // Embedded object exists, but doesn't contain a self link -> cache it using the alternative link instead
+                this.objectCache.add(data._embedded[property], hasValue(request.responseMsToLive) ? request.responseMsToLive : environment.cache.msToLive.default, request.uuid, embedAltUrl);
               }
               this.process<ObjectDomain>(data._embedded[property], request, embedAltUrl);
             });
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index 9ec013813d..65aa45e571 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -46,7 +46,7 @@ export class UUIDIndexEffects {
       ofType(ObjectCacheActionTypes.ADD),
       map((action: AddToObjectCacheAction) => {
         const alternativeLink = action.payload.alternativeLink;
-        const selfLink = hasValue(action.payload.objectToCache) ? action.payload.objectToCache._links.self.href : alternativeLink;
+        const selfLink = hasValue(action.payload.objectToCache?._links?.self) ? action.payload.objectToCache._links.self.href : alternativeLink;
         if (hasValue(alternativeLink) && alternativeLink !== selfLink) {
           return new AddToIndexAction(
             IndexName.ALTERNATIVE_OBJECT_LINK,

From 038e31ccd1a771e3c720a0dbd264f7ffe4720125 Mon Sep 17 00:00:00 2001
From: "max.nuding" <max.nuding@uni-konstanz.de>
Date: Wed, 15 Nov 2023 10:51:01 +0100
Subject: [PATCH 0003/1286] Submission form now displays custom messages for
 regex validated fields if they exist

---
 .../shared/form/builder/parsers/concat-field-parser.ts   | 4 +++-
 .../shared/form/builder/parsers/dropdown-field-parser.ts | 4 +++-
 src/app/shared/form/builder/parsers/field-parser.ts      | 9 +++++++--
 src/app/shared/form/builder/parsers/name-field-parser.ts | 6 ++++--
 src/app/shared/form/builder/parsers/parser-factory.ts    | 2 ++
 .../shared/form/builder/parsers/series-field-parser.ts   | 6 ++++--
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index e86de70c81..c18fa8234e 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -19,6 +19,7 @@ import {
   SUBMISSION_ID
 } from './field-parser';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { TranslateService } from '@ngx-translate/core';
 
 export class ConcatFieldParser extends FieldParser {
 
@@ -27,10 +28,11 @@ export class ConcatFieldParser extends FieldParser {
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
     @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService,
     protected separator: string,
     protected firstPlaceholder: string = null,
     protected secondPlaceholder: string = null) {
-    super(submissionId, configData, initFormValues, parserOptions);
+    super(submissionId, configData, initFormValues, parserOptions, translate);
 
     this.separator = separator;
     this.firstPlaceholder = firstPlaceholder;
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
index 3e5ec0b9da..a4bfb810f3 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -15,6 +15,7 @@ import {
 import { isNotEmpty } from '../../../empty.util';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { TranslateService } from '@ngx-translate/core';
 
 export class DropdownFieldParser extends FieldParser {
 
@@ -23,8 +24,9 @@ export class DropdownFieldParser extends FieldParser {
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
     @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions);
+    super(submissionId, configData, initFormValues, parserOptions, translate);
   }
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 7ea55d4454..3c4d425df3 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -25,6 +25,7 @@ import { VocabularyOptions } from '../../../../core/submission/vocabularies/mode
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
 import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import { TranslateService } from '@ngx-translate/core';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -50,7 +51,8 @@ export abstract class FieldParser {
     @Inject(SUBMISSION_ID) protected submissionId: string,
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) protected initFormValues: any,
-    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
+    protected translate: TranslateService
   ) {
   }
 
@@ -395,11 +397,14 @@ export abstract class FieldParser {
     } else {
       regex = new RegExp(this.configData.input.regex);
     }
+    const baseTranslationKey = 'error.validation.pattern';
+    const fieldranslationKey = `${baseTranslationKey}.${controlModel.id}`;
+    const fieldTranslationExists = this.translate.instant(fieldranslationKey) !== fieldranslationKey;
     controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex });
     controlModel.errorMessages = Object.assign(
       {},
       controlModel.errorMessages,
-      { pattern: 'error.validation.pattern' });
+      { pattern: fieldTranslationExists ? fieldranslationKey : baseTranslationKey });
   }
 
   protected markAsRequired(controlModel) {
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.ts b/src/app/shared/form/builder/parsers/name-field-parser.ts
index e5ecb034ea..469b32be92 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.ts
@@ -1,4 +1,5 @@
 import { Inject } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
 import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
@@ -10,8 +11,9 @@ export class NameFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions, ',', 'form.last-name', 'form.first-name');
+    super(submissionId, configData, initFormValues, parserOptions, translate, ',', 'form.last-name', 'form.first-name');
   }
 }
diff --git a/src/app/shared/form/builder/parsers/parser-factory.ts b/src/app/shared/form/builder/parsers/parser-factory.ts
index 26a9cb0f28..97fc36cbb4 100644
--- a/src/app/shared/form/builder/parsers/parser-factory.ts
+++ b/src/app/shared/form/builder/parsers/parser-factory.ts
@@ -19,12 +19,14 @@ import { SeriesFieldParser } from './series-field-parser';
 import { TagFieldParser } from './tag-field-parser';
 import { TextareaFieldParser } from './textarea-field-parser';
 import { DisabledFieldParser } from './disabled-field-parser';
+import { TranslateService } from '@ngx-translate/core';
 
 const fieldParserDeps = [
   SUBMISSION_ID,
   CONFIG_DATA,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
+  TranslateService
 ];
 
 /**
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.ts b/src/app/shared/form/builder/parsers/series-field-parser.ts
index 36ee9c36c1..589a6dc04c 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.ts
@@ -1,4 +1,5 @@
 import { Inject } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { ConcatFieldParser } from './concat-field-parser';
 import { CONFIG_DATA, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
@@ -10,8 +11,9 @@ export class SeriesFieldParser extends ConcatFieldParser {
     @Inject(SUBMISSION_ID) submissionId: string,
     @Inject(CONFIG_DATA) configData: FormFieldModel,
     @Inject(INIT_FORM_VALUES) initFormValues,
-    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    translate: TranslateService
   ) {
-    super(submissionId, configData, initFormValues, parserOptions, ';');
+    super(submissionId, configData, initFormValues, parserOptions, translate, ';');
   }
 }

From c93a64db838ddc4dce5f73aa9e28f28c457fb14d Mon Sep 17 00:00:00 2001
From: "max.nuding" <max.nuding@uni-konstanz.de>
Date: Wed, 15 Nov 2023 13:27:58 +0100
Subject: [PATCH 0004/1286] Fix tests to include translationservice dependency

---
 .../form/builder/form-builder.service.spec.ts |  6 +++-
 .../builder/parsers/date-field-parser.spec.ts | 10 ++++--
 .../parsers/disabled-field-parser.spec.ts     |  8 +++--
 .../parsers/dropdown-field-parser.spec.ts     |  8 +++--
 .../builder/parsers/list-field-parser.spec.ts | 10 +++---
 .../parsers/lookup-field-parser.spec.ts       |  8 +++--
 .../parsers/lookup-name-field-parser.spec.ts  |  8 +++--
 .../builder/parsers/name-field-parser.spec.ts | 10 +++---
 .../parsers/onebox-field-parser.spec.ts       | 12 ++++---
 .../relation-group-field-parser.spec.ts       | 10 +++---
 .../form/builder/parsers/row-parser.spec.ts   | 35 ++++++++++++-------
 .../parsers/series-field-parser.spec.ts       | 10 +++---
 .../builder/parsers/tag-field-parser.spec.ts  |  8 +++--
 .../parsers/textarea-field-parser.spec.ts     |  8 +++--
 14 files changed, 96 insertions(+), 55 deletions(-)

diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index fd3588e73e..94c88aae17 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -51,6 +51,8 @@ import { FormRowModel } from '../../../core/config/models/config-submission-form
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
 import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
 import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { getMockTranslateService } from '../../mocks/translate.service.mock';
+import { TranslateService } from '@ngx-translate/core';
 
 describe('FormBuilderService test suite', () => {
 
@@ -81,6 +83,7 @@ describe('FormBuilderService test suite', () => {
 
   beforeEach(() => {
     configSpy = createConfigSuccessSpy(typeFieldTestValue);
+    let translateService = getMockTranslateService();
     TestBed.configureTestingModule({
       imports: [ReactiveFormsModule],
       providers: [
@@ -88,7 +91,8 @@ describe('FormBuilderService test suite', () => {
         { provide: DynamicFormValidationService, useValue: {} },
         { provide: NG_VALIDATORS, useValue: testValidator, multi: true },
         { provide: NG_ASYNC_VALIDATORS, useValue: testAsyncValidator, multi: true },
-        { provide: ConfigurationDataService, useValue: configSpy }
+        { provide: ConfigurationDataService, useValue: configSpy },
+        { provide: TranslateService, useValue: translateService },
       ]
     });
 
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 9ab43709ad..891bb1d9d4 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -3,10 +3,14 @@ import { DateFieldParser } from './date-field-parser';
 import { DynamicDsDatePickerModel } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
+
+
 
 describe('DateFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -37,13 +41,13 @@ describe('DateFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DateFieldParser).toBe(true);
   });
 
   it('should return a DynamicDsDatePickerModel object when repeatable option is false', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -56,7 +60,7 @@ describe('DateFieldParser test suite', () => {
     };
     const expectedValue = '1983-11-18';
 
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
index d69f0e48e9..2168d7e2bf 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -2,10 +2,12 @@ import { FormFieldModel } from '../models/form-field.model';
 import { ParserOptions } from './parser-options';
 import { DisabledFieldParser } from './disabled-field-parser';
 import { DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('DisabledFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -35,13 +37,13 @@ describe('DisabledFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DisabledFieldParser).toBe(true);
   });
 
   it('should return a DynamicDisabledModel object when repeatable option is false', () => {
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -56,7 +58,7 @@ describe('DisabledFieldParser test suite', () => {
     };
     const expectedValue = 'test description';
 
-    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
     expect(fieldModel.value.value).toEqual(expectedValue);
diff --git a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
index 3dca7558b3..08a93f76d3 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.spec.ts
@@ -2,9 +2,11 @@ import { FormFieldModel } from '../models/form-field.model';
 import { DropdownFieldParser } from './dropdown-field-parser';
 import { DynamicScrollableDropdownModel } from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('DropdownFieldParser test suite', () => {
   let field: FormFieldModel;
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const initFormValues = {};
@@ -37,13 +39,13 @@ describe('DropdownFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof DropdownFieldParser).toBe(true);
   });
 
   it('should return a DynamicScrollableDropdownModel object when repeatable option is false', () => {
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -52,7 +54,7 @@ describe('DropdownFieldParser test suite', () => {
 
   it('should throw when authority is not passed', () => {
     field.selectableMetadata[0].controlledVocabulary = null;
-    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(() => parser.parse())
       .toThrow();
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
index 30d1913a51..ba9f9291cf 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.spec.ts
@@ -4,10 +4,12 @@ import { ListFieldParser } from './list-field-parser';
 import { DynamicListCheckboxGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from '../ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('ListFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -39,13 +41,13 @@ describe('ListFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof ListFieldParser).toBe(true);
   });
 
   it('should return a DynamicListCheckboxGroupModel object when repeatable option is true', () => {
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -54,7 +56,7 @@ describe('ListFieldParser test suite', () => {
 
   it('should return a DynamicListRadioGroupModel object when repeatable option is false', () => {
     field.repeatable = false;
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -67,7 +69,7 @@ describe('ListFieldParser test suite', () => {
     };
     const expectedValue = [new FormFieldMetadataValueObject('test type')];
 
-    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
index 24efcf3462..a932dc637c 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { LookupFieldParser } from './lookup-field-parser';
 import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('LookupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('LookupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof LookupFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupModel object when repeatable option is false', () => {
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('LookupFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test journal');
 
-    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
index d0281681ef..6220a6e74c 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { LookupNameFieldParser } from './lookup-name-field-parser';
 import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('LookupNameFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('LookupNameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof LookupNameFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupNameModel object when repeatable option is false', () => {
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('LookupNameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test author');
 
-    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
index 6b520142cc..e124181b24 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.spec.ts
@@ -3,12 +3,14 @@ import { NameFieldParser } from './name-field-parser';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('NameFieldParser test suite', () => {
   let field1: FormFieldModel;
   let field2: FormFieldModel;
   let field3: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -71,13 +73,13 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof NameFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -85,7 +87,7 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -98,7 +100,7 @@ describe('NameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test, name', undefined, undefined, 'test');
 
-    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
index a4c71d1f42..6b7ac65a58 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.spec.ts
@@ -5,11 +5,13 @@ import { DynamicOneboxModel } from '../ds-dynamic-form-ui/models/onebox/dynamic-
 import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { ParserOptions } from './parser-options';
 import { FieldParser } from './field-parser';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('OneboxFieldParser test suite', () => {
   let field1: FormFieldModel;
   let field2: FormFieldModel;
   let field3: FormFieldModel;
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const initFormValues = {};
@@ -73,13 +75,13 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof OneboxFieldParser).toBe(true);
   });
 
   it('should return a DynamicQualdropModel object when selectableMetadata is multiple', () => {
-    const parser = new OneboxFieldParser(submissionId, field2, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field2, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -87,7 +89,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DsDynamicInputModel object when selectableMetadata is not multiple', () => {
-    const parser = new OneboxFieldParser(submissionId, field3, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field3, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -95,7 +97,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DynamicOneboxModel object when selectableMetadata has authority', () => {
-    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -124,7 +126,7 @@ describe('OneboxFieldParser test suite', () => {
         languageCodes: []
       } as FormFieldModel;
 
-      parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions);
+      parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions, translateService);
       fieldModel = parser.parse();
     });
 
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
index 7d48ad2d00..8ae0ccfedf 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { DynamicRelationGroupModel } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('RelationGroupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -73,13 +75,13 @@ describe('RelationGroupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof RelationGroupFieldParser).toBe(true);
   });
 
   it('should return a DynamicRelationGroupModel object', () => {
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -88,7 +90,7 @@ describe('RelationGroupFieldParser test suite', () => {
 
   it('should throw when rows configuration is empty', () => {
     field.rows = null;
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(() => parser.parse())
       .toThrow();
@@ -99,7 +101,7 @@ describe('RelationGroupFieldParser test suite', () => {
       author: [new FormFieldMetadataValueObject('test author')],
       affiliation: [new FormFieldMetadataValueObject('test affiliation')]
     };
-    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
     const expectedValue = [{
diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index 1f9bde8a7f..fca16b28e3 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -3,6 +3,10 @@ import { RowParser } from './row-parser';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
+import { TestBed } from '@angular/core/testing';
+import { TranslateService } from '@ngx-translate/core';
+import { Injector } from '@angular/core';
 
 describe('RowParser test suite', () => {
 
@@ -16,6 +20,7 @@ describe('RowParser test suite', () => {
   let row8: FormRowModel;
   let row9: FormRowModel;
   let row10: FormRowModel;
+  let injector: Injector;
 
   const submissionId = '1234';
   const scopeUUID = 'testScopeUUID';
@@ -25,6 +30,12 @@ describe('RowParser test suite', () => {
   const typeField = 'dc_type';
 
   beforeEach(() => {
+    let translateService = getMockTranslateService();
+    injector = Injector.create({
+      providers: [
+        { provide: TranslateService, useValue: translateService },
+      ],
+    });
     row1 = {
       fields: [
         {
@@ -330,14 +341,14 @@ describe('RowParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new RowParser(undefined);
+    const parser = new RowParser(injector);
 
     expect(parser instanceof RowParser).toBe(true);
   });
 
   describe('parse', () => {
     it('should return a DynamicRowGroupModel object', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -345,7 +356,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a row with three fields', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -353,7 +364,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a DynamicRowArrayModel object', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row2, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -361,7 +372,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should return a row that contains only scoped fields', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row3, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -369,7 +380,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a dropdown combo field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row4, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -377,7 +388,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a lookup-name field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row5, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -385,7 +396,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a list field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row6, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -393,7 +404,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a date field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row7, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -401,7 +412,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a tag field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row8, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -409,7 +420,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a textarea field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row9, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
@@ -417,7 +428,7 @@ describe('RowParser test suite', () => {
     });
 
     it('should be able to parse a group field', () => {
-      const parser = new RowParser(undefined);
+      const parser = new RowParser(injector);
 
       const rowModel = parser.parse(submissionId, row10, scopeUUID, initFormValues, submissionScope, readOnly, typeField);
 
diff --git a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
index 0761cfe60e..0ce50081e4 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-conc
 import { SeriesFieldParser } from './series-field-parser';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('SeriesFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -34,13 +36,13 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof SeriesFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -48,7 +50,7 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -61,7 +63,7 @@ describe('SeriesFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test; series', undefined, undefined, 'test');
 
-    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
index 115829f8d3..ae10dbd386 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { TagFieldParser } from './tag-field-parser';
 import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('TagFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -38,13 +40,13 @@ describe('TagFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof TagFieldParser).toBe(true);
   });
 
   it('should return a DynamicTagModel object when repeatable option is false', () => {
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -59,7 +61,7 @@ describe('TagFieldParser test suite', () => {
       ],
     };
 
-    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
index 855e464f21..259f8a60e1 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.spec.ts
@@ -3,10 +3,12 @@ import { FormFieldMetadataValueObject } from '../models/form-field-metadata-valu
 import { TextareaFieldParser } from './textarea-field-parser';
 import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { ParserOptions } from './parser-options';
+import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
 
 describe('TextareaFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
+  let translateService = getMockTranslateService();
 
   const submissionId = '1234';
   const parserOptions: ParserOptions = {
@@ -36,13 +38,13 @@ describe('TextareaFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     expect(parser instanceof TextareaFieldParser).toBe(true);
   });
 
   it('should return a DsDynamicTextAreaModel object when repeatable option is false', () => {
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +59,7 @@ describe('TextareaFieldParser test suite', () => {
     };
     const expectedValue = 'test description';
 
-    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
 
     const fieldModel = parser.parse();
 

From ab23613b799f488a0845aeb309a371eabc3035c6 Mon Sep 17 00:00:00 2001
From: "max.nuding" <max.nuding@uni-konstanz.de>
Date: Wed, 15 Nov 2023 13:42:53 +0100
Subject: [PATCH 0005/1286] Remove unnecessary import

---
 src/app/shared/form/builder/parsers/row-parser.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/form/builder/parsers/row-parser.spec.ts b/src/app/shared/form/builder/parsers/row-parser.spec.ts
index fca16b28e3..f414715f5b 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -4,7 +4,6 @@ import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-ro
 import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 import { getMockTranslateService } from 'src/app/shared/mocks/translate.service.mock';
-import { TestBed } from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
 import { Injector } from '@angular/core';
 

From 5a839c2906ef7709409731092ff6d8715cb18649 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Nov 2023 14:37:06 -0600
Subject: [PATCH 0006/1286] Update version tag for development of next release

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

diff --git a/package.json b/package.json
index 1ddb27078f..852e5e57f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.1",
+  "version": "7.6.2-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 02eb618c5f8dcb7295301e294901dadcb53cd1fe Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Thu, 16 Nov 2023 11:36:06 -0600
Subject: [PATCH 0007/1286] Setup the Docker GH Action for Matrix Building

This change enables building of the amd64 and arm64 images simultaneously.

Once both images finish, the manifest is sent to Docker Hub, allowing for a single image that has both the amd64/arm64 images.
---
 .github/workflows/docker.yml | 173 +++++++++++++++++++++++++++++++----
 1 file changed, 153 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0c36d5af98..18bdef78be 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,6 +17,7 @@ permissions:
 
 
 env:
+  REGISTRY_IMAGE: dspace/dspace-angular
   # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
   # For a new commit on default branch (main), use the literal tag 'latest' on Docker image.
   # For a new commit on other branches, use the branch name as the tag for Docker image.
@@ -30,21 +31,30 @@ env:
   # We manage the 'latest' tag ourselves to the 'main' branch (see settings above)
   TAGS_FLAVOR: |
     latest=false
-  # Architectures / Platforms for which we will build Docker images
-  # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-  # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
-  PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
-
 
 jobs:
-  ###############################################
-  # Build/Push the 'dspace/dspace-angular' image
-  ###############################################
+  #############################################################
+  # Build/Push the '${{ env.REGISTRY_IMAGE }}' image
+  #############################################################
   dspace-angular:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-    runs-on: ubuntu-latest
 
+    strategy:
+        matrix:
+            isPr:
+                - ${{ github.event_name == 'pull_request' }}
+            # Architectures / Platforms for which we will build Docker images
+            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+            # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
+            arch: ['linux/amd64', 'linux/arm64']
+            os: [ubuntu-latest]
+            exclude:
+                - isPr: true
+                  os: ubuntu-latest
+                  arch: linux/arm64
+
+    runs-on: ${{ matrix.os }}
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
@@ -61,7 +71,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
+        if: ${{ ! matrix.isPr }}
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -73,7 +83,7 @@ jobs:
         id: meta_build
         uses: docker/metadata-action@v4
         with:
-          images: dspace/dspace-angular
+          images: ${{ env.REGISTRY_IMAGE }}
           tags: ${{ env.IMAGE_TAGS }}
           flavor: ${{ env.TAGS_FLAVOR }}
 
@@ -84,22 +94,89 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: ${{ env.PLATFORMS }}
+          platforms: ${{ matrix.arch }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ ! matrix.isPr }}
           # Use tags / labels provided by 'docker/metadata-action' above
           tags: ${{ steps.meta_build.outputs.tags }}
           labels: ${{ steps.meta_build.outputs.labels }}
 
+      - name: Export digest
+        if: ${{ ! matrix.isPr }}
+        run: |
+            mkdir -p /tmp/digests
+            digest="${{ steps.docker_build.outputs.digest }}"
+            touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        if: ${{ ! matrix.isPr }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    if: ${{ github.event_name != 'pull_request' }}
+    runs-on: ubuntu-latest
+    needs:
+      - dspace-angular
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
   #############################################################
-  # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
+  # Build/Push the '${{ env.REGISTRY_IMAGE }}' image ('-dist' tag)
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-    runs-on: ubuntu-latest
 
+    strategy:
+        matrix:
+            isPr:
+                - ${{ github.event_name == 'pull_request' }}
+            # Architectures / Platforms for which we will build Docker images
+            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+            # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
+            arch: ['linux/amd64', 'linux/arm64']
+            os: [ubuntu-latest]
+            exclude:
+                - isPr: true
+                  os: ubuntu-latest
+                  arch: linux/arm64
+
+    runs-on: ${{ matrix.os }}
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
@@ -116,7 +193,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
+        if: ${{ ! matrix.isPr }}
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -128,10 +205,10 @@ jobs:
         id: meta_build_dist
         uses: docker/metadata-action@v4
         with:
-          images: dspace/dspace-angular
+          images: ${{ env.REGISTRY_IMAGE }}
           tags: ${{ env.IMAGE_TAGS }}
           # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-          # tagging logic as the primary 'dspace/dspace-angular' image above.
+          # tagging logic as the primary '${{ env.REGISTRY_IMAGE }}' image above.
           flavor: ${{ env.TAGS_FLAVOR }}
             suffix=-dist
 
@@ -141,10 +218,66 @@ jobs:
         with:
           context: .
           file: ./Dockerfile.dist
-          platforms: ${{ env.PLATFORMS }}
+          platforms: ${{ matrix.arch }}
           # For pull requests, we run the Docker build (to ensure no PR changes break the build),
           # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ ! matrix.isPr }}
           # Use tags / labels provided by 'docker/metadata-action' above
           tags: ${{ steps.meta_build_dist.outputs.tags }}
           labels: ${{ steps.meta_build_dist.outputs.labels }}
+
+      - name: Export digest
+        if: ${{ ! matrix.isPr }}
+        run: |
+            mkdir -p /tmp/digests/dist
+            digest="${{ steps.docker_build_dist.outputs.digest }}"
+            touch "/tmp/digests/dist/${digest#sha256:}"
+
+      - name: Upload digest
+        if: ${{ ! matrix.isPr }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/dist/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge-dist:
+    if: ${{ github.event_name != 'pull_request' }}
+    runs-on: ubuntu-latest
+    needs:
+      - dspace-angular-dist
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta_dist
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ env.IMAGE_TAGS }}
+          # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
+          # tagging logic as the primary '${{ env.REGISTRY_IMAGE }}' image above.
+          flavor: ${{ env.TAGS_FLAVOR }}
+            suffix=-dist
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests/dist
+        run: |
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta_dist.outputs.version }}

From 526da8cddf45e09bee4df4c73a9c389659a2c6cf Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 17 Nov 2023 09:31:09 -0600
Subject: [PATCH 0008/1286] Fix bug in Docker manifest. Each build must use a
 separate artifact to store digests. Other minor cleanup & comments added.

---
 .github/workflows/docker.yml | 81 ++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 18bdef78be..23919d573c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,13 +42,13 @@ jobs:
 
     strategy:
         matrix:
-            isPr:
-                - ${{ github.event_name == 'pull_request' }}
             # Architectures / Platforms for which we will build Docker images
-            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-            # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
             arch: ['linux/amd64', 'linux/arm64']
             os: [ubuntu-latest]
+            isPr:
+              - ${{ github.event_name == 'pull_request' }}
+            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+            # The below exclude therefore ensures we do NOT build ARM64 for PRs.
             exclude:
                 - isPr: true
                   os: ubuntu-latest
@@ -58,21 +58,21 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
         if: ${{ ! matrix.isPr }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -81,7 +81,7 @@ jobs:
       # Get Metadata for docker_build step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
         id: meta_build
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: ${{ env.IMAGE_TAGS }}
@@ -90,7 +90,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push 'dspace-angular' image
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
@@ -102,6 +102,7 @@ jobs:
           tags: ${{ steps.meta_build.outputs.tags }}
           labels: ${{ steps.meta_build.outputs.labels }}
 
+      # Export the digest of Docker build locally (for non PRs only)
       - name: Export digest
         if: ${{ ! matrix.isPr }}
         run: |
@@ -109,6 +110,7 @@ jobs:
             digest="${{ steps.docker_build.outputs.digest }}"
             touch "/tmp/digests/${digest#sha256:}"
 
+      # Upload digest to an artifact, so that it can be used in manifest below
       - name: Upload digest
         if: ${{ ! matrix.isPr }}
         uses: actions/upload-artifact@v3
@@ -118,7 +120,12 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-  merge:
+  # Merge digests into a manifest.
+  # This runs after all Docker builds complete above, and it tells hub.docker.com
+  # that these builds should be all included in the manifest for this tag.
+  # (e.g. AMD64 and ARM64 should be listed as options under the same tagged Docker image)
+  # Borrowed from https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
+  dspace-angular_manifest:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
     needs:
@@ -129,9 +136,11 @@ jobs:
         with:
           name: digests
           path: /tmp/digests
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Docker meta
+
+      - name: Add Docker metadata for image
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -145,7 +154,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-      - name: Create manifest list and push
+      - name: Create manifest list from digests and push
         working-directory: /tmp/digests
         run: |
             docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
@@ -164,13 +173,13 @@ jobs:
 
     strategy:
         matrix:
-            isPr:
-                - ${{ github.event_name == 'pull_request' }}
             # Architectures / Platforms for which we will build Docker images
-            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-            # If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
             arch: ['linux/amd64', 'linux/arm64']
             os: [ubuntu-latest]
+            isPr:
+                - ${{ github.event_name == 'pull_request' }}
+            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
+            # The below exclude therefore ensures we do NOT build ARM64 for PRs.
             exclude:
                 - isPr: true
                   os: ubuntu-latest
@@ -180,21 +189,21 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       # https://github.com/docker/login-action
       - name: Login to DockerHub
         # Only login if not a PR, as PRs only trigger a Docker build and not a push
         if: ${{ ! matrix.isPr }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -203,7 +212,7 @@ jobs:
       # Get Metadata for docker_build_dist step below
       - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
         id: meta_build_dist
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: ${{ env.IMAGE_TAGS }}
@@ -214,7 +223,7 @@ jobs:
 
       - name: Build and push 'dspace-angular-dist' image
         id: docker_build_dist
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile.dist
@@ -226,6 +235,7 @@ jobs:
           tags: ${{ steps.meta_build_dist.outputs.tags }}
           labels: ${{ steps.meta_build_dist.outputs.labels }}
 
+      # Export the digest of Docker build locally (for non PRs only)
       - name: Export digest
         if: ${{ ! matrix.isPr }}
         run: |
@@ -233,29 +243,38 @@ jobs:
             digest="${{ steps.docker_build_dist.outputs.digest }}"
             touch "/tmp/digests/dist/${digest#sha256:}"
 
+      # Upload Digest to an artifact, so that it can be used in manifest below
       - name: Upload digest
         if: ${{ ! matrix.isPr }}
         uses: actions/upload-artifact@v3
         with:
-          name: digests
-          path: /tmp/digests/dist/*
+          # NOTE: It's important that this artifact has a unique name so that two
+          # image builds don't upload digests to the same artifact.
+          name: digests-dist
+          path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
 
-  merge-dist:
+  # Merge *-dist digests into a manifest.
+  # This runs after all Docker builds complete above, and it tells hub.docker.com
+  # that these builds should be all included in the manifest for this tag.
+  # (e.g. AMD64 and ARM64 should be listed as options under the same tagged Docker image)
+  dspace-angular-dist_manifest:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
     needs:
       - dspace-angular-dist
     steps:
-      - name: Download digests
+      - name: Download digests for -dist builds
         uses: actions/download-artifact@v3
         with:
-          name: digests
+          name: digests-dist
           path: /tmp/digests
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Docker meta
+
+      - name: Add Docker metadata for image
         id: meta_dist
         uses: docker/metadata-action@v5
         with:
@@ -272,8 +291,8 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
-      - name: Create manifest list and push
-        working-directory: /tmp/digests/dist
+      - name: Create manifest list from digests and push
+        working-directory: /tmp/digests
         run: |
             docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)

From 63e792990f46620f510013fea569a76abb1ba653 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 17 Nov 2023 11:56:48 -0600
Subject: [PATCH 0009/1286] Fix directory structure for -dist digests

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 23919d573c..04112f7b70 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -239,9 +239,9 @@ jobs:
       - name: Export digest
         if: ${{ ! matrix.isPr }}
         run: |
-            mkdir -p /tmp/digests/dist
+            mkdir -p /tmp/digests
             digest="${{ steps.docker_build_dist.outputs.digest }}"
-            touch "/tmp/digests/dist/${digest#sha256:}"
+            touch "/tmp/digests/${digest#sha256:}"
 
       # Upload Digest to an artifact, so that it can be used in manifest below
       - name: Upload digest

From 5ab87ec6c31d736b8eae0891aad92c20228d301d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 17 Nov 2023 11:05:46 -0600
Subject: [PATCH 0010/1286] Update GH actions to latest versions. Fix bug in
 codecov to ensure it retries on error.

---
 .github/workflows/build.yml                    | 16 ++++++++++------
 .github/workflows/codescan.yml                 |  2 +-
 .github/workflows/port_merged_pull_request.yml |  4 ++--
 .github/workflows/pull_request_opened.yml      |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 219074780e..e2680420a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,11 +43,11 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # https://github.com/actions/setup-node
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -118,7 +118,7 @@ jobs:
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
@@ -191,7 +191,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Download artifacts from previous 'tests' job
       - name: Download coverage artifacts
@@ -203,10 +203,14 @@ jobs:
       # Retry action: https://github.com/marketplace/actions/retry-action
       # Codecov action: https://github.com/codecov/codecov-action
       - name: Upload coverage to Codecov.io
-        uses: Wandalen/wretry.action@v1.0.36
+        uses: Wandalen/wretry.action@v1.3.0
         with:
           action: codecov/codecov-action@v3
-          # Try upload 5 times max
+          # Ensure codecov-action throws an error when it fails to upload
+          # This allows us to auto-restart the action if an error is thrown
+          with: |
+            fail_ci_if_error: true
+          # Try re-running action 5 times max
           attempt_limit: 5
           # Run again in 30 seconds
           attempt_delay: 30000
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
index 8b415296c7..d96e786cc3 100644
--- a/.github/workflows/codescan.yml
+++ b/.github/workflows/codescan.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action
diff --git a/.github/workflows/port_merged_pull_request.yml b/.github/workflows/port_merged_pull_request.yml
index 109835d14d..857f22755e 100644
--- a/.github/workflows/port_merged_pull_request.yml
+++ b/.github/workflows/port_merged_pull_request.yml
@@ -23,11 +23,11 @@ jobs:
     if: github.event.pull_request.merged
     steps:
       # Checkout code
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Port PR to other branch (ONLY if labeled with "port to")
       # See https://github.com/korthout/backport-action
       - name: Create backport pull requests
-        uses: korthout/backport-action@v1
+        uses: korthout/backport-action@v2
         with:
           # Trigger based on a "port to [branch]" label on PR
           # (This label must specify the branch name to port to)
diff --git a/.github/workflows/pull_request_opened.yml b/.github/workflows/pull_request_opened.yml
index 9b61af72d1..f16e81c9fd 100644
--- a/.github/workflows/pull_request_opened.yml
+++ b/.github/workflows/pull_request_opened.yml
@@ -21,4 +21,4 @@ jobs:
     # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
     # See https://github.com/toshimaru/auto-author-assign
     - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v1.6.2
+      uses: toshimaru/auto-author-assign@v2.0.1

From 62ccd18345e5be5171bc33479d7aa65e7dfc81f5 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 21 Nov 2023 12:15:42 -0600
Subject: [PATCH 0011/1286] Trigger redeploy of demo/sandbox from GitHub
 Actions after DockerHub image updated.

---
 .github/workflows/docker.yml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 04112f7b70..c482d8f29a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,8 +23,8 @@ env:
   # For a new commit on other branches, use the branch name as the tag for Docker image.
   # For a new tag, copy that tag name as the tag for Docker image.
   IMAGE_TAGS: |
-    type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-    type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
+    type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch }}
+    type=ref,event=branch,enable=${{ github.ref_name != github.event.repository.default_branch }}
     type=ref,event=tag
   # Define default tag "flavor" for docker/metadata-action per
   # https://github.com/docker/metadata-action#flavor-input
@@ -300,3 +300,25 @@ jobs:
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta_dist.outputs.version }}
+
+  # Deploy latest -dist image to Demo or Sandbox site, based on the branch updated
+  dspace-angular-dist_deploy:
+    if: ${{ github.event_name != 'pull_request' }}
+    runs-on: ubuntu-latest
+    needs:
+      # Requires manifest to be fully updated on DockerHub
+      - dspace-angular-dist_manifest
+    steps:
+      - name: Redeploy sandbox.dspace.org (based on main branch)
+        if: ${{ github.ref_name == github.event.repository.default_branch }}
+        run: |
+            curl -X POST -d '{}' $REDEPLOY_SANDBOX_URL
+        env:
+          REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
+
+      - name: Redeploy demo.dspace.org (based on maintenace branch)
+        if: ${{ github.ref_name == 'dspace-7_x' }}
+        run: |
+            curl -X POST -d '{}' $REDEPLOY_DEMO_URL
+        env:
+            REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}

From 9c3e3d9c29189b667d49473456e2e5d74ce099f2 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 22 Nov 2023 14:51:17 +0100
Subject: [PATCH 0012/1286] 108608: Created new ScopeSelectorModal &
 ScopeSelectorModalCurrent context

---
 src/app/core/shared/context.model.ts              |  2 ++
 ...issue-sidebar-search-list-element.component.ts |  2 ++
 ...olume-sidebar-search-list-element.component.ts |  2 ++
 ...urnal-sidebar-search-list-element.component.ts |  2 ++
 ...-unit-sidebar-search-list-element.component.ts |  2 ++
 ...erson-sidebar-search-list-element.component.ts |  2 ++
 ...oject-sidebar-search-list-element.component.ts |  2 ++
 .../dso-selector/dso-selector.component.ts        | 15 ++++++++++++++-
 ...ction-sidebar-search-list-element.component.ts |  2 ++
 ...unity-sidebar-search-list-element.component.ts |  2 ++
 ...ation-sidebar-search-list-element.component.ts |  4 ++--
 .../scope-selector-modal.component.html           |  4 +++-
 .../scope-selector-modal.component.ts             |  4 ++++
 13 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index 126896e3e1..18d40d9cb6 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -15,4 +15,6 @@ export enum Context {
   AdminWorkflowSearch = 'adminWorkflowSearch',
   SideBarSearchModal = 'sideBarSearchModal',
   SideBarSearchModalCurrent = 'sideBarSearchModalCurrent',
+  ScopeSelectorModal = 'scopeSelectorModal',
+  ScopeSelectorModalCurrent = 'scopeSelectorModalCurrent',
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index 84764e9e60..733cadf0c5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -9,6 +9,8 @@ import { isNotEmpty } from '../../../../../shared/empty.util';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-issue-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 7af5487f40..cebb3c1542 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -9,6 +9,8 @@ import { isNotEmpty } from '../../../../../shared/empty.util';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-volume-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index 4a26b293d9..a3cdaf24a3 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -9,6 +9,8 @@ import { isNotEmpty } from '../../../../../shared/empty.util';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 17e9790593..2e1d88bf03 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -8,6 +8,8 @@ import { Item } from '../../../../../core/shared/item.model';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-org-unit-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index 281f22ddb4..2d56d79438 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -13,6 +13,8 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-person-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index 6fbb9d26fc..233216f206 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -8,6 +8,8 @@ import { Item } from '../../../../../core/shared/item.model';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-project-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 82ad095cd4..64ee2278c6 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -50,6 +50,12 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    * The view mode of the listed objects
    */
   viewMode = ViewMode.ListElement;
+
+  /**
+   * The current context
+   */
+  @Input() context: Context;
+
   /**
    * The initially selected DSO's uuid
    */
@@ -243,7 +249,14 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * Get the context for element with the given id
    */
-  getContext(id: string) {
+  getContext(id: string): Context {
+    if (this.context === Context.ScopeSelectorModal) {
+      if (id === this.currentDSOId) {
+        return Context.ScopeSelectorModalCurrent;
+      } else {
+        return Context.ScopeSelectorModal;
+      }
+    }
     if (id === this.currentDSOId) {
       return Context.SideBarSearchModalCurrent;
     } else {
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
index 13703240f4..b94b3766c3 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -8,6 +8,8 @@ import { SidebarSearchListElementComponent } from '../sidebar-search-list-elemen
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-collection-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html'
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 14c8ec09cd..b50e2c6980 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -8,6 +8,8 @@ import { Community } from '../../../../core/shared/community.model';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-collection-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html'
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index 0822accc50..f77263df40 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -8,8 +8,8 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-publication-sidebar-search-list-element',
   templateUrl: '../../sidebar-search-list-element.component.html'
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index bf5c15e963..2d8763383b 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -14,6 +14,8 @@
         </h3>
 
         <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [context]="Context.ScopeSelectorModal" [currentDSOId]="dsoRD?.payload.uuid"
+                         [types]="selectorTypes" (onSelect)="selectObject($event)">
+        </ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 86c3010287..e610d997c7 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -4,6 +4,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Context } from '../../../core/shared/context.model';
 
 /**
  * Component to wrap a button - to select the entire repository -
@@ -17,6 +18,9 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
   templateUrl: './scope-selector-modal.component.html',
 })
 export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
+
+  readonly Context = Context;
+
   objectType = DSpaceObjectType.COMMUNITY;
   /**
    * The types of DSO that can be selected from this list

From bd78acd5594492a4e87e09e3a68d5570368290be Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 22 Nov 2023 10:51:28 -0600
Subject: [PATCH 0013/1286] Redeploy demo/sandbox more quickly by only waiting
 for AMD64 image

---
 .github/workflows/docker.yml | 40 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c482d8f29a..a581b63e7b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -255,6 +255,24 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+      # If the 'linux/amd64' -dist image was just updated for the 'main' branch,
+      # Then redeploy https://sandbox.dspace.org using that updated image.
+      - name: Redeploy sandbox.dspace.org (based on main branch)
+        if: ${{ ! matrix.isPr && matrix.arch == 'linux/amd64' && github.ref_name == github.event.repository.default_branch }}
+        run: |
+            curl -X POST $REDEPLOY_SANDBOX_URL
+        env:
+          REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
+
+      # If the 'linux/amd64' -dist image was just updated for the maintenance branch,
+      # Then redeploy https://demo.dspace.org using that updated image.
+      - name: Redeploy demo.dspace.org (based on maintenace branch)
+        if: ${{ ! matrix.isPr && matrix.arch == 'linux/amd64' && github.ref_name == 'dspace-7_x' }}
+        run: |
+            curl -X POST $REDEPLOY_DEMO_URL
+        env:
+            REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}
+
   # Merge *-dist digests into a manifest.
   # This runs after all Docker builds complete above, and it tells hub.docker.com
   # that these builds should be all included in the manifest for this tag.
@@ -300,25 +318,3 @@ jobs:
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta_dist.outputs.version }}
-
-  # Deploy latest -dist image to Demo or Sandbox site, based on the branch updated
-  dspace-angular-dist_deploy:
-    if: ${{ github.event_name != 'pull_request' }}
-    runs-on: ubuntu-latest
-    needs:
-      # Requires manifest to be fully updated on DockerHub
-      - dspace-angular-dist_manifest
-    steps:
-      - name: Redeploy sandbox.dspace.org (based on main branch)
-        if: ${{ github.ref_name == github.event.repository.default_branch }}
-        run: |
-            curl -X POST -d '{}' $REDEPLOY_SANDBOX_URL
-        env:
-          REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
-
-      - name: Redeploy demo.dspace.org (based on maintenace branch)
-        if: ${{ github.ref_name == 'dspace-7_x' }}
-        run: |
-            curl -X POST -d '{}' $REDEPLOY_DEMO_URL
-        env:
-            REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}

From c3f424dae4eaabcbf42d31af5cdd2ffd5f65278c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 18 Nov 2023 15:24:56 +0100
Subject: [PATCH 0014/1286] 108587: Deselect all fields on component
 destruction

(cherry picked from commit ecca8286b5e8c4d90d9d04e9ea71238dd5046f8e)
---
 .../metadata-schema/metadata-schema.component.ts   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index d0827e6e4d..4dec129ead 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
@@ -32,7 +32,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
  * A component used for managing all existing metadata fields within the current metadata schema.
  * The admin can create, edit or delete metadata fields here.
  */
-export class MetadataSchemaComponent implements OnInit {
+export class MetadataSchemaComponent implements OnInit, OnDestroy {
   /**
    * The metadata schema
    */
@@ -60,7 +60,6 @@ export class MetadataSchemaComponent implements OnInit {
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
-              private router: Router,
               private paginationService: PaginationService,
               private translateService: TranslateService) {
 
@@ -86,7 +85,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   private updateFields() {
     this.metadataFields$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
-      switchMap((currentPagination) => combineLatest(this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination))),
+      switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination)])),
       switchMap(([schema, update, currentPagination]: [MetadataSchema, boolean, PaginationComponentOptions]) => {
         if (update) {
           this.needsUpdate$.next(false);
@@ -193,10 +192,10 @@ export class MetadataSchemaComponent implements OnInit {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
+    const messages = observableCombineLatest([
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
       this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
-    );
+    ]);
     messages.subscribe(([head, content]) => {
       if (success) {
         this.notificationsService.success(head, content);
@@ -207,6 +206,7 @@ export class MetadataSchemaComponent implements OnInit {
   }
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.registryService.deselectAllMetadataField();
   }
 
 }

From b83a8421a3552efdb2eb92c1a4435f8472d75fe4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 28 Nov 2023 16:04:50 -0600
Subject: [PATCH 0015/1286] Refactor to simply use the
 reusable-docker-build.yml from DSpace/DSpace.

---
 .github/workflows/docker.yml | 305 ++++-------------------------------
 1 file changed, 30 insertions(+), 275 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a581b63e7b..ece1f880c0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,9 @@ name: Docker images
 
 # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
+# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
+# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml
+# 
 on:
   push:
     branches:
@@ -17,7 +20,6 @@ permissions:
 
 
 env:
-  REGISTRY_IMAGE: dspace/dspace-angular
   # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
   # For a new commit on default branch (main), use the literal tag 'latest' on Docker image.
   # For a new commit on other branches, use the branch name as the tag for Docker image.
@@ -34,287 +36,40 @@ env:
 
 jobs:
   #############################################################
-  # Build/Push the '${{ env.REGISTRY_IMAGE }}' image
+  # Build/Push the 'dspace/dspace-angular' image
   #############################################################
   dspace-angular:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-
-    strategy:
-        matrix:
-            # Architectures / Platforms for which we will build Docker images
-            arch: ['linux/amd64', 'linux/arm64']
-            os: [ubuntu-latest]
-            isPr:
-              - ${{ github.event_name == 'pull_request' }}
-            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-            # The below exclude therefore ensures we do NOT build ARM64 for PRs.
-            exclude:
-                - isPr: true
-                  os: ubuntu-latest
-                  arch: linux/arm64
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v4
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v3
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: ${{ ! matrix.isPr }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
-        id: meta_build
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'dspace-angular' image
-        id: docker_build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{ matrix.arch }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ ! matrix.isPr }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
-
-      # Export the digest of Docker build locally (for non PRs only)
-      - name: Export digest
-        if: ${{ ! matrix.isPr }}
-        run: |
-            mkdir -p /tmp/digests
-            digest="${{ steps.docker_build.outputs.digest }}"
-            touch "/tmp/digests/${digest#sha256:}"
-
-      # Upload digest to an artifact, so that it can be used in manifest below
-      - name: Upload digest
-        if: ${{ ! matrix.isPr }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: digests
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  # Merge digests into a manifest.
-  # This runs after all Docker builds complete above, and it tells hub.docker.com
-  # that these builds should be all included in the manifest for this tag.
-  # (e.g. AMD64 and ARM64 should be listed as options under the same tagged Docker image)
-  # Borrowed from https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
-  dspace-angular_manifest:
-    if: ${{ github.event_name != 'pull_request' }}
-    runs-on: ubuntu-latest
-    needs:
-      - dspace-angular
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v3
-        with:
-          name: digests
-          path: /tmp/digests
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Add Docker metadata for image
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      - name: Create manifest list from digests and push
-        working-directory: /tmp/digests
-        run: |
-            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    with:
+      build_id: dspace-angular
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
   #############################################################
-  # Build/Push the '${{ env.REGISTRY_IMAGE }}' image ('-dist' tag)
+  # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-
-    strategy:
-        matrix:
-            # Architectures / Platforms for which we will build Docker images
-            arch: ['linux/amd64', 'linux/arm64']
-            os: [ubuntu-latest]
-            isPr:
-                - ${{ github.event_name == 'pull_request' }}
-            # If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
-            # The below exclude therefore ensures we do NOT build ARM64 for PRs.
-            exclude:
-                - isPr: true
-                  os: ubuntu-latest
-                  arch: linux/arm64
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v4
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU emulation to build for multiple architectures
-        uses: docker/setup-qemu-action@v3
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: ${{ ! matrix.isPr }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build_dist step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
-        id: meta_build_dist
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.IMAGE_TAGS }}
-          # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-          # tagging logic as the primary '${{ env.REGISTRY_IMAGE }}' image above.
-          flavor: ${{ env.TAGS_FLAVOR }}
-            suffix=-dist
-
-      - name: Build and push 'dspace-angular-dist' image
-        id: docker_build_dist
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.dist
-          platforms: ${{ matrix.arch }}
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ ! matrix.isPr }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build_dist.outputs.tags }}
-          labels: ${{ steps.meta_build_dist.outputs.labels }}
-
-      # Export the digest of Docker build locally (for non PRs only)
-      - name: Export digest
-        if: ${{ ! matrix.isPr }}
-        run: |
-            mkdir -p /tmp/digests
-            digest="${{ steps.docker_build_dist.outputs.digest }}"
-            touch "/tmp/digests/${digest#sha256:}"
-
-      # Upload Digest to an artifact, so that it can be used in manifest below
-      - name: Upload digest
-        if: ${{ ! matrix.isPr }}
-        uses: actions/upload-artifact@v3
-        with:
-          # NOTE: It's important that this artifact has a unique name so that two
-          # image builds don't upload digests to the same artifact.
-          name: digests-dist
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # If the 'linux/amd64' -dist image was just updated for the 'main' branch,
-      # Then redeploy https://sandbox.dspace.org using that updated image.
-      - name: Redeploy sandbox.dspace.org (based on main branch)
-        if: ${{ ! matrix.isPr && matrix.arch == 'linux/amd64' && github.ref_name == github.event.repository.default_branch }}
-        run: |
-            curl -X POST $REDEPLOY_SANDBOX_URL
-        env:
-          REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
-
-      # If the 'linux/amd64' -dist image was just updated for the maintenance branch,
-      # Then redeploy https://demo.dspace.org using that updated image.
-      - name: Redeploy demo.dspace.org (based on maintenace branch)
-        if: ${{ ! matrix.isPr && matrix.arch == 'linux/amd64' && github.ref_name == 'dspace-7_x' }}
-        run: |
-            curl -X POST $REDEPLOY_DEMO_URL
-        env:
-            REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}
-
-  # Merge *-dist digests into a manifest.
-  # This runs after all Docker builds complete above, and it tells hub.docker.com
-  # that these builds should be all included in the manifest for this tag.
-  # (e.g. AMD64 and ARM64 should be listed as options under the same tagged Docker image)
-  dspace-angular-dist_manifest:
-    if: ${{ github.event_name != 'pull_request' }}
-    runs-on: ubuntu-latest
-    needs:
-      - dspace-angular-dist
-    steps:
-      - name: Download digests for -dist builds
-        uses: actions/download-artifact@v3
-        with:
-          name: digests-dist
-          path: /tmp/digests
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Add Docker metadata for image
-        id: meta_dist
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.IMAGE_TAGS }}
-          # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
-          # tagging logic as the primary '${{ env.REGISTRY_IMAGE }}' image above.
-          flavor: ${{ env.TAGS_FLAVOR }}
-            suffix=-dist
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      - name: Create manifest list from digests and push
-        working-directory: /tmp/digests
-        run: |
-            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta_dist.outputs.version }}
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    with:
+      build_id: dspace-angular-dist
+      image_name: dspace/dspace-angular
+      dockerfile_path: ./Dockerfile.dist
+      # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
+      # tagging logic as the primary 'dspace/dspace-angular' image above.
+      tags_flavor: suffix=-dist
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      # Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
+      # these sites as specified in reusable-docker-build.xml
+      REDEPLOY_SANDBOX_URL:  ${{ secrets.REDEPLOY_SANDBOX_URL }}
+      REDEPLOY_DEMO_URL:  ${{ secrets.REDEPLOY_DEMO_URL }}
\ No newline at end of file

From 65fff9361cc42e9a8d453f256cc2ad5ef04ce69d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 28 Nov 2023 16:13:56 -0600
Subject: [PATCH 0016/1286] Use the script from the dspace-7_x branch

---
 .github/workflows/docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ece1f880c0..5223ab100b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ name: Docker images
 # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
 # NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
-# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml
+# https://github.com/DSpace/DSpace/blob/dspace-7_x/.github/workflows/reusable-docker-build.yml
 # 
 on:
   push:
@@ -42,7 +42,7 @@ jobs:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
-    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
     with:
       build_id: dspace-angular
       image_name: dspace/dspace-angular
@@ -58,7 +58,7 @@ jobs:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
-    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
     with:
       build_id: dspace-angular-dist
       image_name: dspace/dspace-angular

From 92d25dd2a8a2003d53f466761217b8f84ee642b7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 28 Nov 2023 16:50:55 -0600
Subject: [PATCH 0017/1286] Remove unused env variables

---
 .github/workflows/docker.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5223ab100b..3a3183f8cd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,22 +18,6 @@ on:
 permissions:
   contents: read  #  to fetch code (actions/checkout)
 
-
-env:
-  # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
-  # For a new commit on default branch (main), use the literal tag 'latest' on Docker image.
-  # For a new commit on other branches, use the branch name as the tag for Docker image.
-  # For a new tag, copy that tag name as the tag for Docker image.
-  IMAGE_TAGS: |
-    type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch }}
-    type=ref,event=branch,enable=${{ github.ref_name != github.event.repository.default_branch }}
-    type=ref,event=tag
-  # Define default tag "flavor" for docker/metadata-action per
-  # https://github.com/docker/metadata-action#flavor-input
-  # We manage the 'latest' tag ourselves to the 'main' branch (see settings above)
-  TAGS_FLAVOR: |
-    latest=false
-
 jobs:
   #############################################################
   # Build/Push the 'dspace/dspace-angular' image

From 38752d9d71b2441b83bbcb616347df66b7fb5e75 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Wed, 29 Nov 2023 14:25:36 +0100
Subject: [PATCH 0018/1286] ensure HALEndpointService doesn't use stale
 requests

---
 src/app/core/server-check/server-check.guard.spec.ts | 10 ++++++----
 src/app/core/server-check/server-check.guard.ts      |  6 ++----
 src/app/core/shared/hal-endpoint.service.ts          | 12 ++++++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/app/core/server-check/server-check.guard.spec.ts b/src/app/core/server-check/server-check.guard.spec.ts
index 044609ef42..f65a7deca7 100644
--- a/src/app/core/server-check/server-check.guard.spec.ts
+++ b/src/app/core/server-check/server-check.guard.spec.ts
@@ -9,7 +9,7 @@ import SpyObj = jasmine.SpyObj;
 describe('ServerCheckGuard', () => {
   let guard: ServerCheckGuard;
   let router: Router;
-  const eventSubject = new ReplaySubject<RouterEvent>(1);
+  let eventSubject: ReplaySubject<RouterEvent>;
   let rootDataServiceStub: SpyObj<RootDataService>;
   let testScheduler: TestScheduler;
   let redirectUrlTree: UrlTree;
@@ -24,6 +24,7 @@ describe('ServerCheckGuard', () => {
       findRoot: jasmine.createSpy('findRoot')
     });
     redirectUrlTree = new UrlTree();
+    eventSubject = new ReplaySubject<RouterEvent>(1);
     router = {
       events: eventSubject.asObservable(),
       navigateByUrl: jasmine.createSpy('navigateByUrl'),
@@ -64,10 +65,10 @@ describe('ServerCheckGuard', () => {
   });
 
   describe(`listenForRouteChanges`, () => {
-    it(`should retrieve the root endpoint, without using the cache, when the method is first called`, () => {
+    it(`should invalidate the root cache, when the method is first called`, () => {
         testScheduler.run(() => {
           guard.listenForRouteChanges();
-          expect(rootDataServiceStub.findRoot).toHaveBeenCalledWith(false);
+          expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1);
         });
     });
 
@@ -80,7 +81,8 @@ describe('ServerCheckGuard', () => {
           eventSubject.next(new NavigationEnd(2,'', ''));
           eventSubject.next(new NavigationStart(3,''));
         });
-        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(3);
+        // once when the method is first called, and then 3 times for NavigationStart events
+        expect(rootDataServiceStub.invalidateRootCache).toHaveBeenCalledTimes(1 + 3);
     });
   });
 });
diff --git a/src/app/core/server-check/server-check.guard.ts b/src/app/core/server-check/server-check.guard.ts
index 65ca2b0c49..79c34c3659 100644
--- a/src/app/core/server-check/server-check.guard.ts
+++ b/src/app/core/server-check/server-check.guard.ts
@@ -53,10 +53,8 @@ export class ServerCheckGuard implements CanActivateChild {
    */
   listenForRouteChanges(): void {
     // we'll always be too late for the first NavigationStart event with the router subscribe below,
-    // so this statement is for the very first route operation. A `find` without using the cache,
-    // rather than an invalidateRootCache, because invalidating as the app is bootstrapping can
-    // break other features
-    this.rootDataService.findRoot(false);
+    // so this statement is for the very first route operation.
+    this.rootDataService.invalidateRootCache();
 
     this.router.events.pipe(
       filter(event => event instanceof NavigationStart),
diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index 8b6316a6ce..98ab6a16ea 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap, take } from 'rxjs/operators';
+import { distinctUntilChanged, map, startWith, switchMap, take, skipWhile } from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { EndpointMapRequest } from '../data/request.models';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
@@ -9,7 +9,7 @@ import { EndpointMap } from '../cache/response.models';
 import { getFirstCompletedRemoteData } from './operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
-import { UnCacheableObject } from './uncacheable-object.model';
+import { CacheableObject } from '../cache/cacheable-object.model';
 
 @Injectable()
 export class HALEndpointService {
@@ -33,9 +33,13 @@ export class HALEndpointService {
 
     this.requestService.send(request, true);
 
-    return this.rdbService.buildFromHref<UnCacheableObject>(href).pipe(
+    return this.rdbService.buildFromHref<CacheableObject>(href).pipe(
+      // This skip ensures that if a stale object is present in the cache when you do a
+      // call it isn't immediately returned, but we wait until the remote data for the new request
+      // is created.
+      skipWhile((rd: RemoteData<CacheableObject>) => rd.isStale),
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<UnCacheableObject>) => {
+      map((response: RemoteData<CacheableObject>) => {
         if (hasValue(response.payload)) {
           return response.payload._links;
         } else {

From 9c69a77d435a8b19de86ceb4f0a66a2a8e036c99 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Wed, 29 Nov 2023 15:42:30 -0800
Subject: [PATCH 0019/1286] Fix for thumbnail images in items.

Revert changes in html template

Revert changes in html template

Revert changes in html template

(cherry picked from commit 88c39e8b26d4418c370185467e2fee006c3cd811)
---
 src/app/item-page/media-viewer/media-viewer.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 242e50646e..5a17c4f01b 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, take } from 'rxjs/operators';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
@@ -42,6 +42,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
 
   constructor(
     protected bitstreamDataService: BitstreamDataService,
+    protected changeDetectorRef: ChangeDetectorRef
   ) {
   }
 
@@ -85,6 +86,7 @@ export class MediaViewerComponent implements OnDestroy, OnInit {
               }));
           }
           this.isLoading = false;
+          this.changeDetectorRef.detectChanges();
         }));
       }
     }));

From 3b568f7d32fc10fd003caf07a7af588817b24155 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 4 Dec 2023 11:37:14 -0800
Subject: [PATCH 0020/1286] Updated bitstream read description in en.json5

(cherry picked from commit 2592f87356d1caa4f7d396f8e7f9188393e5efb7)
---
 src/assets/i18n/en.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6dee5d54e6..c39106ff1b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1258,7 +1258,7 @@
 
   "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
 
-  "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": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
 
   "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
 

From 9f95eb452ccc6a30047d8acd2441d33e73786981 Mon Sep 17 00:00:00 2001
From: "max.nuding" <max.nuding@uni-konstanz.de>
Date: Wed, 6 Dec 2023 09:57:43 +0100
Subject: [PATCH 0021/1286] enable type-bind for checkbox inputs during
 submission

---
 .../models/list/dynamic-list-radio-group.model.ts             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
index 0a32498173..2bcf8b5f13 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model.ts
@@ -1,5 +1,6 @@
 import {
   DynamicFormControlLayout,
+  DynamicFormControlRelation,
   DynamicRadioGroupModel,
   DynamicRadioGroupModelConfig,
   serializable
@@ -15,12 +16,14 @@ export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any
   value?: VocabularyEntry[];
   required: boolean;
   hint?: string;
+  typeBindRelations?: DynamicFormControlRelation[];
 }
 
 export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
 
   @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() repeatable: boolean;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
   @serializable() groupLength: number;
   @serializable() required: boolean;
   @serializable() hint: string;
@@ -35,6 +38,7 @@ export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
     this.required = config.required;
     this.hint = config.hint;
     this.value = config.value;
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
   }
 
   get hasAuthority(): boolean {

From c8ac260b783d6bd9426325f7e2893e4b4f8d6f0d Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Fri, 1 Dec 2023 16:19:12 +0100
Subject: [PATCH 0022/1286] also skip loading hal requests

---
 src/app/core/shared/hal-endpoint.service.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index 98ab6a16ea..5cdd7ccfad 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -6,7 +6,6 @@ import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 import { Injectable } from '@angular/core';
 import { EndpointMap } from '../cache/response.models';
-import { getFirstCompletedRemoteData } from './operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { CacheableObject } from '../cache/cacheable-object.model';
@@ -37,8 +36,8 @@ export class HALEndpointService {
       // This skip ensures that if a stale object is present in the cache when you do a
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created.
-      skipWhile((rd: RemoteData<CacheableObject>) => rd.isStale),
-      getFirstCompletedRemoteData(),
+      skipWhile((rd: RemoteData<CacheableObject>) => rd.isLoading || rd.isStale),
+      take(1),
       map((response: RemoteData<CacheableObject>) => {
         if (hasValue(response.payload)) {
           return response.payload._links;

From 790e7171992f2cefc6999306703e52586204986b Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Wed, 6 Dec 2023 11:14:41 +0100
Subject: [PATCH 0023/1286] add ResponsePendingStale state

---
 .../core/data/base/base-data.service.spec.ts  |  98 ++++----
 src/app/core/data/base/base-data.service.ts   |   4 +-
 .../data/request-entry-state.model.spec.ts    | 186 ++++++++++++++
 .../core/data/request-entry-state.model.ts    |  25 +-
 src/app/core/data/request.reducer.spec.ts     | 230 +++++++++++++++---
 src/app/core/data/request.reducer.ts          |  55 +++--
 src/app/core/data/request.service.ts          |   2 +-
 .../core/shared/hal-endpoint.service.spec.ts  | 176 ++++++++++++--
 src/app/core/shared/hal-endpoint.service.ts   |  25 +-
 9 files changed, 660 insertions(+), 141 deletions(-)
 create mode 100644 src/app/core/data/request-entry-state.model.spec.ts

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 098f075c10..75662a691f 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -95,6 +95,7 @@ describe('BaseDataService', () => {
     remoteDataMocks = {
       RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
       ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
       Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
       SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
       Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
@@ -303,19 +304,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, true, true, ...linksToFollow)).toBe(expected, values);
@@ -354,19 +357,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
@@ -487,19 +492,21 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -538,21 +545,24 @@ describe('BaseDataService', () => {
 
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.SuccessStale,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
+            a: remoteDataMocks.ResponsePendingStale,
+            b: remoteDataMocks.SuccessStale,
+            c: remoteDataMocks.ErrorStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           }));
-          const expected = '--b-c-d-e';
+          const expected = '------d-e-f-g';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            d: remoteDataMocks.RequestPending,
+            e: remoteDataMocks.ResponsePending,
+            f: remoteDataMocks.Success,
+            g: remoteDataMocks.SuccessStale,
           };
 
+
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index edd6d9e2a4..c7cd5b0a70 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -273,7 +273,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -307,7 +307,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
diff --git a/src/app/core/data/request-entry-state.model.spec.ts b/src/app/core/data/request-entry-state.model.spec.ts
new file mode 100644
index 0000000000..7daa655566
--- /dev/null
+++ b/src/app/core/data/request-entry-state.model.spec.ts
@@ -0,0 +1,186 @@
+import {
+  isRequestPending,
+  isError,
+  isSuccess,
+  isErrorStale,
+  isSuccessStale,
+  isResponsePending,
+  isResponsePendingStale,
+  isLoading,
+  isStale,
+  hasFailed,
+  hasSucceeded,
+  hasCompleted,
+  RequestEntryState
+} from './request-entry-state.model';
+
+describe(`isRequestPending`, () => {
+  it(`should only return true if the given state is RequestPending`, () => {
+    expect(isRequestPending(RequestEntryState.RequestPending)).toBeTrue();
+
+    expect(isRequestPending(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Error)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.Success)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isRequestPending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isError`, () => {
+  it(`should only return true if the given state is Error`, () => {
+    expect(isError(RequestEntryState.Error)).toBeTrue();
+
+    expect(isError(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isError(RequestEntryState.Success)).toBeFalse();
+    expect(isError(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isError(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isError(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccess`, () => {
+  it(`should only return true if the given state is Success`, () => {
+    expect(isSuccess(RequestEntryState.Success)).toBeTrue();
+
+    expect(isSuccess(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccess(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isSuccess(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isErrorStale`, () => {
+  it(`should only return true if the given state is ErrorStale`, () => {
+    expect(isErrorStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isErrorStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Error)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.Success)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isErrorStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isSuccessStale`, () => {
+  it(`should only return true if the given state is SuccessStale`, () => {
+    expect(isSuccessStale(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(isSuccessStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Error)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.Success)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isSuccessStale(RequestEntryState.ErrorStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePending`, () => {
+  it(`should only return true if the given state is ResponsePending`, () => {
+    expect(isResponsePending(RequestEntryState.ResponsePending)).toBeTrue();
+
+    expect(isResponsePending(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ResponsePendingStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePending(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isResponsePendingStale`, () => {
+  it(`should only return true if the given state is requestPending`, () => {
+    expect(isResponsePendingStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isResponsePendingStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Error)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.Success)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isResponsePendingStale(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`isLoading`, () => {
+  it(`should only return true if the given state is RequestPending, ResponsePending or ResponsePendingStale`, () => {
+    expect(isLoading(RequestEntryState.RequestPending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePending)).toBeTrue();
+    expect(isLoading(RequestEntryState.ResponsePendingStale)).toBeTrue();
+
+    expect(isLoading(RequestEntryState.Error)).toBeFalse();
+    expect(isLoading(RequestEntryState.Success)).toBeFalse();
+    expect(isLoading(RequestEntryState.ErrorStale)).toBeFalse();
+    expect(isLoading(RequestEntryState.SuccessStale)).toBeFalse();
+  });
+});
+
+describe(`hasFailed`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasFailed(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasFailed(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasFailed(RequestEntryState.Error)).toBeTrue();
+      expect(hasFailed(RequestEntryState.ErrorStale)).toBeTrue();
+
+      expect(hasFailed(RequestEntryState.Success)).toBeFalse();
+      expect(hasFailed(RequestEntryState.SuccessStale)).toBeFalse();
+    });
+  });
+});
+
+describe(`hasSucceeded`, () => {
+  describe(`when the state is loading`, () => {
+    it(`should return undefined`, () => {
+      expect(hasSucceeded(RequestEntryState.RequestPending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePending)).toBeUndefined();
+      expect(hasSucceeded(RequestEntryState.ResponsePendingStale)).toBeUndefined();
+    });
+  });
+
+  describe(`when the state has completed`, () => {
+    it(`should only return true if the given state is Error or ErrorStale`, () => {
+      expect(hasSucceeded(RequestEntryState.Success)).toBeTrue();
+      expect(hasSucceeded(RequestEntryState.SuccessStale)).toBeTrue();
+
+      expect(hasSucceeded(RequestEntryState.Error)).toBeFalse();
+      expect(hasSucceeded(RequestEntryState.ErrorStale)).toBeFalse();
+    });
+  });
+});
+
+
+describe(`hasCompleted`, () => {
+  it(`should only return true if the given state is Error, Success, ErrorStale or SuccessStale`, () => {
+    expect(hasCompleted(RequestEntryState.Error)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.Success)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.ErrorStale)).toBeTrue();
+    expect(hasCompleted(RequestEntryState.SuccessStale)).toBeTrue();
+
+    expect(hasCompleted(RequestEntryState.RequestPending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(hasCompleted(RequestEntryState.ResponsePendingStale)).toBeFalse();
+  });
+});
+
+describe(`isStale`, () => {
+  it(`should only return true if the given state is ResponsePendingStale, SuccessStale or ErrorStale`, () => {
+    expect(isStale(RequestEntryState.ResponsePendingStale)).toBeTrue();
+    expect(isStale(RequestEntryState.SuccessStale)).toBeTrue();
+    expect(isStale(RequestEntryState.ErrorStale)).toBeTrue();
+
+    expect(isStale(RequestEntryState.RequestPending)).toBeFalse();
+    expect(isStale(RequestEntryState.ResponsePending)).toBeFalse();
+    expect(isStale(RequestEntryState.Error)).toBeFalse();
+    expect(isStale(RequestEntryState.Success)).toBeFalse();
+  });
+});
diff --git a/src/app/core/data/request-entry-state.model.ts b/src/app/core/data/request-entry-state.model.ts
index a813b6e743..3aeace39d2 100644
--- a/src/app/core/data/request-entry-state.model.ts
+++ b/src/app/core/data/request-entry-state.model.ts
@@ -3,8 +3,9 @@ export enum RequestEntryState {
   ResponsePending = 'ResponsePending',
   Error = 'Error',
   Success = 'Success',
+  ResponsePendingStale = 'ResponsePendingStale',
   ErrorStale = 'ErrorStale',
-  SuccessStale = 'SuccessStale'
+  SuccessStale = 'SuccessStale',
 }
 
 /**
@@ -42,12 +43,21 @@ export const isSuccessStale = (state: RequestEntryState) =>
  */
 export const isResponsePending = (state: RequestEntryState) =>
   state === RequestEntryState.ResponsePending;
+
 /**
- * Returns true if the given state is RequestPending or ResponsePending,
- * false otherwise
+ * Returns true if the given state is ResponsePendingStale, false otherwise
+ */
+export const isResponsePendingStale = (state: RequestEntryState) =>
+  state === RequestEntryState.ResponsePendingStale;
+
+/**
+ * Returns true if the given state is RequestPending, RequestPendingStale, ResponsePending, or
+ * ResponsePendingStale, false otherwise
  */
 export const isLoading = (state: RequestEntryState) =>
-  isRequestPending(state) || isResponsePending(state);
+  isRequestPending(state) ||
+  isResponsePending(state) ||
+  isResponsePendingStale(state);
 
 /**
  * If isLoading is true for the given state, this method returns undefined, we can't know yet.
@@ -82,7 +92,10 @@ export const hasCompleted = (state: RequestEntryState) =>
   !isLoading(state);
 
 /**
- * Returns true if the given state is SuccessStale or ErrorStale, false otherwise
+ * Returns true if the given state is isRequestPendingStale, isResponsePendingStale, SuccessStale or
+ * ErrorStale, false otherwise
  */
 export const isStale = (state: RequestEntryState) =>
-  isSuccessStale(state) || isErrorStale(state);
+  isResponsePendingStale(state) ||
+  isSuccessStale(state) ||
+  isErrorStale(state);
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 05f074a96a..86b9c4cd5d 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -48,9 +48,16 @@ describe('requestReducer', () => {
       lastUpdated: 0
     }
   };
+  const testResponsePendingState = {
+    [id1]: {
+      state: RequestEntryState.ResponsePending,
+      lastUpdated: 0
+    }
+  };
   deepFreeze(testInitState);
   deepFreeze(testSuccessState);
   deepFreeze(testErrorState);
+  deepFreeze(testResponsePendingState);
 
   it('should return the current state when no valid actions have been made', () => {
     const action = new NullAction();
@@ -91,29 +98,94 @@ describe('requestReducer', () => {
     expect(newState[id1].response).toEqual(undefined);
   });
 
-  it('should set state to Success for the given RestRequest in the state, in response to a SUCCESS action', () => {
-    const state = testInitState;
+  describe(`in response to a SUCCESS action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Success for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestSuccessAction(id1, 200);
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Success);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
+
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to SuccessStale for the given RestRequest in the state', () => {
+        const action = new RequestSuccessAction(id1, 200);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].response.statusCode).toEqual(200);
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Success);
-    expect(newState[id1].response.statusCode).toEqual(200);
   });
 
-  it('should set state to Error for the given RestRequest in the state, in response to an ERROR action', () => {
-    const state = testInitState;
+  describe(`in response to an ERROR action`, () => {
+    let startState;
+    describe(`when the entry isn't stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePending
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to Error for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
 
-    const action = new RequestErrorAction(id1, 404, 'Not Found');
-    const newState = requestReducer(state, action);
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.Error);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+    });
 
-    expect(newState[id1].request.uuid).toEqual(id1);
-    expect(newState[id1].request.href).toEqual(link1);
-    expect(newState[id1].state).toEqual(RequestEntryState.Error);
-    expect(newState[id1].response.statusCode).toEqual(404);
-    expect(newState[id1].response.errorMessage).toEqual('Not Found');
+    describe(`when the entry is stale`, () => {
+      beforeEach(() => {
+        startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(startState);
+      });
+      it('should set state to ErrorStale for the given RestRequest in the state', () => {
+        const action = new RequestErrorAction(id1, 404, 'Not Found');
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].request.uuid).toEqual(id1);
+        expect(newState[id1].request.href).toEqual(link1);
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].response.statusCode).toEqual(404);
+        expect(newState[id1].response.errorMessage).toEqual('Not Found');
+      });
+
+    });
   });
 
   it('should update the response\'s timeCompleted for the given RestRequest in the state, in response to a RESET_TIMESTAMPS action', () => {
@@ -145,28 +217,112 @@ describe('requestReducer', () => {
     expect(newState[id1]).toBeNull();
   });
 
-  describe(`for an entry with state: Success`, () => {
-    it(`should set the state to SuccessStale, in response to a STALE action`, () => {
-      const state = testSuccessState;
+  describe(`in response to a STALE action`, () => {
+    describe(`when the entry has been removed`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = {
+          [id1]: null
+        };
+        deepFreeze(startState);
 
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
 
-      expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+        expect(newState[id1]).toBeNull();
+      });
+    });
+
+    describe(`for stale entries`, () => {
+      it(`shouldn't do anything`, () => {
+        const rpsStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ResponsePendingStale
+          })
+        });
+        deepFreeze(rpsStartState);
+
+        const action = new RequestStaleAction(id1);
+        let newState = requestReducer(rpsStartState, action);
+
+        expect(newState[id1].state).toEqual(rpsStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(rpsStartState[id1].lastUpdated);
+
+        const ssStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.SuccessStale
+          })
+        });
+
+        newState = requestReducer(ssStartState, action);
+
+        expect(newState[id1].state).toEqual(ssStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(ssStartState[id1].lastUpdated);
+
+        const esStartState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.ErrorStale
+          })
+        });
+
+        newState = requestReducer(esStartState, action);
+
+        expect(newState[id1].state).toEqual(esStartState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(esStartState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for and entry with state: RequestPending`, () => {
+      it(`shouldn't do anything`, () => {
+        const startState = Object.assign({}, testInitState, {
+          [id1]: Object.assign({}, testInitState[id1], {
+            state: RequestEntryState.RequestPending
+          })
+        });
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(startState, action);
+
+        expect(newState[id1].state).toEqual(startState[id1].state);
+        expect(newState[id1].lastUpdated).toBe(startState[id1].lastUpdated);
+
+      });
+    });
+
+    describe(`for an entry with state: ResponsePending`, () => {
+      it(`should set the state to ResponsePendingStale`, () => {
+        const state = testResponsePendingState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ResponsePendingStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Success`, () => {
+      it(`should set the state to SuccessStale`, () => {
+        const state = testSuccessState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.SuccessStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
+    });
+
+    describe(`for an entry with state: Error`, () => {
+      it(`should set the state to ErrorStale`, () => {
+        const state = testErrorState;
+
+        const action = new RequestStaleAction(id1);
+        const newState = requestReducer(state, action);
+
+        expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
+        expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
+      });
     });
   });
-
-  describe(`for an entry with state: Error`, () => {
-    it(`should set the state to ErrorStale, in response to a STALE action`, () => {
-      const state = testErrorState;
-
-      const action = new RequestStaleAction(id1);
-      const newState = requestReducer(state, action);
-
-      expect(newState[id1].state).toEqual(RequestEntryState.ErrorStale);
-      expect(newState[id1].lastUpdated).toBe(action.lastUpdated);
-    });
-  });
-
 });
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index 9bf17faf8d..9cf4fee0e2 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -11,7 +11,13 @@ import {
   ResetResponseTimestampsAction
 } from './request.actions';
 import { isNull } from '../../shared/empty.util';
-import { hasSucceeded, isStale, RequestEntryState } from './request-entry-state.model';
+import {
+  hasSucceeded,
+  isStale,
+  RequestEntryState,
+  isRequestPending,
+  isResponsePending
+} from './request-entry-state.model';
 import { RequestState } from './request-state.model';
 
 // Object.create(null) ensures the object has no default js properties (e.g. `__proto__`)
@@ -91,14 +97,17 @@ function executeRequest(storeState: RequestState, action: RequestExecuteAction):
  *    the new storeState, with the response added to the request
  */
 function completeSuccessRequest(storeState: RequestState, action: RequestSuccessAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Success,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.Success,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
@@ -124,14 +133,17 @@ function completeSuccessRequest(storeState: RequestState, action: RequestSuccess
  *    the new storeState, with the response added to the request
  */
 function completeFailedRequest(storeState: RequestState, action: RequestErrorAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry)) {
     // after a request has been removed it's possible pending changes still come in.
     // Don't store them
     return storeState;
   } else {
     return Object.assign({}, storeState, {
-      [action.payload.uuid]: Object.assign({}, storeState[action.payload.uuid], {
-        state: RequestEntryState.Error,
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        // If a response comes in for a request that's already stale, still store it otherwise
+        // components that are waiting for it might freeze
+        state: isStale(prevEntry.state) ? RequestEntryState.ErrorStale : RequestEntryState.Error,
         response: {
           timeCompleted: action.payload.timeCompleted,
           lastUpdated: action.payload.timeCompleted,
@@ -155,22 +167,27 @@ function completeFailedRequest(storeState: RequestState, action: RequestErrorAct
  *    the new storeState, set to stale
  */
 function expireRequest(storeState: RequestState, action: RequestStaleAction): RequestState {
-  if (isNull(storeState[action.payload.uuid])) {
-    // after a request has been removed it's possible pending changes still come in.
-    // Don't store them
+  const prevEntry = storeState[action.payload.uuid];
+  if (isNull(prevEntry) || isStale(prevEntry.state) || isRequestPending(prevEntry.state)) {
+    // No need to do anything if the entry doesn't exist, is already stale, or if the request is
+    // still pending, because that means it still needs to be sent to the server. Any response
+    // is guaranteed to have been generated after the request was set to stale.
     return storeState;
   } else {
-    const prevEntry = storeState[action.payload.uuid];
-    if (isStale(prevEntry.state)) {
-      return storeState;
+    let nextRequestEntryState: RequestEntryState;
+    if (isResponsePending(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.ResponsePendingStale;
+    } else if (hasSucceeded(prevEntry.state)) {
+      nextRequestEntryState = RequestEntryState.SuccessStale;
     } else {
-      return Object.assign({}, storeState, {
-        [action.payload.uuid]: Object.assign({}, prevEntry, {
-          state: hasSucceeded(prevEntry.state) ? RequestEntryState.SuccessStale : RequestEntryState.ErrorStale,
-          lastUpdated: action.lastUpdated
-        })
-      });
+      nextRequestEntryState = RequestEntryState.ErrorStale;
     }
+    return Object.assign({}, storeState, {
+      [action.payload.uuid]: Object.assign({}, prevEntry, {
+        state: nextRequestEntryState,
+        lastUpdated: action.lastUpdated
+      })
+    });
   }
 }
 
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 27176390d7..c908c696db 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -164,7 +164,7 @@ export class RequestService {
     this.getByHref(request.href).pipe(
       take(1))
       .subscribe((re: RequestEntry) => {
-        isPending = (hasValue(re) && isLoading(re.state));
+        isPending = (hasValue(re) && isLoading(re.state) && !isStale(re.state));
       });
     return isPending;
   }
diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index 56e890b318..b81d0806df 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -1,4 +1,3 @@
-import { cold, hot } from 'jasmine-marbles';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from './hal-endpoint.service';
@@ -7,12 +6,17 @@ import { combineLatest as observableCombineLatest, of as observableOf } from 'rx
 import { environment } from '../../../environments/environment';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { TestScheduler } from 'rxjs/testing';
+import { RemoteData } from '../data/remote-data';
+import { RequestEntryState } from '../data/request-entry-state.model';
 
 describe('HALEndpointService', () => {
   let service: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
   let envConfig;
+  let testScheduler;
+  let remoteDataMocks;
   const endpointMap = {
     test: {
       href: 'https://rest.api/test'
@@ -68,7 +72,30 @@ describe('HALEndpointService', () => {
   };
   const linkPath = 'test';
 
+  const timeStamp = new Date().getTime();
+  const msToLive = 15 * 60 * 1000;
+  const payload = {
+    _links: endpointMaps[one]
+  };
+  const statusCodeSuccess = 200;
+  const statusCodeError = 404;
+  const errorMessage = 'not found';
+  remoteDataMocks = {
+    RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+    ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+    ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+    Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+    SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+    Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+    ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+  };
+
   beforeEach(() => {
+    testScheduler = new TestScheduler((actual, expected) => {
+      // asserting the two objects are equal
+      // e.g. using chai.
+      expect(actual).toEqual(expected);
+    });
     requestService = getMockRequestService();
     rdbService = jasmine.createSpyObj('rdbService', {
       buildFromHref: createSuccessfulRemoteDataObject$({
@@ -111,20 +138,28 @@ describe('HALEndpointService', () => {
     });
 
     it(`should return the endpoint URL for the service's linkPath`, () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: 'https://rest.api/test' }));
-      const result = service.getEndpoint(linkPath);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: 'https://rest.api/test' }));
+        const result = service.getEndpoint(linkPath);
 
-      const expected = cold('(b|)', { b: endpointMap.test.href });
-      expect(result).toBeObservable(expected);
+        const expected = '(b|)';
+        const values = {
+          b: endpointMap.test.href
+        };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return undefined for a linkPath that isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getEndpointAt').and
-        .returnValue(hot('a-', { a: undefined }));
-      const result = service.getEndpoint('unknown');
-      const expected = cold('(b|)', { b: undefined });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getEndpointAt').and
+          .returnValue(cold('a-', { a: undefined }));
+        const result = service.getEndpoint('unknown');
+        const expected = '(b|)';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
   });
 
@@ -183,29 +218,118 @@ describe('HALEndpointService', () => {
     });
 
     it('should return undefined as long as getRootEndpointMap hasn\'t fired', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('----'));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('----'));
 
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b---', { b: undefined });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b---';
+        const values = { b: undefined };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return true if the service\'s linkPath is in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
-      const result = service.isEnabledOnRestApi(linkPath);
-      const expected = cold('b-c-', { b: undefined, c: true });
-      expect(result).toBeObservable(expected);
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-', { a: endpointMap }));
+        const result = service.isEnabledOnRestApi(linkPath);
+        const expected = 'b-c-';
+        const values = { b: undefined, c: true };
+        expectObservable(result).toBe(expected, values);
+      });
     });
 
     it('should return false if the service\'s linkPath isn\'t in the endpoint map', () => {
-      spyOn(service as any, 'getRootEndpointMap').and
-        .returnValue(hot('--a-', { a: endpointMap }));
+      testScheduler.run(({ cold, expectObservable }) => {
+        spyOn(service as any, 'getRootEndpointMap').and
+          .returnValue(cold('--a-',  { a: endpointMap }));
 
-      const result = service.isEnabledOnRestApi('unknown');
-      const expected = cold('b-c-', { b: undefined, c: false });
-      expect(result).toBeObservable(expected);
+        const result = service.isEnabledOnRestApi('unknown');
+        const expected = 'b-c-';
+        const values = { b: undefined, c: false };
+        expectObservable(result).toBe(expected, values);
+      });
+    });
+
+  });
+
+  describe(`getEndpointMapAt`, () => {
+    const href = 'https://rest.api/some/sub/path';
+
+    it(`should call requestService.send with a new EndpointMapRequest for the given href. useCachedVersionIfAvailable should be true`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      const expected = new EndpointMapRequest(requestService.generateRequestId(), href);
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+
+    it(`should call rdbService.buildFromHref with the given href`, () => {
+      testScheduler.run(() => {
+        (service as any).getEndpointMapAt(href);
+      });
+      expect(rdbService.buildFromHref).toHaveBeenCalledWith(href);
+    });
+
+    describe(`when the RemoteData returned from rdbService is stale`, () => {
+      it(`should re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+          testScheduler.run(({ cold }) => {
+            (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePendingStale }));
+            // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+            (service as any).getEndpointMapAt(href).subscribe();
+          });
+          expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe(`when the RemoteData returned from rdbService isn't stale`, () => {
+      it(`should not re-request it`, () => {
+        spyOn(service as any, 'getEndpointMapAt').and.callThrough();
+          testScheduler.run(({ cold }) => {
+            (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', { a: remoteDataMocks.ResponsePending }));
+            // we need to subscribe to the result, to ensure the "tap" that does the re-request can fire
+            (service as any).getEndpointMapAt(href).subscribe();
+          });
+          expect((service as any).getEndpointMapAt).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it(`should emit exactly once, returning the endpoint map in the response, when the RemoteData completes`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a-b-c-d-e-f-g-h-i-j-k-l', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.ResponsePendingStale,
+          d: remoteDataMocks.SuccessStale,
+          e: remoteDataMocks.RequestPending,
+          f: remoteDataMocks.ResponsePending,
+          g: remoteDataMocks.Success,
+          h: remoteDataMocks.SuccessStale,
+          i: remoteDataMocks.RequestPending,
+          k: remoteDataMocks.ResponsePending,
+          l: remoteDataMocks.Error,
+        }));
+        const expected = '------------(g|)';
+        const values = {
+          g: endpointMaps[one]
+        };
+        expectObservable((service as any).getEndpointMapAt(one)).toBe(expected, values);
+      });
+    });
+
+    it(`should emit undefined when the response doesn't have a payload`, () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        (rdbService.buildFromHref as jasmine.Spy).and.returnValue(cold('a', {
+          a: remoteDataMocks.Error,
+        }));
+        const expected = '(a|)';
+        const values = {
+          g: undefined
+        };
+        expectObservable((service as any).getEndpointMapAt(href)).toBe(expected, values);
+      });
     });
 
   });
diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts
index 5cdd7ccfad..07754616c7 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -1,11 +1,19 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap, take, skipWhile } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap, filter
+} from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { EndpointMapRequest } from '../data/request.models';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 import { Injectable } from '@angular/core';
 import { EndpointMap } from '../cache/response.models';
+import { getFirstCompletedRemoteData } from './operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { CacheableObject } from '../cache/cacheable-object.model';
@@ -33,11 +41,16 @@ export class HALEndpointService {
     this.requestService.send(request, true);
 
     return this.rdbService.buildFromHref<CacheableObject>(href).pipe(
-      // This skip ensures that if a stale object is present in the cache when you do a
-      // call it isn't immediately returned, but we wait until the remote data for the new request
-      // is created.
-      skipWhile((rd: RemoteData<CacheableObject>) => rd.isLoading || rd.isStale),
-      take(1),
+      // Re-request stale responses
+      tap((rd: RemoteData<CacheableObject>) => {
+        if (hasValue(rd) && rd.isStale) {
+          this.getEndpointMapAt(href);
+        }
+      }),
+      // Filter out all stale responses. We're only interested in a single, non-stale,
+      // completed RemoteData
+      filter((rd: RemoteData<CacheableObject>) => !rd.isStale),
+      getFirstCompletedRemoteData(),
       map((response: RemoteData<CacheableObject>) => {
         if (hasValue(response.payload)) {
           return response.payload._links;

From d32303bf47413cc2a98faf25ab42410a73657938 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 25 Nov 2023 14:21:57 +0100
Subject: [PATCH 0024/1286] Added missing aria labels to edit bitstream tab

(cherry picked from commit e229be44d6450f9c50ed2d53f4b5d9cb7939fcd1)
---
 .../item-bitstreams/item-bitstreams.component.html         | 7 +++++++
 .../item-edit-bitstream-bundle.component.html              | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..bd4c9334ad 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,21 +1,25 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
   <div class="button-row top d-flex mt-2 space-children-mr">
     <button class="mr-auto btn btn-success"
+            [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
             [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
             class="fas fa-upload"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
     </button>
     <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+            [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
             (click)="reinstate()"><i
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
     <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+            [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
     </button>
     <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
+            [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
             [disabled]="!(hasChanges() | async) || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
@@ -49,16 +53,19 @@
   <div class="button-row bottom">
     <div class="mt-4 float-right space-children-mr ml-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+              [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
               (click)="reinstate()"><i
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
       <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+              [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
       </button>
       <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
+              [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
               [disabled]="!(hasChanges() | async) || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 62170235a3..42b9b9eb64 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -10,6 +10,7 @@
       <div class="btn-group bundle-action-buttons">
         <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                 [queryParams]="{bundle: bundle.id}"
+                [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
                 class="btn btn-outline-success btn-sm"
                 title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
           <i class="fas fa-upload fa-fw"></i>

From 69100f0a24f0f1914511310b38e6558d5b1113b0 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 26 Nov 2023 00:16:50 +0100
Subject: [PATCH 0025/1286] Replaced uncrawlable links with buttons

(cherry picked from commit 9ab30231aad9983cc2d961e639e4a12a22fe1633)
---
 .../admin-sidebar/admin-sidebar.component.html      | 13 ++++++-------
 .../admin-sidebar/admin-sidebar.component.spec.ts   |  2 +-
 src/app/footer/footer.component.html                |  7 ++++---
 src/app/footer/footer.component.scss                |  5 +++--
 .../expandable-navbar-section.component.html        |  6 +++---
 .../expandable-navbar-section.component.scss        |  9 +++++++++
 .../expandable-navbar-section.component.spec.ts     |  8 ++++----
 src/app/navbar/navbar.component.scss                |  4 ++--
 src/themes/dspace/app/navbar/navbar.component.html  |  2 +-
 src/themes/dspace/app/navbar/navbar.component.scss  |  4 ++--
 10 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index fe7e5595ab..ca69501382 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -34,22 +34,21 @@
     </div>
     <div class="navbar-nav">
         <div class="sidebar-section" id="sidebar-collapse-toggle">
-            <a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
-               href="javascript:void(0);"
+            <button class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap border-0" type="button"
                (click)="toggle($event)"
                (keyup.space)="toggle($event)"
             >
-              <div class="shortcut-icon">
+              <span class="shortcut-icon">
                 <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
                    [title]="'menu.section.icon.pin' | translate"></i>
                 <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
                    [title]="'menu.section.icon.unpin' | translate"></i>
-              </div>
-              <div class="sidebar-collapsible">
+              </span>
+              <span class="sidebar-collapsible text-left">
                 <span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
                 <span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
-              </div>
-            </a>
+              </span>
+            </button>
         </div>
     </div>
 </nav>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
index 88efd2a711..9522be29ce 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -143,7 +143,7 @@ describe('AdminSidebarComponent', () => {
   describe('when the collapse link is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle > a'));
+      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle > button'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 13d84e6e2e..d4c0cd1a37 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -62,10 +62,11 @@
         <a class="text-white"
            href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
-      <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
+      <ul class="footer-info list-unstyled d-flex justify-content-center mb-0">
         <li>
-            <a class="text-white" href="javascript:void(0);"
-             (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
+          <button class="btn btn-link text-white" type="button" (click)="showCookieSettings()">
+            {{ 'footer.link.cookies' | translate}}
+          </button>
         </li>
         <li *ngIf="showPrivacyPolicy">
           <a class="text-white"
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 350295b870..4dfdc3267b 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -26,9 +26,10 @@
         li {
           display: inline-flex;
 
-          a {
+          a, .btn-link {
             padding: 0 calc(var(--bs-spacer) / 2);
-            color: inherit
+            color: inherit;
+            font-size: .875em;
           }
 
           &:not(:last-child) {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 053968834e..44ca82b61d 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -5,13 +5,13 @@
     (keydown.space)="$event.preventDefault()"
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
-    <a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
+    <button class="btn btn-link nav-link dropdown-toggle" routerLinkActive="active" type="button"
        [class.disabled]="section.model?.disabled"
-       id="browseDropdown" (click)="toggleSection($event)"
+       (click)="toggleSection($event)"
        data-toggle="dropdown">
         <ng-container
                 *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-    </a>
+    </button>
     <ul @slide *ngIf="(active | async)" (click)="deactivateSection($event)"
         class="m-0 shadow-none border-top-0 dropdown-menu show">
         <li *ngFor="let subSection of (subSections$ | async)">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 28db981f11..ff48341b0f 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -5,6 +5,15 @@
   justify-content: center;
 }
 
+.btn.nav-link {
+  text-align: left;
+  border: none;
+
+  &:active, &:focus {
+    box-shadow: none !important;
+  }
+}
+
 .dropdown-menu {
     background-color: var(--ds-expandable-navbar-bg);
     overflow: hidden;
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 488c9ab251..f4c72e1237 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -152,7 +152,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when a click occurs on the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
         sidebarToggler.triggerEventHandler('click', {
           preventDefault: () => {/**/
           }
@@ -195,7 +195,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse enters the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
           }
@@ -210,7 +210,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse leaves the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
           }
@@ -225,7 +225,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when a click occurs on the section header link', () => {
       beforeEach(() => {
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
+        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
         sidebarToggler.triggerEventHandler('click', {
           preventDefault: () => {/**/
           }
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index dac8c0927f..d9a0901374 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -37,8 +37,8 @@ nav.navbar {
     }
 }
 
-.navbar-nav {
-  ::ng-deep a.nav-link {
+.navbar-nav ::ng-deep {
+  a.nav-link, .btn.nav-link {
     color: var(--ds-navbar-link-color);
 
     &:hover, &:focus {
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index f2e231d46c..9f7e977961 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -8,7 +8,7 @@
     <div id="collapsingNav" class="w-100 h-100">
       <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
         <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-            <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
+            <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
         </li>
         <li *ngFor="let section of (sections | async)">
           <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index 28ead2f1de..f1f17d9f76 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -54,8 +54,8 @@ a.navbar-brand img {
   max-height: var(--ds-header-logo-height);
 }
 
-.navbar-nav {
-  ::ng-deep a.nav-link {
+.navbar-nav ::ng-deep {
+  a.nav-link, .btn.nav-link {
     color: var(--ds-navbar-link-color);
 
     &:hover, &:focus {

From 9f468c2c11dc7429e2a011e1a78a4a37b6b5be60 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 26 Nov 2023 01:30:20 +0100
Subject: [PATCH 0026/1286] Added aria-labels & fixed aria-controls on myDSpace
 page

- Added aria-label to the new submission buttons (for repositories with more than 1 entity type)
- Fixed aria-controls pointing to non-existing ids

(cherry picked from commit 8a7bdfe18ffd2a9451f17d4f7280ba5a60336986)
---
 .../my-dspace-new-external-dropdown.component.html           | 5 +++--
 .../my-dspace-new-submission-dropdown.component.html         | 5 +++--
 .../search/search-sidebar/search-sidebar.component.html      | 5 +++--
 src/app/shared/search/search.component.html                  | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7db6db9a8d..392134dbce 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,5 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" [disabled]="!(initialized$|async)"
+    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="!(initialized$|async)"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +11,7 @@
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
             type="button" [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission-external' | translate}}"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 84d0649277..73fbeb30c2 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,5 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+            [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +9,7 @@
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
             type="button"  [disabled]="!(initialized$|async)"
-            attr.aria-label="{{'mydspace.new-submission' | translate}}"
+            [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index f489de5d28..529f1de887 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -2,9 +2,10 @@
     <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
         <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
         <button (click)="toggleSidebar.emit()"
-                aria-controls="#search-body"
+                [attr.aria-label]="'search.sidebar.close' | translate"
+                aria-controls="search-content"
                 class="btn btn-outline-primary float-right close-sidebar"><i
-                class="fas fa-arrow-right" [title]="'search.sidebar.close' | translate"></i> {{"search.sidebar.close" | translate}}
+                class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
         </button>
     </div>
     <div id="search-sidebar-content">
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index d43f506866..e7dd02e286 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -23,7 +23,8 @@
         <div id="search-content" class="col-12">
             <div class="d-block d-md-none search-controls clearfix">
                 <ds-view-mode-switch [viewModeList]="viewModeList" [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-                <button (click)="openSidebar()" aria-controls="#search-body"
+                <button [attr.aria-label]="'search.sidebar.open' | translate" (click)="openSidebar()"
+                        aria-controls="search-sidebar-content"
                         class="btn btn-outline-primary float-right open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"
                         | translate}}

From 1c4be7d1fe577bfa34eddce722fdb44703832627 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 26 Nov 2023 02:16:56 +0100
Subject: [PATCH 0027/1286] Fixed duplicate search-navbar-container id &
 renabled accessibility tests for header

(cherry picked from commit cc71d60ebb5c696422958fb00a041d9b40175834)
---
 cypress/e2e/header.cy.ts                      |  7 +------
 .../search-navbar.component.html              |  2 +-
 .../search-navbar.component.spec.ts           | 21 ++++++-------------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 1a9b841eb7..9852216e43 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -8,11 +8,6 @@ describe('Header', () => {
         cy.get('ds-header').should('be.visible');
 
         // Analyze <ds-header> for accessibility
-        testA11y({
-            include: ['ds-header'],
-            exclude: [
-                ['#search-navbar-container'] // search in navbar has duplicative ID. Will be fixed in #1174
-            ],
-        });
+        testA11y('ds-header');
     });
 });
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index 02a9890502..e9b5f285fb 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,4 +1,4 @@
-<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
+<div [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
   <div class="d-inline-block position-relative">
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
index b67f5f0eb4..7edae293e1 100644
--- a/src/app/search-navbar/search-navbar.component.spec.ts
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -8,7 +8,6 @@ import { SearchService } from '../core/shared/search/search.service';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 
 import { SearchNavbarComponent } from './search-navbar.component';
-import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserOnlyMockPipe } from '../shared/testing/browser-only-mock.pipe';
 
@@ -17,8 +16,6 @@ describe('SearchNavbarComponent', () => {
   let fixture: ComponentFixture<SearchNavbarComponent>;
   let mockSearchService: any;
   let router: Router;
-  let routerStub;
-  let paginationService;
 
   beforeEach(waitForAsync(() => {
     mockSearchService = {
@@ -27,12 +24,6 @@ describe('SearchNavbarComponent', () => {
       }
     };
 
-    routerStub = {
-      navigate: (commands) => commands
-    };
-
-    paginationService = new PaginationServiceStub();
-
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -72,7 +63,7 @@ describe('SearchNavbarComponent', () => {
       spyOn(component, 'expand').and.callThrough();
       spyOn(component, 'onSubmit').and.callThrough();
       spyOn(router, 'navigate');
-      const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+      const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
       searchIcon.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
@@ -88,7 +79,7 @@ describe('SearchNavbarComponent', () => {
     describe('empty query', () => {
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', {
             preventDefault: () => {/**/
             }
@@ -97,7 +88,7 @@ describe('SearchNavbarComponent', () => {
           fixture.detectChanges();
         }));
         it('to search page with empty query', () => {
-          const extras: NavigationExtras = {queryParams: { query: '' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: '' }, queryParamsHandling: 'merge' };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: '' });
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
         });
@@ -109,20 +100,20 @@ describe('SearchNavbarComponent', () => {
       beforeEach(async () => {
         await fixture.whenStable();
         fixture.detectChanges();
-        searchInput = fixture.debugElement.query(By.css('#search-navbar-container form input'));
+        searchInput = fixture.debugElement.query(By.css('form input'));
         searchInput.nativeElement.value = 'test';
         searchInput.nativeElement.dispatchEvent(new Event('input'));
         fixture.detectChanges();
       });
       describe('press submit button', () => {
         beforeEach(fakeAsync(() => {
-          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          const searchIcon = fixture.debugElement.query(By.css('form .submit-icon'));
           searchIcon.triggerEventHandler('click', null);
           tick();
           fixture.detectChanges();
         }));
         it('to search page with query', async () => {
-          const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge'};
+          const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge' };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' });
 
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);

From fc7aa27706a5797eb8e8709869d7fa1dce41eddf Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 26 Nov 2023 21:28:12 +0100
Subject: [PATCH 0028/1286] Fix Bulk Access Management usability issues

- Added aria-labels to trash & select bitstream icon
- Added aria-labels ui-switch components (had to upgrade ngx-ui-switch to 14.1.0)
- Fixed aria-controls pointing to non-existing ids
- Fixed bulk-access-browse not having the tab role on it's tabs
- Fixed role="tablist" not having direct role="tab" by adding role="presentation" on the li elements
- Fixed aria-expanded being set to true when collapsed and backwards for BulkAccessBrowseComponent & BulkAccessSettingsComponent

(cherry picked from commit c300123b785a75499d1362cecf2b6102660c4508)
---
 package.json                                  |   2 +-
 .../browse/bulk-access-browse.component.html  | 102 +++++++++---------
 .../bulk-access-settings.component.html       |  12 +--
 .../access-control-array-form.component.html  |   1 +
 ...cess-control-form-container.component.html |   8 +-
 src/assets/i18n/en.json5                      |  12 +++
 yarn.lock                                     |   8 +-
 7 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/package.json b/package.json
index 852e5e57f3..61a97e815c 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
-    "ngx-ui-switch": "^14.0.3",
+    "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index c716aedb8b..6e967b53b5 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -1,15 +1,15 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
            data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+                [attr.aria-expanded]="acc.isExpanded('browse')"
+                aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,51 +17,53 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
-        <li [ngbNavItem]="'search'">
-          <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
-          <ng-template ngbNavContent>
-            <div class="mx-n3">
-              <ds-themed-search [configuration]="'administrativeBulkAccess'"
-                                [selectable]="true"
-                                [selectionConfig]="{ repeatable: true, listId: listId }"
-                                [showThumbnails]="false"></ds-themed-search>
-            </div>
-          </ng-template>
-        </li>
-        <li [ngbNavItem]="'selected'">
-          <a ngbNavLink>
-            {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
-          </a>
-          <ng-template ngbNavContent>
-            <ds-pagination
-              [paginationOptions]="(paginationOptions$ | async)"
-              [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
-              [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
-              [objects]="(objectsSelected$|async)"
-              [showPaginator]="false"
-              (prev)="pagePrev()"
-              (next)="pageNext()">
-              <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
-                <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                            currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
-                    class="mt-4 mb-4 d-flex"
-                    [attr.data-test]="'list-object' | dsBrowserOnly">
-                  <ds-selectable-list-item-control [index]="i"
-                                                   [object]="object"
-                                                   [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
-                  <ds-listable-object-component-loader [listID]="listId"
-                                                       [index]="i"
-                                                       [object]="object"
-                                                       [showThumbnails]="false"
-                                                       [viewMode]="'list'"></ds-listable-object-component-loader>
-                </li>
-              </ul>
-            </ds-pagination>
-          </ng-template>
-        </li>
-      </ul>
-      <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      <div id="bulk-access-browse-panel-content">
+        <ul ngbNav #nav="ngbNav" [(activeId)]="activateId" class="nav-pills">
+          <li [ngbNavItem]="'search'" role="presentation">
+            <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div class="mx-n3">
+                <ds-themed-search [configuration]="'administrativeBulkAccess'"
+                                  [selectable]="true"
+                                  [selectionConfig]="{ repeatable: true, listId: listId }"
+                                  [showThumbnails]="false"></ds-themed-search>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'selected'" role="presentation">
+            <a ngbNavLink>
+              {{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
+            </a>
+            <ng-template ngbNavContent>
+              <ds-pagination
+                [paginationOptions]="(paginationOptions$ | async)"
+                [pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
+                [collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
+                [objects]="(objectsSelected$|async)"
+                [showPaginator]="false"
+                (prev)="pagePrev()"
+                (next)="pageNext()">
+                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
+                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
+                      class="mt-4 mb-4 d-flex"
+                      [attr.data-test]="'list-object' | dsBrowserOnly">
+                    <ds-selectable-list-item-control [index]="i"
+                                                     [object]="object"
+                                                     [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
+                    <ds-listable-object-component-loader [listID]="listId"
+                                                         [index]="i"
+                                                         [object]="object"
+                                                         [showThumbnails]="false"
+                                                         [viewMode]="'list'"></ds-listable-object-component-loader>
+                  </li>
+                </ul>
+              </ds-pagination>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-5"></div>
+      </div>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
index 01f36ef03f..c41053874e 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -1,13 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded('browse')"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
+                aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex">
-          <div class="ml-3 d-inline-block">
+        <div class="text-right d-flex gap-2">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -15,7 +15,7 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-access-control-form-container #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
+      <ds-access-control-form-container id="bulk-access-settings-panel-content" #dsAccessControlForm [showSubmit]="false"></ds-access-control-form-container>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index cd56904bd7..e6ebabd707 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -92,6 +92,7 @@
         <div class="input-group">
 
           <button type="button" class="btn btn-outline-danger"
+                  [attr.aria-label]="'access-control-remove' | translate"
                   [disabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index a5173d10d7..263bf60ac7 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -4,10 +4,11 @@
       <ds-alert
         *ngIf="titleMessage"
         [type]="AlertType.Info"
-        [content]="titleMessage">
+        [content]="titleMessage"
+        class="d-block pb-3">
       </ds-alert>
 
-      <div class="row mt-5">
+      <div class="row">
         <div class="col-12 col-md-6 border-right d-flex flex-column justify-content-between">
 
           <div>
@@ -16,6 +17,7 @@
                 {{ 'access-control-item-header-toggle' | translate }}
               </h4>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-item-toggle.disable' : 'access-control-item-toggle.enable') | translate"
                 [(ngModel)]="state.item.toggleStatus"
                 (ngModelChange)="handleStatusChange('item', $event)">
               </ui-switch>
@@ -69,6 +71,7 @@
                 {{'access-control-bitstream-header-toggle' | translate}}
               </h4>
               <ui-switch
+                [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-bitstream-toggle.disable' : 'access-control-bitstream-toggle.enable') | translate"
                 [(ngModel)]="state.bitstream.toggleStatus"
                 (ngModelChange)="handleStatusChange('bitstream', $event)">
               </ui-switch>
@@ -99,6 +102,7 @@
 
                   <button
                     *ngIf="itemRD"
+                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
                     [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c39106ff1b..d4b9e97696 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5190,8 +5190,16 @@
 
   "access-control-item-header-toggle": "Item's Metadata",
 
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
   "access-control-bitstream-header-toggle": "Bitstreams",
 
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
   "access-control-mode": "Mode",
 
   "access-control-access-conditions": "Access conditions",
@@ -5208,12 +5216,16 @@
 
   "access-control-bitstreams-selected": "bitstreams selected",
 
+  "access-control-bitstreams-select": "Select bitstreams",
+
   "access-control-cancel": "Cancel",
 
   "access-control-execute": "Execute",
 
   "access-control-add-more": "Add more",
 
+  "access-control-remove": "Remove access condition",
+
   "access-control-select-bitstreams-modal.title": "Select bitstreams",
 
   "access-control-select-bitstreams-modal.no-items": "No items to show.",
diff --git a/yarn.lock b/yarn.lock
index 27307aefa2..6e04ab27b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8369,10 +8369,10 @@ ngx-sortablejs@^11.1.0:
   dependencies:
     tslib "^2.0.0"
 
-ngx-ui-switch@^14.0.3:
-  version "14.0.3"
-  resolved "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.0.3.tgz"
-  integrity sha512-SZ8ZnTCuNJgNWuY3/mOG3TdsRUNPCX3vGdCKKx1ZHVMTUynerJQlTWck2JrYlnrexNnd7wy4P10jDvdtDwoYeg==
+ngx-ui-switch@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"
+  integrity sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==
   dependencies:
     tslib "^2.3.0"
 

From 96b3423ed12e003453cd430c78d43ec1f7a5685b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 26 Nov 2023 23:53:44 +0100
Subject: [PATCH 0029/1286] Fix Health Panel usability issues

- Fixed aria-controls on HealthComponentComponent, HealthInfoComponent, HealthInfoComponentComponent, HealthPanelComponent pointing to non-existing id
- Fixed the tabs not having the role tab on its tabs
- Fixed aria-expanded being set to true when collapsed and backwards for HealthPanelComponent & HealthInfoComponent
- Fixed role="tablist" not having direct role="tab" by adding role="presentation" on the li elements
- Fixed minor alignment issues

(cherry picked from commit 3628c84844aeccafa0bc91a44c6710596ba6a3f7)
---
 .../health-info-component.component.html      |  8 +++----
 .../health-info/health-info.component.html    | 15 ++++++-------
 .../health-page/health-page.component.html    |  6 +++---
 src/app/health-page/health-page.component.ts  |  3 +++
 .../health-component.component.html           |  8 +++----
 .../health-panel/health-panel.component.html  | 21 +++++++++++--------
 .../health-status.component.html              |  6 +++---
 .../health-status.component.scss              |  3 +++
 8 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index dbaaa7a6b6..84cba4d92f 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,16 +1,16 @@
 <div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
   <div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-info-component [healthInfoComponent]="entry.value"
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index 4bafcaa2d8..b590695b0b 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -2,14 +2,14 @@
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
     <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
       <ng-template ngbPanelHeader>
-        <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
-          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                  aria-controls="collapsePanels">
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                  [attr.aria-controls]="'health-info-' + entry.key + '-content'">
             {{ getPanelLabel(entry.key) | titlecase }}
           </button>
-          <div class="text-right d-flex">
+          <div class="text-right d-flex gap-2">
             <ds-health-status [status]="entry.value?.status"></ds-health-status>
-            <div class="ml-3 d-inline-block">
+            <div class="d-flex my-auto">
               <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
               <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
             </div>
@@ -17,8 +17,9 @@
         </div>
       </ng-template>
       <ng-template ngbPanelContent>
-        <ds-health-info-component [healthInfoComponentName]="entry.key"
-                                  [healthInfoComponent]="entry.value"></ds-health-info-component>
+        <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
+                                  [id]="'health-info-' + entry.key + '-content'">
+        </ds-health-info-component>
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 8083389e1b..15a8787894 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -2,7 +2,7 @@
   <h2>{{'health-page.heading' | translate}}</h2>
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
-      <li [ngbNavItem]="'status'">
+      <li [ngbNavItem]="'status'" role="presentation">
         <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
@@ -10,7 +10,7 @@
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'info'">
+      <li [ngbNavItem]="'info'" role="presentation">
         <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
@@ -21,7 +21,7 @@
     </ul>
     <div [ngbNavOutlet]="nav" class="mt-2"></div>
   </div>
-  <ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="'alert-danger'" [content]="'health-page.error.msg'"></ds-alert>
+  <ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
 </div>
 
 
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index aa7bd7cba4..5c3c7ed70e 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -5,6 +5,7 @@ import { take } from 'rxjs/operators';
 
 import { HealthService } from './health.service';
 import { HealthInfoResponse, HealthResponse } from './models/health-component.model';
+import { AlertType } from '../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-health-page',
@@ -33,6 +34,8 @@ export class HealthPageComponent implements OnInit {
    */
   healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  readonly AlertType = AlertType;
+
   constructor(private healthDataService: HealthService) {
   }
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index 1f29c8c9fc..f962e66052 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,16 +1,16 @@
 <ng-container *ngIf="healthComponent?.components">
   <div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
       <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              aria-controls="collapseExample">
+              [attr.aria-controls]="'health-component-' + entry.key + 'content'">
         {{ entry.key | titlecase }}
       </button>
-      <div class="d-inline-block">
+      <div class="d-flex my-auto">
         <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
         <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
       </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+    <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
       <div class="card border-0">
         <div class="card-body">
           <ds-health-component [healthComponent]="entry.value"
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index 2d67fa537b..ec2a27ce40 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -1,15 +1,18 @@
-<p class="h4">{{'health-page.status' | translate}} : <ds-health-status [status]="healthResponse.status"></ds-health-status></p>
+<p class="h4">
+  {{'health-page.status' | translate}}:
+  <ds-health-status [status]="healthResponse.status" class="d-inline-flex"></ds-health-status>
+</p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
   <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
     <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
-                aria-controls="collapsePanels">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+                [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
           {{ getPanelLabel(entry.key) | titlecase }}
         </button>
-        <div class="text-right d-flex">
+        <div class="text-right d-flex gap-2">
           <ds-health-status [status]="entry.value?.status"></ds-health-status>
-          <div class="ml-3 d-inline-block">
+          <div class="d-flex my-auto">
             <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
             <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
           </div>
@@ -17,9 +20,9 @@
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
-      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"></ds-health-component>
+      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
+                           [id]="'health-panel-' + entry.key + '-content'" role="presentation">
+      </ds-health-component>
     </ng-template>
   </ngb-panel>
 </ngb-accordion>
-
-
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index 38a6f72601..e8710a0760 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,12 @@
 <ng-container [ngSwitch]="status">
   <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success ml-2 mt-1"
+     class="fa fa-check-circle text-success my-auto"
      ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
   <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning ml-2 mt-1"
+     class="fa fa-exclamation-triangle text-warning my-auto"
      ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
   <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger ml-2 mt-1"
+     class="fa fa-times-circle text-danger my-auto"
      ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
 </ng-container>
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.scss b/src/app/health-page/health-panel/health-status/health-status.component.scss
index e69de29bb2..79ff2d5269 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.scss
+++ b/src/app/health-page/health-panel/health-status/health-status.component.scss
@@ -0,0 +1,3 @@
+:host {
+  display: flex;
+}

From 57ebe88994ff69055e9fed426b5d02dec8c14680 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 Nov 2023 23:03:05 +0100
Subject: [PATCH 0030/1286] Fix System-wide Alert accessibility issues

- Added missing aria-label to buttons

(cherry picked from commit 3bdfc386e9d40321794c118dae55fd672bb06f76)
---
 .../alert-form/system-wide-alert-form.component.html        | 6 ++++--
 src/assets/i18n/en.json5                                    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 169081e277..d1de00bea6 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -30,6 +30,7 @@
     <div class="row">
         <div class="col mb-2 d-flex align-items-end">
             <ui-switch size="small"
+                       [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
                        [checked]="counterEnabled$ |async"
                        (change)="setCounterEnabled($event)"></ui-switch>
             <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
@@ -49,8 +50,9 @@
                             #d="ngbDatepicker"
                             (ngModelChange)="updatePreviewTime()"
                     />
-                    <button class="btn btn-outline-secondary fas fa-calendar" (click)="d.toggle()"
-                            type="button"></button>
+                    <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
+                            (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+                    </button>
                 </div>
             </div>
             <div class="col-12 d-md-none">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d4b9e97696..1c4bce9ad5 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5168,6 +5168,8 @@
 
   "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
 
+  "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+
   "system-wide-alert.form.label.preview": "System-wide alert preview",
 
   "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",

From bc1ed9a96fa49afc5999bbe7e66c4b44fbfe267a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 Nov 2023 23:18:56 +0100
Subject: [PATCH 0031/1286] Fix Processes Overview accessibility issues

- Added missing aria-label to delete button

(cherry picked from commit 4ea487cc0d9df74bee2ca286f5b4f1745bb31a1f)
---
 .../process-page/overview/process-overview.component.html | 8 +++++---
 src/assets/i18n/en.json5                                  | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 5bf5fee79f..dcad265490 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -44,9 +44,11 @@
                     <td>{{process.endTime | date:dateFormat:'UTC'}}</td>
                     <td>{{process.processStatus}}</td>
                     <td>
-                        <button class="btn btn-outline-danger"
-                                (click)="processBulkDeleteService.toggleDelete(process.processId)"><i
-                                class="fas fa-trash"></i></button>
+                        <button [attr.aria-label]="'process.overview.delete-process' | translate"
+                                (click)="processBulkDeleteService.toggleDelete(process.processId)"
+                                class="btn btn-outline-danger">
+                          <i class="fas fa-trash"></i>
+                        </button>
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 1c4bce9ad5..05383e75d2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3242,6 +3242,8 @@
 
   "process.overview.delete": "Delete {{count}} processes",
 
+  "process.overview.delete-process": "Delete process",
+
   "process.overview.delete.clear": "Clear delete selection",
 
   "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",

From 9ed13f31ff0397b017fb16e4d1cb95bc7a9e173e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Nov 2023 00:20:35 +0100
Subject: [PATCH 0032/1286] Fix Create a new process page accessibility issues

- Added missing aria-label to delete buttons
- Moved hardcoded translation to translation files
- Fix color contrast issues on buttons
- Fix minor alignment issues
- Added missing aria labels to input and select elements

(cherry picked from commit 52c0977489063689dba99caf004e4120a85e9fc9)
---
 .../process-page/form/process-form.component.html    |  6 +++---
 .../parameter-select/parameter-select.component.html | 12 ++++++++----
 .../parameter-select.component.spec.ts               |  7 +++++--
 .../boolean-value-input.component.html               |  2 +-
 .../boolean-value-input.component.spec.ts            |  5 ++++-
 .../date-value-input/date-value-input.component.html |  4 ++--
 .../date-value-input/date-value-input.component.scss |  5 +++++
 .../file-value-input/file-value-input.component.html |  2 +-
 .../string-value-input.component.html                |  4 ++--
 .../string-value-input.component.scss                |  5 +++++
 src/assets/i18n/en.json5                             |  8 ++++++++
 11 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index ce6d62efec..c55592f3e7 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -3,12 +3,12 @@
         <h2 class="col-12">
             {{headerKey | translate}}
         </h2>
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-6 mb-2">
             <form #form="ngForm" (ngSubmit)="submitForm(form)">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
                 <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <button [routerLink]="['/processes']" class="btn btn-light float-left">{{ 'process.new.cancel' | translate }}</button>
-                <button type="submit" class="btn btn-light float-right">{{ 'process.new.submit' | translate }}</button>
+                <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
+                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
             </form>
         </div>
         <div class="col-12 col-md-6">
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 4bf06bbade..1f1559b50b 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,16 +1,20 @@
-<div class="form-row mb-2 mx-0">
+<div class="form-row gap-2 mb-2 mx-0">
     <select id="process-parameters"
             class="form-control col"
             name="parameter-{{index}}"
+            [attr.aria-label]="'process.new.select-parameter' | translate"
             [(ngModel)]="selectedParameter"
             #param="ngModel">
-        <option [ngValue]="undefined">Add a parameter...</option>
+        <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
         <option *ngFor="let param of parameters" [ngValue]="param.name">
             {{param.nameLong || param.name}}
         </option>
     </select>
-    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col" [index]="index"></ds-parameter-value-input>
-    <button *ngIf="removable" class="btn btn-light col-1 remove-button" (click)="removeParameter.emit(parameterValue);"><span class="fas fa-trash"></span></button>
+    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
+    <button *ngIf="removable" [attr.aria-label]="'process.new.delete-parameter' | translate"
+            (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
+      <i class="fas fa-trash"></i>
+    </button>
     <span *ngIf="!removable" class="col-1"></span>
 </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
index 56fece56b4..818a292e33 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
@@ -1,5 +1,5 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { ParameterSelectComponent } from './parameter-select.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -33,7 +33,10 @@ describe('ParameterSelectComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [ParameterSelectComponent],
       schemas: [NO_ERRORS_SCHEMA]
     })
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
index 914b331413..68171a23b2 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
@@ -1 +1 @@
-<input type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
index 38f119ad5b..76b01b8709 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { BooleanValueInputComponent } from './boolean-value-input.component';
 
 describe('BooleanValueInputComponent', () => {
@@ -8,6 +8,9 @@ describe('BooleanValueInputComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [BooleanValueInputComponent]
     })
       .compileComponents();
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
index f367d3779f..4e77f4ed1b 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index cac3fbd82d..a741eacc86 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,5 +1,5 @@
 <label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
-    <span class="btn btn-light">
+    <span class="btn btn-primary">
         {{'process.new.parameter.file.upload-button' | translate}}
     </span>
     <span class="file-name ml-1">{{fileObject?.name}}</span>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
index 246c62a0f6..bf60f9f024 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -1,6 +1,6 @@
-<input required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
 <div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error">
+     class="alert alert-danger validation-error mb-0">
     <div *ngIf="string.errors.required">
         {{'process.new.parameter.string.required' | translate}}
     </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
index e69de29bb2..8c6325f95a 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--bs-spacer) / 2);
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 05383e75d2..5a1f5afe29 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3136,6 +3136,14 @@
 
   "process.new.select-parameters": "Parameters",
 
+  "process.new.select-parameter": "Select parameter",
+
+  "process.new.add-parameter": "Add a parameter...",
+
+  "process.new.delete-parameter": "Delete parameter",
+
+  "process.new.parameter.label": "Parameter value",
+
   "process.new.cancel": "Cancel",
 
   "process.new.submit": "Save",

From 5e52233cf37ca7b20bdbe3cc70e1a93c078399bc Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Nov 2023 00:36:16 +0100
Subject: [PATCH 0033/1286] Fix Process detail accessibility issues

- Made Process Output keyboard accessible

(cherry picked from commit 120835cfcde75162e26ba7c52574327513e725d3)
---
 .../process-detail-field/process-detail-field.component.spec.ts | 2 +-
 src/app/process-page/detail/process-detail.component.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
index 57b596b8b6..ba0c946bfd 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
@@ -32,7 +32,7 @@ describe('ProcessDetailFieldComponent', () => {
   });
 
   it('should display the given title', () => {
-    const header = fixture.debugElement.query(By.css('h4')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
     expect(header.textContent).toContain(title);
   });
 });
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 5f905cbfff..c52ef3827d 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -53,7 +53,7 @@
         </button>
         <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
                            message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
-        <pre class="font-weight-bold text-secondary bg-light p-3"
+        <pre class="font-weight-bold text-secondary bg-light p-3" tabindex="0"
              *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
         <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
       && !(outputLogs$ | async) || (outputLogs$ | async)?.length == 0 || !process._links.output">

From 5d5582e2d2ea0b3ecb41c20ce872a5d2d029c342 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Nov 2023 01:03:17 +0100
Subject: [PATCH 0034/1286] Fix Bitstream format accessibility issues

- Added missing aria-labels to input checkboxes
- Fixed minor css alignment

(cherry picked from commit 57cc34cdd1ee23c36f87d4ef7a621482ee16a049)
---
 .../add-bitstream-format/add-bitstream-format.component.html | 4 ++--
 .../bitstream-formats/bitstream-formats.component.html       | 5 +++--
 .../edit-bitstream-format.component.html                     | 4 ++--
 src/assets/i18n/en.json5                                     | 2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
index 2b65b369b2..24c97051c5 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
@@ -2,10 +2,10 @@
     <div class="row">
         <div class="col-12 mb-4">
             <h2 id="sub-header"
-                class="border-bottom mb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
+                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
 
             <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 0a2e9f0f92..45d8ed5d11 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -2,7 +2,7 @@
   <div class="bitstream-formats row">
     <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
+      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
@@ -19,7 +19,7 @@
           <table id="formats" class="table table-striped table-hover">
             <thead>
             <tr>
-              <th scope="col"></th>
+              <th scope="col" [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"></th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
@@ -31,6 +31,7 @@
               <td>
                 <label class="mb-0">
                   <input type="checkbox"
+                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
                          [checked]="isSelected(bitstreamFormat) | async"
                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                   >
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
index f57ec9cd38..43bfbd0de0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
@@ -2,10 +2,10 @@
     <div class="row">
         <div class="col-12 mb-4">
             <h2 id="sub-header"
-                class="border-bottom mb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
+                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
 
              <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5a1f5afe29..a63c468b53 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -142,6 +142,8 @@
 
   "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
 
+  "admin.registries.bitstream-formats.select": "Select bitstream format",
+
   "admin.registries.metadata.breadcrumbs": "Metadata registry",
 
   "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.",

From b94f0a9b69eddd0de6edacd3df4183b3036954a1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 05:15:04 +0100
Subject: [PATCH 0035/1286] Fix resource policy accessibility issues

(cherry picked from commit 09bf8af03cbb9fccba459bc9bcb8a7b70716f3c5)
---
 .../entry/resource-policy-entry.component.html            | 4 +++-
 .../resource-policies/resource-policies.component.html    | 6 ++++--
 src/assets/i18n/en.json5                                  | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index 5a9494fe00..a14dde366e 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -5,7 +5,9 @@
            [id]="entry.id"
            [ngModel]="entry.checked"
            (ngModelChange)="this.toggleCheckbox.emit($event);">
-    <label class="custom-control-label" [for]="entry.id"></label>
+    <label class="custom-control-label" [for]="entry.id"
+           [attr.aria-label]="(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate">
+    </label>
   </div>
 </td>
 <th scope="row">
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 277f6e4998..b3dda9091d 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -38,11 +38,13 @@
       <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
         <th>
           <div class="custom-control custom-checkbox">
-            <input type="checkbox"
+            <input #selectAllBtn type="checkbox"
                    class="custom-control-input"
                    [id]="'selectAll_' + resourceUUID"
                    (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"></label>
+            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"
+                   [attr.aria-label]="(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate">
+            </label>
           </div>
         </th>
         <th>{{'resource-policies.table.headers.id' | translate}}</th>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a63c468b53..99af486d8c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3610,6 +3610,14 @@
 
   "resource-policies.table.headers.group": "Group",
 
+  "resource-policies.table.headers.select-all": "Select all",
+
+  "resource-policies.table.headers.deselect-all": "Deselect all",
+
+  "resource-policies.table.headers.select": "Select",
+
+  "resource-policies.table.headers.deselect": "Deselect",
+
   "resource-policies.table.headers.id": "ID",
 
   "resource-policies.table.headers.name": "Name",

From 73cffe990a2a6f7dc8a5420be1ee1cce714dc675 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 15:15:52 +0100
Subject: [PATCH 0036/1286] Fix item mapper accessibility issues

- Added missing aria-labels to input checkboxes
- Fixed role="tablist" not having direct role="tab" by adding role="presentation" on the li elements

(cherry picked from commit 5b21d14583f8b1ca22f889ee4c24fc7e54579fa7)
---
 .../collection-item-mapper.component.html                     | 4 ++--
 .../object-select/item-select/item-select.component.html      | 4 ++--
 src/assets/i18n/en.json5                                      | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index a48c4d15bf..649aa9b43d 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'collection.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -23,7 +23,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 7f8ff943a3..8cdc8ffb2d 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -11,7 +11,7 @@
       <table id="item-select" class="table table-striped table-hover">
         <thead>
         <tr>
-          <th></th>
+          <th aria-hidden="true"></th>
           <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
           <th scope="col">{{'item.select.table.author' | translate}}</th>
           <th scope="col">{{'item.select.table.title' | translate}}</th>
@@ -19,7 +19,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let item of itemsRD?.payload?.page">
-          <td><input [disabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(item.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 99af486d8c..ab3aa368fb 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2508,6 +2508,10 @@
 
   "item.select.empty": "No items to show",
 
+  "item.select.table.select": "Select item",
+
+  "item.select.table.deselect": "Deselect item",
+
   "item.select.table.author": "Author",
 
   "item.select.table.collection": "Collection",

From 79ce4e9ec247d5cacb2a481ff06a165fa7bb1388 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 15:42:13 +0100
Subject: [PATCH 0037/1286] Fix collection mapper accessibility issues

- Added missing aria-labels to input checkboxes
- Fixed multiple tab related accessibility issues

(cherry picked from commit 1db83ba3c5529fdf8dadddf8431b2dac029cfa0e)
---
 .../item-page/edit-item-page/edit-item-page.component.html  | 6 ++++--
 .../item-collection-mapper.component.html                   | 4 ++--
 .../collection-select/collection-select.component.html      | 4 ++--
 src/assets/i18n/en.json5                                    | 4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index c370fe4f20..4aa4c9af16 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -4,11 +4,13 @@
             <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
             <div class="pt-2">
                 <ul class="nav nav-tabs justify-content-start" role="tablist">
-                    <li *ngFor="let page of pages" class="nav-item" [attr.aria-selected]="page.page === currentPage" role="tab">
+                    <li *ngFor="let page of pages" class="nav-item" role="presentation">
                         <a *ngIf="(page.enabled | async)"
+                           [attr.aria-selected]="page.page === currentPage"
                            class="nav-link"
                            [ngClass]="{'active' : page.page === currentPage}"
-                           [routerLink]="['./' + page.page]">
+                           [routerLink]="['./' + page.page]"
+                           role="tab">
                             {{'item.edit.tabs.' + page.page + '.head' | translate}}
                         </a>
                         <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index c522b8a9c5..1d025f6514 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'item.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'">
+        <li [ngbNavItem]="'browseTab'" role="presentation">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -22,7 +22,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'">
+        <li [ngbNavItem]="'mapTab'" role="presentation">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9b87f69c04..7d4dadb2e3 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -11,13 +11,13 @@
       <table id="collection-select" class="table table-striped table-hover">
         <thead>
           <tr>
-            <th></th>
+            <th aria-hidden="true"></th>
             <th scope="col">{{'collection.select.table.title' | translate}}</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let collection of collectionsRD?.payload?.page">
-            <td><input class="collection-checkbox" [ngModel]="getSelected(collection.id) | async" (change)="switch(collection.id)" type="checkbox" name="{{collection.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" class="collection-checkbox" [ngModel]="getSelected(collection.id) | async" (change)="switch(collection.id)" type="checkbox" name="{{collection.id}}"></td>
             <td><a [routerLink]="['/collections', collection.id]">{{ dsoNameService.getName(collection) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ab3aa368fb..081d211507 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1092,6 +1092,10 @@
 
   "collection.select.empty": "No collections to show",
 
+  "collection.select.table.select": "Select collection",
+
+  "collection.select.table.deselect": "Deselect collection",
+
   "collection.select.table.title": "Title",
 
   "collection.source.controls.head": "Harvest Controls",

From 77f52df047615d10ab462ff718b650a15347a591 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 16:37:08 +0100
Subject: [PATCH 0038/1286] Fixed item page accessibility issues

(cherry picked from commit 8ba17c991e76199fe03aed872ac9974309a7702f)
---
 .../bitstream-download-page.component.html             |  2 +-
 .../dso-edit-metadata-value.component.html             |  2 ++
 .../bitstreams/upload/upload-bitstream.component.html  |  2 +-
 .../file-section/full-file-section.component.html      |  4 ++--
 .../tabbed-related-entities-search.component.html      |  2 +-
 .../item-page/versions/item-versions.component.html    |  7 ++++---
 .../file-download-link.component.html                  |  2 +-
 .../file-download-link.component.spec.ts               |  4 ++++
 .../dynamic-lookup-relation-modal.component.html       |  6 +++---
 .../form/resource-policy-form.component.html           |  4 ++--
 src/assets/i18n/en.json5                               | 10 ++++++++++
 11 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
index af3afe98f8..1467ffb0cc 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h3>{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h3>
+  <h1 class="h2">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
   <div class="pt-3">
     <button (click)="back()" class="btn btn-outline-secondary">
       <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}
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 525b42610b..2701ee24ab 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
@@ -4,6 +4,7 @@
   <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"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [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>
@@ -13,6 +14,7 @@
   <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"
+           [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
            [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell" role="cell">
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index 1732da1235..530471135c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="bundles">
     <div class="row">
       <div class="col-12 mb-2">
-        <h2>{{'item.bitstreams.upload.title' | translate}}</h2>
+        <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
           <div *ngIf="item">
             <span class="font-weight-bold">{{'item.bitstreams.upload.item' | translate}}</span>
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8b8603011d..7774754079 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,7 +1,7 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <div *ngVar="(originals$ | async)?.payload as originals">
         <div *ngIf="hasValuesInBundle(originals)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
             <ds-pagination *ngIf="originals?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
@@ -44,7 +44,7 @@
     </div>
     <div *ngVar="(licenses$ | async)?.payload as licenses">
         <div *ngIf="hasValuesInBundle(licenses)">
-            <h5 class="simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h5>
+            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
             <ds-pagination *ngIf="licenses?.page?.length > 0"
                            [hideGear]="true"
                            [hidePagerWhenSinglePage]="true"
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 223d4a6ed0..1b6cc273df 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="relationTypes.length > 1">
   <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter">
+    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" rel="presentation">
       <a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
       <ng-template ngbNavContent>
         <div class="mt-4">
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..0722878f2e 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,7 +1,7 @@
 <div *ngVar="(versionsRD$ | async)?.payload as versions">
   <div *ngVar="(versionRD$ | async)?.payload as itemVersion">
     <div class="mb-2" *ngIf="versions?.page?.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
+      <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}</h2>
       <ds-alert [type]="AlertTypeEnum.Info" *ngIf="itemVersion">
         {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
       </ds-alert>
@@ -98,8 +98,9 @@
                 <ng-container *ngIf="isThisBeingEdited(version); then editSummary else showSummary"></ng-container>
                 <ng-template #showSummary>{{version?.summary}}</ng-template>
                 <ng-template #editSummary>
-                  <input class="form-control" type="text" [(ngModel)]="versionBeingEditedSummary"
-                         (keyup.enter)="onSummarySubmit()"/>
+                  <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                         [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                         class="form-control" type="text"/>
                 </ng-template>
               </div>
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 8ebe622a5b..7a5729cc2d 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,5 +1,5 @@
 <a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
-  <span *ngIf="!(canDownload$ |async)" class="pr-1"><i class="fas fa-lock"></i></span>
+  <span *ngIf="!(canDownload$ |async)" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts
index 61e9ecb4aa..21e1cdae19 100644
--- a/src/app/shared/file-download-link/file-download-link.component.spec.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts
@@ -10,6 +10,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
 import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('FileDownloadLinkComponent', () => {
   let component: FileDownloadLinkComponent;
@@ -41,6 +42,9 @@ describe('FileDownloadLinkComponent', () => {
 
   function initTestbed() {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub],
       providers: [
         {provide: AuthorizationDataService, useValue: authorizationService},
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index f7f0715206..6d249a9b1e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -9,7 +9,7 @@
     <ds-themed-loading *ngIf="!item || !collection"></ds-themed-loading>
     <ng-container *ngIf="item && collection">
         <ul ngbNav #nav="ngbNav" class="nav-tabs">
-            <li ngbNavItem>
+            <li ngbNavItem role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-search-tab
@@ -31,7 +31,7 @@
                     </ds-themed-dynamic-lookup-relation-search-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index">
+            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)[idx] } }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-external-source-tab
@@ -49,7 +49,7 @@
                     </ds-themed-dynamic-lookup-relation-external-source-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngIf="!isEditRelationship">
+            <li ngbNavItem *ngIf="!isEditRelationship" role="presentation">
                 <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
                 <ng-template ngbNavContent>
                     <ds-dynamic-lookup-relation-selection-tab
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 66c1fc400e..283ff4d753 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -9,13 +9,13 @@
     <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
     <input id="ResourcePolicyObject" class="form-control mb-3" type="text" [value]="resourcePolicyTargetName$ | async">
     <ul ngbNav #nav="ngbNav" class="nav-pills" [(activeId)]="navActiveId" (navChange)="onNavChange($event)">
-      <li [ngbNavItem]="'eperson'">
+      <li [ngbNavItem]="'eperson'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.eperson' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list (select)="updateObjectSelected($event, true)"></ds-eperson-group-list>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'group'">
+      <li [ngbNavItem]="'group'" role="presentation">
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.group' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list [isListOfEPerson]="false"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 081d211507..02126ae785 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1622,6 +1622,8 @@
 
   "feed.description": "Syndication feed",
 
+  "file-download-link.restricted": "Restricted bitstream",
+
   "file-section.error.header": "Error obtaining files for this item",
 
   "footer.copyright": "copyright © 2002-{{ year }}",
@@ -2096,6 +2098,10 @@
 
   "item.edit.metadata.discard-button": "Discard",
 
+  "item.edit.metadata.edit.language": "Edit language",
+
+  "item.edit.metadata.edit.value": "Edit value",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2616,6 +2622,10 @@
 
   "itemtemplate.edit.metadata.discard-button": "Discard",
 
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
+
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",

From 3300f72621b59d60b119d35138f3029665d47a0b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 17:42:19 +0100
Subject: [PATCH 0039/1286] Fixed browse by vocabulary treeview accessibility
 issues

(cherry picked from commit 30fe424cc5e079759398ac4ec8706acde476b2aa)
---
 .../vocabulary-treeview.component.html        | 22 +++++++++----------
 .../vocabulary-treeview.component.scss        |  4 ----
 .../vocabulary-treeview.component.ts          |  3 +++
 src/assets/i18n/en.json5                      |  2 ++
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index db3dc31948..432098b463 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,8 +1,9 @@
-<ds-alert [content]="'vocabulary-treeview.info' | translate" [type]="'alert-info'"></ds-alert>
-<div class="treeview-header row">
+<ds-alert [content]="'vocabulary-treeview.info' | translate" [type]="AlertType.Info"></ds-alert>
+<div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
+      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+             [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
         <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
@@ -19,15 +20,15 @@
 </div>
 <div class="treeview-container">
   <ds-themed-loading *ngIf="loading | async" [showMessage]="false"></ds-themed-loading>
-  <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-center text-muted mt-4" >
+  <h2 *ngIf="!(loading | async) && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
     <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h4>
+  </h2>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-          <span class="fas fa-fw fa-angle-right invisible" aria-hidden="true"></span>
-        </button>
+      <span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
+        <i class="fas fa-fw fa-angle-right invisible"></i>
+      </span>
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
                  [class.text-success]="node.isSelected"
                  [ngbTooltip]="node.item?.otherInformation?.note"
@@ -55,11 +56,10 @@
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default" cdkTreeNodeToggle
+        <button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
                 [attr.aria-label]="'toggle ' + node.name"
                 (click)="loadChildren(node)">
-          <span class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
-                aria-hidden="true"></span>
+          <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
         </button>
 
           <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
index 3f0cea10d2..3d32acac5b 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -2,10 +2,6 @@
   text-align:left;
 }
 
-cdk-tree .btn:focus {
-  box-shadow: none !important;
-}
-
 label {
   cursor: pointer;
 }
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 d5a5dee1f5..b1edda461e 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -17,6 +17,7 @@ import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source
 import { CoreState } from '../../../core/core-state.model';
 import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { AlertType } from '../../alert/alert-type';
 
 /**
  * Component that shows a hierarchical vocabulary in a tree view
@@ -105,6 +106,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
    */
   private subs: Subscription[] = [];
 
+  readonly AlertType = AlertType;
+
   /**
    * Initialize instance variables
    *
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 02126ae785..d6722ad8fe 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4790,6 +4790,8 @@
 
   "vocabulary-treeview.search.form.search": "Search",
 
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+
   "vocabulary-treeview.search.no-result": "There were no items to show",
 
   "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",

From 7ec57988b8dcb46e14ced7cd6edd84019472add4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 17:43:16 +0100
Subject: [PATCH 0040/1286] Fixed accessibility issues about header ordering

(cherry picked from commit 5566c99625d86af3222cfd3f58614bbcc3c8b23b)
---
 .../epeople-registry.component.html           |  8 ++++----
 .../eperson-form/eperson-form.component.html  |  6 +++---
 .../group-form/group-form.component.html      | 11 +++++-----
 .../members-list/members-list.component.html  |  8 ++++----
 .../groups-registry.component.html            |  4 ++--
 .../admin-curation-tasks.component.html       |  2 +-
 .../metadata-import-page.component.html       |  2 +-
 .../add-bitstream-format.component.html       |  4 ++--
 .../bitstream-formats.component.html          |  2 +-
 .../edit-bitstream-format.component.html      |  4 ++--
 .../edit-bitstream-page.component.html        |  2 +-
 .../browse-by-taxonomy-page.component.html    |  1 +
 .../delete-collection-page.component.html     |  2 +-
 .../collection-curate.component.html          |  2 +-
 .../collection-source.component.html          |  2 +-
 .../edit-item-template-page.component.html    |  2 +-
 .../delete-community-page.component.html      |  2 +-
 .../community-curate.component.html           |  2 +-
 .../feedback-form.component.html              |  2 +-
 ...tstream-request-a-copy-page.component.html |  2 +-
 .../edit-item-page.component.html             |  2 +-
 .../item-curate/item-curate.component.html    |  2 +-
 .../item-delete/item-delete.component.html    |  2 +-
 .../item-delete/item-delete.component.spec.ts |  2 +-
 .../item-move/item-move.component.html        |  2 +-
 .../item-private.component.spec.ts            |  2 +-
 .../item-public/item-public.component.spec.ts |  2 +-
 .../item-reinstate.component.spec.ts          |  2 +-
 .../edit-relationship-list.component.html     |  4 ++--
 .../item-withdraw.component.spec.ts           |  2 +-
 ...abstract-simple-item-action.component.html |  2 +-
 ...tract-simple-item-action.component.spec.ts |  2 +-
 .../orcid-auth/orcid-auth.component.html      |  2 +-
 .../orcid-page/orcid-page.component.html      | 20 +++++++++----------
 .../process-detail-field.component.html       |  2 +-
 .../detail/process-detail.component.html      |  4 ++--
 .../form/process-form.component.html          |  6 +++---
 .../script-help/script-help.component.html    |  2 +-
 .../overview/process-overview.component.html  |  2 +-
 .../profile-page/profile-page.component.html  |  6 +++---
 .../register-email-form.component.html        |  2 +-
 ...cess-control-form-container.component.html | 12 +++++------
 .../shared/browse-by/browse-by.component.html |  2 +-
 .../comcol-role/comcol-role.component.html    |  4 ++--
 .../edit-comcol-page.component.html           |  4 ++--
 .../comcol-page-handle.component.html         |  8 ++++----
 .../comcol-page-handle.component.scss         |  5 -----
 .../edit/resource-policy-edit.component.html  |  2 +-
 ...search-switch-configuration.component.html |  2 +-
 .../statistics-page.component.html            |  4 ++--
 .../statistics-table.component.html           |  4 ++--
 .../submission-import-external.component.html | 10 +++++-----
 .../submission-import-external.component.ts   |  3 +++
 .../subscriptions-page.component.html         |  4 ++--
 .../subscriptions-page.component.ts           |  3 +++
 .../system-wide-alert-form.component.html     |  2 +-
 src/assets/i18n/en.json5                      |  2 ++
 src/styles/_bootstrap_variables.scss          |  8 ++++++++
 58 files changed, 116 insertions(+), 105 deletions(-)

diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index 4979f85819..bf7b9a2060 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -2,7 +2,7 @@
   <div class="epeople-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
         <div>
           <button class="mr-auto btn btn-success addEPerson-button"
@@ -13,9 +13,9 @@
         </div>
       </div>
 
-      <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-
-      </h3>
+      <h2 id="search" class="border-bottom pb-2">
+        {{labelPrefix + 'search.head' | translate}}
+      </h2>
       <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/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 6a7b8b931f..747d30bb89 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -5,11 +5,11 @@
       <div *ngIf="epersonService.getActiveEPerson() | async; then editHeader; else createHeader"></div>
 
       <ng-template #createHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h2>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
       </ng-template>
 
       <ng-template #editHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h2>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
       </ng-template>
 
       <ds-form [formId]="formId"
@@ -45,7 +45,7 @@
       <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
 
       <div *ngIf="epersonService.getActiveEPerson() | async">
-        <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
+        <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
 
         <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
 
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 f31de0db1b..491762a437 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
@@ -5,11 +5,11 @@
       <div *ngIf="groupDataService.getActiveGroup() | async; then editHeader; else createHeader"></div>
 
       <ng-template #createHeader>
-        <h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
       </ng-template>
 
       <ng-template #editHeader>
-        <h2 class="border-bottom pb-2">
+        <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
               content: 'admin.access-control.groups.form.tooltip.editGroupPage',
@@ -20,7 +20,7 @@
           >
             {{messagePrefix + '.head.edit' | translate}}
           </span>
-        </h2>
+        </h1>
       </ng-template>
 
       <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
@@ -39,9 +39,8 @@
           <button (click)="onCancel()" type="button"
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
-        <div after *ngIf="(canEdit$ | async) && !groupBeingEdited.permanent" class="btn-group">
-          <button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
-                  (click)="delete()" type="button">
+        <div after *ngIf="(canEdit$ | async) && !groupBeingEdited?.permanent" class="btn-group">
+          <button (click)="delete()" class="btn btn-danger delete-button" type="button">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
           </button>
         </div>
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 c0c77f44eb..7f01e1b720 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,7 +1,7 @@
 <ng-container>
-  <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
+  <h2 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h2>
 
-  <h4>{{messagePrefix + '.headMembers' | translate}}</h4>
+  <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
   <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
                  [paginationOptions]="config"
@@ -55,7 +55,7 @@
     {{messagePrefix + '.no-members-yet' | translate}}
   </div>
 
-  <h4 id="search" class="border-bottom pb-2">
+  <h3 id="search" class="border-bottom pb-2">
     <span
       *dsContextHelp="{
         content: 'admin.access-control.groups.form.tooltip.editGroup.addEpeople',
@@ -66,7 +66,7 @@
     >
       {{messagePrefix + '.search.head' | translate}}
     </span>
-  </h4>
+  </h3>
 
   <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/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 27cec262c4..bd39cbe94f 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -2,7 +2,7 @@
   <div class="groups-registry row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom mb-3">
-        <h2 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h2>
+        <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
           <button class="mr-auto btn btn-success"
                   [routerLink]="'create'">
@@ -12,7 +12,7 @@
         </div>
       </div>
 
-      <h3 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h3>
+      <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div class="flex-grow-1 mr-3">
           <div class="form-group input-group">
diff --git a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
index a702a7e6b0..ba3a6f45d7 100644
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.html
@@ -1,4 +1,4 @@
 <div class="container">
-    <h2>{{'admin.curation-tasks.header' |translate }}</h2>
+    <h1>{{'admin.curation-tasks.header' |translate }}</h1>
     <ds-curation-form></ds-curation-form>
 </div>
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 24901cc11d..73e69737ca 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.metadata-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
   <div class="form-group">
     <div class="form-check">
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
index 24c97051c5..d1be68633f 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{ 'admin.registries.bitstream-formats.create.new' | translate }}</h1>
 
             <ds-bitstream-format-form (updatedFormat)="createBitstreamFormat($event)"></ds-bitstream-format-form>
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 45d8ed5d11..37323d41d0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -2,7 +2,7 @@
   <div class="bitstream-formats row">
     <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats.head' | translate}}</h1>
 
       <p id="description">{{'admin.registries.bitstream-formats.description' | translate}}</p>
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
index 43bfbd0de0..efcced2a87 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="row">
         <div class="col-12 mb-4">
-            <h2 id="sub-header"
-                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h2>
+            <h1 id="sub-header"
+                class="border-bottom pb-2">{{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}</h1>
 
              <ds-bitstream-format-form [bitstreamFormat]="(bitstreamFormatRD$ | async)?.payload" (updatedFormat)="updateFormat($event)"></ds-bitstream-format-form>
 
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index 11aa3bfe75..b306eb2721 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -8,7 +8,7 @@
         <div class="container">
           <div class="row">
             <div class="col-12">
-              <h3>{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h3>
+              <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
             </div>
           </div>
         </div>
diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
index 0ae3da6847..c24ca93403 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
+++ b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+  <h1>{{ ('browse.taxonomy_' + vocabularyName + '.title') | translate }}</h1>
   <div class="mb-3">
     <ds-vocabulary-treeview [vocabularyOptions]=vocabularyOptions
                             [multiSelect]="true"
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ba54bbabd5..d878d22589 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -2,7 +2,7 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
index 38c9d22f4e..4fbe60d6b1 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h3>
+    <h2>{{'collection.curate.header' |translate:{collection: (collectionName$ |async)} }}</h2>
     <ds-curation-form
             [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index d7b0d0c475..41e66610a8 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -18,7 +18,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
         </button>
     </div>
-    <h4>{{ 'collection.edit.tabs.source.head' | translate }}</h4>
+    <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
     <div *ngIf="contentSource" class="form-check mb-4">
         <input type="checkbox" class="form-check-input" id="externalSourceCheck"
                [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
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 20afd701ff..8d095dd229 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
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
-        <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h2>
+        <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <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>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 6bb8460bc9..ef5fdade73 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -2,7 +2,7 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h2>
+                <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
index 6c041d1725..5e11fdfbce 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h3>
+    <h2>{{'community.curate.header' |translate:{community: (communityName$ |async)} }}</h2>
     <ds-curation-form
            [dsoHandle]="(dsoRD$|async)?.payload.handle"
     ></ds-curation-form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index a3bab3a6a3..25be4ba445 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -1,7 +1,7 @@
 <div class="row row-offcanvas row-offcanvas-right">
   <div class="col-xs-12 col-sm-12 col-md-9">
     <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
-      <h2>{{ 'info.feedback.head' | translate }}</h2>
+      <h1>{{ 'info.feedback.head' | translate }}</h1>
       <p>{{ 'info.feedback.info' | translate }}</p>
       <fieldset class="col p-0">
         <div class="row">
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 1fae737fdb..2d4ac89fcc 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h3 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h3>
+    <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
     <div *ngIf="canDownload$|async" class="alert alert-success">
         <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
         <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index 4aa4c9af16..1da10106f4 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
+            <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
             <div class="pt-2">
                 <ul class="nav nav-tabs justify-content-start" role="tablist">
                     <li *ngFor="let page of pages" class="nav-item" role="presentation">
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 7c7ed41bd9..22b10b28b6 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,5 +1,5 @@
 <div class="container mt-3">
-    <h3>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h3>
+    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
     <ds-curation-form
       *ngIf="dsoRD$ | async as dsoRD"
       [dsoHandle]="dsoRD?.payload.handle"
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 7b1953d892..5191e705d0 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -2,7 +2,7 @@
     <div class="row">
         <div class="col-12">
 
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
index 2a9f7fae52..d406293828 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.spec.ts
@@ -171,7 +171,7 @@ describe('ItemDeleteComponent', () => {
   });
 
   it('should render a page with messages based on the \'delete\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.delete.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.delete.description');
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index c1a4a5b9a9..d136f003f4 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h2>
+            <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
             <p>{{'item.edit.move.description' | translate}}</p>
             <div class="row">
                 <div class="col-12">
diff --git a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
index 323255e3d7..24a4aacc99 100644
--- a/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-private/item-private.component.spec.ts
@@ -80,7 +80,7 @@ describe('ItemPrivateComponent', () => {
   });
 
   it('should render a page with messages based on the \'private\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.private.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.private.description');
diff --git a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
index 1f741fcc59..0174e6a6b0 100644
--- a/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-public/item-public.component.spec.ts
@@ -74,7 +74,7 @@ describe('ItemPublicComponent', () => {
   });
 
   it('should render a page with messages based on the \'public\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.public.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.public.description');
diff --git a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
index 594e7b806a..4e2b00e4e6 100644
--- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
@@ -76,7 +76,7 @@ describe('ItemReinstateComponent', () => {
   });
 
   it('should render a page with messages based on the \'reinstate\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.reinstate.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.reinstate.description');
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 7cdc903f24..d5f7901b3f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,10 +1,10 @@
-<h5>
+<h2 class="h4">
     {{getRelationshipMessageKey() | async | translate}}
     <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
-</h5>
+</h2>
 <ng-container *ngVar="updates$ | async as updates">
     <ng-container *ngIf="updates && !(loading$ | async)">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
diff --git a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
index 3397742f5b..1b7bff30e8 100644
--- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
@@ -74,7 +74,7 @@ describe('ItemWithdrawComponent', () => {
   });
 
   it('should render a page with messages based on the \'withdraw\' messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.withdraw.header');
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
     expect(description.innerHTML).toContain('item.edit.withdraw.description');
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
index b5757d1859..67249b085a 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12">
-            <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
           <div class="space-children-mr">
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
index 9a19837665..b7d6478726 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
@@ -111,7 +111,7 @@ describe('AbstractSimpleItemActionComponent', () => {
   });
 
   it('should render a page with messages based on the provided messageKey', () => {
-    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    const header = fixture.debugElement.query(By.css('h1')).nativeElement;
     expect(header.innerHTML).toContain('item.edit.myEditAction.header');
 
     const description = fixture.debugElement.query(By.css('p')).nativeElement;
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index e57ce33008..fdc966bd3b 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,5 +1,5 @@
 <div class="container mb-5">
-  <h2>{{'person.orcid.registry.auth' | translate}}</h2>
+  <h1>{{'person.orcid.registry.auth' | translate}}</h1>
   <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
 </div>
 
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 33c3125d67..6c30fbe111 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,13 +1,3 @@
-<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
-  <div class="button-row bottom mb-3">
-    <div class="text-right">
-      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
-        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
-      </a>
-    </div>
-  </div>
-</div>
-
 <ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
 <div class="container" *ngIf="!(processingConnection | async) && !(connectionStatus | async)" data-test="error-box">
   <ds-alert [type]="'alert-danger'">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
@@ -17,3 +7,13 @@
   <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
   <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
 </ng-container>
+
+<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
+  <div class="button-row bottom mb-3">
+    <div class="text-right">
+      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
+        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
index ce26008c28..2558b6cf7a 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
@@ -1,2 +1,2 @@
-<h4 class="mt-4">{{title | translate}}</h4>
+<h2 class="h3 mt-4">{{title | translate}}</h2>
 <ng-content></ng-content>
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index c52ef3827d..4daee064df 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,9 +1,9 @@
 <div class="container" *ngIf="(processRD$ | async)?.payload as process">
     <div class="row">
       <div class="col-10">
-        <h2 class="flex-grow-1">
+        <h1 class="flex-grow-1">
           {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
-        </h2>
+        </h1>
       </div>
       <div *ngIf="refreshCounter$ | async as seconds" class="col-2 refresh-counter">
         Refreshing in {{ seconds }}s <i class="fas fa-sync-alt fa-spin"></i>
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index c55592f3e7..211129489e 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -1,8 +1,8 @@
 <div class="container">
     <div class="row">
-        <h2 class="col-12">
+        <h1 class="col-12">
             {{headerKey | translate}}
-        </h2>
+        </h1>
         <div class="col-12 col-md-6 mb-2">
             <form #form="ngForm" (ngSubmit)="submitForm(form)">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
@@ -12,7 +12,7 @@
             </form>
         </div>
         <div class="col-12 col-md-6">
-            <ds-script-help [script]="selectedScript"></ds-script-help>
+            <ds-script-help *ngIf="selectedScript" [script]="selectedScript"></ds-script-help>
         </div>
     </div>
 
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
index f52ae4b6b9..7615edcfd4 100644
--- a/src/app/process-page/form/script-help/script-help.component.html
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -1,5 +1,5 @@
 <div class="text-secondary">
-  <h3>{{script?.name}}</h3>
+  <h2>{{script?.name}}</h2>
   <span>{{script?.description}}</span>
 
   <table class="table-borderless mt-3">
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index dcad265490..3f0e1e841f 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,6 +1,6 @@
 <div class="container">
     <div class="d-flex">
-        <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
+        <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
     </div>
     <div class="d-flex justify-content-end">
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 44783da84e..187096b391 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
     <ng-container *ngIf="isResearcherProfileEnabled() | async">
-      <h3 class="mb-4">{{'profile.head' | translate}}</h3>
+      <h2 class="mb-4">{{'profile.head' | translate}}</h2>
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
@@ -34,7 +34,7 @@
 
     <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
       <div *ngIf="groups?.length > 0">
-        <h3 class="mt-4">{{'profile.groups.head' | translate}}</h3>
+        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
         <ul class="list-group list-group-flush">
           <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
         </ul>
@@ -43,7 +43,7 @@
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
       <div *ngIf="specialGroups?.length > 0" data-test="specialGroups">
-        <h3 class="mt-4">{{'profile.special.groups.head' | translate}}</h3>
+        <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
         <ul class="list-group list-group-flush">
           <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
             {{ dsoNameService.getName(specialGroup) }}
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index ed79b1d2d1..d4cf75b563 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
+    <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
     <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
     <p *ngIf="validMailDomains.length != 0 && typeRequest === TYPE_REQUEST_REGISTER">
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 263bf60ac7..23c62abc6c 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -13,9 +13,9 @@
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{ 'access-control-item-header-toggle' | translate }}
-              </h4>
+              </h2>
               <ui-switch
                 [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-item-toggle.disable' : 'access-control-item-toggle.enable') | translate"
                 [(ngModel)]="state.item.toggleStatus"
@@ -51,7 +51,7 @@
           </div>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #itemAccessCmp
@@ -67,9 +67,9 @@
 
           <div>
             <div class="d-flex align-items-center">
-              <h4 class="mb-0 mr-4">
+              <h2 class="h3 mb-0 mr-4">
                 {{'access-control-bitstream-header-toggle' | translate}}
-              </h4>
+              </h2>
               <ui-switch
                 [ariaLabel]="(state.bitstream.toggleStatus ? 'access-control-bitstream-toggle.disable' : 'access-control-bitstream-toggle.enable') | translate"
                 [(ngModel)]="state.bitstream.toggleStatus"
@@ -142,7 +142,7 @@
           </div>
 
           <div>
-            <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
 
             <ds-access-control-array-form
               #bitstreamAccessCmp
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index d6a0005173..37799e805f 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h3 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h3>
+  <h1 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h1>
   <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">
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 1e1f3d8209..b6d598d562 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -3,9 +3,9 @@
   <div class="card-body d-flex flex-column"
        *ngVar="group$ | async as group">
 
-    <h5 class="w-100">
+    <h2 class="h4 w-100">
       {{ roleName$ | async }}
-    </h5>
+    </h2>
 
     <div class="mt-2 mb-2">
       <ds-alert [type]="'alert-info'" >{{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.description' | translate}}</ds-alert>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index 819d080f89..c397966fba 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -2,8 +2,8 @@
   <div class="row">
     <div class="col-12">
       <div class="d-flex justify-content-between border-bottom">
-        <h2>{{ type + '.edit.head' | translate }}</h2>
-        <div>
+        <h1>{{ type + '.edit.head' | translate }}</h1>
+        <div class="my-auto">
           <a class="btn btn-danger"
              [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'">
             <i class="fas fa-trash"></i> {{type + '.edit.delete' | translate}}</a>
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 552854a0c0..01a71ab142 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="content" class="content-with-optional-title mb-2">
-    <h2 class="d-inline-block h6" *ngIf="title">{{ title | translate }}</h2>
-    <div class="d-inline-block px-2"><a href="{{getHandle()}}">{{getHandle()}}</a></div>
-</div>
+<p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
+  <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
+  <a [href]="getHandle()">{{getHandle()}}</a>
+</p>
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
index 5d7bac26c7..e69de29bb2 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss
@@ -1,5 +0,0 @@
-div {
-  word-break: break-word;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-}
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
index 0f285c4948..a820fa481a 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h4 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h4>
+  <h1 class="mb-3">{{'resource-policies.edit.page.heading' | translate}} {{resourcePolicy.id}}</h1>
 
   <ds-resource-policy-form [resourcePolicy]="resourcePolicy"
                            [isProcessing]="isProcessing()"
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index f63bf9fa84..64c0cd5008 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h5 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h5>
+  <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
 
   <select class="form-control"
           aria-labelledby="configuration-switch"
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index c6938c7582..047bf52e7c 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -1,11 +1,11 @@
 <div class="container">
 
   <ng-container *ngVar="(scope$ | async) as scope">
-    <h2 *ngIf="scope"
+    <h1 *ngIf="scope"
         class="header"
         id="{{ scope.id }}">
       {{ 'statistics.header' | translate: { scope: getName(scope) } }}
-    </h2>
+    </h1>
   </ng-container>
 
   <ng-container *ngVar="reports$ | async as reports">
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
index 5a333b9658..efa9ce43d9 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.html
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -1,9 +1,9 @@
 <div *ngIf="hasData"
      class="m-1">
 
-  <h3 class="m-1">
+  <h2 class="m-1">
     {{ 'statistics.table.title.' + report.reportType | translate }}
-  </h3>
+  </h2>
 
   <table class="table table-striped" [attr.data-test]="report.reportType">
 
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index dc46e6758f..8d13b1785a 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12">
-      <h2 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h2>
+      <h1 id="header" class="pb-2">{{'submission.import-external.title' + ((label) ? '.' + label : '') | translate}}</h1>
       <ds-submission-import-external-searchbar
         [initExternalSourceData]="reload$.value"
         (externalSourceData) = "getExternalSourceData($event)">
@@ -11,7 +11,7 @@
   <div class="row" *ngIf="reload$.value.entity">
     <div *ngIf="reload$.value.sourceId !== ''" class="col-md-12">
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <h3 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h3>
+        <h2 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
         <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !(isLoading$ | async) && entriesRD?.payload?.page?.length > 0" @fadeIn
                                 [objects]="entriesRD"
                                 [selectionConfig]="{ repeatable: repeatable, listId: listId }"
@@ -25,15 +25,15 @@
         <ds-themed-loading *ngIf="(isLoading$ | async)"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
         <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.empty' | translate }}</ds-alert>
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
         </div>
         <div *ngIf="!(isLoading$ | async) && entriesRD.statusCode === 500" data-test="empty-external-error-500">
-          <ds-alert [type]="'alert-info'">{{ 'search.results.response.500' | translate }}</ds-alert>
+          <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
         </div>
       </ng-container>
     </div>
     <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
-      <ds-alert [type]="'alert-info'">
+      <ds-alert [type]="AlertType.Info">
         <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
       </ds-alert>
     </div>
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 25b1d5d1aa..b4aacd4e63 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -23,6 +23,7 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getFinishedRemoteData } from '../../core/shared/operators';
 import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 /**
  * This component allows to submit a new workspaceitem importing the data from an external source.
@@ -92,6 +93,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
   private retrieveExternalSourcesSub: Subscription;
 
+  public readonly AlertType = AlertType;
+
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index ed31e16759..4d204df93c 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12 m-40">
-      <h2>{{'subscriptions.title' | translate}}</h2>
+      <h1>{{'subscriptions.title' | translate}}</h1>
       <div class="row">
         <div class="col-md-12 m-40">
           <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
@@ -34,7 +34,7 @@
               </div>
             </ds-pagination>
 
-            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements == 0 && !(loading$ | async)" [type]="'alert-info'" data-test="empty-alert">
+            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements == 0 && !(loading$ | async)" [type]="AlertType.Info" data-test="empty-alert">
               {{ 'subscriptions.table.empty.message' | translate }}
             </ds-alert>
 
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
index 05c587ba12..35278d5dc2 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -14,6 +14,7 @@ import { EPerson } from '../core/eperson/models/eperson.model';
 import { getAllCompletedRemoteData } from '../core/shared/operators';
 import { RemoteData } from '../core/data/remote-data';
 import { hasValue } from '../shared/empty.util';
+import { AlertType } from '../shared/alert/alert-type';
 
 @Component({
   selector: 'ds-subscriptions-page',
@@ -54,6 +55,8 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy {
    */
   sub: rxjsSubscription = null;
 
+  readonly AlertType = AlertType;
+
   constructor(
     private paginationService: PaginationService,
     private authService: AuthService,
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index d1de00bea6..95c7a69448 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <h2 id="header">{{'system-wide-alert.form.header' | translate}}</h2>
+    <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
     <div [formGroup]="alertForm" [class]="'ng-invalid'">
         <div class="form-group">
             <div class="row mb-2">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d6722ad8fe..7df199fc8a 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -864,6 +864,8 @@
 
   "browse.startsWith.input": "Filter",
 
+  "browse.taxonomy_srsc.title": "Browsing by Subject Category",
+
   "browse.taxonomy.button": "Browse",
 
   "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 5dfc03fbd3..69b288905a 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,6 +12,14 @@ $fa-font-path: "^assets/fonts" !default;
 /* Images */
 $image-path: "../assets/images" !default;
 
+$font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
+$h1-font-size: $font-size-base * 2.125 !default;
+$h2-font-size: $font-size-base * 1.75 !default;
+$h3-font-size: $font-size-base * 1.5 !default;
+$h4-font-size: $font-size-base * 1.25 !default;
+$h5-font-size: $font-size-base * 1.125 !default;
+$h6-font-size: $font-size-base !default;
+
 // enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
 $enable-responsive-font-sizes: true;
 

From dbb79170585b1c33224ccaeeabc850708ee174e6 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 23:11:50 +0100
Subject: [PATCH 0041/1286] Fixed accessibility issues on search page

(cherry picked from commit 9a5ad0bc9fab596c7a229a94fa06e92b80d1b607)
---
 .../selectable-list-item-control.component.html     |  4 +++-
 .../selectable-list-item-control.component.spec.ts  |  6 +++++-
 .../search-filter/search-filter.component.html      | 13 +++++++------
 .../search-label/search-label.component.html        |  3 ++-
 .../view-mode-switch.component.html                 |  8 ++++++--
 src/assets/i18n/en.json5                            |  6 ++++++
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index 56a83913a7..a90f375c6a 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <input *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+    <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+           [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
            [name]="'checkbox' + index"
            [id]="'object' + index"
            [ngModel]="selected$ | async"
            (ngModelChange)="selectCheckbox($event)">
     <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
+           [attr.aria-label]="'selectable-list-item-control.select' | translate"
            [name]="'radio' + index"
            [id]="'object' + index"
            [checked]="selected$ | async"
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
index c8756567b8..73d70bfa7a 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
@@ -7,6 +7,7 @@ import { FormsModule } from '@angular/forms';
 import { VarDirective } from '../../../utils/var.directive';
 import { of as observableOf } from 'rxjs';
 import { ListableObject } from '../listable-object.model';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('SelectableListItemControlComponent', () => {
   let comp: SelectableListItemControlComponent;
@@ -45,7 +46,10 @@ describe('SelectableListItemControlComponent', () => {
     init();
     TestBed.configureTestingModule({
       declarations: [SelectableListItemControlComponent, VarDirective],
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       providers: [
         {
           provide: SelectableListService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index 25c218166e..a352c5587b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -2,17 +2,18 @@
      [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
   <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
           class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
-          [attr.aria-expanded]="false"
+          [attr.aria-expanded]="!(collapsed$ | async)"
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
-    <h4 class="d-inline-block text-left mt-auto mb-auto">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
-    </h4>
-    <span class="filter-toggle flex-grow-1 fas p-auto"
-          [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-          [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
     </span>
+    <i class="filter-toggle flex-grow-1 fas p-auto"
+       aria-hidden="true"
+       [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
+       [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+    </i>
   </button>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
        (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 17c5a48718..2269771de1 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,6 +1,7 @@
 <a class="badge badge-primary mr-1 mb-1"
+   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
     {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
-    <span> ×</span>
+    <span aria-hidden="true"> ×</span>
 </a>
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 45d219eb91..5d29562a76 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,5 +1,7 @@
 <div class="btn-group" data-toggle="buttons">
     <button *ngIf="isToShow(viewModeEnum.ListElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.ListElement"
+            [attr.aria-label]="'search.view-switch.show-list' | translate"
        routerLink="."
        [queryParams]="{view: 'list'}"
        queryParamsHandling="merge"
@@ -8,9 +10,11 @@
        [class.active]="currentMode === viewModeEnum.ListElement"
        class="btn btn-secondary"
        [attr.data-test]="'list-view' | dsBrowserOnly">
-       <span class="fas fa-list"></span><span class="sr-only">{{'search.view-switch.show-list' | translate}}</span>
+       <i class="fas fa-list"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.GridElement)"
+            [attr.aria-current]="currentMode === viewModeEnum.GridElement"
+            [attr.aria-label]="'search.view-switch.show-grid' | translate"
        routerLink="."
        [queryParams]="{view: 'grid'}"
        queryParamsHandling="merge"
@@ -19,7 +23,7 @@
        [class.active]="currentMode === viewModeEnum.GridElement"
        class="btn btn-secondary"
        [attr.data-test]="'grid-view' | dsBrowserOnly">
-       <span class="fas fa-th-large"></span><span class="sr-only">{{'search.view-switch.show-grid' | translate}}</span>
+       <i class="fas fa-th-large"></i>
     </button>
     <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
        routerLink="."
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 7df199fc8a..643a3ce0d1 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3666,6 +3666,8 @@
 
   "search.search-form.placeholder": "Search the repository ...",
 
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
   "search.filters.applied.f.author": "Author",
 
   "search.filters.applied.f.dateIssued.max": "End date",
@@ -3920,6 +3922,10 @@
 
   "search.view-switch.show-list": "Show as list",
 
+  "selectable-list-item-control.deselect": "Deselect item",
+
+  "selectable-list-item-control.select": "Select item",
+
   "sorting.ASC": "Ascending",
 
   "sorting.DESC": "Descending",

From 8f8a3acba7554ac476148f7a954fa1abf9771088 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 3 Dec 2023 23:28:19 +0100
Subject: [PATCH 0042/1286] Fixed DSONameService getName & getHitHighlights
 returning empty string for OrgUnits without organization.legalName field

(cherry picked from commit e96d3cd2e9f799dc46f827af6d7d7bf587b68eee)
---
 src/app/core/breadcrumbs/dso-name.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index ddd97705b0..8e4fb771c6 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -50,7 +50,7 @@ export class DSONameService {
       }
     },
     OrgUnit: (dso: DSpaceObject): string => {
-      return dso.firstMetadataValue('organization.legalName');
+      return dso.firstMetadataValue('organization.legalName') || this.translateService.instant('dso.name.untitled');
     },
     Default: (dso: DSpaceObject): string => {
       // If object doesn't have dc.title metadata use name property
@@ -106,7 +106,7 @@ export class DSONameService {
       }
       return `${familyName}, ${givenName}`;
     } else if (entityType === 'OrgUnit') {
-      return this.firstMetadataValue(object, dso, 'organization.legalName');
+      return this.firstMetadataValue(object, dso, 'organization.legalName') || this.translateService.instant('dso.name.untitled');
     }
     return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
   }

From 53f5ceabeecbaf6eaee2d057e03b12f8d35e0268 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 6 Dec 2023 01:08:00 +0100
Subject: [PATCH 0043/1286] Fixed Edit Item Bitstream  showing empty buttons
 when css is turned off

(cherry picked from commit ff6dff72d8db680c00b159496beecf87517fec98)
---
 .../item-edit-bitstream.component.html                 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index a3e29ac10c..f0671d3d30 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -26,21 +26,25 @@
     <div class="text-center w-100">
       <div class="btn-group relationship-action-buttons">
         <a *ngIf="bitstreamDownloadUrl != null" [routerLink]="bitstreamDownloadUrl"
-                class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-                [attr.data-test]="'download-button' | dsBrowserOnly">
+           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
+           class="btn btn-outline-primary btn-sm"
+           title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+           [attr.data-test]="'download-button' | dsBrowserOnly">
           <i class="fas fa-download fa-fw"></i>
         </a>
         <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
         <button [disabled]="!canRemove()" (click)="remove()"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
         <button [disabled]="!canUndo()" (click)="undo()"
+                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
           <i class="fas fa-undo-alt fa-fw"></i>

From 4a0bf8a7af691165e6a817d6f3defeaf94645612 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 6 Dec 2023 02:03:44 +0100
Subject: [PATCH 0044/1286] Fixed Edit Item Bitstream  showing empty buttons
 when css is turned off & replaced authentication dropdown menu link with
 button

- Also fixed box-shadows not working the same way for all footer buttons/links

(cherry picked from commit 4545b5354dcc1994b28435ccad95d64f9c328ed5)
---
 src/app/footer/footer.component.html                  |  6 +++---
 src/app/footer/footer.component.scss                  |  9 +++++++++
 .../shared/auth-nav-menu/auth-nav-menu.component.html | 11 +++++++----
 .../shared/auth-nav-menu/auth-nav-menu.component.scss |  9 +++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index d4c0cd1a37..ac903929f6 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -69,15 +69,15 @@
           </button>
         </li>
         <li *ngIf="showPrivacyPolicy">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
         <li *ngIf="showEndUserAgreement">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
         <li *ngIf="showSendFeedback$ | async">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
         </li>
       </ul>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 4dfdc3267b..f1a872c099 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -30,6 +30,15 @@
             padding: 0 calc(var(--bs-spacer) / 2);
             color: inherit;
             font-size: .875em;
+
+            &:focus {
+              box-shadow: none;
+              text-decoration: underline;
+            }
+
+            &:focus-visible {
+              box-shadow: 0 0 0 0.2rem rgba(255, 255, 255, 0.5);
+            }
           }
 
           &:not(:last-child) {
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index eba37fa416..a0623bdd90 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -2,9 +2,11 @@
   <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
       (click)="$event.stopPropagation();">
     <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
+      <button class="btn btn-link dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
          (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
-         ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
+         ngbDropdownToggle>
+        {{ 'nav.login' | translate }}
+      </button>
       <div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
            [attr.aria-label]="'nav.login' | translate">
         <ds-themed-log-in
@@ -19,8 +21,9 @@
   </li>
   <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
     <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" role="button" [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate" class="dropdownLogout px-1" [attr.data-test]="'user-menu' | dsBrowserOnly" ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+      <button role="button" [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate" class="btn btn-link dropdownLogout px-1" [attr.data-test]="'user-menu' | dsBrowserOnly" ngbDropdownToggle>
+        <i class="fas fa-user-circle fa-lg fa-fw"></i>
+      </button>
       <div class="logoutDropdownMenu" ngbDropdownMenu [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate">
         <ds-themed-user-menu></ds-themed-user-menu>
       </div>
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 40e9113b00..ea64f7e74b 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
@@ -19,3 +19,12 @@
     color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdownLogin, .dropdownLogout {
+  &:not(:focus-visible).active,
+  &:not(:focus-visible):active,
+  &:not(:focus-visible).active:focus,
+  &:not(:focus-visible):active:focus {
+    box-shadow: unset;
+  }
+}

From 9a9311e02a4f1987822f7f80553e95bfdbebd4c5 Mon Sep 17 00:00:00 2001
From: reetagithub <51482276+reetagithub@users.noreply.github.com>
Date: Mon, 11 Dec 2023 11:39:38 +0200
Subject: [PATCH 0045/1286] Update fi.json5

Corrected a typo  in search.view.switch.show-grid

(cherry picked from commit 2339a559e91f7ee36f87946d0c2bb6d1e02d3ded)
---
 src/assets/i18n/fi.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index ede41ffb0c..423099b956 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -5746,7 +5746,7 @@
   "search.view-switch.show-detail": "Näytä lisätiedot",
 
   // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Näydä ruudukkona",
+  "search.view-switch.show-grid": "Näytä ruudukkona",
 
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Näytä luettelona",

From 77d20867964a7baf29b17f535308c117889a537a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 23 Nov 2023 21:04:02 +0100
Subject: [PATCH 0046/1286] Fixed ePerson link on edit group page

(cherry picked from commit 430ee3846a2446e16914764e71c1d0c5e739ae2c)
---
 .../group-form/members-list/members-list.component.html  | 6 ++----
 .../members-list/members-list.component.spec.ts          | 3 ---
 .../group-form/members-list/members-list.component.ts    | 3 +++
 src/app/core/eperson/eperson-data.service.ts             | 9 +--------
 .../reviewers-list/reviewers-list.component.spec.ts      | 3 ---
 5 files changed, 6 insertions(+), 18 deletions(-)

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 7f01e1b720..fd7e776472 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
@@ -24,8 +24,7 @@
         <tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
           <td class="align-middle">{{eperson.id}}</td>
           <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
               {{ dsoNameService.getName(eperson) }}
             </a>
           </td>
@@ -106,8 +105,7 @@
         <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
           <td class="align-middle">{{eperson.id}}</td>
           <td class="align-middle">
-            <a (click)="ePersonDataService.startEditingNewEPerson(eperson)"
-               [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">
+            <a [routerLink]="getEPersonEditRoute(eperson.id)">
               {{ dsoNameService.getName(eperson) }}
             </a>
           </td>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 5d97dcade8..99ee9827e8 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -68,9 +68,6 @@ describe('MembersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index feb90b52b3..6129d4d02d 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -23,6 +23,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { getEPersonEditRoute } from '../../../access-control-routing-paths';
 
 /**
  * Keys to keep track of specific subscriptions
@@ -131,6 +132,8 @@ export class MembersListComponent implements OnInit, OnDestroy {
   // current active group being edited
   groupBeingEdited: Group;
 
+  readonly getEPersonEditRoute = getEPersonEditRoute;
+
   constructor(
     protected groupDataService: GroupDataService,
     public ePersonDataService: EPersonDataService,
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index fb8b8bc9b0..a85d471e7d 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -34,7 +34,7 @@ import { PatchData, PatchDataImpl } from '../data/base/patch-data';
 import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
 import { RestRequestMethod } from '../data/rest-request-method';
 import { dataService } from '../data/base/data-service.decorator';
-import { getEPersonEditRoute, getEPersonsRoute } from '../../access-control/access-control-routing-paths';
+import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -313,13 +313,6 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     return getEPersonEditRoute(ePerson.id);
   }
 
-  /**
-   * Get EPeople admin page
-   */
-  public getEPeoplePageRouterLink(): string {
-    return getEPersonsRoute();
-  }
-
   /**
    * Create a new EPerson using a token
    * @param eperson
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
index bcbeef5683..91e200e85d 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
@@ -72,9 +72,6 @@ describe('ReviewersListComponent', () => {
       clearLinkRequests() {
         // empty
       },
-      getEPeoplePageRouterLink(): string {
-        return '/access-control/epeople';
-      }
     };
     groupsDataServiceStub = {
       activeGroup: activeGroup,

From 07a2f3bbbb728ec51f77502a1a2771aeab4eb063 Mon Sep 17 00:00:00 2001
From: Dawnkai <dawnwender@gmail.com>
Date: Fri, 27 Oct 2023 14:32:50 +0200
Subject: [PATCH 0047/1286] Deque Analysis Color Contrast fixes

---
 .../dso-edit-metadata-value.component.scss    |  16 +++
 src/app/shared/alert/alert.component.scss     |   3 +
 .../notification/notification.component.scss  |   6 +
 .../search-range-filter.component.scss        |   8 +-
 .../submission-form-footer.component.scss     |  15 +++
 src/styles/_bootstrap_variables.scss          |   5 +-
 src/styles/_custom_variables.scss             |  15 ++-
 src/styles/_global-styles.scss                | 107 ++++++++++++++++--
 8 files changed, 161 insertions(+), 14 deletions(-)

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 4a207ee1a4..e3bda1697a 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
@@ -14,3 +14,19 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+
+.btn.btn-outline-warning:not(:disabled):hover {
+  background-color: #7f480c;
+}
+.btn.btn-success:not(:disabled):focus, .btn.btn-outline-success:not(:disabled):focus{
+  outline: 2px solid rgba(43, 99, 47, 1)
+}
+.btn.btn-danger:not(:disabled):focus, .btn.btn-outline-danger:not(:disabled):focus{
+  outline: 2px solid rgba(190, 114, 114, 1);
+}
+.btn.btn-warning:not(:disabled):focus, .btn.btn-outline-warning:not(:disabled):focus {
+  outline: 2px solid rgba(88, 87, 65, 1);
+}
+.btn.btn-primary:not(:disabled):focus, .btn.btn-outline-primary:not(:disabled):focus {
+  outline: 2px solid rgba(130, 135, 139, 1);
+}
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 1a70081367..7b225a47b5 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,3 +1,6 @@
 .close:focus {
   outline: none !important;
 }
+button.close {
+  opacity: 0.6;
+}
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index 06c46b0f5d..aa0720afb7 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -30,3 +30,9 @@
 .alert-warning .notification-progress-loader span {
   background: var(--ds-notification-bg-warning);
 }
+.alert-success{
+	color: var(--ds-notification-success-color);
+}
+.alert-danger {
+  color: var(--ds-notification-danger-color);
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index b1cfa841f8..8d207dd023 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -26,7 +26,7 @@
     }
 
   .noUi-connect {
-      background: var(--ds-slider-color);
+      background: var(--ds-range-filter-connect-color);
   }
 
   .noUi-target {
@@ -37,4 +37,10 @@
     margin: 0 calc(-1 * (var(--ds-slider-handle-width) / 2));
     width: calc(100% + var(--ds-slider-handle-width));
   }
+  .noUi-handle {
+      border-color: var(--ds-range-filter-border-color);
+      &::before, &::after {
+          background-color: var(--ds-range-filter-border-color);
+      }
+  }
 }
diff --git a/src/app/submission/form/footer/submission-form-footer.component.scss b/src/app/submission/form/footer/submission-form-footer.component.scss
index e69de29bb2..a435e5c393 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.scss
+++ b/src/app/submission/form/footer/submission-form-footer.component.scss
@@ -0,0 +1,15 @@
+:host{
+	.btn:focus, .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus, .custom-control-input:focus ~ .custom-control-label::before{
+		box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.25), 0 0 0 0.2rem rgba(27, 41, 55, 0.6);
+	}
+
+	.btn.btn-success:focus{
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(0, 100, 0, 0.7)
+	}
+	.btn.btn-danger:focus{
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(200, 0, 0, 0.7)
+	}
+	.btn.btn-warning:focus{
+		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(89, 81, 0, 0.7)
+	}
+}
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 69b288905a..f5051608fa 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -34,10 +34,9 @@ $green:  #94BA65 !default;
 $cyan:   #006666 !default;
 $yellow: #ec9433 !default;
 $red:    #CF4444 !default;
+$teal:   #1F7293 !default;
 $dark:   darken($blue, 17%) !default;
 
-
-
 $theme-colors: (
         primary: $blue,
         secondary: $gray-700,
@@ -49,7 +48,7 @@ $theme-colors: (
         dark: $dark
 ) !default;
 /* Fonts */
-$link-color: map-get($theme-colors, info) !default;
+$link-color: $teal !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index ad9a074e1b..b58e3a92a8 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -61,6 +61,19 @@
   --ds-notification-bg-danger: #{darken(adjust-hue($danger, -10), 10%)};
   --ds-notification-bg-info: #{darken(adjust-hue($info, -10), 10%)};
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
+	--ds-notification-success-color: #307B23;
+  --ds-notification-danger-color: #9a6e6e;
+  --ds-text-warning-color: #cf822c;
+  --ds-text-success-color: #74a030;
+  --ds-range-filter-border-color: #949494;
+  --ds-range-filter-connect-color: #63852e;
+
+	--ds-badge-archived-background-color: #2a701e;
+	--ds-badge-archived-color: #000;
+	--ds-button-success-background-color: #358726;
+	--ds-button-success-background-hover-color: #{darken(#358726, 10%)};
+	--ds-button-warning-background-color: #{darken($yellow, 20%)};
+	--ds-button-warning-background-hover-color: #{darken($yellow, 30%)};
 
   --ds-fa-fixed-width: #{$fa-fixed-width};
   --ds-icon-padding: #{$icon-padding};
@@ -81,7 +94,7 @@
   --ds-home-news-background-color: #{$gray-200};
 
   --ds-breadcrumb-bg: #{$gray-200} !important;
-  --ds-breadcrumb-link-color: #{$cyan};
+  --ds-breadcrumb-link-color: #{darken($cyan, 10%)};
   --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
   --ds-breadcrumb-max-length: 200px;
 
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b6b2d143d4..ec2e68b328 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -232,7 +232,8 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-archived {
-  background-color: #{map-get($theme-colors, success)};
+  background-color: var(--ds-badge-archived-background-color);
+	color: var(--ds-badge-archived-color)
 }
 
 .badge-workflow {
@@ -291,29 +292,117 @@ ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
 
 
 .pt-0\.5 {
-  padding-top: 0.125rem !important;
+    padding-top: 0.125rem !important;
 }
 
 .pr-0\.5 {
-  padding-right: 0.125rem !important;
+    padding-right: 0.125rem !important;
 }
 
 .pb-0\.5 {
-  padding-bottom: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
 }
 
 .pl-0\.5 {
-  padding-left: 0.125rem !important;
+    padding-left: 0.125rem !important;
 }
 
 .px-0\.5 {
-  padding-left: 0.125rem !important;
-  padding-right: 0.125rem !important;
+    padding-left: 0.125rem !important;
+    padding-right: 0.125rem !important;
 }
 
 .py-0\.5 {
-  padding-top: 0.125rem !important;
-  padding-bottom: 0.125rem !important;
+    padding-top: 0.125rem !important;
+    padding-bottom: 0.125rem !important;
+}
+
+.btn.btn-success{
+	background-color: var(--ds-button-success-background-color);
+	border-color: var(--ds-button-success-background-color);
+	&:hover{
+		background-color: var(--ds-button-success-background-hover-color);
+		border-color: var(--ds-button-success-background-hover-color);
+	}
+}
+.btn.btn-outline-success{
+	border-color: var(--ds-button-success-background-color);
+	color: var(--ds-button-success-background-color);
+	&:hover{
+		background-color: var(--ds-button-success-background-hover-color);
+		color: $white;
+	}
+}
+.btn.btn-outline-warning{
+	border-color:var(--ds-button-warning-background-color);
+	color:var(--ds-button-warning-background-color);
+	&:hover{
+		background-color:var(--ds-button-warning-background-hover-color);
+		color: $white;
+	}
+	&:disabled{
+		background-color: transparent;
+		&:hover{
+			color:var(--ds-button-warning-background-color);
+		}
+	}
+}
+
+
+.btn:focus, .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus, .custom-control-input:focus ~ .custom-control-label::before, .form-control:focus, .page-link:focus{
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.25), 0 0 0 0.2rem rgba(27, 41, 55, 0.5);
+}
+
+.btn.btn-success:focus, .btn.btn-outline-success:focus{
+    outline: 2px solid rgba(76, 145, 76, 1);
+    outline-offset: 2px;
+    box-shadow: none;
+}
+.btn.btn-danger:focus, .btn.btn-outline-danger:focus{
+	outline: 2px solid rgba(205, 126, 126, 1);
+    outline-offset: 2px;
+    box-shadow: none;
+}
+.btn.btn-warning:focus, .btn.btn-outline-warning:focus {
+    outline: 2px solid rgba(88, 87, 65, 1);
+    outline-offset: 2px;
+    box-shadow: none;
+}
+.btn.btn-primary:focus, .btn.btn-outline-primary:focus {
+    box-shadow: none;
+    outline: 2px solid rgba(134, 137, 139, 1);
+    outline-offset: 2px;
+}
+.btn.btn-secondary:focus, .btn.btn-outline-secondary:focus {
+    box-shadow: none;
+    outline: 2px solid rgba(141, 148, 155, 1);
+    outline-offset: 2px;
+}
+.btn.btn-warning{
+	background-color:var(--ds-button-warning-background-color);
+	&:hover{
+		background-color:var(--ds-button-warning-background-hover-color);
+	}
+	&:disabled{
+		background-color: transparent;
+	}
+}
+dynamic-ng-bootstrap-checkbox .custom-control-label::before {
+    border-color: #858c91;
+}
+.text-warning {
+    color: var(--ds-text-warning-color) !important;
+}
+.text-success {
+    color: var(--ds-text-success-color) !important;
+}
+ngb-accordion {
+    a.close {
+        opacity: 0.75;
+    }
+    a.close:not(:disabled):not(.disabled):hover {
+        opacity: 0.9;
+    }
 }
 
 // Margin utility classes based on DSpace content spacing

From 0b43109a2946d187c439110e42649cbee5512ae5 Mon Sep 17 00:00:00 2001
From: Maciej Kleban <dawnwender@gmail.com>
Date: Fri, 17 Nov 2023 17:11:08 +0100
Subject: [PATCH 0048/1286] Replace hard-coded colors with bootstrap variants

* Replace custom variables with Bootstrap variants
* Replace custom button colors with Bootstrap variants
* Remove custom colors and replace them with bootstrap variants
* Fix checkbox offset styles
---------
Co-authored-by: Maciej Kleban <maciej.kleban@pcgacademia.pl>
---
 .../dso-edit-metadata-value.component.scss    |  16 --
 src/app/shared/alert/alert.component.scss     |   7 +-
 .../notification/notification.component.scss  |   9 +-
 .../search-range-filter.component.scss        |   6 +-
 .../submission-form-footer.component.scss     |  15 --
 src/styles/_custom_variables.scss             |  16 +-
 src/styles/_global-styles.scss                | 222 +++++++++++-------
 .../_theme_sass_variable_overrides.scss       |   2 +-
 8 files changed, 144 insertions(+), 149 deletions(-)

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 e3bda1697a..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
@@ -14,19 +14,3 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
-
-.btn.btn-outline-warning:not(:disabled):hover {
-  background-color: #7f480c;
-}
-.btn.btn-success:not(:disabled):focus, .btn.btn-outline-success:not(:disabled):focus{
-  outline: 2px solid rgba(43, 99, 47, 1)
-}
-.btn.btn-danger:not(:disabled):focus, .btn.btn-outline-danger:not(:disabled):focus{
-  outline: 2px solid rgba(190, 114, 114, 1);
-}
-.btn.btn-warning:not(:disabled):focus, .btn.btn-outline-warning:not(:disabled):focus {
-  outline: 2px solid rgba(88, 87, 65, 1);
-}
-.btn.btn-primary:not(:disabled):focus, .btn.btn-outline-primary:not(:disabled):focus {
-  outline: 2px solid rgba(130, 135, 139, 1);
-}
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 7b225a47b5..907edae24b 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,5 +1,8 @@
-.close:focus {
-  outline: none !important;
+.close {
+  opacity: 0.75;
+  &:focus {
+    outline: none !important;
+  }
 }
 button.close {
   opacity: 0.6;
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index aa0720afb7..ecfc25fee0 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -5,7 +5,8 @@
 }
 
 .close {
-  outline: none !important
+  outline: none !important;
+  opacity: 0.8;
 }
 
 .notification-icon {
@@ -30,9 +31,3 @@
 .alert-warning .notification-progress-loader span {
   background: var(--ds-notification-bg-warning);
 }
-.alert-success{
-	color: var(--ds-notification-success-color);
-}
-.alert-danger {
-  color: var(--ds-notification-danger-color);
-}
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index 8d207dd023..1240f35678 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -26,7 +26,7 @@
     }
 
   .noUi-connect {
-      background: var(--ds-range-filter-connect-color);
+      background: var(--ds-slider-color);
   }
 
   .noUi-target {
@@ -38,9 +38,9 @@
     width: calc(100% + var(--ds-slider-handle-width));
   }
   .noUi-handle {
-      border-color: var(--ds-range-filter-border-color);
+      border-color: var(--ds-slider-handle-color);
       &::before, &::after {
-          background-color: var(--ds-range-filter-border-color);
+          background-color: var(--ds-slider-handle-color);
       }
   }
 }
diff --git a/src/app/submission/form/footer/submission-form-footer.component.scss b/src/app/submission/form/footer/submission-form-footer.component.scss
index a435e5c393..e69de29bb2 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.scss
+++ b/src/app/submission/form/footer/submission-form-footer.component.scss
@@ -1,15 +0,0 @@
-:host{
-	.btn:focus, .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus, .custom-control-input:focus ~ .custom-control-label::before{
-		box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.25), 0 0 0 0.2rem rgba(27, 41, 55, 0.6);
-	}
-
-	.btn.btn-success:focus{
-		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(0, 100, 0, 0.7)
-	}
-	.btn.btn-danger:focus{
-		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(200, 0, 0, 0.7)
-	}
-	.btn.btn-warning:focus{
-		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0 0.2rem rgba(89, 81, 0, 0.7)
-	}
-}
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index b58e3a92a8..c10a875f57 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -61,19 +61,6 @@
   --ds-notification-bg-danger: #{darken(adjust-hue($danger, -10), 10%)};
   --ds-notification-bg-info: #{darken(adjust-hue($info, -10), 10%)};
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
-	--ds-notification-success-color: #307B23;
-  --ds-notification-danger-color: #9a6e6e;
-  --ds-text-warning-color: #cf822c;
-  --ds-text-success-color: #74a030;
-  --ds-range-filter-border-color: #949494;
-  --ds-range-filter-connect-color: #63852e;
-
-	--ds-badge-archived-background-color: #2a701e;
-	--ds-badge-archived-color: #000;
-	--ds-button-success-background-color: #358726;
-	--ds-button-success-background-hover-color: #{darken(#358726, 10%)};
-	--ds-button-warning-background-color: #{darken($yellow, 20%)};
-	--ds-button-warning-background-hover-color: #{darken($yellow, 30%)};
 
   --ds-fa-fixed-width: #{$fa-fixed-width};
   --ds-icon-padding: #{$icon-padding};
@@ -98,8 +85,9 @@
   --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
   --ds-breadcrumb-max-length: 200px;
 
-  --ds-slider-color: #{$green};
+  --ds-slider-color: #{darken($green, 20%)};
   --ds-slider-handle-width: 18px;
+  --ds-slider-handle-color: #{darken($blue, 17%)};
 
   --ds-search-form-scope-max-width: 150px;
 
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index ec2e68b328..584d9269d1 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -220,51 +220,50 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-validation {
-  background-color: #{map-get($theme-colors, warning)};
+    background-color: #{map-get($theme-colors, warning)};
 }
 
 .badge-waiting-controller {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-workspace {
-  background-color: #{map-get($theme-colors, primary)};
+    background-color: #{map-get($theme-colors, primary)};
 }
 
 .badge-archived {
-  background-color: var(--ds-badge-archived-background-color);
-	color: var(--ds-badge-archived-color)
+    background-color: darken($green, 25);
 }
 
 .badge-workflow {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .badge-item-type {
-  background-color: #{map-get($theme-colors, info)};
+    background-color: #{map-get($theme-colors, info)};
 }
 
 .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;
+    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;
 }
 
-ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
-  // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
-  padding: 0;
-  display: inline;
+ul.dso-edit-menu-dropdown>li .nav-item.nav-link {
+    // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons)
+    padding: 0;
+    display: inline;
 }
 
 .table th,
 .table td {
-  vertical-align: middle;
+    vertical-align: middle;
 }
 
 /* Flexbox gap */
@@ -317,85 +316,107 @@ ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
     padding-bottom: 0.125rem !important;
 }
 
-.btn.btn-success{
-	background-color: var(--ds-button-success-background-color);
-	border-color: var(--ds-button-success-background-color);
-	&:hover{
-		background-color: var(--ds-button-success-background-hover-color);
-		border-color: var(--ds-button-success-background-hover-color);
-	}
-}
-.btn.btn-outline-success{
-	border-color: var(--ds-button-success-background-color);
-	color: var(--ds-button-success-background-color);
-	&:hover{
-		background-color: var(--ds-button-success-background-hover-color);
-		color: $white;
-	}
-}
-.btn.btn-outline-warning{
-	border-color:var(--ds-button-warning-background-color);
-	color:var(--ds-button-warning-background-color);
-	&:hover{
-		background-color:var(--ds-button-warning-background-hover-color);
-		color: $white;
-	}
-	&:disabled{
-		background-color: transparent;
-		&:hover{
-			color:var(--ds-button-warning-background-color);
-		}
-	}
+.btn {
+    &:focus {
+        outline-offset: 2px !important;
+        outline-style: solid !important;
+        outline-width: 2px !important;
+        box-shadow: none !important;
+    }
+    &:disabled {
+        opacity: 0.7;
+    }
+    &.btn-success {
+        background-color: darken($success, 20%);
+        border-color: darken($success, 20%);
+        &:hover {
+            background-color: darken($success, 30%);
+            border-color: darken($success, 30%);
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-outline-success {
+        border-color: darken($success, 20%);
+        color: darken($success, 20%);
+
+        &:hover {
+            background-color: darken($success, 30%);
+            color: $white;
+        }
+        &:focus {
+            outline-color: darken($success, 20%);
+        }
+    }
+    &.btn-warning {
+        background-color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+        }
+        &:disabled {
+            background-color: transparent;
+        }
+        &:focus {
+            outline-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-outline-warning {
+        border-color: darken($warning, 20%);
+        color: darken($warning, 20%);
+        &:hover {
+            background-color: darken($warning, 30%);
+            color: $white;
+        }
+        &:disabled {
+            background-color: transparent;
+
+            &:hover {
+                color: darken($warning, 20%);
+            }
+        }
+        :focus {
+            outline-color: darken($warning, 22%);
+        }
+        &:not(:disabled):hover {
+            background-color: darken($warning, 22%);
+        }
+    }
+
+    &.btn-secondary {
+        &:focus {
+            outline-color: darken($secondary, 20%);
+        }
+    }
+
+    &.btn-danger:focus, &.btn-outline-danger:focus {
+        outline-color: darken($danger, 20%);
+    }
+
+    &.btn-primary:focus, &.btn-outline-primary:focus {
+        outline-color: darken($primary, 5%);
+    }
 }
 
-
-.btn:focus, .btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-primary.dropdown-toggle:focus, .custom-control-input:focus ~ .custom-control-label::before, .form-control:focus, .page-link:focus{
-	box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.25), 0 0 0 0.2rem rgba(27, 41, 55, 0.5);
+dynamic-ng-bootstrap-checkbox .custom-control-input:focus ~ .custom-control-label::before {
+    outline: 2px solid $gray-700 !important;
+    box-shadow: none !important;
+    outline-offset: 2px !important;
 }
 
-.btn.btn-success:focus, .btn.btn-outline-success:focus{
-    outline: 2px solid rgba(76, 145, 76, 1);
-    outline-offset: 2px;
-    box-shadow: none;
-}
-.btn.btn-danger:focus, .btn.btn-outline-danger:focus{
-	outline: 2px solid rgba(205, 126, 126, 1);
-    outline-offset: 2px;
-    box-shadow: none;
-}
-.btn.btn-warning:focus, .btn.btn-outline-warning:focus {
-    outline: 2px solid rgba(88, 87, 65, 1);
-    outline-offset: 2px;
-    box-shadow: none;
-}
-.btn.btn-primary:focus, .btn.btn-outline-primary:focus {
-    box-shadow: none;
-    outline: 2px solid rgba(134, 137, 139, 1);
-    outline-offset: 2px;
-}
-.btn.btn-secondary:focus, .btn.btn-outline-secondary:focus {
-    box-shadow: none;
-    outline: 2px solid rgba(141, 148, 155, 1);
-    outline-offset: 2px;
-}
-.btn.btn-warning{
-	background-color:var(--ds-button-warning-background-color);
-	&:hover{
-		background-color:var(--ds-button-warning-background-hover-color);
-	}
-	&:disabled{
-		background-color: transparent;
-	}
-}
 dynamic-ng-bootstrap-checkbox .custom-control-label::before {
-    border-color: #858c91;
+    border-color: $gray-700;
 }
+
 .text-warning {
-    color: var(--ds-text-warning-color) !important;
+    color: darken($warning, 10%) !important;
 }
+
 .text-success {
-    color: var(--ds-text-success-color) !important;
+    color: darken($success, 11%) !important;
 }
+
 ngb-accordion {
     a.close {
         opacity: 0.75;
@@ -405,10 +426,29 @@ ngb-accordion {
     }
 }
 
+.form-control, .page-link {
+    &:disabled::placeholder {
+        color: lighten($gray-700, 10%);
+    }
+    &:focus {
+        box-shadow: none;
+        outline: 2px solid lighten($gray-700, 10%);
+        outline-offset: 2px !important;
+    }
+}
+
+.alert-success {
+    color: darken($success, 22%);
+}
+
+.alert-danger {
+    color: darken($danger, 22%);
+}
+
 // Margin utility classes based on DSpace content spacing
 .mt-cs { margin-top: var(--ds-content-spacing); }
 .mb-cs { margin-bottom: var(--ds-content-spacing); }
 .my-cs { margin-top: var(--ds-content-spacing); margin-bottom: var(--ds-content-spacing); }
 .mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
-.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
+.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
\ No newline at end of file
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index b5799c9749..aaa27f6f9e 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -12,7 +12,7 @@ $navbar-dark-color: #FFFFFF;
 /* Reassign color vars to semantic color scheme */
 $blue: #2b4e72 !default;
 $green: #92C642 !default;
-$cyan: #207698 !default;
+$cyan: #1e6f90 !default;
 $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;

From 868229460fe4bc9a454b9b6fecf7c34932ef4f07 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 30 Aug 2023 16:00:10 -0500
Subject: [PATCH 0049/1286] Add new e2e accessibility tests & update some
 existing ones

(cherry picked from commit 53d521a87e7e1962875f29f9f2f868b717f825ef)
---
 cypress/e2e/login-modal.cy.ts | 21 +++++++++++++++++----
 cypress/e2e/my-dspace.cy.ts   | 16 +++++-----------
 cypress/e2e/search-page.cy.ts |  5 ++---
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index d29c13c2f9..d4559dc6bf 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -109,6 +109,9 @@ describe('Login Modal', () => {
         cy.get('ds-themed-navbar [data-test="register"]').click();
         cy.location('pathname').should('eq', '/register');
         cy.get('ds-register-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-register-email');
     });
 
     it('should allow forgot password', () => {
@@ -123,16 +126,26 @@ describe('Login Modal', () => {
         cy.get('ds-themed-navbar [data-test="forgot"]').click();
         cy.location('pathname').should('eq', '/forgot');
         cy.get('ds-forgot-email').should('exist');
+
+        // Test accessibility of this page
+        testA11y('ds-forgot-email');
     });
 
-    it('should pass accessibility tests', () => {
+    it('should pass accessibility tests in menus', () => {
         cy.visit('/');
 
+        // Open login menu & verify accessibility
         page.openLoginMenu();
-
         cy.get('ds-log-in').should('exist');
-
-        // Analyze <ds-log-in> for accessibility issues
         testA11y('ds-log-in');
+
+        // Now login
+        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.get('ds-log-in').should('not.exist');
+
+        // Open user menu, verify user menu accesibility
+        page.openUserMenu();
+        cy.get('ds-user-menu').should('be.visible');
+        testA11y('ds-user-menu');
     });
 });
diff --git a/cypress/e2e/my-dspace.cy.ts b/cypress/e2e/my-dspace.cy.ts
index 13f4a1b547..4b27fe13de 100644
--- a/cypress/e2e/my-dspace.cy.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,4 +1,3 @@
-import { Options } from 'cypress-axe';
 import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
@@ -35,16 +34,8 @@ describe('My DSpace page', () => {
 
         cy.get('ds-object-detail').should('be.visible');
 
-        // Analyze <ds-search-page> for accessibility issues
-        testA11y('ds-my-dspace-page',
-            {
-                rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
-                }
-            } as Options
-        );
+        // Analyze <ds-my-dspace-page> for accessibility issues
+        testA11y('ds-my-dspace-page');
     });
 
     // NOTE: Deleting existing submissions is exercised by submission.spec.ts
@@ -136,6 +127,9 @@ describe('My DSpace page', () => {
 
         // The external import searchbox should be visible
         cy.get('ds-submission-import-external-searchbar').should('be.visible');
+
+        // Test for accessibility issues
+        testA11y('ds-submission-import-external');
     });
 
 });
diff --git a/cypress/e2e/search-page.cy.ts b/cypress/e2e/search-page.cy.ts
index 755f8eaac6..aca3d23d04 100644
--- a/cypress/e2e/search-page.cy.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -46,9 +46,8 @@ describe('Search Page', () => {
         testA11y('ds-search-page',
             {
                 rules: {
-                    // Search filters fail these two "moderate" impact rules
-                    'heading-order': { enabled: false },
-                    'landmark-unique': { enabled: false }
+                    // Card titles fail this test currently
+                    'heading-order': { enabled: false }
                 }
             } as Options
         );

From e9efb50e02aa268525cd308628cc5123659b8993 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 1 Sep 2023 09:47:32 -0500
Subject: [PATCH 0050/1286] Fix ARIA labels on submission form relationship
 button and dynamic dropdowns

(cherry picked from commit aeea1cd592c9dfe7bb1f98f096c6eb0f3d6d3cf2)
---
 .../ds-dynamic-form-control-container.component.html       | 2 ++
 .../dynamic-scrollable-dropdown.component.html             | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 9e1f1d48aa..606db29db3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -45,7 +45,9 @@
       <button class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.lookup-help' | translate}}"
+              [attr.aria-label]="'form.lookup-help' | translate"
               placement="top"
+              data-test="lookup-button"
               (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 1ac38e9943..3be79b20f3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -2,14 +2,15 @@
   <div class="position-relative right-addon"
        role="combobox"
        [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'">
+       [attr.aria-owns]="'combobox_' + id + '_listbox'"
+       [attr.aria-expanded]="sdRef.isOpen()"
+       [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
        <i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
           aria-hidden="true"></i>
        <i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
           aria-hidden="true"></i>
     <input class="form-control"
            [attr.aria-controls]="'combobox_' + id + '_listbox'"
-           [attr.aria-activedescendant]="'combobox_' + id + '_selected'"
            [attr.aria-label]="model.placeholder"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
@@ -28,8 +29,6 @@
 
   <div ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
-       aria-haspopup="true"
-       aria-expanded="false"
        [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
          role="listbox"

From 07b95c2634af6e5f9a64aa351564a1c902bc9fdc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 1 Sep 2023 09:48:17 -0500
Subject: [PATCH 0051/1286] Fix ARIA labels and tabindex on date picker in
 submission form.  Tabindex is unnecessary & throws accessibility errors from
 AXE tools

(cherry picked from commit 5dad8bec392cc581baa7116559fe780be51198cf)
---
 .../models/date-picker/date-picker.component.html           | 6 +++---
 .../shared/form/number-picker/number-picker.component.html  | 5 +++--
 .../form/number-picker/number-picker.component.spec.ts      | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 26803f3c67..3bf02c4abd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -4,7 +4,7 @@
       {{model.placeholder}} <span *ngIf="model.required">*</span>
     </legend>
     <ds-number-picker
-      tabindex="1"
+      tabindex="0"
       [id]="model.id + '_year'"
       [disabled]="model.disabled"
       [min]="minYear"
@@ -21,7 +21,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="2"
+      tabindex="0"
       [id]="model.id + '_month'"
       [min]="minMonth"
       [max]="maxMonth"
@@ -37,7 +37,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="3"
+      tabindex="0"
       [id]="model.id + '_day'"
       [min]="minDay"
       [max]="maxDay"
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 9b2ef98925..d4cf9e23f4 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -6,7 +6,7 @@
       [disabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
-      <span class="sr-only">Increment</span>
+      <span class="sr-only">Increment {{placeholder}}</span>
     </button>
     <input
       id="{{id}}"
@@ -24,6 +24,7 @@
       [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
+      [attr.aria-label]="placeholder"
     >
     <button
       class="btn btn-link-focus"
@@ -32,6 +33,6 @@
       [disabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
-      <span class="sr-only">Decrement</span>
+      <span class="sr-only">Decrement {{placeholder}}</span>
     </button>
 </div>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index d4484dbfa3..bf33a6bdd0 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -42,7 +42,6 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        tabindex="1"
         [disabled]="disabled"
         [min]="min"
         [max]="max"

From 0be04c754a52cd5b4a3f4c732d58e4737afbb4de Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 1 Sep 2023 11:29:05 -0500
Subject: [PATCH 0052/1286] Refactor e2e test infrastruction to allow easier
 way to lookup REST API info and generate CSRF tokens

(cherry picked from commit a581219df59b494d12838c1bb82097e7e1e93660)
---
 cypress/plugins/index.ts    |  24 +++++
 cypress/support/commands.ts | 177 +++++++++++++++---------------------
 cypress/support/e2e.ts      |  51 ++++++++---
 3 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts
index ead38afb92..cc3dccba38 100644
--- a/cypress/plugins/index.ts
+++ b/cypress/plugins/index.ts
@@ -1,5 +1,11 @@
 const fs = require('fs');
 
+// These two global variables are used to store information about the REST API used
+// by these e2e tests. They are filled out prior to running any tests in the before()
+// method of e2e.ts. They can then be accessed by any tests via the getters below.
+let REST_BASE_URL: string;
+let REST_DOMAIN: string;
+
 // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress
 // For more info, visit https://on.cypress.io/plugins-api
 module.exports = (on, config) => {
@@ -30,6 +36,24 @@ module.exports = (on, config) => {
             }
 
             return null;
+        },
+        // Save value of REST Base URL, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseURL() below.
+        saveRestBaseURL(url: string) {
+            return (REST_BASE_URL = url);
+        },
+        // Retrieve currently saved value of REST Base URL
+        getRestBaseURL() {
+            return REST_BASE_URL ;
+        },
+        // Save value of REST Domain, looked up before all tests.
+        // This allows other tests to use it easily via getRestBaseDomain() below.
+        saveRestBaseDomain(domain: string) {
+            return (REST_DOMAIN = domain);
+        },
+        // Retrieve currently saved value of REST Domain
+        getRestBaseDomain() {
+            return REST_DOMAIN ;
         }
     });
 };
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 92f0b1aeeb..7da454e2d0 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -5,11 +5,7 @@
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
 import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
-
-// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
-// from the Angular UI's config.json. See 'login()'.
-export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
-export const FALLBACK_TEST_REST_DOMAIN = 'localhost';
+import { v4 as uuidv4 } from 'uuid';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
 // ALL custom commands MUST be listed here for code completion to work
@@ -41,6 +37,13 @@ declare global {
              * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
              */
             generateViewEvent(uuid: string, dsoType: string): typeof generateViewEvent;
+
+            /**
+             * Create a new CSRF token and add to required Cookie. CSRF Token is returned
+             * in chainable in order to allow it to be sent also in required CSRF header.
+             * @returns Chainable reference to allow CSRF token to also be sent in header.
+             */
+            createCSRFCookie(): Chainable<any>;
         }
     }
 }
@@ -54,59 +57,32 @@ declare global {
  * @param password password to login as
  */
 function login(email: string, password: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send login POST request including that CSRF token
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/authn/login',
+                headers: { [XSRF_REQUEST_HEADER]: csrfToken},
+                form: true, // indicates the body should be form urlencoded
+                body: { user: email, password: password }
+            }).then((resp) => {
+                // We expect a successful login
+                expect(resp.status).to.eq(200);
+                // We expect to have a valid authorization header returned (with our auth token)
+                expect(resp.headers).to.have.property('authorization');
 
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            //console.log("Found 'rest.baseUrl' in config.json. Using this REST API for login: ".concat(config.rest.baseUrl));
-            baseRestUrl = config.rest.baseUrl;
-        }
+                // Initialize our AuthTokenInfo object from the authorization header.
+                const authheader = resp.headers.authorization as string;
+                const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
 
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeLoginCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send login POST request including that CSRF token
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/authn/login',
-            headers: { [XSRF_REQUEST_HEADER]: csrfToken},
-            form: true, // indicates the body should be form urlencoded
-            body: { user: email, password: password }
-        }).then((resp) => {
-            // We expect a successful login
-            expect(resp.status).to.eq(200);
-            // We expect to have a valid authorization header returned (with our auth token)
-            expect(resp.headers).to.have.property('authorization');
-
-            // Initialize our AuthTokenInfo object from the authorization header.
-            const authheader = resp.headers.authorization as string;
-            const authinfo: AuthTokenInfo = new AuthTokenInfo(authheader);
-
-            // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
-            // This ensures the UI will recognize we are logged in on next "visit()"
-            cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+                // Save our AuthTokenInfo object to our dsAuthInfo UI cookie
+                // This ensures the UI will recognize we are logged in on next "visit()"
+                cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.login')
@@ -141,56 +117,53 @@ Cypress.Commands.add('loginViaForm', loginViaForm);
  * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
  */
 function generateViewEvent(uuid: string, dsoType: string): void {
-    // Cypress doesn't have access to the running application in Node.js.
-    // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
-    // Instead, we'll read our running application's config.json, which contains the configs &
-    // is regenerated at runtime each time the Angular UI application starts up.
-    cy.task('readUIConfig').then((str: string) => {
-        // Parse config into a JSON object
-        const config = JSON.parse(str);
-
-        // Find the URL of our REST API. Have a fallback ready, just in case 'rest.baseUrl' cannot be found.
-        let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
-        if (!config.rest.baseUrl) {
-            console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
-        } else {
-            baseRestUrl = config.rest.baseUrl;
-        }
-
-        // Now find domain of our REST API, again with a fallback.
-        let baseDomain = FALLBACK_TEST_REST_DOMAIN;
-        if (!config.rest.host) {
-            console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
-        } else {
-            baseDomain = config.rest.host;
-        }
-
-        // Create a fake CSRF Token.  Set it in the required server-side cookie
-        const csrfToken = 'fakeGenerateViewEventCSRFToken';
-        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
-
-        // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
-        cy.request({
-            method: 'POST',
-            url: baseRestUrl + '/api/statistics/viewevents',
-            headers: {
-                [XSRF_REQUEST_HEADER] : csrfToken,
-                // use a known public IP address to avoid being seen as a "bot"
-                'X-Forwarded-For': '1.1.1.1',
-                // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot"
-                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0',
-            },
-            //form: true, // indicates the body should be form urlencoded
-            body: { targetId: uuid, targetType: dsoType },
-        }).then((resp) => {
-            // We expect a 201 (which means statistics event was created)
-            expect(resp.status).to.eq(201);
+    // Create a fake CSRF cookie/token to use in POST
+    cy.createCSRFCookie().then((csrfToken: string) => {
+        // get our REST API's base URL, also needed for POST
+        cy.task('getRestBaseURL').then((baseRestUrl: string) => {
+            // Now, send 'statistics/viewevents' POST request including that fake CSRF token in required header
+            cy.request({
+                method: 'POST',
+                url: baseRestUrl + '/api/statistics/viewevents',
+                headers: {
+                    [XSRF_REQUEST_HEADER] : csrfToken,
+                    // use a known public IP address to avoid being seen as a "bot"
+                    'X-Forwarded-For': '1.1.1.1',
+                    // Use a user-agent of a Firefox browser on Windows. This again avoids being seen as a "bot"
+                    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/119.0',
+                },
+                //form: true, // indicates the body should be form urlencoded
+                body: { targetId: uuid, targetType: dsoType },
+            }).then((resp) => {
+                // We expect a 201 (which means statistics event was created)
+                expect(resp.status).to.eq(201);
+            });
         });
-
-        // Remove cookie with fake CSRF token, as it's no longer needed
-        cy.clearCookie(DSPACE_XSRF_COOKIE);
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.generateViewEvent')
 Cypress.Commands.add('generateViewEvent', generateViewEvent);
 
+
+/**
+ * Can be used by tests to generate a random XSRF/CSRF token and save it to
+ * the required XSRF/CSRF cookie for usage when sending POST requests or similar.
+ * The generated CSRF token is returned in a Chainable to allow it to be also sent
+ * in the CSRF HTTP Header.
+ * @returns a Cypress Chainable which can be used to get the generated CSRF Token
+ */
+function createCSRFCookie(): Cypress.Chainable {
+    // Generate a new token which is a random UUID
+    const csrfToken: string = uuidv4();
+
+    // Save it to our required cookie
+    cy.task('getRestBaseDomain').then((baseDomain: string) => {
+        // Create a fake CSRF Token.  Set it in the required server-side cookie
+        cy.setCookie(DSPACE_XSRF_COOKIE, csrfToken, { 'domain': baseDomain });
+    });
+
+    // return the generated token wrapped in a chainable
+    return cy.wrap(csrfToken);
+}
+// Add as a Cypress command (i.e. assign to 'cy.createCSRFCookie')
+Cypress.Commands.add('createCSRFCookie', createCSRFCookie);
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index dd7ee1824c..5e4fddb805 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -19,24 +19,50 @@ import './commands';
 // Import Cypress Axe tools for all tests
 // https://github.com/component-driven/cypress-axe
 import 'cypress-axe';
+import { DSPACE_XSRF_COOKIE } from 'src/app/core/xsrf/xsrf.constants';
+
+
+// Runs once before all tests
+before(() => {
+  // Cypress doesn't have access to the running application in Node.js.
+  // So, it's not possible to inject or load the AppConfig or environment of the Angular UI.
+  // Instead, we'll read our running application's config.json, which contains the configs &
+  // is regenerated at runtime each time the Angular UI application starts up.
+  cy.task('readUIConfig').then((str: string) => {
+    // Parse config into a JSON object
+    const config = JSON.parse(str);
+
+    // Find URL of our REST API & save to global variable via task
+    let baseRestUrl = FALLBACK_TEST_REST_BASE_URL;
+    if (!config.rest.baseUrl) {
+        console.warn("Could not load 'rest.baseUrl' from config.json. Falling back to " + FALLBACK_TEST_REST_BASE_URL);
+    } else {
+        baseRestUrl = config.rest.baseUrl;
+    }
+    cy.task('saveRestBaseURL', baseRestUrl);
+
+    // Find domain of our REST API & save to global variable via task.
+    let baseDomain = FALLBACK_TEST_REST_DOMAIN;
+    if (!config.rest.host) {
+        console.warn("Could not load 'rest.host' from config.json. Falling back to " + FALLBACK_TEST_REST_DOMAIN);
+    } else {
+        baseDomain = config.rest.host;
+    }
+    cy.task('saveRestBaseDomain', baseDomain);
+
+  });
+});
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
     // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
     // This just ensures it doesn't get in the way of matching other objects in the page.
     cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+
+    // Remove any CSRF cookies saved from prior tests
+    cy.clearCookie(DSPACE_XSRF_COOKIE);
 });
 
-// For better stability between tests, we visit "about:blank" (i.e. blank page) after each test.
-// This ensures any remaining/outstanding XHR requests are killed, so they don't affect the next test.
-// Borrowed from: https://glebbahmutov.com/blog/visit-blank-page-between-tests/
-/*afterEach(() => {
-    cy.window().then((win) => {
-      win.location.href = 'about:blank';
-    });
-});*/
-
-
 // Global constants used in tests
 // May be overridden in our cypress.json config file using specified environment variables.
 // Default values listed here are all valid for the Demo Entities Data set available at
@@ -57,7 +83,10 @@ export const TEST_SUBMIT_COLLECTION_NAME = Cypress.env('DSPACE_TEST_SUBMIT_COLLE
 export const TEST_SUBMIT_COLLECTION_UUID = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID') || '9d8334e9-25d3-4a67-9cea-3dffdef80144';
 export const TEST_SUBMIT_USER = Cypress.env('DSPACE_TEST_SUBMIT_USER') || 'dspacedemo+submit@gmail.com';
 export const TEST_SUBMIT_USER_PASSWORD = Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD') || 'dspace';
-
+// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
+// from the Angular UI's config.json. See 'before()' above.
+const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
+const FALLBACK_TEST_REST_DOMAIN = 'localhost';
 
 // USEFUL REGEX for testing
 

From 023f8a69000517db589601a750d690eeff66e03e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 5 Sep 2023 14:47:59 -0500
Subject: [PATCH 0053/1286] Improve accessibility testing on Submission page

(cherry picked from commit 8d61fa6ac3cb65e72bfd2d9afb3a80908e4b8774)
---
 cypress/e2e/submission.cy.ts | 87 +++++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index ed10b2d13a..43a063035d 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -1,8 +1,10 @@
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support/e2e';
+import { testA11y } from 'cypress/support/utils';
+import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
+import { Options } from 'cypress-axe';
 
 describe('New Submission page', () => {
-    // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
 
+    // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts
     it('should create a new submission when using /submit path & pass accessibility', () => {
         // Test that calling /submit with collection & entityType will create a new submission
         cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
@@ -25,6 +27,22 @@ describe('New Submission page', () => {
         cy.get('div#section_upload').should('be.visible');
         cy.get('div#section_license').should('be.visible');
 
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // Author & Subject fields have invalid "aria-multiline" attrs, see #1272
+                    'aria-allowed-attr': { enabled: false },
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive". Seem to require updating ng-bootstrap and #2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                    // All select boxes fail to have a name / aria-label. This is a bug in ng-dynamic-forms and may require #2216
+                    'select-name': { enabled: false },
+                }
+
+            } as Options
+        );
+
         // Discard button should work
         // Clicking it will display a confirmation, which we will confirm with another click
         cy.get('button#discard').click();
@@ -131,4 +149,69 @@ describe('New Submission page', () => {
         cy.get('ds-notification div.alert-success').should('be.visible');
     });
 
+    it('is possible to submit a new "Person" and that form passes accessibility', () => {
+        // To submit a different entity type, we'll start from MyDSpace
+        cy.visit('/mydspace');
+
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        // NOTE: At this time, we MUST login as admin to submit Person objects
+        cy.loginViaForm(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+
+        // Open the New Submission dropdown
+        cy.get('button[data-test="submission-dropdown"]').click();
+        // Click on the "Person" type in that dropdown
+        cy.get('#entityControlsDropdownMenu button[title="Person"]').click();
+
+        // This should display the <ds-create-item-parent-selector> (popup window)
+        cy.get('ds-create-item-parent-selector').should('be.visible');
+
+        // Click on the first Collection button to seelect a collection (actual collection doesn't matter)
+        cy.get('ds-authorized-collection-selector button:first-child').click();
+
+        // New URL should include /workspaceitems, as we've started a new submission
+        cy.url().should('include', '/workspaceitems');
+
+        // The Submission edit form tag should be visible
+        cy.get('ds-submission-edit').should('be.visible');
+
+        // 3 sections should be visible by default
+        cy.get('div#section_personStep').should('be.visible');
+        cy.get('div#section_upload').should('be.visible');
+        cy.get('div#section_license').should('be.visible');
+
+        // Test entire page for accessibility
+        testA11y('ds-submission-edit',
+            {
+                rules: {
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive". Seem to require updating ng-bootstrap and #2216
+                    'aria-required-children': { enabled: false },
+                    'nested-interactive': { enabled: false },
+                }
+
+            } as Options
+        );
+
+        // Click the lookup button next to "Publication" field
+        cy.get('button[data-test="lookup-button"]').click();
+
+        // A popup modal window should be visible
+        cy.get('ds-dynamic-lookup-relation-modal').should('be.visible');
+
+        // Popup modal should also pass accessibility tests
+        //testA11y('ds-dynamic-lookup-relation-modal');
+        testA11y({
+            include: ['ds-dynamic-lookup-relation-modal'],
+            exclude: [
+                ['ul.nav-tabs'] // Tabs at top of model have several issues which seem to be caused by ng-bootstrap
+            ],
+        });
+
+        // Close popup window
+        cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+
+        // Back on the form, click the discard button to remove new submission
+        // Clicking it will display a confirmation, which we will confirm with another click
+        cy.get('button#discard').click();
+        cy.get('button#discard_submit').click();
+    });
 });

From 77bb3ed9520b0ba9040b2734592497f107c27a56 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 8 Sep 2023 16:14:24 -0500
Subject: [PATCH 0054/1286] Fix circular dependency issue by using Cypres env
 variables directly instead of global constants

(cherry picked from commit e47593b303f269a18b2a40b7920daa85a6c23123)
---
 cypress.config.ts                       |  5 +++--
 cypress/e2e/breadcrumbs.cy.ts           |  3 +--
 cypress/e2e/collection-page.cy.ts       |  3 +--
 cypress/e2e/collection-statistics.cy.ts |  8 ++++----
 cypress/e2e/community-page.cy.ts        |  3 +--
 cypress/e2e/community-statistics.cy.ts  |  8 ++++----
 cypress/e2e/homepage-statistics.cy.ts   |  6 +++---
 cypress/e2e/item-page.cy.ts             |  5 ++---
 cypress/e2e/item-statistics.cy.ts       |  8 ++++----
 cypress/e2e/login-modal.cy.ts           | 11 +++++------
 cypress/e2e/my-dspace.cy.ts             | 15 +++++++--------
 cypress/e2e/search-navbar.cy.ts         |  4 +---
 cypress/e2e/search-page.cy.ts           | 10 ++++++----
 cypress/e2e/submission.cy.ts            | 18 +++++++++---------
 cypress/support/e2e.ts                  | 20 --------------------
 15 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/cypress.config.ts b/cypress.config.ts
index 91eeb9838b..b1da2b4793 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -9,8 +9,9 @@ export default defineConfig({
     openMode: 0,
   },
   env: {
-    // Global constants used in DSpace e2e tests (see also ./cypress/support/e2e.ts)
-    // May be overridden in our cypress.json config file using specified environment variables.
+    // Global DSpace environment variables used in all our Cypress e2e tests
+    // May be modified in this config, or overridden in a variety of ways.
+    // See Cypress environment variable docs: https://docs.cypress.io/guides/guides/environment-variables
     // Default values listed here are all valid for the Demo Entities Data set available at
     // https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
     // (This is the data set used in our CI environment)
diff --git a/cypress/e2e/breadcrumbs.cy.ts b/cypress/e2e/breadcrumbs.cy.ts
index ea6acdafcd..0cddbc723c 100644
--- a/cypress/e2e/breadcrumbs.cy.ts
+++ b/cypress/e2e/breadcrumbs.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Breadcrumbs', () => {
     it('should pass accessibility tests', () => {
         // Visit an Item, as those have more breadcrumbs
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
 
         // Wait for breadcrumbs to be visible
         cy.get('ds-breadcrumbs').should('be.visible');
diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index a034b4361d..55c10cc6e2 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_COLLECTION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
         // <ds-collection-page> tag must be loaded
         cy.get('ds-collection-page').should('be.visible');
diff --git a/cypress/e2e/collection-statistics.cy.ts b/cypress/e2e/collection-statistics.cy.ts
index 6df4e9a454..43bf67ce51 100644
--- a/cypress/e2e/collection-statistics.cy.ts
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -1,11 +1,11 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COLLECTION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Statistics Page', () => {
-    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(TEST_COLLECTION);
+    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'));
 
     it('should load if you click on "Statistics" from a Collection page', () => {
-        cy.visit('/collections/'.concat(TEST_COLLECTION));
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
         cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
         cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
     });
@@ -18,7 +18,7 @@ describe('Collection Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COLLECTIONSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COLLECTION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/community-page.cy.ts b/cypress/e2e/community-page.cy.ts
index 6c628e21ce..4a2e2f9baa 100644
--- a/cypress/e2e/community-page.cy.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_COMMUNITY } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
 
         // <ds-community-page> tag must be loaded
         cy.get('ds-community-page').should('be.visible');
diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts
index 710450e797..ca306eff5c 100644
--- a/cypress/e2e/community-statistics.cy.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -1,11 +1,11 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_COMMUNITY } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Statistics Page', () => {
-    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(TEST_COMMUNITY);
+    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'));
 
     it('should load if you click on "Statistics" from a Community page', () => {
-        cy.visit('/communities/'.concat(TEST_COMMUNITY));
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
         cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
         cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
     });
@@ -18,7 +18,7 @@ describe('Community Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(COMMUNITYSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_COMMUNITY).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index 2a1ab9785a..ff7dbeb852 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -1,4 +1,4 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 import '../support/commands';
 
@@ -11,8 +11,8 @@ describe('Site Statistics Page', () => {
 
     it('should pass accessibility tests', () => {
         // generate 2 view events on an Item's page
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
-        cy.generateViewEvent(TEST_ENTITY_PUBLICATION, 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
 
         cy.visit('/statistics');
 
diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index 9dba6eb8ce..a6a208e9f4 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -1,9 +1,8 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item  Page', () => {
-    const ITEMPAGE = '/items/'.concat(TEST_ENTITY_PUBLICATION);
-    const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMPAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
+    const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid]
     it('should redirect to the entity page when navigating to an item page', () => {
diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index 9b90cb24af..b856744cba 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -1,11 +1,11 @@
-import { REGEX_MATCH_NON_EMPTY_TEXT, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
+import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Item Statistics Page', () => {
-    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(TEST_ENTITY_PUBLICATION);
+    const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
-        cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
         cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
@@ -24,7 +24,7 @@ describe('Item Statistics Page', () => {
     it('should contain a "Total visits per month" section', () => {
         cy.visit(ITEMSTATISTICSPAGE);
         // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(TEST_ENTITY_PUBLICATION).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('.'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('_TotalVisitsPerMonth')).should('exist');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index d4559dc6bf..c56b98fd26 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,4 +1,3 @@
-import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 const page = {
@@ -37,7 +36,7 @@ const page = {
 
 describe('Login Modal', () => {
     it('should login when clicking button & stay on same page', () => {
-        const ENTITYPAGE = '/entities/publication/'.concat(TEST_ENTITY_PUBLICATION);
+        const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
         cy.visit(ENTITYPAGE);
 
         // Login menu should exist
@@ -47,7 +46,7 @@ describe('Login Modal', () => {
         page.openLoginMenu();
         cy.get('.form-login').should('be.visible');
 
-        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('ds-log-in').should('not.exist');
 
         // Verify we are still on the same page
@@ -67,7 +66,7 @@ describe('Login Modal', () => {
         cy.get('.form-login').should('be.visible');
 
         // Login, and the <ds-log-in> tag should no longer exist
-        page.submitLoginAndPasswordByPressingEnter(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('.form-login').should('not.exist');
 
         // Verify we are still on homepage
@@ -81,7 +80,7 @@ describe('Login Modal', () => {
 
     it('should support logout', () => {
         // First authenticate & access homepage
-        cy.login(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.login(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.visit('/');
 
         // Verify ds-log-in tag doesn't exist, but ds-log-out tag does exist
@@ -140,7 +139,7 @@ describe('Login Modal', () => {
         testA11y('ds-log-in');
 
         // Now login
-        page.submitLoginAndPasswordByPressingButton(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('ds-log-in').should('not.exist');
 
         // Open user menu, verify user menu accesibility
diff --git a/cypress/e2e/my-dspace.cy.ts b/cypress/e2e/my-dspace.cy.ts
index 4b27fe13de..c48656ffcc 100644
--- a/cypress/e2e/my-dspace.cy.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,4 +1,3 @@
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('My DSpace page', () => {
@@ -6,7 +5,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -25,7 +24,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         cy.get('ds-my-dspace-page').should('be.visible');
 
@@ -43,7 +42,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Submission dropdown
         cy.get('button[data-test="submission-dropdown"]').click();
@@ -54,10 +53,10 @@ describe('My DSpace page', () => {
         cy.get('ds-create-item-parent-selector').should('be.visible');
 
         // Type in a known Collection name in the search box
-        cy.get('ds-authorized-collection-selector input[type="search"]').type(TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Click on the button matching that known Collection name
-        cy.get('ds-authorized-collection-selector button[title="'.concat(TEST_SUBMIT_COLLECTION_NAME).concat('"]')).click();
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME')).concat('"]')).click();
 
         // New URL should include /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -66,7 +65,7 @@ describe('My DSpace page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & its value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // Now that we've created a submission, we'll test that we can go back and Edit it.
         // Get our Submission URL, to parse out the ID of this new submission
@@ -115,7 +114,7 @@ describe('My DSpace page', () => {
         cy.visit('/mydspace');
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Open the New Import dropdown
         cy.get('button[data-test="import-dropdown"]').click();
diff --git a/cypress/e2e/search-navbar.cy.ts b/cypress/e2e/search-navbar.cy.ts
index 648db17fe6..9dd93c7a2d 100644
--- a/cypress/e2e/search-navbar.cy.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,5 +1,3 @@
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
-
 const page = {
     fillOutQueryInNavBar(query) {
         // Click the magnifying glass
@@ -17,7 +15,7 @@ const page = {
 
 describe('Search from Navigation Bar', () => {
     // NOTE: these tests currently assume this query will return results!
-    const query = TEST_SEARCH_TERM;
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
 
     it('should go to search page with correct query if submitted (from home)', () => {
         cy.visit('/');
diff --git a/cypress/e2e/search-page.cy.ts b/cypress/e2e/search-page.cy.ts
index aca3d23d04..429f4e6da4 100644
--- a/cypress/e2e/search-page.cy.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,8 +1,10 @@
 import { Options } from 'cypress-axe';
-import { TEST_SEARCH_TERM } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Search Page', () => {
+    // NOTE: these tests currently assume this query will return results!
+    const query = Cypress.env('DSPACE_TEST_SEARCH_TERM');
+
     it('should redirect to the correct url when query was set and submit button was triggered', () => {
         const queryString = 'Another interesting query string';
         cy.visit('/search');
@@ -13,8 +15,8 @@ describe('Search Page', () => {
     });
 
     it('should load results and pass accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
-        cy.get('[data-test="search-box"]').should('have.value', TEST_SEARCH_TERM);
+        cy.visit('/search?query='.concat(query));
+        cy.get('[data-test="search-box"]').should('have.value', query);
 
         // <ds-search-page> tag must be loaded
         cy.get('ds-search-page').should('be.visible');
@@ -31,7 +33,7 @@ describe('Search Page', () => {
     });
 
     it('should have a working grid view that passes accessibility tests', () => {
-        cy.visit('/search?query='.concat(TEST_SEARCH_TERM));
+        cy.visit('/search?query='.concat(query));
 
         // Click button in sidebar to display grid view
         cy.get('ds-search-sidebar [data-test="grid-view"]').click();
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index 43a063035d..2b482d8515 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -1,5 +1,5 @@
 import { testA11y } from 'cypress/support/utils';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
+//import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
 import { Options } from 'cypress-axe';
 
 describe('New Submission page', () => {
@@ -7,10 +7,10 @@ describe('New Submission page', () => {
     // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts
     it('should create a new submission when using /submit path & pass accessibility', () => {
         // Test that calling /submit with collection & entityType will create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Should redirect to /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -19,7 +19,7 @@ describe('New Submission page', () => {
         cy.get('ds-submission-edit').should('be.visible');
 
         // A Collection menu button should exist & it's value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
 
         // 4 sections should be visible by default
         cy.get('div#section_traditionalpageone').should('be.visible');
@@ -51,10 +51,10 @@ describe('New Submission page', () => {
 
     it('should block submission & show errors if required fields are missing', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Attempt an immediate deposit without filling out any fields
         cy.get('button#deposit').click();
@@ -111,10 +111,10 @@ describe('New Submission page', () => {
 
     it('should allow for deposit if all required fields completed & file uploaded', () => {
         // Create a new submission
-        cy.visit('/submit?collection='.concat(TEST_SUBMIT_COLLECTION_UUID).concat('&entityType=none'));
+        cy.visit('/submit?collection='.concat(Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID')).concat('&entityType=none'));
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
-        cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
 
         // Fill out all required fields (Title, Date)
         cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
@@ -155,7 +155,7 @@ describe('New Submission page', () => {
 
         // This page is restricted, so we will be shown the login form. Fill it out & submit.
         // NOTE: At this time, we MUST login as admin to submit Person objects
-        cy.loginViaForm(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
 
         // Open the New Submission dropdown
         cy.get('button[data-test="submission-dropdown"]').click();
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 5e4fddb805..f6c6865052 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -63,26 +63,6 @@ beforeEach(() => {
     cy.clearCookie(DSPACE_XSRF_COOKIE);
 });
 
-// Global constants used in tests
-// May be overridden in our cypress.json config file using specified environment variables.
-// Default values listed here are all valid for the Demo Entities Data set available at
-// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
-// (This is the data set used in our CI environment)
-
-// Admin account used for administrative tests
-export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com';
-export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace';
-// Community/collection/publication used for view/edit tests
-export const TEST_COLLECTION = Cypress.env('DSPACE_TEST_COLLECTION') || '282164f5-d325-4740-8dd1-fa4d6d3e7200';
-export const TEST_COMMUNITY = Cypress.env('DSPACE_TEST_COMMUNITY') || '0958c910-2037-42a9-81c7-dca80e3892b4';
-export const TEST_ENTITY_PUBLICATION = Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION') || 'e98b0f27-5c19-49a0-960d-eb6ad5287067';
-// Search term (should return results) used in search tests
-export const TEST_SEARCH_TERM = Cypress.env('DSPACE_TEST_SEARCH_TERM') || 'test';
-// Collection used for submission tests
-export const TEST_SUBMIT_COLLECTION_NAME = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME') || 'Sample Collection';
-export const TEST_SUBMIT_COLLECTION_UUID = Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_UUID') || '9d8334e9-25d3-4a67-9cea-3dffdef80144';
-export const TEST_SUBMIT_USER = Cypress.env('DSPACE_TEST_SUBMIT_USER') || 'dspacedemo+submit@gmail.com';
-export const TEST_SUBMIT_USER_PASSWORD = Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD') || 'dspace';
 // NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
 // from the Angular UI's config.json. See 'before()' above.
 const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';

From 4187847ad06560523cebaf0e45444948f5433619 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 8 Dec 2023 14:54:15 -0600
Subject: [PATCH 0055/1286] Add Edit Community accessibility tests & minor
 cleanup

(cherry picked from commit 6c76d8c1d77c5466042edc5301e81742546640b4)
---
 cypress/e2e/community-edit.cy.ts              | 98 +++++++++++++++++++
 cypress/e2e/community-page.cy.ts              |  2 +-
 cypress/e2e/submission.cy.ts                  | 12 ++-
 .../edit-comcol-page.component.html           |  6 +-
 4 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 cypress/e2e/community-edit.cy.ts

diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
new file mode 100644
index 0000000000..06d78701f0
--- /dev/null
+++ b/cypress/e2e/community-edit.cy.ts
@@ -0,0 +1,98 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COMMUNITY_EDIT_PAGE = '/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Community Page
+    cy.visit(COMMUNITY_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Community > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-community> tag must be loaded
+        cy.get('ds-edit-community').should('be.visible');
+
+        // Analyze <ds-edit-community> for accessibility issues
+        testA11y('ds-edit-community');
+    });
+});
+
+describe('Edit Community > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-community-roles> tag must be loaded
+        cy.get('ds-community-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-roles');
+    });
+});
+
+describe('Edit Community > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-community-curate> tag must be loaded
+        cy.get('ds-community-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-curate');
+    });
+});
+
+describe('Edit Community > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-community-access-control> tag must be loaded
+        cy.get('ds-community-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-access-control');
+    });
+});
+
+describe('Edit Community > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-community-authorizations> tag must be loaded
+        cy.get('ds-community-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-community-authorizations');
+    });
+
+    it('should have an edit policy page which also passes accessibility tests', () => {
+        cy.visit(COMMUNITY_EDIT_PAGE.concat('/authorizations'));
+
+        cy.get('button[title="Edit policy"]').click();
+
+        // <ds-resource-policy-edit> tag must be loaded
+        cy.get('ds-resource-policy-edit').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-resource-policy-edit');
+    });
+});
+
+describe('Edit Community > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-community> tag must be loaded
+        cy.get('ds-delete-community').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-community');
+    });
+});
diff --git a/cypress/e2e/community-page.cy.ts b/cypress/e2e/community-page.cy.ts
index 4a2e2f9baa..386bb592a0 100644
--- a/cypress/e2e/community-page.cy.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -9,6 +9,6 @@ describe('Community Page', () => {
         cy.get('ds-community-page').should('be.visible');
 
         // Analyze <ds-community-page> for accessibility issues
-        testA11y('ds-community-page',);
+        testA11y('ds-community-page');
     });
 });
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index 2b482d8515..97676ca25c 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -31,12 +31,15 @@ describe('New Submission page', () => {
         testA11y('ds-submission-edit',
             {
                 rules: {
-                    // Author & Subject fields have invalid "aria-multiline" attrs, see #1272
+                    // Author & Subject fields have invalid "aria-multiline" attrs.
+                    // See https://github.com/DSpace/dspace-angular/issues/1272
                     'aria-allowed-attr': { enabled: false },
-                    // All panels are accordians & fail "aria-required-children" and "nested-interactive". Seem to require updating ng-bootstrap and #2216
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                     'aria-required-children': { enabled: false },
                     'nested-interactive': { enabled: false },
-                    // All select boxes fail to have a name / aria-label. This is a bug in ng-dynamic-forms and may require #2216
+                    // All select boxes fail to have a name / aria-label.
+                    // This is a bug in ng-dynamic-forms and may require https://github.com/DSpace/dspace-angular/issues/2216
                     'select-name': { enabled: false },
                 }
 
@@ -183,7 +186,8 @@ describe('New Submission page', () => {
         testA11y('ds-submission-edit',
             {
                 rules: {
-                    // All panels are accordians & fail "aria-required-children" and "nested-interactive". Seem to require updating ng-bootstrap and #2216
+                    // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                    // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                     'aria-required-children': { enabled: false },
                     'nested-interactive': { enabled: false },
                 }
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index c397966fba..d7f15ce06b 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -5,7 +5,8 @@
         <h1>{{ type + '.edit.head' | translate }}</h1>
         <div class="my-auto">
           <a class="btn btn-danger"
-             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'">
+             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
+             data-test="delete-button">
             <i class="fas fa-trash"></i> {{type + '.edit.delete' | translate}}</a>
         </div>
       </div>
@@ -14,7 +15,8 @@
           <li *ngFor="let page of pages" class="nav-item">
             <a class="nav-link"
                [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]">
+               [routerLink]="['./' + page]"
+               [attr.data-test]="page">
               {{ type + '.edit.tabs.' + page + '.head' | translate}}
             </a>
           </li>

From 16a10548b8e13f842aee03faf21df7c7615e6827 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 8 Dec 2023 16:09:02 -0600
Subject: [PATCH 0056/1286] Add Edit Collection accessibility Testing

(cherry picked from commit 9894d315a09d116fcdc536ef23a7db1e5828dc59)
---
 cypress/e2e/collection-edit.cy.ts | 86 +++++++++++++++++++++++++++++++
 cypress/e2e/community-edit.cy.ts  | 12 -----
 2 files changed, 86 insertions(+), 12 deletions(-)
 create mode 100644 cypress/e2e/collection-edit.cy.ts

diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
new file mode 100644
index 0000000000..f6089acf70
--- /dev/null
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -0,0 +1,86 @@
+import { testA11y } from 'cypress/support/utils';
+
+const COLLECTION_EDIT_PAGE = '/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Collection Page
+    cy.visit(COLLECTION_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Collection > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        // <ds-edit-collection> tag must be loaded
+        cy.get('ds-edit-collection').should('be.visible');
+
+        // Analyze <ds-edit-collection> for accessibility issues
+        testA11y('ds-edit-collection');
+    });
+});
+
+describe('Edit Collection > Assign Roles tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="roles"]').click();
+
+        // <ds-collection-roles> tag must be loaded
+        cy.get('ds-collection-roles').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-roles');
+    });
+});
+
+describe('Edit Collection > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-collection-curate> tag must be loaded
+        cy.get('ds-collection-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-curate');
+    });
+});
+
+describe('Edit Collection > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-collection-access-control> tag must be loaded
+        cy.get('ds-collection-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-access-control');
+    });
+});
+
+describe('Edit Collection > Authorizations tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="authorizations"]').click();
+
+        // <ds-collection-authorizations> tag must be loaded
+        cy.get('ds-collection-authorizations').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-collection-authorizations');
+    });
+});
+
+describe('Edit Collection > Delete page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="delete-button"]').click();
+
+        // <ds-delete-collection> tag must be loaded
+        cy.get('ds-delete-collection').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-delete-collection');
+    });
+});
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
index 06d78701f0..8fc1a7733e 100644
--- a/cypress/e2e/community-edit.cy.ts
+++ b/cypress/e2e/community-edit.cy.ts
@@ -70,18 +70,6 @@ describe('Edit Community > Authorizations tab', () => {
         // Analyze for accessibility issues
         testA11y('ds-community-authorizations');
     });
-
-    it('should have an edit policy page which also passes accessibility tests', () => {
-        cy.visit(COMMUNITY_EDIT_PAGE.concat('/authorizations'));
-
-        cy.get('button[title="Edit policy"]').click();
-
-        // <ds-resource-policy-edit> tag must be loaded
-        cy.get('ds-resource-policy-edit').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-resource-policy-edit');
-    });
 });
 
 describe('Edit Community > Delete page', () => {

From 9a7277065f67b538f7b128a3621c6fa774cea488 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 8 Dec 2023 16:30:22 -0600
Subject: [PATCH 0057/1286] Add accessibility tests (and minor fixes) for Edit
 Collection's Content Source tab and Item Mapper tab

(cherry picked from commit 00cb2f9e8a2635eaa8e5bc4c5a4234cb723f86b0)
---
 cypress/e2e/collection-edit.cy.ts             | 42 +++++++++++++++++++
 .../collection-item-mapper.component.html     |  4 +-
 .../collection-source-controls.component.html |  2 +-
 .../collection-source.component.html          |  2 +-
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
index f6089acf70..3e7ecf6141 100644
--- a/cypress/e2e/collection-edit.cy.ts
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -33,6 +33,25 @@ describe('Edit Collection > Assign Roles tab', () => {
     });
 });
 
+describe('Edit Collection > Content Source tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="source"]').click();
+
+        // <ds-collection-source> tag must be loaded
+        cy.get('ds-collection-source').should('be.visible');
+
+        // Check the external source checkbox (to display all fields on the page)
+        cy.get('#externalSourceCheck').check();
+
+        // Wait for the source controls to appear
+        cy.get('ds-collection-source-controls').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-source');
+    });
+});
+
 describe('Edit Collection > Curate tab', () => {
 
     it('should pass accessibility tests', () => {
@@ -72,6 +91,29 @@ describe('Edit Collection > Authorizations tab', () => {
     });
 });
 
+describe('Edit Collection > Item Mapper tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="mapper"]').click();
+
+        // <ds-collection-item-mapper> tag must be loaded
+        cy.get('ds-collection-item-mapper').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-collection-item-mapper');
+
+        // Click on the "Map new Items" tab
+        cy.get('li[data-test="mapTab"] a').click();
+
+        // Make sure search form is now visible
+        cy.get('ds-search-form').should('be.visible');
+
+        // Analyze entire page (again) for accessibility issues
+        testA11y('ds-collection-item-mapper');
+    });
+});
+
+
 describe('Edit Collection > Delete page', () => {
 
     it('should pass accessibility tests', () => {
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index 649aa9b43d..77f85d5f78 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'collection.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'" role="presentation">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -23,7 +23,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'" role="presentation">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 4d7b3e657e..521c771cfa 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,6 +1,6 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
     <div class="container-fluid space-children-mr" *ngIf="shouldShow">
-        <h4>{{ 'collection.source.controls.head' | translate }}</h4>
+        <h3>{{ 'collection.source.controls.head' | translate }}</h3>
         <div>
             <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
             <span>{{contentSource?.harvestStatus}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 41e66610a8..b0c155ac95 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -26,7 +26,7 @@
                for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
     </div>
     <ds-themed-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-themed-loading>
-    <h4 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h4>
+    <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
 </div>
 <div class="row">
     <ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"

From 4e0a889fa18d45706e1c651abcfe74287d5185dc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 13 Dec 2023 14:56:52 -0600
Subject: [PATCH 0058/1286] Add Item Edit accessibility tests. Switch Item to
 use to one with bitstreams. Minor updates to HTML to pass accessibility
 tests.

(cherry picked from commit 80492cd88a2b7d7a33465c1b5042a96433c40d24)
---
 cypress.config.ts                             |   2 +-
 cypress/e2e/item-edit.cy.ts                   | 135 ++++++++++++++++++
 .../dso-edit-metadata-value.component.html    |  10 +-
 .../dso-edit-metadata-value.component.spec.ts |   2 +-
 .../edit-item-page.component.html             |   1 +
 .../item-collection-mapper.component.html     |   4 +-
 6 files changed, 145 insertions(+), 9 deletions(-)
 create mode 100644 cypress/e2e/item-edit.cy.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index b1da2b4793..4143327870 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -22,7 +22,7 @@ export default defineConfig({
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
     DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
-    DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
+    DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
     // Search term (should return results) used in search tests
     DSPACE_TEST_SEARCH_TERM: 'test',
     // Collection used for submission tests
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
new file mode 100644
index 0000000000..b4c01a1a94
--- /dev/null
+++ b/cypress/e2e/item-edit.cy.ts
@@ -0,0 +1,135 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');
+
+beforeEach(() => {
+    // All tests start with visiting the Edit Item Page
+    cy.visit(ITEM_EDIT_PAGE);
+
+    // This page is restricted, so we will be shown the login form. Fill it out & submit.
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Edit Item > Edit Metadata tab', () => {
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="metadata"]').click();
+
+        // <ds-edit-item-page> tag must be loaded
+        cy.get('ds-edit-item-page').should('be.visible');
+
+        // Analyze <ds-edit-item-page> for accessibility issues
+        testA11y('ds-edit-item-page');
+    });
+});
+
+describe('Edit Item > Status tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="status"]').click();
+
+        // <ds-item-status> tag must be loaded
+        cy.get('ds-item-status').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-status');
+    });
+});
+
+describe('Edit Item > Bitstreams tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="bitstreams"]').click();
+
+        // <ds-item-bitstreams> tag must be loaded
+        cy.get('ds-item-bitstreams').should('be.visible');
+
+        // Table of item bitstreams must also be loaded
+        cy.get('div.item-bitstreams').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-bitstreams',
+            {
+                rules: {
+                    // Currently Bitstreams page loads a pagination component per Bundle
+                    // and they all use the same 'id="p-dad"'.
+                    'duplicate-id': { enabled: false },
+                }
+            } as Options
+        );
+    });
+});
+
+describe('Edit Item > Curate tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="curate"]').click();
+
+        // <ds-item-curate> tag must be loaded
+        cy.get('ds-item-curate').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-curate');
+    });
+});
+
+describe('Edit Item > Relationships tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="relationships"]').click();
+
+        // <ds-item-relationships> tag must be loaded
+        cy.get('ds-item-relationships').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-relationships');
+    });
+});
+
+describe('Edit Item > Version History tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="versionhistory"]').click();
+
+        // <ds-item-version-history> tag must be loaded
+        cy.get('ds-item-version-history').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-version-history');
+    });
+});
+
+describe('Edit Item > Access Control tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="access-control"]').click();
+
+        // <ds-item-access-control> tag must be loaded
+        cy.get('ds-item-access-control').should('be.visible');
+
+        // Analyze for accessibility issues
+        testA11y('ds-item-access-control');
+    });
+});
+
+describe('Edit Item > Collection Mapper tab', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.get('a[data-test="mapper"]').click();
+
+        // <ds-item-collection-mapper> tag must be loaded
+        cy.get('ds-item-collection-mapper').should('be.visible');
+
+        // Analyze entire page for accessibility issues
+        testA11y('ds-item-collection-mapper');
+
+        // Click on the "Map new collections" tab
+        cy.get('li[data-test="mapTab"] a').click();
+
+        // Make sure search form is now visible
+        cy.get('ds-search-form').should('be.visible');
+
+        // Analyze entire page (again) for accessibility issues
+        testA11y('ds-item-collection-mapper');
+    });
+});
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 2701ee24ab..47449bda5c 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
@@ -21,25 +21,25 @@
     <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"
+          <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="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"
+          <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="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"
+          <button class="btn btn-outline-danger btn-sm" data-test="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"
+          <button class="btn btn-outline-warning btn-sm" data-test="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()">
@@ -47,7 +47,7 @@
           </button>
         </div>
       </div>
-      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" id="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
+      <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="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 }}">
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 67a6f98ac0..459095ea67 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
@@ -149,7 +149,7 @@ describe('DsoEditMetadataValueComponent', () => {
       let btn: DebugElement;
 
       beforeEach(() => {
-        btn = fixture.debugElement.query(By.css(`#metadata-${name}-btn`));
+        btn = fixture.debugElement.query(By.css(`button[data-test="metadata-${name}-btn"]`));
       });
 
       if (exists) {
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index 1da10106f4..63dadef3b1 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -10,6 +10,7 @@
                            class="nav-link"
                            [ngClass]="{'active' : page.page === currentPage}"
                            [routerLink]="['./' + page.page]"
+                           [attr.data-test]="page.page"
                            role="tab">
                             {{'item.edit.tabs.' + page.page + '.head' | translate}}
                         </a>
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 1d025f6514..57287fdfe2 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -6,7 +6,7 @@
       <p>{{'item.edit.item-mapper.description' | translate}}</p>
 
       <ul ngbNav (navChange)="tabChange($event)" [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs">
-        <li [ngbNavItem]="'browseTab'" role="presentation">
+        <li [ngbNavItem]="'browseTab'" role="presentation" data-test="browseTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.browse' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="mt-2">
@@ -22,7 +22,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'" role="presentation">
+        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">

From 75c81b712ea5e0598185515016e30f98618ff116 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 13 Dec 2023 16:35:35 -0600
Subject: [PATCH 0059/1286] Add accessibility testing for admin sidebar

(cherry picked from commit 31bc05235ef2a6e61fd0fb784c2155e8a87d155f)
---
 cypress/e2e/admin-sidebar.cy.ts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 cypress/e2e/admin-sidebar.cy.ts

diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts
new file mode 100644
index 0000000000..7612eb5313
--- /dev/null
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -0,0 +1,28 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Sidebar', () => {
+    beforeEach(() => {
+        // Must login as an Admin for sidebar to appear
+        cy.visit('/login');
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    });
+
+    it('should be pinnable and pass accessibility tests', () => {
+        // Pin the sidebar open
+        cy.get('#sidebar-collapse-toggle').click();
+
+        // Click on every expandable section to open all menus
+        cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
+
+        // Analyze <ds-admin-sidebar> for accessibility
+        testA11y('ds-admin-sidebar',
+        {
+            rules: {
+                // Currently all expandable sections have nested interactive elements
+                // See https://github.com/DSpace/dspace-angular/issues/2178
+                'nested-interactive': { enabled: false },
+            }
+        } as Options);
+    });
+});

From 12a19378f725ed41ede4cc6741e3ccf1c62afb3e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 17 Jan 2024 11:49:00 -0600
Subject: [PATCH 0060/1286] Move increment/decrement to i18n. Update to use
 "name".

(cherry picked from commit 0aaf3131fa4ef3b56b4f34715c417986e906cbab)
---
 .../shared/form/number-picker/number-picker.component.html   | 4 ++--
 .../form/number-picker/number-picker.component.spec.ts       | 4 +++-
 src/app/shared/form/number-picker/number-picker.component.ts | 5 ++++-
 src/assets/i18n/en.json5                                     | 4 ++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index d4cf9e23f4..12e29fa70e 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -6,7 +6,7 @@
       [disabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
-      <span class="sr-only">Increment {{placeholder}}</span>
+      <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
     </button>
     <input
       id="{{id}}"
@@ -33,6 +33,6 @@
       [disabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
-      <span class="sr-only">Decrement {{placeholder}}</span>
+      <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
     </button>
 </div>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index bf33a6bdd0..b6d623d70b 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -7,6 +7,7 @@ import { By } from '@angular/platform-browser';
 import { NumberPickerComponent } from './number-picker.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { createTestComponent } from '../../testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('NumberPickerComponent test suite', () => {
 
@@ -23,7 +24,8 @@ describe('NumberPickerComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot()
       ],
       declarations: [
         NumberPickerComponent,
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 40562dd61c..8f2de5ee54 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, SimpleChanges, } from '@angular/core';
 import { ControlValueAccessor, UntypedFormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -31,7 +32,9 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
   startValue: number;
 
-  constructor(private fb: UntypedFormBuilder, private cd: ChangeDetectorRef) {
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef,
+              private translate: TranslateService) {
   }
 
   ngOnInit() {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 643a3ce0d1..a9f6ee43de 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1760,6 +1760,10 @@
 
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
+  "form.number-picker.decrement": "Decrement {{field}}",
+
+  "form.number-picker.increment": "Increment {{field}}",
+
   "grant-deny-request-copy.deny": "Don't send copy",
 
   "grant-deny-request-copy.email.back": "Back",

From 21377206020c7e95f43ab6bcae1e34ef7ecbc4da Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 17 Jan 2024 12:05:00 -0600
Subject: [PATCH 0061/1286] Add environment variable for Person collection
 name. Use it in submission e2e tests.

(cherry picked from commit a5a89a4b985897a02a9ab4110ca0a02b8afdc6ad)
---
 cypress.config.ts            |  4 +++-
 cypress/e2e/submission.cy.ts | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cypress.config.ts b/cypress.config.ts
index 4143327870..458b035a48 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -25,9 +25,11 @@ export default defineConfig({
     DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
     // Search term (should return results) used in search tests
     DSPACE_TEST_SEARCH_TERM: 'test',
-    // Collection used for submission tests
+    // Main Collection used for submission tests. Should be able to accept normal Item objects
     DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
     DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
+    // Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
+    DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index 97676ca25c..4402410f23 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -168,8 +168,11 @@ describe('New Submission page', () => {
         // This should display the <ds-create-item-parent-selector> (popup window)
         cy.get('ds-create-item-parent-selector').should('be.visible');
 
-        // Click on the first Collection button to seelect a collection (actual collection doesn't matter)
-        cy.get('ds-authorized-collection-selector button:first-child').click();
+        // Type in a known Collection name in the search box
+        cy.get('ds-authorized-collection-selector input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
+        // Click on the button matching that known Collection name
+        cy.get('ds-authorized-collection-selector button[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME')).concat('"]')).click();
 
         // New URL should include /workspaceitems, as we've started a new submission
         cy.url().should('include', '/workspaceitems');
@@ -177,6 +180,9 @@ describe('New Submission page', () => {
         // The Submission edit form tag should be visible
         cy.get('ds-submission-edit').should('be.visible');
 
+        // A Collection menu button should exist & its value should be the selected collection
+        cy.get('#collectionControlsMenuButton span').should('have.text', Cypress.env('DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME'));
+
         // 3 sections should be visible by default
         cy.get('div#section_personStep').should('be.visible');
         cy.get('div#section_upload').should('be.visible');

From f2f5156065b1e3672d1b56f4e95f735c6bf8bbec Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 20 Dec 2023 17:45:35 +0300
Subject: [PATCH 0062/1286] src/app/community-list-page: remove newlines in
 links

The newlines cause whitespace to be enapsulated in the rendered link.

(cherry picked from commit 7bedf7fc59983983bfdd1061db8d0ae4a5822f12)
---
 .../community-list/community-list.component.html          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index de67607bb4..eed9ca64ca 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -35,9 +35,7 @@
       </button>
       <div class="d-flex flex-row">
         <span class="align-middle pt-2 lead">
-          <a [routerLink]="node.route" class="lead">
-            {{ dsoNameService.getName(node.payload) }}
-          </a>
+          <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
           <span class="pr-2">&nbsp;</span>
           <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead">{{node.payload.archivedItemsCount}}</span>
         </span>
@@ -73,9 +71,7 @@
         <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
       </button>
       <h6 class="align-middle pt-2">
-        <a [routerLink]="node.route" class="lead">
-          {{ dsoNameService.getName(node.payload) }}
-        </a>
+        <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
       </h6>
     </div>
     <ds-truncatable [id]="node.id">

From f08d74b2692a9ce0fa0aac7e71a5bf0af1bf1763 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 20 Dec 2023 22:32:22 +0300
Subject: [PATCH 0063/1286] src/app/item-page: remove newlines in links

The newlines cause whitespace to be enapsulated in the rendered link.

(cherry picked from commit 7207bbbd0e647693148438f49cb7bdbd7ca3fe86)
---
 .../metadata-values/metadata-values.component.html            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 61088edd16..a598815d4c 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -32,7 +32,5 @@
 <ng-template #browselink let-value="value">
   <a class="dont-break-out preserve-line-breaks ds-browse-link"
      [routerLink]="['/browse', browseDefinition.id]"
-     [queryParams]="getQueryParams(value)">
-    {{value}}
-  </a>
+     [queryParams]="getQueryParams(value)">{{value}}</a>
 </ng-template>

From e7490340f8fc7d5582f2ee88eb2bc08f95b71dd4 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 10 Jan 2024 16:54:18 +0100
Subject: [PATCH 0064/1286] use localized error message

(cherry picked from commit 92a74cee5aa2e4a9085a7a3d7694edf4855d6281)
---
 src/app/core/auth/auth.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 6604936cde..8b08b4f32d 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -119,7 +119,7 @@ export class AuthService {
         if (hasValue(rd.payload) && rd.payload.authenticated) {
           return rd.payload;
         } else {
-          throw (new Error('Invalid email or password'));
+          throw (new Error('auth.errors.invalid-user'));
         }
       }));
 

From d880b728ced5b5336397e22e58fc9b86b6cee2d7 Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Tue, 5 Dec 2023 10:02:17 -0600
Subject: [PATCH 0065/1286] Decrease min-height for Login Dropdown Menu

Fixes #2690

This is noticable when you have disabled local authentication, and only have a singular remote authentication such as Shibboleth or Orcid.

(cherry picked from commit 09fc44a539477df9e67809921d9ddf1b22198adc)
---
 src/app/shared/auth-nav-menu/auth-nav-menu.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ea64f7e74b..48b27c4be2 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
@@ -4,7 +4,7 @@
 }
 
 .loginDropdownMenu {
-  min-height: 260px;
+  min-height: 75px;
 }
 
 .dropdown-item.active, .dropdown-item:active,

From 2d0d6ddc5d615084eff2c9751433ccedb396c655 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 4 Jan 2024 17:29:28 +0100
Subject: [PATCH 0066/1286] 110088: new implementation for keyboard support in
 dropdowns

---
 ...dynamic-scrollable-dropdown.component.html |   5 +-
 .../dynamic-scrollable-dropdown.component.ts  | 131 +++++++++++++-----
 2 files changed, 103 insertions(+), 33 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 3be79b20f3..d840b696cc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -27,7 +27,7 @@
            (keydown)="selectOnKeyDown($event, sdRef)">
   </div>
 
-  <div ngbDropdownMenu
+  <div #dropdownMenu ngbDropdownMenu
        class="dropdown-menu scrollable-dropdown-menu w-100"
        [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
@@ -41,7 +41,8 @@
          [scrollWindow]="false">
 
       <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList"
+      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
+              [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
               title="{{ listEntry.display }}" role="option"
               [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index a4ca210193..5e0538a171 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -1,8 +1,17 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 
 import { Observable, of as observableOf } from 'rxjs';
-import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
+import { catchError, map, tap } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
@@ -28,6 +37,8 @@ import { FormFieldMetadataValueObject } from '../../../models/form-field-metadat
   templateUrl: './dynamic-scrollable-dropdown.component.html'
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
+  @ViewChild('dropdownMenu', { read: ElementRef }) dropdownMenu: ElementRef;
+
   @Input() bindId = true;
   @Input() group: UntypedFormGroup;
   @Input() model: DynamicScrollableDropdownModel;
@@ -40,6 +51,9 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public loading = false;
   public pageInfo: PageInfo;
   public optionsList: any;
+  public inputText: string = null;
+  public selectedIndex = 0;
+  public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
   constructor(protected vocabularyService: VocabularyService,
               protected cdr: ChangeDetectorRef,
@@ -54,32 +68,26 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   ngOnInit() {
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.loadOptions();
+  }
+
+  loadOptions() {
+    this.loading = true;
+    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
       getFirstSucceededRemoteDataPayload(),
-      catchError(() => observableOf(buildPaginatedList(
-        new PageInfo(),
-        []
-        ))
-      ))
-      .subscribe((list: PaginatedList<VocabularyEntry>) => {
-        this.optionsList = list.page;
-        if (this.model.value) {
-          this.setCurrentValue(this.model.value, true);
-        }
-
-        this.updatePageInfo(
-          list.pageInfo.elementsPerPage,
-          list.pageInfo.currentPage,
-          list.pageInfo.totalElements,
-          list.pageInfo.totalPages
-        );
-        this.cdr.detectChanges();
-      });
-
-    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
-      .subscribe((value) => {
-        this.setCurrentValue(value);
-      });
+      catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
+      tap(() => this.loading = false)
+    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+      this.optionsList = list.page;
+      this.updatePageInfo(
+        list.pageInfo.elementsPerPage,
+        list.pageInfo.currentPage,
+        list.pageInfo.totalElements,
+        list.pageInfo.totalPages
+      );
+      this.selectedIndex = 0;
+      this.cdr.detectChanges();
+    });
   }
 
   /**
@@ -94,10 +102,30 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   openDropdown(sdRef: NgbDropdown) {
     if (!this.model.readOnly) {
       this.group.markAsUntouched();
+      this.inputText = null;
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions();
       sdRef.open();
     }
   }
 
+  navigateDropdown(event: KeyboardEvent) {
+    if (event.key === 'ArrowDown') {
+      this.selectedIndex = Math.min(this.selectedIndex + 1, this.optionsList.length - 1);
+    } else if (event.key === 'ArrowUp') {
+      this.selectedIndex = Math.max(this.selectedIndex - 1, 0);
+    }
+    this.scrollToSelected();
+  }
+
+  scrollToSelected() {
+    const dropdownItems = this.dropdownMenu.nativeElement.querySelectorAll('.dropdown-item');
+    const selectedItem = dropdownItems[this.selectedIndex];
+    if (selectedItem) {
+      selectedItem.scrollIntoView({ block: 'nearest' });
+    }
+  }
+
   /**
    * KeyDown handler to allow toggling the dropdown via keyboard
    * @param event KeyboardEvent
@@ -106,15 +134,56 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   selectOnKeyDown(event: KeyboardEvent, sdRef: NgbDropdown) {
     const keyName = event.key;
 
-    if (keyName === ' ' || keyName === 'Enter') {
+    if (keyName === 'Enter') {
       event.preventDefault();
       event.stopPropagation();
-      sdRef.toggle();
+      if (sdRef.isOpen()) {
+        this.onSelect(this.optionsList[this.selectedIndex]);
+        sdRef.close();
+      } else {
+        sdRef.open();
+      }
     } else if (keyName === 'ArrowDown' || keyName === 'ArrowUp') {
-      this.openDropdown(sdRef);
+      event.preventDefault();
+      event.stopPropagation();
+      this.navigateDropdown(event);
+    } else if (keyName === 'Backspace') {
+      this.removeKeyFromInput();
+    } else if (this.isAcceptableKey(keyName)) {
+      this.addKeyToInput(keyName);
     }
   }
 
+  addKeyToInput(keyName: string) {
+    if (this.inputText === null) {
+      this.inputText = '';
+    }
+    this.inputText += keyName;
+    // When a new key is added, we need to reset the page info
+    this.updatePageInfo(this.model.maxOptions, 1);
+    this.loadOptions();
+  }
+
+  removeKeyFromInput() {
+    if (this.inputText !== null) {
+      this.inputText = this.inputText.slice(0, -1);
+      if (this.inputText === '') {
+        this.inputText = null;
+      }
+      this.loadOptions();
+    }
+  }
+
+
+  isAcceptableKey(keyPress: string): boolean {
+    // allow all letters and numbers
+    if (keyPress.length === 1 && keyPress.match(/^[a-zA-Z0-9]*$/)) {
+      return true;
+    }
+    // Some other characters like space, dash, etc should be allowed as well
+    return this.acceptableKeys.includes(keyPress);
+  }
+
   /**
    * Loads any new entries
    */
@@ -127,7 +196,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages
       );
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),

From c11a3b1372481c2cb2e2a0552d80f54c134e8b01 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 25 Jan 2024 16:10:00 +0100
Subject: [PATCH 0067/1286] fixed typo

(cherry picked from commit 4b7798fcc75e46df54f36e6a59371965b8bad862)
---
 src/assets/i18n/en.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a9f6ee43de..81924ab5a1 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1904,7 +1904,7 @@
 
   "info.feedback.page-label": "Page",
 
-  "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "The page related to your feedback",
 
   "item.alerts.private": "This item is non-discoverable",
 

From f1a7f36f1704550e2f5d7761bb8927424f09238f Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 19 Jan 2024 08:57:12 +0100
Subject: [PATCH 0068/1286] add logo max costraints

(cherry picked from commit 32e3141b1909d3e6e9e7d1ab55adc4f003f1bbf7)
---
 .../comcol/comcol-page-logo/comcol-page-logo.component.html   | 2 +-
 .../comcol/comcol-page-logo/comcol-page-logo.component.scss   | 4 ++++
 src/styles/_custom_variables.scss                             | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index 057c358223..3608c7153e 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
-<div *ngIf="logo" class="dso-logo mb-3">
+<div *ngIf="logo" class="dso-logo mb-3 logo-container">
     <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
index e69de29bb2..f0dd5436d9 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
@@ -0,0 +1,4 @@
+.logo-container {
+  max-width: var(--ds-comcol-logo-max-width);
+  max-height: var(--ds-comcol-logo-max-height);
+}
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index c10a875f57..0e54ec200c 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -102,4 +102,7 @@
   --ds-dso-edit-lang-width: 90px;
   --ds-dso-edit-actions-width: 173px;
   --ds-dso-edit-virtual-tooltip-min-width: 300px;
+
+  --ds-comcol-logo-max-width: 500px;
+  --ds-comcol-logo-max-height: 500px;
 }

From 20f5f17aacebddaa4e6c9a5611db573f80d32abb Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jan 2024 09:16:06 +0100
Subject: [PATCH 0069/1286] adapt solution to prevent img overflow

(cherry picked from commit d3c788a4e13ef1ccb23c64c025fcbcfa8af1c21f)
---
 .../comcol/comcol-page-logo/comcol-page-logo.component.scss     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
index f0dd5436d9..db6e7daecf 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss
@@ -1,4 +1,4 @@
-.logo-container {
+img {
   max-width: var(--ds-comcol-logo-max-width);
   max-height: var(--ds-comcol-logo-max-height);
 }

From 682ec2b67848b1e33e65af2e4c6c363cf4c4ea8a Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jan 2024 09:17:18 +0100
Subject: [PATCH 0070/1286] remove class from template

(cherry picked from commit d9e25882cebfa37a20553408f8863e907f96411a)
---
 .../comcol/comcol-page-logo/comcol-page-logo.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index 3608c7153e..057c358223 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
-<div *ngIf="logo" class="dso-logo mb-3 logo-container">
+<div *ngIf="logo" class="dso-logo mb-3">
     <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>

From d4493cb5340ece8bef58d4ac69adfba3e49ead5c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 25 Jan 2024 09:00:05 +0100
Subject: [PATCH 0071/1286] add width 100% to prevent overflow on mobile

(cherry picked from commit f82ba8c5ad4fc5d64eacd0f0f0f5e9d50de5e2c8)
---
 .../comcol/comcol-page-logo/comcol-page-logo.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index 057c358223..cb3feecbe5 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo mb-3">
-    <img [src]="logo._links.content.href" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>

From 3bf7d819de6d18c087108d63c0dc268b49a5a903 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 00:55:46 +0100
Subject: [PATCH 0072/1286] Fixed accessibility issues related to dso selectors

- Fixed header ordering
- Fixed input field not having a description what it does (because the header isn't always shown I decided to use aria-labels instead of regular labels)
---
 .../dso-selector/dso-selector/dso-selector.component.html   | 1 +
 .../dso-selector/dso-selector/dso-selector.component.ts     | 5 +++++
 .../create-community-parent-selector.component.html         | 6 +++---
 .../create-item-parent-selector.component.html              | 2 +-
 .../dso-selector-modal-wrapper.component.html               | 2 +-
 .../edit-item-selector/edit-item-selector.component.html    | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index c4f5dbc4cd..295165d171 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -2,6 +2,7 @@
     <input type="search"
            class="form-control"
            (click)="$event.stopPropagation();"
+           [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
            placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
            [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 503e4c4412..4590e05363 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -75,6 +75,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   @Input() sort: SortOptions;
 
+  /**
+   * The id that should be given to the input box, this is required for accessibility reasons
+   */
+  @Input() searchBoxId: string | null = null;
+
   // list of allowed selectable dsoTypes
   typesString: string;
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a13be63880..8ae146b42c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
+        <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 5fccd58f48..5288f08e02 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
                                        [entityType]="entityType"
                                        [types]="selectorTypes"
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 54044f5d79..6d3d45cb3d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..999a96e730 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>

From 6b204b5b535d74f76a837656e30a3a8b1fde1e36 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 00:56:30 +0100
Subject: [PATCH 0073/1286] Removed invisible buttons on the
 CommunityListComponent & fixed content displacement when expanding com/col

---
 .../community-list.component.html             | 46 +++++++++----------
 .../community-list.component.scss             |  4 ++
 .../community-list.component.spec.ts          | 35 +++++++-------
 .../community-list.component.ts               |  1 +
 src/assets/i18n/en.json5                      |  4 ++
 5 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 src/app/community-list-page/community-list/community-list.component.scss

diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index eed9ca64ca..7ccf24a761 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -4,9 +4,9 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
                  class="example-tree-node show-more-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="align-middle pt-2">
         <button *ngIf="!(dataSource.loading$ | async)" (click)="getNextPage(node)"
            class="btn btn-outline-primary btn-sm" role="button">
@@ -24,15 +24,18 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
                  class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle
-              [title]="'toggle ' + dsoNameService.getName(node.payload)"
-              [attr.aria-label]="'toggle ' + dsoNameService.getName(node.payload)"
+      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default" cdkTreeNodeToggle
+              [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
               (click)="toggleExpanded(node)"
-              [ngClass]="(hasChild(null, node)| async) ? 'visible' : 'invisible'"
-              [attr.data-test]="(hasChild(null, node)| async) ? 'expand-button' : ''">
+              data-test="expand-button">
         <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
               aria-hidden="true"></span>
+        <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
       </button>
+      <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
+      <span *ngIf="!(hasChild(null, node) | async)" aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <div class="d-flex flex-row">
         <span class="align-middle pt-2 lead">
           <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
@@ -44,10 +47,9 @@
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
@@ -56,10 +58,9 @@
     </ds-truncatable>
     <div class="d-flex" *ngIf="node===loadingNode && dataSource.loading$ | async"
          cdkTreeNodePadding>
-      <button type="button" class="btn btn-default invisible">
-        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-              aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <ds-themed-loading class="ds-themed-loading"></ds-themed-loading>
     </div>
   </cdk-tree-node>
@@ -67,9 +68,9 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
                  class="example-tree-node childless-node">
     <div class="btn-group">
-      <button type="button" class="btn btn-default" cdkTreeNodeToggle>
-        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
-      </button>
+      <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
+        <span class="fa fa-chevron-right"></span>
+      </span>
       <h6 class="align-middle pt-2">
         <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
       </h6>
@@ -77,10 +78,9 @@
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
         <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <button type="button" class="btn btn-default invisible">
-            <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-                  aria-hidden="true"></span>
-          </button>
+          <span aria-hidden="true" class="btn btn-default invisible">
+            <span class="fa fa-chevron-right"></span>
+          </span>
           <ds-truncatable-part [id]="node.id" [minLines]="3">
             <span>{{node.payload.shortDescription}}</span>
           </ds-truncatable-part>
diff --git a/src/app/community-list-page/community-list/community-list.component.scss b/src/app/community-list-page/community-list/community-list.component.scss
new file mode 100644
index 0000000000..2e33380a29
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.scss
@@ -0,0 +1,4 @@
+::ng-deep .fa-chevron-right::before {
+  display: block;
+  width: 16px;
+}
diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts
index fb47f4994d..cec1b555ab 100644
--- a/src/app/community-list-page/community-list/community-list.component.spec.ts
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -5,7 +5,7 @@ import { CommunityListService, showMoreFlatNode, toFlatNode } from '../community
 import { CdkTreeModule } from '@angular/cdk/tree';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Community } from '../../core/shared/community.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -300,12 +300,14 @@ describe('CommunityListComponent', () => {
 
   describe('second top community node is expanded and has more children (collections) than page size of collection', () => {
     describe('children of second top com are added (page-limited pageSize 2)', () => {
-      let allNodes;
+      let allNodes: DebugElement[];
       beforeEach(fakeAsync(() => {
-        const chevronExpand = fixture.debugElement.queryAll(By.css('.expandable-node button'));
-        const chevronExpandSpan = fixture.debugElement.queryAll(By.css('.expandable-node button span'));
-        if (chevronExpandSpan[1].nativeElement.classList.contains('fa-chevron-right')) {
-          chevronExpand[1].nativeElement.click();
+        const toggleButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.expandable-node button'));
+        const toggleButtonText: DebugElement = toggleButtons[1].query(By.css('span'));
+        expect(toggleButtonText).not.toBeNull();
+
+        if (toggleButtonText.nativeElement.classList.contains('fa-chevron-right')) {
+          toggleButtons[1].nativeElement.click();
           tick();
           fixture.detectChanges();
         }
@@ -315,17 +317,18 @@ describe('CommunityListComponent', () => {
         allNodes = [...expandableNodesFound, ...childlessNodesFound];
       }));
       it('tree contains 2 (page-limited) top com, 2 (page-limited) coll of 2nd top com, a show more for those page-limited coll and show more for page-limited top com', () => {
-        mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
-          })).toBeTruthy();
-        });
-        mockCollectionsPage1.map((coll) => {
-          expect(allNodes.find((foundEl) => {
-            return (foundEl.nativeElement.textContent.trim() === coll.name);
-          })).toBeTruthy();
-        });
+        const allNodeNames: string[] = allNodes.map((node: DebugElement) => node.nativeElement.innerText.trim());
         expect(allNodes.length).toEqual(4);
+        const flatNodes: string[] = mockTopFlatnodesUnexpanded.slice(0, 2).map((flatNode: FlatNode) => flatNode.name);
+        for (const flatNode of flatNodes) {
+          expect(allNodeNames).toContain(flatNode);
+        }
+        expect(flatNodes.length).toBe(2);
+        const page1CollectionNames: string[] = mockCollectionsPage1.map((collection: Collection) => collection.name);
+        for (const collectionName of page1CollectionNames) {
+          expect(allNodeNames).toContain(collectionName);
+        }
+        expect(page1CollectionNames.length).toBe(2);
         const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node'));
         expect(showMoreEl.length).toEqual(2);
       });
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 6b5c6578e1..031a422469 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -19,6 +19,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 @Component({
   selector: 'ds-community-list',
   templateUrl: './community-list.component.html',
+  styleUrls: ['./community-list.component.scss'],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 81924ab5a1..83661180af 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1158,6 +1158,10 @@
 
   "communityList.showMore": "Show More",
 
+  "communityList.expand": "Expand {{ name }}",
+
+  "communityList.collapse": "Collapse {{ name }}",
+
   "community.create.head": "Create a Community",
 
   "community.create.notifications.success": "Successfully created the Community",

From cc0501f340402a2955e79d3675125caaa5ee8f4b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 01:31:34 +0100
Subject: [PATCH 0074/1286] Fixed search filters having empty input buttons

---
 .../org-unit-input-suggestions.component.html              | 4 +++-
 .../org-unit-input-suggestions.component.spec.ts           | 2 ++
 .../person-input-suggestions.component.html                | 4 +++-
 .../dso-input-suggestions.component.html                   | 4 +++-
 .../filter-input-suggestions.component.html                | 7 +++----
 .../input-suggestions/input-suggestions.component.html     | 4 +++-
 .../validation-suggestions.component.html                  | 4 +++-
 .../search-range-filter/search-range-filter.component.html | 7 +++----
 8 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index c4e31d3d81..58f39b8d0b 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -11,7 +11,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
index 0981d895ec..a13af0067a 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
@@ -2,6 +2,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
 import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
 
 let component: OrgUnitInputSuggestionsComponent;
 let fixture: ComponentFixture<OrgUnitInputSuggestionsComponent>;
@@ -21,6 +22,7 @@ describe('OrgUnitInputSuggestionsComponent', () => {
       declarations: [OrgUnitInputSuggestionsComponent],
       imports: [
         FormsModule,
+        TranslateModule.forRoot(),
       ],
       providers: [
       ],
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index b1621dbd2c..53260ceaa3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -12,7 +12,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index 7515b830b9..17e7197261 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 726dc9ca0e..d29163e09a 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -20,10 +20,9 @@
            [ngModelOptions]="{standalone: true}" autocomplete="off"
     />
   </ng-template>
-  <label class="d-none">
-    <input type="submit"/>
-    <span>{{'search.filters.search.submit' | translate}}</span>
-  </label>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
index f137982fee..188dcbcb6a 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -9,7 +9,9 @@
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
            [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <input type="submit" class="d-none"/>
+    <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+    </button>
     <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
         <div class="dropdown-list">
             <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index d6e2ead6ea..c5d71e33fd 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -10,7 +10,9 @@
          [placeholder]="placeholder"
          ng-model-options="{standalone: true}"
          autocomplete="off">
-  <input type="submit" class="d-none"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 251e5ac420..6d4ba44920 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -26,10 +26,9 @@
                     />
                 </label>
             </div>
-            <label class="d-none">
-                <input type="submit" class="d-none"/>
-                <span>{{'search.filters.search.submit' | translate}}</span>
-            </label>
+            <button class="sr-only" type="submit">
+                {{'search.filters.search.submit' | translate}}
+            </button>
         </form>
 
         <ng-container *ngIf="shouldShowSlider()">

From b076b989967ceed3fab8f67f7ffb5e1f71c23167 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 01:57:48 +0100
Subject: [PATCH 0075/1286] Fixed accessibility issues on
 SubmissionImportExternalSearchbarComponent

- Fixed input not describing itself
- Put the items from the dropdown in an ul
- Fixed broken aria labels
- Removed titles who where identical to the displayed value
---
 ...n-import-external-searchbar.component.html | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 535395e534..040987d37b 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,25 +1,28 @@
 <div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
-  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
+  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
 </div>
 <div class="input-group mb-5">
-  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}" aria-label="" aria-describedby="">
-  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group" aria-label="">
-    <button class="btn btn-outline-secondary w-fx" title="{{'submission.import-external.search.source.hint' |translate}}" ngbDropdownToggle>{{'submission.import-external.source.' + selectedElement?.name | translate}}</button>
-    <div ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
+  <input *ngIf="!(isXsOrSm$ | async)" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  <div [ngClass]="{'input-group-append': !(isXsOrSm$ | async)}" ngbDropdown role="group">
+    <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
+            class="btn btn-outline-secondary w-fx"
+            title="{{'submission.import-external.search.source.hint' |translate}}"
+            ngbDropdownToggle>
+      {{'submission.import-external.source.' + selectedElement?.name | translate}}
+    </button>
+    <ul ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
       aria-haspopup="true"
-      aria-expanded="false"
-      aria-labelledby="scrollableDropdownMenuButton">
-      <div class="scrollable-menu"
-        aria-labelledby="scrollableDropdownMenuButton"
+      aria-expanded="false">
+      <li class="scrollable-menu"
         infiniteScroll
         [infiniteScrollDistance]="2"
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-        <button ngbDropdownItem class="dropdown-item text-truncate" title="{{'submission.import-external.source.' + source?.name | translate}}" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
+        <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
-      </div>
-    </div>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+      </li>
+    </ul>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>

From e0849af9264d51f1bfae13187afa0a1a2d5d2c74 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 02:08:47 +0100
Subject: [PATCH 0076/1286] Fix header ordering

---
 src/app/access-control/bulk-access/bulk-access.component.html | 1 +
 .../admin-import-batch-page/batch-import-page.component.html  | 4 ++--
 .../metadata-registry/metadata-registry.component.html        | 2 +-
 .../metadata-schema-form/metadata-schema-form.component.html  | 4 ++--
 .../metadata-field-form/metadata-field-form.component.html    | 4 ++--
 .../metadata-schema/metadata-schema.component.html            | 4 ++--
 src/app/health-page/health-page.component.html                | 2 +-
 src/app/profile-page/profile-page.component.html              | 1 +
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 382caf85f4..c164cc5c31 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -1,4 +1,5 @@
 <div class="container">
+  <h1>{{ 'admin.access-control.bulk-access.title' | translate }}</h1>
   <ds-bulk-access-browse [listId]="listId"></ds-bulk-access-browse>
   <div class="clearfix mb-3"></div>
   <ds-bulk-access-settings #dsBulkSettings ></ds-bulk-access-settings>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index 1092443436..c51ee7597c 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 id="header">{{'admin.batch-import.page.header' | translate}}</h2>
+  <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   <p>{{'admin.batch-import.page.help' | translate}}</p>
   <p *ngIf="dso">
     selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
@@ -28,7 +28,7 @@
   <small class="form-text text-muted">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
-  
+
 
   <ds-file-dropzone-no-uploader
     *ngIf="isUpload"
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 35bffad185..b39e4b8381 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -2,7 +2,7 @@
     <div class="metadata-registry row">
         <div class="col-12">
 
-            <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h2>
+            <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
 
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index a4a4613565..85d1e90692 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 4e29fbb6e8..44b6bfb697 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>{{messagePrefix + '.create' | translate}}</h4>
+    <h2>{{messagePrefix + '.create' | translate}}</h2>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>{{messagePrefix + '.edit' | translate}}</h4>
+    <h2>{{messagePrefix + '.edit' | translate}}</h2>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 2fe53dfcd8..d51b8a8233 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -2,7 +2,7 @@
   <div class="metadata-schema row">
     <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h1>
 
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
@@ -10,7 +10,7 @@
         [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
-      <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
+      <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
 
       <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
         <ds-pagination
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 15a8787894..14c577a8ee 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,5 +1,5 @@
 <div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
-  <h2>{{'health-page.heading' | translate}}</h2>
+  <h1>{{'health-page.heading' | translate}}</h1>
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
       <li [ngbNavItem]="'status'" role="presentation">
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 187096b391..fd7246c08b 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,5 +1,6 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
+    <h1>{{'profile.title' | translate}}</h1>
     <ng-container *ngIf="isResearcherProfileEnabled() | async">
       <h2 class="mb-4">{{'profile.head' | translate}}</h2>
       <div class="card mb-4">

From b0d371045411b7a7d37dec2d2dbfc768799795e8 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 03:10:06 +0100
Subject: [PATCH 0077/1286] Fixed accessibility issues with pagination button

- Replaced the h6 tags with the role heading
- Gave the gear button the roles in order to be detected as an expandable menu
- Replaced the dropdown structure to render a menu of listboxes
- Added the aria-selected attribute
---
 .../pagination/pagination.component.html      | 30 ++++++++++++++-----
 .../shared/pagination/pagination.component.ts |  4 +--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 7d90c6a439..19e4cf9491 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -7,13 +7,29 @@
       </div>
       <div class="col">
         <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <div id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
-            <h6 class="dropdown-header">{{ 'pagination.results-per-page' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let item of pageSizeOptions" (click)="doPageSizeChange(item)"><i [ngClass]="{'invisible': item != (pageSize$|async)}" class="fas fa-check" aria-hidden="true"></i> {{item}} </button>
-            <h6 class="dropdown-header">{{ 'pagination.sort-direction' | translate}}</h6>
-            <button class="dropdown-item" *ngFor="let direction of (sortDirections | dsKeys)" (click)="doSortDirectionChange(direction.value)"><i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}} </button>
-          </div>
+          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
+          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+            <li role="menuitem">
+              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
+                  <button (click)="doPageSizeChange(item)" class="dropdown-item">
+                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+            <li role="menuitem">
+              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+                <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
+                  <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
+                    <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+          </ul>
         </div>
         <ds-rss></ds-rss>
       </div>
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 6da813cbc7..f5e482671b 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -162,7 +162,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Number of items per page.
    */
-  public pageSize$;
+  public pageSize$: Observable<number>;
 
   /**
    * Declare SortDirection enumeration to use it in the template
@@ -183,7 +183,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Name of the field that's used to sort by
    */
-  public sortField$;
+  public sortField$: Observable<string>;
   public defaultSortField = 'name';
 
   /**

From 9335c32334c9294262bc1353bf88d36bd01285f6 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 03:13:01 +0100
Subject: [PATCH 0078/1286] Fixed accessibility issues on
 MetadataSchemaComponent

- Removed empty label of the select box and replaced it with an aria-label
- Fixed empty table header
---
 .../metadata-schema/metadata-schema.component.html  | 13 ++++++-------
 src/assets/i18n/en.json5                            |  6 ++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index d51b8a8233..de968d63f2 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -24,7 +24,7 @@
             <table id="metadata-fields" class="table table-striped table-hover">
               <thead>
               <tr>
-                <th></th>
+                <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
@@ -33,12 +33,11 @@
               <tbody>
               <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
-                <td>
-                  <label class="mb-0">
-                    <input type="checkbox"
-                           [checked]="isSelected(field) | async"
-                           (change)="selectMetadataField(field, $event)">
-                  </label>
+                <td *ngVar="(isSelected(field) | async) as selected">
+                  <input type="checkbox"
+                         [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
+                         [checked]="selected"
+                         (change)="selectMetadataField(field, $event)">
                 </td>
                 <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 83661180af..e47d2919d8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -174,6 +174,10 @@
 
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
 
+  "admin.registries.schema.fields.select": "Select",
+
+  "admin.registries.schema.fields.deselect": "Deselect",
+
   "admin.registries.schema.fields.head": "Schema metadata fields",
 
   "admin.registries.schema.fields.no-items": "No metadata fields to show.",
@@ -182,6 +186,8 @@
 
   "admin.registries.schema.fields.table.field": "Field",
 
+  "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+
   "admin.registries.schema.fields.table.id": "ID",
 
   "admin.registries.schema.fields.table.scopenote": "Scope Note",

From 5173ac3704e7d322836b84d95c01698772acee75 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 03:29:04 +0100
Subject: [PATCH 0079/1286] Fixed accessibility issues on
 MetadataRegistryComponent

- Removed empty label of the select box and replaced it with an aria-label
- Fixed empty table header
---
 .../metadata-registry/metadata-registry.component.html      | 3 ++-
 src/assets/i18n/en.json5                                    | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index b39e4b8381..d3be5df08e 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -19,7 +19,7 @@
                     <table id="metadata-schemas" class="table table-striped table-hover">
                         <thead>
                         <tr>
-                            <th scope="col"></th>
+                            <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
                             <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
@@ -34,6 +34,7 @@
                                            [checked]="isSelected(schema) | async"
                                            (change)="selectMetadataSchema(schema, $event)"
                                     >
+                                    <span class="sr-only">{{((isSelected(schema) | async) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
                                 </label>
                             </td>
                             <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index e47d2919d8..ee3de30c43 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -160,8 +160,14 @@
 
   "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
 
+  "admin.registries.metadata.schemas.select": "Select",
+
+  "admin.registries.metadata.schemas.deselect": "Deselect",
+
   "admin.registries.metadata.schemas.table.delete": "Delete selected",
 
+  "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+
   "admin.registries.metadata.schemas.table.id": "ID",
 
   "admin.registries.metadata.schemas.table.name": "Name",

From 949e55235a4cae36f90287b7d4b1a2740bc3dc3a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 03:34:28 +0100
Subject: [PATCH 0080/1286] Fixed accessibility issues on
 BitstreamFormatsComponent

- Removed empty label of the select box and replaced it with an aria-label
- Fixed empty table header
---
 .../bitstream-formats/bitstream-formats.component.html      | 3 ++-
 src/assets/i18n/en.json5                                    | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 37323d41d0..894ef3dc7e 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -19,7 +19,7 @@
           <table id="formats" class="table table-striped table-hover">
             <thead>
             <tr>
-              <th scope="col" [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"></th>
+              <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
               <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
@@ -35,6 +35,7 @@
                          [checked]="isSelected(bitstreamFormat) | async"
                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                   >
+                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}}</span>
                 </label>
               </td>
               <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ee3de30c43..71090f70ac 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -128,6 +128,8 @@
 
   "admin.registries.bitstream-formats.table.name": "Name",
 
+  "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+
   "admin.registries.bitstream-formats.table.id": "ID",
 
   "admin.registries.bitstream-formats.table.return": "Back",
@@ -142,7 +144,9 @@
 
   "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
 
-  "admin.registries.bitstream-formats.select": "Select bitstream format",
+  "admin.registries.bitstream-formats.select": "Select",
+
+  "admin.registries.bitstream-formats.deselect": "Deselect",
 
   "admin.registries.metadata.breadcrumbs": "Metadata registry",
 

From 8b5cd79bdcf12b45288efaaf322e9b2e46cafffa Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 04:44:22 +0100
Subject: [PATCH 0081/1286] Fixed accessibility issues on
 AccessControlFormContainerComponent

- Replaced invisible label in AccessControlArrayFormComponent that was only used for styling with span
- Fixed radio buttons not being part of a fieldset
- Fixed empty table header
---
 .../access-control-array-form.component.html  |  2 +-
 ...cess-control-form-container.component.html | 26 +++++++++----------
 .../collection-select.component.html          |  2 +-
 .../item-select/item-select.component.html    |  2 +-
 src/assets/i18n/en.json5                      |  4 +++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index e6ebabd707..2ec3b51219 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -88,7 +88,7 @@
       </div>
 
       <div>
-        <label>&nbsp;</label>
+        <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
         <div class="input-group">
 
           <button type="button" class="btn btn-outline-danger"
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 23c62abc6c..ce0f5845c6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -23,10 +23,10 @@
               </ui-switch>
             </div>
 
-            <div class="row mt-3">
-              <div class="col-12 col-md-3">
+            <fieldset class="row mt-3">
+              <legend class="h4 col-12 col-md-3">
                 {{ 'access-control-mode' | translate }}
-              </div>
+              </legend>
               <div class="col-12 col-md-8">
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
@@ -47,7 +47,7 @@
                   </label>
                 </div>
               </div>
-            </div>
+            </fieldset>
           </div>
 
           <div>
@@ -78,10 +78,10 @@
             </div>
 
             <div *ngIf="showLimitToSpecificBitstreams" class="row mt-3">
-            <div class="col-12">
-              {{'access-control-limit-to-specific' | translate}}
-            </div>
-            <div class="col-12">
+            <fieldset class="col-12">
+              <legend class="h4">
+                {{'access-control-limit-to-specific' | translate}}
+              </legend>
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
@@ -111,14 +111,14 @@
 
                 </label>
               </div>
-            </div>
+            </fieldset>
             </div>
           </div>
 
-          <div class="row mt-3">
-            <div class="col-12 col-md-3">
+          <fieldset class="row mt-3">
+            <legend class="h4 col-12 col-md-3">
               {{'access-control-mode' | translate}}
-            </div>
+            </legend>
             <div class="col-12 col-md-8">
               <div class="form-check">
                 <input class="form-check-input" type="radio"
@@ -139,7 +139,7 @@
                 </label>
               </div>
             </div>
-          </div>
+          </fieldset>
 
           <div>
             <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 7d4dadb2e3..135579aff7 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -11,7 +11,7 @@
       <table id="collection-select" class="table table-striped table-hover">
         <thead>
           <tr>
-            <th aria-hidden="true"></th>
+            <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
             <th scope="col">{{'collection.select.table.title' | translate}}</th>
           </tr>
         </thead>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 8cdc8ffb2d..d1d454b2e4 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -11,7 +11,7 @@
       <table id="item-select" class="table table-striped table-hover">
         <thead>
         <tr>
-          <th aria-hidden="true"></th>
+          <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
           <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
           <th scope="col">{{'item.select.table.author' | translate}}</th>
           <th scope="col">{{'item.select.table.title' | translate}}</th>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 71090f70ac..d736efb9e0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1110,6 +1110,8 @@
 
   "collection.select.empty": "No collections to show",
 
+  "collection.select.table.selected": "Selected collections",
+
   "collection.select.table.select": "Select collection",
 
   "collection.select.table.deselect": "Deselect collection",
@@ -2544,6 +2546,8 @@
 
   "item.select.empty": "No items to show",
 
+  "item.select.table.selected": "Selected items",
+
   "item.select.table.select": "Select item",
 
   "item.select.table.deselect": "Deselect item",

From 37803e9330c769085106dcd033bc8dbf7733448b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 15:25:44 +0100
Subject: [PATCH 0082/1286] Fixed remaining community/collection page
 accessibility issues

- Hide fontawesome icons for screen readers
- Replaced dangling labels with spans and added more descriptive aria label to browse link
- Fixed empty label/missing header in edit resource policy table
- Added missing comcol logo al text
- Refactored dso-edit-menu-section to not display empty link buttons and duplicate titles
---
 .../collection-page.component.html            |  2 +-
 .../collection-metadata.component.html        |  8 +++---
 .../community-page.component.html             |  2 +-
 .../delete-community-page.component.html      |  6 ++---
 .../comcol-form/comcol-form.component.html    |  9 ++++---
 .../edit-comcol-page.component.html           |  4 +--
 .../dso-edit-menu-section.component.html      | 26 ++++++++-----------
 .../dso-edit-menu-section.component.spec.ts   | 11 +++-----
 src/app/shared/form/form.component.html       |  5 ++--
 .../resource-policy-entry.component.html      |  8 +++---
 .../resource-policies.component.html          | 10 +++----
 .../upload/uploader/uploader.component.html   |  2 +-
 .../upload/uploader/uploader.component.ts     |  5 ++++
 src/assets/i18n/en.json5                      |  8 ++++++
 14 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 3cbd08f132..9a5414952f 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -13,7 +13,7 @@
                   <!-- Collection logo -->
                   <ds-comcol-page-logo *ngIf="logoRD$"
                                    [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'">
+                                   [alternateText]="'collection.logo' | translate">
                   </ds-comcol-page-logo>
 
                   <!-- Handle -->
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index ffd8f71343..1cf40159ec 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,17 +1,17 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
-  <label>{{ 'collection.edit.template.label' | translate}}</label>
+  <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
     <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
-      <i class="fas fa-plus"></i>
+      <i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
-      <i class="fas fa-trash-alt"></i>
+      <i class="fas fa-trash-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
     </button>
     <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
             [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
-      <i class="fas fa-edit"></i>
+      <i class="fas fa-edit" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
     </button>
   </div>
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 671bf28fd1..194fb747d0 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -7,7 +7,7 @@
           <!-- Community name -->
           <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
           <!-- Community logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
+          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
           </ds-comcol-page-logo>
           <!-- Handle -->
           <ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index ef5fdade73..1e71fb7f49 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -7,11 +7,11 @@
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
                         <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
-                            <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
+                            <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
                         <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
-                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
-                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
+                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
+                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index b7b3d344b1..c79dba42b7 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,13 +1,13 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-12 d-inline-block">
-      <label>{{type.value + '.edit.logo.label' | translate}}</label>
+    <div class="col-12 d-inline-block mb-1">
+      <span>{{type.value + '.edit.logo.label' | translate}}</span>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
       <div class="col-12 d-inline-block alert" [ngClass]="{'alert-danger': markLogoForDeletion}" id="logo-section" *ngIf="logo">
         <div class="row">
           <div class="col-8 d-inline-block">
-            <ds-comcol-page-logo [logo]="logo"></ds-comcol-page-logo>
+            <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
           </div>
           <div class="col-4 d-inline-block">
             <div *ngIf="logo" class="btn-group btn-group-sm float-right" role="group">
@@ -27,6 +27,7 @@
       </div>
       <div *ngIf="!logo" class="col-12 d-inline-block">
         <ds-uploader  *ngIf="initializedUploaderOptions | async"
+                      [ariaLabel]="type.value + '.browse.logo'"
                       [dropMsg]="type.value + '.edit.logo.upload'"
                       [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
                       [enableDragOverDocument]="true"
@@ -43,6 +44,6 @@
          [displayCancel]="false"
          (submitForm)="onSubmit()">
   <button before (click)="back.emit()" class="btn btn-outline-secondary" type="button">
-    <i class="fas fa-arrow-left"></i> {{ type.value + '.edit.return' | translate }}
+    <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
   </button>
 </ds-form>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index d7f15ce06b..a8ca674c26 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -7,7 +7,7 @@
           <a class="btn btn-danger"
              [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
              data-test="delete-button">
-            <i class="fas fa-trash"></i> {{type + '.edit.delete' | translate}}</a>
+            <i class="fas fa-trash" aria-hidden="true"></i> {{type + '.edit.delete' | translate}}</a>
         </div>
       </div>
       <div class="pt-2">
@@ -27,7 +27,7 @@
           </div>
           <div class="col-12 text-right">
             <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
-              <i class="fas fa-arrow-left"></i> {{ type + '.edit.return' | translate }}
+              <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
             </a>
           </div>
         </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 16fda1caa8..bbc388a601 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -1,25 +1,21 @@
 <div *ngIf="!canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <a *ngIf="!section.model.disabled" class="d-flex flex-row flex-nowrap"
-       [routerLink]="itemModel.link"
-       href="javascript:void(0);">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
+    <a *ngIf="!section.model.disabled" class="btn btn-dark btn-sm"
+       [routerLink]="itemModel.link">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <div *ngIf="section.model.disabled" class="d-flex flex-row flex-nowrap">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
-    </div>
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
+    </button>
 </div>
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
-     [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
             (click)="activate($event)">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+        <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
 </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
index f0815c5415..bdf121f799 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -96,7 +96,7 @@ describe('DsoEditMenuSectionComponent', () => {
     });
     describe('when the section model in a disabled link or text', () => {
       it('should show just the button', () => {
-        const textButton = fixture.debugElement.query(By.css('div div button'));
+        const textButton = fixture.debugElement.query(By.css('div a'));
         expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString);
       });
     });
@@ -144,7 +144,7 @@ describe('DsoEditMenuSectionComponent', () => {
 
   });
 
-  describe('link model', () => {
+  describe('when the section model in a non disabled link', () => {
     initAsync(dummySectionLink, menuService);
     beforeEach(() => {
       spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
@@ -154,11 +154,8 @@ describe('DsoEditMenuSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    describe('when the section model in a non disabled link', () => {
-      it('should show a link element with the button in it', () => {
-        const link = fixture.debugElement.query(By.css('a'));
-        expect(link.nativeElement.innerHTML).toContain('button');
-      });
+    it('should show the link element', () => {
+      expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
     });
 
   });
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 1b27c9d308..5b39068ae2 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -58,11 +58,12 @@
         <div class="col text-right space-children-mr">
           <ng-content select="[before]"></ng-content>
             <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
-              <i class="fa fa-times"></i> {{cancelLabel | translate}}
+              <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="!(isValid() | async)"><i class="fas fa-save"></i> {{submitLabel | translate}}
+                    [disabled]="!(isValid() | async)">
+              <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
         </div>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index a14dde366e..9ad019c8c6 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -5,8 +5,8 @@
            [id]="entry.id"
            [ngModel]="entry.checked"
            (ngModelChange)="this.toggleCheckbox.emit($event);">
-    <label class="custom-control-label" [for]="entry.id"
-           [attr.aria-label]="(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate">
+    <label class="custom-control-label" [for]="entry.id">
+      <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
     </label>
   </div>
 </td>
@@ -30,12 +30,12 @@
     <button class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.policy' | translate"
             (click)="redirectToResourcePolicyEditPage()">
-      <i class="fas fa-edit fa-fw"></i>
+      <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
     <button *ngIf="(groupName$ | async) !== undefined" class="btn btn-outline-primary btn-sm"
             [title]="'resource-policies.table.headers.edit.group' | translate"
             (click)="redirectToGroupEditPage()">
-      <i class="fas fa-users fa-fw"></i>
+      <i class="fas fa-users fa-fw" aria-hidden="true"></i>
     </button>
   </div>
 </td>
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index b3dda9091d..485166aabf 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -17,10 +17,10 @@
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
-                  <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                  <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
                 <span *ngIf="!(isProcessingDelete() | async)">
-                  <i class='fas fa-trash-alt fa-fw'></i>
+                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
                   {{'resource-policies.delete.btn' | translate}}
                 </span>
               </button>
@@ -28,7 +28,7 @@
                       [disabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
-                <i class='fas fa-plus'></i>
+                <i class='fas fa-plus' aria-hidden="true"></i>
                 {{'resource-policies.add.button' | translate}}
               </button>
             </div>
@@ -42,8 +42,8 @@
                    class="custom-control-input"
                    [id]="'selectAll_' + resourceUUID"
                    (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID"
-                   [attr.aria-label]="(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate">
+            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+              <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
             </label>
           </div>
         </th>
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 88dc5926e4..b1fd8199d8 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -23,7 +23,7 @@
           <i class="fas fa-upload" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
-            <span role="button" [attr.aria-label]="'uploader.browse' | translate">{{'uploader.browse' | translate}}</span>
+            <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
           </label>
           <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
         </span>
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index ef4ce4ee45..2072cb4c83 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -53,6 +53,11 @@ export class UploaderComponent {
    */
   @Input() uploadProperties: UploaderProperties;
 
+  /**
+   * The aria label to describe what kind of files need to be uploaded
+   */
+  @Input() ariaLabel: string;
+
   /**
    * The function to call when upload is completed
    */
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d736efb9e0..b237d6e7d1 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -898,6 +898,8 @@
 
   "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
 
+  "collection.browse.logo": "Browse for a collection logo",
+
   "collection.create.head": "Create a Collection",
 
   "collection.create.notifications.success": "Successfully created the Collection",
@@ -1094,6 +1096,8 @@
 
   "collection.listelement.badge": "Collection",
 
+  "collection.logo": "Collection logo",
+
   "collection.page.browse.recent.head": "Recent Submissions",
 
   "collection.page.browse.recent.empty": "No items to show",
@@ -1180,6 +1184,8 @@
 
   "communityList.collapse": "Collapse {{ name }}",
 
+  "community.browse.logo": "Browse for a community logo",
+
   "community.create.head": "Create a Community",
 
   "community.create.notifications.success": "Successfully created the Community",
@@ -1256,6 +1262,8 @@
 
   "community.listelement.badge": "Community",
 
+  "community.logo": "Community logo",
+
   "comcol-role.edit.no-group": "None",
 
   "comcol-role.edit.create": "Create",

From ac743c513878065c6a9b3bf7950036b46531bcbb Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 15:33:07 +0100
Subject: [PATCH 0083/1286] Fixed feedback form page accessibility issue

- The form used a fieldset tag instead of a form tag
---
 .../feedback-form.component.html              | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 25be4ba445..a5de058854 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -1,45 +1,43 @@
 <div class="row row-offcanvas row-offcanvas-right">
   <div class="col-xs-12 col-sm-12 col-md-9">
-    <form class="primary" [formGroup]="feedbackForm" (ngSubmit)="createFeedback()">
-      <h1>{{ 'info.feedback.head' | translate }}</h1>
-      <p>{{ 'info.feedback.info' | translate }}</p>
-      <fieldset class="col p-0">
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
-            <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
-          </div>
+    <h1>{{ 'info.feedback.head' | translate }}</h1>
+    <p>{{ 'info.feedback.info' | translate }}</p>
+    <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+          <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
         </div>
+      </div>
 
-        <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
-          class="alert">
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
-            <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
-          </div>
+      <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
+        class="alert">
+        <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+        <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+      </ng-container>
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+          <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
         </div>
-        <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
-          class="alert">
-          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
-        </ng-container>
-        <div class="row">
-          <div class="control-group col-sm-12">
-            <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
-            <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
-            <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
-          </div>
+      </div>
+      <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
+        class="alert">
+        <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+      </ng-container>
+      <div class="row">
+        <div class="control-group col-sm-12">
+          <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+          <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
+          <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
-        <div class="row py-2">
-          <div class="control-group col-sm-12 text-right">
-            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
-          </div>
+      </div>
+      <div class="row py-2">
+        <div class="control-group col-sm-12 text-right">
+          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
-      </fieldset>
+      </div>
     </form>
   </div>
 </div>

From 138e163fa85d771bb8617e65ea7025e566f7eb94 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 16 Dec 2023 16:01:46 +0100
Subject: [PATCH 0084/1286] Fixed edit metadata page accessibility issue

- Hide fontawesome icons for screen readers
- Added missing aria-label to metadata field input
---
 .../dso-edit-metadata.component.html            | 17 ++++++++++-------
 .../metadata-field-selector.component.html      |  5 +++--
 src/assets/i18n/en.json5                        |  4 ++++
 3 files changed, 17 insertions(+), 9 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 24c3dc5cd7..8fb676a724 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
@@ -2,23 +2,23 @@
   <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>
+            (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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>
+            (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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>
+            (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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>
+            (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
   </div>
@@ -74,16 +74,19 @@
     <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 }}
+              (click)="reinstate()">
+        <i class="fas fa-undo-alt" aria-hidden="true"></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 }}
+              (click)="submit()">
+        <i class="fas fa-save" aria-hidden="true"></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 }}
+              (click)="discard()">
+        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
     </div>
   </div>
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 4c310bd81b..3f5af76051 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,6 +1,7 @@
 <div class="w-100 position-relative">
   <input type="text" #mdFieldInput
          class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+         [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
          [value]="mdField"
          [formControl]="input"
          (focusin)="query$.next(mdField)"
@@ -10,9 +11,9 @@
   <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)">
+        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
           <span [innerHTML]="mdFieldOption"></span>
-        </a>
+        </button>
       </div>
     </div>
   </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b237d6e7d1..f238b1c798 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2162,6 +2162,8 @@
 
   "item.edit.metadata.headers.value": "Value",
 
+  "item.edit.metadata.metadatafield": "Edit field",
+
   "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -2686,6 +2688,8 @@
 
   "itemtemplate.edit.metadata.headers.value": "Value",
 
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
   "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",

From 63fa8f39f593193e35446d1335ce37b377847921 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 20 Dec 2023 21:18:56 +0100
Subject: [PATCH 0085/1286] Fixed user authentication/registration
 accessibility issue

- Added the correct autocomplete value
- Removed dangling labels, because aria labels already describe those input fields & we can't use ids in this component because otherwise there are duplicate ids on the /login page
---
 .../forgot-password-form.component.html                  | 8 ++++----
 .../forgot-password-form.component.spec.ts               | 8 ++++++--
 .../profile-page-metadata-form.component.ts              | 8 ++++++--
 .../profile-page-security-form.component.ts              | 9 ++++++---
 src/app/profile-page/profile-page.component.html         | 3 +--
 .../methods/password/log-in-password.component.html      | 6 ++----
 src/assets/i18n/en.json5                                 | 4 +---
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 5fb0006279..189d0bee40 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,13 +1,13 @@
 <div class="container" *ngIf="(registration$ |async)">
-    <h3 class="mb-4">{{'forgot-password.form.head' | translate}}</h3>
+    <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="card mb-4">
         <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
-                           for="email">{{'forgot-password.form.identification.email' | translate}}</label>
-                    <span id="email">{{(registration$ |async).email}}</span></div>
+                    <span class="font-weight-bold">{{'forgot-password.form.identification.email' | translate}} </span>
+                    <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
index 92d72d83df..05f5df72f1 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -21,6 +21,7 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
 import { CoreState } from '../../core/core-state.model';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
 describe('ForgotPasswordFormComponent', () => {
   let comp: ForgotPasswordFormComponent;
@@ -54,7 +55,10 @@ describe('ForgotPasswordFormComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
-      declarations: [ForgotPasswordFormComponent],
+      declarations: [
+        BrowserOnlyPipe,
+        ForgotPasswordFormComponent,
+      ],
       providers: [
         {provide: Router, useValue: router},
         {provide: ActivatedRoute, useValue: route},
@@ -75,7 +79,7 @@ describe('ForgotPasswordFormComponent', () => {
 
   describe('init', () => {
     it('should initialise mail address', () => {
-      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      const elem = fixture.debugElement.queryAll(By.css('span[data-test="email"]'))[0].nativeElement;
       expect(elem.innerHTML).toContain('test@email.org');
     });
   });
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index c4e164a7e8..53f9acdb45 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -43,7 +43,8 @@ export class ProfilePageMetadataFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'email',
       name: 'email',
-      readOnly: true
+      readOnly: true,
+      disabled: true,
     }),
     new DynamicInputModel({
       id: 'firstname',
@@ -55,6 +56,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       errorMessages: {
         required: 'This field is required'
       },
+      autoComplete: 'given-name',
     }),
     new DynamicInputModel({
       id: 'lastname',
@@ -66,10 +68,12 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       errorMessages: {
         required: 'This field is required'
       },
+      autoComplete: 'family-name',
     }),
     new DynamicInputModel({
       id: 'phone',
-      name: 'eperson.phone'
+      name: 'eperson.phone',
+      autoComplete: 'tel',
     }),
     new DynamicSelectModel<string>({
       id: 'language',
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 04292ea96e..940e382c78 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -39,12 +39,14 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'password',
       name: 'password',
-      inputType: 'password'
+      inputType: 'password',
+      autoComplete: 'new-password',
     }),
     new DynamicInputModel({
       id: 'passwordrepeat',
       name: 'passwordrepeat',
-      inputType: 'password'
+      inputType: 'password',
+      autoComplete: 'new-password',
     })
   ];
 
@@ -79,7 +81,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
         id: 'current-password',
         name: 'current-password',
         inputType: 'password',
-        required: true
+        required: true,
+        autoComplete: 'current-password',
       }));
     }
     if (this.passwordCanBeEmpty) {
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index fd7246c08b..331c360054 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,8 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
     <h1>{{'profile.title' | translate}}</h1>
-    <ng-container *ngIf="isResearcherProfileEnabled() | async">
-      <h2 class="mb-4">{{'profile.head' | translate}}</h2>
+    <ng-container>
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 60477d141d..94f6ef870d 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,9 +1,8 @@
 <form class="form-login"
       (ngSubmit)="submit()"
       [formGroup]="form" novalidate>
-  <label class="sr-only">{{"login.form.email" | translate}}</label>
   <input [attr.aria-label]="'login.form.email' |translate"
-         autocomplete="off"
+         autocomplete="username"
          autofocus
          class="form-control form-control-lg position-relative"
          formControlName="email"
@@ -11,9 +10,8 @@
          required
          type="email"
          [attr.data-test]="'email' | dsBrowserOnly">
-  <label class="sr-only">{{"login.form.password" | translate}}</label>
   <input [attr.aria-label]="'login.form.password' |translate"
-         autocomplete="off"
+         autocomplete="current-password"
          class="form-control form-control-lg position-relative mb-3"
          placeholder="{{'login.form.password' | translate}}"
          formControlName="password"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f238b1c798..9965a07f5d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1710,7 +1710,7 @@
 
   "forgot-password.form.label.passwordrepeat": "Retype to confirm",
 
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
 
   "forgot-password.form.error.matching-passwords": "The passwords do not match.",
 
@@ -3340,8 +3340,6 @@
 
   "profile.special.groups.head": "Authorization special groups you belong to",
 
-  "profile.head": "Update Profile",
-
   "profile.metadata.form.error.firstname.required": "First Name is required",
 
   "profile.metadata.form.error.lastname.required": "Last Name is required",

From 3e48e5903e2cadc124d823d8bb6773ee260a57d1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 26 Dec 2023 11:26:08 +0100
Subject: [PATCH 0086/1286] Fixed dropdown accessibility issue

- Removed non-existing dropdownMenuButton references
- Added appropriate roles to dropdown menus
---
 ...space-new-external-dropdown.component.html |  4 +--
 ...ace-new-submission-dropdown.component.html |  4 +--
 .../collection-dropdown.component.html        | 22 +++++++++-------
 .../collection-dropdown.component.scss        |  3 ++-
 .../shared/ds-select/ds-select.component.html |  2 +-
 .../entity-dropdown.component.html            | 26 ++++++++++---------
 .../entity-dropdown.component.scss            | 10 ++++---
 .../entity-dropdown.component.spec.ts         |  2 +-
 .../lookup/dynamic-lookup.component.html      |  1 -
 .../submission-form-collection.component.html |  2 +-
 src/assets/i18n/en.json5                      |  2 ++
 11 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 392134dbce..23438c205f 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -15,10 +15,10 @@
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="importControlsDropdownMenu"
          aria-labelledby="dropdownImport">
       <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 73fbeb30c2..566e40d98a 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -13,10 +13,10 @@
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
-      <span class="caret"></span>
+      <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="entityControlsDropdownMenu"
          aria-labelledby="dropdownSubmission">
       <ds-entity-dropdown [isSubmission]="true" (selectionChange)="openDialog($event)"></ds-entity-dropdown>
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 470291373f..a27aafa31d 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2">
+<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2 my-2">
   <input type="search"
          class="form-control w-100"
          (click)="$event.stopPropagation();"
@@ -6,9 +6,9 @@
          [formControl]="searchField"
          #searchFieldEl>
 </div>
-<div class="dropdown-divider"></div>
-<ul class="scrollable-menu p-0"
-     aria-labelledby="dropdownMenuButton"
+<div class="dropdown-divider m-0"></div>
+<ul class="scrollable-menu p-0 m-0"
+    role="menu"
      (scroll)="onScroll($event)"
      infiniteScroll
      [infiniteScrollDistance]="1.5"
@@ -18,12 +18,13 @@
      [scrollWindow]="false"
      (scrolled)="onScrollDown()">
 
-  <li class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
+  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
     {{'submission.sections.general.no-collection' | translate}}
   </li>
   <ng-container *ngIf="searchListCollection?.length > 0">
     <li *ngFor="let listItem of searchListCollection"
             class="dropdown-item collection-item"
+            role="menuitem"
             title="{{ listItem.collection.name }}"
             (click)="onSelect(listItem)">
       <div class="list-unstyled mb-0">
@@ -34,9 +35,10 @@
       </div>
     </li>
   </ng-container>
-  <button class="dropdown-item disabled" *ngIf="(isLoading | async)">
-    <ds-themed-loading message="{{'loading.default' | translate}}">
-    </ds-themed-loading>
-  </button>
-
+  <li *ngIf="(isLoading | async)">
+    <button class="dropdown-item disabled">
+      <ds-themed-loading message="{{'loading.default' | translate}}">
+      </ds-themed-loading>
+    </button>
+  </li>
 </ul>
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
index 907a111900..8a28a3ff7e 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.scss
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
@@ -4,7 +4,8 @@
   overflow-x: hidden;
 }
 
-.collection-item {
+li:not(:last-of-type), .dropdown-divider {
+  border-top: none;
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 5a15155d4f..c12ea61347 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -22,7 +22,7 @@
          class="dropdown-menu"
          id="dsSelectDropdownMenu"
          aria-labelledby="dsSelectMenuButton">
-      <div aria-labelledby="dropdownMenuButton">
+      <div>
         <ng-content select=".menu"></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index a4d539625f..38b4ecc53e 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -1,6 +1,5 @@
-<div
-    class="scrollable-menu"
-    aria-labelledby="dropdownMenuButton"
+<ul class="scrollable-menu list-unstyled mb-0"
+    role="menu"
     (scroll)="onScroll($event)"
     infiniteScroll
     [infiniteScrollDistance]="5"
@@ -9,20 +8,23 @@
     [fromRoot]="true"
     [scrollWindow]="false"
     (scrolled)="onScrollDown()">
-    <button class="dropdown-item disabled" *ngIf="searchListEntity?.length == 0 && !(isLoadingList | async)">
+  <li *ngIf="searchListEntity?.length == 0 && !(isLoadingList | async)">
+    <button class="dropdown-item disabled" role="menuitem">
       {{'submission.sections.general.no-entity' | translate}}
     </button>
-    <button *ngFor="let listItem of searchListEntity"
-            class="dropdown-item entity-item"
+  </li>
+  <li *ngFor="let listItem of searchListEntity" class="entity-item text-primary">
+    <button class="dropdown-item"
+            role="menuitem"
             title="{{ listItem.label }}"
             (click)="onSelect(listItem)">
-      <ul class="list-unstyled mb-0">
-        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
-      </ul>
+      <span class="text-truncate font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</span>
     </button>
-    <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
+  </li>
+  <li *ngIf="(isLoadingList | async)">
+    <button class="dropdown-item disabled" role="menuitem">
       <ds-themed-loading message="{{'loading.default' | translate}}">
       </ds-themed-loading>
     </button>
-
-</div>
+  </li>
+</ul>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.scss b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
index a5f43f359b..4f9ca62310 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.scss
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.scss
@@ -1,5 +1,9 @@
-.list-item:active {
-  color: white !important;
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
 }
 
 .scrollable-menu {
@@ -8,7 +12,7 @@
   overflow-x: hidden;
 }
 
-.entity-item {
+li:not(:last-of-type) .dropdown-item {
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
 
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
index 13e6dbc9c5..2f3aa763bc 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
@@ -123,7 +123,7 @@ describe('EntityDropdownComponent', () => {
     scheduler.flush();
 
     spyOn(component, 'onSelect');
-    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2)'));
+    const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2) button'));
     entityItem.triggerEventHandler('click', null);
 
     scheduler.schedule(() => fixture.detectChanges());
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c624c46d2d..0ecddf9278 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -88,7 +88,6 @@
        aria-expanded="false"
        [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         aria-labelledby="scrollableDropdownMenuButton"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index a78d737640..f967ffe132 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -32,7 +32,7 @@
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
       <ds-themed-collection-dropdown
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 9965a07f5d..eb0934eef8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4446,6 +4446,8 @@
 
   "submission.sections.general.no-collection": "No collection found",
 
+  "submission.sections.general.no-entity": "No entity types found",
+
   "submission.sections.general.no-sections": "No options available",
 
   "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",

From 05c978bc627773eb6fb51d2a9cd241ed38c322cf Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@tamu.edu>
Date: Fri, 26 Jan 2024 15:56:35 -0600
Subject: [PATCH 0087/1286] Dedupe patch operations by op and path

(cherry picked from commit f40639de8672b047038e0ddba9242b11864e2231)
---
 .../json-patch-operations.reducer.ts          | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 5e00027edb..86edd339e8 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -351,7 +351,28 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
       newBody.push(makeOperationEntry({ op: JsonPatchOperationType.move, from: fromPath, path: targetPath }));
       break;
   }
-  return newBody;
+  return dedupeOperationEntries(newBody);
+}
+
+/**
+ * Dedupe operation entries by op and path. This prevents processing unnecessary patches in a single PATCH request.
+ *
+ * @param body JSON patch operation object entries
+ * @returns deduped JSON patch operation object entries
+ */
+function dedupeOperationEntries(body: JsonPatchOperationObject[]): JsonPatchOperationObject[] {
+  const ops = new Map<string, any>();
+  for (let i = body.length - 1; i >= 0; i--) {
+    const patch = body[i].operation;
+    const key = `${patch.op}-${patch.path}`;
+    if (!ops.has(key)) {
+      ops.set(key, patch);
+    } else {
+      body.splice(i, 1);
+    }
+  }
+
+  return body;
 }
 
 function makeOperationEntry(operation) {

From e2d014d0a6b5e1ec8372cb2cdad922d7ae35e37f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 2 Feb 2024 14:27:33 -0600
Subject: [PATCH 0088/1286] Update cli.yml to reference dspacenet in
 docker-compose-rest.  Remove unnecessary network from cli.assetstore.yml

---
 docker/cli.assetstore.yml |  5 -----
 docker/cli.yml            | 15 ++++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c..31bc53f64d 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -14,13 +14,8 @@
 # Therefore, it should be kept in sync with that file
 version: "3.7"
 
-networks:
-  dspacenet:
-
 services:
   dspace-cli:
-    networks:
-      dspacenet: {}
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
diff --git a/docker/cli.yml b/docker/cli.yml
index 54b83d4503..6b2b1daad0 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -13,7 +13,12 @@
 #
 # Therefore, it should be kept in sync with that file
 version: "3.7"
-
+networks:
+  # Default to using network named 'dspacenet' from docker-compose-rest.yml.
+  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  default:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-cli:
     image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
@@ -30,16 +35,12 @@ services:
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
     volumes:
-    - "assetstore:/dspace/assetstore"
+    # Keep DSpace assetstore directory between reboots
+    - assetstore:/dspace/assetstore
     entrypoint: /dspace/bin/dspace
     command: help
-    networks:
-      - dspacenet
     tty: true
     stdin_open: true
 
 volumes:
   assetstore:
-
-networks:
-  dspacenet:

From f072ae74afe8f6c9d22fcbba7c97f67ae48506ab Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 2 Feb 2024 14:57:34 -0600
Subject: [PATCH 0089/1286] Bug fix to GitHub CI build. Set compose project
 name via env variable. Also add default name if unspecified

---
 .github/workflows/build.yml | 2 ++
 docker/cli.yml              | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2680420a2..52f20470a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,8 @@ jobs:
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
+      # Project name to use when running docker-compose prior to e2e tests
+      COMPOSE_PROJECT_NAME: 'ci'
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
diff --git a/docker/cli.yml b/docker/cli.yml
index 6b2b1daad0..fa53ef6069 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -16,8 +16,9 @@ version: "3.7"
 networks:
   # Default to using network named 'dspacenet' from docker-compose-rest.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
   default:
-    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
     external: true
 services:
   dspace-cli:

From b9cc5ba824bb6fce7bcf585fd07bb9964064131d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 2 Feb 2024 16:59:52 -0600
Subject: [PATCH 0090/1286] Resync docker-compose-ci and
 docker/docker-compose-rest with DSpace/DSpace docker scripts

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

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 9ec8fe664a..db334f161f 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,11 +33,11 @@ services:
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -45,8 +45,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
@@ -70,21 +68,18 @@ services:
       PGDATA: /pgdata
     image: dspace/dspace-postgres-pgcrypto:loadsql
     networks:
-      dspacenet:
+      - dspacenet
     stdin_open: true
     tty: true
     volumes:
+     # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.11-slim
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -92,9 +87,6 @@ services:
     tty: true
     working_dir: /var/solr/data
     volumes:
-    # Mount our "solr_configs" volume available under the Solr's configsets folder (in a 'dspace' subfolder)
-    # This copies the Solr configs from main 'dspace' container into 'dspacesolr' via that volume
-    - solr_configs:/opt/solr/server/solr/configsets/dspace
     # Keep Solr data directory between reboots
     - solr_data:/var/solr/data
     # Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
@@ -103,14 +95,16 @@ services:
     - '-c'
     - |
       init-var-solr
-      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
-      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
-      precreate-core search /opt/solr/server/solr/configsets/dspace/search
-      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
+      precreate-core authority /opt/solr/server/solr/configsets/authority
+      cp -r /opt/solr/server/solr/configsets/authority/* authority
+      precreate-core oai /opt/solr/server/solr/configsets/oai
+      cp -r /opt/solr/server/solr/configsets/oai/* oai
+      precreate-core search /opt/solr/server/solr/configsets/search
+      cp -r /opt/solr/server/solr/configsets/search/* search
+      precreate-core statistics /opt/solr/server/solr/configsets/statistics
+      cp -r /opt/solr/server/solr/configsets/statistics/* statistics
       exec solr -f
 volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:
\ No newline at end of file
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index e5f62600e7..c9207713a9 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -43,7 +43,7 @@ services:
     depends_on:
     - dspacedb
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -51,8 +51,6 @@ services:
     tty: true
     volumes:
     - assetstore:/dspace/assetstore
-    # Mount DSpace's solr configs to a volume, so that we can share to 'dspacesolr' container (see below)
-    - solr_configs:/dspace/solr
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
@@ -69,25 +67,25 @@ services:
     container_name: dspacedb
     environment:
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto
+      POSTGRES_PASSWORD: dspace
+    # Uses a custom Postgres image with pgcrypto installed
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 5432
       target: 5432
     stdin_open: true
     tty: true
     volumes:
+    # Keep Postgres data directory between reboots
     - pgdata:/pgdata
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
     image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
-    # Needs main 'dspace' container to start first to guarantee access to solr_configs
-    depends_on:
-    - dspace
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -120,5 +118,3 @@ volumes:
   assetstore:
   pgdata:
   solr_data:
-  # Special volume used to share Solr configs from 'dspace' to 'dspacesolr' container (see above)
-  solr_configs:

From 59fc3e5635310068ca8f40a6cd0aa0f533b964ab Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Mon, 5 Feb 2024 12:06:11 +0100
Subject: [PATCH 0091/1286] remove translation (use singular form instead of
 plural form)

(cherry picked from commit ac5670a51428c58cf02cf139b97c7d358d5b5f30)
---
 src/assets/i18n/de.json5 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index c185a13432..94067fccd0 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -731,9 +731,6 @@
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "Workflows verwalten",
 
-  // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "Workflows",
-
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Löschen",
 

From ff55646c62a3666f5038d3a039cee88d51301220 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 5 Dec 2023 00:45:19 +0100
Subject: [PATCH 0092/1286] 108588: Fixed accessibility issues on
 ds-comcol-page-browse-by

---
 .../comcol-page-browse-by.component.html                      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index 504d9f4bcd..39c5cb000c 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -2,9 +2,11 @@
 <nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
   <div class="d-none d-sm-block">
 
-    <div class="list-group list-group-horizontal">
+    <div class="list-group list-group-horizontal" role="tablist">
       <a *ngFor="let option of allOptions"
+         [attr.aria-current]="(currentOptionId$ | async) === option.id"
          class="list-group-item"
+         role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
          routerLinkActive="active">{{ option.label | translate }}</a>

From effa19f71912ca1b35130c5047850bd5cd724565 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 7 Feb 2024 13:43:50 +0100
Subject: [PATCH 0093/1286] 111679: Restored missing inAndOutputNames on
 ClaimedTaskActionsLoaderComponent

---
 .../switcher/claimed-task-actions-loader.component.ts           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
index e3d3a4f7ef..d33516fcb8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
@@ -68,8 +68,10 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges, OnD
    * The list of input and output names for the dynamic component
    */
   protected inAndOutputNames: (keyof ClaimedTaskActionsAbstractComponent & keyof this)[] = [
+    'item',
     'object',
     'option',
+    'workflowitem',
     'processCompleted',
   ];
 

From eb4633557db61cceab1c093ccccda4848d75d555 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:29:37 +0000
Subject: [PATCH 0094/1286] Bump follow-redirects from 1.15.3 to 1.15.5

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.5.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.5)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index 6e04ab27b2..786a832e56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5859,9 +5859,9 @@ flatted@^3.1.0, flatted@^3.2.7:
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
-  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
 for-each@^0.3.3:
   version "0.3.3"

From 9f99555c6402a9c5d8dd76c53a71e6110217d756 Mon Sep 17 00:00:00 2001
From: Agustina Martinez <am857@cam.ac.uk>
Date: Tue, 23 Jan 2024 21:47:29 +0000
Subject: [PATCH 0095/1286] Update item-status.component.ts

Fix initialOperations typo and return ops with register doi op

(cherry picked from commit e77898eaacb3489f9bdd077a709c90ca66ca0dec)
---
 .../edit-item-page/item-status/item-status.component.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 8e04985c18..d3a5e033d7 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -117,7 +117,7 @@ export class ItemStatusComponent implements OnInit {
        * The value is supposed to be a href for the button
        */
       const currentUrl = this.getCurrentUrl(item);
-      const inititalOperations: ItemOperation[] = [
+      const initialOperations: ItemOperation[] = [
         new ItemOperation('authorizations', `${currentUrl}/authorizations`, FeatureID.CanManagePolicies, true),
         new ItemOperation('mappedCollections', `${currentUrl}/mapper`, FeatureID.CanManageMappings, true),
         item.isWithdrawn
@@ -130,7 +130,7 @@ export class ItemStatusComponent implements OnInit {
         new ItemOperation('delete', `${currentUrl}/delete`, FeatureID.CanDelete, true)
       ];
 
-      this.operations$.next(inititalOperations);
+      this.operations$.next(initialOperations);
 
         /**
          *  When the identifier data stream changes, determine whether the register DOI button should be shown or not.
@@ -170,12 +170,12 @@ export class ItemStatusComponent implements OnInit {
           }),
           // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe
           switchMap((showDoi: boolean) => {
-            const ops = [...inititalOperations];
+            const ops = [...initialOperations];
             if (showDoi) {
               const op = new ItemOperation('register-doi', `${currentUrl}/register-doi`, FeatureID.CanRegisterDOI, true);
               ops.splice(ops.length - 1, 0, op); // Add item before last
             }
-            return inititalOperations;
+            return ops;
           }),
           concatMap((op: ItemOperation) => {
             if (hasValue(op.featureID)) {

From 8b3bc908645a9e2c5a2d55cc6950871b98bbfc31 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 7 Feb 2024 11:55:44 +1300
Subject: [PATCH 0096/1286] Improve cfg handling in item-status.component.ts

(cherry picked from commit 3e33785311444682eaf1f38ffc0bb8e0b3e3f353)
---
 .../item-status/item-status.component.ts        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index d3a5e033d7..759045b3dc 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -3,7 +3,7 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { ItemOperation } from '../item-operation/itemOperation.model';
-import { concatMap, distinctUntilChanged, first, map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import {concatMap, distinctUntilChanged, first, map, mergeMap, switchMap, tap, toArray} from 'rxjs/operators';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
@@ -17,6 +17,7 @@ import { ConfigurationProperty } from '../../../core/shared/configuration-proper
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import {getDSORoute} from "../../../app-routing-paths";
 
 @Component({
   selector: 'ds-item-status',
@@ -107,7 +108,19 @@ export class ItemStatusComponent implements OnInit {
       // Observable for configuration determining whether the Register DOI feature is enabled
       let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
         getFirstCompletedRemoteData(),
-        map((enabledRD: RemoteData<ConfigurationProperty>) => enabledRD.hasSucceeded && enabledRD.payload.values.length > 0)
+        map((response: RemoteData<ConfigurationProperty>) => {
+          // Return true if a successful response with a 'true' value was retrieved, otherwise return false
+          if (response.hasSucceeded) {
+            const payload = response.payload;
+            if (payload.values.length > 0 && hasValue(payload.values[0])) {
+              return payload.values[0] === 'true';
+            } else {
+              return false;
+            }
+          } else {
+            return false;
+          }
+        })
       );
 
       /**

From c50dd1a3e9e4bd4c06136fd795e84b252afad415 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 7 Feb 2024 12:09:16 +1300
Subject: [PATCH 0097/1286] Improve cfg handling in item-status.component.ts

(cherry picked from commit 68475d1ed61bd231de1a1efdb2feb3bf638108c2)
---
 .../edit-item-page/item-status/item-status.component.ts        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 759045b3dc..8b4dc88d9d 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -3,7 +3,7 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { ItemOperation } from '../item-operation/itemOperation.model';
-import {concatMap, distinctUntilChanged, first, map, mergeMap, switchMap, tap, toArray} from 'rxjs/operators';
+import {concatMap, distinctUntilChanged, first, map, mergeMap, switchMap, toArray} from 'rxjs/operators';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
@@ -17,7 +17,6 @@ import { ConfigurationProperty } from '../../../core/shared/configuration-proper
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
-import {getDSORoute} from "../../../app-routing-paths";
 
 @Component({
   selector: 'ds-item-status',

From 9d9d90ab9c458beb2ce8a6dd025f3264ec1b93d7 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 8 Dec 2023 21:54:32 +0300
Subject: [PATCH 0098/1286] src/assets/i18n: change "controller" to "reviewer"

Reviewer is a less obscure term for what this actually is in most
cases.

(cherry picked from commit 98241d8925cbc394c78feb124cdea476c67da4be)
---
 src/assets/i18n/ar.json5    | 4 ++--
 src/assets/i18n/bn.json5    | 2 +-
 src/assets/i18n/ca.json5    | 2 +-
 src/assets/i18n/cs.json5    | 4 ++--
 src/assets/i18n/de.json5    | 2 +-
 src/assets/i18n/en.json5    | 4 ++--
 src/assets/i18n/es.json5    | 2 +-
 src/assets/i18n/fi.json5    | 2 +-
 src/assets/i18n/fr.json5    | 2 +-
 src/assets/i18n/gd.json5    | 2 +-
 src/assets/i18n/hu.json5    | 2 +-
 src/assets/i18n/it.json5    | 2 +-
 src/assets/i18n/ja.json5    | 4 ++--
 src/assets/i18n/kk.json5    | 2 +-
 src/assets/i18n/lv.json5    | 2 +-
 src/assets/i18n/nl.json5    | 2 +-
 src/assets/i18n/pt-BR.json5 | 2 +-
 src/assets/i18n/pt-PT.json5 | 2 +-
 src/assets/i18n/sv.json5    | 2 +-
 src/assets/i18n/sw.json5    | 4 ++--
 src/assets/i18n/tr.json5    | 2 +-
 src/assets/i18n/uk.json5    | 2 +-
 22 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 3069104dd9..617d2a93de 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -4284,9 +4284,9 @@
   // TODO New key - Add a translation
   "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index c70cc6f459..c9c5ba2640 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -3886,7 +3886,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "বৈধতা",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "নিয়ামক জন্য অপেক্ষা করছে",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index ad8fe49424..db624f2c3f 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -4196,7 +4196,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validació",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Esperant el controlador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 7f9583a50e..9816571e05 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4195,9 +4195,9 @@
   // TODO New key - Add a translation
   "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 94067fccd0..cff2ac0570 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -3488,7 +3488,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validierung",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Warten auf die Überprüfung",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index eb0934eef8..88e2c41bb8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3082,7 +3082,7 @@
 
   "mydspace.status.mydspaceValidation": "Validation",
 
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   "mydspace.status.mydspaceWorkflow": "Workflow",
 
@@ -3902,7 +3902,7 @@
 
   "search.filters.namedresourcetype.Validation": "Validation",
 
-  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for Controller",
+  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
 
   "search.filters.namedresourcetype.Workflow": "Workflow",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 0d5b27473c..dc4e3afcc7 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -4524,7 +4524,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validación",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Esperando al controlador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 423099b956..5fec62d2b9 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -4479,7 +4479,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validointi",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Odottaa tarkastajaa",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 699ca5cc27..80566e589e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -3828,7 +3828,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "En cours de validation",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "En attente d'assignation",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 55a53bc6f1..929ab87d10 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -3873,7 +3873,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Dearbhadh",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "A' feitheamh riaghladair",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index d186f6435a..afbfa25a13 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -4989,7 +4989,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Érvényesítés",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Várakozás a kontrollerre",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index 7f410ce0b1..ad2478ae61 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -4570,7 +4570,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Convalida",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "In attesa del controllo",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index da2385fd62..03323eb7ef 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -4284,9 +4284,9 @@
   // TODO New key - Add a translation
   "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index d23dc23c47..dbaa8078e2 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -4145,7 +4145,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Валидация",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Контроллерді күтуде",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 81e2383a1f..3ceaac7fea 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -3498,7 +3498,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validācija",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Gaida kontrolieri",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index 280a87b96f..fc52543c38 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -3770,7 +3770,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validatie",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Wachten op controlleur",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index ce35f1ec05..5061c5a0e9 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -4533,7 +4533,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validação",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Esperando pelo controlador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index faa027705e..328cb20810 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -4478,7 +4478,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Em validação",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Aguarda validador",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index 4e3576ccfc..d2fe72536c 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -3940,7 +3940,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Validering",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Väntar på kontrollant",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index a470ee4b58..d2d663cdc5 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -4284,9 +4284,9 @@
   // TODO New key - Add a translation
   "mydspace.status.mydspaceValidation": "Validation",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index 153eaa1281..75bc5c9a36 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -3263,7 +3263,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Doğrulama",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Kontrolör bekleniyor",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
index 7df55fa236..fae770b6bd 100644
--- a/src/assets/i18n/uk.json5
+++ b/src/assets/i18n/uk.json5
@@ -3389,7 +3389,7 @@
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Перевірка",
 
-  // "mydspace.status.mydspaceWaitingController": "Waiting for controller",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "Чекаємо контролера",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",

From b2b9fb8bf912b45b17fe55a57e78538466f2276a Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 8 Dec 2023 22:02:19 +0300
Subject: [PATCH 0099/1286] src/assets/i18n/en.json5: minor updates for
 consistency

We should be capitalizing acronyms and project-specific nouns like
MyDSpace consistently in our interface.

(cherry picked from commit f78f4b45fcb82654c2cca08cccb254f414a3244f)
---
 src/assets/i18n/en.json5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 88e2c41bb8..c9ba2f5d56 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -606,9 +606,9 @@
 
   "admin.metadata-import.page.error.addFile": "Select file first!",
 
-  "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
 
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Select ZIP file first!",
 
   "admin.metadata-import.page.toggle.upload": "Upload",
 
@@ -3068,9 +3068,9 @@
 
   "mydspace.results.no-title": "No title",
 
-  "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "No URI",
 
-  "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Search in MyDSpace...",
 
   "mydspace.show.workflow": "Workflow tasks",
 

From 8eb2e2ce802c380e6cf7f60384b80804899c0042 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 8 Dec 2023 22:03:11 +0300
Subject: [PATCH 0100/1286] src/assets/i18n/en.json5: minor changes for
 consistency

Fix some random capitalizations and strange wording.

(cherry picked from commit d6c46847c2340c2e2755a81b0909e30a25052ea5)
---
 src/assets/i18n/en.json5 | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c9ba2f5d56..c4bf2c0834 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4,15 +4,15 @@
 
   "401.link.home-page": "Take me to the home page",
 
-  "401.unauthorized": "unauthorized",
+  "401.unauthorized": "Unauthorized",
 
   "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.link.home-page": "Take me to the home page",
 
-  "403.forbidden": "forbidden",
+  "403.forbidden": "Forbidden",
 
-  "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Service unavailable",
 
   "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
 
@@ -22,15 +22,15 @@
 
   "404.link.home-page": "Take me to the home page",
 
-  "404.page-not-found": "page not found",
+  "404.page-not-found": "Page not found",
 
-  "error-page.description.401": "unauthorized",
+  "error-page.description.401": "Unauthorized",
 
-  "error-page.description.403": "forbidden",
+  "error-page.description.403": "Forbidden",
 
-  "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Service unavailable",
 
-  "error-page.description.404": "page not found",
+  "error-page.description.404": "Page not found",
 
   "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",
 
@@ -58,7 +58,7 @@
 
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
 
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Create bitstream format",
 
   "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
 
@@ -316,7 +316,7 @@
 
   "admin.access-control.epeople.form.email": "E-mail",
 
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Must be a valid e-mail address",
 
   "admin.access-control.epeople.form.canLogIn": "Can log in",
 
@@ -1220,9 +1220,9 @@
 
   "community.edit.logo.label": "Community logo",
 
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
 
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Upload community logo successful.",
 
   "community.edit.logo.notifications.delete.success.title": "Logo deleted",
 
@@ -1230,13 +1230,13 @@
 
   "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
 
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Drop a community logo to upload",
 
   "community.edit.notifications.success": "Successfully edited the Community",
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "An error occured while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1632,9 +1632,9 @@
 
   "error.validation.required": "This field is required",
 
-  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "This is not a valid e-mail",
 
-  "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "This e-mail is already taken",
 
   "error.validation.groupExists": "This group already exists",
 
@@ -3074,7 +3074,7 @@
 
   "mydspace.show.workflow": "Workflow tasks",
 
-  "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Your submissions",
 
   "mydspace.show.supervisedWorkspace": "Supervised items",
 
@@ -3110,7 +3110,7 @@
 
   "nav.login": "Log In",
 
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "User profile menu and log out",
 
   "nav.logout": "Log Out",
 

From 17dc120ca15cc0603d5fbad4a58e704e98a6f287 Mon Sep 17 00:00:00 2001
From: Thomas Misilo <tmisilo@ksu.edu>
Date: Mon, 11 Dec 2023 13:16:46 -0600
Subject: [PATCH 0101/1286] Update "E-mail" to be "Email" for consistency

(cherry picked from commit 7b8962a7cde749074df3c47e93e780fb21c895ca)
---
 .../privacy-content/privacy-content.component.html |  2 +-
 src/assets/i18n/en.json5                           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index f29a786e8b..003e6b0d51 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -22,7 +22,7 @@
 <h2>Information we collect about you and how we collect it</h2>
 <p>We collect several types of information from and about users of our Website, including information:</p>
 <ul>
-  <li>by which you may be personally identified, such as name, e-mail address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
+  <li>by which you may be personally identified, such as name, email address, telephone number, or any other identifier by which you may be contacted online or offline ("personal information"); and/or</li>
   <li>about your internet connection, the equipment you use to access our Website and usage details.</li>
 </ul>
 <p>We collect this information:</p>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c4bf2c0834..1296bb21e2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -282,7 +282,7 @@
 
   "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Email (exact)",
 
   "admin.access-control.epeople.search.button": "Search",
 
@@ -294,7 +294,7 @@
 
   "admin.access-control.epeople.table.name": "Name",
 
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Email (exact)",
 
   "admin.access-control.epeople.table.edit": "Edit",
 
@@ -314,9 +314,9 @@
 
   "admin.access-control.epeople.form.lastName": "Last name",
 
-  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Email",
 
-  "admin.access-control.epeople.form.emailHint": "Must be a valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
 
   "admin.access-control.epeople.form.canLogIn": "Can log in",
 
@@ -766,7 +766,7 @@
 
   "bitstream-request-a-copy.name.error": "The name is required",
 
-  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Your email address *",
 
   "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
 
@@ -1632,9 +1632,9 @@
 
   "error.validation.required": "This field is required",
 
-  "error.validation.NotValidEmail": "This is not a valid e-mail",
+  "error.validation.NotValidEmail": "This is not a valid email",
 
-  "error.validation.emailTaken": "This e-mail is already taken",
+  "error.validation.emailTaken": "This email is already taken",
 
   "error.validation.groupExists": "This group already exists",
 

From 0366e8b934979ca254c752920d8d93ad7946eb7d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 14 Feb 2024 00:10:41 +0100
Subject: [PATCH 0102/1286] Replace routerLinkActive with [class.active] to
 ensure visibility of aria-current tag

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

diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index 39c5cb000c..c0ead4f46a 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -9,7 +9,7 @@
          role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
-         routerLinkActive="active">{{ option.label | translate }}</a>
+         [class.active]="(currentOptionId$ | async) === option.id">{{ option.label | translate }}</a>
     </div>
   </div>
 

From 381254a16e5ea21d0bd27846b1ddd8640733f49a Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 16 Nov 2023 19:38:13 -0800
Subject: [PATCH 0103/1286] File edit component updated to work for forms
 without access conditions.

Fixed unit test

Fixed accidental reformatting

(cherry picked from commit 6fff475a5a0a8a2a234b114307e3df897400da60)
---
 ...section-upload-file-edit.component.spec.ts | 25 ++++++
 .../section-upload-file-edit.component.ts     | 78 ++++++++++---------
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index d008bf61f1..72c555f39c 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -80,6 +80,9 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   const fileData: any = mockUploadFiles[0];
   const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
 
+  let noAccessConditionsMock = Object.assign({}, mockFileFormData);
+  delete noAccessConditionsMock.accessConditions;
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -299,6 +302,28 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
 
     }));
 
+    it('should update Bitstream data properly when access options are omitted', fakeAsync(() => {
+      compAsAny.formRef = {formGroup: null};
+      compAsAny.fileData = fileData;
+      compAsAny.pathCombiner = pathCombiner;
+      formService.validateAllFormFields.and.callFake(() => null);
+      formService.isValid.and.returnValue(of(true));
+      formService.getFormData.and.returnValue(of(noAccessConditionsMock));
+      const response = [
+        Object.assign(mockSubmissionObject, {
+          sections: {
+            upload: {
+              files: mockUploadFiles
+            }
+          }
+        })
+      ];
+      operationsService.jsonPatchByResourceID.and.returnValue(of(response));
+      comp.saveBitstreamData();
+      tick();
+      expect(uploadService.updateFileData).toHaveBeenCalled();
+    }));
+
     it('should not save Bitstream File data properly when form is not valid', fakeAsync(() => {
       compAsAny.formRef = {formGroup: null};
       compAsAny.pathCombiner = pathCombiner;
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 9ee4a7dda5..eb4dc5aaf8 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -416,56 +416,58 @@ export class SubmissionSectionUploadFileEditComponent
             this.operationsBuilder.remove(this.pathCombiner.getPath(path));
           });
         const accessConditionsToSave = [];
-        formData.accessConditions
-          .map((accessConditions) => accessConditions.accessConditionGroup)
-          .filter((accessCondition) => isNotEmpty(accessCondition))
-          .forEach((accessCondition) => {
-            let accessConditionOpt;
+        if (formData.hasOwnProperty('accessConditions')) {
+          formData.accessConditions
+            .filter((accessConditions) => isNotNull(accessConditions))
+            .map((accessConditions) => accessConditions.accessConditionGroup)
+            .filter((accessCondition) => isNotEmpty(accessCondition))
+            .forEach((accessCondition) => {
+              let accessConditionOpt;
 
-            this.availableAccessConditionOptions
-              .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
-              .forEach((element) => accessConditionOpt = element);
+              this.availableAccessConditionOptions
+                .filter((element) => isNotNull(accessCondition.name) && element.name === accessCondition.name[0].value)
+                .forEach((element) => accessConditionOpt = element);
 
-            if (accessConditionOpt) {
-              const currentAccessCondition = Object.assign({}, accessCondition);
-              currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
+              if (accessConditionOpt) {
+                const currentAccessCondition = Object.assign({}, accessCondition);
+                currentAccessCondition.name = this.retrieveValueFromField(accessCondition.name);
 
-              /* When start and end date fields are deactivated, their values may be still present in formData,
-              therefore it is necessary to delete them if they're not allowed by the current access condition option. */
-              if (!accessConditionOpt.hasStartDate) {
-                delete currentAccessCondition.startDate;
-              } else if (accessCondition.startDate) {
-                const startDate = this.retrieveValueFromField(accessCondition.startDate);
-                // Clamp the start date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let startDateDate = new Date(startDate);
-                if (accessConditionOpt.maxStartDate) {
+                /* When start and end date fields are deactivated, their values may be still present in formData,
+                therefore it is necessary to delete them if they're not allowed by the current access condition option. */
+                if (!accessConditionOpt.hasStartDate) {
+                  delete currentAccessCondition.startDate;
+                } else if (accessCondition.startDate) {
+                  const startDate = this.retrieveValueFromField(accessCondition.startDate);
+                  // Clamp the start date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let startDateDate = new Date(startDate);
+                  if (accessConditionOpt.maxStartDate) {
                     const maxStartDateDate = new Date(accessConditionOpt.maxStartDate);
                     if (startDateDate > maxStartDateDate) {
-                        startDateDate = maxStartDateDate;
+                      startDateDate = maxStartDateDate;
                     }
+                  }
+                  currentAccessCondition.startDate = dateToISOFormat(startDateDate);
                 }
-                currentAccessCondition.startDate = dateToISOFormat(startDateDate);
-              }
-              if (!accessConditionOpt.hasEndDate) {
-                delete currentAccessCondition.endDate;
-              } else if (accessCondition.endDate) {
-                const endDate = this.retrieveValueFromField(accessCondition.endDate);
-                // Clamp the end date to the maximum, if any, since the
-                // datepicker sometimes exceeds it.
-                let endDateDate = new Date(endDate);
-                if (accessConditionOpt.maxEndDate) {
+                if (!accessConditionOpt.hasEndDate) {
+                  delete currentAccessCondition.endDate;
+                } else if (accessCondition.endDate) {
+                  const endDate = this.retrieveValueFromField(accessCondition.endDate);
+                  // Clamp the end date to the maximum, if any, since the
+                  // datepicker sometimes exceeds it.
+                  let endDateDate = new Date(endDate);
+                  if (accessConditionOpt.maxEndDate) {
                     const maxEndDateDate = new Date(accessConditionOpt.maxEndDate);
                     if (endDateDate > maxEndDateDate) {
-                        endDateDate = maxEndDateDate;
+                      endDateDate = maxEndDateDate;
                     }
+                  }
+                  currentAccessCondition.endDate = dateToISOFormat(endDateDate);
                 }
-                currentAccessCondition.endDate = dateToISOFormat(endDateDate);
+                accessConditionsToSave.push(currentAccessCondition);
               }
-              accessConditionsToSave.push(currentAccessCondition);
-            }
-          });
-
+            });
+        }
         if (isNotEmpty(accessConditionsToSave)) {
           this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true);
         }

From 865f4899b21552cb19ae29edcf0c799b1346dbc6 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 2 Feb 2024 17:40:32 +0100
Subject: [PATCH 0104/1286] 111639: Added scope @Input() and made the search
 facets & search results use that scope

(cherry picked from commit 22e87a5f5a875b41e38c1ef834b9c7a9b8cea458)
---
 .../shared/search/search-filter.service.ts    |  1 +
 .../search-facet-filter-wrapper.component.ts  |  9 ++++-
 .../search-facet-filter.component.spec.ts     |  2 ++
 .../search-facet-filter.component.ts          | 12 +++++--
 .../search-filter.component.html              |  1 +
 .../search-filter/search-filter.component.ts  | 10 +++++-
 .../search-hierarchy-filter.component.spec.ts |  4 ++-
 .../search-hierarchy-filter.component.ts      |  6 ++--
 .../search-range-filter.component.spec.ts     |  2 ++
 .../search-range-filter.component.ts          |  4 ++-
 .../search-filters.component.html             |  2 +-
 .../shared/search/search.component.spec.ts    | 26 ++------------
 src/app/shared/search/search.component.ts     | 31 +++++++++++------
 .../shared/search/themed-search.component.ts  | 34 +++++++++++++++++--
 14 files changed, 97 insertions(+), 47 deletions(-)

diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 80ba200d38..bf232cb141 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -27,6 +27,7 @@ const filterStateSelector = (state: SearchFiltersState) => state.searchFilter;
 export const FILTER_CONFIG: InjectionToken<SearchFilterConfig> = new InjectionToken<SearchFilterConfig>('filterConfig');
 export const IN_PLACE_SEARCH: InjectionToken<boolean> = new InjectionToken<boolean>('inPlaceSearch');
 export const REFRESH_FILTER: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('refreshFilters');
+export const SCOPE: InjectionToken<string> = new InjectionToken<string>('scope');
 
 /**
  * Service that performs all actions that have to do with search filters and facets
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 0aa131d428..f635c027b5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -4,6 +4,7 @@ import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
@@ -35,6 +36,11 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * The constructor of the search facet filter that should be rendered, based on the filter config's type
    */
@@ -56,7 +62,8 @@ export class SearchFacetFilterWrapperComponent implements OnInit {
       providers: [
         { provide: FILTER_CONFIG, useFactory: () => (this.filterConfig), deps: [] },
         { provide: IN_PLACE_SEARCH, useFactory: () => (this.inPlaceSearch), deps: [] },
-        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] }
+        { provide: REFRESH_FILTER, useFactory: () => (this.refreshFilters), deps: [] },
+        { provide: SCOPE, useFactory: () => (this.scope), deps: [] },
       ],
       parent: this.injector
     });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 92d2e5265b..fc348722e5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -99,6 +100,7 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => observableOf(selectedValues),
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 2b2eb9b11a..994b488d9c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -22,6 +22,7 @@ import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -104,7 +105,9 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               @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>) {
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
+  ) {
   }
 
   /**
@@ -114,8 +117,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.currentUrl = this.router.url;
     this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
-
-    this.searchOptions$ = this.searchConfigService.searchOptions;
+    this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+        scope: this.scope,
+      })),
+    );
     this.subs.push(
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
       this.refreshFilters.asObservable().pipe(
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index a352c5587b..97809ef854 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -19,6 +19,7 @@
        (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
        class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
     <ds-search-facet-filter-wrapper
+      [scope]="scope"
       [filterConfig]="filter"
       [inPlaceSearch]="inPlaceSearch"
       [refreshFilters]="refreshFilters" >
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index d1d3bd729d..67e8906bb5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -6,7 +6,7 @@ import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
 import { SearchFilterConfig } from '../../models/search-filter-config.model';
 import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { slide } from '../../../animations/slide';
-import { isNotEmpty } from '../../../empty.util';
+import { isNotEmpty, hasValue } from '../../../empty.util';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
@@ -38,6 +38,11 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -171,6 +176,9 @@ export class SearchFilterComponent implements OnInit {
         } else {
           return this.searchConfigService.searchOptions.pipe(
             switchMap((options) => {
+                if (hasValue(this.scope)) {
+                  options.scope = this.scope;
+                }
                 return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
                   filter((RD) => !RD.isLoading),
                   map((valuesRD) => {
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 e6c74d8047..4469a124ce 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
@@ -14,6 +14,7 @@ import { CommonModule } from '@angular/common';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   SearchFilterService,
   REFRESH_FILTER
@@ -75,7 +76,8 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)}
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false)},
+        { provide: SCOPE, useValue: undefined },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
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 f9b3f2bff9..d53fa37cf4 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
@@ -9,6 +9,7 @@ import {
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   SearchFilterService, REFRESH_FILTER
 } from '../../../../../core/shared/search/search-filter.service';
@@ -49,9 +50,10 @@ 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>
+              @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
   ) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
   }
 
   vocabularyExists$: Observable<boolean>;
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 3a146f5059..03f47a7569 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -105,6 +106,7 @@ describe('SearchRangeFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
         {
           provide: SearchFilterService, useValue: {
             getSelectedValuesForFilter: () => selectedValues,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index ed20e63c52..a6eaf436c9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -10,6 +10,7 @@ import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/se
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import {
   FILTER_CONFIG,
+  SCOPE,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
   SearchFilterService
@@ -101,8 +102,9 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
               @Inject(PLATFORM_ID) private platformId: any,
               @Inject(REFRESH_FILTER) public refreshFilters: BehaviorSubject<boolean>,
+              @Inject(SCOPE) public scope: string,
               private route: RouteService) {
-    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters);
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
 
   }
 
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index e392cd2663..c006d80c44 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,7 +1,7 @@
 <h3>{{"search.filters.head" | translate}}</h3>
 <div *ngIf="(filters | async)?.hasSucceeded">
     <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
 <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index d0d9bdda86..9d069636a9 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -36,8 +36,6 @@ import { getCollectionPageRoute } from '../../collection-page/collection-page-ro
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
-let searchServiceObject: SearchService;
-let searchConfigurationServiceObject: SearchConfigurationService;
 const store: Store<SearchComponent> = jasmine.createSpyObj('store', {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   dispatch: {},
@@ -93,7 +91,6 @@ const mockDso2 = Object.assign(new Item(), {
     }
   }
 });
-const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
 const mockSearchResults: SearchObjects<DSpaceObject> = Object.assign(new SearchObjects(), {
   page: [mockDso, mockDso2]
 });
@@ -106,23 +103,13 @@ const searchServiceStub = jasmine.createSpyObj('SearchService', {
   getSearchConfigurationFor: createSuccessfulRemoteDataObject$(searchConfig),
   trackSearch: {},
 }) as SearchService;
-const configurationParam = 'default';
 const queryParam = 'test query';
 const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-const fixedFilter = 'fixed filter';
 
 const defaultSearchOptions = new PaginatedSearchOptions({ pagination });
 
 const paginatedSearchOptions$ = new BehaviorSubject(defaultSearchOptions);
 
-const paginatedSearchOptions = new PaginatedSearchOptions({
-  configuration: configurationParam,
-  query: queryParam,
-  scope: scopeParam,
-  fixedFilter: fixedFilter,
-  pagination,
-  sort
-});
 const activatedRouteStub = {
   snapshot: {
     queryParamMap: new Map([
@@ -155,14 +142,11 @@ const filtersConfigRD = createSuccessfulRemoteDataObject([mockFilterConfig, mock
 const filtersConfigRD$ = observableOf(filtersConfigRD);
 
 const routeServiceStub = {
-  getRouteParameterValue: () => {
-    return observableOf('');
-  },
   getQueryParameterValue: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   getQueryParamsWithPrefix: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   setParameter: () => {
     return;
@@ -252,16 +236,10 @@ describe('SearchComponent', () => {
     comp.paginationId = paginationId;
 
     spyOn((comp as any), 'getSearchOptions').and.returnValue(paginatedSearchOptions$.asObservable());
-
-    searchServiceObject = TestBed.inject(SearchService);
-    searchConfigurationServiceObject = TestBed.inject(SEARCH_CONFIG_SERVICE);
-
   });
 
   afterEach(() => {
     comp = null;
-    searchServiceObject = null;
-    searchConfigurationServiceObject = null;
   });
 
   it('should init search parameters properly and call retrieveSearchResults', fakeAsync(() => {
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c8..8e120940ec 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output, OnDestroy } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -11,7 +11,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { pushInOut } from '../animations/push';
 import { HostWindowService } from '../host-window.service';
 import { SidebarService } from '../sidebar/sidebar.service';
-import { hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
+import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../empty.util';
 import { RouteService } from '../../core/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { PaginatedSearchOptions } from './models/paginated-search-options.model';
@@ -34,7 +34,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
 import { environment } from 'src/environments/environment';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
-import { WorkspaceItem } from '../..//core/submission/models/workspaceitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
@@ -50,7 +50,7 @@ import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routi
 /**
  * This component renders a sidebar, a search input bar and the search results.
  */
-export class SearchComponent implements OnInit {
+export class SearchComponent implements OnDestroy, OnInit {
 
   /**
    * The list of available configuration options
@@ -166,6 +166,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() query: string;
 
+  /**
+   * The fallback scope when no scope is defined in the url, if this is also undefined no scope will be set
+   */
+  @Input() scope: string;
+
   /**
    * The current configuration used during the search
    */
@@ -179,7 +184,7 @@ export class SearchComponent implements OnInit {
   /**
    * The current sort options used
    */
-  currentScope$: BehaviorSubject<string> = new BehaviorSubject<string>('');
+  currentScope$: Observable<string>;
 
   /**
    * The current sort options used
@@ -299,6 +304,10 @@ export class SearchComponent implements OnInit {
       this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
     }
 
+    this.currentScope$ = this.routeService.getQueryParameterValue('scope').pipe(
+      map((routeValue: string) => hasValue(routeValue) ? routeValue : this.scope),
+    );
+
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.searchLink = this.getSearchLink();
     this.currentContext$.next(this.context);
@@ -321,13 +330,13 @@ export class SearchComponent implements OnInit {
     );
     const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
 
-    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$]).pipe(
-      filter(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+    this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$]).pipe(
+      filter(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
         // filter for search options related to instanced paginated id
         return searchOptions.pagination.id === this.paginationId;
       }),
       debounceTime(100)
-    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption]: [string, SortOptions[], PaginatedSearchOptions, SortOptions]) => {
+    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
       // Build the PaginatedSearchOptions object
       const combinedOptions = Object.assign({}, searchOptions,
         {
@@ -337,6 +346,9 @@ export class SearchComponent implements OnInit {
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
+      if (isEmpty(combinedOptions.scope)) {
+        combinedOptions.scope = scope;
+      }
       const newSearchOptions = new PaginatedSearchOptions(combinedOptions);
       // check if search options are changed
       // if so retrieve new related results otherwise skip it
@@ -344,13 +356,12 @@ export class SearchComponent implements OnInit {
         // Initialize variables
         this.currentConfiguration$.next(configuration);
         this.currentSortOptions$.next(newSearchOptions.sort);
-        this.currentScope$.next(newSearchOptions.scope);
         this.sortOptionsList$.next(searchSortOptions);
         this.searchOptions$.next(newSearchOptions);
         this.initialized$.next(true);
         // retrieve results
         this.retrieveSearchResults(newSearchOptions);
-        this.retrieveFilters(searchOptions);
+        this.retrieveFilters(newSearchOptions);
       }
     }));
 
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index fe531e4f0f..38df90dd8a 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -15,11 +15,37 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
  */
 @Component({
   selector: 'ds-themed-search',
-  styleUrls: [],
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = [
+    'configurationList',
+    'context',
+    'configuration',
+    'fixedFilterQuery',
+    'useCachedVersionIfAvailable',
+    'inPlaceSearch',
+    'linkType',
+    'paginationId',
+    'searchEnabled',
+    'sideBarWidth',
+    'searchFormPlaceholder',
+    'selectable',
+    'selectionConfig',
+    'showCsvExport',
+    'showSidebar',
+    'showThumbnails',
+    'showViewModes',
+    'useUniquePageId',
+    'viewModeList',
+    'showScopeSelector',
+    'trackStatistics',
+    'query',
+    'scope',
+    'resultFound',
+    'deselectObject',
+    'selectObject',
+  ];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -51,7 +77,7 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() showSidebar: boolean;
 
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   @Input() showViewModes: boolean;
 
@@ -65,6 +91,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() query: string;
 
+  @Input() scope: string;
+
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
   @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();

From d96c048874dc1aa3f981be3a79b813e9e85b4e3b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 3 Feb 2024 13:39:31 +0100
Subject: [PATCH 0105/1286] 111639: Fixed search settings not using the scope

(cherry picked from commit 93b22cba1f1b541d86f12b3bce79c8db6fd83bb9)
---
 .../search-settings.component.spec.ts         | 41 ++-----------------
 .../search-settings.component.ts              | 11 ++---
 src/app/shared/search/search.component.ts     |  5 +--
 src/assets/i18n/en.json5                      | 12 ++++++
 4 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts
index d0b51f04b1..bdcdb6f171 100644
--- a/src/app/shared/search/search-settings/search-settings.component.spec.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts
@@ -1,4 +1,3 @@
-import { SearchService } from '../../../core/shared/search/search.service';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { SearchSettingsComponent } from './search-settings.component';
 import { of as observableOf } from 'rxjs';
@@ -6,15 +5,11 @@ import { PaginationComponentOptions } from '../../pagination/pagination-componen
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { By } from '@angular/platform-browser';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { VarDirective } from '../../utils/var.directive';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { SidebarService } from '../../sidebar/sidebar.service';
-import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
 
@@ -22,32 +17,23 @@ describe('SearchSettingsComponent', () => {
 
   let comp: SearchSettingsComponent;
   let fixture: ComponentFixture<SearchSettingsComponent>;
-  let searchServiceObject: SearchService;
 
   let pagination: PaginationComponentOptions;
   let sort: SortOptions;
-  let mockResults;
-  let searchServiceStub;
 
   let queryParam;
   let scopeParam;
   let paginatedSearchOptions;
 
-  let paginationService;
+  let paginationService: PaginationServiceStub;
 
-  let activatedRouteStub;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(waitForAsync(async () => {
     pagination = new PaginationComponentOptions();
     pagination.id = 'search-results-pagination';
     pagination.currentPage = 1;
     pagination.pageSize = 10;
     sort = new SortOptions('score', SortDirection.DESC);
-    mockResults = ['test', 'data'];
-    searchServiceStub = {
-      searchOptions: { pagination: pagination, sort: sort },
-      search: () => mockResults,
-    };
 
     queryParam = 'test query';
     scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
@@ -58,30 +44,12 @@ describe('SearchSettingsComponent', () => {
       sort,
     };
 
-    activatedRouteStub = {
-      queryParams: observableOf({
-        query: queryParam,
-        scope: scopeParam,
-      }),
-    };
-
     paginationService = new PaginationServiceStub(pagination, sort);
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       declarations: [SearchSettingsComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: SearchService, useValue: searchServiceStub },
-
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        {
-          provide: SidebarService,
-          useValue: SidebarServiceStub,
-        },
-        {
-          provide: SearchFilterService,
-          useValue: {},
-        },
         {
           provide: PaginationService,
           useValue: paginationService,
@@ -111,10 +79,7 @@ describe('SearchSettingsComponent', () => {
 
     // SearchPageComponent test instance
     fixture.detectChanges();
-    searchServiceObject = (comp as any).service;
     spyOn(comp, 'reloadOrder');
-    spyOn(searchServiceObject, 'search').and.callThrough();
-
   });
 
   it('it should show the order settings with the respective selectable options', () => {
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 0efd38b5b2..23c9e78c3a 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,7 +1,5 @@
 import { Component, Inject, Input } from '@angular/core';
-import { SearchService } from '../../../core/shared/search/search.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ActivatedRoute, Router } from '@angular/router';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -26,11 +24,10 @@ export class SearchSettingsComponent {
    */
   @Input() sortOptionsList: SortOptions[];
 
-  constructor(private service: SearchService,
-              private route: ActivatedRoute,
-              private router: Router,
-              private paginationService: PaginationService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService) {
+  constructor(
+    protected paginationService: PaginationService,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService,
+  ) {
   }
 
   /**
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 8e120940ec..fc07893d72 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -315,9 +315,8 @@ export class SearchComponent implements OnDestroy, OnInit {
     // Determinate PaginatedSearchOptions and listen to any update on it
     const configuration$: Observable<string> = this.searchConfigService
       .getCurrentConfiguration(this.configuration).pipe(distinctUntilChanged());
-    const searchSortOptions$: Observable<SortOptions[]> = configuration$.pipe(
-      switchMap((configuration: string) => this.searchConfigService
-        .getConfigurationSearchConfig(configuration)),
+    const searchSortOptions$: Observable<SortOptions[]> = combineLatest([configuration$, this.currentScope$]).pipe(
+      switchMap(([configuration, scope]: [string, string]) => this.searchConfigService.getConfigurationSearchConfig(configuration, scope)),
       map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)),
       distinctUntilChanged()
     );
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 1296bb21e2..8245ac6404 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3988,6 +3988,18 @@
 
   "sorting.lastModified.DESC": "Last modified Descending",
 
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
+
   "statistics.title": "Statistics",
 
   "statistics.header": "Statistics for {{ scope }}",

From 0fdfecd9735675d268abafa92c95acadc6fc7cc3 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 25 Jan 2024 16:42:36 +0100
Subject: [PATCH 0106/1286] added german translations of feedback page
 translation keys

(cherry picked from commit 26ebc9f8fc2a1cb18e3e23e7317fe134de1ad654)
---
 src/assets/i18n/de.json5 | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index cff2ac0570..7394e33768 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -2190,6 +2190,44 @@
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Datenschutzerklärung",
 
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Feedback",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Feedback",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Feedback",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Vielen Dank für Ihre Rückmeldung. Wir werden uns in Kürze bei Ihnen melden, sofern Sie eine Rückmeldung gewünscht haben.",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Sollten wir Rückfragen zu Ihrem Feedback haben, dann kontaktieren wir Sie unter dieser E-Mailadresse.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Feedback senden",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Ihr Kommentar",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Ihre E-Mailadresse",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Ihr Feedback wurde erfolgreich versendet.",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Bitte geben Sie eine gültige E-Mailadresse ein!",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Bitte geben Sie einen Kommentar ein!",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "URL der Seite",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Dies ist die URL der Seite, auf die sich Ihr Feedback bezieht.",
 
 
   // "item.alerts.private": "This item is private",

From 9cff5e9c340fe74d2dcbfd43afe6770f9e3f54f6 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 25 Jan 2024 16:51:25 +0100
Subject: [PATCH 0107/1286] minor improvement of German translation

(cherry picked from commit e03b492dbd2a60b3512361c08f343c73392561cc)
---
 src/assets/i18n/de.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7394e33768..4f9988acb6 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -2200,7 +2200,7 @@
   "info.feedback.title": "Feedback",
 
   // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
-  "info.feedback.info": "Vielen Dank für Ihre Rückmeldung. Wir werden uns in Kürze bei Ihnen melden, sofern Sie eine Rückmeldung gewünscht haben.",
+  "info.feedback.info": "Wir freuen uns auf Ihr Feedback. Sofern Sie eine Rückmeldung wünschen, werden wir uns in Kürze bei Ihnen melden.",
 
   // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
   "info.feedback.email_help": "Sollten wir Rückfragen zu Ihrem Feedback haben, dann kontaktieren wir Sie unter dieser E-Mailadresse.",
@@ -2215,7 +2215,7 @@
   "info.feedback.email-label": "Ihre E-Mailadresse",
 
   // "info.feedback.create.success": "Feedback Sent Successfully!",
-  "info.feedback.create.success": "Ihr Feedback wurde erfolgreich versendet.",
+  "info.feedback.create.success": "Vielen Dank für Ihr Feedback! Ihr Feedback wurde erfolgreich versendet.",
 
   // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "Bitte geben Sie eine gültige E-Mailadresse ein!",

From 85694ec285401903a8d51fd533e2221bf0e467a0 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 14 Feb 2024 10:41:24 +0100
Subject: [PATCH 0108/1286] 111768: add back necessary setCurrentValue calls
 that were removed earlier

---
 .../dynamic-scrollable-dropdown.component.ts          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 5e0538a171..3142d1787f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -11,7 +11,7 @@ import {
 import { UntypedFormGroup } from '@angular/forms';
 
 import { Observable, of as observableOf } from 'rxjs';
-import { catchError, map, tap } from 'rxjs/operators';
+import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
@@ -79,6 +79,10 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       tap(() => this.loading = false)
     ).subscribe((list: PaginatedList<VocabularyEntry>) => {
       this.optionsList = list.page;
+        if (this.model.value) {
+          this.setCurrentValue(this.model.value, true);
+        }
+
       this.updatePageInfo(
         list.pageInfo.elementsPerPage,
         list.pageInfo.currentPage,
@@ -88,6 +92,11 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       this.selectedIndex = 0;
       this.cdr.detectChanges();
     });
+
+    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
+      .subscribe((value) => {
+        this.setCurrentValue(value);
+      });
   }
 
   /**

From d920567f8a2ba9aabeabb56f1863548dc1d9ce04 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 19 Feb 2024 11:42:57 +0100
Subject: [PATCH 0109/1286] 111768: move original code back to init only for
 performance

---
 .../dynamic-scrollable-dropdown.component.ts  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 3142d1787f..c902807cd4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -68,10 +68,14 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   ngOnInit() {
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions();
+    this.loadOptions(true);
+    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
+    .subscribe((value) => {
+      this.setCurrentValue(value);
+    });
   }
 
-  loadOptions() {
+  loadOptions(fromInit: boolean) {
     this.loading = true;
     this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
       getFirstSucceededRemoteDataPayload(),
@@ -79,7 +83,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       tap(() => this.loading = false)
     ).subscribe((list: PaginatedList<VocabularyEntry>) => {
       this.optionsList = list.page;
-        if (this.model.value) {
+        if (fromInit && this.model.value) {
           this.setCurrentValue(this.model.value, true);
         }
 
@@ -92,11 +96,6 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       this.selectedIndex = 0;
       this.cdr.detectChanges();
     });
-
-    this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
-      .subscribe((value) => {
-        this.setCurrentValue(value);
-      });
   }
 
   /**
@@ -113,7 +112,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       this.group.markAsUntouched();
       this.inputText = null;
       this.updatePageInfo(this.model.maxOptions, 1);
-      this.loadOptions();
+      this.loadOptions(false);
       sdRef.open();
     }
   }
@@ -170,7 +169,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
     this.inputText += keyName;
     // When a new key is added, we need to reset the page info
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions();
+    this.loadOptions(false);
   }
 
   removeKeyFromInput() {
@@ -179,7 +178,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       if (this.inputText === '') {
         this.inputText = null;
       }
-      this.loadOptions();
+      this.loadOptions(false);
     }
   }
 

From 0f09920cb19e701906dfc0bdba23d5f468dfd1b9 Mon Sep 17 00:00:00 2001
From: DSpace Bot <68393067+dspace-bot@users.noreply.github.com>
Date: Thu, 22 Feb 2024 02:50:03 -0600
Subject: [PATCH 0110/1286] [Port dspace-7_x] site search should not adopt
 existing URL query string parameters (#2824)

Do not merge existing query params when using site search from MyDSpace workflow.
---
 src/app/search-navbar/search-navbar.component.spec.ts | 4 ++--
 src/app/search-navbar/search-navbar.component.ts      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
index 7edae293e1..ece2391dcb 100644
--- a/src/app/search-navbar/search-navbar.component.spec.ts
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -88,7 +88,7 @@ describe('SearchNavbarComponent', () => {
           fixture.detectChanges();
         }));
         it('to search page with empty query', () => {
-          const extras: NavigationExtras = { queryParams: { query: '' }, queryParamsHandling: 'merge' };
+          const extras: NavigationExtras = { queryParams: { query: '' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: '' });
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
         });
@@ -113,7 +113,7 @@ describe('SearchNavbarComponent', () => {
           fixture.detectChanges();
         }));
         it('to search page with query', async () => {
-          const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge' };
+          const extras: NavigationExtras = { queryParams: { query: 'test' } };
           expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' });
 
           expect(router.navigate).toHaveBeenCalledWith(['search'], extras);
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 98e64f6e10..7f8f951073 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -66,8 +66,7 @@ export class SearchNavbarComponent {
     this.searchForm.reset();
 
     this.router.navigate(linkToNavigateTo, {
-      queryParams: queryParams,
-      queryParamsHandling: 'merge'
+      queryParams: queryParams
     });
   }
 }

From f2dab663ca6bfddac106b9f9b7c0965626adf8be Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 18 Dec 2023 00:01:59 +0100
Subject: [PATCH 0111/1286] 108588: Fixed browse by issue date show loading
 icon indefinitely when empty

(cherry picked from commit 6f51bd866ccccd17e70557b82028effa183263df)
---
 .../browse-by-date-page.component.spec.ts     |  7 ++++++-
 .../browse-by-date-page.component.ts          | 21 +++++++++++++------
 .../browse-by-metadata-page.component.html    |  4 ++--
 .../browse-by-metadata-page.component.spec.ts |  7 ++++++-
 .../browse-by-metadata-page.component.ts      | 13 +++++++++++-
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index e41d3a45b2..b19250edae 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -23,6 +23,7 @@ import { PaginationServiceStub } from '../../shared/testing/pagination-service.s
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { cold } from 'jasmine-marbles';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -112,9 +113,13 @@ describe('BrowseByDatePageComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should initialize the list of items', () => {
+  it('should initialize the list of items', (done: DoneFn) => {
+    expect(comp.loading$).toBeObservable(cold('(a|)', {
+      a: false,
+    }));
     comp.items$.subscribe((result) => {
       expect(result.payload.page).toEqual([firstItem]);
+      done();
     });
   });
 
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 c52731a421..d3c832d3e2 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
@@ -4,7 +4,7 @@ import {
   browseParamsToOptions,
   getBrowseSearchOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
@@ -85,12 +85,21 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
    * @param scope           The scope under which to fetch the earliest item for
    */
   updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
-    const firstItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
-    const lastItemRD = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    const firstItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.ASC);
+    const lastItemRD$: Observable<RemoteData<Item>> = this.browseService.getFirstItemFor(definition, scope, SortDirection.DESC);
+    this.loading$ = observableCombineLatest([
+      firstItemRD$,
+      lastItemRD$,
+    ]).pipe(
+      map(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => firstItemRD.isLoading || lastItemRD.isLoading)
+    );
     this.subs.push(
-      observableCombineLatest([firstItemRD, lastItemRD]).subscribe(([firstItem, lastItem]) => {
-        let lowerLimit: number = this.getLimit(firstItem, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
-        let upperLimit: number = this.getLimit(lastItem, metadataKeys, new Date().getUTCFullYear());
+      observableCombineLatest([
+        firstItemRD$,
+        lastItemRD$,
+      ]).subscribe(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+        let lowerLimit: number = this.getLimit(firstItemRD, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
+        let upperLimit: number = this.getLimit(lastItemRD, metadataKeys, new Date().getUTCFullYear());
         const options: number[] = [];
         const oneYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
         const fiveYearBreak: number = Math.floor((upperLimit - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
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 cfc2cbe305..a6abd5a7a4 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
@@ -32,7 +32,7 @@
 
     <section class="comcol-page-browse-section">
     <div class="browse-by-metadata w-100">
-    <ds-themed-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
+    <ds-themed-browse-by *ngIf="!(loading$ | async)" class="col-xs-12 w-100"
       title="{{'browse.title' | translate:
       {
         collection: dsoNameService.getName((parent$ | async)?.payload),
@@ -49,7 +49,7 @@
       (prev)="goPrev()"
       (next)="goNext()">
     </ds-themed-browse-by>
-    <ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
+    <ds-themed-loading *ngIf="loading$ | async" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
   </div>
   </section>
   <ng-container *ngVar="(parent$ | async) as parent">
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 a5beeb8a45..2bdecc2670 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
@@ -30,6 +30,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
+import { cold } from 'jasmine-marbles';
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -149,9 +150,13 @@ describe('BrowseByMetadataPageComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should fetch items', () => {
+    it('should fetch items', (done: DoneFn) => {
+      expect(comp.loading$).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
       comp.items$.subscribe((result) => {
         expect(result.payload.page).toEqual(mockItems);
+        done();
       });
     });
 
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 75dbfcfc82..c03cf03429 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,4 +1,4 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
 import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
@@ -122,6 +122,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   fetchThumbnails: boolean;
 
+  /**
+   * Observable determining if the loading animation needs to be shown
+   */
+  loading$ = observableOf(true);
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
@@ -200,6 +205,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
+    this.loading$ = this.browseEntries$.pipe(
+      map((browseEntriesRD: RemoteData<PaginatedList<BrowseEntry>>) => browseEntriesRD.isLoading),
+    );
     this.items$ = undefined;
   }
 
@@ -214,6 +222,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string, authority: string) {
     this.items$ = this.browseService.getBrowseItemsFor(value, authority, searchOptions);
+    this.loading$ = this.items$.pipe(
+      map((itemsRD: RemoteData<PaginatedList<Item>>) => itemsRD.isLoading),
+    );
   }
 
   /**

From b2adc42aaf62e2dc60d5563b610e3647d3b8b7e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 20:49:23 +0000
Subject: [PATCH 0112/1286] Bump ip from 2.0.0 to 2.0.1

Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index 786a832e56..d7f81a1db9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6732,9 +6732,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

From 3add551bde1235954005a5ef20a36ea625763bda Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Mon, 4 Mar 2024 20:26:44 +0300
Subject: [PATCH 0113/1286] [Port dspace-7_x] Update dependencies for Node v20

Port of #2356 by @mwoodiupui to dspace-7_x.
---
 package.json |   4 +-
 yarn.lock    | 298 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 202 insertions(+), 100 deletions(-)

diff --git a/package.json b/package.json
index 61a97e815c..66f32c80be 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.6",
+    "@angular/cli": "^16.0.4",
     "@angular/compiler-cli": "^15.2.8",
     "@angular/language-service": "^15.2.8",
     "@cypress/schematic": "^1.5.0",
@@ -170,7 +170,7 @@
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.6.4",
+    "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index d7f81a1db9..a4058bf47e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -47,6 +47,14 @@
     "@angular-devkit/core" "15.2.6"
     rxjs "6.6.7"
 
+"@angular-devkit/architect@0.1602.12":
+  version "0.1602.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.12.tgz#a430970acd4ad9f7cc23d41facc2c04ea5770f65"
+  integrity sha512-19Fwwfx+KvJ01SyI6cstRgqT9+cwer8Ro1T27t1JqlGyOX8tY3pV78ulwxy2+wCzPjR18V6W7cb7Cv6fyK4xog==
+  dependencies:
+    "@angular-devkit/core" "16.2.12"
+    rxjs "7.8.1"
+
 "@angular-devkit/architect@^0.1202.10":
   version "0.1202.18"
   resolved "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.18.tgz"
@@ -241,6 +249,18 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
+"@angular-devkit/core@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.12.tgz#5d40e8414d5da14a4281af519d32e1241b002c89"
+  integrity sha512-o6ziQs+EcEonFezrsA46jbZqkQrs4ckS1bAQj93g5ZjGtieUz8l/U3lclvKpL/iEzWkGVViSYuP2KyW2oqTDiQ==
+  dependencies:
+    ajv "8.12.0"
+    ajv-formats "2.1.1"
+    jsonc-parser "3.2.0"
+    picomatch "2.3.1"
+    rxjs "7.8.1"
+    source-map "0.7.4"
+
 "@angular-devkit/schematics@12.2.18", "@angular-devkit/schematics@^12.2.17":
   version "12.2.18"
   resolved "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.18.tgz"
@@ -250,16 +270,16 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.6.tgz#fb5b7530f21586dbdec45cac56f8a418bcfd053d"
-  integrity sha512-f7VgnAcok7AwR/DhX0ZWskB0rFBo/KsvtIUA2qZSrpKMf8eFiwu03dv/b2mI0vnf+1FBfIQzJvO0ww45zRp6dA==
+"@angular-devkit/schematics@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.12.tgz#9dbf287b2343059792c97bbfc60a3b52253c66f1"
+  integrity sha512-lf/Nz2o875pllxGNUcI2by4rctfRsOZOxvaLq2UaH6XG6Re9tqeNfn40a8qXrr9/IYntXnlvEid/pd9e8gFBIw==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
+    "@angular-devkit/core" "16.2.12"
     jsonc-parser "3.2.0"
-    magic-string "0.29.0"
+    magic-string "0.30.1"
     ora "5.4.1"
-    rxjs "6.6.7"
+    rxjs "7.8.1"
 
 "@angular-eslint/builder@15.2.1":
   version "15.2.1"
@@ -334,29 +354,29 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.6.tgz#d5994fbd4d02e71017d4dd28ba06dc1c3cb7a976"
-  integrity sha512-wNkQ/qCVbd4pERaGVagKJPifEvjRNY5otwsd4iRVubY/XOcIHcYChUThZwgQdVfNAImfJPMZNrhbGxejuWLA9w==
+"@angular/cli@^16.0.4":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.12.tgz#f5ce4eea5409f708963a59a4ab787d6c08196fe3"
+  integrity sha512-Pcbiraoqdw4rR2Ey5Ooy0ESLS1Ffbjkb6sPfinKRkHmAvyqsmlvkfbB/qK8GrzDSFSWvAKMMXRw9l8nbjvQEXg==
   dependencies:
-    "@angular-devkit/architect" "0.1502.6"
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
-    "@schematics/angular" "15.2.6"
+    "@angular-devkit/architect" "0.1602.12"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
+    "@schematics/angular" "16.2.12"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
-    ini "3.0.1"
+    ini "4.1.1"
     inquirer "8.2.4"
     jsonc-parser "3.2.0"
     npm-package-arg "10.1.0"
     npm-pick-manifest "8.0.1"
-    open "8.4.1"
+    open "8.4.2"
     ora "5.4.1"
-    pacote "15.1.0"
-    resolve "1.22.1"
-    semver "7.3.8"
+    pacote "15.2.0"
+    resolve "1.22.2"
+    semver "7.5.4"
     symbol-observable "4.0.0"
-    yargs "17.6.2"
+    yargs "17.7.2"
 
 "@angular/common@^15.2.8":
   version "15.2.8"
@@ -1697,14 +1717,14 @@
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.39.4":
+  version "0.39.4"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
+  integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
   dependencies:
     comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@esbuild/android-arm64@0.17.8":
   version "0.17.8"
@@ -1943,7 +1963,7 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
@@ -2331,13 +2351,13 @@
   resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@schematics/angular@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.6.tgz#5a0face51806f6b2adf67eef73b08c31744b07bc"
-  integrity sha512-OcBUvVAxZEMBX+fi0ytybeAdmStra+GwtlvipS70yOxcAgJ84ZrnZGN7a072cCVQcq7AgqUfssnyqCx1wu+yCg==
+"@schematics/angular@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.12.tgz#13e00e7390903cfc00eb8d5c2e74986262aff6ec"
+  integrity sha512-rc6Dxo7yLnNhECxZyvwv3qL40GvMHw/gMeme8DUGN7zgcUdBJ7LOCURp7EZqOBghMVeeJvLrohitEbs9NhRLBA==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
-    "@angular-devkit/schematics" "15.2.6"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
     jsonc-parser "3.2.0"
 
 "@schematics/angular@^12.2.17":
@@ -2349,10 +2369,34 @@
     "@angular-devkit/schematics" "12.2.18"
     jsonc-parser "3.0.0"
 
-"@sigstore/protobuf-specs@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz"
-  integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
@@ -2394,13 +2438,13 @@
   resolved "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz"
   integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
 
-"@tufjs/models@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/@tufjs/models/-/models-1.0.2.tgz"
-  integrity sha512-uxarDtxTIK3f8hJS4yFhW/lvTa3tsiQU5iDCRut+NCnOXvNtEul0Ct58NIIcIx9Rkt7OFEK31Ndpqsd663nsew==
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
   dependencies:
     "@tufjs/canonical-json" "1.0.0"
-    minimatch "^8.0.3"
+    minimatch "^9.0.0"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -3269,6 +3313,11 @@ arch@^2.2.0:
   resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"
@@ -5345,17 +5394,18 @@ eslint-plugin-import@^2.27.5:
     semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsdoc@^39.6.4:
-  version "39.9.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz"
-  integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==
+eslint-plugin-jsdoc@^45.0.0:
+  version "45.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
+  integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
+    "@es-joy/jsdoccomment" "~0.39.4"
+    are-docs-informative "^0.0.2"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.8"
+    esquery "^1.5.0"
+    semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-jsonc@^2.6.0:
@@ -5492,7 +5542,7 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -6674,10 +6724,10 @@ ini@2.0.0:
   resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+ini@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
+  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
 ini@^1.3.4:
   version "1.3.8"
@@ -6807,7 +6857,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.8.1:
   version "2.12.0"
   resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"
   integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
@@ -7196,10 +7246,10 @@ jsbn@~0.1.0:
   resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsdom@21.1.0:
   version "21.1.0"
@@ -7825,6 +7875,13 @@ magic-string@0.29.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
+magic-string@0.30.1:
+  version "0.30.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.1.tgz#ce5cd4b0a81a5d032bd69aab4522299b2166284d"
+  integrity sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 magic-string@^0.27.0:
   version "0.27.0"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"
@@ -7895,6 +7952,27 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
+make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 manifesto.js@^4.2.0:
   version "4.2.17"
   resolved "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz"
@@ -8068,13 +8146,20 @@ minimatch@^7.4.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^8.0.2, minimatch@^8.0.3:
+minimatch@^8.0.2:
   version "8.0.4"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz"
   integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.0:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -8674,6 +8759,15 @@ open@8.4.1:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+open@8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 open@^8.0.9:
   version "8.4.0"
   resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
@@ -8821,10 +8915,10 @@ p-wait-for@^3.2.0:
   dependencies:
     p-timeout "^3.0.0"
 
-pacote@15.1.0:
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz"
-  integrity sha512-FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg==
+pacote@15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
   dependencies:
     "@npmcli/git" "^4.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
@@ -8832,7 +8926,7 @@ pacote@15.1.0:
     "@npmcli/run-script" "^6.0.0"
     cacache "^17.0.0"
     fs-minipass "^3.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     npm-package-arg "^10.0.0"
     npm-packlist "^7.0.0"
     npm-pick-manifest "^8.0.0"
@@ -8841,7 +8935,7 @@ pacote@15.1.0:
     promise-retry "^2.0.1"
     read-package-json "^6.0.0"
     read-package-json-fast "^3.0.0"
-    sigstore "^1.0.0"
+    sigstore "^1.3.0"
     ssri "^10.0.0"
     tar "^6.1.11"
 
@@ -8990,7 +9084,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -10019,16 +10113,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.1:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
+resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
   version "1.22.2"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -10155,6 +10240,13 @@ rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
@@ -10317,6 +10409,13 @@ semver@7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -10327,10 +10426,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+semver@^7.5.1:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -10487,14 +10586,16 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-sigstore@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.2.0.tgz"
-  integrity sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA==
+sigstore@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.1.0"
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
     make-fetch-happen "^11.0.1"
-    tuf-js "^1.0.0"
 
 simple-update-notifier@^1.0.7:
   version "1.1.0"
@@ -11220,13 +11321,14 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.3.tgz"
-  integrity sha512-jGYi5nG/kqgfTFQSdoN6PW9eIn+XRZqdXku+fSwNk6UpWIsWaV7pzAqPgFr85edOPhoyJDyBqCS+DCnHroMvrw==
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
   dependencies:
-    "@tufjs/models" "1.0.2"
-    make-fetch-happen "^11.0.1"
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -12082,10 +12184,10 @@ yargs@17.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@17.6.2:
-  version "17.6.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+yargs@17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"

From 781de6e998de26c246ab5816c76573952d957599 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:25:29 +0000
Subject: [PATCH 0114/1286] Bump sanitize-html from 2.10.0 to 2.12.1

Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.10.0 to 2.12.1.
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.10.0...2.12.1)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
...

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

diff --git a/package.json b/package.json
index 66f32c80be..0dd610718c 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.10.0",
+    "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
diff --git a/yarn.lock b/yarn.lock
index a4058bf47e..6d14e72286 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10283,10 +10283,10 @@ safe-stable-stringify@^2.4.3:
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452"
-  integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==
+sanitize-html@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
+  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"

From 77f3b97e46d141c1d301673ed6ea7384d5e02914 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 5 Mar 2024 11:10:12 +0100
Subject: [PATCH 0115/1286] fix selector value in
 CommunitySidebarSearchListElementComponent

(cherry picked from commit ad3ef56e06512a55e3506c1065f038efb3452c42)
---
 .../community-sidebar-search-list-element.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 14c8ec09cd..fb0f69f9a9 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -9,7 +9,7 @@ import { Community } from '../../../../core/shared/community.model';
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
-  selector: 'ds-collection-sidebar-search-list-element',
+  selector: 'ds-community-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html'
 })
 /**

From d95d5753b442ea1974643de9236d3257a7044987 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Thu, 23 Nov 2023 00:34:05 +0100
Subject: [PATCH 0116/1286] [DURACOM-195] New host-window service methods

---
 src/app/shared/host-window.service.ts         | 57 +++++++++++++++----
 .../testing/host-window-service.stub.ts       |  4 ++
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 6d13d921e0..1c71bf5075 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -10,13 +10,15 @@ import { AppState } from '../app.reducer';
 import { CSSVariableService } from './sass-helper/css-variable.service';
 
 export enum WidthCategory {
-  XS,
-  SM,
-  MD,
-  LG,
-  XL
+  XS = 0,
+  SM = 1,
+  MD = 2,
+  LG = 3,
+  XL = 4,
 }
 
+export const maxMobileWidth = WidthCategory.SM;
+
 const hostWindowStateSelector = (state: AppState) => state.hostWindow;
 const widthSelector = createSelector(hostWindowStateSelector, (hostWindow: HostWindowState) => hostWindow.width);
 
@@ -31,11 +33,11 @@ export class HostWindowService {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-      this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
-      this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
-      this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
-      this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
-    });
+        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
+        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
+        this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
+        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
+      });
   }
 
   private getWidthObs(): Observable<number> {
@@ -99,6 +101,41 @@ export class HostWindowService {
     );
   }
 
+  is(exactWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat === exactWidthCat),
+      distinctUntilChanged()
+    );
+  }
+
+  isIn(widthCatArray: [WidthCategory]): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCatArray.includes(widthCat)),
+      distinctUntilChanged()
+    );
+  }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxWidthCat),
+      distinctUntilChanged()
+    );
+  }
+
+  isMobile(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat <= maxMobileWidth),
+      distinctUntilChanged()
+    );
+  }
+
+  isDesktop(): Observable<boolean> {
+    return this.widthCategory.pipe(
+      map((widthCat: WidthCategory) => widthCat > maxMobileWidth),
+      distinctUntilChanged()
+    );
+  }
+
   isXsOrSm(): Observable<boolean> {
     return observableCombineLatest(
       this.isXs(),
diff --git a/src/app/shared/testing/host-window-service.stub.ts b/src/app/shared/testing/host-window-service.stub.ts
index ecb8c26acb..b64d6fbffc 100644
--- a/src/app/shared/testing/host-window-service.stub.ts
+++ b/src/app/shared/testing/host-window-service.stub.ts
@@ -20,4 +20,8 @@ export class HostWindowServiceStub {
   isXsOrSm(): Observable<boolean> {
     return this.isXs();
   }
+
+  isMobile(): Observable<boolean> {
+    return this.isXs();
+  }
 }

From 6c6afbf148fb812e017ca17c1955a1ca16823fb2 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Thu, 23 Nov 2023 10:36:53 +0100
Subject: [PATCH 0117/1286] [DURACOM-195] Base components

---
 .../header-navbar-wrapper.component.ts        |  8 ++-
 src/app/header/header.component.html          |  2 +-
 src/app/header/header.component.scss          | 55 ++++++++--------
 src/app/header/header.component.ts            |  8 ++-
 src/app/navbar/navbar.component.html          |  4 +-
 src/app/navbar/navbar.component.scss          | 64 ++++++++++---------
 src/app/navbar/navbar.component.ts            | 11 ++--
 src/styles/_custom_variables.scss             |  9 ++-
 8 files changed, 88 insertions(+), 73 deletions(-)

diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index a610b2cb02..9786f0ed1d 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -5,6 +5,7 @@ import { hasValue } from '../shared/empty.util';
 import { Observable, Subscription } from 'rxjs';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
@@ -18,15 +19,20 @@ export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy {
   @HostBinding('class.open') isOpen = false;
   private sub: Subscription;
   public isNavBarCollapsed: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
     private store: Store<AppState>,
-    private menuService: MenuService
+    private menuService: MenuService,
+    protected windowService: HostWindowService,
   ) {
   }
 
   ngOnInit(): void {
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
     this.isNavBarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
     this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed);
   }
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 32b42dc8a7..8ff76242cd 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -11,7 +11,7 @@
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div *ngIf="isXsOrSm$ | async" class="pl-2">
+        <div *ngIf="isMobile$ | async" class="pl-2">
           <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
                   aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 8539ca8fbf..a37acf4ced 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -1,31 +1,30 @@
-header {
-  background-color: var(--ds-header-bg);
-}
+:host {
+  header {
+    background-color: var(--ds-header-bg);
+  }
 
-.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-  max-width: 100%;
-  @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-    max-height: var(--ds-header-logo-height-xs);
+  .navbar-brand img {
+    max-height: var(--ds-header-logo-height);
+    max-width: 100%;
+  }
+
+  .navbar-toggler .navbar-toggler-icon {
+    background-image: none !important;
+    line-height: 1.5;
+  }
+
+  .navbar-toggler {
+    border: none;
+    color: var(--ds-header-icon-color);
+
+    &:hover, &:focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+  }
+
+  .navbar {
+    display: flex;
+    gap: calc(var(--bs-spacer) / 3);
+    align-items: center;
   }
 }
-
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
-
-.navbar-toggler {
-  border: none;
-  color: var(--ds-header-icon-color);
-
-  &:hover, &:focus {
-    color: var(--ds-header-icon-color-hover);
-  }
-}
-
-.navbar {
-  display: flex;
-  gap: calc(var(--bs-spacer) / 3);
-  align-items: center;
-}
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 5153a19be4..83694ad9b8 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
-import { HostWindowService } from '../shared/host-window.service';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 
 /**
  * Represents the header with the logo and simple navigation
@@ -18,8 +18,10 @@ export class HeaderComponent implements OnInit {
    * @type {Observable<string>}
    */
   public isAuthenticated: Observable<boolean>;
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
+
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   constructor(
     protected menuService: MenuService,
@@ -28,7 +30,7 @@ export class HeaderComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
   }
 
   public toggleNavbar(): void {
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index b691cfb3f9..8bf1f942c7 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,11 +1,11 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
     class="navbar navbar-light navbar-expand-md p-md-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
     <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
-    <div class="navbar-inner-container w-100" [class.container]="!(isXsOrSm$ | async)">
+    <div class="navbar-inner-container w-100" [class.container]="!(isMobile$ | async)">
         <div class="reset-padding-md w-100">
             <div id="collapsingNav">
                 <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
-                    <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
+                    <li *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
                         <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
                     </li>
                     <li *ngFor="let section of (sections | async)">
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index d9a0901374..8095b7fff6 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,48 +1,50 @@
-nav.navbar {
+:host {
+  nav.navbar {
     background-color: var(--ds-navbar-bg);
     align-items: baseline;
-}
+  }
 
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
+  /** Mobile menu styling **/
+  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-        width: 100%;
-        background-color: var(--bs-white);
-        position: absolute;
-        overflow: hidden;
-        height: 0;
-        z-index: var(--ds-nav-z-index);
-        &.open {
-          height: auto;
-          min-height: 100vh; //doesn't matter because wrapper is sticky
-          border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border
-        }
+      width: 100%;
+      background-color: var(--bs-white);
+      position: absolute;
+      overflow: hidden;
+      height: 0;
+      z-index: var(--ds-nav-z-index);
+      &.open {
+        height: auto;
+        min-height: 100vh; //doesn't matter because wrapper is sticky
+        border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border
+      }
     }
-}
+  }
 
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
+  @media screen and (min-width: map-get($grid-breakpoints, md)) {
     .reset-padding-md {
-        margin-left: calc(var(--bs-spacer) / -2);
-        margin-right: calc(var(--bs-spacer) / -2);
+      margin-left: calc(var(--bs-spacer) / -2);
+      margin-right: calc(var(--bs-spacer) / -2);
     }
-}
+  }
 
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
+  /* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
+  .navbar-expand-md.navbar-container {
     @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-        > .navbar-inner-container {
-            padding: 0 var(--bs-spacer);
-        }
-        padding: 0;
+      > .navbar-inner-container {
+        padding: 0 var(--bs-spacer);
+      }
+      padding: 0;
     }
-}
+  }
 
-.navbar-nav ::ng-deep {
-  a.nav-link, .btn.nav-link {
+.navbar-nav {
+  ::ng-deep a.nav-link, .btn.nav-link {
     color: var(--ds-navbar-link-color);
 
-    &:hover, &:focus {
-      color: var(--ds-navbar-link-color-hover);
+      &:hover, &:focus {
+        color: var(--ds-navbar-link-color-hover);
+      }
     }
   }
 }
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 0cfad9e431..d56200fd02 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,8 +1,8 @@
-import { Component, Injector } from '@angular/core';
+import { Component, Injector, OnInit } from '@angular/core';
 import { slideMobileNav } from '../shared/animations/slide';
 import { MenuComponent } from '../shared/menu/menu.component';
 import { MenuService } from '../shared/menu/menu.service';
-import { HostWindowService } from '../shared/host-window.service';
+import { HostWindowService, WidthCategory } from '../shared/host-window.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { ActivatedRoute } from '@angular/router';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
@@ -22,12 +22,13 @@ import { isAuthenticated } from '../core/auth/selectors';
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav]
 })
-export class NavbarComponent extends MenuComponent {
+export class NavbarComponent extends MenuComponent implements OnInit {
   /**
    * The menu ID of the Navbar is PUBLIC
    * @type {MenuID.PUBLIC}
    */
   menuID = MenuID.PUBLIC;
+  maxMobileWidth = WidthCategory.SM;
 
   /**
    * Whether user is authenticated.
@@ -35,7 +36,7 @@ export class NavbarComponent extends MenuComponent {
    */
   public isAuthenticated$: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   constructor(protected menuService: MenuService,
     protected injector: Injector,
@@ -51,7 +52,7 @@ export class NavbarComponent extends MenuComponent {
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
     this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
   }
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 0e54ec200c..7d3b2c3853 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -20,8 +20,6 @@
   --ds-sidebar-z-index: 20;
 
   --ds-header-bg: #{$white};
-  --ds-header-logo-height: 50px;
-  --ds-header-logo-height-xs: 50px;
   --ds-header-icon-color: #{$link-color};
   --ds-header-icon-color-hover: #{$link-hover-color};
   --ds-navbar-bg: var(--ds-header-bg);
@@ -33,6 +31,13 @@
   --ds-expandable-navbar-link-color: var(--ds-navbar-link-color);
   --ds-expandable-navbar-link-color-hover: var(--ds-navbar-link-color-hover);
 
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 50px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+  }
+
   $admin-sidebar-bg: darken(#2B4E72, 17%);
   $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
   --ds-admin-sidebar-bg: #{$admin-sidebar-bg};

From 7d2fdb759888ef73a4cc8e901fbb97b2a3b895a0 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Thu, 23 Nov 2023 14:07:23 +0100
Subject: [PATCH 0118/1286] [DURACOM-195] Base components (simplify
 header-navbar-wrapper)

---
 .../header-navbar-wrapper.component.html      |  2 +-
 .../header-navbar-wrapper.component.ts        | 22 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
index 5756ad32b0..47e31ea733 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="{'open': !(isNavBarCollapsed | async)}" id="header-navbar-wrapper">
+<div [ngClass]="{'open': !(isNavBarCollapsed$ | async)}" id="header-navbar-wrapper">
     <ds-themed-header></ds-themed-header>
     <ds-themed-navbar></ds-themed-navbar>
 </div>
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 9786f0ed1d..0a32b3a70e 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,8 +1,5 @@
-import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { AppState } from '../app.reducer';
-import { hasValue } from '../shared/empty.util';
-import { Observable, Subscription } from 'rxjs';
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
 import { HostWindowService, WidthCategory } from '../shared/host-window.service';
@@ -15,17 +12,14 @@ import { HostWindowService, WidthCategory } from '../shared/host-window.service'
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
 })
-export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy {
-  @HostBinding('class.open') isOpen = false;
-  private sub: Subscription;
-  public isNavBarCollapsed: Observable<boolean>;
+export class HeaderNavbarWrapperComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
   public isMobile$: Observable<boolean>;
 
   menuID = MenuID.PUBLIC;
   maxMobileWidth = WidthCategory.SM;
 
   constructor(
-    private store: Store<AppState>,
     private menuService: MenuService,
     protected windowService: HostWindowService,
   ) {
@@ -33,13 +27,7 @@ export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
-    this.isNavBarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed);
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
   }
 
-  ngOnDestroy() {
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
-  }
 }

From 8718bd0df6cd4faf280518cebb3f65f6e6013856 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Thu, 23 Nov 2023 19:03:03 +0100
Subject: [PATCH 0119/1286] [DURACOM-195] Header, navbar, and sidebar
 refactoring

---
 cypress/e2e/collection-statistics.cy.ts       |   2 +-
 cypress/e2e/community-statistics.cy.ts        |   2 +-
 cypress/e2e/homepage-statistics.cy.ts         |   2 +-
 cypress/e2e/item-statistics.cy.ts             |   2 +-
 cypress/e2e/login-modal.cy.ts                 |  26 +-
 cypress/e2e/search-navbar.cy.ts               |   8 +-
 .../admin-sidebar-section.component.html      |  42 ++-
 .../admin-sidebar-section.component.spec.ts   |   4 +-
 .../admin-sidebar-section.component.ts        |   8 +
 .../admin-sidebar.component.html              |  98 +++----
 .../admin-sidebar.component.scss              | 245 ++++++++++--------
 .../admin-sidebar.component.spec.ts           |   2 +-
 .../admin-sidebar/admin-sidebar.component.ts  |  20 +-
 ...dable-admin-sidebar-section.component.html |  56 ++--
 ...dable-admin-sidebar-section.component.scss |  37 +--
 ...le-admin-sidebar-section.component.spec.ts |   4 +-
 ...andable-admin-sidebar-section.component.ts |  30 ++-
 .../themed-admin-sidebar.component.ts         |  16 +-
 .../expandable-navbar-section.component.html  |  46 ++--
 .../expandable-navbar-section.component.scss  |  63 ++---
 ...xpandable-navbar-section.component.spec.ts |  96 ++++---
 .../expandable-navbar-section.component.ts    |  79 ++++--
 .../navbar-section.component.html             |   6 +-
 .../navbar-section.component.scss             |   8 +-
 src/app/navbar/navbar.component.html          |  35 +--
 src/app/navbar/navbar.component.scss          |  24 +-
 src/app/root/root.component.html              |   8 +-
 src/app/root/root.component.ts                |  46 ++--
 src/app/shared/animations/slide.ts            |  50 ++--
 .../auth-nav-menu.component.html              |  66 +++--
 .../auth-nav-menu.component.scss              |   4 +-
 .../auth-nav-menu.component.spec.ts           |  38 ++-
 .../auth-nav-menu/auth-nav-menu.component.ts  |   4 +-
 .../user-menu/user-menu.component.html        |  37 ++-
 .../user-menu/user-menu.component.scss        |  12 +
 .../user-menu/user-menu.component.spec.ts     |   4 +-
 .../lang-switch/lang-switch.component.html    |   7 +-
 .../password/log-in-password.component.html   |   4 +-
 .../external-link-menu-item.component.html    |   3 +-
 .../external-link-menu-item.component.ts      |   3 +-
 .../menu-item/link-menu-item.component.html   |   5 +-
 .../menu-item/link-menu-item.component.ts     |   3 +-
 .../menu/menu-item/menu-item.component.scss   |   5 +
 .../onclick-menu-item.component.html          |   6 +-
 .../onclick-menu-item.component.spec.ts       |   2 +-
 .../menu-item/onclick-menu-item.component.ts  |   2 +-
 .../menu-item/text-menu-item.component.html   |   2 +-
 .../menu-item/text-menu-item.component.ts     |   1 +
 .../testing/host-window-service.stub.ts       |   5 +
 src/app/shared/testing/menu-service.stub.ts   |   3 +
 .../system-wide-alert-banner.component.html   |   2 +-
 src/assets/i18n/en.json5                      |   4 +
 src/styles/_bootstrap_variables.scss          |   3 -
 src/styles/_custom_variables.scss             |  14 +-
 src/styles/_global-styles.scss                |   5 -
 src/styles/_mixins.scss                       |   2 +-
 .../header-navbar-wrapper.component.html      |   8 +-
 .../header-navbar-wrapper.component.scss      |  90 ++++++-
 .../header-navbar-wrapper.component.ts        |   2 +
 .../dspace/app/header/header.component.html   |  45 ++--
 .../dspace/app/header/header.component.scss   |  29 +--
 .../dspace/app/header/header.component.ts     |  11 +-
 .../dspace/app/navbar/navbar.component.html   |  35 +--
 .../dspace/app/navbar/navbar.component.scss   |  64 +----
 .../styles/_theme_css_variable_overrides.scss |  20 +-
 65 files changed, 913 insertions(+), 702 deletions(-)
 create mode 100644 src/app/shared/menu/menu-item/menu-item.component.scss

diff --git a/cypress/e2e/collection-statistics.cy.ts b/cypress/e2e/collection-statistics.cy.ts
index 43bf67ce51..a08f8cb198 100644
--- a/cypress/e2e/collection-statistics.cy.ts
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -6,7 +6,7 @@ describe('Collection Statistics Page', () => {
 
     it('should load if you click on "Statistics" from a Collection page', () => {
         cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
     });
 
diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts
index ca306eff5c..6cafed0350 100644
--- a/cypress/e2e/community-statistics.cy.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -6,7 +6,7 @@ describe('Community Statistics Page', () => {
 
     it('should load if you click on "Statistics" from a Community page', () => {
         cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
     });
 
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index ff7dbeb852..ece38686b9 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -5,7 +5,7 @@ import '../support/commands';
 describe('Site Statistics Page', () => {
     it('should load if you click on "Statistics" from homepage', () => {
         cy.visit('/');
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', '/statistics');
     });
 
diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index b856744cba..6caeacae8e 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -6,7 +6,7 @@ describe('Item Statistics Page', () => {
 
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
         cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
 
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index c56b98fd26..673041e9f3 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -3,31 +3,31 @@ import { testA11y } from 'cypress/support/utils';
 const page = {
     openLoginMenu() {
         // Click the "Log In" dropdown menu in header
-        cy.get('ds-themed-navbar [data-test="login-menu"]').click();
+        cy.get('ds-themed-header [data-test="login-menu"]').click();
     },
     openUserMenu() {
         // Once logged in, click the User menu in header
-        cy.get('ds-themed-navbar [data-test="user-menu"]').click();
+        cy.get('ds-themed-header [data-test="user-menu"]').click();
     },
     submitLoginAndPasswordByPressingButton(email, password) {
         // Enter email
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="email"]').type(email);
         // Enter password
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
         // Click login button
-        cy.get('ds-themed-navbar [data-test="login-button"]').click();
+        cy.get('ds-themed-header [data-test="login-button"]').click();
     },
     submitLoginAndPasswordByPressingEnter(email, password) {
         // In opened Login modal, fill out email & password, then click Enter
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
-        cy.get('ds-themed-navbar [data-test="password"]').type('{enter}');
+        cy.get('ds-themed-header [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
+        cy.get('ds-themed-header [data-test="password"]').type('{enter}');
     },
     submitLogoutByPressingButton() {
         // This is the POST command that will actually log us out
         cy.intercept('POST', '/server/api/authn/logout').as('logout');
         // Click logout button
-        cy.get('ds-themed-navbar [data-test="logout-button"]').click();
+        cy.get('ds-themed-header [data-test="logout-button"]').click();
         // Wait until above POST command responds before continuing
         // (This ensures next action waits until logout completes)
         cy.wait('@logout');
@@ -102,10 +102,10 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Registration link should be visible
-        cy.get('ds-themed-navbar [data-test="register"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="register"]').should('be.visible');
 
         // Click registration link & you should go to registration page
-        cy.get('ds-themed-navbar [data-test="register"]').click();
+        cy.get('ds-themed-header [data-test="register"]').click();
         cy.location('pathname').should('eq', '/register');
         cy.get('ds-register-email').should('exist');
 
@@ -119,10 +119,10 @@ describe('Login Modal', () => {
         page.openLoginMenu();
 
         // Forgot password link should be visible
-        cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible');
+        cy.get('ds-themed-header [data-test="forgot"]').should('be.visible');
 
         // Click link & you should go to Forgot Password page
-        cy.get('ds-themed-navbar [data-test="forgot"]').click();
+        cy.get('ds-themed-header [data-test="forgot"]').click();
         cy.location('pathname').should('eq', '/forgot');
         cy.get('ds-forgot-email').should('exist');
 
diff --git a/cypress/e2e/search-navbar.cy.ts b/cypress/e2e/search-navbar.cy.ts
index 9dd93c7a2d..28a72bcc78 100644
--- a/cypress/e2e/search-navbar.cy.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,15 +1,15 @@
 const page = {
     fillOutQueryInNavBar(query) {
         // Click the magnifying glass
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
         // Fill out a query in input that appears
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query);
+        cy.get('ds-themed-header [data-test="header-search-box"]').type(query);
     },
     submitQueryByPressingEnter() {
-        cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}');
+        cy.get('ds-themed-header [data-test="header-search-box"]').type('{enter}');
     },
     submitQueryByPressingIcon() {
-        cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
+        cy.get('ds-themed-header [data-test="header-search-icon"]').click();
     }
 };
 
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 7f1e8716ba..f0f7a49573 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,23 +1,21 @@
-<div class="sidebar-section">
-    <a class="nav-item nav-link d-flex flex-row flex-nowrap"
-       [ngClass]="{ disabled: isDisabled }"
-       [attr.aria-disabled]="isDisabled"
-       [attr.aria-labelledby]="'sidebarName-' + section.id"
-       [title]="('menu.section.icon.' + section.id) | translate"
-       [routerLink]="itemModel.link"
-       (keyup.space)="navigate($event)"
-       (keyup.enter)="navigate($event)"
-       href="javascript:void(0);"
-    >
-      <div class="shortcut-icon">
-        <i class="fas fa-{{section.icon}} fa-fw"></i>
+<li role="presentation">
+  <a class="sidebar-section-wrapper"
+     [ngClass]="{ disabled: isDisabled }"
+     role="menuitem"
+     [attr.aria-disabled]="isDisabled"
+     [attr.aria-labelledby]="adminMenuSectionTitleId(section.id)"
+     [routerLink]="itemModel.link"
+     (keyup.space)="navigate($event)"
+     (keyup.enter)="navigate($event)"
+     href="javascript:void(0);"
+  >
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
+      <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+        <span [id]="adminMenuSectionTitleId(section.id)">{{itemModel.text | translate}}</span>
       </div>
-      <div class="sidebar-collapsible">
-        <div class="toggle">
-          <span id="sidebarName-{{section.id}}" class="section-header-text">
-            {{itemModel.text | translate}}
-          </span>
-        </div>
-      </div>
-    </a>
-</div>
+    </div>
+  </a>
+</li>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
index 260a364d7a..296a70331c 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts
@@ -48,7 +48,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should not contain the disabled class', () => {
@@ -88,7 +88,7 @@ describe('AdminSidebarSectionComponent', () => {
     });
 
     it('should set the right icon', () => {
-      const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
+      const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"]')).query(By.css('i.fas'));
       expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
     });
     it('should contain the disabled class', () => {
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index b195526d1c..51a0902f61 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -52,4 +52,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
       this.router.navigate(this.itemModel.link);
     }
   }
+
+  adminMenuSectionId(sectionId: string) {
+    return `admin-menu-section-${sectionId}`;
+  }
+
+  adminMenuSectionTitleId(sectionId: string) {
+    return `admin-menu-section-${sectionId}-title`;
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index ca69501382..26f2adfe39 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,54 +1,62 @@
-<nav class="navbar navbar-dark p-0"
-     [ngClass]="{'active': sidebarOpen, 'inactive': sidebarClosed}"
+<nav class="navbar navbar-dark p-0 vh-100"
+     id="admin-sidebar"
+     [attr.aria-label]="'menu.header.nav.description' | translate"
+     [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
      [@slideSidebar]="{
       value: (!(sidebarExpanded | async) ? 'collapsed' : 'expanded'),
-      params: {sidebarWidth: (sidebarWidth | async)}
+      params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
      }" (@slideSidebar.done)="finishSlide($event)" (@slideSidebar.start)="startSlide($event)"
      *ngIf="menuVisible | async"
      (mouseenter)="handleMouseEnter($event)"
-     (mouseleave)="handleMouseLeave($event)"
-     role="navigation" [attr.aria-label]="'menu.header.admin.description' |translate">
-    <div class="sidebar-top-level-items">
-        <ul class="navbar-nav">
-            <li class="admin-menu-header">
-              <div class="sidebar-section">
-                <div href="javascript:void(0);" class="nav-item d-flex flex-row flex-nowrap py-0">
-                  <div class="shortcut-icon navbar-brand logo-wrapper">
-                    <img class="admin-logo" src="assets/images/dspace-logo-mini.svg"
-                         [alt]="('menu.header.image.logo') | translate">
-                  </div>
-                  <div class="sidebar-collapsible navbar-brand">
-                    <div class="mr-0">
-                      <h4 class="section-header-text mb-0">{{ 'menu.header.admin' | translate }}</h4>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </li>
+     (mouseleave)="handleMouseLeave($event)">
 
-            <li *ngFor="let section of (sections | async)">
-                <ng-container
-                        *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-            </li>
-        </ul>
-    </div>
-    <div class="navbar-nav">
-        <div class="sidebar-section" id="sidebar-collapse-toggle">
-            <button class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap border-0" type="button"
-               (click)="toggle($event)"
-               (keyup.space)="toggle($event)"
-            >
-              <span class="shortcut-icon">
-                <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
-                   [title]="'menu.section.icon.pin' | translate"></i>
-                <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
-                   [title]="'menu.section.icon.unpin' | translate"></i>
-              </span>
-              <span class="sidebar-collapsible text-left">
-                <span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
-                <span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
-              </span>
-            </button>
+  <!-- HEADER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
+    <div class="sidebar-section-wrapper">
+      <div class="sidebar-fixed-element-wrapper">
+        <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
         </div>
+      </div>
     </div>
+  </div>
+
+  <!-- ITEMS -->
+
+  <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
+    <ul class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+        [attr.aria-label]="'menu.header.admin.description' |translate">
+      <ng-container *ngFor="let section of (sections | async)">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+      </ng-container>
+    </ul>
+  </div>
+
+  <!-- TOGGLER -->
+
+  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container" aria-hidden="true">
+    <a class="sidebar-section-wrapper sidebar-full-width-container"
+       href="javascript:void(0);"
+       (click)="toggle($event)"
+       (keyup.space)="toggle($event)"
+    >
+      <div class="sidebar-fixed-element-wrapper">
+        <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
+           [title]="'menu.section.icon.pin' | translate"></i>
+        <i *ngIf="!(menuCollapsed | async)" class="fas fa-fw fa-angle-double-left"
+           [title]="'menu.section.icon.unpin' | translate"></i>
+      </div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+        </div>
+      </div>
+    </a>
+  </div>
+
 </nav>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
index 5ed0142c7f..c2f3279a8e 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.scss
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
@@ -1,123 +1,140 @@
 :host {
-  --ds-icon-z-index: 10;
 
-    left: 0;
-    top: 0;
-    height: 100vh;
-    flex: 1 1 auto;
-    nav {
-        background-color: var(--ds-admin-sidebar-bg);
-        height: 100%;
-        flex-direction: column;
-        > div {
-            width: 100%;
-            &.sidebar-top-level-items {
-                flex: 1;
-                overflow: auto;
-                @include dark-scrollbar;
-            }
+  /* SIDEBAR SIZE AND POSITION */
+
+  /* Sidebar hierarchy:
+   § nav
+     § .sidebar-full-width-container (any OPTIONAL full width element with no horizontal margin or padding - it can be nested)
+       § .sidebar-section-wrapper
+         § .sidebar-fixed-element-wrapper
+         § .sidebar-collapsible-element-outer-wrapper
+           § .sidebar-collapsible-element-inner-wrapper
+             § .sidebar-item
+   */
+
+  // Sidebar position
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: var(--ds-sidebar-z-index);
+
+  // Sidebar size and content position
+  nav#admin-sidebar {
+
+    max-width: var(--ds-admin-sidebar-fixed-element-width); // Sidebar collapsed width
+
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+
+    div#sidebar-top-level-items-container {
+      flex: 1 1 auto; // Fill available vertical space
+      overflow-x: hidden;
+      overflow-y: auto;
+      @include dark-scrollbar;
+    }
+
+    img#admin-sidebar-logo {
+      width: 20px;
+    }
+
+    ::ng-deep {
+
+      // This class must be applied to any nested wrapper containing a sidebar section
+      .sidebar-full-width-container {
+        width: 100%;
+        padding-left: 0 !important;
+        padding-right: 0 !important;
+        margin-left: 0 !important;
+        margin-right: 0 !important;
+      }
+
+      // This class must be applied to the innermost block element containing a section or subsection link
+      // (it can be applied together with `sidebar-collapsible-element-inner-wrapper`)
+      .sidebar-item {
+        padding-top: 1rem;
+        padding-bottom: 1rem;
+      }
+
+      // These classes handle the collapsing behavior
+      .sidebar-section-wrapper {
+
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: stretch;
+
+        // These elements have fixed width and determine the width of the collapsed sidebar
+        & > .sidebar-fixed-element-wrapper {
+          min-width: var(--ds-admin-sidebar-fixed-element-width);
+          flex: 1 1 auto; // Fill available space
+
+          // Align the icons
+          display: flex;
+          flex-direction: row;
+          justify-content: center;
+          align-items: center;
         }
 
-        &.inactive ::ng-deep .sidebar-collapsible {
-            margin-left: calc(-1 * var(--ds-sidebar-items-width));
-        }
-
-        .navbar-nav {
-            .admin-menu-header {
-                background-color: var(--ds-admin-sidebar-header-bg);
-
-                .sidebar-section {
-                  background-color: inherit;
-                }
-
-                .logo-wrapper {
-                    img {
-                        height: 20px;
-                    }
-                }
-                .section-header-text {
-                    line-height: 1.5;
-                }
-
-                .navbar-brand {
-                  margin-right: 0;
-                }
-
-            }
-        }
-
-
-        ::ng-deep {
-            .navbar-nav {
-                .sidebar-section {
-                    display: flex;
-                    align-content: stretch;
-                    background-color: var(--ds-admin-sidebar-bg);
-                    overflow-x: visible;
-
-                    .nav-item {
-                        padding-top: var(--bs-spacer);
-                        padding-bottom: var(--bs-spacer);
-                        background-color: inherit;
-
-                      &:focus-visible {
-                        // since links fill the whole sidebar, we _inset_ the outline
-                        outline-offset: -4px;
-
-                        // replace padding with margins so it doesn't extend over the :focus-visible outline
-                        //  → can't remove the padding altogether; the icon needs to fill out
-                        //    the collapsed width of the sidebar for the slide animation to look decent.
-                        .shortcut-icon {
-                          padding-left: 0;
-                          padding-right: 0;
-                          margin-left: var(--ds-icon-padding);
-                          margin-right: var(--ds-icon-padding);
-                        }
-                        .logo-wrapper {
-                          margin-right: var(--bs-navbar-padding-x) !important;
-                        }
-                        .navbar-brand {
-                          padding-top: 0;
-                          padding-bottom: 0;
-                          margin-top: var(--bs-navbar-brand-padding-y);
-                          margin-bottom: var(--bs-navbar-brand-padding-y);
-                        }
-                      }
-                    }
-
-                    .shortcut-icon {
-                        background-color: inherit;
-                        padding-left: var(--ds-icon-padding);
-                        padding-right: var(--ds-icon-padding);
-                        z-index: var(--ds-icon-z-index);
-                        align-self: baseline;
-                    }
-
-                    .sidebar-collapsible {
-                        padding-left: 0;
-                        padding-right: var(--bs-spacer);
-                        width: var(--ds-sidebar-items-width);
-                        position: relative;
-                        .toggle {
-                          width: 100%;
-                        }
-
-                        ul {
-                          padding-top: var(--bs-spacer);
-
-                          li a {
-                            padding-left: var(--bs-spacer);
-                          }
-                        }
-                    }
-
-                    &.active > .sidebar-collapsible > .nav-link {
-                        color: var(--bs-navbar-dark-active-color);
-                    }
-                }
-            }
+        & > .sidebar-collapsible-element-outer-wrapper {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: flex-end; // make inner wrapper slide on the left when collapsing
+          max-width: calc(100% - var(--ds-admin-sidebar-fixed-element-width)); // fill available space
+          padding-left: var(--ds-dark-scrollbar-width); // leave room for scrollbar
+          overflow-x: hidden; // hide inner wrapper when sidebar is collapsed
+
+          // These elements have fixed width and slide on the left when the sidebar is collapsed
+          // Their content should fill all available space
+          & > .sidebar-collapsible-element-inner-wrapper {
+            min-width: calc(var(--ds-admin-sidebar-collapsible-element-width) - var(--ds-dark-scrollbar-width));
+            height: 100%;
+            padding-right: 16px !important;
+          }
         }
+      }
 
     }
 
+    // Set here any style that depends on the sidebar status
+    &.collapsed, &.transitioning, &.expanded { }
+
+  }
+
+  /* SIDEBAR STYLE */
+
+  nav#admin-sidebar {
+
+    background-color: var(--ds-admin-sidebar-bg);
+
+    ::ng-deep {
+
+      color: white;
+
+      // Set here the style of the *-menu-item nested components
+      .ds-menu-item {
+      }
+
+      a {
+        color: var(--ds-admin-sidebar-link-color);
+        text-decoration: none;
+
+        &:hover, &:focus {
+          color: var(--ds-admin-sidebar-link-hover-color);
+        }
+      }
+    }
+
+    div#sidebar-header-container {
+      background-color: var(--ds-admin-sidebar-header-bg);
+      .sidebar-fixed-element-wrapper {
+        background-color: var(--ds-admin-sidebar-header-bg);
+      }
+    }
+
+    div#sidebar-collapse-toggle-container {
+      .sidebar-collapsible-element-inner-wrapper {
+      }
+    }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
index 9522be29ce..058b81df2f 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -143,7 +143,7 @@ describe('AdminSidebarComponent', () => {
   describe('when the collapse link is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleMenu');
-      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle > button'));
+      const sidebarToggler = fixture.debugElement.query(By.css('#sidebar-collapse-toggle-container > a'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 26ded965d4..741f9b7630 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Injector, Input, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, first, map, withLatestFrom } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
@@ -28,9 +28,14 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   menuID = MenuID.ADMIN;
 
   /**
-   * Observable that emits the width of the collapsible menu sections
+   * Observable that emits the width of the sidebar when expanded
    */
-  sidebarWidth: Observable<string>;
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
 
   /**
    * Is true when the sidebar is open, is false when the sidebar is animating or closed
@@ -44,6 +49,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
 
+  /**
+   * Is true when the sidebar is opening or closing
+   * @type {boolean}
+   */
+  sidebarTransitioning = !this.sidebarOpen; // Animation in progress
+
   /**
    * Emits true when either the menu OR the menu's preview is expanded, else emits false
    */
@@ -69,7 +80,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width');
     this.authService.isAuthenticated()
       .subscribe((loggedIn: boolean) => {
         if (loggedIn) {
@@ -134,6 +144,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   startSlide(event: any): void {
+    this.sidebarTransitioning = true;
     if (event.toState === 'expanded') {
       this.sidebarClosed = false;
     } else if (event.toState === 'collapsed') {
@@ -146,6 +157,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   finishSlide(event: any): void {
+    this.sidebarTransitioning = false;
     if (event.fromState === 'expanded') {
       this.sidebarClosed = true;
     } else if (event.fromState === 'collapsed') {
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 1f4666bbd0..303b1400f4 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -1,37 +1,47 @@
-<div class="sidebar-section" [ngClass]="{'expanded': (expanded | async)}"
+<li [ngClass]="{'expanded': (isExpanded$ | async)}" role="presentation"
     [@bgColor]="{
-     value: ((expanded | async) ? 'endBackground' : 'startBackground'),
-     params: {endColor: (sidebarActiveBg | async)}}">
-  <div class="nav-item nav-link d-flex flex-row flex-nowrap"
-     role="button" tabindex="0"
-     [attr.aria-labelledby]="'sidebarName-' + section.id"
-     [attr.aria-expanded]="expanded | async"
-     [title]="('menu.section.icon.' + section.id) | translate"
-       [class.disabled]="section.model?.disabled"
+     value: ((isExpanded$ | async) ? 'endBackground' : 'startBackground'),
+     params: {endColor: (sidebarActiveBg$ | async)}
+     }">
+  <a class="sidebar-section-wrapper"
+     role="menuitem" tabindex="0"
+     aria-haspopup="menu"
+     [attr.aria-controls]="adminMenuSectionId(section.id)"
+     [attr.aria-expanded]="isExpanded$ | async"
+     [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+     [class.disabled]="section.model?.disabled"
      (click)="toggleSection($event)"
      (keyup.space)="toggleSection($event)"
      (keyup.enter)="toggleSection($event)"
+     href="javascript:void(0);"
   >
-    <div class="shortcut-icon h-100">
+    <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
     </div>
-    <div class="sidebar-collapsible">
-      <div class="toggle">
-        <span id="sidebarName-{{section.id}}" class="section-header-text">
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
+        <span [id]="adminMenuSectionTitleId(section.id)">
           <ng-container
             *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
-        <i class="fas fa-chevron-right fa-pull-right"
-           [@rotate]="(expanded | async) ? 'expanded' : 'collapsed'"
-           [title]="('menu.section.toggle.' + section.id) | translate"
+        <i class="fas fa-chevron-right fa-xs" aria-hidden="true"
+           [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
         ></i>
       </div>
-      <ul class="sidebar-sub-level-items list-unstyled" @slide *ngIf="(expanded | async)">
-        <li *ngFor="let subSection of (subSections$ | async)">
-          <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </li>
-      </ul>
+    </div>
+  </a>
+  <div class="sidebar-section-wrapper subsection" @slide *ngIf="(isExpanded$ | async)">
+    <div class="sidebar-fixed-element-wrapper"></div>
+    <div class="sidebar-collapsible-element-outer-wrapper">
+      <div class="sidebar-collapsible-element-inner-wrapper">
+        <ul class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+          <li class="sidebar-item" role="presentation" *ngFor="let subSection of (subSections$ | async)">
+            {{ (sectionMap$ | async).get(subSection.id).component | json}}
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
-</div>
+</li>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 802fade8c1..937d996102 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,23 +1,24 @@
-:host ::ng-deep {
-    .fa-chevron-right {
-        padding-left: calc(var(--bs-spacer) / 2);
-        font-size: 0.5rem;
-        line-height: 3;
+:host {
+  ul.sidebar-sub-level-item-list  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    ::ng-deep .ds-menu-item {
+      margin-left: 12px;
     }
+  }
 
-    .sidebar-sub-level-items {
-        list-style: disc;
-        color: var(--bs-navbar-dark-color);
-        overflow: hidden;
-        margin-bottom: calc(-1 * var(--bs-spacer)); // the bottom-most nav-item is padded, no need for double spacing
-    }
+  .toggler-wrapper {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-between;
+  }
 
-    .sidebar-collapsible {
-        display: flex;
-        flex-direction: column;
-    }
-
-    li.sidebar-section.expanded {
-      background-color: var(--ds-admin-sidebar-active-bg) !important;
+  .subsection {
+    .sidebar-collapsible-element-inner-wrapper {
+      overflow-y: hidden;
     }
+  }
 }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
index dd31f757c2..bd859d295d 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts
@@ -49,14 +49,14 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
   });
 
   it('should set the right icon', () => {
-    const icon = fixture.debugElement.query(By.css('.shortcut-icon > i.fas'));
+    const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"] > i.fas'));
     expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
   });
 
   describe('when the header text is clicked', () => {
     beforeEach(() => {
       spyOn(menuService, 'toggleActiveSection');
-      const sidebarToggler = fixture.debugElement.query(By.css('.sidebar-section > div.nav-item'));
+      const sidebarToggler = fixture.debugElement.query(By.css('a.sidebar-section-wrapper'));
       sidebarToggler.triggerEventHandler('click', {
         preventDefault: () => {/**/
         }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 8591fef97e..e2995598f8 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -31,23 +31,23 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
   /**
    * The background color of the section when it's active
    */
-  sidebarActiveBg;
+  sidebarActiveBg$: Observable<string>;
 
   /**
    * Emits true when the sidebar is currently collapsed, true when it's expanded
    */
-  sidebarCollapsed: Observable<boolean>;
+  isSidebarCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the sidebar's preview is currently collapsed, true when it's expanded
    */
-  sidebarPreviewCollapsed: Observable<boolean>;
+  isSidebarPreviewCollapsed$: Observable<boolean>;
 
   /**
    * Emits true when the menu section is expanded, else emits false
    * This is true when the section is active AND either the sidebar or it's preview is open
    */
-  expanded: Observable<boolean>;
+  isExpanded$: Observable<boolean>;
 
   constructor(
     @Inject('sectionDataProvider') menuSection,
@@ -64,12 +64,20 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarActiveBg = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
-    this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID);
-    this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.expanded = combineLatestObservable(this.active, this.sidebarCollapsed, this.sidebarPreviewCollapsed)
-      .pipe(
-        map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed)))
-      );
+    this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
+    this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+    this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
+    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+      map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed)))
+    );
+  }
+
+  toggleSection($event: Event) {
+    this.menuService.expandMenuPreview(this.menuID); // fixes accessibility issue
+    super.toggleSection($event);
+  }
+
+  adminMenuSubsectionId(sectionId: string, subsectionId: string) {
+    return `admin-menu-section-${sectionId}-${subsectionId}`;
   }
 }
diff --git a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
index f2f35725e8..03b783aeaf 100644
--- a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
@@ -1,6 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { AdminSidebarComponent } from './admin-sidebar.component';
+import { Observable } from 'rxjs';
 
 /**
  * Themed wrapper for AdminSidebarComponent
@@ -11,6 +12,19 @@ import { AdminSidebarComponent } from './admin-sidebar.component';
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
 export class ThemedAdminSidebarComponent extends ThemedComponent<AdminSidebarComponent> {
+
+  /**
+   * Observable that emits the width of the sidebar when expanded
+   */
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
+
+  protected inAndOutputNames: (keyof AdminSidebarComponent & keyof this)[] = ['collapsedSidebarWidth$', 'expandedSidebarWidth$'];
+
   protected getComponentName(): string {
     return 'AdminSidebarComponent';
   }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 44ca82b61d..180ce16ba5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,22 +1,36 @@
-<div class="nav-item dropdown expandable-navbar-section text-md-center"
-    *ngVar="(active | async) as isActive"
-    (keyup.enter)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keyup.space)="isActive ? deactivateSection($event) : activateSection($event)"
-    (keydown.space)="$event.preventDefault()"
-    (mouseenter)="activateSection($event)"
-    (mouseleave)="deactivateSection($event)">
-    <button class="btn btn-link nav-link dropdown-toggle" routerLinkActive="active" type="button"
-       [class.disabled]="section.model?.disabled"
+<li class="ds-menu-item-wrapper text-md-center" role="presentation"
+    [id]="'expandable-navbar-section-' + section.id"
+    (mouseenter)="onMouseEnter($event, isActive)"
+    (mouseleave)="onMouseLeave($event, isActive)"
+    data-test="navbar-section-wrapper"
+    *ngVar="(active | async) as isActive">
+    <a href="javascript:void(0);" routerLinkActive="active"
+       role="menuitem"
+       (keyup.enter)="toggleSection($event)"
+       (keyup.space)="toggleSection($event)"
        (click)="toggleSection($event)"
-       data-toggle="dropdown">
+       (keydown.space)="$event.preventDefault()"
+       aria-haspopup="menu"
+       data-test="navbar-section-toggler"
+       [attr.aria-expanded]="isActive"
+       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
+       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+       [class.disabled]="section.model?.disabled"
+       id="browseDropdown">
+      <span class="flex-fill">
         <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-    </button>
-    <ul @slide *ngIf="(active | async)" (click)="deactivateSection($event)"
-        class="m-0 shadow-none border-top-0 dropdown-menu show">
-        <li *ngFor="let subSection of (subSections$ | async)">
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
+      </span>
+      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+    </a>
+    <ul @slide *ngIf="isActive" (click)="deactivateSection($event)"
+        [id]="expandableNavbarSectionId(section.id)"
+        role="menu"
+        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+        <li *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
             <ng-container
                     *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
         </li>
     </ul>
-</div>
+</li>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index ff48341b0f..961d450486 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -1,47 +1,24 @@
-.expandable-navbar-section {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-  justify-content: center;
-}
+:host {
+  li.ds-menu-item-wrapper {
+    position: relative; // align dropdown menu with respect to this element
+  }
 
-.btn.nav-link {
-  text-align: left;
-  border: none;
+  .dropdown-menu {
+    overflow: hidden;
+    @include media-breakpoint-down(sm) {
+      border: 0;
+      background-color: var(--ds-expandable-navbar-bg);
+    }
+    @include media-breakpoint-up(md) {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      background-color: var(--ds-navbar-dropdown-bg);
+    }
+  }
 
-  &:active, &:focus {
-    box-shadow: none !important;
+  .toggle-menu-icon {
+    &, &:hover {
+      text-decoration: none;
+    }
   }
 }
-
-.dropdown-menu {
-    background-color: var(--ds-expandable-navbar-bg);
-    overflow: hidden;
-    min-width: 100%;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-    ::ng-deep a.nav-link {
-        color: var(--ds-expandable-navbar-link-color) !important;
-        padding-right: var(--bs-spacer);
-        padding-left: var(--bs-spacer);
-        white-space: nowrap;
-
-        &:hover, &:focus {
-          color: var(--ds-expandable-navbar-link-color-hover) !important;
-        }
-    }
-}
-
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)) {
-    .dropdown-toggle {
-        &:after {
-            float: right;
-            margin-top: calc(var(--bs-spacer) / 2);
-        }
-    }
-    .dropdown-menu {
-        border: 0;
-
-    }
-}
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index f4c72e1237..986dca86eb 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -47,120 +47,138 @@ describe('ExpandableNavbarSectionComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    describe('when the mouse enters the section header', () => {
+    describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseEnter').and.callThrough();
+        spyOn(component, 'activateSection').and.callThrough();
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
           }
         });
       });
 
-      it('should call activateSection on the menuService', () => {
+      it('should call onMouseEnter', () => {
+        expect(component.onMouseEnter).toHaveBeenCalled();
+      });
+
+      it('should activate the section', () => {
+        expect(component.activateSection).toHaveBeenCalled();
         expect(menuService.activateSection).toHaveBeenCalled();
       });
     });
 
-    describe('when the mouse leaves the section header', () => {
+    describe('when the mouse leaves the section header (while active)', () => {
       beforeEach(() => {
+        spyOn(component, 'onMouseLeave').and.callThrough();
+        spyOn(component, 'deactivateSection').and.callThrough();
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
+        component.ngOnInit();
+        component.mouseEntered = true;
+        fixture.detectChanges();
+
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
           }
         });
       });
 
-      it('should call deactivateSection on the menuService', () => {
+      it('should call onMouseLeave', () => {
+        expect(component.onMouseLeave).toHaveBeenCalled();
+      });
+
+      it('should deactivate the section', () => {
+        expect(component.deactivateSection).toHaveBeenCalled();
         expect(menuService.deactivateSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while inactive)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
       it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when Enter key is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.enter) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'activateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
       beforeEach(() => {
-        spyOn(menuService, 'deactivateSection');
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
         // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property.
         spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true));
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         // dispatch the (keyup.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call deactivateSection on the menuService', () => {
-        expect(menuService.deactivateSection).toHaveBeenCalled();
-      });
-    });
-
-    describe('when a click occurs on the section header', () => {
-      beforeEach(() => {
-        spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
-        sidebarToggler.triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
-      });
-
-      it('should not call toggleActiveSection on the menuService', () => {
-        expect(menuService.toggleActiveSection).not.toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
   });
@@ -195,7 +213,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse enters the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'activateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseenter', {
           preventDefault: () => {/**/
           }
@@ -210,7 +228,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when the mouse leaves the section header', () => {
       beforeEach(() => {
         spyOn(menuService, 'deactivateSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-wrapper"]'));
         sidebarToggler.triggerEventHandler('mouseleave', {
           preventDefault: () => {/**/
           }
@@ -225,7 +243,7 @@ describe('ExpandableNavbarSectionComponent', () => {
     describe('when a click occurs on the section header link', () => {
       beforeEach(() => {
         spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > button'));
+        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
         sidebarToggler.triggerEventHandler('click', {
           preventDefault: () => {/**/
           }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index d32fa46a32..030b2b3da4 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,10 +1,11 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Inject, Injector, OnInit } from '@angular/core';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { slide } from '../../shared/animations/slide';
 import { first } from 'rxjs/operators';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { Observable } from 'rxjs';
 
 /**
  * Represents an expandable section in the navbar
@@ -21,12 +22,42 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   menuID = MenuID.PUBLIC;
 
+  /**
+   * True if mouse has entered the menu section toggler
+   */
+  mouseEntered = false;
+
+  /**
+   * True if screen size was small before a resize event
+   */
+  wasMobile = undefined;
+
+  /**
+   * Observable that emits true if the screen is small, false otherwise
+   */
+  isMobile$: Observable<boolean>;
+
+  @HostListener('window:resize', ['$event'])
+  onResize() {
+    this.isMobile$.pipe(
+      first()
+    ).subscribe((isMobile) => {
+      // When switching between desktop and mobile active sections should be deactivated
+      if (isMobile !== this.wasMobile) {
+        this.wasMobile = isMobile;
+        this.menuService.deactivateSection(this.menuID, this.section.id);
+        this.mouseEntered = false;
+      }
+    });
+  }
+
   constructor(@Inject('sectionDataProvider') menuSection,
               protected menuService: MenuService,
               protected injector: Injector,
               private windowService: HostWindowService
   ) {
     super(menuSection, menuService, injector);
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
@@ -34,48 +65,42 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   }
 
   /**
-   * Overrides the super function that activates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be activated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * When the mouse enters the section toggler activate the menu section
+   * @param $event
+   * @param isActive
    */
-  activateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
+  onMouseEnter($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.activateSection(event);
+      if (!isMobile && !isActive && !this.mouseEntered) {
+        this.activateSection($event);
       }
+      this.mouseEntered = true;
     });
   }
 
   /**
-   * Overrides the super function that deactivates this section (triggered on hover)
-   * Has an extra check to make sure the section can only be deactivated on non-mobile devices
-   * @param {Event} event The user event that triggered this function
+   * When the mouse leaves the section toggler deactivate the menu section
+   * @param $event
+   * @param isActive
    */
-  deactivateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
+  onMouseLeave($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.deactivateSection(event);
+      if (!isMobile && isActive && this.mouseEntered) {
+        this.deactivateSection($event);
       }
+      this.mouseEntered = false;
     });
   }
 
   /**
-   * Overrides the super function that toggles this section (triggered on click)
-   * Has an extra check to make sure the section can only be toggled on mobile devices
-   * @param {Event} event The user event that triggered this function
+   * returns the ID of the DOM element representing the navbar section
+   * @param sectionId
    */
-  toggleSection(event): void {
-    event.preventDefault();
-    this.windowService.isXsOrSm().pipe(
-      first()
-    ).subscribe((isMobile) => {
-      if (isMobile) {
-        super.toggleSection(event);
-      }
-    });
+  expandableNavbarSectionId(sectionId: string) {
+    return `expandable-navbar-section-${sectionId}-dropdown`;
   }
 }
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index 42754be1e6..ac51c86342 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,3 +1,5 @@
-<div class="nav-item navbar-section text-md-center">
+<li role="presentation"
+    class="ds-menu-item-wrapper text-md-center"
+    [id]="'navbar-section-' + section.id">
   <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-</div>
+</li>
diff --git a/src/app/navbar/navbar-section/navbar-section.component.scss b/src/app/navbar/navbar-section/navbar-section.component.scss
index 7af4ada8e6..1cda7dcf9e 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.scss
+++ b/src/app/navbar/navbar-section/navbar-section.component.scss
@@ -1,5 +1,5 @@
-.navbar-section {
-  display: flex;
-  align-items: center;
-  height: 100%;
+:host {
+  li.ds-menu-item-wrapper {
+
+  }
 }
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 8bf1f942c7..5e15315a9b 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,18 +1,21 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-    class="navbar navbar-light navbar-expand-md p-md-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
-    <div class="navbar-inner-container w-100" [class.container]="!(isMobile$ | async)">
-        <div class="reset-padding-md w-100">
-            <div id="collapsingNav">
-                <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
-                    <li *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
-                        <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
-                    </li>
-                    <li *ngFor="let section of (sections | async)">
-                        <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-                    </li>
-                </ul>
-            </div>
-        </div>
+<nav [ngClass]="{'open': !(menuCollapsed | async)}"
+     [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+     class="navbar navbar-light navbar-expand-md px-md-0 pt-md-0 pt-3 navbar-container" role="navigation"
+     [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
+  <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
+  <div class="navbar-inner-container w-100" [class.container]="!(isMobile$ | async)">
+    <div class="w-100">
+      <div id="collapsingNav">
+        <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+          <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
+        </ng-container>
+        <ul class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
+          <ng-container *ngFor="let section of (sections | async)">
+            <ng-container
+              *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+          </ng-container>
+        </ul>
+      </div>
     </div>
+  </div>
 </nav>
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index 8095b7fff6..23268b145f 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,7 +1,10 @@
 :host {
+  --ds-collapsible-navbar-height: auto;
+
   nav.navbar {
     background-color: var(--ds-navbar-bg);
     align-items: baseline;
+    padding: 0;
   }
 
   /** Mobile menu styling **/
@@ -23,8 +26,8 @@
 
   @media screen and (min-width: map-get($grid-breakpoints, md)) {
     .reset-padding-md {
-      margin-left: calc(var(--bs-spacer) / -2);
-      margin-right: calc(var(--bs-spacer) / -2);
+      margin-left: calc(var(--bs-spacer) / -1);
+      margin-right: calc(var(--bs-spacer) / -1);
     }
   }
 
@@ -38,9 +41,20 @@
     }
   }
 
-.navbar-nav {
-  ::ng-deep a.nav-link, .btn.nav-link {
-    color: var(--ds-navbar-link-color);
+  #main-navbar ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    .dropdown-menu {
+      padding: 0.5rem !important;
+    }
+
+    .ds-menu-item {
+      display: block;
+      color: var(--ds-navbar-link-color);
+      padding: 0.5rem 0;
 
       &:hover, &:focus {
         color: var(--ds-navbar-link-color-hover);
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index d6d0586892..8f07951097 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,12 +1,12 @@
-<button (click)="skipToMainContent()" class="btn btn-primary" id="skip-to-main-content">
+<button (click)="skipToMainContent()" class="sr-only" id="skip-to-main-content">
   {{ 'root.skip-to-content' | translate }}
 </button>
 
 <div class="outer-wrapper" [class.d-none]="shouldShowFullscreenLoader" [@slideSidebarPadding]="{
-     value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
-     params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
+     value: (!(isSidebarVisible$ | async) ? 'hidden' : (slideSidebarOver$ | async) ? 'unpinned' : 'pinned'),
+     params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
     }">
-  <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
+  <ds-themed-admin-sidebar [expandedSidebarWidth$]="expandedSidebarWidth$" [collapsedSidebarWidth$]="collapsedSidebarWidth$"></ds-themed-admin-sidebar>
   <div class="inner-wrapper">
     <ds-system-wide-alert-banner></ds-system-wide-alert-banner>
     <ds-themed-header-navbar-wrapper></ds-themed-header-navbar-wrapper>
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 160504f14f..4c4370fc62 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,25 +1,17 @@
-import { map, startWith } from 'rxjs/operators';
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { first, map, skipWhile, startWith } from 'rxjs/operators';
+import { Component, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { TranslateService } from '@ngx-translate/core';
-
-import { MetadataService } from '../core/metadata/metadata.service';
-import { HostWindowState } from '../shared/search/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
-import { AuthService } from '../core/auth/auth.service';
 import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { ThemeConfig } from '../../config/theme.config';
-import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
 import { environment } from '../../environments/environment';
 import { slideSidebarPadding } from '../shared/animations/slide';
 import { MenuID } from '../shared/menu/menu-id.model';
 import { getPageInternalServerErrorRoute } from '../app-routing-paths';
-import { hasValueOperator } from '../shared/empty.util';
+import { INotificationBoardOptions } from 'src/config/notifications-config.interfaces';
 
 @Component({
   selector: 'ds-root',
@@ -28,13 +20,13 @@ import { hasValueOperator } from '../shared/empty.util';
   animations: [slideSidebarPadding],
 })
 export class RootComponent implements OnInit {
-  sidebarVisible: Observable<boolean>;
-  slideSidebarOver: Observable<boolean>;
-  collapsedSidebarWidth: Observable<string>;
-  totalSidebarWidth: Observable<string>;
   theme: Observable<ThemeConfig> = of({} as any);
-  notificationOptions;
-  models;
+  isSidebarVisible$: Observable<boolean>;
+  slideSidebarOver$: Observable<boolean>;
+  collapsedSidebarWidth$: Observable<string>;
+  expandedSidebarWidth$: Observable<string>;
+  notificationOptions: INotificationBoardOptions;
+  models: any;
 
   /**
    * Whether or not to show a full screen loader
@@ -47,12 +39,6 @@ export class RootComponent implements OnInit {
   @Input() shouldShowRouteLoader: boolean;
 
   constructor(
-    @Inject(NativeWindowService) private _window: NativeWindowRef,
-    private translate: TranslateService,
-    private store: Store<HostWindowState>,
-    private metadata: MetadataService,
-    private angulartics2DSpace: Angulartics2DSpace,
-    private authService: AuthService,
     private router: Router,
     private cssService: CSSVariableService,
     private menuService: MenuService,
@@ -62,13 +48,19 @@ export class RootComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.sidebarVisible = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+    this.isSidebarVisible$ = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
 
-    this.collapsedSidebarWidth = this.cssService.getVariable('--ds-collapsed-sidebar-width').pipe(hasValueOperator());
-    this.totalSidebarWidth = this.cssService.getVariable('--ds-total-sidebar-width').pipe(hasValueOperator());
+    this.expandedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-total-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
+    this.collapsedSidebarWidth$ = this.cssService.getVariable('--ds-admin-sidebar-fixed-element-width').pipe(
+      skipWhile((val) => !val),
+      first(),
+    );
 
     const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
-    this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
+    this.slideSidebarOver$ = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile),
         startWith(true),
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 9d18817ee3..a0f596a0fa 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -1,4 +1,4 @@
-import { animate, animateChild, group, query, state, style, transition, trigger } from '@angular/animations';
+import { animate, group, state, style, transition, trigger } from '@angular/animations';
 
 export const slide = trigger('slide', [
   state('expanded', style({ height: '*' })),
@@ -12,45 +12,35 @@ export const slide = trigger('slide', [
 
 export const slideMobileNav = trigger('slideMobileNav', [
 
-  state('expanded', style({ height: 'auto', 'min-height': '100vh' })),
+  state('expanded', style({ height: '*', minHeight: '*' })),
 
-  state('collapsed', style({ height: 0 })),
+  state('collapsed', style({ height: 0, minHeight: 0 })),
 
   transition('expanded <=> collapsed', animate('300ms'))
 ]);
 
-const collapsedStyle = style({ marginLeft: '-{{ sidebarWidth }}' });
-const expandedStyle = style({ marginLeft: '0' });
-const options = { params: { sidebarWidth: '*' } };
+const collapsedSidebarStyle = style({ maxWidth: '{{collapsedWidth}}' });
+const expandedSidebarStyle = style({ maxWidth: '{{expandedWidth}}' });
+const unpinnedSidebarPageStyle = style({ paddingLeft: '{{collapsedWidth}}' });
+const pinnedSidebarPageStyle = style({ paddingLeft: '{{expandedWidth}}' });
+const hiddenSidebarPageStyle = style({ paddingLeft: '0' });
+const options = { params: { collapsedWidth: '*', expandedWidth: '*' } };
+const animation = '300ms ease-in-out';
 
 export const slideSidebar = trigger('slideSidebar', [
-
-  transition('expanded => collapsed',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', expandedStyle, options),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', collapsedStyle))
-      ],
-    )),
-
-  transition('collapsed => expanded',
-    group(
-      [
-        query('@*', animateChild()),
-        query('.sidebar-collapsible', collapsedStyle),
-        query('.sidebar-collapsible', animate('300ms ease-in-out', expandedStyle), options)
-      ]
-    ))
+  state('collapsed', collapsedSidebarStyle, options),
+  state('expanded', expandedSidebarStyle, options),
+  transition('expanded => collapsed', animate(animation, collapsedSidebarStyle)),
+  transition('collapsed => expanded', animate(animation, expandedSidebarStyle)),
 ]);
 
 export const slideSidebarPadding = trigger('slideSidebarPadding', [
-  state('hidden', style({ paddingLeft: 0 })),
-  state('shown', style({ paddingLeft: '{{ collapsedSidebarWidth }}' }), { params: { collapsedSidebarWidth: '*' } }),
-  state('expanded', style({ paddingLeft: '{{ totalSidebarWidth }}' }), { params: { totalSidebarWidth: '*' } }),
-  transition('hidden <=> shown', [animate('200ms')]),
-  transition('hidden <=> expanded', [animate('200ms')]),
-  transition('shown <=> expanded', [animate('200ms')]),
+  state('hidden', hiddenSidebarPageStyle),
+  state('unpinned', unpinnedSidebarPageStyle, options),
+  state('pinned', pinnedSidebarPageStyle, options),
+  transition('hidden <=> unpinned', animate(animation)),
+  transition('hidden <=> pinned', animate(animation)),
+  transition('unpinned <=> pinned', animate(animation)),
 ]);
 
 export const expandSearchInput = trigger('toggleAnimation', [
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index a0623bdd90..44487be1e3 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,40 +1,52 @@
-<ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
-  <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item"
+<div class="navbar-nav mr-auto" *ngIf="!(isMobile$ | async); else mobileButtons" data-test="auth-nav">
+  <div *ngIf="!(isAuthenticated | async) && (showAuth | async)"
+      class="nav-item"
       (click)="$event.stopPropagation();">
-    <div ngbDropdown #loginDrop display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <button class="btn btn-link dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
+    <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
          (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
-         ngbDropdownToggle>
-        {{ 'nav.login' | translate }}
-      </button>
-      <div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+         role="menuitem"
+         aria-haspopup="menu"
+         aria-controls="loginDropdownMenu"
+         [attr.aria-expanded]="loginDrop.isOpen()"
+         ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
+      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+           role="menu"
            [attr.aria-label]="'nav.login' | translate">
         <ds-themed-log-in
           [isStandalonePage]="false"></ds-themed-log-in>
       </div>
     </div>
-  </li>
-  <li *ngIf="!(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a routerLink="/login" routerLinkActive="active" class="loginLink px-0.5">
+  </div>
+  <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
+    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+      <a href="javascript:void(0);"
+         role="menuitem"
+         [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
+         aria-controls="user-menu-dropdown"
+         (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
+         class="dropdownLogout px-1"
+         [attr.data-test]="'user-menu' | dsBrowserOnly"
+         ngbDropdownToggle>
+        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+      <ul id="logoutDropdownMenu" class="p-3" ngbDropdownMenu role="presentation">
+        <ds-themed-user-menu></ds-themed-user-menu>
+      </ul>
+    </div>
+  </div>
+</div>
+
+
+<ng-template #mobileButtons>
+  <div data-test="auth-nav">
+    <a *ngIf="!(isAuthenticated | async)" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
       {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
     </a>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <button role="button" [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate" class="btn btn-link dropdownLogout px-1" [attr.data-test]="'user-menu' | dsBrowserOnly" ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i>
-      </button>
-      <div class="logoutDropdownMenu" ngbDropdownMenu [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate">
-        <ds-themed-user-menu></ds-themed-user-menu>
-      </div>
-    </div>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
       <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
       <span class="sr-only">(current)</span>
     </a>
-  </li>
-</ul>
-
+  </div>
+</ng-template>
 
+<!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
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 48b27c4be2..84e4916eff 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
@@ -1,9 +1,9 @@
-.loginDropdownMenu, .logoutDropdownMenu {
+#loginDropdownMenu, #logoutDropdownMenu {
   min-width: 330px;
   z-index: 1002;
 }
 
-.loginDropdownMenu {
+#loginDropdownMenu {
   min-height: 75px;
 }
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 0b9ea6ef4b..e3d3ef7fc5 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -16,6 +16,7 @@ import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { AuthService } from '../../core/auth/auth.service';
 import { of } from 'rxjs';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 
 describe('AuthNavMenuComponent', () => {
 
@@ -75,7 +76,8 @@ describe('AuthNavMenuComponent', () => {
               strictActionImmutability: false
             }
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
+          NgbDropdownModule
         ],
         declarations: [
           AuthNavMenuComponent,
@@ -83,7 +85,7 @@ describe('AuthNavMenuComponent', () => {
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
         ],
         schemas: [
           CUSTOM_ELEMENTS_SCHEMA
@@ -117,10 +119,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
       afterEach(() => {
@@ -155,10 +157,10 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-        const navMenuItemSelector = 'li';
+        const navMenuItemSelector = '.nav-item';
         deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
@@ -197,10 +199,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -210,7 +212,7 @@ describe('AuthNavMenuComponent', () => {
         });
 
         it('should render login dropdown menu', () => {
-          const loginDropdownMenu = deNavMenuItem.query(By.css('div.loginDropdownMenu'));
+          const loginDropdownMenu = deNavMenuItem.query(By.css('div#loginDropdownMenu'));
           expect(loginDropdownMenu.nativeElement).toBeDefined();
         });
       });
@@ -236,10 +238,10 @@ describe('AuthNavMenuComponent', () => {
 
           fixture.detectChanges();
 
-          const navMenuSelector = '.navbar-nav';
+          const navMenuSelector = '[data-test="auth-nav"]';
           deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
 
-          const navMenuItemSelector = 'li';
+          const navMenuItemSelector = '.nav-item';
           deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
         }));
 
@@ -309,11 +311,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -322,7 +321,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render login link', () => {
-        const loginDropdownMenu = deNavMenuItem.query(By.css('.loginLink'));
+        const loginDropdownMenu = deNavMenu.query(By.css('.loginLink'));
         expect(loginDropdownMenu.nativeElement).toBeDefined();
       });
     });
@@ -345,11 +344,8 @@ describe('AuthNavMenuComponent', () => {
 
         fixture.detectChanges();
 
-        const navMenuSelector = '.navbar-nav';
+        const navMenuSelector = '[data-test="auth-nav"]';
         deNavMenu = fixture.debugElement.query(By.css(navMenuSelector));
-
-        const navMenuItemSelector = 'li';
-        deNavMenuItem = deNavMenu.query(By.css(navMenuItemSelector));
       }));
 
       afterEach(() => {
@@ -358,7 +354,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render logout link', inject([Store], (store: Store<AppState>) => {
-        const logoutDropdownMenu = deNavMenuItem.query(By.css('a.logoutLink'));
+        const logoutDropdownMenu = deNavMenu.query(By.css('a.logoutLink'));
         expect(logoutDropdownMenu.nativeElement).toBeDefined();
       }));
     });
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index 37a45e1b20..3174462fc3 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -32,7 +32,7 @@ export class AuthNavMenuComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   public showAuth = observableOf(false);
 
@@ -44,7 +44,7 @@ export class AuthNavMenuComponent implements OnInit {
               private windowService: HostWindowService,
               private authService: AuthService
   ) {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 85b9d8aece..637b483db0 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,15 +1,32 @@
 <ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
-<div *ngIf="!(loading$ | async)">
-  <span class="dropdown-item-text" [class.pl-0]="inExpandableNavbar">
+<ul *ngIf="!(loading$ | async)" class="user-menu" role="menu"
+    [ngClass]="{ 'pb-2 mb-2 border-bottom' : inExpandableNavbar }"
+    [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
+  <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
     {{dsoNameService.getName(user$ | async)}}<br>
     <span class="text-muted">{{(user$ | async)?.email}}</span>
-  </span>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[profileRoute]" routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[mydspaceRoute]" routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  <a [ngClass]="inExpandableNavbar ? 'nav-item nav-link' : 'dropdown-item'" [routerLink]="[subscriptionsRoute]" routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
-
-  <div class="dropdown-divider"></div>
-  <ds-log-out *ngIf="!inExpandableNavbar" data-test="log-out-component"></ds-log-out>
-</div>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[profileRoute]"
+       routerLinkActive="active">{{'nav.profile' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[mydspaceRoute]"
+       routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
+  </li>
+  <li class="ds-menu-item-wrapper" role="presentation">
+    <a class="ds-menu-item" role="menuitem"
+       [routerLink]="[subscriptionsRoute]"
+       routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
+  </li>
+  <ng-container *ngIf="!inExpandableNavbar">
+    <li class="dropdown-divider" aria-hidden="true"></li>
+    <li class="ds-menu-item-wrapper" role="presentation">
+      <ds-log-out data-test="log-out-component"></ds-log-out>
+    </li>
+  </ng-container>
+</ul>
 
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
index e69de29bb2..1f33a321f0 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
@@ -0,0 +1,12 @@
+:host {
+  ul.user-menu  {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .ds-menu-item {
+    display: inline-block;
+    padding: 0.25rem 0;
+  }
+}
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index 5576b942b3..04270f97cd 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -140,7 +140,7 @@ describe('UserMenuComponent', () => {
 
       fixture.detectChanges();
 
-      deUserMenu = fixture.debugElement.query(By.css('div'));
+      deUserMenu = fixture.debugElement.query(By.css('ul#user-menu-dropdown'));
     }));
 
     afterEach(() => {
@@ -164,7 +164,7 @@ describe('UserMenuComponent', () => {
     it('should display user name and email', () => {
       const username = 'User Test';
       const email = 'test@test.com';
-      const span = deUserMenu.query(By.css('.dropdown-item-text'));
+      const span = deUserMenu.query(By.css('.username-email-wrapper'));
       expect(span).toBeDefined();
       expect(span.nativeElement.innerHTML).toContain(username);
       expect(span.nativeElement.innerHTML).toContain(email);
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 73a5041f7b..9be622099b 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,13 +1,16 @@
 <div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="javascript:void(0);" role="button"
+  <a href="javascript:void(0);" role="menuitem"
      [attr.aria-label]="'nav.language' |translate"
+     aria-controls="language-menu-list"
+     aria-haspopup="menu"
      [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>
-  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate">
+  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
     <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
+        role="menuitem"
             (keyup.enter)="useLang(lang)"
             (click)="useLang(lang)"
             [class.active]="lang === translate.currentLang">
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 94f6ef870d..0124ea29b2 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -28,10 +28,10 @@
 </form>
 
 <div class="mt-2">
-  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly">
+  <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]" [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">
     {{ 'login.form.new-user' | translate }}
   </a>
-  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly">
+  <a class="dropdown-item" [routerLink]="[getForgotRoute()]" [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">
     {{ 'login.form.forgot-password' | translate }}
   </a>
 </div>
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.html b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
index dc602cc572..c95c63fdf5 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.html
@@ -1,4 +1,5 @@
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    [ngClass]="{'disabled': !hasLink }"
    [attr.aria-disabled]="!hasLink"
    [href]="href"
diff --git a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
index 5fbbe608db..4567876fad 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.ts
@@ -9,7 +9,8 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-external-link-menu-item',
-  templateUrl: './external-link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './external-link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.EXTERNAL)
 export class ExternalLinkMenuItemComponent implements OnInit {
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 91e23ad886..58a3cec10c 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -1,8 +1,7 @@
-
-<a class="nav-item nav-link"
+<a class="ds-menu-item" role="menuitem"
    [ngClass]="{ 'disabled': !hasLink || item.disabled }"
    [attr.aria-disabled]="!hasLink || item.disabled"
-   [title]="item.text | translate"
+   [attr.data-test]="'link-menu-item.'+item.text"
    [routerLink]="getRouterLink()"
    [queryParams]="item.queryParams"
    (click)="$event.stopPropagation()"
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts
index 39f9006987..2cc7e1ae85 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts
@@ -10,7 +10,8 @@ import { Router } from '@angular/router';
  */
 @Component({
   selector: 'ds-link-menu-item',
-  templateUrl: './link-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss'],
+  templateUrl: './link-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.LINK)
 export class LinkMenuItemComponent implements OnInit {
diff --git a/src/app/shared/menu/menu-item/menu-item.component.scss b/src/app/shared/menu/menu-item/menu-item.component.scss
new file mode 100644
index 0000000000..ca7546d79a
--- /dev/null
+++ b/src/app/shared/menu/menu-item/menu-item.component.scss
@@ -0,0 +1,5 @@
+:host {
+  .ds-menu-item {
+    display: inline-block;
+  }
+}
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 5e8aecbd44..4e68b6c5bc 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,10 +1,10 @@
 <a *ngIf="!item.disabled"
+   class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
    href="javascript:void(0);"
-   class="nav-item nav-link"
-   role="button"
    [title]="item.text | translate"
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled"   class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" class="nav-item nav-link disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
index 18ae66b23d..342fb58455 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.spec.ts
@@ -45,7 +45,7 @@ describe('OnClickMenuItemComponent', () => {
   });
 
   it('should call the function on the item when clicked', () => {
-    debugElement.query(By.css('a.nav-link')).triggerEventHandler('click', new Event(('click')));
+    debugElement.query(By.css('a.ds-menu-item')).triggerEventHandler('click', new Event(('click')));
     expect(item.function).toHaveBeenCalled();
   });
 });
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 68e477b1fb..8bc03717d7 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -8,7 +8,7 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-onclick-menu-item',
-  styleUrls: ['./onclick-menu-item.component.scss'],
+  styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
   templateUrl: './onclick-menu-item.component.html'
 })
 @rendersMenuItemForType(MenuItemType.ONCLICK)
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.html b/src/app/shared/menu/menu-item/text-menu-item.component.html
index 11c4420402..ba3cf99a49 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.html
@@ -1 +1 @@
-<span [class.disabled]="item.disabled">{{item.text | translate}}</span>
+<span class="ds-menu-item" [class.disabled]="item.disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.ts b/src/app/shared/menu/menu-item/text-menu-item.component.ts
index 25549f53a8..badaeff738 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.ts
@@ -8,6 +8,7 @@ import { MenuItemType } from '../menu-item-type.model';
  */
 @Component({
   selector: 'ds-text-menu-item',
+  styleUrls: ['./menu-item.component.scss'],
   templateUrl: './text-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.TEXT)
diff --git a/src/app/shared/testing/host-window-service.stub.ts b/src/app/shared/testing/host-window-service.stub.ts
index b64d6fbffc..a0b5d29e9b 100644
--- a/src/app/shared/testing/host-window-service.stub.ts
+++ b/src/app/shared/testing/host-window-service.stub.ts
@@ -1,4 +1,5 @@
 import {of as observableOf,  Observable } from 'rxjs';
+import { WidthCategory } from '../host-window.service';
 
 // declare a stub service
 export class HostWindowServiceStub {
@@ -24,4 +25,8 @@ export class HostWindowServiceStub {
   isMobile(): Observable<boolean> {
     return this.isXs();
   }
+
+  isUpTo(maxWidthCat: WidthCategory): Observable<boolean> {
+    return this.isXs();
+  }
 }
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index 71ee777157..50f01f928f 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -53,6 +53,9 @@ export class MenuServiceStub {
   deactivateSection(): void { /***/
   }
 
+  toggleSection(): void { /***/
+  }
+
   addSection(menuID: MenuID, section: MenuSection): void { /***/
   }
 
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index 5f741091f1..d97d3d5d70 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="(systemWideAlert$ |async)?.active">
-    <div class="rounded-0 alert alert-warning w100">
+    <div class="rounded-0 alert alert-warning w100 m-0 px-1">
         <div class="container">
             <span class="font-weight-bold">
         <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8245ac6404..07ac2f2fe3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2854,6 +2854,8 @@
 
   "logout.title": "Logout",
 
+  "menu.header.nav.description": "Admin navigation bar",
+
   "menu.header.admin": "Management",
 
   "menu.header.image.logo": "Repository logo",
@@ -3100,6 +3102,8 @@
 
   "mydspace.view-btn": "View",
 
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
   "nav.browse.header": "All of DSpace",
 
   "nav.community-browse.header": "By Community",
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index f5051608fa..70bf270c06 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -1,9 +1,6 @@
 /** Help Variables **/
 $fa-fixed-width: 1.25rem !default;
 $icon-padding: 1rem !default;
-$collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)) !default;
-$sidebar-items-width: 250px !default;
-$total-sidebar-width: $collapsed-sidebar-width + $sidebar-items-width !default;
 
 /* Fonts */
 // Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 7d3b2c3853..3964131f06 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -40,13 +40,24 @@
 
   $admin-sidebar-bg: darken(#2B4E72, 17%);
   $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
+  $admin-sidebar-fixed-element-width: 55px !default;
+  $admin-sidebar-collapsible-element-width: 250px !default;
+  $admin-sidebar-total-width: $admin-sidebar-fixed-element-width + $admin-sidebar-collapsible-element-width !default;
+
   --ds-admin-sidebar-bg: #{$admin-sidebar-bg};
   --ds-admin-sidebar-active-bg: #{$admin-sidebar-active-bg};
   --ds-admin-sidebar-header-bg: #{darken($admin-sidebar-bg, 7%)};
+  --ds-admin-sidebar-fixed-element-width: #{$admin-sidebar-fixed-element-width};
+  --ds-admin-sidebar-fixed-element-z-index: 10;
+  --ds-admin-sidebar-collapsible-element-width: #{$admin-sidebar-collapsible-element-width};
+  --ds-admin-sidebar-total-width: #{$admin-sidebar-total-width};
+  --ds-admin-sidebar-link-color: #{$navbar-dark-color};
+  --ds-admin-sidebar-link-hover-color: #{$navbar-dark-hover-color};
 
   --ds-dark-scrollbar-bg: #{$admin-sidebar-active-bg};
   --ds-dark-scrollbar-alt-bg: #{lighten($admin-sidebar-active-bg, 2%)};
   --ds-dark-scrollbar-fg: #47495d;
+  --ds-dark-scrollbar-width: 8px;
 
   --ds-submission-sections-margin-bottom: .5rem;
 
@@ -69,9 +80,6 @@
 
   --ds-fa-fixed-width: #{$fa-fixed-width};
   --ds-icon-padding: #{$icon-padding};
-  --ds-collapsed-sidebar-width: #{$collapsed-sidebar-width};
-  --ds-sidebar-items-width: #{$sidebar-items-width};
-  --ds-total-sidebar-width: #{$total-sidebar-width};
 
   --ds-top-footer-bg: #{$gray-200};
   --ds-footer-bg: #{theme-color('primary')};
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 584d9269d1..2c6088a504 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -33,11 +33,6 @@ body {
     margin: 0;
 }
 
-ds-admin-sidebar {
-    position: fixed;
-    z-index: var(--ds-sidebar-z-index);
-}
-
 .sticky-top {
     z-index: 0;
 }
diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss
index ae9e6082f5..eb39b8c786 100644
--- a/src/styles/_mixins.scss
+++ b/src/styles/_mixins.scss
@@ -14,7 +14,7 @@
 
 @mixin dark-scrollbar() {
     &::-webkit-scrollbar {
-        width: 8px;
+        width: var(--ds-dark-scrollbar-width);
         height: 3px;
     }
     &::-webkit-scrollbar-button {
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
index 8c10efcb42..5f51689df8 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,3 +1,9 @@
-<div [class.open]="!(isNavBarCollapsed | async)" id="header-navbar-wrapper">
+<div id="header-navbar-wrapper"><!-- [class.open]="!(isNavBarCollapsed$ | async)" -->
   <ds-themed-header></ds-themed-header>
+  <!-- Collapsible navbar (mobile only) -->
+  <div *ngIf="(isMobile$ | async)" id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+    <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
+      <ds-themed-navbar></ds-themed-navbar>
+    </nav>
+  </div>
 </div>
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index 1daf4ebdbc..5b3ac00077 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -1,7 +1,91 @@
 :host {
-  // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index
-  position: relative;
+  --ds-header-navbar-border-bottom-style: solid var(--ds-header-navbar-border-bottom-height) var(--ds-header-navbar-border-bottom-color);
+  --ds-mobile-navbar-border-top-style: solid var(--ds-mobile-navbar-border-top-height) var(--ds-mobile-navbar-border-top-color);
+  --ds-collapsible-navbar-height: calc(100vh - var(--ds-header-height));
+
   div#header-navbar-wrapper {
-    border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid;
+    // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index
+    position: relative; // required by the mobile collapsible navbar
+    border-bottom: var(--ds-header-navbar-border-bottom-style); // gets covered by mobile navbar wrapper, when open
+
+    div#mobile-navbar-wrapper {
+      width: 100%;
+      background-color: var(--ds-expandable-navbar-bg);
+      position: absolute;
+      z-index: var(--ds-nav-z-index);
+      overflow: hidden;
+
+      nav#collapsible-mobile-navbar {
+        // Following parameters are changed by slideMobileNav animation
+        min-height: var(--ds-collapsible-navbar-height);
+        height: auto;
+        border-bottom: var(--ds-header-navbar-border-bottom-style);
+      }
+    }
+  }
+
+  /* MENU ITEMS */
+
+  ::ng-deep {
+    .ds-menu-item, .ds-menu-toggler-wrapper {
+      white-space: nowrap;
+      text-decoration: none;
+    }
+
+    nav#desktop-navbar ::ng-deep {
+
+      // desktop menu
+      .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
+        // fill navbar height (required by dropdown menus) and center content
+        display: flex;
+        align-items: center;
+        height: 100%;
+      }
+      .ds-menu-item {
+        padding: 0.5rem;
+      }
+      .ds-menu-item, .ds-menu-toggler-wrapper {
+        color: var(--ds-navbar-link-color) !important;
+        &:hover, &:focus {
+          color: var(--ds-navbar-link-color-hover) !important;
+        }
+      }
+
+      // desktop submenu
+      .dropdown-menu {
+        .ds-menu-item {
+        }
+      }
+
+    }
+
+    nav#collapsible-mobile-navbar {
+
+      border-top: var(--ds-mobile-navbar-border-top-style);
+      padding-top: var(--ds-mobile-navbar-padding-top);
+
+      ::ng-deep {
+
+        // mobile menu
+        .ds-menu-item {
+          padding: 0.25rem 0;
+        }
+
+        .ds-menu-item, .ds-menu-toggler-wrapper {
+          color: var(--ds-expandable-navbar-link-color) !important;
+
+          &:hover, &:focus {
+            color: var(--ds-expandable-navbar-link-color-hover) !important;
+          }
+        }
+
+        // mobile submenu
+        .dropdown-menu {
+          .ds-menu-item {
+          }
+        }
+
+      }
+    }
   }
 }
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 36e23e174a..ef7d38028a 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
+import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
@@ -8,6 +9,7 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h
   selector: 'ds-header-navbar-wrapper',
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
+  animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index 205abfd463..656a076e37 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,25 +1,34 @@
-<header class="header">
-  <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="container navbar navbar-expand-md px-0">
-    <div class="d-flex flex-grow-1">
-      <a class="navbar-brand m-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
+<header id="main-site-header">
+  <div class="container h-100 d-flex flex-row flex-nowrap justify-content-between gapx-3">
+    <!-- Logo and navbar wrapper -->
+    <div id="header-left"
+         [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
+         [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
+         class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
+      <a class="d-block" routerLink="/home" [attr.aria-label]="'home.title' | translate">
+        <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
+      <nav *ngIf="!(isMobile$ | async)" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
+        <ds-themed-navbar></ds-themed-navbar>
+      </nav>
     </div>
-    <div class="navbar-buttons d-flex flex-grow-1 ml-auto justify-content-end align-items-center gapx-1">
+    <!-- Search bar and other menus -->
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1">
       <ds-themed-search-navbar></ds-themed-search-navbar>
-      <ds-themed-lang-switch></ds-themed-lang-switch>
-      <ds-context-help-toggle></ds-context-help-toggle>
-      <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
-      <ds-impersonate-navbar></ds-impersonate-navbar>
-      <div class="pl-2">
-        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
-                aria-controls="collapsingNav"
-                aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+      <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
+        <ds-themed-lang-switch></ds-themed-lang-switch>
+        <ds-context-help-toggle></ds-context-help-toggle>
+        <ds-impersonate-navbar></ds-impersonate-navbar>
+        <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
+      </div>
+
+      <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
+        <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
+                [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="!(isNavBarCollapsed$ | async)">
+          <span class="fas fa-bars fa-fw fa-xl" aria-hidden="true"></span>
         </button>
       </div>
-    </div>
-  </nav>
-  <ds-themed-navbar></ds-themed-navbar>
 
+    </div>
+  </div>
 </header>
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
index 2fc857826f..2e1064b75c 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -1,26 +1,19 @@
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  nav.navbar {
-    display: none;
-  }
-  .header {
+:host {
+  #main-site-header {
+    height: var(--ds-header-height);
     background-color: var(--ds-header-bg);
   }
-}
 
-.navbar-brand img {
-  @media screen and (max-width: map-get($grid-breakpoints, md)) {
-    height: var(--ds-header-logo-height-xs);
+  img#header-logo {
+    height: 40px;
   }
-}
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
 
-.navbar-toggler {
-  color: var(--ds-header-icon-color);
+  button#navbar-toggler {
+    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/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
index 6da89b47d5..98768d8b26 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,5 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
+import { Observable } from 'rxjs';
 
 /**
  * Represents the header with the logo and simple navigation
@@ -9,5 +10,11 @@ import { HeaderComponent as BaseComponent } from '../../../../app/header/header.
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
 })
-export class HeaderComponent extends BaseComponent {
+export class HeaderComponent extends BaseComponent implements OnInit {
+  public isNavBarCollapsed$: Observable<boolean>;
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.isNavBarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
+  }
 }
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 9f7e977961..ac4424c638 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,26 +1,9 @@
-<nav [ngClass]="{'open': !(menuCollapsed | async)}" [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-  class="navbar navbar-expand-md navbar-light p-0 navbar-container" role="navigation" [attr.aria-label]="'nav.main.description' | translate">
-  <div class="navbar-inner-container w-100 h-100" [class.container]="!(isXsOrSm$ | async)">
-    <a class="navbar-brand my-2" routerLink="/home">
-      <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate" />
-    </a>
-
-    <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
-        <li *ngIf="(isXsOrSm$ | async) && (isAuthenticated$ | async)">
-            <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
-        </li>
-        <li *ngFor="let section of (sections | async)">
-          <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-        </li>
-      </ul>
-    </div>
-    <div class="navbar-buttons d-flex align-items-center gapx-1">
-      <ds-themed-search-navbar class="navbar-collapsed"></ds-themed-search-navbar>
-      <ds-themed-lang-switch class="navbar-collapsed"></ds-themed-lang-switch>
-      <ds-context-help-toggle class="navbar-collapsed"></ds-context-help-toggle>
-      <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
-      <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
-    </div>
-  </div>
-</nav>
+<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+  <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
+</ng-container>
+<ul class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
+  <ng-container *ngFor="let section of (sections | async)">
+    <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  </ng-container>
+</ul>
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index f1f17d9f76..32c65c8c97 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,65 +1,3 @@
-nav.navbar {
-  align-items: baseline;
+:host {
 
-  .navbar-inner-container {
-    border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-  }
-}
-
-.navbar-nav {
-  background-color: var(--ds-navbar-bg);
-}
-
-/** Mobile menu styling **/
-@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-  .navbar {
-    width: 100vw;
-    background-color: var(--bs-white);
-    position: absolute;
-    overflow: hidden;
-    height: 0;
-    z-index: var(--ds-nav-z-index);
-    &.open {
-      height: 100vh; //doesn't matter because wrapper is sticky
-      border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border
-    }
-  }
-}
-
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  .reset-padding-md {
-    margin-left: calc(var(--bs-spacer) / -2);
-    margin-right: calc(var(--bs-spacer) / -2);
-  }
-}
-
-/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
-.navbar-expand-md.navbar-container {
-  @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
-    > .navbar-inner-container {
-      padding: 0 var(--bs-spacer);
-      a.navbar-brand {
-        display: none;
-      }
-      .navbar-collapsed {
-        display: none;
-      }
-    }
-    padding: 0;
-  }
-  height: 80px;
-}
-
-a.navbar-brand img {
-  max-height: var(--ds-header-logo-height);
-}
-
-.navbar-nav ::ng-deep {
-  a.nav-link, .btn.nav-link {
-    color: var(--ds-navbar-link-color);
-
-    &:hover, &:focus {
-      color: var(--ds-navbar-link-color-hover);
-    }
-  }
 }
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 516eff9f7e..6315acc3fa 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -1,11 +1,29 @@
 // Override or add CSS variables for your theme here
 
 :root {
-  --ds-header-logo-height: 40px;
+
+  @include media-breakpoint-up(md) {
+    --ds-header-logo-height: 40px;
+    --ds-header-height: 80px;
+  }
+  @include media-breakpoint-down(sm) {
+    --ds-header-logo-height: 50px;
+    --ds-header-height: 90px;
+  }
+
   --ds-banner-text-background: rgba(0, 0, 0, 0.45);
   --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};
+  --ds-header-navbar-border-bottom-height: 5px;
+
+  /* set the next two properties as `--ds-header-navbar-border-bottom-*`
+  in order to keep the bottom border of the header when navbar is expanded */
+  --ds-mobile-navbar-border-top-color: #{$white};
+  --ds-mobile-navbar-border-top-height: 0;
+  --ds-mobile-navbar-padding-top: 0;
 }
 

From 510968b0c62be590c11b3ff62a4678ddb29872fb Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Wed, 13 Dec 2023 22:49:16 +0100
Subject: [PATCH 0120/1286] [DURACOM-195] [DURACOM-210] Reorder SCSS and CSS
 theme variables

---
 src/styles/_bootstrap_variables.scss          | 122 ++++++++++++------
 src/styles/_bootstrap_variables_mapping.scss  |  12 +-
 src/styles/_custom_variables.scss             |  61 ++++-----
 .../styles/_theme_css_variable_overrides.scss |   5 -
 .../_theme_sass_variable_overrides.scss       | 103 +++++++++++----
 5 files changed, 188 insertions(+), 115 deletions(-)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 70bf270c06..0c023d5d2a 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -1,13 +1,19 @@
-/** Help Variables **/
-$fa-fixed-width: 1.25rem !default;
-$icon-padding: 1rem !default;
+// DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
+// variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
 
-/* Fonts */
-// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
-// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
-$fa-font-path: "^assets/fonts" !default;
-/* Images */
-$image-path: "../assets/images" !default;
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// If you want to change the 'dspace' or the 'custom' theme you should not edit this file, and you should edit
+// _theme_sass_variable_overrides.scss in the theme folder.
+
+// All SASS variables that are declared must have the '!default' flag, otherwise it won't be possible
+// to override them in custom themes.
+
+
+/*** FONT FAMILIES AND FONT SIZES ***/
 
 $font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
 $h1-font-size: $font-size-base * 2.125 !default;
@@ -17,48 +23,80 @@ $h4-font-size: $font-size-base * 1.25 !default;
 $h5-font-size: $font-size-base * 1.125 !default;
 $h6-font-size: $font-size-base !default;
 
+
+/*** BOOTSTRAP OPTIONS ***/
+
 // enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
-$enable-responsive-font-sizes: true;
+$enable-responsive-font-sizes: true !default;
+$enable-shadows: true !default;
 
-/** Bootstrap Variables **/
-/* Colors */
-$gray-700: #495057 !default;  // Bootstrap $gray-700
-$gray-100: #f8f9fa !default;  //           $gray-100
 
-/* Reassign color vars to semantic color scheme */
-$blue:   #2B4E72 !default;
-$green:  #94BA65 !default;
-$cyan:   #006666 !default;
-$yellow: #ec9433 !default;
-$red:    #CF4444 !default;
-$teal:   #1F7293 !default;
-$dark:   darken($blue, 17%) !default;
+/*** SEMANTIC COLOR SCHEME ***/
 
-$theme-colors: (
-        primary: $blue,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
-/* Fonts */
-$link-color: $teal !default;
+// Override semantic colors
+$primary:   #2b4e72 !default;               // Blue gray
+$secondary: #495057 !default;               // As Bootstrap $gray-700
+$success:   #94ba65 !default;               // Lime
+$info:      #006666 !default;               // Blue green
+$warning:   #ec9433 !default;               // Orange
+$danger:    #cf4444 !default;               // Red
+$light:     #f8f9fa !default;               // As Bootstrap $gray-100
+$dark:      darken(#2b4e72, 17%) !default;  // Blue gray (darker)
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+$link-color: #1F7293 !default;
+$link-hover-color: darken($link-color, 15%) !default;
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 165 !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
 $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-dark-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-light-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 
-$enable-shadows: true !default;
 
-$yiq-contrasted-threshold:  165 !default;
+/*** CUSTOM DSPACE VARIABLES ***/
 
-$primary-bg: #{lighten(map-get($theme-colors, primary), 30%)} !default;
-$secondary-bg: #{lighten(map-get($theme-colors, secondary), 30%)} !default;
-$success-bg: #{lighten(map-get($theme-colors, success), 30%)} !default;
-$info-bg: #{lighten(map-get($theme-colors, info), 30%)} !default;
-$warning-bg: #{lighten(map-get($theme-colors, warning), 30%)} !default;
-$danger-bg: #{lighten(map-get($theme-colors, danger), 30%)} !default;
+$ds-home-news-link-color: $link-color !default;
+$ds-home-news-link-hover-color: darken($ds-home-news-link-color, 15%) !default;
+$ds-breadcrumb-link-color: #003333 !default;
+$ds-breadcrumb-link-active-color: #040D11 !default;
+
+$ds-header-navbar-border-top-color: #fff !default;
+$ds-header-navbar-border-bottom-color: #ced4da !default;
+
+$ds-header-bg: #fff !default;
+$ds-header-icon-color: $link-color !default;
+$ds-header-icon-color-hover: $link-hover-color !default;
+
+$ds-navbar-bg: #fff !default;
+$ds-navbar-dropdown-bg: #fff !default;
+$ds-expandable-navbar-bg: #fff !default;
+$ds-navbar-link-color: $link-color !default;
+$ds-navbar-link-color-hover: #{darken($ds-navbar-link-color, 15%)} !default;
+
+$ds-slider-color: $success !default;
+
+$ds-admin-sidebar-bg: darken(#2b4e72, 17%) !default;
+$ds-admin-sidebar-active-bg: darken($ds-admin-sidebar-bg, 3%) !default;
+$ds-admin-sidebar-fg: #47495d !default;
+$ds-admin-sidebar-fixed-element-width: 55px !default;
+$ds-admin-sidebar-collapsible-element-width: 250px !default;
+$ds-admin-sidebar-total-width: $ds-admin-sidebar-fixed-element-width + $ds-admin-sidebar-collapsible-element-width; // do not change/override
+
+$ds-primary-bg: #{lighten($primary, 30%)} !default;
+$ds-secondary-bg: #{lighten($secondary, 30%)} !default;
+$ds-success-bg: #{lighten($success, 30%)} !default;
+$ds-info-bg: #{lighten($info, 30%)} !default;
+$ds-warning-bg: #{lighten($warning, 30%)} !default;
+$ds-danger-bg: #{lighten($danger, 30%)} !default;
+
+
+/*** MISC ***/
+
+// Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
+// See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
+$fa-font-path: "^assets/fonts" !default;
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 16719f9919..04ed5a7850 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -29,17 +29,17 @@
   --bs-teal: #{$teal};
   --bs-cyan: #{$cyan};
   --bs-primary: #{$primary};
-  --bs-primary-bg: #{$primary-bg};
+  --bs-primary-bg: #{$ds-primary-bg};
   --bs-secondary: #{$secondary};
-  --bs-secondary-bg: #{$secondary-bg};
+  --bs-secondary-bg: #{$ds-secondary-bg};
   --bs-success: #{$success};
-  --bs-success-bg: #{$success-bg};
+  --bs-success-bg: #{$ds-success-bg};
   --bs-info: #{$info};
-  --bs-info-bg: #{$info-bg};
+  --bs-info-bg: #{$ds-info-bg};
   --bs-warning: #{$warning};
-  --bs-warning-bg: #{$warning-bg};
+  --bs-warning-bg: #{$ds-warning-bg};
   --bs-danger: #{$danger};
-  --bs-danger-bg: #{$danger-bg};
+  --bs-danger-bg: #{$ds-danger-bg};
   --bs-light: #{$light};
   --bs-dark: #{$dark};
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 3964131f06..a08b39aa87 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -19,17 +19,18 @@
   --ds-footer-z-index: 0;
   --ds-sidebar-z-index: 20;
 
-  --ds-header-bg: #{$white};
-  --ds-header-icon-color: #{$link-color};
-  --ds-header-icon-color-hover: #{$link-hover-color};
-  --ds-navbar-bg: var(--ds-header-bg);
-  --ds-header-navbar-border-top-color: #{$white};
-  --ds-header-navbar-border-bottom-color: #{$gray-400};
-  --ds-navbar-link-color: #{$cyan};
-  --ds-navbar-link-color-hover: #{darken($cyan, 15%)};
-  --ds-expandable-navbar-bg: var(--ds-navbar-bg);
-  --ds-expandable-navbar-link-color: var(--ds-navbar-link-color);
-  --ds-expandable-navbar-link-color-hover: var(--ds-navbar-link-color-hover);
+  --ds-header-bg: #{$ds-header-bg};
+  --ds-header-icon-color: #{$ds-header-icon-color};
+  --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
+  --ds-navbar-bg: #{$ds-navbar-bg};
+  --ds-navbar-dropdown-bg: #{$ds-navbar-dropdown-bg};
+  --ds-header-navbar-border-top-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-navbar-link-color: #{$ds-navbar-link-color};
+  --ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
+  --ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
+  --ds-expandable-navbar-link-color: #{$ds-navbar-link-color};
+  --ds-expandable-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
 
   @include media-breakpoint-up(md) {
     --ds-header-logo-height: 50px;
@@ -38,25 +39,19 @@
     --ds-header-logo-height: 50px;
   }
 
-  $admin-sidebar-bg: darken(#2B4E72, 17%);
-  $admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
-  $admin-sidebar-fixed-element-width: 55px !default;
-  $admin-sidebar-collapsible-element-width: 250px !default;
-  $admin-sidebar-total-width: $admin-sidebar-fixed-element-width + $admin-sidebar-collapsible-element-width !default;
-
-  --ds-admin-sidebar-bg: #{$admin-sidebar-bg};
-  --ds-admin-sidebar-active-bg: #{$admin-sidebar-active-bg};
-  --ds-admin-sidebar-header-bg: #{darken($admin-sidebar-bg, 7%)};
-  --ds-admin-sidebar-fixed-element-width: #{$admin-sidebar-fixed-element-width};
+  --ds-admin-sidebar-bg: #{$ds-admin-sidebar-bg};
+  --ds-admin-sidebar-active-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-admin-sidebar-header-bg: #{darken($ds-admin-sidebar-bg, 7%)};
+  --ds-admin-sidebar-fixed-element-width: #{$ds-admin-sidebar-fixed-element-width};
   --ds-admin-sidebar-fixed-element-z-index: 10;
-  --ds-admin-sidebar-collapsible-element-width: #{$admin-sidebar-collapsible-element-width};
-  --ds-admin-sidebar-total-width: #{$admin-sidebar-total-width};
+  --ds-admin-sidebar-collapsible-element-width: #{$ds-admin-sidebar-collapsible-element-width};
+  --ds-admin-sidebar-total-width: #{$ds-admin-sidebar-total-width};
   --ds-admin-sidebar-link-color: #{$navbar-dark-color};
   --ds-admin-sidebar-link-hover-color: #{$navbar-dark-hover-color};
 
-  --ds-dark-scrollbar-bg: #{$admin-sidebar-active-bg};
-  --ds-dark-scrollbar-alt-bg: #{lighten($admin-sidebar-active-bg, 2%)};
-  --ds-dark-scrollbar-fg: #47495d;
+  --ds-dark-scrollbar-bg: #{$ds-admin-sidebar-active-bg};
+  --ds-dark-scrollbar-alt-bg: #{lighten($ds-admin-sidebar-active-bg, 2%)};
+  --ds-dark-scrollbar-fg: #{$ds-admin-sidebar-fg};
   --ds-dark-scrollbar-width: 8px;
 
   --ds-submission-sections-margin-bottom: .5rem;
@@ -78,9 +73,6 @@
   --ds-notification-bg-info: #{darken(adjust-hue($info, -10), 10%)};
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
 
-  --ds-fa-fixed-width: #{$fa-fixed-width};
-  --ds-icon-padding: #{$icon-padding};
-
   --ds-top-footer-bg: #{$gray-200};
   --ds-footer-bg: #{theme-color('primary')};
   --ds-footer-border: 1px solid var(--bs-gray-400);
@@ -88,17 +80,16 @@
   --ds-footer-padding-bottom: 0;
   --ds-footer-logo-height: 50px;
 
-  $home-news-link-color: $cyan;
-  --ds-home-news-link-color: #{$home-news-link-color};
-  --ds-home-news-link-hover-color: #{darken($home-news-link-color, 15%)};
+  --ds-home-news-link-color: #{$ds-home-news-link-color};
+  --ds-home-news-link-hover-color: #{darken($ds-home-news-link-color, 15%)};
   --ds-home-news-background-color: #{$gray-200};
 
   --ds-breadcrumb-bg: #{$gray-200} !important;
-  --ds-breadcrumb-link-color: #{darken($cyan, 10%)};
-  --ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
+  --ds-breadcrumb-link-color: #{$ds-breadcrumb-link-color};
+  --ds-breadcrumb-link-active-color: #{$ds-breadcrumb-link-active-color};
   --ds-breadcrumb-max-length: 200px;
 
-  --ds-slider-color: #{darken($green, 20%)};
+  --ds-slider-color: #{$ds-slider-color};
   --ds-slider-handle-width: 18px;
   --ds-slider-handle-color: #{darken($blue, 17%)};
 
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 6315acc3fa..b8e0b3e2e9 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -14,10 +14,6 @@
   --ds-banner-text-background: rgba(0, 0, 0, 0.45);
   --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};
   --ds-header-navbar-border-bottom-height: 5px;
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
@@ -26,4 +22,3 @@
   --ds-mobile-navbar-border-top-height: 0;
   --ds-mobile-navbar-padding-top: 0;
 }
-
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index aaa27f6f9e..b754a0cfa9 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -1,41 +1,90 @@
 // DSpace works with CSS variables for its own components, and has a mapping of all bootstrap Sass
 // variables to CSS equivalents (see src/styles/_bootstrap_variables_mapping.scss). However Bootstrap
-// still uses Sass variables internally. So if you want to override bootstrap (or other sass
-// variables) you can do so here. Their CSS counterparts will include the changes you make here
+// still uses Sass variables internally. So if you want to override Bootstrap (or other sass
+// variables) you can do so here. Their CSS counterparts will include the changes you make here.
+
+// When this file is going to be compiled, internal Bootstrap variables won't have been declared yet,
+// therefore if you want to use any Bootstrap variable you also need to declare it here.
+
+// All SASS variables from the base theme are also included here. Do not use the '!default' flag
+// here if you want to override them.
+
+
+/*** FONT FAMILIES ***/
 
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap');
 
 $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 
-$navbar-dark-color: #FFFFFF;
 
-/* Reassign color vars to semantic color scheme */
-$blue: #2b4e72 !default;
-$green: #92C642 !default;
-$cyan: #1e6f90 !default;
-$yellow: #ec9433 !default;
-$red: #CF4444 !default;
-$dark: #43515f !default;
+/*** SEMANTIC COLOR SCHEME ***/
 
-$gray-800: #343a40 !default;
-$gray-700: #495057 !default;
-$gray-400: #ced4da !default;
-$gray-100: #f8f9fa !default;
+// Gray scale (uncomment the variables that you want to override or that you need to use in this file)
+//$white:    #fff;
+//$gray-100: #f8f9fa;
+//$gray-200: #e9ecef;
+//$gray-300: #dee2e6;
+//$gray-400: #ced4da;
+//$gray-500: #adb5bd;
+//$gray-600: #6c757d;
+//$gray-700: #495057;
+//$gray-800: #343a40;
+//$gray-900: #212529;
+//$black:    #000;
 
-$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+// Other colors (uncomment the variables that you want to override or that you need to use in this file)
+//$blue:    #007bff !default;
+//$indigo:  #6610f2 !default;
+//$purple:  #6f42c1 !default;
+//$pink:    #e83e8c !default;
+//$red:     #dc3545 !default;
+//$orange:  #fd7e14 !default;
+//$yellow:  #ffc107 !default;
+//$green:   #28a745 !default;
+//$teal:    #20c997 !default;
+//$cyan:    #17a2b8 !default;
 
-$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
-$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
+// Override semantic colors here
+$primary:   #43515f;  // Gray
+$secondary: #495057;  // As Bootstrap $gray-700
+$success:   #92c642;  // Lime
+$info:      #207698;  // Light blue
+$warning:   #ec9433;  // Orange
+$danger:    #cf4444;  // Red
+$light:     #f8f9fa;  // As Bootstrap $gray-100
+$dark:      #43515f;  // Dark blue
 
-$yiq-contrasted-threshold:  170 !default;
+// Define or override other colors here
+// ...
 
+// Add new semantic colors here (you don't need to add existing semantic colors)
 $theme-colors: (
-        primary: $dark,
-        secondary: $gray-700,
-        success: $green,
-        info: $cyan,
-        warning: $yellow,
-        danger: $red,
-        light: $gray-100,
-        dark: $dark
-) !default;
+  // ...
+);
+
+
+/*** OTHER BOOTSTRAP VARIABLES ***/
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+$yiq-contrasted-threshold: 170;
+
+$body-color: #343a40;       // As Bootstrap $gray-800
+
+$link-color: #207698;       // Blue green, as DSpace $info
+$link-decoration: none;
+$link-hover-color: darken($link-color, 15%);
+$link-hover-decoration: underline;
+
+$table-accent-bg: #f8f9fa;  // As Bootstrap $gray-100
+$table-hover-bg: #ced4da;   // As Bootstrap $gray-400
+
+$navbar-dark-color: #fff;
+
+
+/*** CUSTOM DSPACE VARIABLES ***/
+
+$ds-home-news-link-color: #92c642;
+$ds-header-navbar-border-bottom-color: #92c642;
+
+$ds-breadcrumb-link-color: #154E66 !default;
+$ds-breadcrumb-link-active-color: #040D11 !default;

From 5b1438f09faaf4f6e6f73e2f37d6d9a5afee7d4f Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Thu, 18 Jan 2024 18:38:55 +0100
Subject: [PATCH 0121/1286] [DURACOM-195] accessibility issue fixed on log-out
 button

(cherry picked from commit 8f73b8ff9d6ec426f51cb8a5a6694b9afb265781)
---
 src/app/admin/admin-sidebar/admin-sidebar.component.html | 3 ++-
 src/app/shared/log-out/log-out.component.html            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 26f2adfe39..0179b27404 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -39,8 +39,9 @@
 
   <!-- TOGGLER -->
 
-  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container" aria-hidden="true">
+  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
     <a class="sidebar-section-wrapper sidebar-full-width-container"
+       id="sidebar-collapse-toggle"
        href="javascript:void(0);"
        (click)="toggle($event)"
        (keyup.space)="toggle($event)"
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 83e58b3841..26f03b95a4 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -2,5 +2,5 @@
 
   <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
 
-  <button class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button role="menuitem" class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>

From bb1698302976246c73836a6b91e7788a62b0a7b2 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Tue, 23 Jan 2024 00:08:57 +0100
Subject: [PATCH 0122/1286] [DURACOM-195] fix issue with event handling in
 expandable admin sidebar section

(cherry picked from commit f25ec6210b33752dfa039a8dc1bece43f864cbea)
---
 cypress/e2e/collection-edit.cy.ts                               | 2 +-
 .../expandable-admin-sidebar-section.component.html             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
index 3e7ecf6141..63d873db3e 100644
--- a/cypress/e2e/collection-edit.cy.ts
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -45,7 +45,7 @@ describe('Edit Collection > Content Source tab', () => {
         cy.get('#externalSourceCheck').check();
 
         // Wait for the source controls to appear
-        cy.get('ds-collection-source-controls').should('be.visible');
+        // cy.get('ds-collection-source-controls').should('be.visible');
 
         // Analyze entire page for accessibility issues
         testA11y('ds-collection-source');
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 303b1400f4..cb8b87cfa2 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -12,7 +12,6 @@
      [class.disabled]="section.model?.disabled"
      (click)="toggleSection($event)"
      (keyup.space)="toggleSection($event)"
-     (keyup.enter)="toggleSection($event)"
      href="javascript:void(0);"
   >
     <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">

From 2f5c3b12673e1777504abdb62d3af74d55e49d5a Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Wed, 24 Jan 2024 18:07:25 +0100
Subject: [PATCH 0123/1286] [DURACOM-195] fix comment

(cherry picked from commit 80cc4c5d9a521e3dbe98bd508a08d395ea836537)
---
 .../dspace/styles/_theme_sass_variable_overrides.scss     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index b754a0cfa9..17155b15a1 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -44,6 +44,9 @@ $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI"
 //$teal:    #20c997 !default;
 //$cyan:    #17a2b8 !default;
 
+// Define or override other colors here
+// ...
+
 // Override semantic colors here
 $primary:   #43515f;  // Gray
 $secondary: #495057;  // As Bootstrap $gray-700
@@ -52,10 +55,7 @@ $info:      #207698;  // Light blue
 $warning:   #ec9433;  // Orange
 $danger:    #cf4444;  // Red
 $light:     #f8f9fa;  // As Bootstrap $gray-100
-$dark:      #43515f;  // Dark blue
-
-// Define or override other colors here
-// ...
+$dark:      #43515f;  // Gray
 
 // Add new semantic colors here (you don't need to add existing semantic colors)
 $theme-colors: (

From 9518f70b4237c475456e15b6a09a4ef3e3cee710 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Fri, 2 Feb 2024 13:41:02 +0100
Subject: [PATCH 0124/1286] [DURACOM-195] misc fixes

(cherry picked from commit 87d3383bbaff352cd976d661d56f90d94f8f76a4)
---
 .../admin-sidebar.component.scss              | 16 ++++++++--------
 ...dable-admin-sidebar-section.component.scss |  2 +-
 src/app/header/header.component.html          |  2 +-
 src/app/header/header.component.scss          | 11 ++++++-----
 src/app/navbar/navbar.component.scss          |  2 +-
 .../user-menu/user-menu.component.scss        |  2 +-
 src/styles/_custom_variables.scss             | 19 +++++++++++++++++--
 .../header-navbar-wrapper.component.scss      | 17 ++++++++++-------
 .../dspace/app/header/header.component.html   |  2 +-
 .../dspace/app/header/header.component.scss   |  2 +-
 .../styles/_theme_css_variable_overrides.scss |  6 +++---
 11 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.scss b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
index c2f3279a8e..d3607ca625 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.scss
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.scss
@@ -35,7 +35,7 @@
     }
 
     img#admin-sidebar-logo {
-      width: 20px;
+      height: var(--ds-admin-sidebar-logo-height);
     }
 
     ::ng-deep {
@@ -43,17 +43,17 @@
       // This class must be applied to any nested wrapper containing a sidebar section
       .sidebar-full-width-container {
         width: 100%;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-        margin-left: 0 !important;
-        margin-right: 0 !important;
+        padding-left: 0;
+        padding-right: 0;
+        margin-left: 0;
+        margin-right: 0;
       }
 
       // This class must be applied to the innermost block element containing a section or subsection link
       // (it can be applied together with `sidebar-collapsible-element-inner-wrapper`)
       .sidebar-item {
-        padding-top: 1rem;
-        padding-bottom: 1rem;
+        padding-top: var(--ds-admin-sidebar-item-padding);
+        padding-bottom: var(--ds-admin-sidebar-item-padding);
       }
 
       // These classes handle the collapsing behavior
@@ -89,7 +89,7 @@
           & > .sidebar-collapsible-element-inner-wrapper {
             min-width: calc(var(--ds-admin-sidebar-collapsible-element-width) - var(--ds-dark-scrollbar-width));
             height: 100%;
-            padding-right: 16px !important;
+            padding-right: var(--ds-admin-sidebar-item-padding);
           }
         }
       }
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 937d996102..5e76813abb 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -4,7 +4,7 @@
     margin: 0;
     padding: 0;
     ::ng-deep .ds-menu-item {
-      margin-left: 12px;
+      margin-left: var(--ds-admin-sidebar-section-indent);
     }
   }
 
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 8ff76242cd..e98959d162 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -15,7 +15,7 @@
           <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
                   aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-            <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+            <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
           </button>
         </div>
       </nav>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index a37acf4ced..e002e0c347 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -8,11 +8,6 @@
     max-width: 100%;
   }
 
-  .navbar-toggler .navbar-toggler-icon {
-    background-image: none !important;
-    line-height: 1.5;
-  }
-
   .navbar-toggler {
     border: none;
     color: var(--ds-header-icon-color);
@@ -20,6 +15,12 @@
     &:hover, &:focus {
       color: var(--ds-header-icon-color-hover);
     }
+
+    .toggler-icon {
+      width: 1.5em;
+      height: 1.5em;
+      line-height: 1.5;
+    }
   }
 
   .navbar {
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index 23268b145f..b74408f0f5 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,5 +1,5 @@
 :host {
-  --ds-collapsible-navbar-height: auto;
+  --ds-expandable-navbar-height: auto;
 
   nav.navbar {
     background-color: var(--ds-navbar-bg);
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
index 1f33a321f0..9409580cd4 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
@@ -7,6 +7,6 @@
 
   .ds-menu-item {
     display: inline-block;
-    padding: 0.25rem 0;
+    padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-item-horizontal-padding);
   }
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index a08b39aa87..82b5fb28e2 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -22,15 +22,27 @@
   --ds-header-bg: #{$ds-header-bg};
   --ds-header-icon-color: #{$ds-header-icon-color};
   --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
+
   --ds-navbar-bg: #{$ds-navbar-bg};
+  --ds-navbar-item-vertical-padding: 0;
+  --ds-navbar-item-horizontal-padding: 0.25rem;
   --ds-navbar-dropdown-bg: #{$ds-navbar-dropdown-bg};
-  --ds-header-navbar-border-top-color: #{$ds-header-navbar-border-bottom-color};
-  --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-navbar-dropdown-item-vertical-padding: 0.5rem;
+  --ds-navbar-dropdown-item-horizontal-padding: 1rem;
   --ds-navbar-link-color: #{$ds-navbar-link-color};
   --ds-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
+
+  --ds-header-navbar-border-top-color: #{$ds-header-navbar-border-bottom-color};
+  --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
+
   --ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
   --ds-expandable-navbar-link-color: #{$ds-navbar-link-color};
   --ds-expandable-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
+  --ds-expandable-navbar-dropdown-item-vertical-padding: 0.25rem;
+  --ds-expandable-navbar-dropdown-item-horizontal-padding: 0;
+
+  --ds-user-menu-item-vertical-padding: 0.25rem;
+  --ds-user-menu-item-horizontal-padding: 0;
 
   @include media-breakpoint-up(md) {
     --ds-header-logo-height: 50px;
@@ -42,12 +54,15 @@
   --ds-admin-sidebar-bg: #{$ds-admin-sidebar-bg};
   --ds-admin-sidebar-active-bg: #{$ds-admin-sidebar-active-bg};
   --ds-admin-sidebar-header-bg: #{darken($ds-admin-sidebar-bg, 7%)};
+  --ds-admin-sidebar-logo-height: 20px;
   --ds-admin-sidebar-fixed-element-width: #{$ds-admin-sidebar-fixed-element-width};
   --ds-admin-sidebar-fixed-element-z-index: 10;
   --ds-admin-sidebar-collapsible-element-width: #{$ds-admin-sidebar-collapsible-element-width};
   --ds-admin-sidebar-total-width: #{$ds-admin-sidebar-total-width};
   --ds-admin-sidebar-link-color: #{$navbar-dark-color};
   --ds-admin-sidebar-link-hover-color: #{$navbar-dark-hover-color};
+  --ds-admin-sidebar-item-padding: 1rem;
+  --ds-admin-sidebar-section-indent: .75rem;
 
   --ds-dark-scrollbar-bg: #{$ds-admin-sidebar-active-bg};
   --ds-dark-scrollbar-alt-bg: #{lighten($ds-admin-sidebar-active-bg, 2%)};
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index 5b3ac00077..379b1234d7 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -1,7 +1,7 @@
 :host {
   --ds-header-navbar-border-bottom-style: solid var(--ds-header-navbar-border-bottom-height) var(--ds-header-navbar-border-bottom-color);
-  --ds-mobile-navbar-border-top-style: solid var(--ds-mobile-navbar-border-top-height) var(--ds-mobile-navbar-border-top-color);
-  --ds-collapsible-navbar-height: calc(100vh - var(--ds-header-height));
+  --ds-expandable-navbar-border-top-style: solid var(--ds-expandable-navbar-border-top-height) var(--ds-expandable-navbar-border-top-color);
+  --ds-expandable-navbar-height: calc(100vh - var(--ds-header-height));
 
   div#header-navbar-wrapper {
     // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index
@@ -17,7 +17,7 @@
 
       nav#collapsible-mobile-navbar {
         // Following parameters are changed by slideMobileNav animation
-        min-height: var(--ds-collapsible-navbar-height);
+        min-height: var(--ds-expandable-navbar-height);
         height: auto;
         border-bottom: var(--ds-header-navbar-border-bottom-style);
       }
@@ -42,7 +42,8 @@
         height: 100%;
       }
       .ds-menu-item {
-        padding: 0.5rem;
+        // define here the style for top-level navbar menu items
+        padding: var(--ds-navbar-item-vertical-padding) var(--ds-navbar-item-horizontal-padding);
       }
       .ds-menu-item, .ds-menu-toggler-wrapper {
         color: var(--ds-navbar-link-color) !important;
@@ -54,6 +55,8 @@
       // desktop submenu
       .dropdown-menu {
         .ds-menu-item {
+          // define here the style for second-level navbar menu items
+          padding: var(--ds-navbar-dropdown-item-vertical-padding) var(--ds-navbar-dropdown-item-horizontal-padding);
         }
       }
 
@@ -61,14 +64,14 @@
 
     nav#collapsible-mobile-navbar {
 
-      border-top: var(--ds-mobile-navbar-border-top-style);
-      padding-top: var(--ds-mobile-navbar-padding-top);
+      border-top: var(--ds-expandable-navbar-border-top-style);
+      padding-top: var(--ds-expandable-navbar-padding-top);
 
       ::ng-deep {
 
         // mobile menu
         .ds-menu-item {
-          padding: 0.25rem 0;
+          padding: var(--ds-expandable-navbar-dropdown-item-vertical-padding) var(--ds-expandable-navbar-dropdown-item-horizontal-padding);
         }
 
         .ds-menu-item, .ds-menu-toggler-wrapper {
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index 656a076e37..1ea91bc460 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -25,7 +25,7 @@
       <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
         <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
                 [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="!(isNavBarCollapsed$ | async)">
-          <span class="fas fa-bars fa-fw fa-xl" aria-hidden="true"></span>
+          <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
         </button>
       </div>
 
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
index 2e1064b75c..f61c442ff5 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -5,7 +5,7 @@
   }
 
   img#header-logo {
-    height: 40px;
+    height: var(--ds-header-logo-height);
   }
 
   button#navbar-toggler {
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index b8e0b3e2e9..d016ff4032 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -18,7 +18,7 @@
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
   in order to keep the bottom border of the header when navbar is expanded */
-  --ds-mobile-navbar-border-top-color: #{$white};
-  --ds-mobile-navbar-border-top-height: 0;
-  --ds-mobile-navbar-padding-top: 0;
+  --ds-expandable-navbar-border-top-color: #{$white};
+  --ds-expandable-navbar-border-top-height: 0;
+  --ds-expandable-navbar-padding-top: 0;
 }

From 8efc401811eec95cd75cb839d380a1d82438f76a Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Fri, 2 Feb 2024 13:45:48 +0100
Subject: [PATCH 0125/1286] [DURACOM-195] fix prefix of custom CSS variables

(cherry picked from commit 46fe7f63e316c7e14ff41e05dfcbbbf39567faf1)
---
 .../dso-edit-metadata-shared/dso-edit-metadata-cells.scss | 6 +++---
 .../dso-edit-metadata-value.component.scss                | 2 +-
 .../dso-edit-metadata/dso-edit-metadata.component.scss    | 2 +-
 src/styles/_bootstrap_variables_mapping.scss              | 6 ------
 src/styles/_custom_variables.scss                         | 8 ++++++++
 5 files changed, 13 insertions(+), 11 deletions(-)

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
index 20d479ac88..29b93f3150 100644
--- 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
@@ -24,7 +24,7 @@
   }
 
   &.ds-warning {
-    background-color: var(--bs-warning-bg);
+    background-color: var(--ds-warning-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-warning);
@@ -32,7 +32,7 @@
   }
 
   &.ds-danger {
-    background-color: var(--bs-danger-bg);
+    background-color: var(--ds-danger-bg);
 
     .ds-flex-cell {
       border: 1px solid var(--bs-danger);
@@ -40,7 +40,7 @@
   }
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-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.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index 4a207ee1a4..e555191300 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
@@ -1,5 +1,5 @@
 .ds-success {
-  background-color: var(--bs-success-bg);
+  background-color: var(--ds-success-bg);
   border: 1px solid var(--bs-success);
 }
 
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 4e5e9ff1d4..3a181fd130 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
@@ -7,7 +7,7 @@
   border: 1px solid var(--bs-gray-200);
 
   &.ds-success {
-    background-color: var(--bs-success-bg);
+    background-color: var(--ds-success-bg);
     border: 1px solid var(--bs-success);
   }
 }
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 04ed5a7850..5a64be7e2a 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -29,17 +29,11 @@
   --bs-teal: #{$teal};
   --bs-cyan: #{$cyan};
   --bs-primary: #{$primary};
-  --bs-primary-bg: #{$ds-primary-bg};
   --bs-secondary: #{$secondary};
-  --bs-secondary-bg: #{$ds-secondary-bg};
   --bs-success: #{$success};
-  --bs-success-bg: #{$ds-success-bg};
   --bs-info: #{$info};
-  --bs-info-bg: #{$ds-info-bg};
   --bs-warning: #{$warning};
-  --bs-warning-bg: #{$ds-warning-bg};
   --bs-danger: #{$danger};
-  --bs-danger-bg: #{$ds-danger-bg};
   --bs-light: #{$light};
   --bs-dark: #{$dark};
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 82b5fb28e2..3631fa7e29 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -124,4 +124,12 @@
 
   --ds-comcol-logo-max-width: 500px;
   --ds-comcol-logo-max-height: 500px;
+
+  --ds-primary-bg: #{$ds-primary-bg};
+  --ds-secondary-bg: #{$ds-secondary-bg};
+  --ds-success-bg: #{$ds-success-bg};
+  --ds-info-bg: #{$ds-info-bg};
+  --ds-warning-bg: #{$ds-warning-bg};
+  --ds-danger-bg: #{$ds-danger-bg};
+
 }

From a9c3008cee51c76c96e77691a71db99783a2a336 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Wed, 14 Feb 2024 12:05:55 +0100
Subject: [PATCH 0126/1286] [DURACOM-195] fixes

(cherry picked from commit 523850bc45ed640d3331e07932d9eae8785d33c6)
---
 .../navbar-section.component.scss             |  5 -----
 .../header-navbar-wrapper.component.scss      | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/app/navbar/navbar-section/navbar-section.component.scss b/src/app/navbar/navbar-section/navbar-section.component.scss
index 1cda7dcf9e..e69de29bb2 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.scss
+++ b/src/app/navbar/navbar-section/navbar-section.component.scss
@@ -1,5 +0,0 @@
-:host {
-  li.ds-menu-item-wrapper {
-
-  }
-}
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index 379b1234d7..cabad27a5d 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -34,7 +34,8 @@
 
     nav#desktop-navbar ::ng-deep {
 
-      // desktop menu
+      /* Desktop menu */
+
       .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
         // fill navbar height (required by dropdown menus) and center content
         display: flex;
@@ -52,7 +53,8 @@
         }
       }
 
-      // desktop submenu
+      /* desktop submenu */
+
       .dropdown-menu {
         .ds-menu-item {
           // define here the style for second-level navbar menu items
@@ -69,7 +71,8 @@
 
       ::ng-deep {
 
-        // mobile menu
+        /* mobile menu */
+
         .ds-menu-item {
           padding: var(--ds-expandable-navbar-dropdown-item-vertical-padding) var(--ds-expandable-navbar-dropdown-item-horizontal-padding);
         }
@@ -82,11 +85,12 @@
           }
         }
 
-        // mobile submenu
-        .dropdown-menu {
-          .ds-menu-item {
-          }
-        }
+        /* mobile submenu */
+
+        //.dropdown-menu {
+        //  .ds-menu-item {
+        //  }
+        //}
 
       }
     }

From 48e9817245152ce0781b439e5b3d130fe341fb2d Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Mon, 26 Feb 2024 16:22:28 +0100
Subject: [PATCH 0127/1286] [DURACOM-195] replace ul/li with div in navbar

(cherry picked from commit abba806d405af9de44fea3734c542fa8ab7fef1b)
---
 .../expandable-navbar-section.component.html         | 12 ++++++------
 .../expandable-navbar-section.component.scss         |  2 +-
 .../navbar-section/navbar-section.component.html     |  7 +++----
 src/app/navbar/navbar.component.html                 |  4 ++--
 src/themes/dspace/app/navbar/navbar.component.html   |  4 ++--
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 180ce16ba5..00752e7c04 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,4 +1,4 @@
-<li class="ds-menu-item-wrapper text-md-center" role="presentation"
+<div class="ds-menu-item-wrapper text-md-center"
     [id]="'expandable-navbar-section-' + section.id"
     (mouseenter)="onMouseEnter($event, isActive)"
     (mouseleave)="onMouseLeave($event, isActive)"
@@ -24,13 +24,13 @@
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <ul @slide *ngIf="isActive" (click)="deactivateSection($event)"
+    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-        <li *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
             <ng-container
                     *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </li>
-    </ul>
-</li>
+        </div>
+    </div>
+</div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 961d450486..8849fbd809 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -1,5 +1,5 @@
 :host {
-  li.ds-menu-item-wrapper {
+  .ds-menu-item-wrapper {
     position: relative; // align dropdown menu with respect to this element
   }
 
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index ac51c86342..1411d3b6a6 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,5 +1,4 @@
-<li role="presentation"
-    class="ds-menu-item-wrapper text-md-center"
-    [id]="'navbar-section-' + section.id">
+<div class="ds-menu-item-wrapper text-md-center"
+     [id]="'navbar-section-' + section.id">
   <ng-container *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-</li>
+</div>
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 5e15315a9b..bda9815481 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -9,12 +9,12 @@
         <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
           <ds-themed-user-menu [inExpandableNavbar]="true"></ds-themed-user-menu>
         </ng-container>
-        <ul class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
+        <div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
           <ng-container *ngFor="let section of (sections | async)">
             <ng-container
               *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
           </ng-container>
-        </ul>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index ac4424c638..518d3bbe30 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,9 +1,9 @@
 <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
   <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
 </ng-container>
-<ul class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
+<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
   <ng-container *ngFor="let section of (sections | async)">
     <ng-container
       *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
   </ng-container>
-</ul>
+</div>

From 49efc4175d66f7345865a43c97860758a387278f Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Mon, 26 Feb 2024 18:23:51 +0100
Subject: [PATCH 0128/1286] [DURACOM-195] fix issue with logo on small screens

(cherry picked from commit bff93a08471240e107704cd7c525ac747b0c93b6)
---
 src/themes/dspace/app/header/header.component.html |  4 ++--
 src/themes/dspace/app/header/header.component.scss | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index 1ea91bc460..0a0e055253 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,5 +1,5 @@
 <header id="main-site-header">
-  <div class="container h-100 d-flex flex-row flex-nowrap justify-content-between gapx-3">
+  <div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
     <!-- Logo and navbar wrapper -->
     <div id="header-left"
          [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
@@ -13,7 +13,7 @@
       </nav>
     </div>
     <!-- Search bar and other menus -->
-    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1">
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
       <ds-themed-search-navbar></ds-themed-search-navbar>
       <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
         <ds-themed-lang-switch></ds-themed-lang-switch>
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
index f61c442ff5..5aae8af017 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -1,7 +1,16 @@
 :host {
   #main-site-header {
-    height: var(--ds-header-height);
+    min-height: var(--ds-header-height);
+
+    @include media-breakpoint-up(md) {
+      height: var(--ds-header-height);
+    }
+
     background-color: var(--ds-header-bg);
+
+    &-container {
+      min-height: var(--ds-header-height);
+    }
   }
 
   img#header-logo {

From e3f1fa39d55a67fd98e6d353e8685a89e319f26e Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Mon, 26 Feb 2024 20:24:12 +0100
Subject: [PATCH 0129/1286] [DURACOM-195] add background on mouse over to
 dropdown user menu items

(cherry picked from commit 8e35c0f713f37c76e0711ac7f862d02ed4c29d83)
---
 .../auth-nav-menu.component.html              |  6 +--
 .../user-menu/user-menu.component.html        |  2 +-
 .../user-menu/user-menu.component.scss        | 41 +++++++++++++++++--
 src/styles/_custom_variables.scss             | 11 ++---
 .../header-navbar-wrapper.component.scss      | 24 -----------
 5 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 44487be1e3..07b37e220d 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -29,9 +29,9 @@
          [attr.data-test]="'user-menu' | dsBrowserOnly"
          ngbDropdownToggle>
         <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <ul id="logoutDropdownMenu" class="p-3" ngbDropdownMenu role="presentation">
-        <ds-themed-user-menu></ds-themed-user-menu>
-      </ul>
+      <div id="logoutDropdownMenu" ngbDropdownMenu>
+        <ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 637b483db0..c20ad463d1 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,6 +1,6 @@
 <ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
 <ul *ngIf="!(loading$ | async)" class="user-menu" role="menu"
-    [ngClass]="{ 'pb-2 mb-2 border-bottom' : inExpandableNavbar }"
+    [ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
     [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
   <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
     {{dsoNameService.getName(user$ | async)}}<br>
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
index 9409580cd4..8fa0019bf1 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
@@ -3,10 +3,43 @@
     list-style: none;
     margin: 0;
     padding: 0;
+
+    &.user-menu-dropdown {
+      .ds-menu-item-wrapper {
+        a.ds-menu-item, &.username-email-wrapper {
+          padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-dropdown-padding);
+        }
+
+        a.ds-menu-item {
+          display: block;
+          color: var(--ds-expandable-navbar-link-color);
+          &:hover {
+            color: var(--ds-expandable-navbar-link-color-hover);
+            background-color: var(--ds-user-menu-dropdown-link-background-hover);
+          }
+        }
+      }
+    }
+
+    &.user-menu-mobile {
+      .ds-menu-item-wrapper {
+        padding-top: var(--ds-user-menu-item-vertical-padding);
+        padding-bottom: var(--ds-user-menu-item-vertical-padding);
+      }
+
+      .ds-menu-item {
+        display: inline-block;
+      }
+
+      .ds-menu-item, .ds-menu-toggler-wrapper {
+        color: var(--ds-expandable-navbar-link-color) !important;
+
+        &:hover, &:focus {
+          color: var(--ds-expandable-navbar-link-background-hover) !important;
+        }
+      }
+
+    }
   }
 
-  .ds-menu-item {
-    display: inline-block;
-    padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-item-horizontal-padding);
-  }
 }
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 3631fa7e29..c48ee29713 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -36,13 +36,14 @@
   --ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
 
   --ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
-  --ds-expandable-navbar-link-color: #{$ds-navbar-link-color};
-  --ds-expandable-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
-  --ds-expandable-navbar-dropdown-item-vertical-padding: 0.25rem;
-  --ds-expandable-navbar-dropdown-item-horizontal-padding: 0;
+  --ds-expandable-navbar-link-color: #{$body-color};
+  --ds-expandable-navbar-link-color-hover: #{$body-color};
+  --ds-expandable-navbar-link-background-hover: #{$ds-navbar-link-color-hover};
 
   --ds-user-menu-item-vertical-padding: 0.25rem;
-  --ds-user-menu-item-horizontal-padding: 0;
+  --ds-user-menu-dropdown-padding: 1rem;
+  --ds-user-menu-dropdown-link-color: #{$dark};
+  --ds-user-menu-dropdown-link-background-hover: #{$gray-200};
 
   @include media-breakpoint-up(md) {
     --ds-header-logo-height: 50px;
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index cabad27a5d..77e2d4ad51 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -69,30 +69,6 @@
       border-top: var(--ds-expandable-navbar-border-top-style);
       padding-top: var(--ds-expandable-navbar-padding-top);
 
-      ::ng-deep {
-
-        /* mobile menu */
-
-        .ds-menu-item {
-          padding: var(--ds-expandable-navbar-dropdown-item-vertical-padding) var(--ds-expandable-navbar-dropdown-item-horizontal-padding);
-        }
-
-        .ds-menu-item, .ds-menu-toggler-wrapper {
-          color: var(--ds-expandable-navbar-link-color) !important;
-
-          &:hover, &:focus {
-            color: var(--ds-expandable-navbar-link-color-hover) !important;
-          }
-        }
-
-        /* mobile submenu */
-
-        //.dropdown-menu {
-        //  .ds-menu-item {
-        //  }
-        //}
-
-      }
     }
   }
 }

From 89c88ca6e0a3da6f2b189ddd4b1c1eaf8972eff9 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Mon, 26 Feb 2024 20:32:31 +0100
Subject: [PATCH 0130/1286] [DURACOM-195] replace ul/li with div in sidebar

(cherry picked from commit d1dc8e6038673de22946fddc8d41b22862bcb5a6)
---
 .../admin-sidebar-section.component.html             |  4 ++--
 .../admin/admin-sidebar/admin-sidebar.component.html |  4 ++--
 .../expandable-admin-sidebar-section.component.html  | 12 ++++++------
 .../expandable-admin-sidebar-section.component.scss  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index f0f7a49573..24ba17fff4 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,4 +1,4 @@
-<li role="presentation">
+<div>
   <a class="sidebar-section-wrapper"
      [ngClass]="{ disabled: isDisabled }"
      role="menuitem"
@@ -18,4 +18,4 @@
       </div>
     </div>
   </a>
-</li>
+</div>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 0179b27404..fcb33eb175 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -28,13 +28,13 @@
   <!-- ITEMS -->
 
   <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
-    <ul class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+    <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
         [attr.aria-label]="'menu.header.admin.description' |translate">
       <ng-container *ngFor="let section of (sections | async)">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
       </ng-container>
-    </ul>
+    </div>
   </div>
 
   <!-- TOGGLER -->
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index cb8b87cfa2..636938b7b6 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -1,4 +1,4 @@
-<li [ngClass]="{'expanded': (isExpanded$ | async)}" role="presentation"
+<div [ngClass]="{'expanded': (isExpanded$ | async)}"
     [@bgColor]="{
      value: ((isExpanded$ | async) ? 'endBackground' : 'startBackground'),
      params: {endColor: (sidebarActiveBg$ | async)}
@@ -33,14 +33,14 @@
     <div class="sidebar-fixed-element-wrapper"></div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper">
-        <ul class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
-          <li class="sidebar-item" role="presentation" *ngFor="let subSection of (subSections$ | async)">
+        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+          <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
             {{ (sectionMap$ | async).get(subSection.id).component | json}}
             <ng-container
               *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-          </li>
-        </ul>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-</li>
+</div>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 5e76813abb..845ba734df 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,5 +1,5 @@
 :host {
-  ul.sidebar-sub-level-item-list  {
+  .sidebar-sub-level-item-list  {
     list-style: none;
     margin: 0;
     padding: 0;

From f26b265e64a148bda54c86e9de40f5e93b296588 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Mon, 26 Feb 2024 20:41:44 +0100
Subject: [PATCH 0131/1286] [DURACOM-195] fix

(cherry picked from commit fdbe7a6005e59783075395aa3ba26c2b56f7afe5)
---
 src/themes/dspace/app/header/header.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index 0a0e055253..02226ac0a1 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -5,7 +5,7 @@
          [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
          [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
          class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
-      <a class="d-block" routerLink="/home" [attr.aria-label]="'home.title' | translate">
+      <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
         <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
       <nav *ngIf="!(isMobile$ | async)" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">

From 3caac21648d279bf668d181623352965dda20341 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.com>
Date: Tue, 27 Feb 2024 14:05:48 +0100
Subject: [PATCH 0132/1286] [DURACOM-195] fix spacing in collapsible menu

(cherry picked from commit a88282d70b8677712d5515ca697c46276840e774)
---
 src/styles/_custom_variables.scss             |  1 +
 .../header-navbar-wrapper.component.scss      | 59 +++++++++++--------
 .../dspace/app/navbar/navbar.component.html   |  2 +-
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index c48ee29713..dfdcdc7359 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -39,6 +39,7 @@
   --ds-expandable-navbar-link-color: #{$body-color};
   --ds-expandable-navbar-link-color-hover: #{$body-color};
   --ds-expandable-navbar-link-background-hover: #{$ds-navbar-link-color-hover};
+  --ds-expandable-navbar-item-vertical-padding: 0.25rem;
 
   --ds-user-menu-item-vertical-padding: 0.25rem;
   --ds-user-menu-dropdown-padding: 1rem;
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index 77e2d4ad51..444d3a9722 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -32,43 +32,50 @@
       text-decoration: none;
     }
 
-    nav#desktop-navbar ::ng-deep {
+    nav#desktop-navbar { // in header component
+      #main-site-navigation {
+        /* Desktop menu */
 
-      /* Desktop menu */
-
-      .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
-        // fill navbar height (required by dropdown menus) and center content
-        display: flex;
-        align-items: center;
-        height: 100%;
-      }
-      .ds-menu-item {
-        // define here the style for top-level navbar menu items
-        padding: var(--ds-navbar-item-vertical-padding) var(--ds-navbar-item-horizontal-padding);
-      }
-      .ds-menu-item, .ds-menu-toggler-wrapper {
-        color: var(--ds-navbar-link-color) !important;
-        &:hover, &:focus {
-          color: var(--ds-navbar-link-color-hover) !important;
+        .ds-menu-item-wrapper, .ds-menu-item, .ds-menu-toggler-wrapper {
+          // fill navbar height (required by dropdown menus) and center content
+          display: flex;
+          align-items: center;
+          height: 100%;
         }
-      }
-
-      /* desktop submenu */
-
-      .dropdown-menu {
         .ds-menu-item {
-          // define here the style for second-level navbar menu items
-          padding: var(--ds-navbar-dropdown-item-vertical-padding) var(--ds-navbar-dropdown-item-horizontal-padding);
+          // define here the style for top-level navbar menu items
+          padding: var(--ds-navbar-item-vertical-padding) var(--ds-navbar-item-horizontal-padding);
+        }
+        .ds-menu-item, .ds-menu-toggler-wrapper {
+          color: var(--ds-navbar-link-color) !important;
+          &:hover, &:focus {
+            color: var(--ds-navbar-link-color-hover) !important;
+          }
         }
-      }
 
+        /* desktop submenu */
+
+        .dropdown-menu {
+          .ds-menu-item {
+            // define here the style for second-level navbar menu items
+            padding: var(--ds-navbar-dropdown-item-vertical-padding) var(--ds-navbar-dropdown-item-horizontal-padding);
+          }
+        }
+
+      }
     }
 
-    nav#collapsible-mobile-navbar {
+    nav#collapsible-mobile-navbar { // in header-navbar-wrapper component
 
       border-top: var(--ds-expandable-navbar-border-top-style);
       padding-top: var(--ds-expandable-navbar-padding-top);
 
+      #main-site-navigation {
+        .ds-menu-item {
+          padding: var(--ds-expandable-navbar-item-vertical-padding) 0;
+        }
+      }
+
     }
   }
 }
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 518d3bbe30..d828206e7a 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
   <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
 </ng-container>
-<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar">
+<div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
   <ng-container *ngFor="let section of (sections | async)">
     <ng-container
       *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>

From 85922433a5c3da366635da124e9300c8e6d6ccc6 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@tamu.edu>
Date: Fri, 26 Jan 2024 15:50:41 -0600
Subject: [PATCH 0133/1286] NgbTypeahead instance is only defined when model
 has authority

(cherry picked from commit 018d44c61603dd12b685a6ca5ce503d9040f7f2a)
---
 .../ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 7805dad1f3..7c3d8982e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -151,7 +151,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
    * @param event The value to emit.
    */
   onBlur(event: Event) {
-    if (isNotEmpty(this.currentValue) && !this.instance.isPopupOpen()) {
+    if (isNotEmpty(this.currentValue) && (!this.model.hasAuthority || !this.instance.isPopupOpen())) {
       this.addTagsToChips();
     }
     this.blur.emit(event);

From badf00258c0a0fa576eb2ab3da4b0134d3e7f2b6 Mon Sep 17 00:00:00 2001
From: Kuno Vercammen <kuno.vercammen@atmire.com>
Date: Fri, 15 Mar 2024 11:42:01 +0100
Subject: [PATCH 0134/1286] 113124: Allow opening ds-metadata-uri-values links
 in a new window

---
 .../metadata-uri-values/metadata-uri-values.component.html | 2 +-
 .../metadata-uri-values.component.spec.ts                  | 7 +++++++
 .../metadata-uri-values/metadata-uri-values.component.ts   | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 9091beb6c7..7d7174536b 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value">
+    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="linkTarget">
        {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
index f869ab8aaf..56a51b01fe 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
@@ -73,6 +73,13 @@ describe('MetadataUriValuesComponent', () => {
     expect(separators.length).toBe(mockMetadata.length - 1);
   });
 
+  it('should contain the correct target attribute for metadata links', () => {
+    const links = fixture.debugElement.queryAll(By.css('a'));
+    for (const link of links) {
+      expect(link.nativeElement.getAttribute('target')).toBe('_blank');
+    }
+  });
+
   describe('when linktext is defined', () => {
 
     beforeEach(() => {
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index e070eccf2d..5a024bfb30 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -37,4 +37,10 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
    * The label for this iteration of metadata values
    */
   @Input() label: string;
+
+  /**
+   * The target attribute for the metadata links.
+   * Defaults to '_blank' to open links in a new window/tab.
+   */
+  @Input() linkTarget = '_blank';
 }

From 25cb0455e2de428cd2bdabd7e30a74b2fc676a44 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 12 Dec 2023 00:34:12 +0100
Subject: [PATCH 0135/1286] Fixed bug in BrowseService where findListByHref was
 called with null instead of undefined, which prevented its default values
 from being used

(cherry picked from commit e6bf2f0ca71adf02dca64a7a1a07de46c309a8d1)
---
 src/app/core/browse/browse.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index b210b34949..58bbc0b870 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -105,7 +105,7 @@ export class BrowseService {
       })
     );
     if (options.fetchThumbnail ) {
-      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, undefined, undefined, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
@@ -153,7 +153,7 @@ export class BrowseService {
       }),
     );
     if (options.fetchThumbnail) {
-      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, undefined, undefined, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }

From d05438dc3e2020867b6bfaefd3ad98aed5daf30f Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 23 Mar 2024 15:12:48 +0100
Subject: [PATCH 0136/1286] Prevent system-wide alert to be activated with
 empty message

(cherry picked from commit 767de4b5c85d18b0a2e3e8dae130ad2c2b4894ca)
---
 .../system-wide-alert-form.component.spec.ts         |  8 ++++++++
 .../alert-form/system-wide-alert-form.component.ts   | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 505990b445..a42a24d61d 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -302,6 +302,14 @@ describe('SystemWideAlertFormComponent', () => {
       expect(comp.back).not.toHaveBeenCalled();
 
     });
+    it('should not create the new alert when the enable button is clicked on an invalid the form', () => {
+      spyOn(comp as any, 'handleResponse');
+
+      comp.formMessage.patchValue('');
+      comp.save();
+
+      expect((comp as any).handleResponse).not.toHaveBeenCalled();
+    });
   });
   describe('back', () => {
     it('should navigate back to the home page', () => {
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index eaff12c169..b4a272890b 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -219,11 +219,13 @@ export class SystemWideAlertFormComponent implements OnInit {
     } else {
       alert.countdownTo = null;
     }
-    if (hasValue(this.currentAlert)) {
-      const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert);
-      this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update', navigateToHomePage);
-    } else {
-      this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create', navigateToHomePage);
+    if (this.alertForm.valid) {
+      if (hasValue(this.currentAlert)) {
+        const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert);
+        this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update', navigateToHomePage);
+      } else {
+        this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create', navigateToHomePage);
+      }
     }
   }
 

From ed8e280aa423041382e3ed092db1811bd8c8281e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 4 Apr 2024 11:01:41 -0500
Subject: [PATCH 0137/1286] Bump follow-redirects from 1.15.5 to 1.15.6

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6d14e72286..128d17cc71 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5909,9 +5909,9 @@ flatted@^3.1.0, flatted@^3.2.7:
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
-  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"

From bba7fe2f74c1b06b338dffa7ab2e3733ffb5716d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 4 Apr 2024 11:34:30 -0500
Subject: [PATCH 0138/1286] Bump express from 4.18.2 to 4.19.2

---
 package.json |  2 +-
 yarn.lock    | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0dd610718c..54c3cbbfdd 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.9",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 6d14e72286..18fd089863 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3670,6 +3670,24 @@ body-parser@1.20.1, body-parser@^1.19.0:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 bonjour-service@^1.0.11:
   version "1.1.1"
   resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
@@ -4313,7 +4331,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -4346,6 +4364,11 @@ cookie@0.5.0:
   resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+
 cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
@@ -5682,6 +5705,43 @@ express@^4.17.3, express@^4.18.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.19.2:
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.20.2"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.6.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "2.0.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.2.0"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.11.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.18.0"
+    serve-static "1.15.0"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
@@ -9672,6 +9732,16 @@ raw-body@2.5.1, raw-body@^2.3.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 re-reselect@^4.0.0:
   version "4.0.1"
   resolved "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz"

From d503e4db0768021c460522a745cb91e21d59bfe2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 4 Apr 2024 11:58:15 -0500
Subject: [PATCH 0139/1286] Bump webpack-dev-middleware from 5.3.3 to 5.3.4

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6d14e72286..452c3c5d87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11782,9 +11782,9 @@ webpack-dev-middleware@6.0.1:
     schema-utils "^4.0.0"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

From 4239d37a386c8509e393581b4a0403b9b12b909c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 4 Apr 2024 14:12:29 -0500
Subject: [PATCH 0140/1286] Bump axios to 1.6.8

---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3b60c1deec..866f1608c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3517,11 +3517,11 @@ axios@0.21.4:
     follow-redirects "^1.14.0"
 
 axios@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
-  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -5968,7 +5968,7 @@ flatted@^3.1.0, flatted@^3.2.7:
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

From 3b11ac517cd1c7f275f5410ac06608def2760036 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 1 Feb 2023 13:10:37 +0100
Subject: [PATCH 0141/1286] Add configuration option to disable inlined CSS in
 SSR HTML

When inlining CSS, Angular Universal needs to extract critical styles.
This seems to take up a significant chunk of processing time.

However, loading may appear less smooth when this feature is disabled.

Added to the configuration to make it easier to A/B test this without a full re-build.

(cherry picked from commit 38a058d7af6e43eb27bb3b8ce34472a0235085fd)
---
 server.ts                                  | 1 +
 src/config/universal-config.interface.ts   | 9 +++++++++
 src/environments/environment.production.ts | 3 ++-
 src/environments/environment.ts            | 3 ++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/server.ts b/server.ts
index da085f372f..93f3e86876 100644
--- a/server.ts
+++ b/server.ts
@@ -131,6 +131,7 @@ export function app() {
   server.engine('html', (_, options, callback) =>
     ngExpressEngine({
       bootstrap: ServerAppModule,
+      inlineCriticalCss: environment.universal.inlineCriticalCss,
       providers: [
         {
           provide: REQUEST,
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index c088dcd657..3ff68fea66 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -4,4 +4,13 @@ export interface UniversalConfig extends Config {
   preboot: boolean;
   async: boolean;
   time: boolean;
+
+  /**
+   * Whether to inline "critical" styles into the server-side rendered HTML.
+   *
+   * Determining which styles are critical is a relatively expensive operation;
+   * this option can be disabled to boost server performance at the expense of
+   * loading smoothness.
+   */
+  inlineCriticalCss?;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 09b5f19ade..7dd9bd2aa3 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -7,6 +7,7 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: true,
     async: true,
-    time: false
+    time: false,
+    inlineCriticalCss: true,
   }
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dc0e808be0..10f71618e1 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,7 +12,8 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: false,
     async: true,
-    time: false
+    time: false,
+    inlineCriticalCss: true,
   }
 };
 

From fd10fbe2a81556c77b69222a73465b0958a4d22a Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Fri, 22 Mar 2024 16:23:09 +0100
Subject: [PATCH 0142/1286] Add to config.example.yml

(cherry picked from commit 4a39f33006e07da2286551010839ba32d5175a41)
---
 config/config.example.yml                | 7 +++++++
 src/config/universal-config.interface.ts | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 76d73a2693..e87ad1f89f 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -17,6 +17,13 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
+universal:
+  # Whether to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation;
+  # this option can be disabled to boost server performance at the expense of
+  # loading smoothness.
+  inlineCriticalCss: true
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index 3ff68fea66..eb89264e37 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -12,5 +12,5 @@ export interface UniversalConfig extends Config {
    * this option can be disabled to boost server performance at the expense of
    * loading smoothness.
    */
-  inlineCriticalCss?;
+  inlineCriticalCss?: boolean;
 }

From 78f1d9f763da7744abf62fb66522905dc9c87f55 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 8 Apr 2024 10:22:04 -0500
Subject: [PATCH 0143/1286] Update all GitHub Actions. Add newly required
 CODECOV_TOKEN to codecov action

---
 .github/workflows/build.yml               | 13 +++++++------
 .github/workflows/issue_opened.yml        |  2 +-
 .github/workflows/pull_request_opened.yml |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 52f20470a3..4c7c89aaa9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache Yarn dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # Cache entire Yarn cache directory (see previous step)
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -101,7 +101,7 @@ jobs:
       # so that it can be shared with the 'codecov' job (see below)
       # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
       - name: Upload code coverage report to Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.node-version == '18.x'
         with:
           name: dspace-angular coverage report
@@ -135,7 +135,7 @@ jobs:
       # Cypress always creates a video of all e2e tests (whether they succeeded or failed)
       # Save those in an Artifact
       - name: Upload e2e test videos to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: e2e-test-videos
@@ -144,7 +144,7 @@ jobs:
       # If e2e tests fail, Cypress creates a screenshot of what happened
       # Save those in an Artifact
       - name: Upload e2e test failure screenshots to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: e2e-test-screenshots
@@ -197,7 +197,7 @@ jobs:
 
       # Download artifacts from previous 'tests' job
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       # Now attempt upload to Codecov using its action.
       # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
@@ -207,11 +207,12 @@ jobs:
       - name: Upload coverage to Codecov.io
         uses: Wandalen/wretry.action@v1.3.0
         with:
-          action: codecov/codecov-action@v3
+          action: codecov/codecov-action@v4
           # Ensure codecov-action throws an error when it fails to upload
           # This allows us to auto-restart the action if an error is thrown
           with: |
             fail_ci_if_error: true
+            token: ${{ secrets.CODECOV_TOKEN }}
           # Try re-running action 5 times max
           attempt_limit: 5
           # Run again in 30 seconds
diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml
index b4436dca3a..0a35a6a950 100644
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -16,7 +16,7 @@ jobs:
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v0.5.0
+      uses: actions/add-to-project@v1.0.0
       # Note, the authentication token below is an ORG level Secret. 
       # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token
diff --git a/.github/workflows/pull_request_opened.yml b/.github/workflows/pull_request_opened.yml
index f16e81c9fd..bbac52af24 100644
--- a/.github/workflows/pull_request_opened.yml
+++ b/.github/workflows/pull_request_opened.yml
@@ -21,4 +21,4 @@ jobs:
     # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
     # See https://github.com/toshimaru/auto-author-assign
     - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v2.0.1
+      uses: toshimaru/auto-author-assign@v2.1.0

From b758d0a5f9a6622ec5ec65293f39c2af4ae891b2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 8 Apr 2024 11:14:30 -0500
Subject: [PATCH 0144/1286] Ensure all artifacts have a unique name by
 appending Node version to each

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c7c89aaa9..fd655a3932 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,7 +104,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.node-version == '18.x'
         with:
-          name: dspace-angular coverage report
+          name: coverage-report-${{ matrix.node-version }}
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
@@ -138,7 +138,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: e2e-test-videos
+          name: e2e-test-videos-${{ matrix.node-version }}
           path: cypress/videos
 
       # If e2e tests fail, Cypress creates a screenshot of what happened
@@ -147,7 +147,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: e2e-test-screenshots
+          name: e2e-test-screenshots-${{ matrix.node-version }}
           path: cypress/screenshots
 
       - name: Stop app (in case it stays up after e2e tests)

From b12bdfdd228817bc8134343fd24caca0ff050587 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 9 Apr 2024 14:52:27 -0500
Subject: [PATCH 0145/1286] Docker build IDs must all be unique to avoid image
 conflicts. Ensure no builds use a generic name like "dspace-angular".

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3a3183f8cd..db42a36d3b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,7 +28,7 @@ jobs:
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
     uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
     with:
-      build_id: dspace-angular
+      build_id: dspace-angular-dev
       image_name: dspace/dspace-angular
       dockerfile_path: ./Dockerfile
     secrets:

From e2c2174bf7b58d1dadbb1284839a7b640421a144 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 30 Jan 2024 11:08:59 +0100
Subject: [PATCH 0146/1286] 111373: Fixed Font Awesome CSS Pseudo-elements for
 v6.x

(cherry picked from commit 01f97a623f3fb364fef14ed01e07d0b7ed0b90a6)
---
 .../org-unit-input-suggestions.component.scss                | 5 ++---
 .../person-input-suggestions.component.scss                  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
index 20b48c805b..26b765b704 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
@@ -3,10 +3,9 @@ form {
     &:before {
         pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
-        font-weight: 900;
-        font-family: "Font Awesome 5 Free";
+        font: var(--fa-font-solid);
         content: "\f0d7";
-        top: 7px;
+        top: 10px;
         right: 0;
         height: 20px;
         width: 20px;
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
index 86233c473a..d9a9544bfb 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
@@ -2,10 +2,9 @@ form {
     &:before {
         pointer-events: none; // prevent the icon from ‘catching‘ the click
         position: absolute;
-        font-weight: 900;
-        font-family: "Font Awesome 5 Free";
+        font: var(--fa-font-solid);
         content: "\f0d7";
-        top: 7px;
+        top: 10px;
         right: 0;
         height: 20px;
         width: 20px;

From 8e59b7d0b0798ed7f7f7fdc952dbcfe1c9f773b6 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 11 Apr 2024 17:51:59 +0200
Subject: [PATCH 0147/1286] also add relationships one by one on the edit item
 relationships tab

---
 .../core/data/relationship-data.service.ts    |  24 ++-
 .../item-relationships.component.ts           | 174 +++++++++++-------
 2 files changed, 124 insertions(+), 74 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 46a51a2d01..f9c2c7f16a 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -114,8 +114,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param id                    the ID of the relationship to delete
    * @param copyVirtualMetadata   whether to copy this relationship's virtual metadata to the related Items
    *                              accepted values: none, all, left, right, configured
+   * @param shouldRefresh         refresh the cache for the items in the relationship after creating
+   *                              it. Disable this if you want to add relationships in bulk, and
+   *                              want to refresh the cachemanually at the end
    */
-  deleteRelationship(id: string, copyVirtualMetadata: string): Observable<RemoteData<NoContent>> {
+  deleteRelationship(id: string, copyVirtualMetadata: string, shouldRefresh = true): Observable<RemoteData<NoContent>> {
     return this.getRelationshipEndpoint(id).pipe(
       isNotEmptyOperator(),
       take(1),
@@ -126,7 +129,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
       getFirstCompletedRemoteData(),
-      tap(() => this.refreshRelationshipItemsInCacheByRelationship(id)),
+      tap(() => {
+        if (shouldRefresh) {
+          this.refreshRelationshipItemsInCacheByRelationship(id);
+        }
+      }),
     );
   }
 
@@ -137,8 +144,11 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param item2 The second item of the relationship
    * @param leftwardValue The leftward value of the relationship
    * @param rightwardValue The rightward value of the relationship
+   * @param shouldRefresh refresh the cache for the items in the relationship after creating it.
+   *                      Disable this if you want to add relationships in bulk, and want to refresh
+   *                      the cache manually at the end
    */
-  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string): Observable<RemoteData<Relationship>> {
+  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string, shouldRefresh = true): Observable<RemoteData<Relationship>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
@@ -153,8 +163,12 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
       getFirstCompletedRemoteData(),
-      tap(() => this.refreshRelationshipItemsInCache(item1)),
-      tap(() => this.refreshRelationshipItemsInCache(item2)),
+      tap(() => {
+        if (shouldRefresh) {
+          this.refreshRelationshipItemsInCache(item1);
+          this.refreshRelationshipItemsInCache(item2);
+        }
+      }),
     ) as Observable<RemoteData<Relationship>>;
   }
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 8f7c43e79f..433e0a9493 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -4,8 +4,14 @@ import {
   DeleteRelationship,
   RelationshipIdentifiable,
 } from '../../../core/data/object-updates/object-updates.reducer';
-import { map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip, Observable } from 'rxjs';
+import { map, startWith, switchMap, take, concatMap, toArray, tap } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+  zip as observableZip,
+  Observable,
+  BehaviorSubject, EMPTY
+} from 'rxjs';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -30,6 +36,7 @@ import { FieldChangeType } from '../../../core/data/object-updates/field-change-
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { HALLink } from '../../../core/shared/hal-link.model';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -50,7 +57,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   /**
    * The item's entity type as an observable
    */
-  entityType$: Observable<ItemType>;
+  entityType$: BehaviorSubject<ItemType> = new BehaviorSubject(undefined);
 
   constructor(
     public itemService: ItemDataService,
@@ -82,13 +89,13 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
         map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
       );
 
-      this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
+      this.entityTypeService.getEntityTypeByLabel(label).pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-      );
+      ).subscribe((type) => this.entityType$.next(type));
 
     } else {
-      this.entityType$ = observableOf(undefined);
+      this.entityType$.next(undefined);
     }
   }
 
@@ -106,8 +113,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   public submit(): void {
 
     // Get all the relationships that should be removed
-    const removedRelationshipIDs$: Observable<DeleteRelationship[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
-      startWith([]),
+    const removeUpdates$: Observable<FieldUpdate[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
       map((relationships: Relationship[]) => relationships.map((relationship) =>
         Object.assign(new Relationship(), relationship, { uuid: relationship.id })
       )),
@@ -117,83 +123,113 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
       map((fieldUpdates: FieldUpdates) =>
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship)
       ),
+      take(1)
     );
 
-    const addRelatedItems$: Observable<RelationshipIdentifiable[]> = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe(
+    const addUpdates$: Observable<FieldUpdate[]> = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe(
       map((fieldUpdates: FieldUpdates) =>
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable)
       ),
+      take(1)
     );
 
-    observableCombineLatest(
-      removedRelationshipIDs$,
-      addRelatedItems$,
-    ).pipe(
+    observableCombineLatest([
+      removeUpdates$,
+      addUpdates$,
+    ]).pipe(
       take(1),
-    ).subscribe(([removeRelationshipIDs, addRelatedItems]) => {
-      const actions = [
-        this.deleteRelationships(removeRelationshipIDs),
-        this.addRelationships(addRelatedItems),
-      ];
-      actions.forEach((action) =>
-        action.subscribe((response) => {
-          if (response.length > 0) {
-            this.initializeOriginalFields();
-            this.cdr.detectChanges();
-            this.displayNotifications(response);
-            this.modalService.dismissAll();
-          }
-        })
-      );
+      switchMap(([removeUpdates, addUpdates]) => [...removeUpdates, ...addUpdates]),
+      concatMap((update: FieldUpdate) => {
+        if (update.changeType === FieldChangeType.REMOVE) {
+          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1))
+        } else if (update.changeType === FieldChangeType.ADD) {
+          return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
+            take(1),
+            switchMap((relationshipRD: RemoteData<Relationship>) => {
+              if (relationshipRD.hasSucceeded) {
+                // Set the newly related item to stale, so its relationships will update to include
+                // the new one. Only set the current item to stale at the very end so we only do it
+                // once
+                const { leftItem, rightItem } = relationshipRD.payload._links;
+                if (leftItem.href === this.item.self) {
+                  return this.itemService.invalidateByHref(rightItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                } else {
+                  return this.itemService.invalidateByHref(leftItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                }
+              }
+              else {
+                return [relationshipRD];
+              }
+            })
+          )
+        } else {
+          return EMPTY;
+        }
+      }),
+      toArray(),
+      switchMap((responses) => {
+        // once all relationships are made and all related items have been invalidated, invalidate
+        // the current item
+        return this.itemService.invalidateByHref(this.item.self).pipe(
+          map(() => responses)
+        );
+      })
+    ).subscribe((responses) => {
+      if (responses.length > 0) {
+        this.initializeOriginalFields();
+        this.displayNotifications(responses);
+        this.modalService.dismissAll();
+      }
     });
   }
 
-  deleteRelationships(deleteRelationshipIDs: DeleteRelationship[]): Observable<RemoteData<NoContent>[]> {
-    return observableZip(...deleteRelationshipIDs.map((deleteRelationship) => {
-        let copyVirtualMetadata: string;
-        if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'all';
-        } else if (deleteRelationship.keepLeftVirtualMetadata) {
-          copyVirtualMetadata = 'left';
-        } else if (deleteRelationship.keepRightVirtualMetadata) {
-          copyVirtualMetadata = 'right';
-        } else {
-          copyVirtualMetadata = 'none';
-        }
-        return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata);
-      }
-    ));
+  deleteRelationship(deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
+    let copyVirtualMetadata: string;
+    if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'all';
+    } else if (deleteRelationship.keepLeftVirtualMetadata) {
+      copyVirtualMetadata = 'left';
+    } else if (deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'right';
+    } else {
+      copyVirtualMetadata = 'none';
+    }
+
+    return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata, false);
   }
 
-  addRelationships(addRelatedItems: RelationshipIdentifiable[]): Observable<RemoteData<Relationship>[]> {
-    return observableZip(...addRelatedItems.map((addRelationship) =>
-      this.entityType$.pipe(
-        switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)),
-        switchMap((isLeftType) => {
-          let leftItem: Item;
-          let rightItem: Item;
-          let leftwardValue: string;
-          let rightwardValue: string;
-          if (isLeftType) {
-            leftItem = this.item;
-            rightItem = addRelationship.relatedItem;
-            leftwardValue = null;
-            rightwardValue = addRelationship.nameVariant;
-          } else {
-            leftItem = addRelationship.relatedItem;
-            rightItem = this.item;
-            leftwardValue = addRelationship.nameVariant;
-            rightwardValue = null;
-          }
-          return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue);
-        }),
-      )
-    ));
+  addRelationship(addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
+    return this.entityType$.pipe(
+      switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)),
+      switchMap((isLeftType) => {
+        let leftItem: Item;
+        let rightItem: Item;
+        let leftwardValue: string;
+        let rightwardValue: string;
+        if (isLeftType) {
+          leftItem = this.item;
+          rightItem = addRelationship.relatedItem;
+          leftwardValue = null;
+          rightwardValue = addRelationship.nameVariant;
+        } else {
+          leftItem = addRelationship.relatedItem;
+          rightItem = this.item;
+          leftwardValue = addRelationship.nameVariant;
+          rightwardValue = null;
+        }
+        return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue, false);
+      }),
+    )
+
   }
 
   /**

From 47537a019c104252d6546d4af83cb94f06033812 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Wed, 27 Mar 2024 13:27:44 +0100
Subject: [PATCH 0148/1286] 113500: Fix for warning on first describe step

(cherry picked from commit 993ce1ab16004c14621acea93acaac7865add34a)
---
 .../sections/form/section-form.component.ts       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 2a07f7e3f1..477a263edd 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -192,7 +192,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.submissionObject = submissionObject;
           this.isSectionReadonly = isSectionReadOnly;
           // Is the first loading so init form
-          this.initForm(sectionData);
+          this.initForm(sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors);
           this.sectionData.data = sectionData;
           this.subscriptions();
           this.isLoading = false;
@@ -296,7 +296,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @param sectionData
    *    the section data retrieved from the server
    */
-  initForm(sectionData: WorkspaceitemSectionFormObject): void {
+  initForm(sectionData: WorkspaceitemSectionFormObject, errorsToShow: SubmissionSectionError[], serverValidationErrors: SubmissionSectionError[]): void {
     try {
       this.formModel = this.formBuilderService.modelFromConfiguration(
         this.submissionId,
@@ -307,7 +307,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.isSectionReadonly
       );
       const sectionMetadata = this.sectionService.computeSectionConfiguredMetadata(this.formConfig);
-      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, this.sectionData.errorsToShow, this.sectionData.serverValidationErrors, sectionMetadata);
+      this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, sectionData, errorsToShow, serverValidationErrors, sectionMetadata);
     } catch (e) {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
@@ -327,7 +327,10 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @param errors
    *    the section errors retrieved from the server
    */
-  updateForm(sectionData: WorkspaceitemSectionFormObject, errors: SubmissionSectionError[]): void {
+  updateForm(sectionState: SubmissionSectionObject): void {
+
+    const sectionData = sectionState.data as WorkspaceitemSectionFormObject;
+    const errors = sectionState.errorsToShow
 
     if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
       this.sectionData.data = sectionData;
@@ -335,7 +338,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.isUpdating = true;
         this.formModel = null;
         this.cdr.detectChanges();
-        this.initForm(sectionData);
+        this.initForm(sectionData, errors, sectionState.serverValidationErrors);
         this.checksForErrors(errors);
         this.isUpdating = false;
         this.cdr.detectChanges();
@@ -389,7 +392,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         .subscribe((sectionState: SubmissionSectionObject) => {
           this.fieldsOnTheirWayToBeRemoved = new Map();
           this.sectionMetadata = sectionState.metadata;
-          this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
+          this.updateForm(sectionState);
         })
     );
   }

From d8b6e868964dd6e4e16cfbfa5445f1052314f03d Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Wed, 27 Mar 2024 14:07:55 +0100
Subject: [PATCH 0149/1286] 113500: Fixed tests after bugfix

(cherry picked from commit 4e0046022ba8921a71a1ed9b59059a1e3c1ac1d8)
---
 .../form/section-form.component.spec.ts       | 23 +++++++++++--------
 .../sections/form/section-form.component.ts   |  6 ++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index 4fbf324edf..bce665b444 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -261,7 +261,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       expect(comp.sectionData.errorsToShow).toEqual([]);
       expect(comp.sectionData.data).toEqual(sectionData);
       expect(comp.isLoading).toBeFalsy();
-      expect(comp.initForm).toHaveBeenCalledWith(sectionData);
+      expect(comp.initForm).toHaveBeenCalledWith(sectionData, [], []);
       expect(comp.subscriptions).toHaveBeenCalled();
     });
 
@@ -269,7 +269,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formBuilderService.modelFromConfiguration.and.returnValue(testFormModel);
       const sectionData = {};
 
-      comp.initForm(sectionData);
+      comp.initForm(sectionData, [], []);
 
       expect(comp.formModel).toEqual(testFormModel);
 
@@ -284,7 +284,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         path: '/sections/' + sectionObject.id
       };
 
-      comp.initForm(sectionData);
+      comp.initForm(sectionData, [], []);
 
       expect(comp.formModel).toBeUndefined();
       expect(sectionsServiceStub.setSectionError).toHaveBeenCalledWith(submissionId, sectionObject.id, sectionError);
@@ -443,7 +443,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       compAsAny.formData = {};
       compAsAny.sectionMetadata = ['dc.title'];
 
-      comp.updateForm(sectionData, sectionError);
+      comp.updateForm({data: sectionData, errorsToShow: sectionError} as any);
 
       expect(comp.isUpdating).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalled();
@@ -455,15 +455,19 @@ describe('SubmissionSectionFormComponent test suite', () => {
     it('should update form error properly', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
-      const sectionData: any = {
+      const sectionData = {
         'dc.title': [new FormFieldMetadataValueObject('test')]
       };
+      const sectionState = {
+        data: sectionData,
+        errorsToShow: [{path: '/test', message: 'test'}],
+      } as any;
       comp.sectionData.data = {};
       comp.sectionData.errorsToShow = [];
       compAsAny.formData = sectionData;
       compAsAny.sectionMetadata = ['dc.title'];
 
-      comp.updateForm(sectionData, parsedSectionErrors);
+      comp.updateForm(sectionState);
 
       expect(comp.initForm).not.toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();
@@ -474,8 +478,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {};
+      const sectionErrors: any = [{ path: '/test', message: 'test'}];
 
-      comp.updateForm(sectionData, parsedSectionErrors);
+      comp.updateForm({data: sectionData, errorsToShow: sectionErrors} as any);
 
       expect(comp.initForm).not.toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();
@@ -541,7 +546,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       const sectionState = {
         data: sectionData,
         errorsToShow: parsedSectionErrors
-      };
+      } as any;
 
       formService.getFormData.and.returnValue(observableOf(formData));
       sectionsServiceStub.getSectionState.and.returnValue(observableOf(sectionState));
@@ -550,7 +555,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.formData).toEqual(formData);
-      expect(comp.updateForm).toHaveBeenCalledWith(sectionState.data, sectionState.errorsToShow);
+      expect(comp.updateForm).toHaveBeenCalledWith(sectionState);
 
     });
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 477a263edd..8e12f81097 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -322,10 +322,8 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   /**
    * Update form model
    *
-   * @param sectionData
-   *    the section data retrieved from the server
-   * @param errors
-   *    the section errors retrieved from the server
+   * @param sectionState
+   *    the section state retrieved from the server
    */
   updateForm(sectionState: SubmissionSectionObject): void {
 

From 27286998f776fb9300218f6822f15c19d8fc4d25 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Wed, 27 Mar 2024 14:15:20 +0100
Subject: [PATCH 0150/1286] 113500: Fixed lint error

(cherry picked from commit 722bd6f7f5e2b7240b6d038d83342c1c15ebae57)
---
 src/app/submission/sections/form/section-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 8e12f81097..4cbb97fd1f 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -328,7 +328,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   updateForm(sectionState: SubmissionSectionObject): void {
 
     const sectionData = sectionState.data as WorkspaceitemSectionFormObject;
-    const errors = sectionState.errorsToShow
+    const errors = sectionState.errorsToShow;
 
     if (isNotEmpty(sectionData) && !isEqual(sectionData, this.sectionData.data)) {
       this.sectionData.data = sectionData;

From 3768dc030e5adaa71f1f755db8bba95170f41e35 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Mon, 8 Apr 2024 10:40:45 +0200
Subject: [PATCH 0151/1286] 113500: Fixed lint issues

(cherry picked from commit 903af2ccdb065eb24a638904f295a0d66a4b05a7)
---
 .../sections/form/section-form.component.spec.ts          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index bce665b444..22525720fa 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -443,7 +443,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       compAsAny.formData = {};
       compAsAny.sectionMetadata = ['dc.title'];
 
-      comp.updateForm({data: sectionData, errorsToShow: sectionError} as any);
+      comp.updateForm({ data: sectionData, errorsToShow: sectionError } as any);
 
       expect(comp.isUpdating).toBeFalsy();
       expect(comp.initForm).toHaveBeenCalled();
@@ -460,7 +460,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       };
       const sectionState = {
         data: sectionData,
-        errorsToShow: [{path: '/test', message: 'test'}],
+        errorsToShow: [{ path: '/test', message: 'test' }],
       } as any;
       comp.sectionData.data = {};
       comp.sectionData.errorsToShow = [];
@@ -478,9 +478,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {};
-      const sectionErrors: any = [{ path: '/test', message: 'test'}];
+      const sectionErrors: any = [{ path: '/test', message: 'test' }];
 
-      comp.updateForm({data: sectionData, errorsToShow: sectionErrors} as any);
+      comp.updateForm({ data: sectionData, errorsToShow: sectionErrors } as any);
 
       expect(comp.initForm).not.toHaveBeenCalled();
       expect(comp.checksForErrors).toHaveBeenCalled();

From fde0ebf872a6d12fa0483da2bc1694106fea4c79 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Tue, 23 Jan 2024 17:19:50 +0100
Subject: [PATCH 0152/1286] [DURACOM-224] fix infinite scroll

(cherry picked from commit 2afa473cfb1b189c18071f6506cb1413bfcd8386)
---
 .../dso-selector/dso-selector/dso-selector.component.html    | 4 ++--
 .../dso-selector/dso-selector/dso-selector.component.ts      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 295165d171..10cdd7cd3f 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -7,12 +7,12 @@
            [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
-<div class="scrollable-menu list-group">
+<div id="scrollable-menu-dso-selector-{{randomSeed}}" class="scrollable-menu list-group">
   <div
     infiniteScroll
     [infiniteScrollDistance]="1"
     [infiniteScrollThrottle]="0"
-    [infiniteScrollContainer]="'.scrollable-menu'"
+    [infiniteScrollContainer]="'#scrollable-menu-dso-selector-' + randomSeed"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
     <ng-container *ngIf="listEntries$ | async">
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 4590e05363..4ae338dee8 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -141,6 +141,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   public subs: Subscription[] = [];
 
+  /**
+   * Random seed of 4 characters to avoid duplicate ids
+   */
+  randomSeed: string = Math.random().toString(36).substring(2, 6);
+
   constructor(
     protected searchService: SearchService,
     protected notifcationsService: NotificationsService,

From 92f2a77dae852f416921bedd87102053b0a08206 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 19 Feb 2024 13:34:29 +0100
Subject: [PATCH 0153/1286] 111326: return not found status code on missing
 identifiers

---
 .../objectnotfound.component.spec.ts             | 16 +++++++++++++++-
 .../objectnotfound/objectnotfound.component.ts   |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
index f0139e9251..b293ead102 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
@@ -6,6 +6,7 @@ import { ObjectNotFoundComponent } from './objectnotfound.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { of as observableOf } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
+import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
 describe('ObjectNotFoundComponent', () => {
   let comp: ObjectNotFoundComponent;
@@ -17,6 +18,10 @@ describe('ObjectNotFoundComponent', () => {
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({id: testUUID, idType: uuidType})
   });
+  const serverResponseServiceStub = jasmine.createSpyObj('ServerResponseService', {
+    setNotFound: jasmine.createSpy('setNotFound')
+  });
+
   const activatedRouteStubHandle = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({id: handleId, idType: handlePrefix})
   });
@@ -26,6 +31,7 @@ describe('ObjectNotFoundComponent', () => {
         imports: [
           TranslateModule.forRoot()
         ], providers: [
+          {provide: ServerResponseService, useValue: serverResponseServiceStub},
           {provide: ActivatedRoute, useValue: activatedRouteStub}
         ],
         declarations: [ObjectNotFoundComponent],
@@ -48,6 +54,10 @@ describe('ObjectNotFoundComponent', () => {
       expect(comp.idType).toEqual(uuidType);
       expect(comp.missingItem).toEqual('uuid: ' + testUUID);
     });
+
+    it('should call serverResponseService.setNotFound', () => {
+      expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled();
+    });
   });
 
   describe( 'legacy handle request', () => {
@@ -56,6 +66,7 @@ describe('ObjectNotFoundComponent', () => {
         imports: [
           TranslateModule.forRoot()
         ], providers: [
+          {provide: ServerResponseService, useValue: serverResponseServiceStub},
           {provide: ActivatedRoute, useValue: activatedRouteStubHandle}
         ],
         declarations: [ObjectNotFoundComponent],
@@ -74,6 +85,9 @@ describe('ObjectNotFoundComponent', () => {
       expect(comp.idType).toEqual(handlePrefix);
       expect(comp.missingItem).toEqual('handle: ' + handlePrefix + '/' + handleId);
     });
-  });
 
+    it('should call serverResponseService.setNotFound', () => {
+      expect(serverResponseServiceStub.setNotFound).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index bbab90f39d..cad78f8555 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,6 +1,7 @@
 
 import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
 /**
  * This component representing the `PageNotFound` DSpace page.
@@ -25,7 +26,7 @@ export class ObjectNotFoundComponent implements OnInit {
    * @param {AuthService} authservice
    * @param {ServerResponseService} responseService
    */
-  constructor(private route: ActivatedRoute) {
+  constructor(private route: ActivatedRoute, private serverResponseService: ServerResponseService) {
     route.params.subscribe((params) => {
       this.idType = params.idType;
       this.id = params.id;
@@ -38,6 +39,7 @@ export class ObjectNotFoundComponent implements OnInit {
     } else {
       this.missingItem = 'handle: ' + this.idType + '/' + this.id;
     }
+    this.serverResponseService.setNotFound();
   }
 
 }

From b43e99518d92ea725cba6129a6871e8506583190 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 19 Apr 2024 16:21:12 -0500
Subject: [PATCH 0154/1286] Update REST and CI docker compose scripts to sync
 with 7.x backend

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

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index db334f161f..a9ee500740 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,6 +33,7 @@ services:
       # Tell Statistics to commit all views immediately instead of waiting on Solr's autocommit.
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
+      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
     image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
@@ -60,15 +61,19 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x-loadsql}"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+      POSTGRES_PASSWORD: dspace
     networks:
       - dspacenet
+    ports:
+    - published: 5432
+      target: 5432
     stdin_open: true
     tty: true
     volumes:
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index c9207713a9..0650c39dc6 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -29,8 +29,9 @@ services:
       # __D__ => "-" (e.g. google__D__metadata => google-metadata)
       # dspace.dir, dspace.server.url, dspace.ui.url and dspace.name
       dspace__P__dir: /dspace
-      dspace__P__server__P__url: http://localhost:8080/server
-      dspace__P__ui__P__url: http://localhost:4000
+      # Uncomment to set a non-default value for dspace.server.url or dspace.ui.url
+      # dspace__P__server__P__url: http://localhost:8080/server
+      # dspace__P__ui__P__url: http://localhost:4000
       dspace__P__name: 'DSpace Started with Docker Compose'
       # db.url: Ensure we are using the 'dspacedb' image for our database
       db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
@@ -39,6 +40,7 @@ services:
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
+      LOGGING_CONFIG: /dspace/config/log4j2-container.xml
     image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
@@ -65,11 +67,11 @@ services:
   # DSpace database container    
   dspacedb:
     container_name: dspacedb
+    # Uses a custom Postgres image with pgcrypto installed
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
-    # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
     networks:
       - dspacenet
     ports:

From f8e0cc6808d7db0f97ebabc5f4da5f2fc2684fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Mon, 22 Apr 2024 14:42:32 -0600
Subject: [PATCH 0155/1286] added maxlength and hint to resource policy

---
 .../resource-policies/form/resource-policy-form.model.ts  | 2 ++
 src/assets/i18n/ar.json5                                  | 4 ++++
 src/assets/i18n/bn.json5                                  | 4 ++++
 src/assets/i18n/ca.json5                                  | 3 +++
 src/assets/i18n/cs.json5                                  | 4 ++++
 src/assets/i18n/de.json5                                  | 3 +++
 src/assets/i18n/el.json5                                  | 3 +++
 src/assets/i18n/en.json5                                  | 2 ++
 src/assets/i18n/es.json5                                  | 3 +++
 src/assets/i18n/fi.json5                                  | 3 +++
 src/assets/i18n/fr.json5                                  | 3 +++
 src/assets/i18n/gd.json5                                  | 4 ++++
 src/assets/i18n/hi.json5                                  | 4 ++++
 src/assets/i18n/hu.json5                                  | 4 ++++
 src/assets/i18n/it.json5                                  | 4 ++++
 src/assets/i18n/ja.json5                                  | 4 ++++
 src/assets/i18n/kk.json5                                  | 8 ++++++++
 src/assets/i18n/lv.json5                                  | 4 ++++
 src/assets/i18n/nl.json5                                  | 4 ++++
 src/assets/i18n/pl.json5                                  | 3 +++
 src/assets/i18n/pt-BR.json5                               | 4 ++++
 src/assets/i18n/pt-PT.json5                               | 4 ++++
 src/assets/i18n/sr-cyr.json5                              | 3 +++
 src/assets/i18n/sr-lat.json5                              | 3 +++
 src/assets/i18n/sv.json5                                  | 4 ++++
 src/assets/i18n/sw.json5                                  | 4 ++++
 src/assets/i18n/tr.json5                                  | 4 ++++
 src/assets/i18n/uk.json5                                  | 4 ++++
 src/assets/i18n/vi.json5                                  | 3 +++
 29 files changed, 106 insertions(+)

diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
index 0967a4e70d..71d223e764 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -68,6 +68,8 @@ const policyActionList: DynamicFormOptionConfig<any>[] = [
 export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
   id: 'name',
   label: 'resource-policies.form.name.label',
+  maxLength: 30,
+  hint: 'resource-policies.form.name.hint',
   metadataFields: [],
   repeatable: false,
   submissionId: '',
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 617d2a93de..34b11eef7f 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -5193,6 +5193,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index c9c5ba2640..7ed64d0c0a 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -4616,6 +4616,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "নাম",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+  
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "নীতির টাইপ নির্বাচন করুন",
 
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index db624f2c3f..4af472680f 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -5034,6 +5034,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Màxim 30 caràcters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Seleccioneu el tipus de política",
 
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 9816571e05..e28caf53b2 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -5098,6 +5098,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 4f9988acb6..523d98f6df 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4238,6 +4238,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Maximal 30 Zeichen",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Wählen Sie den Richtlinientyp",
 
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index 176eadff62..19aed4f908 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -1687,6 +1687,9 @@
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.name": "Ονομα",
   "resource-policies.form.name.label": "Ονομα",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Επιλέξτε τον τύπο πολιτικής",
   "resource-policies.form.policy-type.required": "Πρέπει να επιλέξετε τον τύπο πολιτικής πόρων.",
   "resource-policies.table.headers.action": "Δράση",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 07ac2f2fe3..c7d746d536 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3652,6 +3652,8 @@
 
   "resource-policies.form.name.label": "Name",
 
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   "resource-policies.form.policy-type.label": "Select the policy type",
 
   "resource-policies.form.policy-type.required": "You must select the resource policy type.",
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index dc4e3afcc7..3609d58966 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -5362,6 +5362,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nombre",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Máximo 30 caracteres",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Seleccione el tipo de política",
 
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 5fec62d2b9..fc40952e58 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -5316,6 +5316,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nimi",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Enintään 30 merkkiä",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Valitse käytäntötyyppi",
 
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 80566e589e..979c84f9b5 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -4559,6 +4559,9 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "30 caractères maximum",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Sélectionner le type de règle",
 
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 929ab87d10..179cfbccae 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -4611,6 +4611,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Ainm",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Tagh an seòrsa poileasaidh",
 
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index 68eb6c1f12..ce9a93be89 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -3421,6 +3421,10 @@
 
   "resource-policies.form.name.label": "नाम",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   "resource-policies.form.policy-type.label": "नीति प्रकार चुनें",
 
   "resource-policies.form.policy-type.required": "आपको संसाधन नीति प्रकार का चयन करना होगा।",
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index afbfa25a13..db03a3140e 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -5906,6 +5906,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Név",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Szabály típus kiválasztása",
 
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index ad2478ae61..d038697db8 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -5429,6 +5429,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selezionare il tipo di criterio",
 
diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5
index 03323eb7ef..e9eea2af0d 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -5193,6 +5193,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index dbaa8078e2..3cc4750df0 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -4966,6 +4966,14 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Аты",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Саясат түрін таңдаңыз",
 
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 3ceaac7fea..be9eda79e9 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -4307,6 +4307,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index fc52543c38..7c20a083b0 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -4610,6 +4610,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index 7a857ae4fd..a3a01d5011 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -1535,6 +1535,9 @@
   "resource-policies.form.date.start.label": "Data rozpoczęcia",
   "resource-policies.form.description.label": "Opis",
   "resource-policies.form.name.label": "Nazwa",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Wybierz typ polityki",
   "resource-policies.form.policy-type.required": "Musisz wybrać typ polityki zasobu.",
   "resource-policies.table.headers.action": "Akcja",
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 5061c5a0e9..8f4384effe 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -5373,6 +5373,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selecione o tipo política",
 
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 328cb20810..60ef361374 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -5315,6 +5315,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Selecione o tipo de política",
 
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
index 81b776529c..6dd1b48a1c 100644
--- a/src/assets/i18n/sr-cyr.json5
+++ b/src/assets/i18n/sr-cyr.json5
@@ -1787,6 +1787,9 @@
   "resource-policies.form.date.start.label": "Датум почетка",
   "resource-policies.form.description.label": "Опис",
   "resource-policies.form.name.label": "Име",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Изаберите тип полисе",
   "resource-policies.form.policy-type.required": "Морате да изаберете тип полисе ресурса.",
   "resource-policies.table.headers.action": "Поступак",
diff --git a/src/assets/i18n/sr-lat.json5 b/src/assets/i18n/sr-lat.json5
index ebcc8aeb9a..48376ee6d9 100644
--- a/src/assets/i18n/sr-lat.json5
+++ b/src/assets/i18n/sr-lat.json5
@@ -1787,6 +1787,9 @@
   "resource-policies.form.date.start.label": "Datum početka",
   "resource-policies.form.description.label": "Opis",
   "resource-policies.form.name.label": "Ime",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Izaberite tip polise",
   "resource-policies.form.policy-type.required": "Morate da izaberete tip polise resursa.",
   "resource-policies.table.headers.action": "Postupak",
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index d2fe72536c..05d77728f6 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -4737,6 +4737,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Namn",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Välj typ av policy",
 
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index d2d663cdc5..a402570e9d 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -5193,6 +5193,10 @@
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   // TODO New key - Add a translation
   "resource-policies.form.policy-type.label": "Select the policy type",
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index 75bc5c9a36..631fe923f4 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -3951,6 +3951,10 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Ad",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Politika türünü seçin",
 
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
index fae770b6bd..fb2613e744 100644
--- a/src/assets/i18n/uk.json5
+++ b/src/assets/i18n/uk.json5
@@ -4148,6 +4148,10 @@
 
   "resource-policies.form.name.label": "Назва",
 
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
 
   "resource-policies.form.policy-type.label": "Виберіть тип політики",
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
index f9fb33ebcb..278f560e8b 100644
--- a/src/assets/i18n/vi.json5
+++ b/src/assets/i18n/vi.json5
@@ -1828,6 +1828,9 @@
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.name": "Tên",
   "resource-policies.form.name.label": "Tên",
+  //"resource-policies.form.name.hint": "Max 30 characters",
+  // TODO New key - Add a translation
+  "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.policy-type.label": "Lựa chọn kiểu chính sách",
   "resource-policies.form.policy-type.required": "Bạn cần lựa chọn kiểu chính sách tài nguyên.",
   "resource-policies.table.headers.action": "Quyền",

From e4b098e64dd98af3d87c8f9f2f28f9c3ea3c0336 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 25 Apr 2024 10:56:54 +0200
Subject: [PATCH 0156/1286] update test

---
 .../item-relationships.component.spec.ts           |  2 +-
 .../item-relationships.component.ts                | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index aa711c8ea3..b7bd0f789f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -266,7 +266,7 @@ describe('ItemRelationshipsComponent', () => {
     });
 
     it('it should delete the correct relationship', () => {
-      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left');
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationships[1].uuid, 'left', false);
     });
   });
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 433e0a9493..033f22a40b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -4,11 +4,9 @@ import {
   DeleteRelationship,
   RelationshipIdentifiable,
 } from '../../../core/data/object-updates/object-updates.reducer';
-import { map, startWith, switchMap, take, concatMap, toArray, tap } from 'rxjs/operators';
+import { map, switchMap, take, concatMap, toArray } from 'rxjs/operators';
 import {
   combineLatest as observableCombineLatest,
-  of as observableOf,
-  zip as observableZip,
   Observable,
   BehaviorSubject, EMPTY
 } from 'rxjs';
@@ -36,7 +34,6 @@ import { FieldChangeType } from '../../../core/data/object-updates/field-change-
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { HALLink } from '../../../core/shared/hal-link.model';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -144,7 +141,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
       switchMap(([removeUpdates, addUpdates]) => [...removeUpdates, ...addUpdates]),
       concatMap((update: FieldUpdate) => {
         if (update.changeType === FieldChangeType.REMOVE) {
-          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1))
+          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1));
         } else if (update.changeType === FieldChangeType.ADD) {
           return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
             take(1),
@@ -165,12 +162,11 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
                     map(() => relationshipRD)
                   );
                 }
-              }
-              else {
+              } else {
                 return [relationshipRD];
               }
             })
-          )
+          );
         } else {
           return EMPTY;
         }
@@ -228,7 +224,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
         }
         return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue, false);
       }),
-    )
+    );
 
   }
 

From f055ff6fbd91b804bddc6530dae69e07a63ae099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Thu, 25 Apr 2024 16:19:21 -0600
Subject: [PATCH 0157/1286] Fix: author search result without co-author

---
 ...-search-result-list-element.component.html |  2 +-
 .../search-result-list-element.component.ts   | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

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 f7a687048a..69d28c79d2 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
@@ -29,7 +29,7 @@
           <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
           </ng-container>
           <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span *ngFor="let author of allMetadataNoExcludingValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                 <span *ngIf="!last">; </span>
             </span>
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 e13be91e63..64084215d2 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
@@ -47,6 +47,28 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
+  /**
+   * Gets all matching metadata string values from hitHighlights or dso metadata.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string[]} the matching string values or an empty array.
+   */
+  allMetadataNoExcludingValues(keyOrKeys: string | string[]): string[] {
+    let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
+    let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
+    let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
+    for (let i = 0; i < removedHighlights.length; i++) {
+        let index = dsoMetadata.indexOf(removedHighlights[i]);        
+        if (index !== -1) {
+          dsoMetadata[index] = highlights[i];
+        }
+    }
+    console.log(dsoMetadata);
+    console.log(highlights);
+    console.log(removedHighlights);
+    return dsoMetadata;
+  }
+
   /**
    * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
    *

From 2530845b9b17e6acb9de2c784acffc19338a8e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Fri, 26 Apr 2024 17:38:06 -0600
Subject: [PATCH 0158/1286] Fix trailing spaces and removed console.log

---
 .../search-result-list-element.component.ts                  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 64084215d2..0621998729 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
@@ -58,14 +58,11 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
     let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
-        let index = dsoMetadata.indexOf(removedHighlights[i]);        
+        let index = dsoMetadata.indexOf(removedHighlights[i]);
         if (index !== -1) {
           dsoMetadata[index] = highlights[i];
         }
     }
-    console.log(dsoMetadata);
-    console.log(highlights);
-    console.log(removedHighlights);
     return dsoMetadata;
   }
 

From dabc0e9b4bc606c3d2a2ac074a53c56856e4f9c1 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 18 Apr 2023 15:53:17 +0200
Subject: [PATCH 0159/1286] [Ticket 2124] Slow response times

---
 src/app/core/submission/submission-rest.service.spec.ts | 2 +-
 src/app/core/submission/submission-rest.service.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 46e536ff7d..ec6fe10ec1 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -26,7 +26,7 @@ describe('SubmissionRestService test suite', () => {
   const resourceEndpoint = 'workspaceitems';
   const resourceScope = '260';
   const body = { test: new FormFieldMetadataValueObject('test') };
-  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?projection=full';
+  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?embed=sections,collection';
   const timestampResponse = 1545994811992;
 
   function initTestService() {
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index cf4b741af2..3dc885ea03 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -70,7 +70,7 @@ export class SubmissionRestService {
    */
   protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
     let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
-    url = new URLCombiner(url, '?projection=full').toString();
+    url = new URLCombiner(url, '?embed=sections,collection').toString();
     if (collectionId) {
       url = new URLCombiner(url, `&owningCollection=${collectionId}`).toString();
     }

From 65860b81b12246fde47130e2a90e6f2950ebf2f7 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 28 Nov 2023 19:17:23 +0100
Subject: [PATCH 0160/1286] 108595: fix for overflowing search filter badge
 selection

---
 .../search-label/search-label.component.html             | 8 +++++---
 .../search-label/search-label.component.scss             | 3 +++
 .../search-labels/search-label/search-label.component.ts | 1 +
 .../search/search-labels/search-labels.component.html    | 4 ++--
 .../search/search-labels/search-labels.component.scss    | 9 ++++++++-
 src/app/shared/search/search.component.html              | 4 ++--
 6 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 src/app/shared/search/search-labels/search-label/search-label.component.scss

diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 2269771de1..2a2c6955a8 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,7 +1,9 @@
-<a class="badge badge-primary mr-1 mb-1"
+<a class="badge badge-primary mb-1"
    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + key) | translate, value: normalizeFilterValue(value) }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
-    {{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}
-    <span aria-hidden="true"> ×</span>
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}</span>
+      <span class="pl-1">×</span>
+    </span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.scss b/src/app/shared/search/search-labels/search-label/search-label.component.scss
new file mode 100644
index 0000000000..601f57d407
--- /dev/null
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.scss
@@ -0,0 +1,3 @@
+.badge {
+  white-space: inherit;
+}
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
index ab4c57d9f5..bdcdc3efdb 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -12,6 +12,7 @@ import { stripOperatorFromFilterValue } from '../../search.utils';
 @Component({
   selector: 'ds-search-label',
   templateUrl: './search-label.component.html',
+  styleUrls: ['./search-label.component.scss']                                                        ,
 })
 
 /**
diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
index f6af072c51..4812dd5096 100644
--- a/src/app/shared/search/search-labels/search-labels.component.html
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -1,5 +1,5 @@
 <div class="labels">
-    <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys)">
-        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
+    <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys); let lastType = last">
+        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]; let lastOfType = last" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
     </ng-container>
 </div>
diff --git a/src/app/shared/search/search-labels/search-labels.component.scss b/src/app/shared/search/search-labels/search-labels.component.scss
index c48cd57304..348c46571d 100644
--- a/src/app/shared/search/search-labels/search-labels.component.scss
+++ b/src/app/shared/search/search-labels/search-labels.component.scss
@@ -1,3 +1,10 @@
 :host {
     line-height: 1;
-}
\ No newline at end of file
+  .labels {
+    margin: 0 calc(-1 * var(--bs-spacer)/8);
+    ds-search-label {
+      display: inline-block;
+      padding: 0 calc(var(--bs-spacer)/8);
+    }
+  }
+}
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index e7dd02e286..845e1e7af5 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -90,8 +90,8 @@
                     [inPlaceSearch]="inPlaceSearch"
                     [searchPlaceholder]="searchFormPlaceholder | translate">
     </ds-themed-search-form>
-    <div class="row mb-3 mb-md-1">
-        <div class="labels col-sm-9">
+    <div class="mb-3 mb-md-1">
+        <div class="labels">
             <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
         </div>
     </div>

From e1fe4031e5f92918c1f780121d42344d420b194e Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 30 Nov 2023 12:14:24 +0100
Subject: [PATCH 0161/1286] Removed unnecessary change

---
 .../shared/search/search-labels/search-labels.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
index 4812dd5096..f6af072c51 100644
--- a/src/app/shared/search/search-labels/search-labels.component.html
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -1,5 +1,5 @@
 <div class="labels">
-    <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys); let lastType = last">
-        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]; let lastOfType = last" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
+    <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys)">
+        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
     </ng-container>
 </div>

From ebb99c813ab2c2ec744ff777cbef3a8f32d891a3 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 30 Nov 2023 12:14:51 +0100
Subject: [PATCH 0162/1286] Merge branch
 'w2p-108595_multiline-search-filter-badge' into
 multiline-search-filter-badge_main

---
 .../search-labels/search-label/search-label.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 2a2c6955a8..a601534271 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -4,6 +4,6 @@
    [queryParams]="(removeParameters | async)" queryParamsHandling="merge">
     <span class="d-flex">
       <span class="flex-grow-1 text-left">{{('search.filters.applied.' + key) | translate}}: {{'search.filters.' + filterName + '.' + value | translate: {default: normalizeFilterValue(value)} }}</span>
-      <span class="pl-1">×</span>
+      <span class="pl-1" aria-hidden="true">×</span>
     </span>
 </a>

From 6447c3769bdc515edf05f78ea13bc823046ead31 Mon Sep 17 00:00:00 2001
From: Bram Luyten <bram@atmire.com>
Date: Tue, 12 Dec 2023 11:16:39 +0100
Subject: [PATCH 0163/1286] Update robots.txt.ejs

Fix for issue #2709

(cherry picked from commit fbd35296f03968ae78a38478053fe8d8d3286b21)
---
 src/robots.txt.ejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/robots.txt.ejs b/src/robots.txt.ejs
index cd5e228b3a..f6dc7fa5cb 100644
--- a/src/robots.txt.ejs
+++ b/src/robots.txt.ejs
@@ -16,6 +16,8 @@ Disallow: /submit
 Disallow: /workspaceitems
 Disallow: /profile
 Disallow: /workflowitems
+# Crawlers should be able to access entity pages, but not the facet search links present on entity pages
+Disallow: /entities/*?f
 
 # Optionally uncomment the following line ONLY if sitemaps are working
 # and you have verified that your site is being indexed correctly.

From 45840c1c172cb6c75b0a8a09a1d1391f7e2ddf2d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 1 May 2024 14:15:45 -0500
Subject: [PATCH 0164/1286] Remove obsolete "version" tag from compose files

(cherry picked from commit d6303de87748b9689edcdd4c229ae067e56613d1)
---
 docker/cli.assetstore.yml      | 2 --
 docker/cli.ingest.yml          | 2 --
 docker/cli.yml                 | 1 -
 docker/db.entities.yml         | 2 --
 docker/docker-compose-ci.yml   | 1 -
 docker/docker-compose-dist.yml | 1 -
 docker/docker-compose-rest.yml | 1 -
 docker/docker-compose.yml      | 1 -
 8 files changed, 11 deletions(-)

diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 31bc53f64d..98f7414861 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -12,8 +12,6 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.assetstore.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
-
 services:
   dspace-cli:
     environment:
diff --git a/docker/cli.ingest.yml b/docker/cli.ingest.yml
index 1db241af3b..cc3623298e 100644
--- a/docker/cli.ingest.yml
+++ b/docker/cli.ingest.yml
@@ -12,8 +12,6 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/cli.ingest.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
-
 services:
   dspace-cli:
     environment:
diff --git a/docker/cli.yml b/docker/cli.yml
index fa53ef6069..890fbde956 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -12,7 +12,6 @@
 # https://github.com/DSpace/DSpace/blob/main/docker-compose-cli.yml
 #
 # Therefore, it should be kept in sync with that file
-version: "3.7"
 networks:
   # Default to using network named 'dspacenet' from docker-compose-rest.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index 6473bf2e38..5c0a15c8f6 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -12,8 +12,6 @@
 # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
 #
 # # Therefore, it should be kept in sync with that file
-version: "3.7"
-
 services:
   dspacedb:
     image: dspace/dspace-postgres-pgcrypto:loadsql
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index a9ee500740..9431a02a87 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -10,7 +10,6 @@
 # This is used by our GitHub CI at .github/workflows/build.yml
 # It is based heavily on the Backend's Docker Compose:
 # https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
-version: '3.7'
 networks:
   dspacenet:
 services:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 00225e8052..1f4d2d7f5e 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -8,7 +8,6 @@
 
 # Docker Compose for running the DSpace Angular UI dist build
 # for previewing with the DSpace Demo site backend
-version: '3.7'
 networks:
   dspacenet:
 services:
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 0650c39dc6..37bccee364 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -10,7 +10,6 @@
 # This is based heavily on the docker-compose.yml that is available in the DSpace/DSpace
 # (Backend) at:
 # https://github.com/DSpace/DSpace/blob/main/docker-compose.yml
-version: '3.7'
 networks:
   dspacenet:
     ipam:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1387b1de39..8bce9548ab 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,6 @@
 # Docker Compose for running the DSpace Angular UI for testing/development
 # Requires also running a REST API backend (either locally or remotely),
 # for example via 'docker-compose-rest.yml'
-version: '3.7'
 networks:
   dspacenet:
 services:

From 861132d04d3da18bd48ec8c3651dfbb9dbf6ae14 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 25 Mar 2024 13:19:01 +0100
Subject: [PATCH 0165/1286] 113319: Add dropdown entry to clear selection

(cherry picked from commit 13d1547b3dbf5d4cd74617d6327044da798ed44e)
---
 .../dynamic-scrollable-dropdown.component.html            | 8 +++++++-
 src/assets/i18n/en.json5                                  | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index d840b696cc..50acdd575c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -40,7 +40,13 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item collection-item text-truncate"
+              (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
+              title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
+      >
+        <i>{{ 'dropdown.clear' | translate }}</i>
+      </button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b870662d72..1dbb5ed1b7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1468,6 +1468,10 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dropdown.clear": "Clear selection",
+
+  "dropdown.clear.tooltip": "Clear the selected option",
+
   "dso.name.untitled": "Untitled",
 
   "dso.name.unnamed": "Unnamed",

From e9c5340f6720272d1f076ad74b6bf23ceb134ccb Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 26 Mar 2024 07:59:34 +0100
Subject: [PATCH 0166/1286] 113319: Fix dropdown component spec

(cherry picked from commit 70357803e86caabc6357b7cbec9db1ef8edd2a56)
---
 .../dynamic-scrollable-dropdown.component.spec.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 05e46c6e6d..116e4a0f46 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -165,7 +165,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         scrollableDropdownFixture.detectChanges();
 
         de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
-        btnEl = de[0].nativeElement;
+        btnEl = de[1].nativeElement;
 
         btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();

From a250de49a0332c09520d31f4b425df6b6e924c95 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 22 Feb 2024 15:35:18 -0500
Subject: [PATCH 0167/1286] Update fr.json5 to add access conditions labels

Changes to the labels related to access control and access conditions.

(cherry picked from commit e747520646e4ed1458a69601b63a4dd06b4e05a5)
---
 src/assets/i18n/fr.json5 | 59 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 80566e589e..b636883850 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6177,8 +6177,6 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolonger la session",
 
-
-
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 
@@ -6251,6 +6249,63 @@
   //"admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Messages d'avertissement",
 
+//"item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+"item-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès des métadonnées de l'Item et de ses Bitstreams.",
+
+//"collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+"collection-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de cette collection. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+
+//"community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+"community-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de toutes les collections de cette communauté. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+
+//"access-control-item-header-toggle": “Item's Metadata”,
+"access-control-item-header-toggle": “Métadonnées de l'Item”,
+
+//"access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+"access-control-item-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+
+//"access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+"access-control-item-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+
+//"access-control-bitstream-header-toggle": "Bitstreams",
+"access-control-bitstream-header-toggle": "Bitstreams",
+
+//"access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+"access-control-bitstream-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les Bitstreams",
+
+//"access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+"access-control-bitstream-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les Bitstreams",
+
+//"access-control-mode": "Mode",
+"access-control-mode": "Mode",
+
+//"access-control-access-conditions": "Access conditions",
+"access-control-access-conditions": "Conditions d'accès",
+
+//"access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+//"access-control-no-access-conditions-warning-message": "Aucune condition d'accès n'est spécifiée ci-dessous pour l'instant. Si exécuté, ceci remplacera les conditions d'accès actuelles par les conditions d'accès par défaut héritées de celles de la collection.",
+
+//"access-control-replace-all": "Replace access conditions",
+"access-control-replace-all": "Remplacer les conditions d'accès",
+
+//"access-control-add-to-existing":"Add to existing ones", 
+"access-control-add-to-existing":"Ajouter aux conditions d'accès existantes", 
+
+//"access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+"access-control-limit-to-specific": "Limiter les modifications à des Bitstreams spécifiques",
+
+//"access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+"access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'item",
+
+//"access-control-bitstreams-selected": "bitstreams selected",
+"access-control-bitstreams-selected": "Bitstreams sélectionnés",
+
+//"access-control-bitstreams-select": "Select bitstreams",
+"access-control-bitstreams-select": "Sélectionner les Bitstreams",
+
+//"access-control-cancel": "Cancel",
+"access-control-cancel": "Annuler",
+
 
 }
 

From ae354615169311641f425fa1de1b9315307fb5d1 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 22 Feb 2024 16:06:43 -0500
Subject: [PATCH 0168/1286] Update fr.json5 to add batch upload labels

Addition of batch upload labels (ZIP, SAF)

(cherry picked from commit c4548e63ca198a0b451b871ca91148a33a5e34f9)
---
 src/assets/i18n/fr.json5 | 61 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index b636883850..a9ff86df91 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -313,6 +313,33 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre des schémas de métadonnées",
 
+    //"admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+   "admin.access-control.bulk-access.breadcrumbs": "Gestion des accès en lot",
+   
+  //"administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Résultats de recherche",
+  
+  //"admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestion des accès en lot",
+
+  //"admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestion des accès en lot"
+  
+
+  //"admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Étape 1 : Sélectionner les objets",
+
+  //"admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Chercher",
+
+
+  //"admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Sélection actuelle({{number}})",
+
+
+  //"admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Étape 2 : Opération à éxecuter",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Supprimer un(e) EPerson",
 
@@ -772,18 +799,34 @@
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
 
+  //"admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importation en lots",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importer Métadonnées",
 
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importer Métadonnées",
 
+  //"admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importation en 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": "Vous pouvez glisser-déposer ou rechercher ici des fichiers CSV qui contiennent des opérations en lot sur les métadonnées",
 
+//"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": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
+
+//"admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", 
+"admin.batch-import.page.toggle.help": "Il est possible d'effectuer l'importation en téléversant un fichier ou en utilisant un URL. Utiliser le bouton à bascule ci-dessus afin de sélectionner la source.", 
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Déposer un fichier CSV à importer",
 
+  //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+ "admin.batch-import.page.dropMsg": "Glisser/déposer un fichier zip à importer",
+
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Déposer un nouveau fichier CSV pour remplacer le fichier à importer",
 
@@ -793,9 +836,27 @@
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Importer",
 
+  //"admin.metadata-import.page.button.select-collection": "Select Collection",
+"admin.metadata-import.page.button.select-collection": "Sélectionner une collection",
+  
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Veuillez d'abord sélectionner un fichier",
 
+  //"admin.metadata-import.page.toggle.upload": "Upload",
+"admin.metadata-import.page.toggle.upload": "Téléverser",
+  
+  //"admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Valider seulement",
+
+  //"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": "Si activé, le fichier CSV sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux métadonnées.",
+
+  //"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": "Si activé, le fichier ZIP SAF sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux données.", 
+
+ //"admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "supprimer",
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Adresse électronique ou mot de passe non valide.",
 

From 7129d6b9c871815c582adb4e6e410e8e1328ed17 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 23 Feb 2024 13:32:06 -0500
Subject: [PATCH 0169/1286] Update fr.json5 to adresse reviewer feedback

(cherry picked from commit 46df7e805e2eac71c31acd35bd15367ceb5efc46)
---
 src/assets/i18n/fr.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index a9ff86df91..45eec84e44 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -338,7 +338,7 @@
 
 
   //"admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
-  "admin.access-control.bulk-access-settings.header": "Étape 2 : Opération à éxecuter",
+  "admin.access-control.bulk-access-settings.header": "Étape 2 : Opération à exécuter",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Supprimer un(e) EPerson",
@@ -815,7 +815,7 @@
   "admin.metadata-import.page.help": "Vous pouvez glisser-déposer ou rechercher ici des fichiers CSV qui contiennent des opérations en lot sur les métadonnées",
 
 //"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": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
+"admin.batch-import.page.help": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
 
 //"admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", 
 "admin.batch-import.page.toggle.help": "Il est possible d'effectuer l'importation en téléversant un fichier ou en utilisant un URL. Utiliser le bouton à bascule ci-dessus afin de sélectionner la source.", 
@@ -6356,7 +6356,7 @@
 "access-control-limit-to-specific": "Limiter les modifications à des Bitstreams spécifiques",
 
 //"access-control-process-all-bitstreams": "Update all the bitstreams in the item",
-"access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'item",
+"access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'Item",
 
 //"access-control-bitstreams-selected": "bitstreams selected",
 "access-control-bitstreams-selected": "Bitstreams sélectionnés",

From 053844a7bcb313682d1d87fb051d0be420efb625 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Tue, 23 Apr 2024 14:14:55 -0400
Subject: [PATCH 0170/1286] Update fr.json5 - adding missing comma

(cherry picked from commit 3b98c8c84f134cd866cfd81535b5a7896713d02f)
---
 src/assets/i18n/fr.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 45eec84e44..85623a21ac 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -323,7 +323,7 @@
   "admin.access-control.bulk-access": "Gestion des accès en lot",
 
   //"admin.access-control.bulk-access.title": "Bulk Access Management",
-  "admin.access-control.bulk-access.title": "Gestion des accès en lot"
+  "admin.access-control.bulk-access.title": "Gestion des accès en lot",
   
 
   //"admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",

From b06bece1cb9d9665f397bec378ea2474c3409238 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Tue, 23 Apr 2024 15:49:08 -0400
Subject: [PATCH 0171/1286] Update fr.json5 correcting bad quotation marks

(cherry picked from commit 1abc7967343e5307acf6bd617f271e2cc60c2d34)
---
 src/assets/i18n/fr.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 85623a21ac..04d8586499 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6319,8 +6319,8 @@
 //"community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
 "community-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de toutes les collections de cette communauté. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
 
-//"access-control-item-header-toggle": “Item's Metadata”,
-"access-control-item-header-toggle": “Métadonnées de l'Item”,
+//"access-control-item-header-toggle": "Item's Metadata",
+"access-control-item-header-toggle": "Métadonnées de l'Item",
 
 //"access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
 "access-control-item-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",

From 07a91222c4077186fc2b9712fb0a58909a56d771 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 3 May 2024 11:16:59 -0500
Subject: [PATCH 0172/1286] lint fixes

(cherry picked from commit 3bb559542d6f776421daeb03644bad7028c232e4)
---
 src/assets/i18n/fr.json5 | 108 +++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 04d8586499..a71e1911ec 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -313,18 +313,18 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre des schémas de métadonnées",
 
-    //"admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
-   "admin.access-control.bulk-access.breadcrumbs": "Gestion des accès en lot",
-   
+  //"admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestion des accès en lot",
+
   //"administrativeBulkAccess.search.results.head": "Search Results",
   "administrativeBulkAccess.search.results.head": "Résultats de recherche",
-  
+
   //"admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "Gestion des accès en lot",
 
   //"admin.access-control.bulk-access.title": "Bulk Access Management",
   "admin.access-control.bulk-access.title": "Gestion des accès en lot",
-  
+
 
   //"admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
   "admin.access-control.bulk-access-browse.header": "Étape 1 : Sélectionner les objets",
@@ -814,17 +814,17 @@
   // "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": "Vous pouvez glisser-déposer ou rechercher ici des fichiers CSV qui contiennent des opérations en lot sur les métadonnées",
 
-//"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": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
+  //"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": "Sélectionner la collection dans laquelle importer les données. Ensuite, ajouter le fichier zip Simple Archive Format (SAF) contenant tous les Items à importer.",
 
-//"admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source", 
-"admin.batch-import.page.toggle.help": "Il est possible d'effectuer l'importation en téléversant un fichier ou en utilisant un URL. Utiliser le bouton à bascule ci-dessus afin de sélectionner la source.", 
+  //"admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Il est possible d'effectuer l'importation en téléversant un fichier ou en utilisant un URL. Utiliser le bouton à bascule ci-dessus afin de sélectionner la source.",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Déposer un fichier CSV à importer",
 
   //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
- "admin.batch-import.page.dropMsg": "Glisser/déposer un fichier zip à importer",
+  "admin.batch-import.page.dropMsg": "Glisser/déposer un fichier zip à importer",
 
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
@@ -837,14 +837,14 @@
   "admin.metadata-import.page.button.proceed": "Importer",
 
   //"admin.metadata-import.page.button.select-collection": "Select Collection",
-"admin.metadata-import.page.button.select-collection": "Sélectionner une collection",
-  
+  "admin.metadata-import.page.button.select-collection": "Sélectionner une collection",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Veuillez d'abord sélectionner un fichier",
 
   //"admin.metadata-import.page.toggle.upload": "Upload",
-"admin.metadata-import.page.toggle.upload": "Téléverser",
-  
+  "admin.metadata-import.page.toggle.upload": "Téléverser",
+
   //"admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Valider seulement",
 
@@ -852,9 +852,9 @@
   "admin.metadata-import.page.validateOnly.hint": "Si activé, le fichier CSV sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux métadonnées.",
 
   //"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": "Si activé, le fichier ZIP SAF sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux données.", 
+  "admin.batch-import.page.validateOnly.hint": "Si activé, le fichier ZIP SAF sera uniquement validé. Vous recevrez un rapport identifiant les changements détectés, mais aucun changement ne sera appliqué aux données.",
 
- //"admin.batch-import.page.remove": "remove",
+  //"admin.batch-import.page.remove": "remove",
   "admin.batch-import.page.remove": "supprimer",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
@@ -6310,62 +6310,62 @@
   //"admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Messages d'avertissement",
 
-//"item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
-"item-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès des métadonnées de l'Item et de ses Bitstreams.",
+  //"item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès des métadonnées de l'Item et de ses Bitstreams.",
 
-//"collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
-"collection-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de cette collection. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+  //"collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de cette collection. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
 
-//"community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
-"community-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de toutes les collections de cette communauté. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
+  //"community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Ce formulaire vous permet de changer les conditions d'accès de tous les Items de toutes les collections de cette communauté. Les changements peuvent être appliqués aux métadonnées des Items ou à leur contenu (Bitstreams).",
 
-//"access-control-item-header-toggle": "Item's Metadata",
-"access-control-item-header-toggle": "Métadonnées de l'Item",
+  //"access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Métadonnées de l'Item",
 
-//"access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
-"access-control-item-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+  //"access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
 
-//"access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
-"access-control-item-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
+  //"access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les métadonnées de l'Item",
 
-//"access-control-bitstream-header-toggle": "Bitstreams",
-"access-control-bitstream-header-toggle": "Bitstreams",
+  //"access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Bitstreams",
 
-//"access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
-"access-control-bitstream-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les Bitstreams",
+  //"access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Activer l'option permettant d'effectuer des modifications sur les Bitstreams",
 
-//"access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
-"access-control-bitstream-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les Bitstreams",
+  //"access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Désactiver l'option permettant d'effectuer des modifications sur les Bitstreams",
 
-//"access-control-mode": "Mode",
-"access-control-mode": "Mode",
+  //"access-control-mode": "Mode",
+  "access-control-mode": "Mode",
 
-//"access-control-access-conditions": "Access conditions",
-"access-control-access-conditions": "Conditions d'accès",
+  //"access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Conditions d'accès",
 
-//"access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
-//"access-control-no-access-conditions-warning-message": "Aucune condition d'accès n'est spécifiée ci-dessous pour l'instant. Si exécuté, ceci remplacera les conditions d'accès actuelles par les conditions d'accès par défaut héritées de celles de la collection.",
+  //"access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  //"access-control-no-access-conditions-warning-message": "Aucune condition d'accès n'est spécifiée ci-dessous pour l'instant. Si exécuté, ceci remplacera les conditions d'accès actuelles par les conditions d'accès par défaut héritées de celles de la collection.",
 
-//"access-control-replace-all": "Replace access conditions",
-"access-control-replace-all": "Remplacer les conditions d'accès",
+  //"access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Remplacer les conditions d'accès",
 
-//"access-control-add-to-existing":"Add to existing ones", 
-"access-control-add-to-existing":"Ajouter aux conditions d'accès existantes", 
+  //"access-control-add-to-existing":"Add to existing ones",
+  "access-control-add-to-existing": "Ajouter aux conditions d'accès existantes",
 
-//"access-control-limit-to-specific": "Limit the changes to specific bitstreams",
-"access-control-limit-to-specific": "Limiter les modifications à des Bitstreams spécifiques",
+  //"access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limiter les modifications à des Bitstreams spécifiques",
 
-//"access-control-process-all-bitstreams": "Update all the bitstreams in the item",
-"access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'Item",
+  //"access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Mise à jour de tous les Bitstreams de l'Item",
 
-//"access-control-bitstreams-selected": "bitstreams selected",
-"access-control-bitstreams-selected": "Bitstreams sélectionnés",
+  //"access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "Bitstreams sélectionnés",
 
-//"access-control-bitstreams-select": "Select bitstreams",
-"access-control-bitstreams-select": "Sélectionner les Bitstreams",
+  //"access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Sélectionner les Bitstreams",
 
-//"access-control-cancel": "Cancel",
-"access-control-cancel": "Annuler",
+  //"access-control-cancel": "Cancel",
+  "access-control-cancel": "Annuler",
 
 
 }

From aa7496e41d4d03a28974ee0ee39b2ce7176c213b Mon Sep 17 00:00:00 2001
From: Mohamed Ali <66433220+mohamedali654321@users.noreply.github.com>
Date: Wed, 13 Mar 2024 04:42:58 -0700
Subject: [PATCH 0173/1286] Added Arabic Translation

---
 config/config.example.yml |     3 +
 src/assets/i18n/ar.json5  | 10870 ++++++++++++++++++++++++------------
 2 files changed, 7389 insertions(+), 3484 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index e87ad1f89f..bcdc447db5 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -176,6 +176,9 @@ languages:
   - code: en
     label: English
     active: true
+  - code: ar
+    label: العربية
+    active: true
   - code: ca
     label: Català
     active: true
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 617d2a93de..cf7f7b05bd 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -1,6744 +1,10646 @@
 {
 
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "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": "غير مصرح لك بالوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
 
   // "401.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "401.link.home-page": "Take me to the home page",
-
-  // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-
+  "401.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "بدون تصريح",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "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": "ليس لديك صلاحية الوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
 
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
-  // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "ممنوع",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "الخدمة غير متاحة",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "الخادم غير قادر مؤقتًا على تلبية طلبك بسبب توقف الصيانة أو وجود مشاكل في السعة. يرجى إعادة المحاولة في وقت لاحق.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
   // "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. ",
-  // TODO New key - Add a translation
-  "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": "تعذر العثور على الصفحة التي تبحث عنها. ربما تمت إزالتها أو حذفها. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.  ",
 
   // "404.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "اذهب إلى الصفحة الرئيسية",
 
-  // "404.page-not-found": "page not found",
-  // TODO New key - Add a translation
-  "404.page-not-found": "page not found",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "لم يتم العثور على الصفحة",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "بدون تصريح",
+
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "ممنوع",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "الخدمة غير متاحة",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "لم يتم العثور على الصفحة",
+
+  // "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": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. يرجى التأكد من أنك قمت بمشاركة عنوان البريد الإلكتروني الخاص بحساب أوركيد الخاص بك مع دي سبيس. إذا استمر الخطأ، فاتصل بالمسؤول",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "حظر",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "ميتاداتا فقط",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "وصول حر",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "مقيد",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "غير معروف",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "مهام أكرتة النظام",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "مهام أكرتة النظام",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "مهام أكرتة النظام",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "سجل التنسيق",
 
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تنسيق تدفق البت الجديد.",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "فشل",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "إنشاء تنسيق تدفق بت",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "إضافة تنسيق تدفق بت جديد",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تنسيق تدفق البت الجديد بنجاح.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "فشل إزالة {{ amount }} تنسيقًا",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "فشل",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "تمت إزالة {{ amount }} تنسيقًا بنجاح",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "توفر قائمة تنسيقات تدفق البت معلومات حول التنسيقات المعروفة ومستوى دعمها.",
 
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "الوصف",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف تنسيق الملفات المرفوعة تلقائيًا. يمكنك إدخال عدة امتدادات لكل تنسيق.",
 
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "امتدادات الملفات",
 
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بإدخال امتداد ملف بدون النقطة",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تنسيق تدفق البت.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "فشل",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "تنسيق تدفق البت: {{ format }}",
 
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO New key - Add a translation
-  "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": "التنسيقات الداخلية مخفية من المستخدم، وتستخدم لأغراض إدارية.",
 
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "داخلي",
 
   // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
-  // TODO New key - Add a translation
-  "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": "نوع المايم المرتبط بهذا التنسيق، لا يجب أن يكون فريدًا.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع المايم",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  // TODO New key - Add a translation
-  "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": "اسم فريد لهذا التنسيق، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "الاسم",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير تنسيق تدفق البت بنجاح.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "نجاح",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم التي تتعهد به مؤسستك لهذا التنسيق.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "مستوى الدعم",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "سجل تنسيق تدفق البت",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "لا توجد تنسيقات لتدفق البت.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "حذف المحدد",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "إلغاء تحديد الكل",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "داخلي",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "نوع المايم",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.name": "الاسم",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.return": "Return",
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البت المحددة",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "المعرّف",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "رجوع",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "معروف",
 
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "مدعوم",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "غير معروف",
 
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "مستوى الدعم",
 
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "سجل تنسيق تدفق البت",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "تحديد",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "إلغاء تحديد",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "سجل الميتاداتا",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "يحتفظ سجل الميتاداتا بقائمة بجميع حقول الميتاداتا المتاحة في المستودع. يمكن تقسيم تلك الحقول بين عدة تخطيطات، يتطلب دي سبيس مخطط دبلن كور المؤهل.",
 
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاداتا",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "تحرير مخطط الميتاداتا",
 
   // "admin.registries.metadata.form.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "الاسم",
 
   // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "مسافة الاسم",
 
   // "admin.registries.metadata.head": "Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "سجل الميتاداتا",
 
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "لا توجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "تحديد",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "إلغاء تحديد",
 
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "حذف المحدد",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "المخططات المحددة",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "المعرّف",
 
   // "admin.registries.metadata.schemas.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "الاسم",
 
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.namespace": "Namespace",
-
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-
+  "admin.registries.metadata.schemas.table.namespace": "مسافة الاسم",
 
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "سجل الميتاداتا",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "مخطط الميتاداتا",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  // TODO New key - Add a translation
-  "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ  \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "تحديد",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "إلغاء تحديد",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "حقول مخطط الميتاداتا",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "لا توجد حقول ميتاداتا للعرض.",
 
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "حذف المحدد",
 
   // "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.field": "حقل",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "حقول الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.id": "المعرّف",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "ملاحظة النطاق",
 
   // "admin.registries.schema.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "إنشاء حقل ميتاداتا",
 
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "تحرير حقل ميتاداتا",
 
   // "admin.registries.schema.form.element": "Element",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "عنصر",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "مؤهل",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "ملاحظة النطاق",
 
   // "admin.registries.schema.head": "Metadata Schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "مخطط الميتاداتا",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "تم بنجاح إنشاء مخطط الميتاداتا \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "فشل حذف {{amount}} مخطط ميتاداتا",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "تم حذف {{amount}} مخطط ميتاداتا بنجاح",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "تم بنجاح تحرير مخطط الميتاداتا \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "خطأ",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "تم بنجاح إنشاء حقل الميتاداتا  \"{{field}}\"",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "فشل حذف {{amount}} حقل ميتاداتا",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "تم حذف {{amount}} حقل ميتاداتا بنجاح",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "تم بنجاح تحرير حقل الميتاداتا \"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "نجاح",
 
-  // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "Return",
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "رجوع",
 
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  // TODO New key - Add a translation
-  "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "سجل مخطط الميتاداتا",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "إدارة الوصول بالجملة",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "نتائج البحث",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بتحديد الكائنات",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "بحث",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "التحديد الحالي({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "الخطوة الثانية: العملية المراد إجراؤها",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "حذف شخص إلكتروني",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "التصرف كشخص إلكتروني",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "إعادة تعيين كلمة المرور",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "إضافة شخص إلكتروني",
 
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "أشخاص إلكترونيين",
 
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "بحث",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "استعراض الكل",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "الميتاداتا",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
+  "admin.access-control.epeople.search.scope.email": "البريد الإلكتروني (بالضبط)",
 
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "بحث",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "بحث الأشخاص...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "إضافة شخص إلكتروني",
 
   // "admin.access-control.epeople.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "المعرّف",
 
   // "admin.access-control.epeople.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "الاسم",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
+  "admin.access-control.epeople.table.email": "البريد الإلكتروني (بالضبط)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "تحرير",
 
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "تحرير \"{{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": "غير مصرح لك بتحرير هذه المجموعة",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "حذف \"{{name}}\"",
 
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "لا يوجد أشخاص إلكترونيين للعرض.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "إنشاء شخص إلكتروني",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "تحرير شخص إلكتروني",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "الاسم الأول",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "اسم العائلة",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
+  "admin.access-control.epeople.form.email": "البريد الإلكتروني",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد إلكتروني صالح",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "يمكنه تسجيل الدخول",
 
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "يتطلب شهادة",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "رجوع",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "تم إنشاء الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "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": "فشل إنشاء الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
 
   // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "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": "فشل تحرير الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "تم تحرير الشخص الإلكتروني \"{{name}}\"بنجاح",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "فشل تحرير الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "تم حذف الشخص الإلكتروني \"{{name}}\"بنجاح",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "فشل حذف الشخص الإلكتروني \"{{name}}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "عضو في هذه المجموعات:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "المعرّف",
 
   // "admin.access-control.epeople.form.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "الاسم",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "حاوية/مجتمع",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "هذا الشخص الإلكتروني ليس عضواً في أي مجموعة",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "أضف إلى مجموعات",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف شخص إلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "تم حذف الشخص الإلكتروني: \"{{name}}\"بنجاح",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "المجموعات",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "المجموعات",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير مجموعة",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "تحرير مجموعة",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "مجموعة جديدة",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "مجموعة جديدة",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "المجموعات",
 
   // "admin.access-control.groups.button.add": "Add group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "إضافة مجموعة",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "بحث المجموعات",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "بحث",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "بحث المجموعات...",
 
   // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.id": "المعرّف",
 
   // "admin.access-control.groups.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "الاسم",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "حاوية/مجتمع",
 
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "الأعضاء",
 
   // "admin.access-control.groups.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "تحرير",
 
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "تحرير \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "حذف \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات بهذا في اسمها أو كمعرف عمومي فريد",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "تم حذف المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "فشل حذف المجموعة \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-
-
+  "admin.access-control.groups.notification.deleted.failure.content": "السبب: \"{{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.",
-  // TODO New key - Add a translation
-  "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": "هذه المجموعة دائمة، لذا لا يمكن تحريرها أو حذفها. لكن لايزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة..",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "لا يمكن تعديل هذه المجموعة أو حذفها لأنها تتوافق مع دور في عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}. يمكنك حذفها من تبويب <a href='{{comcolEditRolesRoute}}'>\"تعيين الأدوار\"</a> في صفحة تحرير {{comcol}}. لا يزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "إنشاء مجموعة",
 
   // "admin.access-control.groups.form.head.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "تحرير مجموعة",
 
   // "admin.access-control.groups.form.groupName": "Group name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "اسم المجموعة",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "مجتمع أو حاوية",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "الوصف",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "تم إنشاء المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "فشل إنشاء المجموعة \"{{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.",
-  // TODO New key - Add a translation
-  "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": "فشل إنشاء المجموعة بالاسم: \"{{name}}\"، يرجى التأكد أن الاسم ليس قيد الاستخدام بالفعل.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "فشل تحرير المجموعة \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\" قيد الاستخدام بالفعل!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "تم تحرير المجموعة \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "حذف المجموعة",
 
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "حذف المجموعة \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "هل أنت متأكد من أنك ترغب في حذف المجموعة \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "إلغاء",
 
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "حذف",
 
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "تم حذف المجموعة \"{{ name }}\"بنجاح",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل حذف المجموعة \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "السبب: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "أشخاص إلكترونيين",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "إضافة أشخاص إلكترونيين",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحاليين",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "بحث",
 
   // "admin.access-control.groups.form.members-list.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "المعرّف",
 
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "الاسم",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "الهوية",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "البريد الإلكتروني",
+
+  // "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",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "إزالة / إضافة",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف عضو باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "فشل إضافة العضو: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "فشل حذف العضو: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
 
   // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "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": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "هناك خطأ ما: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "المجموعات",
 
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "إضافة مجموعة فرعية",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "استعراض الكل",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الفرعية الحالية",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "بحث",
 
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "المعرّف",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "الاسم",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "الحاوية/المجتمع",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "إزالة / إضافة",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة مجموعة فرعية باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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.currentGroup": "Current group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "إضافة مجموعة فرعية باسم \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "تمت إضافة المجموعة الفرعية: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "فشل إضافة مجموعة فرعية: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "تم حذف المجموعة الفرعية: \"{{name}}\"بنجاح",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "فشل حذف المجموعة الفرعية: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  // TODO New key - Add a translation
-  "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": "هذه هي المجموعة الحالية، لا يمكن إضافتها.",
 
   // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "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": "لم يتم العثور على مجموعات بهذا في اسمها أو بهذا كمعرف عمومي فريد",
 
   // "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": "لا توجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "رجوع",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "ضمان الجودة",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "مقترحات ضمان الجودة",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "مقترحات ضمان الجودة",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "ضمان الجودة",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "مصدر ضمان الجودة",
+
+  // "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.editGroupPage": "في هذه الصفحة، يمكنك تعديل خصائص المجموعة وأعضائها. في القسم العلوي، يمكنك تحرير اسم المجموعة ووصفها، ما لم تكن هذه مجموعة إدارية لحاوية أو مجتمع، وفي هذه الحالة يتم إنشاء اسم المجموعة ووصفها تلقائياً ولا يمكن تحريرهما. في الأقسام التالية، يمكنك تعديل عضوية المجموعة. انظر [الويكي](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) للمزيد من التفاصيل.",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "لإضافة شخص إلكتروني إلى هذه المجموعة أو إزالته منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المنسدلة الموجودة على يسار شريط البحث لاختيار ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ثم قم بالنقر على أيقونة زائد لكل مستخدم ترغب في إضافته في القائمة أدناه، أو أيقونة سلة المهملات لكل مستخدم ترغب في إزالته. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "لإضافة مجموعة فرعية إلى هذه المجموعة أو إزالتها منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ثم قم بالنقر على أيقونة زائد لكل مجموعة ترغب في إضافتها في القائمة أدناه، أو أيقونة سلة المهملات لكل مجموعة ترغب في إزالتها. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.reports.collections.title": "Collection Filter Report",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
 
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
 
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "بحث إداري",
 
   // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "تحرير",
 
   // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "تحرير",
 
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "حذف",
 
   // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "تحرير",
 
-  // "admin.search.item.make-private": "Make Private",
-  // TODO New key - Add a translation
-  "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "اجعله غير قابل للاكتشاف",
 
-  // "admin.search.item.make-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "اجعله قابل للاكتشاف",
 
   // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
+  "admin.search.item.move": "نقل",
 
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "إعادة تعيين",
 
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "سحب",
 
   // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
+  "admin.search.title": "بحث إداري",
 
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-
-
-
+  "administrativeView.search.results.head": "بحث إداري",
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "أدر سير العمل",
 
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "أدر سير العمل",
 
   // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "سير العمل",
+
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "مساحة العمل",
 
   // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "حذف",
 
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "إعادة إرسال",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "السياسات",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "الإشراف",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "استيراد الميتاداتا",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "استيراد الدفعة",
 
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "استيراد الميتاداتا",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "استيراد الدفعة",
 
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "استيراد الميتاداتا",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "استيراد الدفعة",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "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": "يمكنك إفلات أو استعراض ملفات CSV التي تحتوي على عمليات ميتاداتا بالدفعة على الملفات من هنا",
+
+  // "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": "حدد الحاوية المراد الاستيراد إليها. بعد ذلك، قم بإسقاط أو تصفح ملف مضغوط بتنسيق أرشيف بسيط (SAF) يتضمن المواد المراد استيرادها",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "من الممكن إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم التبديل أعلاه لتعيين مصدر الإدخال",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا لاستيراده",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "قم بإسقاط ZIP الدفعة المراد استيرادها",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ملف CSV للميتاداتا المراد استيراده",
 
-  // "admin.metadata-import.page.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  "admin.metadata-import.page.button.return": "رجوع",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "متابعة",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "حدد الحاوية",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "حدد ملف أولاً!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف أولاً!",
 
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "حدد ملف ZIP أولاً!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "تحميل",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "عنوان URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "قم بإدخال عنوان url لملف ZIP الخاص بالدفعة لاستيراده",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "التحقق فقط",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "التقييم",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "يجب عليك تقييم هذه المادة",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "مراجعة",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "يجب عليك إدخال مراجعة لتقديم هذا التقييم",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "يرجى تحديد التقييم أدناه",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم أدناه وإضافة مراجعة",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مراجع واحد أدناه قبل التقديم",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مراجع واحد أو أكثر أدناه قبل التقديم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "استعراض الكل",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحاليين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "بحث",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "المعرّف",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "الاسم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "الهوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "البريد الإلكتروني",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "إزالة / إضافة",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "إزالة عضو باسم \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل إضافة العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي مراجع.",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة الملف المضغوط الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "إزالة",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
-  // TODO New key - Add a translation
-  "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة المرور غير صالحة.",
 
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  // TODO New key - Add a translation
-  "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "لقد انتهت جلستك. يرجى تسجيل الدخول مرة أخرى.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. يرجى تسجيل الدخول مرة أخرى.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "جاري الآن تنزيل {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "رجوع",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "رجوع",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "تدفق البت: ",
 
   // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  // TODO New key - Add a translation
-  "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": "اختيارياً، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\" أو \"<i>قراءات بيانات التجربة</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "الوصف",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "أول يوم يسمح منه الوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر لتدفق بت، قم بالذهاب إلى تبويب <i> حالة المادة</i>، وقم بالنقر على <i>تصاريح...</i>، إنشاء أو تحرير سياسة <i>READ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ البدء</i> حسب الرغبة.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "حظر حتى تاريخ محدد",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "تغيير اسم الملف لتدفق البت. لاحظ أن هذا سيؤدي إلى تغيير عنوان URL لدفق البت المعروض، لكن الروابط القديمة ستظل تحل طالما لم يتغير معرف التسلسل.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "اسم الملف",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "وصف التنسيق الجديد",
 
   // "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>\").",
-  // TODO New key - Add a translation
-  "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": "التطبيق الذي قمت باستخدامه لإنشاء الملف، ورقم الإصدار (على سبيل المثال: \"<i>ACMESoft SuperApp الإصدار 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "تدفق البت الرئيسي",
 
   // "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\".",
-  // TODO New key - Add a translation
-  "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": "إذا لم يكن التنسيق موجوداً في القائمة أعلاه، <b>قم بتحديد \"التنسيق غير موجود في القائمة\" أعلاه</b> وقم بوصفه أدنى  \"وصف تنسيق جديد\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "التنسيق المحدد",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "التنسيق غير موجود في القائمة",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تنسيق تدفق البت",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ تدفق البت الرئيسي",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "ملصق تسمية 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 لهذه الصورة. إذا لم يتم توفير التسمية الافتراضية سيتم استخدامها.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "جدول محتويات 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": "إن إضافة نص هنا تجعل هذا بداية لنطاق جدول محتويات جديد.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "عرض IIIF Canvas",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض Canvas عادةً مع عرض الصورة.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "ارتفاع Canvas IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع Canvas عادةً مع ارتفاع الصورة.",
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على تدفق البت هذا.",
 
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "تم حفظ تدفق البت",
 
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "تحرير تدفق البت",
 
+  // "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": "لديك بالفعل حق الوصول إلى هذا الملف. إذا كنت تريد تنزيل الملف، انقر ",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "هنا",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "طلب نسخة من الملف",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "قم بإدخال المعلومات التالية لطلب نسخة للمادة التالية: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "جاري طلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "طلب كل الملفات. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "الاسم *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "الاسم مطلوب",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "عنوان بريدك  الإلكتروني *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان هذا البريد الإلكتروني لإرسال الملف.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "ملفات",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "الملف المطلوب فقط",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المقيد",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "رسالة",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "رجوع",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "طلب نسخة",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "تم تقديم طلب المادة بنجاح.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "حدث خطأ ما أثناء تقديم طلب المادة.",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "جميع نتائج الاستعراض",
 
   // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "حسب المؤلف",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "حسب تاريخ الإصدار",
 
   // "browse.comcol.by.subject": "By Subject",
-  // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "حسب الموضوع",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "حسب فئة الموضوع",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "حسب فهرس العلوم النرويجي",
 
   // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "حسب العنوان",
 
   // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
+  "browse.comcol.head": "استعراض",
 
   // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
+  "browse.empty": "لا توجد مواد للعرض.",
 
   // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
+  "browse.metadata.author": "المؤلف",
 
   // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "تاريخ الإصدار",
 
   // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "الموضوع",
 
   // "browse.metadata.title": "Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
+  "browse.metadata.title": "العنوان",
+
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "فئة الموضوع",
 
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "استعراض حسب المؤلف",
 
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "استعراض حسب التاريخ",
 
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "استعراض حسب الموضوع",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "استعراض حسب فئة الموضوع",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "استعراض حسب فهرس العلوم النرويجي",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "استعراض حسب العنوان",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "التالي",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "السابق",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "لا مزيد من الصفحات من النتائج",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", يبدأ بـ {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(اختر الشهر)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(اختر السنة)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  // TODO New key - Add a translation
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "اختر سنة الإصدار",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "تنقيح النتائج حسب السنة أو الشهر",
 
   // "browse.startsWith.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "أبريل",
 
   // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "أغسطس",
 
   // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "ديسمبر",
 
   // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "فبراير",
 
   // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "يناير",
 
   // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "يوليو",
 
   // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "يونيو",
 
   // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "مارس",
 
   // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "مايو",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(اختر الشهر)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "اختر تاريخ الإصدار",
 
   // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "نوفمبر",
 
   // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "أكتوبر",
 
   // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "سبتمبر",
 
-  // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "استعراض",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date": "Or type in a date (year-month):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "تنقيح النتائج حسب التاريخ",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر استعراض.",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  // TODO New key - Add a translation
-  "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "منقح",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "استعراض",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "استعراض حسب {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "استعراض حسب {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "العودة إلى النتائج",
 
   // "chips.remove": "Remove chip",
-  // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
+  "chips.remove": "إزالة الشريحة",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "مقبول",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى مقدم الطلب",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى سير عمل مدير المراجعة",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "استعراض للحصول على شعار للحاوية",
 
   // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
+  "collection.create.head": "إنشاء حاوية",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "تم إنشاء الحاوية بنجاح",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "إنشاء حاوية للمجتمع {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "أكرتة الحاوية: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "إلغاء",
 
   // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "تأكيد",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "جاري الحذف",
 
   // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "حذف الحاوية",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  // TODO New key - Add a translation
-  "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "تعذر حف الحاوية",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "تم حذف الحاوية بنجاح",
 
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-
-
+  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الحاوية \"{{ dso }}\"",
 
   // "collection.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "حذف هذه الحاوية",
 
   // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "تحرير الحاوية",
 
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-
-
+  "collection.edit.breadcrumbs": "تحرير الحاوية",
 
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "مخطط المادة",
 
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "تحرير الحاوية - مخطط المادة",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "إلغاء",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "الحاوية: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "تخطيط المواد المحددة",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "هذه هي أداة مخطط المادة والتي تتيح لمديري الحاوية بتخطيط مواد من حاويات أخرى إلى هذه الحاوية. يمكنك البحث عن مواد من حاويات أخرى وتخطيطها، أو استعراض قائمة بالمواد المخططة حاليًا.",
 
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "مخطط المادة - تخطيط مواد من حاويات أخرى",
 
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
 
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أخطاء أثناء تخطيط {{amount}} مادة.",
 
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "أخطاء التخطيط",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "تم تخطيط {{amount}} مادة بنجاح.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "اكتمل التخطيط",
 
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "حدثت أخطأ أثناء إزالة تخطيطات {{amount}} مادة.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "أخطاء إزالة التخطيط",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "تمت إزالة {{amount}} تخطيط مادة بنجاح.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "اكتملت إزالة التخطيط",
 
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "إزالة تخطيطات المادة المحددة",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "بحث المواد...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "استعراض المواد المخططة",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "تخطيط مواد جديدة",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "حذف الشعار",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "التراجع عن الحذف",
 
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "شعار الحاوية",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار الحاوية. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "تم تحميل شعار الحاوية بنجاح.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "تم حذف شعار الحاوية بنجاح",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
 
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-
-
+  "collection.edit.logo.upload": "قم بإسقاط شعار الحاوية للتحميل",
 
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "تم تحرير الحاوية بنجاح",
 
-  // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "رجوع",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "التحكم في الوصول",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "تحرير الحاوية - التحكم في الوصول",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "أكرتة",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "تحرير الحاوية - أكرتة",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "تصاريح",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "تحرير الحاوية - تصاريح",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "تحميل المزيد من الحزم",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "تحميل المزيد",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات تدفق البت للحزمة",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "تحرير الميتاداتا",
 
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "تحرير الحاوية - الميتاداتا",
 
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "تعيين الأدوار",
 
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "تحرير الحاوية - الأدوار",
 
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "تقوم هذه الحاوية بحصاد محتواها من مصدر خارجي",
 
   // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  // TODO New key - Add a translation
-  "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": "يجب عليك تقديم معرف حزمة للحاوية المستهدفة.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "المحتوى الجاري حصاده",
 
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "تهيئة مصدر خارجي",
 
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميتاداتا",
 
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "معرف حزمة محددة لمبادرة الأرشيفات المفتوحة",
 
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "مقدم خدمة مبادرة الأرشيفات المفتوحة",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "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": "حصاد الميتاداتا وتدفقات البت (يتطلب دعم ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "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": "حصاد الميتاداتا والمراجع إلى تدفقات البت (يتطلب دعم ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "حصاد الميتاداتا فقط",
 
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "مصدر المحتوى",
 
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "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": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم النقر على زر 'تراجع'",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة كل الحقول قبل الحفظ.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "الميتاداتا غير صالحة",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تغييراتك على مصدر محتوى هذه الحاوية.",
 
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "تم حفظ مصدر المحتوى",
 
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-
-
+  "collection.edit.tabs.source.title": "تحرير الحاوية - مصدر المحتوى",
 
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "إضافة",
 
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "قالب المادة",
 
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "إلغاء",
 
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "حذف",
 
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "تحرير",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "حدث خطأ أثناء استرداد عنصر القالب",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "تحرير عنصر القالب للحاوية \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "عنصر القالب",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "جاري تحميل عنصر القالب...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "فشل حذف قالب المادة",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "تم حذف قالب المادة بنجاح",
 
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-
-
+  "collection.edit.template.title": "تحرير عنصر القالب",
 
   // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "وصف مختصر",
 
   // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "نص تمهيدي (HTML)",
 
   // "collection.form.errors.title.required": "Please enter a collection name",
-  // TODO New key - Add a translation
-  "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "يرجى إدخال اسم الحاوية",
 
   // "collection.form.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
+  "collection.form.license": "الترخيص",
 
   // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "المنشأ",
 
   // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "نص حقوق النشر (HTML)",
 
   // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "الأخبار (HTML)",
 
   // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
-
+  "collection.form.title": "الاسم",
 
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "نوع الكينونة",
 
   // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "الحاوية",
+
+  // "collection.logo": "Collection logo",
+  "collection.logo": "شعار الحاوية",
+
+  // "collection.page.browse.search.head": "Search",
   // TODO New key - Add a translation
-  "collection.listelement.badge": "Collection",
-
-
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "collection.page.browse.recent.head": "Recent Submissions",
-
-  // "collection.page.browse.recent.empty": "No items to show",
-  // TODO New key - Add a translation
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "تحرير هذه الحاوية",
 
   // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI الدائم لهذه الحاوية",
 
   // "collection.page.license": "License",
-  // TODO New key - Add a translation
-  "collection.page.license": "License",
+  "collection.page.license": "الترخيص",
 
   // "collection.page.news": "News",
+  "collection.page.news": "الأخبار",
+
+  // "collection.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "collection.page.news": "News",
-
-
+  "collection.search.results.head": "Search Results",
 
   // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "تأكيد المحدد",
 
   // "collection.select.empty": "No collections to show",
-  // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
+  "collection.select.empty": "لا توجد حاويات للعرض",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "الحاويات المحددة",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "تحديد حاوية",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "إلغاء تحديد حاوية",
 
   // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
+  "collection.select.table.title": "العنوان",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "إعدادات التحكم في الحصاد",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء اختبار الإعدادات",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "فشل البرنامج النصي لاختبار الإعدادات",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "انتهى البرنامج النصي لاختبار الإعدادات بنجاح",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "اختبار التهيئة",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "جاري اختبار التهيئة...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "تم بدء الاستيراد بنجاح",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "حدث خطأ ما أثناء بدء الاستيراد",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "استيراد الآن",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "جاري الاستيراد...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "حدث خطأ أثناء الاستيراد",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "اكتمل الاستيراد",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "تم بدء عملية إعادة التعيين وإعادة الاستيراد بنجاح",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء بدء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "اكتملت عملية إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "إعادة تعيين وإعادة استيراد",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "جاري إعادة التعيين وإعادة الاستيراد...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "حالة الحصاد:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "وقت بدء الحصاد:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "آخر مرة تم الحصاد:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "معلومات الحصاد:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "غير قابل للتطبيق",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "تم اختبار الإعدادات المتوفرة ولم تعملk.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "خطأ في الخادم",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "قائمة المجتمعات",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "قائمة المجتمعات",
 
   // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
+  "communityList.title": "قائمة المجتمعات",
 
   // "communityList.showMore": "Show More",
+  "communityList.showMore": "عرض المزيد",
+
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "توسيع {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "طي {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "استعراض للحصول على شعار المجتمع",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
   // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
-
-
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
 
   // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
+  "community.create.head": "إنشاء مجتمع",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "تم إنشاء المجتمع بنجاح",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "إنشاء مجتمع فرعي للمجتمع {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "أكرتة المجتمع: {{community}}",
 
   // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "إلغاء",
 
   // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "تأكيد",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "جاري الحذف...",
 
   // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
+  "community.delete.head": "حذف المجتمع",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  // TODO New key - Add a translation
-  "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "تعذر حذف المجتمع",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "تم حذف المجتمع بنجاح",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "هل أنت متأكد من أنك تريد حذف المجتمع \"{{ dso }}\"",
 
   // "community.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
+  "community.edit.delete": "حذف هذا المجتمع",
 
   // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
+  "community.edit.head": "تحرير المجتمع",
 
   // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "تحرير المجتمع",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "حذف الشعار",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "التراجع عن الحذف",
 
   // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "شعار المجتمع",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع بنجاح.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "تم حذف شعار المجتمع بنجاح",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
-
+  "community.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
 
+  // "community.edit.logo.upload": "Drop a community logo to upload",
+  "community.edit.logo.upload": "قم بإسقاط شعار المجتمع للتحميل",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "تم تحرير المجتمع بنجاح",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  // TODO New key - Add a translation
-  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-
-  // "community.edit.notifications.error": "An error occured while editing the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.error": "An error occured while editing the Community",
-
-  // "community.edit.return": "Return",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
+  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لإجراء هذا التغيير",
 
+  // "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "حدث خطأ أثناء تحرير المجتمع",
 
+  // "community.edit.return": "Back",
+  "community.edit.return": "رجوع",
 
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "أكرتة",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "تحرير المجتمع - أكرتة",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "تحرير المجتمع - التحكم في الوصول",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "تحرير الميتاداتا",
 
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "تحرير المجتمع - الميتاداتا",
 
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "تعيين أدوار",
 
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "تحرير المجتمع - أدوار",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "التصاريح",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-
-
+  "community.edit.tabs.authorizations.title": "تحرير المجتمع - التصاريح",
 
   // "community.listelement.badge": "Community",
-  // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-
+  "community.listelement.badge": "مجتمع",
 
+  // "community.logo": "Community logo",
+  "community.logo": "شعار المجتمع",
 
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "لا شيء",
 
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "إنشاء",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "فشل إنشاء مجموعة لدور '{{ role }}'",
 
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "تقييد",
 
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "حذف",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "فشل حذف مجموعة الدور '{{ role }}'",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "المسؤولون",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-
+  "comcol-role.edit.collection-admin.name": "المسؤولون",
 
   // "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).",
-  // TODO New key - Add a translation
-  "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": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
 
   // "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).",
-  // TODO New key - Add a translation
-  "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": "يقرر مديري الحاوية من يمكنه تقديم المواد إلى الحاوية، وتحريرميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحاوية من الحاويات الأخرى إلى هذه الحاوية (تخضع للتصريح لتلك الحاوية).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "المقدمون",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  // TODO New key - Add a translation
-  "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": "الأشخاص الإلكترونيين والمجموعات الذين يملكون صلاحية تقديم مواد جديدة إلى هذه الحاوية.",
 
   // "comcol-role.edit.item_read.name": "Default item read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضي",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "الأشخاص الإلكترونيون والمجموعات  الذين يمكنهم قراءة المواد الجديدة التي تم تقديمها إلى هذه الحاوية. التغييرات على هذا الدور ليست بأثر رجعي. ستظل المواد الحالية الموجودة في النظام قابلة للعرض بواسطة أولئك الذين يملكون الوصول للقراءة في وقت إضافتها.",
 
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-
+  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الافتراضية للمواد الواردة حاليًا إلى غير معرف الهوية.",
 
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "وصول قراءة تدفق البت الافتراضي",
 
-  // "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).",
-  // TODO New key - Add a translation
-  "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": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-
+  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت الواردة حاليًا إلى غير معرف الهوية.",
 
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "المحررون",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  // TODO New key - Add a translation
-  "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": "يمكن للمحررون تحرير ميتاداتا التقديمات الواردة، ثم قبولها أو رفضها.",
 
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "المحررون النهائيون",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  // TODO New key - Add a translation
-  "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": "يمكن للمحررون النهائيون تحرير ميتاداتا التقديمات الواردة، لكن لا يمكنهم رفضها.",
 
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "المراجعون",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "يمكن للمراجعين قبول أو رفض التقديمات الواردة. غير أنه لا يمكنهم تحرير ميتاداتا التقديم..",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "نقاط المراجعين",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين منح نقاط للمشاركات الواردة، وهذا سيحدد ما إذا كان سيتم رفض التقديم أم لا.",
 
   // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
+  "community.form.abstract": "وصف مختصر",
 
   // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "نص تمهيدي (HTML)",
 
   // "community.form.errors.title.required": "Please enter a community name",
-  // TODO New key - Add a translation
-  "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "يرجى إدخال اسم مجتمع",
 
   // "community.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "نص حقوق النشر (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "الأخبار (HTML)",
 
   // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
+  "community.form.title": "الاسم",
 
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
+  "community.page.edit": "تحرير هذا المجتمع",
 
   // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "ال URI الدائم لهذا المجتمع",
 
   // "community.page.license": "License",
-  // TODO New key - Add a translation
-  "community.page.license": "License",
+  "community.page.license": "الترخيص",
 
   // "community.page.news": "News",
-  // TODO New key - Add a translation
-  "community.page.news": "News",
+  "community.page.news": "الأخبار",
 
   // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "المجتمعات الفرعية والحاويات",
+
+  // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "community.all-lists.head": "Subcommunities and Collections",
-
-  // "community.sub-collection-list.head": "Collections of this Community",
-  // TODO New key - Add a translation
-  "community.sub-collection-list.head": "Collections of this Community",
-
-  // "community.sub-community-list.head": "Communities of this Community",
-  // TODO New key - Add a translation
-  "community.sub-community-list.head": "Communities of this Community",
+  "community.search.results.head": "Search Results",
 
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "حاويات هذا المجتمع",
 
+  // "community.sub-community-list.head": "Communities in this Community",
+  "community.sub-community-list.head": "مجتمعات هذا المجتمع",
 
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "قبول الكل",
 
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "قبول المحدد",
 
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك الانسحاب)",
 
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(انسحاب)",
 
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "الغرض",
 
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "هذا التطبيق مطلوب دائماً",
 
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(مطلوب دائماً)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "استخدم هذا التبديل لتفعيل كل الخدمات أو تعطيلها.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "تفعيل أو تعطيل كل الخدمات",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "لقد حدثت بعض التغييرات منذ زيارتك الأخيرة، يرجى تحديث موافقتك.",
 
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
+  "cookies.consent.close": "إغلاق",
 
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "رفض",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "لا بأس",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "حفظ",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "الموافقة على ملفات تعريف الارتباط",
 
   // "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}.",
-  // TODO New key - Add a translation
-  "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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>. <br/> لمعرفة المزيد، يرجى قراءة {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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "تخصيص",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي نقوم بجمعها عنك.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "سياسة الخصوصية",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "المعلومات التي نقوم بجمعها",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "خدمات",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "خدمة",
 
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "استيثاق",
 
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
-
+  "cookies.consent.app.description.authentication": "مطلوب لتسجيل دخولك",
 
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "التفضيلات",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
-
-
+  "cookies.consent.app.description.preferences": "مطلوب لحفظ تفضيلاتك",
 
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "إقرار",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-
-
+  "cookies.consent.app.description.acknowledgement": "مطلوب لحفظ إقراراتك وموافقاتك",
 
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics": "تحليلات جوجل",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
   "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
 
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.google-recaptcha": "جوجل ريكابتشا",
 
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  // TODO New key - Add a translation
+  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
 
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "وظيفي",
 
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "إحصائي",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "التسجيل واستعادة كلمة المرور",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label": "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "مشاركة",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "إنشاء صفحة الاقتباس",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "التحقق من الروابط في الميتاداتا",
 
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
-  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "لا توجد مهمة",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "تنسيقات تدفق بت البروفايل",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "التحقق للميتاداتا المطلوبة",
 
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "مترجم ميكروسوفت",
 
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
-
+  "curation-task.task.vscan.label": "مسح الفيروسات",
 
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "تسجيل معرف الكائن الرقمي",
 
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "المهمة:",
 
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
-  "curation.form.submit": "Start",
+  "curation.form.submit": "بدء",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "تم بدء مهمة الأكرتة بنجاح",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى صفحة العملية المقابلة.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "فشل تشغيل مهمة الأكرتة",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "حدث خطأ أثناء محاولة بدء مهمة الأكرتة.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "تعذر تحديد هاندل هذا الكائن",
 
   // "curation.form.handle.label": "Handle:",
-  // TODO New key - Add a translation
-  "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "هاندل:",
 
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  // TODO New key - Add a translation
-  "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": "تلميح: قم بإدخال [your-handle-prefix]/0 لتشغيل مهمة عبر الموقع بأكمله (قد لا تدعم جميع المهام هذه الإمكانية)",
 
+  // "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": "عزيزي {{ recipientName }},\nردًا على طلبك، يؤسفني إبلاغك أنه لا يمكن إرسال نسخة من الملف الذي قمت بطلبه، فيما يتعلق بالوثيقة: \"{{ itemUrl }}\" ({{ itemName }}), والتي قمت بتأليفها.\n\nمع أطيب التحيات,\n{{ authorName }} <{{ authorEmail }}>",
 
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "لقد حدث خطأ",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "رفض طلب نسخ الوثيقة",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "تم رفض طلب المادة بنجاح",
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "بدون عنوان",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "بدون اسم",
 
   // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "حاوية جديدة",
 
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "إنشاء حاوية جديدة في",
 
   // "dso-selector.create.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "مجتمع جديد",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "أو",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "إنشاء مجتمع جديد في",
 
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "إنشاء مجتمع مستوى أعلى جديد",
 
   // "dso-selector.create.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "مادة جديدة",
 
   // "dso-selector.create.item.sub-level": "Create a new item in",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "إنشاء مادة جديدة في",
 
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "تقديم جديد",
 
   // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "تحرير الحاوية",
 
   // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "تحرير المجتمع",
 
   // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "تحرير المادة",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "حدث خطأ أثناء البحث عن {{ type }}",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  // TODO New key - Add a translation
-  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "استيراد ميتاداتا من",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "استيراد دفعة (ZIP) من",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "استيراد دفعة من",
 
   // "dso-selector.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "لم يتم العثور على {{ type }}",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
-  // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "بحث عن {{ type }}",
 
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "تحديد حاوية",
 
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "تحديد نطاق البحث",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "بحث دي سبيس بالكامل",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "أو",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "البحث عن حاوية أو مجتمع",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "نصائح الملف الشخصي",
+
+  // "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": "هذه هي الملفات الشخصية الموجودة التي قد تكون ذات صلة بك. إذا تعرفت على نفسك في أحد هذه الملفات الشخصية، قم بتحديده وفي صفحة التفاصيل، من بين الخيارات، اختر المطالبة به. بخلاف ذلك، يمكنك إنشاء ملف شخصي جديد من البداية باستخدام الزر أدناه.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "لا يعود أي من هذا لي",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "إنشاء واحد جديد",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى التحديث مرة أخرى ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "محدد مجموعة الإشراف",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "حدد نوع الرتبة",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "لا شيء",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "محرر",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "مراقب",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "حدد مجموعة",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "إلغاء",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "حفظ",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الرتبة",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "يرجى تحديد مجموعة",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "تم إنشاء رتبة الإشراف للمجموعة بنجاح {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "خطأ",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "يوجد بالفعل رتبة إشراف على هذه المادة للمجموعة المحددة",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "تصدير الميتاداتا لـ {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "هل أنت متأكد أنك تريد تصدير الميتاداتا لـ {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "إلغاء",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "تصدير",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "هل أنت متأكد أنك تريد تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "إلغاء",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "تصدير",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "حذف الشخص الإلكتروني \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الشخص الإلكتروني \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "إلغاء",
 
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "حذف",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "حذف الملف الشخصي",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "هل أنت متأكد أنك تريد حذف ملف الشخصي الخاص بك",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "حذف",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "حذف الاشتراك",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "هل أنت متأكد من أنك تريد حذف الاشتراك لـ \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "حذف",
 
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "حدث خطأ أثناء جلب تدفق البت",
 
   // "error.browse-by": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.browse-by": "Error fetching items",
+  "error.browse-by": "حدث خطأ أثناء جلب المواد",
 
   // "error.collection": "Error fetching collection",
-  // TODO New key - Add a translation
-  "error.collection": "Error fetching collection",
+  "error.collection": "حدث خطأ أثناء جلب الحاوية",
 
   // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
+  "error.collections": "حدث خطأ أثناء جلب الحاويات",
 
   // "error.community": "Error fetching community",
-  // TODO New key - Add a translation
-  "error.community": "Error fetching community",
+  "error.community": "حدث خطأ أثناء جلب المجتمع",
 
   // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
+  "error.identifier": "لم يتم العثور على أي مادة للمعرف",
 
   // "error.default": "Error",
-  // TODO New key - Add a translation
-  "error.default": "Error",
+  "error.default": "خطأ",
 
   // "error.item": "Error fetching item",
-  // TODO New key - Add a translation
-  "error.item": "Error fetching item",
+  "error.item": "حدث خطأ أثناء جلب المادة",
 
   // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
+  "error.items": "حدث خطأ أثناء جلب المواد",
 
   // "error.objects": "Error fetching objects",
-  // TODO New key - Add a translation
-  "error.objects": "Error fetching objects",
+  "error.objects": "حدث خطأ أثناء جلب الكائنات",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-  // TODO New key - Add a translation
-  "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث التقديمات",
 
   // "error.search-results": "Error fetching search results",
-  // TODO New key - Add a translation
-  "error.search-results": "Error fetching search results",
+  "error.search-results": "حدث خطأ أثناء جلب نتائج البحث",
+
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "استعلام البحث غير صالح. يرجى مراجعة <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على مزيد من المعلومات حول هذا الخطأ.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  // TODO New key - Add a translation
-  "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "حدث خطأ أثناء جلب الحاويات الفرعية",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "حدث خطأ أثناء جلب المجتمعات الفرعية",
 
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  // TODO New key - Add a translation
-  "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": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج الإدخال الخاص بك. التفاصيل أدناه : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  // TODO New key - Add a translation
-  "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "حدث خطأ أثناء جلب مجتمعات المستوى الأعلى",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "يجب عليك منح هذا الترخيص لإكمال عملية التقديم الخاصة بك. إذا لم تتمكن من منح هذا الترخيص في هذا الوقت، يمكنك حفظ عملك والعودة لاحقاً أو إزالة التقديم.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "هذا الإدخال مقيد بالنمط الحالي: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
-  // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "تحميل الملف إلزامي",
 
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "هذا الحقل مطلوب",
 
+  // "error.validation.NotValidEmail": "This is not a valid email",
+  "error.validation.NotValidEmail": "البريد الإلكتروني غير صالح",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "هذا البريد الإلكتروني مأخوذ بالفعل",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "هذه المجموعة موجودة بالفعل",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقول العنصر والمؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 32 حرفاً",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاًs",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقل المؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": " ملاحظات Syndication",
+
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "دفق البت المقيد",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
-
-
+  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات لهذه المادة",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  // TODO New key - Add a translation
-  "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "حقوق النشر © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
-  // TODO New key - Add a translation
-  "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "برنامج دي سبيس",
 
   // "footer.link.lyrasis": "LYRASIS",
-  // TODO New key - Add a translation
-  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "ليراسيس",
 
   // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "إعدادات ملفات تعريف الارتباط",
 
   // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "سياسة الخصوصية",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "اتفاقية المستخدم النهائي",
+
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "إرسال الملاحظات",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
   // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
-
-  // "footer.link.end-user-agreement":"End User Agreement",
-  // TODO New key - Add a translation
-  "footer.link.end-user-agreement": "End User Agreement",
-
-
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "هل نسيت كلمة المرور",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "قم بإدخال عنوان البريد الإلكتروني المرتبط بالحساب.",
 
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "عنوان البريد الإلكتروني *",
 
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "يرجى ملء عنوان البريد الإلكتروني",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "يرجى ملء عنوان بريد إلكتروني صالح",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "سيتم إرسال بريد إلكتروني إلى هذا العنوان يتضمن المزيد من التعليمات.",
 
-  // "forgot-email.form.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "إعادة تعيين كلمة المرور",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني لإعادة تعيين كلمة المرور",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.head": "Error when trying to register email",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL خاص وتعليمات إضافية.",
 
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور",
 
+  // "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": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب المرتبط بعنوان البريد الإلكتروني التالي: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "نسيت كلمة المرور",
 
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "نسيت كلمة المرور",
 
-  // "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.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "forgot-password.form.info": "قم بإدخال كلمة المرور الجديدة في المربع أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
 
   // "forgot-password.form.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "الحماية والأمان",
 
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "تعريف",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "عنوان البريد الإلكتروني: ",
 
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "كلمة المرور",
 
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "يرجى إدخال كلمة المرور في المربعات أعلاه.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
 
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "حدث خطأ أثناء محاولة تقديم كلمة المرور الجديدة",
 
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "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": "تمت إعادة تعيين كلمة المرور بنجاح. لقد قمت بتسجيل الدخول كمستخدم تم إنشاؤه.",
 
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "اكتملت إعادة تعيين كلمة المرور",
 
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "تقديم كلمة المرور",
 
-
-
-  // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
+  // "form.add": "Add more",
+  "form.add": "إضافة المزيد",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "انقر هنا لإضافة الإدخال الحالي وإضافة إدخال آخر",
 
   // "form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "form.cancel": "Cancel",
+  "form.cancel": "إلغاء",
 
   // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "Clear",
+  "form.clear": "مسح",
 
   // "form.clear-help": "Click here to remove the selected value",
-  // TODO New key - Add a translation
-  "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "انقر هنا لإزالة القيمة المحددة",
+
+  // "form.discard": "Discard",
+  "form.discard": "تجاهل",
+
+  // "form.drag": "Drag",
+  "form.drag": "سحب",
 
   // "form.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "Edit",
+  "form.edit": "تحرير",
 
   // "form.edit-help": "Click here to edit the selected value",
-  // TODO New key - Add a translation
-  "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "انقر هنا لتحرير القيمة المحددة",
 
   // "form.first-name": "First name",
-  // TODO New key - Add a translation
-  "form.first-name": "First name",
+  "form.first-name": "الاسم الأول",
 
   // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "Collapse",
+  "form.group-collapse": "طي",
 
   // "form.group-collapse-help": "Click here to collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "انقر هنا للطي",
 
   // "form.group-expand": "Expand",
-  // TODO New key - Add a translation
-  "form.group-expand": "Expand",
+  "form.group-expand": "توسيع",
 
   // "form.group-expand-help": "Click here to expand and add more elements",
-  // TODO New key - Add a translation
-  "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "انقر هنا للتوسيع وإضافة المزيد من العناصر",
 
   // "form.last-name": "Last name",
-  // TODO New key - Add a translation
-  "form.last-name": "Last name",
+  "form.last-name": "اسم العائلة",
 
   // "form.loading": "Loading...",
-  // TODO New key - Add a translation
-  "form.loading": "Loading...",
+  "form.loading": "جاري التحميل...",
 
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
+  "form.lookup": "ابحث عن",
 
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "انقر هنا للبحث عن علاقة حالية",
 
   // "form.no-results": "No results found",
-  // TODO New key - Add a translation
-  "form.no-results": "No results found",
+  "form.no-results": "لم يتم العثور على نتائج",
 
   // "form.no-value": "No value entered",
-  // TODO New key - Add a translation
-  "form.no-value": "No value entered",
+  "form.no-value": "لم يتم إدخال أي قيمة",
+
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "البريد الإلكتروني",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "الاسم الأول",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "في فهرس سولر",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "المؤسسة",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "اسم العائلة",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "أوركيد",
 
   // "form.remove": "Remove",
-  // TODO New key - Add a translation
-  "form.remove": "Remove",
+  "form.remove": "إزالة",
 
   // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
+  "form.save": "حفظ",
 
   // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
+  "form.save-help": "حفظ التغييرات",
 
   // "form.search": "Search",
-  // TODO New key - Add a translation
-  "form.search": "Search",
+  "form.search": "بحث",
 
   // "form.search-help": "Click here to look for an existing correspondence",
-  // TODO New key - Add a translation
-  "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "انقر هنا للبحث عن المراسلات الحالية",
 
-  // "form.submit": "Submit",
-  // TODO New key - Add a translation
-  "form.submit": "Submit",
+  // "form.submit": "Save",
+  "form.submit": "حفظ",
 
+  // "form.create": "Create",
+  "form.create": "إنشاء",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "إنقاص {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "زيادة {{field}}",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "قم بإسقاط المادة في الموضع الجديد",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "لا تقم بإرسال نسخة",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "رجوع",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "رسالة إضافية اختيارية",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "يرجى إدخال رسالة",
+
+  // "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": "يمكنك استغلال هذه المناسبة لإعادة النظر في قيود الوصول على الوثيقة، لتجنب الاضطرار إلى الرد على هذه الطلبات. إذا كنت ترغب في مطالبة مديري المستودع بإزالة هذه القيود، فيرجى تحديد المربع أدناه.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "تغيير إلى وصول حر",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "إرسال",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "الموضوع",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "يرجى إدخال موضوع",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "إرسال نسخة",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "طلب نسخة من الوثيقة",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "انتقل بي إلى الصفحة الرئيسية",
+
+  // "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": "إذا كنت أحد مؤلفي الوثيقة <a href='{{ url }}'>{{ name }}</a>, فيرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد مقترحة بالبريد الإلكتروني يمكنك تحريرها.",
+
+  // "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": "تمت معالجة هذا الطلب بالفعل. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "لقد حدث خطأ",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "طلب منح نسخة من الوثيقة",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. وسيتم إرفاق الوثيقة المطلوبة.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "تم منح طلب المادة بنجاح",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "كشف الصحة",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "كشف الصحة",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "معلومات",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "الحالة",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "خدمة الفحص الصحي غير متاحة مؤقتاً",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "رمز الحالة",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "قاعدة البيانات",
+
+  // "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": "سولر: جوهر الاستناد",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "سولر: جوهر oai",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "سولر: جوهر البحث",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "سولر: جوهر الإحصائيات",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "الواجهة الخلفية للتطبيق",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "جافا",
+
+  // "health-page.status": "Status",
+  "health-page.status": "الحالة",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "تشغيلي",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "تم الكشف عن مشاكل",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "تم الكشف عن مشاكل محتملة",
+
+  // "health-page.title": "Health",
+  "health-page.title": "كشف الصحة",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "لم يتم اكتشاف أي مشكلات",
 
   // "home.description": "",
-  // TODO New key - Add a translation
   "home.description": "",
 
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "الرئيسية",
 
-  // "home.title": "DSpace Angular :: Home",
-  // TODO New key - Add a translation
-  "home.title": "DSpace Angular :: Home",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "بحث المستودع ...",
+
+  // "home.title": "Home",
+  "home.title": "الرئيسية",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  // TODO New key - Add a translation
-  "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "المجتمعات في دي سبيس",
 
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  // TODO New key - Add a translation
-  "home.top-level-communities.help": "Select a community to browse its collections.",
-
-
+  "home.top-level-communities.help": "قم بتحديد مجتمع لاستعراض حاوياته.",
 
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "لقد قمت بقراءة اتفاقية المستخدم النهائي وأوافق عليها",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "حدث خطأ أثناء قبول اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "تم بنجاح تحديث اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "إلغاء",
 
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "حفظ",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "اتفاقية المستخدم النهائي",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "الولايات المتحدة",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "بيان الخصوصية",
 
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "بيان الخصوصية",
 
   // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "بيان الخصوصية",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "ملاحظات",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "ملاحظات",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "ملاحظات",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "شكراً لمشاركتنا ملاحظاتك حول نظام دي سبيس. نقدر تعليقاتكم!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة ملاحظاتك.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "قم بإرسال ملاحظاتك",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "تعليقات",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "البريد الإلكتروني الخاص بك",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "تم إرسال الملاحظات بنجاح!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "مطلوب عنوان بريد إلكتروني صالح",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "مطلوب تعليق",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "صفحة",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "الصفحة ذات الصلة بملاحظاتك",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
   // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
+  "info.coar-notify-support.title": "COAR Notify Support",
 
-
-
-  // "item.alerts.private": "This item is private",
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
   // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "هذه المادة غير قابلة للاكتشاف",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "تم سحب هذه المادة",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
   // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "باستخدام هذا المحرر ، يمكنك عرض وتغيير سياسات مادة ما، بالإضافة إلى تغيير سياسات مكونات المادة الفردية: الحزم وتدفق البت. باختصار، المادة عبارة عن حاوية من الحزم، والحزم عبارة عن حاويات لتدفقات البت. للحاويات في المعتاد سياسات ADD/REMOVE/READ/WRITE ، بينما يكون لتدفقات البت سياسات READ/WRITE فقط.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "تحرير سياسات المادة",
 
-
-
-  // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "غير قابل للاكتشاف",
 
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-
-
+  "item.badge.withdrawn": "مسحوب",
 
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "الحزمة",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "قم بتحديد حزمة أو إدخال اسم حزمة جديدة",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "إنشاء حزمة",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "لا تحتوي هذه المادة على أية حزم لتحميل تدفقات البت لها.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "إلغاء",
 
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف لتحميله",
 
   // "item.bitstreams.upload.item": "Item: ",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "المواد: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة بنجاح.",
 
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم إنشاؤها",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-
-
+  "item.bitstreams.upload.title": "تحميل تدفق البت",
 
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "تحميل",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "يتم حالياً عرض {{ amount }} تدفقات بت من {{ total }}.",
 
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "تحميل الكل ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "تحميل المزيد",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "الحزمة: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "تجاهل",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "تنزيل",
 
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "سحب",
 
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "تحرير",
 
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "إزالة",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "التراجع عن التغييرات",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "لا تحتوي هذه المادة على أية تدفقات بت. انقر على زر التحميل لإنشاء واحد.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "إجراءات",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "الحزمة",
 
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "الوصف",
 
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "التنسيق",
 
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "الاسم",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم بالنقر على زر 'تراجع'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "خطأ أثناء نقل تدفقات البت",
 
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "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": "تم حفظ تغييرات النقل الخاصة بك على حزم وتدفقات بت هذه المادة.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "تم حفظ تغييرات النقل",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "خطأ أثناء حذف تدفق البت",
 
   // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  // TODO New key - Add a translation
-  "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": "تم حفظ تغييرات الإزالة الخاصة بك على تدفقات بت هذه المادة.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ تغييرات الإزالة",
 
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "تراجع",
 
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "حفظ",
 
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-
-
+  "item.edit.bitstreams.upload-button": "تحميل",
 
   // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "إلغاء",
 
   // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "حذف",
 
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  // TODO New key - Add a translation
-  "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": "هل أنت متأكد من حذف هذه المادة تماماً؟ تحذير: في الوقت الحالي لن تتبقى أي آثار.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  // TODO New key - Add a translation
-  "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "حدث خطأ أثناء حذف المادة",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "حذف المادة: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  // TODO New key - Add a translation
-  "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "تم حذف هذه المادة",
 
   // "item.edit.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
+  "item.edit.head": "تحرير المادة",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "تحرير المادة",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "غير مصرح لك بالوصول إلى هذا التبويب",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "مخطط الحاوية",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الحاوية",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "غير معروف",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "في قائمة الانتظار للحجز",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "مسجل",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "محجوز",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "محجوز (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "مسجل (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "في قائمة الانتظار للتحديث والتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "في قائمة الانتظار للحذف",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "تم الحذف",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "في الانتظار (غير مسجل)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "مسكوك (غير مسجل)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل معرف كائن رقمي...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر على تأكيد لمتابعة تسجيل معرف الكائن الرقمي، أو إلغاء للتراجع",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "تأكيد",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "إلغاء",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "تم وضع معرف الكائن الرقمي في قائمة الانتظار للتسجيل بنجاح.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "خطأ في تسجيل معرف الكائن الرقمي",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "لقد تم بالفعل سك معرف الكائن الرقمي التالي وسيتم وضعه في قائمة الانتظار للتسجيل عبر الإنترنت",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "تخطيط مادة إلى حاويات محددة",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "إزالة تحطيط مادة لحاويات محددة",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "إلغاء",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "هذه أداة مخطط المادة التي تتيح للمديرين تخطيط هذه المادة إلى حاويات أخرى. يمكنك البحث عن الحاويات وتخطيطها، أو استعراض قائمة بالحاويات التي تم تخطيط هذه المادة لها حالياً.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "مخطط المادة - تخطيط مادة إلى حاويات",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "المادة: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
 
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "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": "حدثت أخطاء أثناء تخطيط مادة إلى  {{amount}} حاوية.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "أخطاء التخطيط",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة إلى {{amount}} حاوية بنجاح.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "اكتمل التخطيط",
 
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "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": "حدثت أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "أخطاء إزالة التخطيط",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "تمت إزالة تخطيط المادة إلى {{amount}} حاوية بنجاح.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "اكتملت إزالة التخطيط",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "بحث الحاويات...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "استعراض الحاويات المخططة",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
-
-
+  "item.edit.item-mapper.tabs.map": "تخطيط حاويات جديدة",
 
   // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "إضافة",
 
   // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "تجاهل",
+
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "تحرير القيمة",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
   // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "اسحب لإعادة ترتيب",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "تحرير",
 
   // "item.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "إزالة",
 
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
 
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "توقف عن التحرير",
+
+  // "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.edit.buttons.virtual": "هذه قيمة ميتاداتا افتراضية، أي قيمة موروثة من كينونة ذات صلة. ولا يمكن تعديلها مباشرة. إضافة أو إزالة العلاقة المقابلة في تبويب \"العلاقات\" ",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "لا تحتوي المادة حاليًا على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
 
   // "item.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "تحرير",
 
   // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "الحقل",
 
   // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "اللغة",
 
   // "item.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "القيمة",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "تحرير الحقل",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة حقل الميتاداتا",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر 'تراجع'",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "لقد حدث خطأ",
 
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة جميع الحقول قبل الحفظ.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "تم حفظ تغييراتك على ميتاداتا هذه المادة.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "تراجع",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "تراجع عن إعادة الترتيب",
 
   // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "حفظ",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
   // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.authority.label": "Authority: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
 
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "حقل",
 
   // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "اللغة",
 
   // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "قيمة",
 
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "رجوع",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "حفظ",
 
-  // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "تجاهل",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "اختر الحاوية التي ترغب في نقل هذه المادة لها. لتضييق قائمة الحاويات المعروضة، يمكنك إدخال استعلام بحث في المربع.",
 
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO New key - Add a translation
-  "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "حدث خطأ أثناء محاولة نقل المادة",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "نقل المادة: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "توريث السياسات",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "توريث السياسات الافتراضية للحاوية المقصودة",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، سيتم استبدال سياسة الوصول للقراءة الخاصة بالمادة وأي ملفات مرتبطة بالمادة بسياسة الوصول للقراءة الافتراضية للحاوية. لا يمكن التراجع عنه هذا الإجراء.",
 
   // "item.edit.move.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
+  "item.edit.move.move": "نقل",
 
   // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "جاري النقل...",
 
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  // TODO New key - Add a translation
-  "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "قم بإدخال استعلام بحث للبحث عن حاويات",
 
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO New key - Add a translation
-  "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "تم نقل المادة بنجاح",
 
   // "item.edit.move.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
-
-
+  "item.edit.move.title": "نقل المادة",
 
   // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "إلغاء",
 
-  // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm": "اجعلها غير قابلة للاكتشاف",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "هل أنت متأكد من أن هذه المادة يجب أن تكون غير قابلة للاكتشاف في الأرشيف؟",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
-  // TODO New key - Add a translation
-  "item.edit.private.error": "An error occurred while making the item private",
-
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item private: {{ id }}",
-
-  // "item.edit.private.success": "The item is now private",
-  // TODO New key - Add a translation
-  "item.edit.private.success": "The item is now private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "حدث خطأ أثناء جعل المادة غير قابلة للاكتشاف",
 
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "اجعل المادة غير قابلة للاكتشاف: {{ id }}",
 
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success": "المادة الآن غير قابلة للاكتشاف",
 
   // "item.edit.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "إلغاء",
 
-  // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "اجعلها قابلة للاكتشاف",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "هل أنت متأكد من أنه يجب جعل هذه المادة قابلة للاكتشاف في الأرشيف؟",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
-  // TODO New key - Add a translation
-  "item.edit.public.error": "An error occurred while making the item public",
-
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item public: {{ id }}",
-
-  // "item.edit.public.success": "The item is now public",
-  // TODO New key - Add a translation
-  "item.edit.public.success": "The item is now public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "حدث خطأ أثناء جعل المادة قابلة للاكتشاف",
 
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "اجعل المادة قابلة للاكتشاف: {{ id }}",
 
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "المادة الآن قابلة للاكتشاف",
 
   // "item.edit.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "إلغاء",
 
   // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "إعادة تعيين",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "هل أنت متأكد من إعادة تعيين هذه المادة إلى الأرشيف؟",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "حدث خطأ أثناء إعادة تعيين المادة",
 
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "إعادة تعيين المادة: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.success": "The item was reinstated successfully",
-
-
+  "item.edit.reinstate.success": "تمت إعادة تعيين المادة بنجاح",
 
   // "item.edit.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "تجاهل",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "إضافة",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "إزالة",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "تراجع عن التغييرات",
 
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "لا توجد علاقات",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر  'تراجع'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "تم تجاهل التغييرات",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "حدث خطأ أثناء تحرير العلاقات",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "انتهت صلاحية التغييرات",
 
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "تم حفظ تغييراتك على علاقات هذه المادة.",
 
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "تم حفظ العلاقات",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "تراجع",
 
   // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "حفظ",
 
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-
+  "item.edit.relationships.no-entity-type": "قم بإضافة ميتاداتا 'dspace.entity.type' لتفعيل العلاقات لهذه المادة",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "رجوع",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "تدفقات البت",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "تحرير المادة - تدفقات البت",
 
   // "item.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "أكرتة",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "تحرير المادة - أكرتة",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "أكرتة المادة: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "تحرير المادة - التحكم في الوصول",
 
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "الميتاداتا",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "تحرير المادة -  الميتاداتا",
 
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "العلاقات",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "تحرير الماة - العلاقات",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "تصاريح...",
 
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات تصاريح المادة",
 
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "حذف نهائي",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "شطب المادة تماماً",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "حاويات مخططة",
 
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  // TODO New key - Add a translation
-  "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 this Item to a different Collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección distinta",
+  "item.edit.tabs.status.buttons.move.button": "نقل هذه المادة إلى حاوية مختلفة",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "نقل هذه المادة إلى حاوية مختلفة",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button": "اجعلها غير قابلة للاكتشاف...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "اجعل المادة غير قابلة للاكتشاف",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "اجعلها قابلة للاكتشاف...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "اجعل المادة قابلة للاكتشاف",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "إعادة تعيين...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "إعادة تعيين المادة في المستودع",
+
+  // "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 this item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
+  "item.edit.tabs.status.buttons.withdraw.button": "سحب هذه المادة",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "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.",
-  // TODO New key - Add a translation
-  "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": "مرحباً بك في صفحة إدارة المادة. من هنا يمكنك سحب المادة، أو إعادة تعيينها، أو نقلها أو حذفها. كما يمكنك تحديث أو إضافة ميتاداتا/ تدفقات بت جديدة في التبويبات الأخرى.",
 
   // "item.edit.tabs.status.head": "Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "الحالة",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "هاندل",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "معرّف المادة الداخلي",
 
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "صفحة المادة",
 
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "آخر تعديل",
 
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "تحرير المادة -  الحالة",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "سجل الإصدارة",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل الإصدارة",
 
   // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  // TODO New key - Add a translation
-  "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": "تحرير أو إضافة إصدارات جديدة ليس ممكناً بعد في واجهة المستخدم هذه..",
 
   // "item.edit.tabs.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "عرض المادة",
 
   // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
-
-
+  "item.edit.tabs.view.title": "تحرير المادة -  عرض",
 
   // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "إلغاء",
 
   // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "سحب",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "هل أنت متأكد من ضرورة سحب هذه المادة من الأرشيف؟",
 
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "حدث خطأ أثناء سحب المادة",
 
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "سحب المادة: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.success": "The item was withdrawn successfully",
-
+  "item.edit.withdraw.success": "تم سحب المادة بنجاح",
 
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "رجوع",
 
   // "item.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "item.listelement.badge": "Item",
+  "item.listelement.badge": "المادة",
 
   // "item.page.description": "Description",
-  // TODO New key - Add a translation
-  "item.page.description": "Description",
+  "item.page.description": "الوصف",
 
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ردمد الدورية",
 
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "عنوان الدورية",
 
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
+  "item.page.publisher": "الناشر",
 
   // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
-  "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "المادة: ",
 
   // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "عنوان المجلد",
 
   // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "نتائج بحث المواد",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "بحث المواد",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "عرض المواد",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "طي",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
   // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
+  // "item.qa-event-notification-info.check.button": "View",
   // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
+  "item.qa-event-notification-info.check.button": "View",
 
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "إلغاء",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "حذف",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "تم حذف أمر الإشراف بنجاح \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "فشل في حذف أمر الإشراف \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "تحت إشراف:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "إزالة مجموعة الإشراف",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   // "item.page.abstract": "Abstract",
-  // TODO New key - Add a translation
-  "item.page.abstract": "Abstract",
+  "item.page.abstract": "خلاصة",
 
   // "item.page.author": "Authors",
-  // TODO New key - Add a translation
-  "item.page.author": "Authors",
+  "item.page.author": "المؤلفين",
 
   // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
+  "item.page.citation": "اقتباس",
 
   // "item.page.collections": "Collections",
-  // TODO New key - Add a translation
-  "item.page.collections": "Collections",
+  "item.page.collections": "الحاويات",
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "جاري التحميل...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "تحميل المزيد",
 
   // "item.page.date": "Date",
-  // TODO New key - Add a translation
-  "item.page.date": "Date",
+  "item.page.date": "التاريخ",
 
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "تحرير هذه المادة",
 
   // "item.page.files": "Files",
-  // TODO New key - Add a translation
-  "item.page.files": "Files",
+  "item.page.files": "ملفات",
 
   // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "الوصف:",
 
   // "item.page.filesection.download": "Download",
-  // TODO New key - Add a translation
-  "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "تنزيل",
 
   // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "تنسيق:",
 
   // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "الاسم:",
 
   // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "الحجم:",
 
   // "item.page.journal.search.title": "Articles in this journal",
-  // TODO New key - Add a translation
-  "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "مقالات في هذه الدورية",
 
   // "item.page.link.full": "Full item page",
-  // TODO New key - Add a translation
-  "item.page.link.full": "Full item page",
+  "item.page.link.full": "صفحة المادة الكاملة",
 
   // "item.page.link.simple": "Simple item page",
-  // TODO New key - Add a translation
-  "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "صفحة المادة البسيطة",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "أوركيد",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "فتح صفحة إعداد أوركيد",
 
   // "item.page.person.search.title": "Articles by this author",
-  // TODO New key - Add a translation
-  "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "مقالات بواسطة هذا المؤلف",
 
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "إظهار {{ amount }} أكثر",
 
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "إخفاء آخر {{ amount }}",
 
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "المنشورات",
 
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "المنشورات",
 
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "المؤلفين",
 
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "مشاريع البحث",
 
   // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
+  "item.page.subject": "كلمات رئيسية",
 
   // "item.page.uri": "URI",
-  // TODO New key - Add a translation
   "item.page.uri": "URI",
 
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "عرض المزيد",
 
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "طي",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.bitstreams.primary": "Primary",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "الحزمة الرئيسية",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "حزمة الترخيص",
+
+  // "item.page.return": "Back",
+  "item.page.return": "رجوع",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "إنشاء إصدارة جديدة",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
   // TODO New key - Add a translation
-  "item.page.filesection.license.bundle": "License bundle",
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "مطالبة",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "المطالبة بهذه المادة كملف شخصي",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR شعار",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "المعرف:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "المؤلفين:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "تاريخ النشر:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "مستخلص:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "معرف آخر:",
 
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "اللغة:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "الموضوعات:",
 
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "العنوان:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "النوع:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "العدد",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "المجلد",
+
+  // "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": "المعرف:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "الدورية",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "معرف الكائن الرقمي",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "الناشر:",
 
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "اللقب:",
 
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "الاسم:",
 
   // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
-  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "أوركيد:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "الممول:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "معرف الممول:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "معرف التمويل:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "الحروف المختصرة:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "الاختصاص القضائي:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "تدفق التمويل:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "عنوان URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "البلد",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "تاريخ التأسيس",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef معرف",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR معرف",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "الاسم القانوني",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "تأكيد المحدد",
 
   // "item.select.empty": "No items to show",
-  // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
+  "item.select.empty": "لا توجد مواد للعرض",
+
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "المواد المحددة",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "تحديد المادة",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "إلغاء تحديد المادة",
 
   // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
+  "item.select.table.author": "المؤلف",
 
   // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
+  "item.select.table.collection": "الحاوية",
 
   // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "Title",
-
+  "item.select.table.title": "العنوان",
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "لا توجد إصدارات أخرى لهذه المادة حتى الآن.",
 
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
+  "item.version.history.head": "سجل الإصدارة",
 
-  // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "رجوع",
 
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "افصدارة المحددة",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "أنت حالياً تقوم بعرض الإصدارة {{version}} للمادة.",
 
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "الإصدارة",
 
   // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
-  "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "المادة",
 
   // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "المحرر",
 
   // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
-  "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "التاريخ",
 
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "الملخص",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "مادة نطاق العمل",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "مادة سير العمل",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "الإجراء",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "تحرير مادة نطاق العمل",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "تحرير الملخص",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "حفظ تعديلات الملخص",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "تجاهل تعديلات الملخص",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "إنشاء إصدارة جديدة من هذه الإصدارة",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "حذف الإصدارة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
 
   // "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": "هذه ليست آخر إصدارة من هذه المادة. يمكن العثور على آخر إصدارة من <a href='{{destination}}'>هنا</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "إصدارة جديدة",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
   // TODO New key - Add a translation
-  "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
 
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
 
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "إنشاء إصدارة جديدة لهذه المادة",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "بدءاً من الإصدارة {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "إنشاء",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "إنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "إلغاء",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "لا تقم بإنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "الملخص",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "قم بإدخال ملخص الإصدارة الجديدة",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "إنشاء إصدارة جديدة...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "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": "جاري إنشاء الإصدارة الجديدة. قد يستغرق هذا بعض الوقت إذا كان لهذه المادة الكثير من العلاقات.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "تم إنشاء إصدارة جديدة برقم الإصدار {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "لم يتم إنشاء إصدارة جديدة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "حذف الإصدارة",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "هل ترغب في حذف الإصدارة {{version}}؟",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "حذف",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه الإصدارة",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "إلغاء",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "لا تقم بحذف هذه الإصدارة",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "تم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "لم يتم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "تم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "لم يتم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "إضافة",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "تجاهل",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "تحرير القيمة",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "اسحب لإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "إزالة",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "إيقاف التحرير",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "قالب العنصر حاليًا لا يحتوي على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "الحقل",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "اللغة",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "القيمة",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "تحرير الحقل",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من حقل الميتاداتا",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي أجريتها. لاستعادة التغييرات، قم بالنقر على زر 'تراجع' ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "حدث خطأ",
+
+  // "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.content": "لم يتم حفظ التغييرات. يرجى التأكد من أن جميع الحقول صالحة قبل الحفظ.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "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.content": "تم تغيير قالب المادة الذي تعمل عليه حالياً بواسطة مستخدم آخر. تم تجاهل التغييرات الحالية لمنع التعارضات",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على الميتاداتا لقالب المادة هذا.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "تراجع",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "التراجع عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "حفظ",
 
   // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "الدورية",
 
   // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
+  "journal.page.description": "الوصف",
 
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
+  "journal.page.edit": "تحرير هذه المادة",
 
   // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "رئيس التحرير",
 
   // "journal.page.issn": "ISSN",
-  // TODO New key - Add a translation
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "الناشر",
 
   // "journal.page.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "الدورية: ",
 
   // "journal.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal.search.results.head": "Journal Search Results",
-
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  // TODO New key - Add a translation
-  "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.results.head": "نتائج بحث الدورية",
 
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "نتائج بحث الدورية",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "بحث الدورية",
 
   // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "عدد الدورية",
 
   // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
+  "journalissue.page.description": "الوصف",
 
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "تحرير هذه المادة",
 
   // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "تاريخ العدد",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ردمد الدورية",
 
   // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "عنوان الدورية",
 
   // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "كلمات رئيسية",
 
   // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
+  "journalissue.page.number": "رقم",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
-
+  "journalissue.page.titleprefix": "عدد الدورية: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "نتائج بحث عدد الدورية",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "مجلد الدورية",
 
   // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "الوصف",
 
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "تحرير هذه المادة",
 
   // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "تاريخ الإصدار",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "مجلد دورية: ",
 
   // "journalvolume.page.volume": "Volume",
-  // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "المجلد",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "نتائج بحث مجلد الدورية",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "وسائط الوثائق",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "الوثيقة: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "الرابط الدائم: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "العدد: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "الوصف: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "استخدم الشاشة الكاملة لمشاهدة أفضل.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "وسائط الصور",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "الصورة: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "الرابط الدائم: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "العدد: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "الوصف: ",
 
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "جاري تحميل تدفق البت...",
 
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "جاري تحميل تدفقات البت...",
 
   // "loading.browse-by": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.browse-by": "Loading items...",
+  "loading.browse-by": "جاري تحميل المواد...",
 
   // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "جاري تحميل الصفحة...",
 
   // "loading.collection": "Loading collection...",
-  // TODO New key - Add a translation
-  "loading.collection": "Loading collection...",
+  "loading.collection": "جاري تحميل الحاوية...",
 
   // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
+  "loading.collections": "جاري تحميل الحاويات...",
 
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
+  "loading.content-source": "جاري تحميل مصدر المحتوى...",
 
   // "loading.community": "Loading community...",
-  // TODO New key - Add a translation
-  "loading.community": "Loading community...",
+  "loading.community": "جاري تحميل المجتمع...",
 
   // "loading.default": "Loading...",
-  // TODO New key - Add a translation
-  "loading.default": "Loading...",
+  "loading.default": "جاري التحميل...",
 
   // "loading.item": "Loading item...",
-  // TODO New key - Add a translation
-  "loading.item": "Loading item...",
+  "loading.item": "جاري تحميل المادة...",
 
   // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
+  "loading.items": "جاري تحميل المواد...",
 
   // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "جاري تحميل المواد...",
 
   // "loading.objects": "Loading...",
-  // TODO New key - Add a translation
-  "loading.objects": "Loading...",
+  "loading.objects": "جاري التحميل...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
-  // TODO New key - Add a translation
-  "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "جاري تحميل أحدث التقديمات...",
 
   // "loading.search-results": "Loading search results...",
-  // TODO New key - Add a translation
-  "loading.search-results": "Loading search results...",
+  "loading.search-results": "جاري تحميل نتائج البحث...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  // TODO New key - Add a translation
-  "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "جاري تحميل الحاويات الفرعية...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  // TODO New key - Add a translation
-  "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "جاري تحميل المجتمعات الفرعية...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
-  // TODO New key - Add a translation
-  "loading.top-level-communities": "Loading top-level communities...",
-
-
+  "loading.top-level-communities": "جاري تحميل مجتمعات المستوى الأعلى...",
 
   // "login.form.email": "Email address",
-  // TODO New key - Add a translation
-  "login.form.email": "Email address",
+  "login.form.email": "عنوان البريد الإلكتروني",
 
   // "login.form.forgot-password": "Have you forgotten your password?",
-  // TODO New key - Add a translation
-  "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "هل نسيت كلمة المرور؟",
 
   // "login.form.header": "Please log in to DSpace",
-  // TODO New key - Add a translation
-  "login.form.header": "Please log in to DSpace",
+  "login.form.header": "يرجى تسجيل الدخول إلى دي سبيس",
 
   // "login.form.new-user": "New user? Click here to register.",
-  // TODO New key - Add a translation
-  "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "مستخدم جديد؟ اضغط هنا للتسجيل.",
 
-  // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "تسجيل الدخول باستخدام أوركيد",
 
   // "login.form.password": "Password",
-  // TODO New key - Add a translation
-  "login.form.password": "Password",
+  "login.form.password": "كلمة المرور",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "تسجيل الدخول باستخدام Shibboleth",
 
   // "login.form.submit": "Log in",
-  // TODO New key - Add a translation
-  "login.form.submit": "Log in",
+  "login.form.submit": "تسجيل الدخول",
 
   // "login.title": "Login",
-  // TODO New key - Add a translation
-  "login.title": "Login",
+  "login.title": "تسجيل الدخول",
 
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-
-
+  "login.breadcrumbs": "تسجيل الدخول",
 
   // "logout.form.header": "Log out from DSpace",
-  // TODO New key - Add a translation
-  "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "تسجيل الخروج من دي سبيس",
 
   // "logout.form.submit": "Log out",
-  // TODO New key - Add a translation
-  "logout.form.submit": "Log out",
+  "logout.form.submit": "خروج",
 
   // "logout.title": "Logout",
+  "logout.title": "خروج",
+
+  // "menu.header.nav.description": "Admin navigation bar",
   // TODO New key - Add a translation
-  "logout.title": "Logout",
+  "menu.header.nav.description": "Admin navigation bar",
 
-
-
-  // "menu.header.admin": "Admin",
-  // TODO New key - Add a translation
-  "menu.header.admin": "Admin",
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "إدارة",
 
   // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
-
+  "menu.header.image.logo": "شعار المستودع",
 
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "قائمة الإدارة",
 
   // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "التحكم في الوصول",
 
   // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "تصاريح",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "إدارة الوصول بالجملة",
 
   // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "مجموعات",
 
   // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "أشخاص",
+
+  // "menu.section.reports": "Reports",
   // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
 
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-
-
+  "menu.section.admin_search": "بحث إداري",
 
   // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "هذا المجتمع",
 
   // "menu.section.browse_community_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "حسب المؤلف",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "حسب تاريخ الإصدار",
 
   // "menu.section.browse_community_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "حسب العنوان",
 
   // "menu.section.browse_global": "All of DSpace",
-  // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "كل دي سبيس",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "حسب المؤلف",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "حسب تاريخ الإصدار",
 
   // "menu.section.browse_global_by_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "حسب الموضوع",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "حسب فئة الموضوع",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "حسب فهرس العلوم النرويجي",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "حسب العنوان",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-
-
+  "menu.section.browse_global_communities_and_collections": "المجتمعات والحاويات",
 
   // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "لوحة التحكم",
 
   // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
-
-
+  "menu.section.curation_task": "مهمة الأكرتة",
 
   // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
+  "menu.section.edit": "تحرير",
 
   // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "حاوية",
 
   // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "مجتمع",
 
   // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
-
-
+  "menu.section.edit_item": "مادة",
 
   // "menu.section.export": "Export",
-  // TODO New key - Add a translation
-  "menu.section.export": "Export",
+  "menu.section.export": "تصدير",
 
   // "menu.section.export_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "حاوية",
 
   // "menu.section.export_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
+  "menu.section.export_community": "مجتمع",
 
   // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
+  "menu.section.export_item": "مادة",
 
   // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.export_metadata": "Metadata",
-
+  "menu.section.export_metadata": "ميتاداتا",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "تصدير بالدفعة (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "قسم قائمة التحكم في الوصول",
+
+  // "menu.section.icon.reports": "Reports menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "قسم قائمة البحث الإداري",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "قسم قائمة لوحة التحكم",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_task": "Curation Task menu section",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الأكرتة",
 
   // "menu.section.icon.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "قسم قائمة التحرير",
 
   // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "قسم قائمة التصدير",
 
   // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "قسم قائمة البحث",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "قسم قائمة التحقق من الصحة",
 
   // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "قسم قائمة الاستيراد",
 
   // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "قسم قائمة جديد",
 
   // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "تدبيس الشريط الجانبي",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "قسم قائمة العمليات",
 
   // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "قسم قائمة السجلات",
 
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "قسم قائمة مهام الإحصائيات",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "قسم قائمة إدارة عمليات سير العمل",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
-
+  "menu.section.icon.unpin": "إلغاء تدبيس الشريط الجانبي",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "قسم قائمة الإشعارات",
 
   // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
+  "menu.section.import": "استيراد",
 
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "استيراد بالدفعة (ملف مضغوط)",
 
   // "menu.section.import_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.import_metadata": "Metadata",
-
-
+  "menu.section.import_metadata": "ميتاداتا",
 
   // "menu.section.new": "New",
-  // TODO New key - Add a translation
-  "menu.section.new": "New",
+  "menu.section.new": "جديد",
 
   // "menu.section.new_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "حاوية",
 
   // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
+  "menu.section.new_community": "مجتمع",
 
   // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
+  "menu.section.new_item": "مادة",
 
   // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "إصدارة المادة",
 
   // "menu.section.new_process": "Process",
+  "menu.section.new_process": "عملية",
+
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "الإشعارات",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "ضمان الجودة",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
   // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
-
-
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "تدبيس الشريط الجانبي",
 
   // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
-
-
+  "menu.section.unpin": "إلغاء تدبيس الشريط الجانبي",
 
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-
+  "menu.section.processes": "العمليات",
 
+  // "menu.section.health": "Health",
+  "menu.section.health": "كشف الصحة",
 
   // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
+  "menu.section.registries": "السجلات",
 
   // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "التنسيق",
 
   // "menu.section.registries_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.registries_metadata": "Metadata",
-
-
+  "menu.section.registries_metadata": "الميتاداتا",
 
   // "menu.section.statistics": "Statistics",
-  // TODO New key - Add a translation
-  "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "الإحصائيات",
 
   // "menu.section.statistics_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
-
-
+  "menu.section.statistics_task": "مهمة الإحصائيات",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "قسم التحكم في الوصول للبدل",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
   // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "قسم لوحة التحكم في البدل",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "قسم مهمة أكرتة البدل",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "قسم تحرير البدل",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "قسم تصدير البدل",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "قسم بحث البدل",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "قسم استيراد البدل",
 
   // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "قسم بدل جديد",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "قسم سجلات البدل",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-
+  "menu.section.toggle.statistics_task": "قسم مهمة إحصائيات البدل",
 
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "أدر سير العمل",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "تصدير نتائج البحث كملف CSV",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "تم بدء التصدير بنجاح",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "فشل بدء التصدير",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "ماي دي سبيس",
 
   // "mydspace.description": "",
-  // TODO New key - Add a translation
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  // TODO New key - Add a translation
-  "mydspace.general.text-here": "here",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  // TODO New key - Add a translation
-  "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "حدد هذا الخيار لإرسال رسالة إلى مقدم المادة.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "قم بإدخال رسالتك هنا...",
 
   // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "إخفاء الرسالة",
 
   // "mydspace.messages.mark-as-read": "Mark as read",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "حدد كمقروء",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "حدد كغير مقروء",
 
   // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "لا يوجد محتوى.",
 
   // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "لا توجد رسائل بعد.",
 
   // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "إرسال",
 
   // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "عرض الرسالة",
 
   // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "الموضوع...",
 
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  // TODO New key - Add a translation
-  "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "حدد هذا الخيار لإرسال رسالة إلى وحدة التحكم.",
 
   // "mydspace.messages.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "الرسائل",
 
   // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
+  "mydspace.messages.to": "إلى",
 
   // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "تقديم جديد",
 
   // "mydspace.new-submission-external": "Import metadata from external source",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "استيراد الميتاداتا من مصدر خارجي",
 
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "استيراد الميتاداتا",
 
   // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "تقديماتك",
 
   // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "لا يوجد مستخلص",
 
   // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "لا يوجد مؤلفين",
 
   // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "لا توجد حاويات",
 
   // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "لا يوجد تاريخ",
 
   // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "لا توجد ملفات",
 
   // "mydspace.results.no-results": "There were no items to show",
-  // TODO New key - Add a translation
-  "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "لا توجد مواد للعرض",
 
   // "mydspace.results.no-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "لا يوجد عنوان",
 
-  // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
+  "mydspace.results.no-uri": "لا يوجد Uri",
 
-  // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
+  "mydspace.search-form.placeholder": "بحث في ما دي سبيس...",
 
-  // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "مهام سير العمل",
+
+  // "mydspace.show.workspace": "Your submissions",
+  "mydspace.show.workspace": "تقديماتك",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "مواد تحت الإشراف",
 
   // "mydspace.status.mydspaceArchived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "في الأرشيف",
 
   // "mydspace.status.mydspaceValidation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "تحقق",
 
   // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "في انتظار المتحكم",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "سير العمل",
 
   // "mydspace.status.mydspaceWorkspace": "Workspace",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "مساحة العمل",
 
   // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
+  "mydspace.title": "ماي دي سبيس",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "خطأ اثناء إنشاء نطاق عمل جديد. يرجى التأكد من المحتوى المرفوع قبل إعادة المحاولة.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. تم اكتشاف عدد كبير جدًا من المدخلات ولكن تم السماح بإدخال واحد فقط للملف.",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. يسمح بملف واحد فقط.",
 
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} مادة نطاق عمل جديدة.",
 
   // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "عرض",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
   // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
 
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
 
   // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "كل دي سبيس",
 
   // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "حسب المجتمع",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "مساعدة تبديل السياق",
 
   // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
+  "nav.language": "تبديل اللغة",
 
   // "nav.login": "Log In",
-  // TODO New key - Add a translation
-  "nav.login": "Log In",
+  "nav.login": "تسجيل الدخول",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
+  "nav.user-profile-menu-and-logout": "قائمة ملف تعريف المستخدم وتسجيل الخروج",
 
   // "nav.logout": "Log Out",
-  // TODO New key - Add a translation
-  "nav.logout": "Log Out",
+  "nav.logout": "خروج",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "شريط التصفح الرئيسي",
 
   // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "ماي دي سبيس",
 
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
+  "nav.profile": "الملف الشخصي",
 
   // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
+  "nav.search": "بحث",
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "تقديم بحث",
 
   // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "الإحصائيات",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "الاشتراكات",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "تبديل التصفح",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "شريط ملف تعريف المستخدم",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "المادة",
+
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "ضمان الجودة",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "أدناه يمكنك رؤية جميع مصادر الإشعارات.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "المواضيع الحالية",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "المصادر الحالية",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "الموضوع",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "المصدر",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "آخر فعالية",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "إجراءات",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
   // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
 
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
 
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "لم يتم العثور على مواضيع.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "لم يتم العثور على مصادر.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "اقتراحات ضمان الجودة",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "حدث خطأ أثناء تحميل موضوعات ضمان الجودة",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل مصدر ضمان الجودة",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "جاري التحميل ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "الموضوع:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "لم يتم العثور على أي اقتراحات.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "ثقة",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "النشر",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "تفاصيل",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "تفاصيل المشروع",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "إجراءات",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "قبول الاقتراح",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
+
+  // "quality-assurance.event.action.undo": "DELETE",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "DELETE",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "رفض الاقتراح",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراح",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "PID نوع:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "PID قيمة:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "قيمة الموضوع:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "خلاصة:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "بيانات المشروع المقترحة من OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "عنوان المشروع:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "حروف مختصرة:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "رمز:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "الممول:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "برنامج التمويل:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "الاختصاص القضائي:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "رجوع إلى المواضيع",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "عرض أقل",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "عرض المزيد",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيلة محلية",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "هل أنت متأكد؟",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "لا يمكن التراجع عن هذه العملية. تجاهل هذا الاقتراح؟",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "لا يمكن التراجع عن هذه العملية. هل ترفض هذا الاقتراح؟",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع دي سبيس. سيتم إنشاء مشروع جديد بناءً على بيانات الاقتراح.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "إلغاء",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "لقد تم حفظ قرارك بنجاح.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "حدث خطأ. لم يتم حفظ قرارك.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "اختر مشروعاً للربط",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "النشر:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "بحث المشروع",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "بحث",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "مسح",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "إلغاء",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "ربط المشروع",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "إزالة",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "قم بإدخال اسم المشروع",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على مشروع.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "تم ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "تم إلغاء ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "حدث خطأ. لم يتم تنفيذ أي عملية.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "السبب",
 
   // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "وحدة مؤسسية",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "بدون عنوان",
 
   // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
+  "orgunit.page.city": "المدينة",
 
   // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
+  "orgunit.page.country": "البلد",
 
   // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "تاريخ التأسيس",
 
   // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
+  "orgunit.page.description": "الوصف",
 
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "تحرير هذه المادة",
 
   // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
-  "orgunit.page.id": "ID",
+  "orgunit.page.id": "المعرف",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "الوحدة المؤسسية: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "ROR معرف",
 
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "خيارات ترقيم الصفحات",
 
   // "pagination.results-per-page": "Results Per Page",
-  // TODO New key - Add a translation
-  "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "النتائج لكل صفحة",
 
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  // TODO New key - Add a translation
-  "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} من {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  // TODO New key - Add a translation
-  "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "يظهر الآن  ",
 
   // "pagination.sort-direction": "Sort Options",
-  // TODO New key - Add a translation
-  "pagination.sort-direction": "Sort Options",
-
-
+  "pagination.sort-direction": "خيارات الفرز",
 
   // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
+  "person.listelement.badge": "شخص",
 
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "لم يتم العثور على أسماء",
 
   // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "تاريخ الميلاد الميلادي",
 
   // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
+  "person.page.edit": "تحرير هذه المادة",
 
   // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
+  "person.page.email": "عنوان البريد الإلكتروني",
 
   // "person.page.firstname": "First Name",
   // TODO New key - Add a translation
   "person.page.firstname": "First Name",
 
   // "person.page.jobtitle": "Job Title",
-  // TODO New key - Add a translation
-  "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "المسمي الوظيفي",
 
   // "person.page.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
+  "person.page.lastname": "اسم العائلة",
+
+  // "person.page.name": "Name",
+  "person.page.name": "الاسم",
 
   // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "عرض كل الميتاداتا",
 
   // "person.page.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "person.page.orcid": "ORCID",
+  "person.page.orcid": "أوركيد",
 
   // "person.page.staffid": "Staff ID",
-  // TODO New key - Add a translation
-  "person.page.staffid": "Staff ID",
+  "person.page.staffid": "معرف الموظف",
 
   // "person.page.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "الشخص: ",
 
   // "person.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person.search.results.head": "Person Search Results",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  // TODO New key - Add a translation
-  "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.results.head": "نتائج بحث الشخص",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "نتائج بحث الشخص",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "بحث الشخص",
 
   // "process.new.select-parameters": "Parameters",
-  // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "المتغيرات",
+
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "تحديد متغير",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "إضافة متغير...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "حذف متغير",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "قيمة المتغير",
 
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
+  "process.new.cancel": "إلغاء",
 
-  // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
+  // "process.new.submit": "Save",
+  "process.new.submit": "حفظ",
 
   // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
-  "process.new.select-script": "Script",
+  "process.new.select-script": "نص",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  // TODO New key - Add a translation
-  "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "اختر نص...",
 
   // "process.new.select-script.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "النص مطلوب",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "اختر ملف...",
 
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "يرجى تحديد ملف",
 
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "قيمة المتغير مطلوبة",
 
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "القيمة",
 
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "ملف",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "المتغيرات التالية مطلوبة ولكنها لا تزال ناقصة:",
 
   // "process.new.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "نجاح",
 
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "تم إنشاء العملية بنجاح",
 
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "خطأ",
 
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء العملية",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "يتجاوز الملف الحد الأقصى لحجم التحميل",
 
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
+  "process.new.header": "إنشاء عملية جديدة",
 
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
+  "process.new.title": "إنشاء عملية جديدة",
 
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "إنشاء عملية جديدة",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "حجج",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "لا تحتوي هذه العملية على أي حجج",
 
-  // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  // "process.detail.back": "Back",
+  "process.detail.back": "رجوع",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
-
-  // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
-
-  // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "مخرجات العملية",
 
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "استرجاع مخرجات العملية",
 
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "استرجاع",
 
   // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "لا توجد مخرجات لهذه العملية",
+
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "ملفات الإخراج",
+
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "لا تحتوي هذه العملية على أي ملفات إخراج",
+
+  // "process.detail.script": "Script",
+  "process.detail.script": "النص",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "العملية: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "وقت البدء",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "وقت الانتهاء",
+
+  // "process.detail.status": "Status",
+  "process.detail.status": "الحالة",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "إنشاء عملية مماثلة",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "إجراءات",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "حذف العملية",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "حذف العملية",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "هل أنت متأكد من أنك تريد حذف العملية الحالية؟",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "إلغاء",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "حذف العملية",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "تم حذف العملية بنجاح.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "حدث خطأ ما أثناء حذف العملية",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
   // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
+  "process.detail.refreshing": "Auto-refreshing…",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.overview.table.completed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  "process.overview.table.completed.info": "Finish time (UTC)",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.overview.table.completed.title": "Succeeded processes",
   // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.overview.table.completed.title": "Succeeded processes",
 
-  // "process.detail.script" : "Script",
+  // "process.overview.table.empty": "No matching processes found.",
   // TODO New key - Add a translation
-  "process.detail.script": "Script",
+  "process.overview.table.empty": "No matching processes found.",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.overview.table.failed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.overview.table.failed.info": "Finish time (UTC)",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.overview.table.failed.title": "Failed processes",
   // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  "process.overview.table.failed.title": "Failed processes",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "وقت الانتهاء (التوقيت العالمي)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "معرف العملية",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "الاسم",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  "process.overview.table.running.info": "Start time (UTC)",
 
-  // "process.detail.status" : "Status",
+  // "process.overview.table.running.title": "Running processes",
   // TODO New key - Add a translation
-  "process.detail.status": "Status",
+  "process.overview.table.running.title": "Running processes",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
   // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
 
-
-
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.scheduled.title": "Scheduled processes",
   // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time",
+  "process.overview.table.scheduled.title": "Scheduled processes",
 
-  // "process.overview.table.id" : "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "وقت البدء (التوقيت العالمي)",
 
-  // "process.overview.table.name" : "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  // "process.overview.table.status": "Status",
+  "process.overview.table.status": "الحالة",
 
-  // "process.overview.table.start" : "Start time",
-  // TODO New key - Add a translation
-  "process.overview.table.start": "Start time",
-
-  // "process.overview.table.status" : "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status": "Status",
-
-  // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "المستخدم",
 
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
+  "process.overview.title": "نظرة عامة على العمليات",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "نظرة عامة على العمليات",
 
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
+  "process.overview.new": "جديد",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "إجراءات",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "حذف {{count}} عملية",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "حذف العملية",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "مسح تحديد الحذف",
+
+  // "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": "يجري حذف {{count}} عملية. يرجى الانتظار حتى يكتمل الحذف بالكامل. لاحظ أن ذلك قد يستغرق بعض الوقت.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "هل أنت متأكد أنك تريد حذف {{count}} عملية؟",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "حذف العمليات",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "خطأ في عملية الحذف",
+
+  // "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": "لا يمكن حذف العملية ذات المعرف {{processId}}. وسيستمر حذف العمليات المتبقية. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "تم حذف {{count}} عملية بنجاح",
 
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "تحديث الملف الشخصي",
 
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
+  "profile.card.identify": "تعريف",
 
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
+  "profile.card.security": "الحماية والأمان",
 
-  // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "حفظ",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "مجموعات التفويض التي تنتمي إليها",
 
-  // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "مجموعات التفويض الخاصة التي تنتمي إليها",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "الاسم الأول مطلوب",
 
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "اسم العائلة مطلوب",
 
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "عنوان البريد الإلكتروني",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "الاسم الأول",
 
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "اللغة",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "اسم العائلة",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "هاتف الاتصال",
 
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على الملف الشخصي.",
 
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "تم حفظ الملف الشخصي",
 
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "لم يتم إجراء أي تغييرات على الملف الشخصي.",
 
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "لا توجد تغييرات",
 
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  "profile.security.form.info": "اختيارياً، يمكنك إدخال كلمة مرور جديدة في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
 
   // "profile.security.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "كلمة المرور",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "كلمة المرور الحالية",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على كلمة المرور.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "تم حفظ كلمة المرور",
 
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "حدث خطأ أثناء تغيير كلمات المرور",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  // "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": "حدث خطأ أثناء محاولة تغيير كلمة المرور. يرجى التحقق مما إذا كانت كلمة المرور الحالية صحيحة.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "كلمات المرور المقدمة مختلفة.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "يرجى ملء الحقول المطلوبة في نموذج الحماية والأمان.",
 
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-
+  "profile.title": "تحديث الملف الشخصي",
 
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "الملف الشخصي للباحث",
 
   // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "مشروع الباحث",
 
   // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
+  "project.page.contributor": "المساهمون",
 
   // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
+  "project.page.description": "الوصف",
 
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
+  "project.page.edit": "تحرير هذه المادة",
 
   // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "الإكمال المتوقع",
 
   // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
+  "project.page.funder": "الممولين",
 
   // "project.page.id": "ID",
-  // TODO New key - Add a translation
-  "project.page.id": "ID",
+  "project.page.id": "المعرف",
 
   // "project.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "project.page.keyword": "Keywords",
+  "project.page.keyword": "كلمات رئيسية",
 
   // "project.page.status": "Status",
-  // TODO New key - Add a translation
-  "project.page.status": "Status",
+  "project.page.status": "الحالة",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "مشورع البحث: ",
 
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-
+  "project.search.results.head": "نتائج بحث المشروع",
 
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "نتائج بحث المشروع",
 
   // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "النشر",
 
   // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
+  "publication.page.description": "الوصف",
 
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
+  "publication.page.edit": "تحرير هذه المادة",
 
   // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ردمد الدورية",
 
   // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "عنوان الدورية",
 
   // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "الناشر",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "المنشور: ",
 
   // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "عنوان المجلد",
 
   // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "نتائج بحث المنشور",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "نتائج بحث المنشور",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "بحث المنشور",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "التالي",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "السابق",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "قائمة التشغيل",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
+  "register-email.title": "تسجيل مستخدم جديد",
 
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "إنشاء ملف شخصي",
 
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "تعريف",
 
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "عنوان البريد الإلكتروني",
 
   // "register-page.create-profile.identification.first-name": "First Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "الاسم الأول *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "يرجى إدخال الاسم الأول",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "اسم العائلة *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "يرجى إدخال اسم العائلة",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "الهاتف",
 
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "اللغة",
 
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "الحماية والأمان",
 
-  // "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.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  "register-page.create-profile.security.info": "يرجى إدخال كلمة المرور في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني. يجب أن تتكون من ستة أحرف على الأقل.",
 
   // "register-page.create-profile.security.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "كلمة المرور *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "أعد الكتابة للتأكيد *",
 
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "يرجى إدخال كلمة المرور في المربع أدناه.",
 
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.matching-passwords": "كلمتي المرور التي قمت بإدخالهما غير متطابقتين.",
 
   // "register-page.create-profile.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "اكتمل التسجيل",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "حدث خطأ ما أثناء تسجيل مستخدم جديد.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "فشل التسجيل",
 
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "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": "تم التسجيل بنجاح. لقد قمت بتسجيل الدخول كالمستخدم الذي تم إنشاؤه.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-
+  "register-page.create-profile.submit.success.head": "اكتمل التسجيل",
 
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "تسجيل مستخدم جديد",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "قم بتسجيل حساب للاشتراك في حاويات لتحديثات البريد الإلكتروني، وتقديم مواد جديدة إلى دي سبيس.",
 
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "عنوان البريد الإلكتروني *",
 
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "يرجى إدخال عنوان البريد الإلكتروني",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "استخدم البريد الإلكتروني بالنطاقات المسموح بها: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "سيتم التحقق من هذا العنوان واستخدامه كاسم تسجيل الدخول الخاص بك.",
 
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "تسجيل",
 
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "تم إرسال رسالة تأكيد البريد الإلكتروني",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "تم إرسال رسالة بريد إلكتروني إلى {{ email }} تحتوي على عنوان URL خاص والمزيد من التعلميات.",
 
   // "register-page.registration.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "خطأ أثناء محاولة تسجيل البريد الإلكتروني",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "حدث خطأ أثناء تسجيل عنوان البريد الإلكتروني التالي: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "حدث خطأ أثناء محاولة الاستيثاق باستخدام 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": "للتسجيل، يجب عليك قبول ملفات تعريف ارتباط <b>التسجيل واستعادة كلمة المرور</b> (جوجل reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي يمكنها التسجيل. النطاقات المسموح بها هي {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "فتح إعدادات ملفات تعريف الارتباط",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "جوجل reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
+  "register-page.registration.google-recaptcha.notification.message.error": "حدث خطأ أثناء التحقق من reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "انتهت صلاحية التحقق. يرجى التحقق مرة أخرى.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "يمكن تسجيل الحسابات لعناوين البريد للنطاقات",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
-  "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": "لا يمكن العثور على تطابق مناسب لنوع العلاقة {{ type }} بين المادتين",
 
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
-  "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "لقد أعاد الخادم خطأ",
 
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "غير قادر على إضافة العلاقة",
 
   // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "المؤلفين",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "المؤلفين (أشخاص)",
 
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "المؤلفين (وحدات مؤسسية)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "أعداد الدورية",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "عدد الدورية",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "عدد الدورية",
 
   // "relationships.isJournalOf": "Journals",
-  // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "الدوريات",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "مجلد الدورية",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "وحدات مؤسسية",
 
   // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "المؤلفين",
 
   // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "مشروعات البحث",
 
   // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "منشورات",
 
   // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "مقالات",
 
   // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "الدورية",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "مجلد الدورية",
 
   // "relationships.isVolumeOf": "Journal Volumes",
-  // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "مجلدات الدورية",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "مجلد الدورية",
 
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "المساهمين",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "المساهم (وحدة مؤسسية)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "المساهم",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "الممول",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "شعار المستودع",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "مستودع دي سبيس",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "مستودع دي سبيس :: ",
 
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "إضافة",
 
   // "resource-policies.add.for.": "Add a new policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "إضافة سياسة جديدة",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "إضافة سياسة تدفق بت جديدة",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "إضافة سياسة حزمة جديدة",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "إضافة سياسة مادة جديدة",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "إضافة سياسة مجتمع جديدة",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "إضافة سياسة حاوية جديدة",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "إنشاء سياسة موارد جديدة لـ ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء سياسة الموارد.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "تمت العملية بنجاح",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "إنشاء سياسة موارد جديدة",
 
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "حذف المحدد",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "حذف سياسات الموارد المحددة",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد المحددة.",
 
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "عملية ناجحة",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "تحرير سياسة المورد ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير سياسة المورد.",
+
+  // "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": "حدث خطأ أثناء تحرير الهدف (الشخص الإلكتروني أو المجموعة) لسياسة الموارد.",
+
+  // "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": "حدث خطأ أثناء تحرير سياسة الموارد. تم تحديث الهدف (الشخص الإلكتروني أو المجموعة) بنجاح.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "عملية ناجحة",
 
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "تحرير سياسة المورد",
 
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "تحديد نوع الإجراء",
 
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء سياسة المورد.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي سيتم منحها هذه الصلاحية",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "تحديد",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "بحث عن شخص إلكتروني",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "بحث عن مجموعة",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "إجراء",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "المعرف",
 
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "الاسم",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "لا يمكن تغيير النوع",
+
+  // "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": "لا يمكن استبدال الشخص الإلكتروني بمجموعة.",
+
+  // "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": "لا يمكن استبدال مجموعة بشخص إلكتروني.",
+
+  // "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": "قم بحذف سياسة الموارد الحالية وإنشاء سياسة جديدة بالنوع المطلوب.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "موافق",
 
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "تاريخ الانتهاء",
 
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "تاريخ البدء",
 
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "الوصف",
 
   // "resource-policies.form.name.label": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "الاسم",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "حدد نوع السياسة",
 
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع سياسة الموارد.",
 
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "إجراء",
 
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "تاريخ الانتهاء",
 
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "تاريخ البدء",
 
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "تحرير",
 
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "تحرير المجموعة",
 
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "تحرير السياسة",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "شخص إلكتروني",
 
   // "resource-policies.table.headers.group": "Group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "المجموعة",
+
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "تحديد الكل",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "إلغاء تحديد الكل",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "تحديد",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "إلغاء تحديد",
 
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "المعرف",
 
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "الاسم",
 
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "النوع",
 
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "سياسات تدفق البت",
 
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "سياسات الحزمة",
 
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "سياسات المادة",
 
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "سياسات المجتمع",
 
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-
+  "resource-policies.table.headers.title.for.collection": "سياسات الحاوية",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "انتقل إلى المحتوى الرئيسي",
 
   // "search.description": "",
-  // TODO New key - Add a translation
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-  // TODO New key - Add a translation
-  "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "عرض",
 
-  // "search.title": "DSpace Angular :: Search",
-  // TODO New key - Add a translation
-  "search.title": "DSpace Angular :: Search",
+  // "search.title": "Search",
+  "search.title": "بحث",
 
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "بحث",
 
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "بحث المستودع ...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "إزالة المنقح من النوع {{ type }} بقيمة {{ value }}",
 
   // "search.filters.applied.f.author": "Author",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "المؤلف",
 
   // "search.filters.applied.f.dateIssued.max": "End date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "تاريخ الانتهاء",
 
   // "search.filters.applied.f.dateIssued.min": "Start date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "تاريخ البدء",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "تاريخ التقديم",
 
-  // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "غير قابل للاكتشاف",
 
   // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "نوع المادة",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "بها ملفات",
 
   // "search.filters.applied.f.itemtype": "Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "النوع",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "الحالة",
 
   // "search.filters.applied.f.subject": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "الموضع",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "المقدم",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "المسمى الوظيفي",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "نهاية تاريخ الميلاد",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "بداية تاريخ الميلاد",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "تحت إشراف",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
-
-
+  "search.filters.applied.f.withdrawn": "مسحوب",
 
   // "search.filters.filter.author.head": "Author",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "المؤلف",
 
   // "search.filters.filter.author.placeholder": "Author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "اسم المؤلف",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "بحث اسم المؤلف",
 
   // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "تاريخ الميلاد",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "بحث تاريخ الميلاد",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "طي المنقح",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "تاريخ النشر",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "بحث تاريخ النشر",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "المحرر",
 
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "بحث المحرر",
 
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "الموضوع",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "الموضوع",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "بحث الموضوع",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "الناشر",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "بحث الناشر",
 
   // "search.filters.filter.dateIssued.head": "Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "التاريخ",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "الحد الأقصى للتاريخ",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "انتهاء",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "الحد الأدنى للتاريخ",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "البدء",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "تاريخ التقديم",
 
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "تاريخ التقديم",
 
-  // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "بحث تاريخ التقديم",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "غير قابل للاكتشاف",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "مسحوب",
 
   // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "نوع المادة",
 
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "نوع المادة",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "بحث نوع المادة",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "توسيع المنقح",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  // TODO New key - Add a translation
-  "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "بها ملفات",
 
   // "search.filters.filter.itemtype.head": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "النوع",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "النوع",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "بحث النوع",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "المسمى الوظيفي",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "بحث المسمى الوظيفي",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "لغة معروفة",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "لغة معروفة",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "بحث لغة معروفة",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "الحالة",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "الحالة",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "بحث الحالة",
 
   // "search.filters.filter.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "أشخاص",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "أشخاص",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "بحث الأشخاص",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "البلد",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "بحث البلد",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "المدينة",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "بحث المدينة",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "تاريخ التأسيس",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "تاريخ التأسيس",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "بحث تاريخ التأسيس",
 
   // "search.filters.filter.scope.head": "Scope",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "النطاق",
 
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "منقح النطاق",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "منقح نطاق البحث",
 
   // "search.filters.filter.show-less": "Collapse",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "طي",
 
   // "search.filters.filter.show-more": "Show more",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "عرض المزيد",
 
   // "search.filters.filter.subject.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "الموضوع",
 
   // "search.filters.filter.subject.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "الموضوع",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "بحث الموضوع",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "المقدم",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "المقدم",
 
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "مقدم البحث",
 
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "استعراض شجرة {{ name }}",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "التمويل",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "التمويل",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "البحث تحت إشراف",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "عدد الدورية",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "مجلد الدورية",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "وحدة مؤسسية",
+
+  // "search.filters.entityType.Person": "Person",
   // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "نعم",
 
   // "search.filters.has_content_in_original_bundle.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "لا",
 
   // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "لا",
 
   // "search.filters.discoverable.false": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "نعم",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "مؤرشف",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "التحقق من الصحة",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "في انتظار المراجع",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "سير العمل",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "مساحة العمل",
 
   // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "نعم",
 
   // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
-
+  "search.filters.withdrawn.false": "لا",
 
   // "search.filters.head": "Filters",
-  // TODO New key - Add a translation
-  "search.filters.head": "Filters",
+  "search.filters.head": "المنقحات",
 
   // "search.filters.reset": "Reset filters",
-  // TODO New key - Add a translation
-  "search.filters.reset": "Reset filters",
-
+  "search.filters.reset": "إعادة تعيين المنقحات",
 
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "تقديم",
 
   // "search.form.search": "Search",
-  // TODO New key - Add a translation
-  "search.form.search": "Search",
-
-  // "search.form.search_dspace": "Search DSpace",
-  // TODO New key - Add a translation
-  "search.form.search_dspace": "Search DSpace",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  // TODO New key - Add a translation
-  "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search": "بحث",
 
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "كل المستودع",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "كل دي سبيس",
 
   // "search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "search.results.head": "Search Results",
+  "search.results.head": "نتائج البحث",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  // TODO New key - Add a translation
-  "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "لم يسفر بحثك عن أي نتائج. هل تجد صعوبة في العثور على ما تبحث عنه؟ جرب وضع",
 
   // "search.results.no-results-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "قوسي نص حوله",
 
   // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "لم يسفر بحثك عن أي نتائج.",
+
+  // "search.results.view-result": "View",
+  "search.results.view-result": "عرض",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "حدث خطأ أثناء تنفيذ الاستعلام، يرجى إعادة المحاولة مرة أخرى لاحقاً",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "نتائج البحث",
+
+  // "default-relationships.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
-
-
+  "default-relationships.search.results.head": "Search Results",
 
   // "search.sidebar.close": "Back to results",
-  // TODO New key - Add a translation
-  "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "العودة إلى النتائج",
 
   // "search.sidebar.filters.title": "Filters",
-  // TODO New key - Add a translation
-  "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "المنقحات",
 
   // "search.sidebar.open": "Search Tools",
-  // TODO New key - Add a translation
-  "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "أدوات البحث",
 
   // "search.sidebar.results": "results",
-  // TODO New key - Add a translation
-  "search.sidebar.results": "results",
+  "search.sidebar.results": "النتائج",
 
   // "search.sidebar.settings.rpp": "Results per page",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "النتائج لكل صفحة",
 
   // "search.sidebar.settings.sort-by": "Sort By",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "فرز حسب",
 
   // "search.sidebar.settings.title": "Settings",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.title": "Settings",
-
-
+  "search.sidebar.settings.title": "الإعدادات",
 
   // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "عرض التفاصل",
 
   // "search.view-switch.show-grid": "Show as grid",
-  // TODO New key - Add a translation
-  "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "عرض كشبكة",
 
   // "search.view-switch.show-list": "Show as list",
-  // TODO New key - Add a translation
-  "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "عرض كقائمة",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "إلغاء تحديد المادة",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "تحديد المادة",
 
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
+  "sorting.ASC": "تصاعدياً",
 
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
+  "sorting.DESC": "تنازلياً",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "العنوان تصاعدياً",
 
   // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "العنوان تنازلياً",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "الأقل صلة",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "الأكثر صلة",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "تاريخ الإصدار تصاعدياً",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "تاريخ الإصدار تنازلياً",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تصاعدياً",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع تنازلياً",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "آخر تعديل تصاعدياً",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "آخر تعديل تنازلياً",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
   // TODO New key - Add a translation
-  "sorting.dc.title.DESC": "Title Descending",
+  "sorting.person.familyName.ASC": "Surname Ascending",
 
-  // "sorting.score.DESC": "Relevance",
+  // "sorting.person.familyName.DESC": "Surname Descending",
   // TODO New key - Add a translation
-  "sorting.score.DESC": "Relevance",
+  "sorting.person.familyName.DESC": "Surname Descending",
 
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
 
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
 
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
+  "statistics.title": "الاحصائيات",
 
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "احصائيات لـ {{ scope }}",
 
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "الاحصائيات",
 
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "لا تتوافر أي بيانات",
 
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "لا تتوافر أي بيانات",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "إجمالي الزيارات",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "إجمالي الزيارات لكل شهر",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "زيارات الملف",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "أعلى مشاهدات على مستوى البلد",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "أعلى مشاهدات على مستوى المدينة",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "المشاهدات",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(تعذر تحميل اسم الكائن)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "تحرير التقديم",
 
   // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "تحرير التقديم",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  // TODO New key - Add a translation
-  "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "إلغاء",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "ليس لديك صلاحية القيام بتقديم جديد.",
 
   // "submission.general.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "إيداع",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "إلغاء",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "نعم، متأكد",
 
   // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "تجاهل التقديم",
 
   // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "تجاهل",
+
+  // "submission.general.back.submit": "Back",
   // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "محفوظ",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "تغييرات غير محفوظة",
 
   // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
+  "submission.general.save": "حفظ",
 
   // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for later",
-
+  "submission.general.save-later": "حفظ لوقت لاحق",
 
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "استيراد ميتاداتا من مصدر خارجي",
 
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "استيراد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من مصدر خارجيe",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "استيراد مجلد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "استيراد ناشر من مصدر خارجي",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "استيراد شخص من مصدر خارجي",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "استيراد مشروع من مصدر خارجي",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "استيراد منشور من مصدر خارجي",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "استيراد ميتاداتا من مصدر خارجي",
 
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  // TODO New key - Add a translation
-  "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": "قم بإدخال استعلام أعلاه للعثور على مواد من الويب لاستيرادها إلى دي سبيس.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  // TODO New key - Add a translation
-  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "العودة إلى ماي سبيس",
 
   // "submission.import-external.search.placeholder": "Search the external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "بحث المصدر الخارجي",
 
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "بحث",
 
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "اكتب بعض الكلمات للبحث",
 
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "اختر مصدراً خارجياً",
 
   // "submission.import-external.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
 
-  // "submission.import-external.source.loading": "Loading ...",
+  // "submission.import-external.source.ads": "NASA/ADS",
+  "submission.import-external.source.ads": "ناسا/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "كروس ريف",
+
+  // "submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "داتاسايت",
+
+  // "submission.import-external.source.doi": "DOI",
   // TODO New key - Add a translation
-  "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.doi": "DOI",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.scopus": "سكوبس",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.vufind": "فيوفايند",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "شبكة العلوم",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.orcidWorks": "أوركيد",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "مكتب براءات الاختراع الأوروبي (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "جاري التحميل ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "دوريات شيربا",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "دوريات شيربا بواسطة الردمد",
 
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "ناشري شيربا",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
 
   // "submission.import-external.source.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "أوركيد",
 
   // "submission.import-external.source.pubmed": "Pubmed",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
-  "submission.import-external.source.lcname": "Library of Congress Names",
+  "submission.import-external.source.lcname": "أسماء مكتبة الكونجرس",
+
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "سجل المؤسسات البحثية (ROR)",
 
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "معاينة المنشور",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "معاينة الدورية",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "معاينة الوحدة المؤسسية",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "معاينة الشخص",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "معاينة المشروع",
 
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "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": "تم استيراد الميتاداتا أدناه من مصدر خارجي. ستتم تعبئتها بشكل مسبق عند بدء التقديم.",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "بدء التقديم",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "خطأ في التقديم",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد مدخل المصدر الخارجي.",
 
   // "submission.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "إغلاق",
 
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "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": "استيراد مؤلف بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  // TODO New key - Add a translation
-  "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": "استيراد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "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": "استيراد عدد دورية بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "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": "استيراد مجلد دورية بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "المشروع",
+
+  // "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": "استيراد مادة بعيدة",
+
+  // "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": "استيراد فعالية بعيدة",
+
+  // "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": "استيراد منتج بعيد",
+
+  // "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": "استيراد معدات بعيدة",
+
+  // "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": "استيراد وحدة مؤسسية بعيدة",
+
+  // "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": "استيراد تمويل بعيد",
+
+  // "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": "استيراد شخص بعيد",
+
+  // "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": "استيراد براءة اختراع بعيدة",
+
+  // "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": "استيراد مشروع بعيد",
+
+  // "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": "استيراد منشور بعيد",
+
+  // "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": "تمت إضافة كينونة جديدة!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "مشروع",
+
+  // "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": "تمويل واجهة برمجة تطبيقات OpenAIRE",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "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": "استيراد مؤلف بعيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "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": "تمت إضافة المؤلف المحلي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "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": "تم استيراد وإضافة المؤلف الخارجي بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "الاستناد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "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": "استيراد كإدخال استناد محلي جديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "إلغاء",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "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": "حدد حاوية لاستيراد الإدخالات الجديدة إليها",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "الكينونات",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "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": "استيراد ككينونة محلية جديدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "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": "استيراد من اسم مكتبة الكونجرس",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  // TODO New key - Add a translation
-  "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": "استيراد من أوركيد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  // TODO New key - Add a translation
-  "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": "استيراد من دورية شيربا",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "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": "استيراد من ناشر شيربا",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "استيراد من PubMed",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "استيراد من arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "استيراد من ROR",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "استيراد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "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": "استيراد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "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": "تمت إضافة الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  // TODO New key - Add a translation
-  "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": "تم بنجاح استيراد وإضافة دورية خارجية إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "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": "استيراد عدد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "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": "تمت إضافة عدد الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "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": "تم استيراد عدد الدورية الخارجية وإضافته بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  // TODO New key - Add a translation
-  "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": "استيراد مجلد دورية بعيدة",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  // TODO New key - Add a translation
-  "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": "تمت إضافة مجلد الدورية المحلية بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  // TODO New key - Add a translation
-  "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": "تم استيراد مجلد الدورية الخارجية وإضافته بنجاح إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "تحديد تطابق محلي:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "استيراد مؤسسة بعيدة",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد بنجاح",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم بنجاح استيراد وإضافة مؤسسة خارجية إلى التحديد",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "إلغاء تحديد الكل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "إلغاء تحديد الصفحة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "جاري التحميل...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "استعلام البحث",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "اذهب",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحث...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "تحديد الكل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "تحديد الصفحة",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} مادة محددة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين المحليين ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "المشاريع المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "المنشورات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين المحليين ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "الوحدات المؤسسية المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "حزم البيانات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "ملفات البيانات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "أعداد الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "أعداد الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "مجلدات الدوريات المحلية ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "مجلدات الدوريات المحلية ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "دوريات شيربا ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "ناشري شيربا ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "أوركيد ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "أسماء مكتبة الكونجرس ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "أوركيد ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "تمويل OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "دوريات شيربا حسب ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "البحث عن وكالات ممولة",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن تمويل",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "المشاريع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "منشورات المؤلف",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة المؤسسية للمشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "المشروع",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "المشاريع",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحث...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الحالي ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "أعداد الدورية",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "أعداد الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "مجلدات الدورية",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "مجلدات الدورية",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "الدوريات",
 
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "المؤلفين",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "الوكالة الممولة",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "المشروعات",
 
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "المنشورات",
 
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "المؤلفين",
 
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات المؤسسية",
 
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "حزم البيانات",
 
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات البيانات",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "الوكالة الممولة",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "تمويل",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المؤسسية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "النشر",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "وحدة مؤسسية",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "قائمة التبديل المنسدلة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "الإعدادات",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك فارغ حالياً.",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين المحددين",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "الدوريات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "مجلد الدورية المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "المشاريع المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "المنشورات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين المحددين",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات المؤسسية المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "حزم البيانات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ملفات البيانات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "الدوريات المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العدد المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "مجلد الدورية المحدد",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل المحدد",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العدد المحدد",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة المؤسسية المحددة",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "نتائج البحث",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "نتائج البحث",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "هل ترغب في حفظe \"{{ value }}\" كمتغير اسم لهذا الشخص حتى تتمكن أنت والآخرون من إعادة استخدامه لعمليات التقديم المستقبلية؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدامه لهذا التقديم.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ متغير اسم جديد",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط لهذا التقديم",
 
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "نوع الترخيص",
 
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "قم بتحديد نوع الترخيص…",
 
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "قم بتغيير نوع الترخيص…",
 
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "لا تتوافر أي تراخيص",
 
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "قم بتحديد خيار…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "لقد قمت بتحديد الترخيص التالي:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "أمنحك الترخيص أعلاه",
 
   // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "إضافة المزيد",
+
+  // "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": "لا يمكن إتمام الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى ملء جميع الحقول المطلوبة لإتمام الإيداع.",
 
   // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "حاوية",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "حدثت مشكلة أثناء تقديم المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "تم إيداع التقديم بنجاح.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "حدثت مشكلة أثناء تجاهل المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "تم تجاهل التقديم بنجاح.",
 
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "تم استخلاص ميتاداتا جديدة وإضافتها إلى قسم <strong>{{sectionId}}</strong>.",
 
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "تمت إضافة قسم <strong>{{sectionId}}</strong> جديد إلى التقديم.",
 
   // "submission.sections.general.no-collection": "No collection found",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "لم يتم العثور على حاويات",
+
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "لم يتم العثور على أنواع كينونات",
 
   // "submission.sections.general.no-sections": "No options available",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "لا تتوافر أي خيارات",
 
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "تم حفظ التقديم بنجاح.",
 
   // "submission.sections.general.search-collection": "Search for a collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "البحث عن حاوية",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  // TODO New key - Add a translation
-  "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "هناك أقسام غير مكتملة.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية للمادة الخاصة بك:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "لم يتم سك أي هاندل لهذه المادة.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "لم يتم سك أي معرفات كائنات رقمية لهذه المادة.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "هاندل: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "معرف الكائن الرقمي: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "معرفات أخرى: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول للمادة",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "الإبداعية العامة",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "وصف",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "وصف",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "وصف",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "المعرفات",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "رخصة الإيداع",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "سياسات شيربا",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "تحميل الملفات",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات سياسة الوصول الحر للناشر",
+
+  // "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": "لا تتوفر معلومات حول سياسة الناشر. إذا كان لعملك رقم ISSN مرتبط، يرجى إدخاله أعلاه للاطلاع على أي سياسة وصول حر للناشرين ذوي الصلة.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "أخطاء",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "صالح",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "تحذيرات",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "به أخطاء",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "صالح",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "ذو تحذيرات",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "معلومات إضافية",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "معلومات إضافية",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "فتح القسم",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "إغلاق القسم",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "توسيع قسم {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "طي قسم {{sectionHeader}}",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
-
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
 
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "إلغاء",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "نعم، متأكد",
 
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "حذف تدفق البت",
 
   // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "حذف",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "تحميل تدفق البت",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  // TODO New key - Add a translation
-  "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإرفاقها بالمادة",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "تحرير دفق البت",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "نوع شرط الوصول",
+
+  // "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": "حدد شرط الوصول لتطبيقه على تدفقات البت بمجرد إيداع المادة",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "التاريخ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "منح الوصول من",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة منذ بلوغه",
 
   // "submission.sections.upload.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "من",
 
   // "submission.sections.upload.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "المجموعة",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "المجموعة مطلوبة.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "حتى",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "ستكون الملفات المرفوعة في الحاوية {{collectionName}} قابلة للوصول وفقًا للمجموعات التالية:",
 
   // "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):",
-  // TODO New key - Add a translation
-  "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في حاوية {{collectionName}} ستكون قابلة للوصول، بالإضافة إلى ما تقرر بوضوح للملف المفرد، مع المجموعات التالية:",
 
   // "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 by dragging & dropping them anywhere on the page.</strong>",
-  // TODO New key - Add a translation
-  "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 by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "ستجد هنا كل الملفات الموجودة في المادة حاليًا. يمكنك تحديث ميتاداتا الملف وشروط الوصول أو <strong> تحميل ملفات إضافية عن طريق سحبها وإسقاطها في أي مكان في الصفحة</strong>",
 
   // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "لا",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "لم يتم تحميل أي ملف حتى الآن.",
 
   // "submission.sections.upload.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "حفظ الميتاداتا",
 
   // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "إلغاء",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "فشل التحميل",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "نجح التحميل",
+
+  // "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": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. عند إلغاء التحديد، ستكون المادة متاحة فقط عبر رابط مباشر ولن تظهر أبدًا في البحث/الاستعراض.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "قابل للاكتشاف",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "نوع شرط الوصول",
+
+  // "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": "حدد شرط الوصول لتطبيقه على المادة بمجرد إيداعها",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "التاريخ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "منح الوصول منذ",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "من",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "المجموعة",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "المجموعة مطلوبة.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "حتى",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
   // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.duplicates.none": "No duplicates were detected.",
 
-
-
-  // "submission.submit.title": "Submission",
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
   // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
 
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
 
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "أؤكد الترخيص أعلاه",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "معلومات الناشر",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "العنوان",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.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": "الناشر",
+
+  // "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": "سياسة الناشر",
+
+  // "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": "تم العثور على المعلومات أدناه عبر شيربا روميو. وبناءً على سياسات الناشر الخاص بك، فإنه يقدم النصائح بشأن ما إذا كان الحظر ضروريًا أو الملفات المسموح لك بتحميلها. إذا كانت لديك أسئلة، يرجى الاتصال بمسؤول موقعك عبر نموذج التعليقات الموجود في التذييل.",
+
+  // "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": "مسارات الوصول الحر التي تسمح بها سياسة هذه الدورية مدرجة أدناه حسب إصدار المقال. انقر على المسار للحصول على عرض أكثر تفصيلاً",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "للمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "الإصدارة",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "حظر",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "بلا حظر",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "لا شيء",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "الترخيص",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "المتطلبات الأساسية",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "الموقع",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "الشروط",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "تحديث",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "معلومات التسجيلة",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.id": "المعرّف",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "تاريخ الإنشاء",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "آخر تعديل",
+
+  // "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": "حدث خطأ أثناء استرداد معلومات شيربا",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "تقديم جديد",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "تقديم جديد",
 
   // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "حذف",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  // TODO New key - Add a translation
-  "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": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. سيُطلب منك بعد ذلك تأكيد ذلك.",
 
   // "submission.workflow.generic.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "تحرير",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتغيير ميتاداتا المادة.",
 
   // "submission.workflow.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "عرض",
 
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "حدد المراجع",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "تقييم",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "قبول",
 
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  // TODO New key - Add a translation
-  "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": "إذا قمت بمراجعة المادة وكانت ملائمة للإدراج في الحاوية، اختر  \"قبول\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "تحرير",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "قم بتحديد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "رفض",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "يرجي إدخال سبب رفض التقديم في المربع أدناه، وقم بتوضيح ما إذا كان بإمكان المقدم تصحيح المشكلة وإعادة التقديم.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "قم بوصف سبب الرفض",
 
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "رفض المادة",
 
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "السبب",
 
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "رفض",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "إذا قمت بمراجعة المادة ووجدتها <strong>غير</strong> ملائمة للإدراج في الحاوية، اختر \"رفض\". سيُطلب منك إدخال رسالة لتوضيح سبب عدم ملاءمة المادة، وما إذا كان يجب على المقدم إجراء بعض التغييرات وإعادة التقديم.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "إعادة إلى الصحن",
 
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  // TODO New key - Add a translation
-  "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": "إعادة المهمة إلى الصحن لكي يقوم مستخدم آخر بأداء المهمة.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء العملية...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "جاري المعالجة...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "المقدم",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
-
-
+  "submission.workflow.tasks.generic.success": "تمت العملية بنجاح",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "مطالبة",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "قم بتعيين هذه المهمة لنفسك.",
 
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "إخفاء التفاصيل",
 
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "عرض التفاصيل",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
   // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "عرض",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "غير قابل للتطبيق",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "الاشتراكات",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "اشتراكات للمواد",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "اشتراكات للحاويات",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "اشتراكات للمجتمعات",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "تواتر الاشتراك",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "يومي",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "شهري",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "أسبوعي",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "اشتراك",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "الاشتراكات",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "النوع والتواتر",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "إغلاق",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "لإزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "المحتوى",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "يومي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "أسبوعي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "شهري",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "تقديم",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "جاري المعالجة...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} بنجاح.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "تم حذف الاشتراك بنجاح",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} بنجاح",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "حدث خطأ أثناء إنشاء الاشتراك",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "حدث خطأ أثناء حذف الاشتراك",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "حدث خطأ أثناء تحديث الاشتراك",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "الموضوع",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "تواتر الاشتراك",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "إجراء",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "تحرير",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "حذف",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "غير متاح",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حالياً لمشاهدتها",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "ليس لديك أي اشتراكات في هذا الوقت. للاشتراك في تحديثات البريد الإلكتروني لمجتمع أو حاوية، استخدم زر الاشتراك الموجود في صفحة الكائن.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "صورة مصغرة",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "لا تتوفر صورة مصغرة",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "شعار المشروع",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "صورة العنصر النائب للمشروع",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "شعار الوحدة المؤسسية",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "صورة العنصر النائي للوحدة المؤسسية",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "صورة الملف الشخصي",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "لا تتوافر صورة للملف الشخصي",
 
   // "title": "DSpace",
-  // TODO New key - Add a translation
-  "title": "DSpace",
-
-
+  "title": "دي سبيس",
 
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "عرض الشجرة الهرمية",
 
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "تحميل المزيد",
 
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "إعادة تعيين",
 
   // "vocabulary-treeview.search.form.search": "Search",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "بحث",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
 
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "لم تكن هناك مواد للعرض",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "فهرس العلوم النرويجي",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-
+  "vocabulary-treeview.tree.description.srsc": "فئات موضوع البحث",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "قم بتحديد موضوع لإضافته كمنقح بحث",
 
   // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
+  "uploader.browse": "استعراض",
 
   // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "قم بسحب وإسقاط ملفاتك هنا",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "حذف",
 
   // "uploader.or": ", or ",
-  // TODO New key - Add a translation
-  "uploader.or": ", or ",
+  "uploader.or": ", أو ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO New key - Add a translation
-  "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "جاري معالجة الملفات التي تم تحميلها... (أصبح من الآمن الآن إغلاق هذه الصفحة)",
 
   // "uploader.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "طول الصف",
 
   // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "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": "قم بتحديد الأنواع التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
 
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "الميتاداتا الافتراضية لهذه العلاقة",
 
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "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": "قم بتحديد المواد التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "مواد خاضعة للإشراف",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "تقديمات",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
-  // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "أدر سير العمل",
 
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "مهام سير العمل",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "مهام سير العمل ومساحة العمل",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "نتائج بحث الوحدات المؤسسية",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "تحرير مادة سير العمل",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "تحرير مادة سير العمل",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "تم الحذف",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "تم حذف مادة سير العمل هذه بنجاح",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "لقد حدث خطأ ما",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "تعذر حذف مادة سير العمل",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "حذف مادة سير العمل",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "حذف مادة سير العمل",
 
   // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "إلغاء",
 
   // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-
+  "workflow-item.delete.button.confirm": "حذف",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "إعادة إرسال إلى المقدم",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "تمت إعادة إرسال مادة سير العمل هذه إلى المقدم بنجاح",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "لقد حدث خطأ ما",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "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": "تعذر إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "إعادة إرسال مادة سير العمل إلى المقدم",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "إلغاء",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back",
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "إعادة إرسال",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "عرض سير العمل",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "عرض مساحة العمل",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "عرض مساحة العمل",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "حذف مساحة العمل",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "حذف مادة مساحة العمل",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "حذف",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "إلغاء",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "تم الحذف",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "تم حذف مادة مساحة العمل بنجاح",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "هناك خطأ ما",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "تعذر حذف مادة مساحة العمل",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "سير العمل المتقدم",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "المراجع المحدد",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاص بمادة سير العمل هذه بنجاح",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "تعذر تحديد المراجع لعنصر سير العمل هذا",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "إلغاء",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "تأكيد",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "مراجعة التقييم",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "تم إرسال التقييم الخاص بعنصر سير عمل هذه المادة بنجاح",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "تعذر تقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "قم بتقيم هذه المادة",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "قم بتقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "إلغاء",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "تأكيد",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "ستنتهي الجلسة بعد قليل",
+
+  // "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": "لأسباب أمنية، تنتهي جلسات المستخدم بعد {{ timeToExpire }} دقيقة من عدم النشاط. ستنتهي جلستك بعد قليل. هل ترغب في تمديدها أم تسجيل الخروج؟",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "خروج",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "تمديد الجلسة",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "جاري المعالجة...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "الملف الشخصي للباحث المرتبط",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير رؤية الملف الشخصي",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "إنشاء جديد",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث بنجاح",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "حدث خطأ أثناء إنشاء الملف الشخصي للباحث",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "حذف",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "عرض",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "إخفاء",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "الملف الشخصي للباحث غير مرتبط بعد",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "عرض",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "خاص",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "عام",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "الحالة:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "لا يحق لك المطالبة بهذه المادة. لمزيد من التفاصيل يرجى الاتصال بالمسؤول.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "حدث خطأ أثناء المطالبة بالملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "خطأ",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "تمت المطالبة بالملف الشخصي بنجاح",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "نجاح",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "إنشاء معرف أوركيد",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "التصاريح الممنوحة",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "منح التصاريح",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "الاتصال بمعرف أوركيد",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "جاري ربط الملف الشخصي بأوركيد...",
+
+  // "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": "حدث خطأ ما أثناء ربط الملف الشخصي بأوركيد. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول.",
+
+  // "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": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم ربطه بعد بحساب في سجل أوركيد أو انتهت صلاحية الاتصال.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "قطع الاتصال بأوركيد",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "جاري المعالجة...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "تصاريح مفقودة",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "التصاريح التالية مفقودة:",
+
+  // "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": "عظيم! هذا المربع فارغ، لذا فقد قمت بمنح جميع حقوق الوصول لاستخدام جميع الوظائف التي تقدمها مؤسستك.",
+
+  // "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": "لا يوجد معرف أوركيد مرتبط حتى الآن. بالنقر على الزر أدناه من الممكن ربط هذا الملف الشخصي بحساب أوركيد.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "تفضيلات الملف الشخصي",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "تفضيلات التمويل",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "تفضيلات النشر",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "إذا كنت بحاجة إلى إزالة أوركيد الخاص بك، يرجى الاتصال بمسؤول المستودع",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "تحديث الإعدادات",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "البيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "التعليم",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "المعرفات",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "كل التمويلات",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "تمويلاتي",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "التمويلات المحددة",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "معطلة",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "كل المنشورات",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "منشوراتي",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "المنشورات المحددة",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "معطلة",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "تجاهل التغيير ولا تقم بالمزامنة مع سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "فشل تجاهل تسجيلة قائمة انتظار أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيلة قائمة انتظار أوركيد بنجاح",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد فارغ",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "النوع",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "الوصف",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "إجراء",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "البلد",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "معرفات خارجية",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "أسماء أخرى",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "المؤهلات",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحث",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "كلمات رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "إضافة إدخال جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "تحديث هذا الإدخال في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "إزالة هذا الإدخال من سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "النشر",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "المشروع",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "المؤهل",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "اسم آخر",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "البلد",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "كلمة رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "معرف خارجي",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "عنوان URL للباحث",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "المزامنة مع سجل أوركيد",
+
+  // "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": "فشل التقديم إلى أوركيد بسبب نقص تصاريح.",
+
+  // "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": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد الذي تم إرساله إلى سجل أوركيد غير صالح",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "فشل التقديم إلى أوركيد",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
+
+  // "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": "لم يعد المورد موجودًا في سجل أوركيد.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "تم اكتمال التقديم إلى أوركيد بنجاح",
+
+  // "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": "البيانات التي تريد مزامنتها مع أوركيد غير صالحة",
+
+  // "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": "عملة المبلغ مطلوبة",
+
+  // "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": "يتطلب المورد المراد إرساله معرفًا واحدًا على الأقل",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "العنوان مطلوب",
+
+  // "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": "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": "تاريخ البد مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "الممول مطلوب",
+
+  // "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": "كود البلد المكون من رقمين ISO 3166 غير صالح",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "المؤسسة مطلوبة",
+
+  // "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": "اسم المؤسسة مطلوب",
+
+  // "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": "يجب أن يكون تاريخ النشر بعد سنة واحدة من عام 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": "تتطلب المؤسسة التي سيتم إرسالها عنواناً",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها مدينة",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
+
+  // "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": "مطلوب معرف لتوضيح المؤسسات. المعرفات المدعومة هي GRID وRinggold ومعرفات الكينونات القانونية (LEIs) ومعرفات سجل Crossref Funder",
+
+  // "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": "تتطلب معرفات المؤسسة قيمة",
+
+  // "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": "تتطلب معرفات المؤسسة مصدراً",
+
+  // "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": "مصدر أحد معرفات المؤسسة غير صالح. المصادر المدعومة هي RINGGOLD وGRID وLEI وFUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "وضع المزامنة",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "دفعة",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "وضع المزامنة",
+
+  // "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": "يرجى تحديد الطريقة التي تريد أن تتم بها المزامنة مع أوركيد. تتضمن الخيارات \"يدوي\" (يجب عليك إرسال بياناتك إلى أوركيد يدوياً)، أو \"بالدفعة\" (سيقوم النظام بإرسال بياناتك إلى أوركيد عبر برنامج نصي مجدول).",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات المشروع المرتبطة إلى قائمة معلومات التمويل الخاصة بتسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات النشر المرتبطة إلى قائمة أعمال تسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال بياناتات الشخصية أو معرفاتك الشخصية إلى تسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات المزامنة بنجاح",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات المزامنة",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "يدوي",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "احصل على معرف أوركيد الخاص بك",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "اقرأ معلوماتك مع ضبط مستوى الرؤية للأطراف الموثوقة",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "إضافة/تحديث الأنشطة البحثية الخاصة بك",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "إضافة/تحديث معلومات أخرى عنك",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وسجل أوركيد بنجاح",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وسجل أوركيد. يرجى إعادة المحاولة",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "إعدادات مزامنة أوركيد",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "قائمة انتظار سجل أوركيد",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "تصاريح أوركيد",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "أحدث التقديمات",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "تعذر استرداد هذا الكائن",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء استرداد شعار التنبيه على مستوى النظام",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "خلال",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} يوماً,",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} ساعة و",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} دقيقة:",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "حدث خطأ ما أثناء استرداد التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "إلغاء",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "حفظ",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "نشط",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "غير نشط",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "يجب أن يحتوي التنبيه على مستوى النظام على رسالة",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "رسالة تنبيه",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "تفعيل مؤقت العد التنازلي",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط مؤقت العد التنازلي. عند التفعيل، يمكن تعيين تاريخ في المستقبل وسيقوم شعار التنبيه على مستوى النظام بإجراء العد التنازلي للتاريخ المحدد. عندما ينتهي هذا المؤقت، سوف يختفي من التنبيه. لن يتم إيقاف الخادم تلقائياً.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "حدد التاريخ باستخدام التقويم",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "معاينة التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "تم تحديث التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "تم إنشاء التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء التنبيه على مستوى النظام",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "تنبيهات على مستوى النظام",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "تنبيهات على مستوى النظام",
+
+  // "discover.filters.head": "Discover",
+  // TODO New key - Add a translation
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول إلى ميتاداتا المادة أو تدفقات البت الخاصة بها.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لهذه المجموعة. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لأي مجموعة ضمن هذا المجتمع. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "ميتاداتا المادة",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "تفعيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "تعطيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "تدفقات البت",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "تفعيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "تعطيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "شروط الوصول",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "في الوقت الراهن، لم يتم تحديد أي شروط وصول أدناه. عند التنفيذ، سيتم استبدال شروط الوصول الحالية بشروط الوصول الافتراضية الموروثة من المجموعة المالكة.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "استبدل شروط الوصول",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "إضافة إلى الموجود",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بت معينة",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "تحديد كل تدفقات البت في المادة",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "تم تحديد تدفقات البت",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "حدد تدفقات البت",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "إلغاء",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "تنفيذ",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "إضافة المزيد",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "إزالة شرط الوصول",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "حدد تدفقات البت",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "لا توجد مواد.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "إلغاء",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "نوع شرط الوصول",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "اختر شرط وصول لتطبيقه على الكائنات المحددة.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "منح الوصول من",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "قم بتحديد التاريخ الذي يبدأ منه تطبيق شرط الوصول ذي الصلة",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "منح الوصول حتى",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "قم بتحديد التاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "إضافة",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "filter.search.operator.placeholder": "Operator",
+  // TODO New key - Add a translation
+  "filter.search.operator.placeholder": "Operator",
+
+  // "search.filters.filter.entityType.text": "Item Type",
+  // TODO New key - Add a translation
+  "search.filters.filter.entityType.text": "Item Type",
+
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.filter.title.text": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.text": "Title",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
+
+  // "search.filters.filter.author.text": "Author",
+  // TODO New key - Add a translation
+  "search.filters.filter.author.text": "Author",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "توجد أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "search.filters.filter.subject.text": "Subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.subject.text": "Subject",
+
+  // "search.advanced.filters.head": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.advanced.filters.head": "Advanced Search",
+
+  // "filter.search.text.placeholder": "Search text",
+  // TODO New key - Add a translation
+  "filter.search.text.placeholder": "Search text",
+
+  // "advancesearch.form.submit": "Add",
+  // TODO New key - Add a translation
+  "advancesearch.form.submit": "Add",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 
 }

From 55e742fbfb08691e0498da30f5ac1ca0fd0cbcd9 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 3 May 2024 16:07:48 -0500
Subject: [PATCH 0174/1286] Bump ejs from 3.1.9 to 3.1.10

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 54c3cbbfdd..e82386dff9 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
-    "ejs": "^3.1.9",
+    "ejs": "^3.1.10",
     "express": "^4.19.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 866f1608c1..712690662b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5060,10 +5060,10 @@ ee-first@1.1.1:
   resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
-  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
+ejs@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 

From 26c234e36c2c14fa43122287878b30ba8b039420 Mon Sep 17 00:00:00 2001
From: Kuno Vercammen <kuno.vercammen@atmire.com>
Date: Mon, 6 May 2024 11:49:10 +0200
Subject: [PATCH 0175/1286] 113904: Fix null user handling

---
 .../overview/process-overview.component.ts    | 28 +++++++++++++------
 src/assets/i18n/en.json5                      |  2 ++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 7fa3b12dac..5e34a8711f 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,20 +1,21 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
+import { Observable, Subscription, from as observableFrom } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { map, switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs/operators';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { FindListOptions } from '../../core/data/find-list-options.model';
 import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { hasValue } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-process-overview',
@@ -61,6 +62,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
               protected modalService: NgbModal,
               public processBulkDeleteService: ProcessBulkDeleteService,
               protected dsoNameService: DSONameService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -83,10 +85,20 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
    * @param id  ID of the EPerson
    */
   getEpersonName(id: string): Observable<string> {
-    return this.ePersonService.findById(id).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
-    );
+    if (isNotEmpty(id)) {
+      return this.ePersonService.findById(id).pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((rd: RemoteData<EPerson>) => {
+          if (rd.hasSucceeded) {
+            return observableFrom([this.dsoNameService.getName(rd.payload)]);
+          } else {
+            return this.translateService.get('process.overview.unknown.user');
+          }
+        })
+      );
+    } else {
+      return this.translateService.get('process.overview.unknown.user');
+    }
   }
 
   ngOnDestroy(): void {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..79fce0732c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5216,4 +5216,6 @@
 
   "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
 
+  "process.overview.unknown.user": "Unknown",
+
 }

From 488958c251806ececa8545345da61203b2860186 Mon Sep 17 00:00:00 2001
From: Kuno Vercammen <kuno.vercammen@atmire.com>
Date: Mon, 6 May 2024 12:09:40 +0200
Subject: [PATCH 0176/1286] 113904: Added tests for null user handling

---
 .../process-overview.component.spec.ts        | 57 +++++++++++++++++--
 .../overview/process-overview.component.ts    |  4 +-
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
index 94071c0e59..e9382b0744 100644
--- a/src/app/process-page/overview/process-overview.component.spec.ts
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -1,7 +1,7 @@
 import { ProcessOverviewComponent } from './process-overview.component';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
@@ -33,6 +33,8 @@ describe('ProcessOverviewComponent', () => {
   let processBulkDeleteService;
   let modalService;
 
+  let translateServiceSpy: jasmine.SpyObj<TranslateService>;
+
   const pipe = new DatePipe('en-US');
 
   function init() {
@@ -42,24 +44,29 @@ describe('ProcessOverviewComponent', () => {
         scriptName: 'script-name',
         startTime: '2020-03-19 00:30:00',
         endTime: '2020-03-19 23:30:00',
-        processStatus: ProcessStatus.COMPLETED
+        processStatus: ProcessStatus.COMPLETED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 2,
         scriptName: 'script-name',
         startTime: '2020-03-20 00:30:00',
         endTime: '2020-03-20 23:30:00',
-        processStatus: ProcessStatus.FAILED
+        processStatus: ProcessStatus.FAILED,
+        userId: 'testid'
       }),
       Object.assign(new Process(), {
         processId: 3,
         scriptName: 'another-script-name',
         startTime: '2020-03-21 00:30:00',
         endTime: '2020-03-21 23:30:00',
-        processStatus: ProcessStatus.RUNNING
+        processStatus: ProcessStatus.RUNNING,
+        userId: 'testid'
       })
     ];
     ePerson = Object.assign(new EPerson(), {
+      id: 'testid',
+      uuid: 'testid',
       metadata: {
         'eperson.firstname': [
           {
@@ -110,6 +117,9 @@ describe('ProcessOverviewComponent', () => {
 
   beforeEach(waitForAsync(() => {
     init();
+
+    translateServiceSpy = jasmine.createSpyObj('TranslateService', ['get']);
+
     TestBed.configureTestingModule({
       declarations: [ProcessOverviewComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
@@ -249,4 +259,43 @@ describe('ProcessOverviewComponent', () => {
       expect(component.setProcesses).toHaveBeenCalled();
     });
   });
+
+  describe('getEPersonName function', () => {
+    it('should return unknown user when id is null', (done: DoneFn) => {
+      const id = null;
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return unknown user when id is invalid', (done: DoneFn) => {
+      const id = '';
+      const expectedTranslation = 'process.overview.unknown.user';
+
+      translateServiceSpy.get(expectedTranslation);
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toBe(expectedTranslation);
+        done();
+      });
+      expect(translateServiceSpy.get).toHaveBeenCalledWith('process.overview.unknown.user');
+    });
+
+    it('should return EPerson name when id is correct', (done: DoneFn) => {
+      const id = 'testid';
+      const expectedName = 'John Doe';
+
+      component.getEpersonName(id).subscribe((result: string) => {
+        expect(result).toEqual(expectedName);
+        done();
+      });
+      expect(translateServiceSpy.get).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 5e34a8711f..094430706c 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription, from as observableFrom } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { Process } from '../processes/process.model';
@@ -90,7 +90,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
         getFirstCompletedRemoteData(),
         switchMap((rd: RemoteData<EPerson>) => {
           if (rd.hasSucceeded) {
-            return observableFrom([this.dsoNameService.getName(rd.payload)]);
+            return [this.dsoNameService.getName(rd.payload)];
           } else {
             return this.translateService.get('process.overview.unknown.user');
           }

From f80d1fdc6859373399aa5aa2a834ceb42aa7b7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Mon, 6 May 2024 11:12:22 -0600
Subject: [PATCH 0177/1286] fixed lint errors

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

diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index 7ed64d0c0a..165552a00f 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -4619,7 +4619,7 @@
   //"resource-policies.form.name.hint": "Max 30 characters",
   // TODO New key - Add a translation
   "resource-policies.form.name.hint": "Max 30 characters",
-  
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "নীতির টাইপ নির্বাচন করুন",
 

From 3c9cb4e3b6ea12920da0e1caca307c8ac1e43806 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 7 May 2024 12:08:25 -0500
Subject: [PATCH 0178/1286] Ensure item is also embedded in submission form

(cherry picked from commit bf4d04c90929a702f9e57a65012aa91f161d55c5)
---
 src/app/core/submission/submission-rest.service.spec.ts | 2 +-
 src/app/core/submission/submission-rest.service.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index ec6fe10ec1..49715c6a1e 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -26,7 +26,7 @@ describe('SubmissionRestService test suite', () => {
   const resourceEndpoint = 'workspaceitems';
   const resourceScope = '260';
   const body = { test: new FormFieldMetadataValueObject('test') };
-  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?embed=sections,collection';
+  const resourceHref = resourceEndpointURL + '/' + resourceEndpoint + '/' + resourceScope + '?embed=item,sections,collection';
   const timestampResponse = 1545994811992;
 
   function initTestService() {
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 3dc885ea03..a08d25a3dd 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -70,7 +70,7 @@ export class SubmissionRestService {
    */
   protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
     let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
-    url = new URLCombiner(url, '?embed=sections,collection').toString();
+    url = new URLCombiner(url, '?embed=item,sections,collection').toString();
     if (collectionId) {
       url = new URLCombiner(url, `&owningCollection=${collectionId}`).toString();
     }

From 9f3ee328580719006a08b3bfd8bcbedf35944d12 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Wed, 8 May 2024 17:48:33 +0200
Subject: [PATCH 0179/1286] fix issue where a submit emitted from the edit
 relationship modal wouldn't arrive in the edit relationships component

---
 src/app/app.component.ts                      |   7 +-
 .../object-updates/object-updates.reducer.ts  |   2 +
 .../core/data/relationship-data.service.ts    |   8 +-
 .../edit-item-relationships.service.spec.ts   |  16 ++
 .../edit-item-relationships.service.ts        | 186 ++++++++++++++++++
 .../edit-relationship-list.component.ts       | 167 +++++++++-------
 .../edit-relationship.component.ts            |  10 +-
 .../item-relationships.component.html         |   3 +-
 .../item-relationships.component.ts           | 146 +-------------
 9 files changed, 320 insertions(+), 225 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ba7b738227..b77d53c81d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { distinctUntilChanged, take, withLatestFrom } from 'rxjs/operators';
+import { distinctUntilChanged, take, withLatestFrom, delay } from 'rxjs/operators';
 import { DOCUMENT, isPlatformBrowser } from '@angular/common';
 import {
   AfterViewInit,
@@ -114,7 +114,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    this.router.events.subscribe((event) => {
+    this.router.events.pipe(
+      // delay(0) to prevent "Expression has changed after it was checked" errors
+      delay(0)
+    ).subscribe((event) => {
       if (event instanceof NavigationStart) {
         distinctNext(this.isRouteLoading$, true);
       } else if (
diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts
index 14bacc52db..da18a28d3f 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -58,6 +58,8 @@ export interface VirtualMetadataSource {
 
 export interface RelationshipIdentifiable extends Identifiable {
   nameVariant?: string;
+  originalItem: Item;
+  originalIsLeft: boolean
   relatedItem: Item;
   relationship: Relationship;
   type: RelationshipType;
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index f9c2c7f16a..8d8f62b14e 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -309,7 +309,13 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     } else {
       findListOptions.searchParams = searchParams;
     }
-    return this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+    // add this result as a dependency of the item, meaning that if the item is invalided, this
+    // result will be as well
+    this.addDependency(result$, item.self);
+
+    return result$;
   }
 
   /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
new file mode 100644
index 0000000000..af5ec5ea04
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { EditItemRelationshipsService } from './edit-item-relationships.service';
+
+describe('EditItemRelationshipsService', () => {
+  let service: EditItemRelationshipsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(EditItemRelationshipsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
new file mode 100644
index 0000000000..cf29552cad
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -0,0 +1,186 @@
+import { Injectable } from '@angular/core';
+import { take, map, switchMap, concatMap, toArray } from 'rxjs/operators';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { hasValue } from '../../../shared/empty.util';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable
+} from '../../../core/data/object-updates/object-updates.reducer';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { EMPTY, Observable } from 'rxjs';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { TranslateService } from '@ngx-translate/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EditItemRelationshipsService {
+  public notificationsPrefix = 'static-pages.form.notification';
+
+  constructor(
+    public itemService: ItemDataService,
+    public objectUpdatesService: ObjectUpdatesService,
+    public notificationsService: NotificationsService,
+    protected modalService: NgbModal,
+    public relationshipService: RelationshipDataService,
+    public entityTypeService: EntityTypeDataService,
+    public translateService: TranslateService,
+  ) { }
+
+
+  /**
+   * Resolve the currently selected related items back to relationships and send a delete request for each of the relationships found
+   * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
+   */
+  public submit(item: Item, url: string): void {
+    this.objectUpdatesService.getFieldUpdates(url, [], true).pipe(
+      map((fieldUpdates: FieldUpdates) =>
+        Object.values(fieldUpdates)
+          .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
+          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD || fieldUpdate.changeType === FieldChangeType.REMOVE)
+      ),
+      take(1),
+      // emit each update in the array separately
+      switchMap((updates) => updates),
+      // process each update one by one, while waiting for the previous to finish
+      concatMap((update: FieldUpdate) => {
+        if (update.changeType === FieldChangeType.REMOVE) {
+          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1));
+        } else if (update.changeType === FieldChangeType.ADD) {
+          return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
+            take(1),
+            switchMap((relationshipRD: RemoteData<Relationship>) => {
+              if (relationshipRD.hasSucceeded) {
+                // Set the newly related item to stale, so its relationships will update to include
+                // the new one. Only set the current item to stale at the very end so we only do it
+                // once
+                const { leftItem, rightItem } = relationshipRD.payload._links;
+                if (leftItem.href === item.self) {
+                  return this.itemService.invalidateByHref(rightItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                } else {
+                  return this.itemService.invalidateByHref(leftItem.href).pipe(
+                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
+                    map(() => relationshipRD)
+                  );
+                }
+              } else {
+                return [relationshipRD];
+              }
+            })
+          );
+        } else {
+          return EMPTY;
+        }
+      }),
+      toArray(),
+      switchMap((responses) => {
+        // once all relationships are made and all related items have been invalidated, invalidate
+        // the current item
+        return this.itemService.invalidateByHref(item.self).pipe(
+          map(() => responses)
+        );
+      })
+    ).subscribe((responses) => {
+      if (responses.length > 0) {
+        this.initializeOriginalFields(item, url);
+        this.displayNotifications(responses);
+        this.modalService.dismissAll();
+      }
+    });
+  }
+
+  /**
+   * Sends all initial values of this item to the object updates service
+   */
+  public initializeOriginalFields(item: Item, url: string) {
+    return this.relationshipService.getRelatedItems(item).pipe(
+      take(1),
+    ).subscribe((items: Item[]) => {
+      this.objectUpdatesService.initialize(url, items, item.lastModified);
+    });
+  }
+
+  deleteRelationship(deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
+    let copyVirtualMetadata: string;
+    if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'all';
+    } else if (deleteRelationship.keepLeftVirtualMetadata) {
+      copyVirtualMetadata = 'left';
+    } else if (deleteRelationship.keepRightVirtualMetadata) {
+      copyVirtualMetadata = 'right';
+    } else {
+      copyVirtualMetadata = 'none';
+    }
+
+    return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata, false);
+  }
+
+  addRelationship(addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
+    let leftItem: Item;
+    let rightItem: Item;
+    let leftwardValue: string;
+    let rightwardValue: string;
+    if (addRelationship.originalIsLeft) {
+      leftItem = addRelationship.originalItem;
+      rightItem = addRelationship.relatedItem;
+      leftwardValue = null;
+      rightwardValue = addRelationship.nameVariant;
+    } else {
+      leftItem = addRelationship.relatedItem;
+      rightItem = addRelationship.originalItem;
+      leftwardValue = addRelationship.nameVariant;
+      rightwardValue = null;
+    }
+    return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue, false);
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param responses
+   */
+  displayNotifications(responses: RemoteData<NoContent>[]) {
+    const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+    const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+
+    failedResponses.forEach((response: RemoteData<NoContent>) => {
+      this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
+    });
+    if (successfulResponses.length > 0) {
+      this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
+    }
+  }
+
+
+
+  /**
+   * Get translated notification title
+   * @param key
+   */
+  getNotificationTitle(key: string) {
+    return this.translateService.instant(this.notificationsPrefix + key + '.title');
+  }
+
+  /**
+   * Get translated notification content
+   * @param key
+   */
+  getNotificationContent(key: string) {
+    return this.translateService.instant(this.notificationsPrefix + key + '.content');
+
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index b8542f5806..b66fa67dd8 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -5,6 +5,7 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
+  EMPTY,
   from as observableFrom,
   Observable,
   Subscription
@@ -14,10 +15,22 @@ import {
 } from '../../../../core/data/object-updates/object-updates.reducer';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators';
+import {
+  defaultIfEmpty,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+  toArray,
+  concatMap
+} from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  RelationshipType
+} from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteData,
@@ -25,15 +38,23 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
-import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model';
-import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import {
+  DsDynamicLookupRelationModalComponent
+} from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import {
+  RelationshipOptions
+} from '../../../../shared/form/builder/models/relationship-options.model';
+import {
+  SelectableListService
+} from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import {
+  PaginationComponentOptions
+} from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
@@ -41,6 +62,7 @@ import { FieldUpdates } from '../../../../core/data/object-updates/field-updates
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -90,7 +112,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
    * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
    */
-  private currentItemIsLeftItem$: Observable<boolean>;
+  private currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
 
   private relatedEntityType$: Observable<ItemType>;
 
@@ -153,6 +175,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
+    protected editItemRelationshipsService: EditItemRelationshipsService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig
   ) {
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
@@ -211,7 +234,6 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Open the dynamic lookup modal to search for items to add as relationships
    */
   openLookup() {
-
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
       size: 'lg'
     });
@@ -277,51 +299,59 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
 
     modalComp.submitEv = () => {
-
-      const subscriptions = [];
-
-      modalComp.toAdd.forEach((searchResult: SearchResult<Item>) => {
-        const relatedItem = searchResult.indexableObject;
-        subscriptions.push(this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
-          map((nameVariant) => {
-          const update = {
-            uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
-            nameVariant,
-            type: this.relationshipType,
-            relatedItem,
-          } as RelationshipIdentifiable;
-          this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
-          return update;
-        })
-        ));
-      });
-
-      modalComp.toRemove.forEach( (searchResult) => {
-        subscriptions.push(this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe(
-          switchMap((nameVariant) => {
-            return this.getRelationFromId(searchResult.indexableObject).pipe(
-              map( (relationship: Relationship) => {
+      modalComp.isPending = true;
+      const isLeft = this.currentItemIsLeftItem$.getValue();
+      const addOperations = modalComp.toAdd.map((searchResult: any) => ({ type: 'add', searchResult }));
+      const removeOperations = modalComp.toRemove.map((searchResult: any) => ({ type: 'remove', searchResult }));
+      observableFrom([...addOperations, ...removeOperations]).pipe(
+        concatMap(({ type, searchResult }: { type: string, searchResult: any }) => {
+          if (type === 'add') {
+            const relatedItem = searchResult.indexableObject;
+            return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
+              map((nameVariant) => {
                 const update = {
-                  uuid: relationship.id,
+                  uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
                   nameVariant,
                   type: this.relationshipType,
-                  relationship,
+                  originalIsLeft: isLeft,
+                  originalItem: this.item,
+                  relatedItem,
                 } as RelationshipIdentifiable;
-                this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
+                this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
                 return update;
-              })
+              }),
+              take(1)
             );
-          })
-        ));
-      });
-
-      observableCombineLatest(subscriptions).subscribe( (res) => {
-        // Wait until the states changes since there are multiple items
-        setTimeout( () => {
+          } else if (type === 'remove') {
+            return this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe(
+              switchMap((nameVariant) => {
+                return this.getRelationFromId(searchResult.indexableObject).pipe(
+                  map( (relationship: Relationship) => {
+                    const update = {
+                      uuid: relationship.id,
+                      nameVariant,
+                      type: this.relationshipType,
+                      originalIsLeft: isLeft,
+                      originalItem: this.item,
+                      relationship,
+                    } as RelationshipIdentifiable;
+                    this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
+                    return update;
+                  })
+                );
+              }),
+              take(1)
+            )
+          } else {
+            return EMPTY;
+          }
+        }),
+        toArray(),
+      ).subscribe({
+        complete: () => {
+          this.editItemRelationshipsService.submit(this.item, this.url)
           this.submit.emit();
-        },1000);
-
-        modalComp.isPending = true;
+        }
       });
     };
 
@@ -355,27 +385,12 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   }
 
   getRelationFromId(relatedItem) {
-    return this.currentItemIsLeftItem$.pipe(
-      take(1),
-      switchMap( isLeft => {
-        let apiCall;
-        if (isLeft) {
-          apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.leftwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
-        } else {
-          apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.rightwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
-        }
-
-        return apiCall.pipe(
-          map( (res: PaginatedList<Relationship>) => res.page[0])
-        );
-      }
-    ));
+    const relationshipLabel = this.currentItemIsLeftItem$.getValue() ? this.relationshipType.leftwardType : this.relationshipType.rightwardType;
+    return this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, relationshipLabel ,[relatedItem.id] ).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map( (res: PaginatedList<Relationship>) => res.page[0])
+    );
   }
 
 
@@ -440,7 +455,6 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-
     // store the left and right type of the relationship in a single observable
     this.relationshipLeftAndRightType$ = observableCombineLatest([
       this.relationshipType.leftType,
@@ -461,7 +475,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
     );
 
-    this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
+    this.subs.push(this.relationshipLeftAndRightType$.pipe(
       map(([leftType, rightType]: [ItemType, ItemType]) => {
         if (leftType.id === this.itemType.id) {
           return true;
@@ -475,7 +489,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
         return undefined;
       })
-    );
+    ).subscribe((nextValue: boolean) => {
+      this.currentItemIsLeftItem$.next(nextValue);
+    }));
 
 
     // initialize the pagination options
@@ -500,19 +516,20 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         currentPagination$,
         this.currentItemIsLeftItem$,
       ]).pipe(
-        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) =>
+        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => {
           // get the relationships for the current item, relationshiptype and page
-          this.relationshipService.getItemRelationshipsByLabel(
+          return this.relationshipService.getItemRelationshipsByLabel(
             this.item,
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
               currentPage: currentPagination.currentPage
             },
-            false,
+            true,
             true,
             ...linksToFollow
-          )),
+          );
+        }),
       ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
         this.relationshipsRd$.next(rd);
       })
@@ -548,6 +565,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
               uuid: relationship.id,
               type: this.relationshipType,
               relationship,
+              originalIsLeft: isLeftItem,
+              originalItem: this.item,
               nameVariant,
             } as RelationshipIdentifiable;
           }),
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 742cc7181c..cf0c610f8f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -108,10 +108,10 @@ export class EditRelationshipComponent implements OnChanges {
    */
   remove(): void {
     this.closeVirtualMetadataModal();
-    observableCombineLatest(
+    observableCombineLatest([
       this.leftItem$,
       this.rightItem$,
-    ).pipe(
+    ]).pipe(
       map((items: Item[]) =>
         items.map((item) => this.objectUpdatesService
           .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid))
@@ -127,9 +127,9 @@ export class EditRelationshipComponent implements OnChanges {
         ) as DeleteRelationship;
       }),
       take(1),
-    ).subscribe((deleteRelationship: DeleteRelationship) =>
-      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship)
-    );
+    ).subscribe((deleteRelationship: DeleteRelationship) => {
+      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship);
+    });
   }
 
   openVirtualMetadataModal(content: any) {
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index c1505deb58..a253e2108f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -27,8 +27,7 @@
               [item]="item"
               [itemType]="entityType$ | async"
               [relationshipType]="relationshipType"
-              [hasChanges] = hasChanges()
-              (submit) = submit()
+              [hasChanges]="hasChanges()"
             ></ds-edit-relationship-list>
           </div>
         </ng-container>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 033f22a40b..2fac6d8371 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -4,7 +4,7 @@ import {
   DeleteRelationship,
   RelationshipIdentifiable,
 } from '../../../core/data/object-updates/object-updates.reducer';
-import { map, switchMap, take, concatMap, toArray } from 'rxjs/operators';
+import { map, switchMap, take, concatMap, toArray, tap } from 'rxjs/operators';
 import {
   combineLatest as observableCombineLatest,
   Observable,
@@ -34,6 +34,7 @@ import { FieldChangeType } from '../../../core/data/object-updates/field-change-
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { EditItemRelationshipsService } from './edit-item-relationships.service';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -70,6 +71,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     protected relationshipTypeService: RelationshipTypeDataService,
     public cdr: ChangeDetectorRef,
     protected modalService: NgbModal,
+    protected editItemRelationshipsService: EditItemRelationshipsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -108,152 +110,14 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
    * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
    */
   public submit(): void {
-
-    // Get all the relationships that should be removed
-    const removeUpdates$: Observable<FieldUpdate[]> = this.relationshipService.getItemRelationshipsArray(this.item).pipe(
-      map((relationships: Relationship[]) => relationships.map((relationship) =>
-        Object.assign(new Relationship(), relationship, { uuid: relationship.id })
-      )),
-      switchMap((relationships: Relationship[]) => {
-        return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable<FieldUpdates>;
-      }),
-      map((fieldUpdates: FieldUpdates) =>
-        Object.values(fieldUpdates)
-          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
-      ),
-      take(1)
-    );
-
-    const addUpdates$: Observable<FieldUpdate[]> = this.objectUpdatesService.getFieldUpdates(this.url, []).pipe(
-      map((fieldUpdates: FieldUpdates) =>
-        Object.values(fieldUpdates)
-          .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
-          .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
-      ),
-      take(1)
-    );
-
-    observableCombineLatest([
-      removeUpdates$,
-      addUpdates$,
-    ]).pipe(
-      take(1),
-      switchMap(([removeUpdates, addUpdates]) => [...removeUpdates, ...addUpdates]),
-      concatMap((update: FieldUpdate) => {
-        if (update.changeType === FieldChangeType.REMOVE) {
-          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1));
-        } else if (update.changeType === FieldChangeType.ADD) {
-          return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
-            take(1),
-            switchMap((relationshipRD: RemoteData<Relationship>) => {
-              if (relationshipRD.hasSucceeded) {
-                // Set the newly related item to stale, so its relationships will update to include
-                // the new one. Only set the current item to stale at the very end so we only do it
-                // once
-                const { leftItem, rightItem } = relationshipRD.payload._links;
-                if (leftItem.href === this.item.self) {
-                  return this.itemService.invalidateByHref(rightItem.href).pipe(
-                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
-                    map(() => relationshipRD)
-                  );
-                } else {
-                  return this.itemService.invalidateByHref(leftItem.href).pipe(
-                    // when it's invalidated, emit the original relationshipRD for use in the pipe below
-                    map(() => relationshipRD)
-                  );
-                }
-              } else {
-                return [relationshipRD];
-              }
-            })
-          );
-        } else {
-          return EMPTY;
-        }
-      }),
-      toArray(),
-      switchMap((responses) => {
-        // once all relationships are made and all related items have been invalidated, invalidate
-        // the current item
-        return this.itemService.invalidateByHref(this.item.self).pipe(
-          map(() => responses)
-        );
-      })
-    ).subscribe((responses) => {
-      if (responses.length > 0) {
-        this.initializeOriginalFields();
-        this.displayNotifications(responses);
-        this.modalService.dismissAll();
-      }
-    });
+    this.editItemRelationshipsService.submit(this.item, this.url);
   }
 
-  deleteRelationship(deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
-    let copyVirtualMetadata: string;
-    if (deleteRelationship.keepLeftVirtualMetadata && deleteRelationship.keepRightVirtualMetadata) {
-      copyVirtualMetadata = 'all';
-    } else if (deleteRelationship.keepLeftVirtualMetadata) {
-      copyVirtualMetadata = 'left';
-    } else if (deleteRelationship.keepRightVirtualMetadata) {
-      copyVirtualMetadata = 'right';
-    } else {
-      copyVirtualMetadata = 'none';
-    }
-
-    return this.relationshipService.deleteRelationship(deleteRelationship.uuid, copyVirtualMetadata, false);
-  }
-
-  addRelationship(addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
-    return this.entityType$.pipe(
-      switchMap((entityType) => this.entityTypeService.isLeftType(addRelationship.type, entityType)),
-      switchMap((isLeftType) => {
-        let leftItem: Item;
-        let rightItem: Item;
-        let leftwardValue: string;
-        let rightwardValue: string;
-        if (isLeftType) {
-          leftItem = this.item;
-          rightItem = addRelationship.relatedItem;
-          leftwardValue = null;
-          rightwardValue = addRelationship.nameVariant;
-        } else {
-          leftItem = addRelationship.relatedItem;
-          rightItem = this.item;
-          leftwardValue = addRelationship.nameVariant;
-          rightwardValue = null;
-        }
-        return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue, false);
-      }),
-    );
-
-  }
-
-  /**
-   * Display notifications
-   * - Error notification for each failed response with their message
-   * - Success notification in case there's at least one successful response
-   * @param responses
-   */
-  displayNotifications(responses: RemoteData<NoContent>[]) {
-    const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-    const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-
-    failedResponses.forEach((response: RemoteData<NoContent>) => {
-      this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
-    });
-    if (successfulResponses.length > 0) {
-      this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
-    }
-  }
   /**
    * Sends all initial values of this item to the object updates service
    */
   public initializeOriginalFields() {
-    return this.relationshipService.getRelatedItems(this.item).pipe(
-      take(1),
-    ).subscribe((items: Item[]) => {
-      this.objectUpdatesService.initialize(this.url, items, this.item.lastModified);
-    });
+    return this.editItemRelationshipsService.initializeOriginalFields(this.item, this.url);
   }
 
 

From 3454ca99f3367e30303d8d8e0abbfb000f445389 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 18 Nov 2023 11:37:07 +0100
Subject: [PATCH 0180/1286] 108586: Fixed ItemListElementComponent not pointing
 to the ItemSearchResultListElementComponent from the themes folder when
 present

(cherry picked from commit d00fc5d9d300ae85cdb3ae82271650d04d48d774)
---
 ...-object-component-loader.component.spec.ts | 60 ++++++++++++-----
 .../item/item-list-element.component.html     |  6 +-
 .../item/item-list-element.component.spec.ts  | 66 ++++++++++++++-----
 .../item/item-list-element.component.ts       |  8 +++
 .../testing/truncatable-service.stub.ts       | 21 ++++++
 5 files changed, 129 insertions(+), 32 deletions(-)
 create mode 100644 src/app/shared/testing/truncatable-service.stub.ts

diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e893fe807b..e3d2ad64b1 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -1,18 +1,31 @@
 import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
 import { ListableObject } from '../listable-object.model';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import {
-  ItemListElementComponent
-} from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
 import { ListableObjectDirective } from './listable-object.directive';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { provideMockStore } from '@ngrx/store/testing';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { ItemSearchResultListElementComponent } from '../../../object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub';
+import { FileServiceStub } from '../../../testing/file-service.stub';
+import { TruncatableServiceStub } from '../../../testing/truncatable-service.stub';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
+import { ActivatedRoute } from '@angular/router';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { FileService } from '../../../../core/shared/file.service';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { ChangeDetectionStrategy } from '@angular/core';
+import { SearchResultListElementComponent } from '../../../object-list/search-result-list-element/search-result-list-element.component';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -28,24 +41,41 @@ describe('ListableObjectComponentLoaderComponent', () => {
   let comp: ListableObjectComponentLoaderComponent;
   let fixture: ComponentFixture<ListableObjectComponentLoaderComponent>;
 
+  let activatedRoute: ActivatedRouteStub;
+  let authService: AuthServiceStub;
+  let authorizationService: AuthorizationDataServiceStub;
+  let fileService: FileServiceStub;
   let themeService: ThemeService;
+  let truncatableService: TruncatableServiceStub;
 
   beforeEach(waitForAsync(() => {
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: 'dspace',
-    });
-    TestBed.configureTestingModule({
+    activatedRoute = new ActivatedRouteStub();
+    authService = new AuthServiceStub();
+    authorizationService = new AuthorizationDataServiceStub();
+    fileService = new FileServiceStub();
+    themeService = getMockThemeService();
+    truncatableService = new TruncatableServiceStub();
+
+    void TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, ListableObjectDirective],
-      schemas: [NO_ERRORS_SCHEMA],
+      declarations: [
+        ItemSearchResultListElementComponent,
+        ListableObjectComponentLoaderComponent,
+        ListableObjectDirective,
+      ],
       providers: [
-        provideMockStore({}),
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: AuthService, useValue: authService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: FileService, useValue: fileService },
         { provide: ThemeService, useValue: themeService },
+        { provide: TruncatableService, useValue: truncatableService },
       ]
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ItemListElementComponent]
       }
     }).compileComponents();
   }));
@@ -57,7 +87,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
     comp.object = new TestType();
     comp.viewMode = testViewMode;
     comp.context = testContext;
-    spyOn(comp, 'getComponent').and.returnValue(ItemListElementComponent as any);
+    spyOn(comp, 'getComponent').and.returnValue(SearchResultListElementComponent as any);
     spyOn(comp as any, 'connectInputsAndOutputs').and.callThrough();
     fixture.detectChanges();
 
@@ -81,7 +111,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
       spyOn((comp as any), 'instantiateComponent').and.returnValue(null);
       spyOn((comp as any).contentChange, 'emit').and.returnValue(null);
 
-      listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
+      listableComponent = fixture.debugElement.query(By.css('ds-search-result-list-element')).componentInstance;
       reloadedObject = 'object';
     });
 
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
index 3877e2f335..7f8dde1c4e 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
@@ -1 +1,5 @@
-<ds-item-search-result-list-element [showLabel]="showLabel" [object]="{ indexableObject: object, hitHighlights: {} }" [linkType]="linkType"></ds-item-search-result-list-element>
+<ds-listable-object-component-loader
+  [object]="transformItemToItemSearchResult(object)"
+  [viewMode]="viewMode"
+  [linkType]="linkType">
+</ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index d75576e8eb..46dba497f5 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -1,13 +1,26 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, waitForAsync, ComponentFixture } from '@angular/core/testing';
+import { ChangeDetectionStrategy } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemListElementComponent } from './item-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { of as observableOf } from 'rxjs';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { ListableObjectComponentLoaderComponent } from '../../../../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { getMockThemeService } from '../../../../mocks/theme-service.mock';
+import { ThemeService } from '../../../../theme-support/theme.service';
+import { ListableObjectDirective } from '../../../../object-collection/shared/listable-object/listable-object.directive';
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRouteStub } from '../../../../testing/active-router.stub';
+import { ActivatedRoute } from '@angular/router';
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../../../testing/auth-service.stub';
+import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
+import { AuthorizationDataServiceStub } from '../../../../testing/authorization-service.stub';
+import { FileService } from '../../../../../core/shared/file.service';
+import { FileServiceStub } from '../../../../testing/file-service.stub';
+import { TruncatableServiceStub } from '../../../../testing/truncatable-service.stub';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -46,21 +59,42 @@ const mockItem: Item = Object.assign(new Item(), {
 });
 
 describe('ItemListElementComponent', () => {
-  let comp;
-  let fixture;
+  let comp: ItemListElementComponent;
+  let fixture: ComponentFixture<ItemListElementComponent>;
 
-  const truncatableServiceStub: any = {
-    isCollapsed: (id: number) => observableOf(true),
-  };
+  let activatedRoute: ActivatedRouteStub;
+  let authService: AuthServiceStub;
+  let authorizationService: AuthorizationDataServiceStub;
+  let fileService: FileServiceStub;
+  let themeService: ThemeService;
+  let truncatableService: TruncatableServiceStub;
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ItemListElementComponent, TruncatePipe],
-      providers: [
-        { provide: DSONameService, useValue: new DSONameServiceMock() },
-        { provide: TruncatableService, useValue: truncatableServiceStub },
+    activatedRoute = new ActivatedRouteStub();
+    authService = new AuthServiceStub();
+    authorizationService = new AuthorizationDataServiceStub();
+    fileService = new FileServiceStub();
+    themeService = getMockThemeService();
+    truncatableService = new TruncatableServiceStub();
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        ItemListElementComponent,
+        ListableObjectComponentLoaderComponent,
+        ListableObjectDirective,
+      ],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: AuthService, useValue: authService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: FileService, useValue: fileService },
+        { provide: ThemeService, useValue: themeService },
+        { provide: TruncatableService, useValue: truncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ItemListElementComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
index a3bd2a1ce0..8682a5a024 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
@@ -3,6 +3,7 @@ import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { Item } from '../../../../../core/shared/item.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
@@ -15,4 +16,11 @@ import { Item } from '../../../../../core/shared/item.model';
  * The component for displaying a list element for an item of the type Publication
  */
 export class ItemListElementComponent extends AbstractListableElementComponent<Item> {
+
+  transformItemToItemSearchResult(object: Item): ItemSearchResult {
+    const itemSearchResult = new ItemSearchResult();
+    itemSearchResult.indexableObject = object;
+    return itemSearchResult;
+  }
+
 }
diff --git a/src/app/shared/testing/truncatable-service.stub.ts b/src/app/shared/testing/truncatable-service.stub.ts
new file mode 100644
index 0000000000..080cd98469
--- /dev/null
+++ b/src/app/shared/testing/truncatable-service.stub.ts
@@ -0,0 +1,21 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+export class TruncatableServiceStub {
+
+  isCollapsed(_id: string): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public toggle(_id: string): void {
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public collapse(_id: string): void {
+  }
+
+  // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
+  public expand(_id: string): void {
+  }
+
+}

From 6dac7ceec486229ed60b3ef599e3dc29a41f3bac Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 1 May 2024 16:27:35 +0200
Subject: [PATCH 0181/1286] Prevent ItemSearchResult from being recreated at
 every iteration

(cherry picked from commit da320b5fbc52fdc2facc67a55cbd129ed423545e)
---
 .../item/item-list-element.component.html     |  2 +-
 .../item/item-list-element.component.spec.ts  |  1 +
 .../item/item-list-element.component.ts       | 21 +++++++++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
index 7f8dde1c4e..8ab6fae9e6 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html
@@ -1,5 +1,5 @@
 <ds-listable-object-component-loader
-  [object]="transformItemToItemSearchResult(object)"
+  [object]="itemSearchResult"
   [viewMode]="viewMode"
   [linkType]="linkType">
 </ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index 46dba497f5..a222c49871 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -108,6 +108,7 @@ describe('ItemListElementComponent', () => {
   describe(`when the publication is rendered`, () => {
     beforeEach(() => {
       comp.object = mockItem;
+      comp.ngOnChanges();
       fixture.detectChanges();
     });
 
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
index 8682a5a024..f338c5de68 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.ts
@@ -1,9 +1,14 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnChanges,
+} from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { hasValue } from '../../../../empty.util';
 
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
@@ -15,12 +20,16 @@ import { ItemSearchResult } from '../../../../object-collection/shared/item-sear
 /**
  * The component for displaying a list element for an item of the type Publication
  */
-export class ItemListElementComponent extends AbstractListableElementComponent<Item> {
+export class ItemListElementComponent extends AbstractListableElementComponent<Item> implements OnChanges {
 
-  transformItemToItemSearchResult(object: Item): ItemSearchResult {
-    const itemSearchResult = new ItemSearchResult();
-    itemSearchResult.indexableObject = object;
-    return itemSearchResult;
+  itemSearchResult: ItemSearchResult;
+
+  ngOnChanges(): void {
+    if (hasValue(this.object)) {
+      this.itemSearchResult = Object.assign(new ItemSearchResult(), {
+        indexableObject: this.object,
+      });
+    }
   }
 
 }

From ce3eb761901793e6880b55e4118ca5e40971033b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 18 Feb 2024 17:42:53 +0100
Subject: [PATCH 0182/1286] 110889: Don't retrieve the accessStatus when
 item.showAccessStatuses is false

(cherry picked from commit 37c534b8096013273556dece0d00c3b1ab8ba323)
---
 .../search-page/configuration-search-page.component.ts |  7 +++++--
 src/app/shared/search/search.component.spec.ts         |  5 ++++-
 src/app/shared/search/search.component.ts              | 10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 768149de6a..9196dda025 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -8,6 +8,7 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
 import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { Router } from '@angular/router';
+import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -32,7 +33,9 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router);
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
   }
 }
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 9d069636a9..69f4dfd6aa 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -33,6 +33,8 @@ import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
 import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { environment } from '../../../environments/environment.test';
+import { APP_CONFIG } from '../../../config/app-config.interface';
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
@@ -209,7 +211,8 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       {
         provide: SEARCH_CONFIG_SERVICE,
         useValue: searchConfigurationServiceStub
-      }
+      },
+      { provide: APP_CONFIG, useValue: environment },
     ],
     schemas: [NO_ERRORS_SCHEMA]
   }).overrideComponent(compType, {
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index fc07893d72..a2a89b53a3 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -31,13 +31,13 @@ import { ViewMode } from '../../core/shared/view-mode.model';
 import { SelectionConfig } from './search-results/search-results.component';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { environment } from 'src/environments/environment';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
 import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
+import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search',
@@ -278,7 +278,9 @@ export class SearchComponent implements OnDestroy, OnInit {
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -445,8 +447,10 @@ export class SearchComponent implements OnDestroy, OnInit {
     let followLinks = [
       followLink<Item>('thumbnail', { isOptional: true }),
       followLink<SubmissionObject>('item', { isOptional: true }, followLink<Item>('thumbnail', { isOptional: true })) as any,
-      followLink<Item>('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses }),
     ];
+    if (this.appConfig.item.showAccessStatuses) {
+      followLinks.push(followLink<Item>('accessStatus', { isOptional: true }));
+    }
     if (this.configuration === 'supervision') {
       followLinks.push(followLink<WorkspaceItem>('supervisionOrders', { isOptional: true }) as any);
     }

From 1c50dbf4c6199aecc22d8339174d95dfc4992785 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 9 May 2024 13:40:03 +0200
Subject: [PATCH 0183/1286] Merge remote-tracking branch
 'alexandre/fix-create-relationship-not-working-between-same-types_contribute-7.6'
 into w2p-113560_edit-item-add-relationships-one-by-one

---
 .../edit-relationship-list.component.html     |  2 +-
 .../edit-relationship-list.component.ts       | 96 +++++--------------
 .../item-relationships.component.html         | 84 ++++++++--------
 .../item-relationships.component.ts           |  7 ++
 ...dynamic-lookup-relation-modal.component.ts |  5 +-
 5 files changed, 76 insertions(+), 118 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 7cdc903f24..372a4916df 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,5 +1,5 @@
 <h5>
-    {{getRelationshipMessageKey() | async | translate}}
+    {{relationshipMessageKey$ | async | translate}}
     <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index b66fa67dd8..bff384dc7d 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -47,7 +47,7 @@ import {
 import {
   SelectableListService
 } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { SearchResult } from '../../../../shared/search/models/search-result.model';
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -63,6 +63,7 @@ import { FieldChangeType } from '../../../../core/data/object-updates/field-chan
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
 import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { Identifiable } from '../../../../core/data/object-updates/identifiable.model';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -101,7 +102,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   /**
    * The event emmiter to submit the new information
    */
-  @Output() submit: EventEmitter<any> = new EventEmitter();
+  @Output() submitModal: EventEmitter<void> = new EventEmitter();
 
   /**
    * Observable that emits the left and right item type of {@link relationshipType} simultaneously.
@@ -116,6 +117,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
   private relatedEntityType$: Observable<ItemType>;
 
+  /**
+   * The translation key for the entity type
+   */
+  relationshipMessageKey$: Observable<string>;
+
   /**
    * The list ID to save selected entities under
    */
@@ -185,11 +191,10 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Get the i18n message key for this relationship type
    */
   public getRelationshipMessageKey(): Observable<string> {
-
-    return observableCombineLatest(
+    return observableCombineLatest([
       this.getLabel(),
       this.relatedEntityType$,
-    ).pipe(
+    ]).pipe(
       map(([label, relatedEntityType]) => {
         if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) {
           const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`;
@@ -254,11 +259,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       modalComp.collection = collection;
     });
 
-    modalComp.select = (...selectableObjects: SearchResult<Item>[]) => {
+    modalComp.select = (...selectableObjects: ItemSearchResult[]) => {
       selectableObjects.forEach((searchResult) => {
         const relatedItem: Item = searchResult.indexableObject;
 
-        const foundIndex = modalComp.toRemove.findIndex( el => el.uuid === relatedItem.uuid);
+        const foundIndex = modalComp.toRemove.findIndex((itemSearchResult: ItemSearchResult) => itemSearchResult.indexableObject.uuid === relatedItem.uuid);
 
         if (foundIndex !== -1) {
           modalComp.toRemove.splice(foundIndex,1);
@@ -282,7 +287,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         }
       });
     };
-    modalComp.deselect = (...selectableObjects: SearchResult<Item>[]) => {
+    modalComp.deselect = (...selectableObjects: ItemSearchResult[]) => {
       selectableObjects.forEach((searchResult) => {
         const relatedItem: Item = searchResult.indexableObject;
 
@@ -350,7 +355,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       ).subscribe({
         complete: () => {
           this.editItemRelationshipsService.submit(this.item, this.url)
-          this.submit.emit();
+          this.submitModal.emit();
         }
       });
     };
@@ -393,67 +398,6 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     );
   }
 
-
-
-  /**
-   * Get the existing field updates regarding a relationship with a given item
-   * @param relatedItem The item for which to get the existing field updates
-   */
-  private getFieldUpdatesForRelatedItem(relatedItem: Item): Observable<RelationshipIdentifiable[]> {
-    return this.updates$.pipe(
-      take(1),
-      map((updates) => Object.values(updates)
-        .map((update) => update.field as RelationshipIdentifiable)
-        .filter((field) => field.relationship)
-      ),
-      mergeMap((identifiables) =>
-        observableCombineLatest(
-          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((relatedItems) => {
-            return identifiables.filter( (identifiable, index) => {
-                return relatedItems[index].uuid === relatedItem.uuid;
-            });
-          }
-          ),
-        )
-      )
-    );
-  }
-
-  /**
-   * Check if the given item is related with the item we are editing relationships
-   * @param relatedItem The item for which to get the existing field updates
-   */
-  private getIsRelatedItem(relatedItem: Item): Observable<boolean> {
-
-    return this.currentItemIsLeftItem$.pipe(
-      take(1),
-      map( isLeft => {
-        if (isLeft) {
-          const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.leftwardType );
-          return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
-        } else {
-          const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.rightwardType );
-          return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
-        }
-      })
-    );
-  }
-
-  /**
-   * Get the related item for a given relationship
-   * @param relationship  The relationship for which to get the related item
-   */
-  private getRelatedItem(relationship: Relationship): Observable<Item> {
-    return this.relationshipService.isLeftItem(relationship, this.item).pipe(
-      switchMap((isLeftItem) => isLeftItem ? relationship.rightItem : relationship.leftItem),
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    ) as Observable<Item>;
-  }
-
   ngOnInit(): void {
     // store the left and right type of the relationship in a single observable
     this.relationshipLeftAndRightType$ = observableCombineLatest([
@@ -465,8 +409,14 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     ))) as Observable<[ItemType, ItemType]>;
 
     this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
-      map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-      hasValueOperator()
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.uuid !== this.itemType.uuid) {
+          return leftType;
+        } else {
+          return rightType;
+        }
+      }),
+      hasValueOperator(),
     );
 
     this.relatedEntityType$.pipe(
@@ -475,6 +425,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
     );
 
+    this.relationshipMessageKey$ = this.getRelationshipMessageKey();
+
     this.subs.push(this.relationshipLeftAndRightType$.pipe(
       map(([leftType, rightType]: [ItemType, ItemType]) => {
         if (leftType.id === this.itemType.id) {
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index a253e2108f..97ea83a11c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,59 +1,57 @@
 <div class="item-relationships">
-  <ng-container *ngVar="entityType$ | async as entityType">
-    <ng-container *ngIf="entityType">
-      <div class="button-row top d-flex space-children-mr">
-        <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
+  <ng-container *ngIf="entityType$ | async as entityType">
+    <div class="button-row top d-flex space-children-mr">
+      <button class="btn btn-danger ml-auto" *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>
+      <button class="btn btn-warning ml-auto" *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)"
+              (click)="submit()"><i
+          class="fas fa-save"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+      </button>
+    </div>
+    <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
+      <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
+        <ds-edit-relationship-list
+          [url]="url"
+          [item]="item"
+          [itemType]="entityType"
+          [relationshipType]="relationshipType"
+          [hasChanges]="hasChanges()"
+        ></ds-edit-relationship-list>
+      </div>
+    </div>
+    <ng-template #loading>
+      <ds-themed-loading></ds-themed-loading>
+    </ng-template>
+    <div class="button-row bottom">
+      <div class="float-right space-children-mr ml-gap">
+        <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
                 [disabled]="!(hasChanges() | async)"
                 (click)="discard()"><i
-          class="fas fa-times"></i>
+            class="fas fa-times"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
         </button>
-        <button class="btn btn-warning ml-auto" *ngIf="isReinstatable() | async"
+        <button class="btn btn-warning" *ngIf="isReinstatable() | async"
                 (click)="reinstate()"><i
-          class="fas fa-undo-alt"></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)"
                 (click)="submit()"><i
-          class="fas fa-save"></i>
+            class="fas fa-save"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
         </button>
       </div>
-      <ng-container *ngVar="relationshipTypes$ | async as relationshipTypes">
-        <ng-container *ngIf="relationshipTypes">
-          <div *ngFor="let relationshipType of relationshipTypes" class="mb-4">
-            <ds-edit-relationship-list
-              [url]="url"
-              [item]="item"
-              [itemType]="entityType$ | async"
-              [relationshipType]="relationshipType"
-              [hasChanges]="hasChanges()"
-            ></ds-edit-relationship-list>
-          </div>
-        </ng-container>
-        <ds-themed-loading *ngIf="!relationshipTypes"></ds-themed-loading>
-      </ng-container>
-      <div class="button-row bottom">
-        <div class="float-right space-children-mr ml-gap">
-          <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>
-          <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)"
-                  (click)="submit()"><i
-            class="fas fa-save"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-          </button>
-        </div>
-      </div>
-    </ng-container>
+    </div>
     <div *ngIf="!entityType"
          class="alert alert-info mt-2" role="alert">
       {{ 'item.edit.relationships.no-entity-type' | translate }}
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 2fac6d8371..3f84c97971 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -121,6 +121,13 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   }
 
 
+  /**
+   * Method to prevent unnecessary for loop re-rendering
+   */
+  trackById(index: number, relationshipType: RelationshipType): string {
+    return relationshipType.id;
+  }
+
   getRelationshipTypeFollowLinks() {
     return [
       followLink('leftType'),
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 446497a74f..9215cb88e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -29,6 +29,7 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -141,12 +142,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   /**
    * Maintain the list of the related items to be added
    */
-  toAdd = [];
+  toAdd: ItemSearchResult[] = [];
 
   /**
    * Maintain the list of the related items to be removed
    */
-  toRemove = [];
+  toRemove: ItemSearchResult[] = [];
 
   /**
    * Disable buttons while the submit button is pressed

From cb59c05baf58af2d122214f556b365dd72c12b68 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 9 May 2024 14:06:56 +0200
Subject: [PATCH 0184/1286] fix spinners

---
 .../item-relationships/edit-item-relationships.service.ts | 8 ++++++--
 .../edit-relationship-list.component.ts                   | 5 +++--
 .../item-relationships/item-relationships.component.html  | 5 +++--
 .../item-relationships/item-relationships.component.ts    | 4 ++++
 .../dynamic-lookup-relation-modal.component.html          | 2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
index cf29552cad..4a5e37c0e9 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -10,7 +10,7 @@ import {
 } from '../../../core/data/object-updates/object-updates.reducer';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { EMPTY, Observable } from 'rxjs';
+import { EMPTY, Observable, BehaviorSubject } from 'rxjs';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Item } from '../../../core/shared/item.model';
@@ -25,7 +25,9 @@ import { TranslateService } from '@ngx-translate/core';
   providedIn: 'root'
 })
 export class EditItemRelationshipsService {
-  public notificationsPrefix = 'static-pages.form.notification';
+  public notificationsPrefix = 'item.edit.relationships.notifications.';
+
+  public isSaving$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     public itemService: ItemDataService,
@@ -43,6 +45,7 @@ export class EditItemRelationshipsService {
    * Make sure the lists are refreshed afterwards and notifications are sent for success and errors
    */
   public submit(item: Item, url: string): void {
+    this.isSaving$.next(true);
     this.objectUpdatesService.getFieldUpdates(url, [], true).pipe(
       map((fieldUpdates: FieldUpdates) =>
         Object.values(fieldUpdates)
@@ -98,6 +101,7 @@ export class EditItemRelationshipsService {
         this.initializeOriginalFields(item, url);
         this.displayNotifications(responses);
         this.modalService.dismissAll();
+        this.isSaving$.next(false);
       }
     });
   }
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index bff384dc7d..97fdb0fc69 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -47,7 +47,9 @@ import {
 import {
   SelectableListService
 } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import {
+  ItemSearchResult
+} from '../../../../shared/object-collection/shared/item-search-result.model';
 import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -63,7 +65,6 @@ import { FieldChangeType } from '../../../../core/data/object-updates/field-chan
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
 import { EditItemRelationshipsService } from '../edit-item-relationships.service';
-import { Identifiable } from '../../../../core/data/object-updates/identifiable.model';
 
 @Component({
   selector: 'ds-edit-relationship-list',
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 97ea83a11c..3b9a119ea6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -13,8 +13,9 @@
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
       </button>
       <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-              (click)="submit()"><i
-          class="fas fa-save"></i>
+              (click)="submit()"><span *ngIf="isSaving$ | async" class="spinner-border spinner-border-sm" role="status"
+                                                     aria-hidden="true"></span>
+        <i *ngIf="!(isSaving$ | async)" class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
       </button>
     </div>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 3f84c97971..4ab5def74b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -57,6 +57,10 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
    */
   entityType$: BehaviorSubject<ItemType> = new BehaviorSubject(undefined);
 
+  get isSaving$(): BehaviorSubject<boolean> {
+    return this.editItemRelationshipsService.isSaving$;
+  }
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b72a8722ae..25c3535836 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -86,7 +86,7 @@
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
                               aria-hidden="true"></span>
-              <i class="fas fa-save"></i>
+              <i *ngIf="!isPending" class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
       </button>
     </ng-container>

From 4541788a34500b7d23fed6d1016172eb63c5a8fe Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 9 May 2024 14:55:37 +0200
Subject: [PATCH 0185/1286] fix issue where relationship lists wouldn't update
 automatically from the second submit onwards

---
 src/app/core/data/relationship-data.service.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 8d8f62b14e..b002d4c9ce 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -309,13 +309,19 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     } else {
       findListOptions.searchParams = searchParams;
     }
-    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+    // always set reRequestOnStale to false here, so it doesn't happen automatically in BaseDataService
+    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, false, ...linksToFollow);
 
     // add this result as a dependency of the item, meaning that if the item is invalided, this
     // result will be as well
-    this.addDependency(result$, item.self);
+    this.addDependency(result$, item._links.self.href);
 
-    return result$;
+    // do the reRequestOnStale call here, to ensure any re-requests also get added as dependencies
+    return result$.pipe(
+      this.reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.getItemRelationshipsByLabel(item, label, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+    );
   }
 
   /**

From a658bf4531e97737e0ace703b042a8e4951212cc Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 9 May 2024 15:25:37 +0200
Subject: [PATCH 0186/1286] decrease the number of unnecessary rerenders by
 checking whether the relationship types have changed

---
 .../edit-relationship-list.component.ts       |  4 ++--
 .../item-relationships.component.ts           | 24 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 97fdb0fc69..54c870cfae 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -347,7 +347,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                 );
               }),
               take(1)
-            )
+            );
           } else {
             return EMPTY;
           }
@@ -355,7 +355,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         toArray(),
       ).subscribe({
         complete: () => {
-          this.editItemRelationshipsService.submit(this.item, this.url)
+          this.editItemRelationshipsService.submit(this.item, this.url);
           this.submitModal.emit();
         }
       });
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 4ab5def74b..758978f8d8 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,14 +1,13 @@
 import { ChangeDetectorRef, Component } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+
+
 import {
-  DeleteRelationship,
-  RelationshipIdentifiable,
-} from '../../../core/data/object-updates/object-updates.reducer';
-import { map, switchMap, take, concatMap, toArray, tap } from 'rxjs/operators';
+  map,
+  distinctUntilChanged
+} from 'rxjs/operators';
 import {
-  combineLatest as observableCombineLatest,
   Observable,
-  BehaviorSubject, EMPTY
+  BehaviorSubject
 } from 'rxjs';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
@@ -18,23 +17,17 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RemoteData } from '../../../core/data/remote-data';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
 import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { hasValue } from '../../../shared/empty.util';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { EditItemRelationshipsService } from './edit-item-relationships.service';
+import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -89,7 +82,8 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     if (label !== undefined) {
       this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks())
       .pipe(
-        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
+        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page),
+        distinctUntilChanged(compareArraysUsingIds())
       );
 
       this.entityTypeService.getEntityTypeByLabel(label).pipe(

From 0aadcdfdd92517063c1a8e95e5520a1a4a9786ae Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 18 Feb 2024 11:58:04 +0100
Subject: [PATCH 0187/1286] 110889: Prevent vocabulary undefined from being
 retrieved in hierarchy filter when none is configured

(cherry picked from commit 9e7a59ddd0bf2a6b3b1c31a920d13b97c7fcc320)
---
 .../search-hierarchy-filter.component.spec.ts |  7 +++-
 .../search-hierarchy-filter.component.ts      | 42 +++++++++++--------
 2 files changed, 29 insertions(+), 20 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 4469a124ce..a6212ca9c5 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
@@ -27,6 +27,8 @@ import { SearchConfigurationServiceStub } from '../../../../testing/search-confi
 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 { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
 
 describe('SearchHierarchyFilterComponent', () => {
 
@@ -34,7 +36,7 @@ describe('SearchHierarchyFilterComponent', () => {
   let showVocabularyTreeLink: DebugElement;
 
   const testSearchLink = 'test-search';
-  const testSearchFilter = 'test-search-filter';
+  const testSearchFilter = 'subject';
   const VocabularyTreeViewComponent = {
     select: new EventEmitter<VocabularyEntryDetail>(),
   };
@@ -73,6 +75,7 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: Router, useValue: router },
         { provide: NgbModal, useValue: ngbModal },
         { provide: VocabularyService, useValue: vocabularyService },
+        { provide: APP_CONFIG, useValue: environment },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: IN_PLACE_SEARCH, useValue: false },
         { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
@@ -86,7 +89,7 @@ describe('SearchHierarchyFilterComponent', () => {
   function init() {
     fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
     fixture.detectChanges();
-    showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree'));
+    showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
   }
 
   describe('if the vocabulary doesn\'t exist', () => {
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 d53fa37cf4..18ddbbdf97 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
@@ -24,9 +24,11 @@ import { filter, map, take } from 'rxjs/operators';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { environment } from '../../../../../../environments/environment';
 import { addOperatorToFilterValue } from '../../../search.utils';
 import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { hasValue } from '../../../../empty.util';
+import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -47,6 +49,7 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               protected router: Router,
               protected modalService: NgbModal,
               protected vocabularyService: VocabularyService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean,
               @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig,
@@ -67,17 +70,20 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
     super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     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;
-      }),
-    );
+    const vocabularyName: string = this.getVocabularyEntry();
+    if (hasValue(vocabularyName)) {
+      this.vocabularyExists$ = this.vocabularyService.searchTopEntries(
+        vocabularyName, new PageInfo(), true, false,
+      ).pipe(
+        filter(rd => rd.hasCompleted),
+        take(1),
+        map(rd => {
+          return rd.hasSucceeded;
+        }),
+      );
+    }
   }
 
   /**
@@ -93,11 +99,11 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       name: this.getVocabularyEntry(),
       closed: true
     };
-    modalRef.result.then((detail: VocabularyEntryDetail) => {
-      this.selectedValues$
+    void modalRef.result.then((detail: VocabularyEntryDetail) => {
+      this.subs.push(this.selectedValues$
         .pipe(take(1))
         .subscribe((selectedValues) => {
-          this.router.navigate(
+          void this.router.navigate(
             [this.searchService.getSearchLink()],
             {
               queryParams: {
@@ -107,16 +113,16 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               queryParamsHandling: 'merge',
             },
           );
-        });
-    }).catch();
+        }));
+    });
   }
 
   /**
    * 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);
+  getVocabularyEntry(): string {
+    const foundVocabularyConfig: FilterVocabularyConfig[] = this.appConfig.vocabularies.filter((v: FilterVocabularyConfig) => v.filter === this.filterConfig.name);
     if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) {
       return foundVocabularyConfig[0].vocabulary;
     }

From ae8e0f9ae8ea6f986a3853107f4d4179436dcbf8 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 17 Feb 2024 19:45:00 +0100
Subject: [PATCH 0188/1286] 110889: Fixed searchevents request containing the
 query params in the clickedObject

Also fixed minor CSS issue in mobile mode where sidebar is still visible

(cherry picked from commit cbe3f2f8f5f0f31ae1aa7880f412b21830fcffd3)
---
 src/app/shared/sidebar/page-with-sidebar.component.html | 4 +++-
 src/app/statistics/angulartics/dspace-provider.ts       | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 9feb6c792e..75f40ef8d6 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -3,10 +3,12 @@
     <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
          [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
       <div id="{{id}}-sidebar-content"
+           [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
            class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
         <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
       </div>
-      <div class="col-12 col-md-{{12 - sideBarWidth}}">
+      <div class="col-12 col-md-{{12 - sideBarWidth}}"
+           [class.invisible]="(isSidebarCollapsed$ | async) === false && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
index 86c16b5c01..957b09a0c8 100644
--- a/src/app/statistics/angulartics/dspace-provider.ts
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
+import { Angulartics2, EventTrack } from 'angulartics2';
 import { StatisticsService } from '../statistics.service';
 
 /**
@@ -23,7 +23,7 @@ export class Angulartics2DSpace {
       .subscribe((event) => this.eventTrack(event));
   }
 
-  private eventTrack(event) {
+  private eventTrack(event: Partial<EventTrack>): void {
     if (event.action === 'page_view') {
       this.statisticsService.trackViewEvent(event.properties.object, event.properties.referrer);
     } else if (event.action === 'search') {
@@ -32,7 +32,7 @@ export class Angulartics2DSpace {
         event.properties.page,
         event.properties.sort,
         event.properties.filters,
-        event.properties.clickedObject,
+        event.properties.clickedObject?.split('?')[0],
       );
     }
   }

From 4a236906eb6f487a9a475d70b808698dadb145f9 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 6 May 2024 16:19:03 -0700
Subject: [PATCH 0189/1286] Updated browser init to update cache after external
 auth.

---
 src/modules/app/browser-init.service.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 014a8f5daa..8cd869e15f 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -32,9 +32,11 @@ import { AppState } from '../../app/app.reducer';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { AuthService } from '../../app/core/auth/auth.service';
 import { coreSelector } from '../../app/core/core.selectors';
+import { RequestService } from '../../app/core/data/request.service';
 import { RootDataService } from '../../app/core/data/root-data.service';
 import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
+import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
 import { KlaroService } from '../../app/shared/cookies/klaro.service';
@@ -81,6 +83,9 @@ export class BrowserInitService extends InitService {
     protected menuService: MenuService,
     private rootDataService: RootDataService,
     protected router: Router,
+    private requestService: RequestService,
+    private halService: HALEndpointService,
+
   ) {
     super(
       store,
@@ -169,17 +174,15 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * During an external authentication flow invalidate the SSR transferState
+   * During an external authentication flow invalidate the
    * data in the cache. This allows the app to fetch fresh content.
    * @private
    */
   private externalAuthCheck() {
-
     this.sub = this.authService.isExternalAuthentication().pipe(
       filter((externalAuth: boolean) => externalAuth),
     ).subscribe(() => {
-      // Clear the transferState data.
-      this.rootDataService.invalidateRootCache();
+      this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
       this.authService.setExternalAuthStatus(false);
     },
     );

From 36c95db7bf19b83453691ef4e0dbc52608c08ee5 Mon Sep 17 00:00:00 2001
From: Victor Hugo Duran Santiago <victorhugodurans@gmail.com>
Date: Thu, 9 May 2024 20:50:51 -0600
Subject: [PATCH 0190/1286] Set color black on filter section for mobile

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

diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index 97809ef854..6c3873d296 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -6,7 +6,7 @@
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
-    <span class="h4 d-inline-block text-left mt-auto mb-auto">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
     </span>
     <i class="filter-toggle flex-grow-1 fas p-auto"

From daff8a4594e5e4018ee5f3bab31762eb4b586d4b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 24 Mar 2024 13:32:25 +0100
Subject: [PATCH 0191/1286] Refactored code to always encode the RequestParams

(cherry picked from commit d5cf236938a4bd16102079069d96a5ff3ee2d744)
---
 .../core/cache/models/request-param.model.ts  | 11 +++--
 .../core/data/relationship-data.service.ts    | 40 +++++--------------
 .../data/relationship-type-data.service.ts    | 11 ++---
 .../core/eperson/eperson-data.service.spec.ts | 10 ++---
 src/app/core/eperson/eperson-data.service.ts  |  4 +-
 .../statistics/usage-report-data.service.ts   |  6 +--
 .../submission-cc-license-url-data.service.ts | 14 ++-----
 .../submission/workflowitem-data.service.ts   |  2 +-
 .../submission/workspaceitem-data.service.ts  |  2 +-
 9 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/src/app/core/cache/models/request-param.model.ts b/src/app/core/cache/models/request-param.model.ts
index ac21fe0b8a..b78fa45e33 100644
--- a/src/app/core/cache/models/request-param.model.ts
+++ b/src/app/core/cache/models/request-param.model.ts
@@ -1,9 +1,14 @@
-
 /**
  * Class representing a query parameter (query?fieldName=fieldValue) used in FindListOptions object
  */
 export class RequestParam {
-  constructor(public fieldName: string, public fieldValue: any) {
-
+  constructor(
+    public fieldName: string,
+    public fieldValue: any,
+    public encodeValue = true,
+  ) {
+    if (encodeValue) {
+      this.fieldValue = encodeURIComponent(fieldValue);
+    }
   }
 }
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 46a51a2d01..00ef14548a 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -492,40 +492,18 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param arrayOfItemIds The uuid of the items to be found on the other side of returned relationships
    */
   searchByItemsAndType(typeId: string,itemUuid: string,relationshipLabel: string, arrayOfItemIds: string[] ): Observable<RemoteData<PaginatedList<Relationship>>> {
-
-    const searchParams = [
-          {
-            fieldName: 'typeId',
-            fieldValue: typeId
-          },
-          {
-            fieldName: 'focusItem',
-            fieldValue: itemUuid
-          },
-          {
-            fieldName: 'relationshipLabel',
-            fieldValue: relationshipLabel
-          },
-          {
-            fieldName: 'size',
-            fieldValue: arrayOfItemIds.length
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'leftItem'
-          },
-          {
-            fieldName: 'embed',
-            fieldValue: 'rightItem'
-          },
-        ];
+    const searchParams: RequestParam[] = [
+      new RequestParam('typeId', typeId),
+      new RequestParam('focusItem', itemUuid),
+      new RequestParam('relationshipLabel', relationshipLabel),
+      new RequestParam('size', arrayOfItemIds.length),
+      new RequestParam('embed', 'leftItem'),
+      new RequestParam('embed', 'rightItem'),
+    ];
 
     arrayOfItemIds.forEach( (itemId) => {
       searchParams.push(
-        {
-          fieldName: 'relatedItem',
-          fieldValue: itemId,
-        }
+        new RequestParam('relatedItem', itemId),
       );
     });
 
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 3020e52d47..81612d0278 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -17,6 +17,7 @@ import { FindAllDataImpl } from './base/find-all-data';
 import { SearchDataImpl } from './base/search-data';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from './base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
@@ -130,14 +131,8 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
       'byEntityType',
       {
         searchParams: [
-          {
-            fieldName: 'type',
-            fieldValue: type,
-          },
-          {
-            fieldName: 'size',
-            fieldValue: 100,
-          },
+          new RequestParam('type', type),
+          new RequestParam('size', 100),
         ],
       }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow,
     ).pipe(
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index c1bc3563a3..9eb480c526 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -97,7 +97,7 @@ describe('EPersonDataService', () => {
     it('search by default scope (byMetadata) and no query', () => {
       service.searchByScope(null, '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -105,7 +105,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and no query', () => {
       service.searchByScope('metadata', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -113,7 +113,7 @@ describe('EPersonDataService', () => {
     it('search metadata scope and with query', () => {
       service.searchByScope('metadata', 'test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', encodeURIComponent('test')))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -123,7 +123,7 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
       service.searchByScope('email', '');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent('')))]
+        searchParams: [Object.assign(new RequestParam('email', ''))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
@@ -134,7 +134,7 @@ describe('EPersonDataService', () => {
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock));
       service.searchByScope('email', EPersonMock.email);
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('email', encodeURIComponent(EPersonMock.email)))]
+        searchParams: [Object.assign(new RequestParam('email', EPersonMock.email))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index a85d471e7d..c48d3a0858 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -131,7 +131,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
    */
   public getEPersonByEmail(query: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<EPerson | NoContent>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('email', encodeURIComponent(query))];
+    findListOptions.searchParams = [new RequestParam('email', query)];
     const href$ = this.searchData.getSearchByHref(this.searchByEmailPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
@@ -148,7 +148,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
    *                                    {@link HALLink}s should be automatically resolved
    */
   private getEpeopleByMetadata(query: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<EPerson>[]): Observable<RemoteData<PaginatedList<EPerson>>> {
-    const searchParams = [new RequestParam('query', encodeURIComponent(query))];
+    const searchParams = [new RequestParam('query', query)];
     return this.getEPeopleBy(searchParams, this.searchByMetadataPath, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index fde8298488..5ce186f4ca 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -15,6 +15,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
@@ -45,10 +46,7 @@ export class UsageReportDataService extends IdentifiableDataService<UsageReport>
   searchStatistics(uri: string, page: number, size: number): Observable<UsageReport[]> {
     return this.searchBy('object', {
       searchParams: [
-        {
-          fieldName: `uri`,
-          fieldValue: uri,
-        },
+        new RequestParam('uri', uri),
       ],
       currentPage: page,
       elementsPerPage: size,
diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index 3d5dedb505..5ccaf9bc4d 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -16,6 +16,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RequestParam } from '../cache/models/request-param.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
@@ -43,17 +44,8 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
     return this.searchData.getSearchByHref(
       'rightsByQuestions',{
         searchParams: [
-          {
-            fieldName: 'license',
-            fieldValue: ccLicense.id
-          },
-          ...ccLicense.fields.map(
-            (field) => {
-              return {
-                fieldName: `answer_${field.id}`,
-                fieldValue: options.get(field).id,
-              };
-            }),
+          new RequestParam('license', ccLicense.id),
+          ...ccLicense.fields.map((field: Field) => new RequestParam(`answer_${field.id}`, options.get(field).id)),
         ]
       }
     ).pipe(
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 47d18470d3..7f8649b2e6 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -107,7 +107,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
    */
   public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    findListOptions.searchParams = [new RequestParam('uuid', uuid)];
     const href$ = this.searchData.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index f285fb6eca..d219de0ddc 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -54,7 +54,7 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
    */
   public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
     const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    findListOptions.searchParams = [new RequestParam('uuid', uuid)];
     const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
     return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }

From 202c84c4840a9a569030fdd7528f0f7c35b8f628 Mon Sep 17 00:00:00 2001
From: "Gantner, Florian Klaus" <florian.gantner@uni-bamberg.de>
Date: Wed, 17 Apr 2024 17:59:10 +0200
Subject: [PATCH 0192/1286] extend eperson render type for display of dso name

https://github.com/DSpace/dspace-angular/issues/2947
(cherry picked from commit 97fade00a47eb0e1bc5e1d8b8d264878d808654d)
---
 .../core/breadcrumbs/dso-name.service.spec.ts | 62 +++++++++++++++++++
 src/app/core/eperson/models/eperson.model.ts  |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/app/core/breadcrumbs/dso-name.service.spec.ts b/src/app/core/breadcrumbs/dso-name.service.spec.ts
index 9f2f76599a..81c7591334 100644
--- a/src/app/core/breadcrumbs/dso-name.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.spec.ts
@@ -9,6 +9,10 @@ describe(`DSONameService`, () => {
   let service: DSONameService;
   let mockPersonName: string;
   let mockPerson: DSpaceObject;
+  let mockEPersonNameFirst: string;
+  let mockEPersonFirst: DSpaceObject;
+  let mockEPersonName: string;
+  let mockEPerson: DSpaceObject;
   let mockOrgUnitName: string;
   let mockOrgUnit: DSpaceObject;
   let mockDSOName: string;
@@ -25,6 +29,26 @@ describe(`DSONameService`, () => {
       }
     });
 
+    mockEPersonName = 'John Doe';
+    mockEPerson = Object.assign(new DSpaceObject(), {
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+        return mockEPersonName;
+      },
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+        return ['EPerson', Item, DSpaceObject];
+      },
+    });
+
+    mockEPersonNameFirst = 'John';
+    mockEPersonFirst = Object.assign(new DSpaceObject(), {
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+        return mockEPersonNameFirst;
+      },
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+        return ['EPerson', Item, DSpaceObject];
+      },
+    });
+
     mockOrgUnitName = 'Molecular Spectroscopy';
     mockOrgUnit = Object.assign(new DSpaceObject(), {
       firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
@@ -67,6 +91,15 @@ describe(`DSONameService`, () => {
       expect(result).toBe('Bingo!');
     });
 
+    it(`should use the EPerson factory for EPerson objects`, () => {
+      spyOn((service as any).factories, 'EPerson').and.returnValue('Bingo!');
+
+      const result = service.getName(mockEPerson);
+
+      expect((service as any).factories.EPerson).toHaveBeenCalledWith(mockEPerson);
+      expect(result).toBe('Bingo!');
+    });
+
     it(`should use the Default factory for regular DSpaceObjects`, () => {
       spyOn((service as any).factories, 'Default').and.returnValue('Bingo!');
 
@@ -107,6 +140,35 @@ describe(`DSONameService`, () => {
     });
   });
 
+  describe(`factories.EPerson`, () => {
+    describe(`with eperson.firstname and without eperson.lastname`, () => {
+      beforeEach(() => {
+        spyOn(mockEPerson, 'firstMetadataValue').and.returnValues(...mockEPersonName.split(' '));
+      });
+
+      it(`should return 'eperson.firstname' and 'eperson.lastname'`, () => {
+        const result = (service as any).factories.EPerson(mockEPerson);
+        expect(result).toBe(mockEPersonName);
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
+      });
+    });
+
+    describe(` with eperson.firstname and without eperson.lastname`, () => {
+      beforeEach(() => {
+        spyOn(mockEPersonFirst, 'firstMetadataValue').and.returnValues(mockEPersonNameFirst, undefined);
+      });
+
+      it(`should return 'eperson.firstname'`, () => {
+        const result = (service as any).factories.EPerson(mockEPersonFirst);
+        expect(result).toBe(mockEPersonNameFirst);
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
+      });
+    });
+  });
+
+
   describe(`factories.OrgUnit`, () => {
     beforeEach(() => {
       spyOn(mockOrgUnit, 'firstMetadataValue').and.callThrough();
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index 08b36dd78d..c985812411 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -85,7 +85,7 @@ export class EPerson extends DSpaceObject {
   public groups?: Observable<RemoteData<PaginatedList<Group>>>;
 
   getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-    return [this.constructor.name, ...super.getRenderTypes()];
+    return ['EPerson', this.constructor.name, ...super.getRenderTypes()];
   }
 
 }

From ffbe407d8335eed6ddb973147458d4d19146e29b Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 18 Apr 2024 02:08:20 +0200
Subject: [PATCH 0193/1286] 104686: Live Import preview only shows first
 metadata value per field

---
 .../submission-import-external-preview.component.html  | 10 ++++++----
 .../submission-import-external-preview.component.ts    |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index bbb0dbcc94..beecd68d70 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -18,10 +18,12 @@
       </div>
     </div>
     <div *ngFor="let metadata of metadataList" class="row">
-      <div class="col-md-12">
-        <strong>{{'item.preview.' + metadata.key | translate}}</strong>
-        <p>{{metadata.value.value}}</p>
-      </div>
+      <p class="col-md-12">
+        <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
+        <ng-container *ngFor="let metadatum of metadata.values">
+          <span>{{metadatum.value}}</span><br>
+        </ng-container>
+      </p>
     </div>
     <div class="row">
       <div class="col-md-12">
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index ccc9ede142..2c7b3a66be 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -27,7 +27,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
   /**
    * The entry metadata list
    */
-  public metadataList: { key: string, value: MetadataValue }[];
+  public metadataList: { key: string, values: MetadataValue[] }[];
   /**
    * The label prefix to use to generate the translation label
    */
@@ -62,7 +62,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     metadataKeys.forEach((key) => {
       this.metadataList.push({
         key: key,
-        value: Metadata.first(this.externalSourceEntry.metadata, key)
+        values: Metadata.all(this.externalSourceEntry.metadata, key)
       });
     });
   }

From 01719822c12f56c9730740da6ea3b4176a5a9110 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 18 Apr 2024 11:59:12 +0200
Subject: [PATCH 0194/1286] 114440: fix test

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

diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
index f7ff88c3b1..4f46a78da0 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
@@ -105,7 +105,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     it('Should init component properly', () => {
       comp.externalSourceEntry = externalEntry;
       const expected = [
-        { key: 'dc.identifier.uri', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') }
+        { key: 'dc.identifier.uri', values: Metadata.all(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
       ];
       fixture.detectChanges();
 

From 876ecb1d12e249da0d7dc714cf841558d3246979 Mon Sep 17 00:00:00 2001
From: Victor Hugo Duran Santiago <victorhugodurans@gmail.com>
Date: Fri, 10 May 2024 15:27:37 -0600
Subject: [PATCH 0195/1286] Fix - Change color Contrast in cookie settings box

---
 src/styles/_custom_variables.scss |  2 ++
 src/styles/_global-styles.scss    | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index dfdcdc7359..1109a6d459 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -134,4 +134,6 @@
   --ds-warning-bg: #{$ds-warning-bg};
   --ds-danger-bg: #{$ds-danger-bg};
 
+  --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
+  --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 2c6088a504..765b50ae86 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -37,6 +37,25 @@ body {
     z-index: 0;
 }
 
+.klaro
+.cookie-notice {
+  .cn-buttons {
+    .cm-btn.cm-btn-success {
+      color: var(--button-text-color-cookie);
+      background-color: var(--green1);
+    }
+    .cm-btn.cm-btn-success.cm-btn-accept-all {
+      color: var(--button-text-color-cookie);
+      background-color: var(--green1);
+    }
+  }
+}
+
+.klaro .cookie-modal a, .klaro .context-notice a, .klaro .cookie-notice a
+{
+  color: var(--green1);
+}
+
 .media-viewer
 .change-gallery
 .ngx-gallery
@@ -446,4 +465,4 @@ ngb-accordion {
 .my-cs { margin-top: var(--ds-content-spacing); margin-bottom: var(--ds-content-spacing); }
 .mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
-.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
\ No newline at end of file
+.my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }

From 6ff9edaa8b374e9a49fc12ee5b2b0da2e2f7a537 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 25 Jan 2024 17:16:48 +0100
Subject: [PATCH 0196/1286] improved layout of feedback form (increase vertical
 spacing)

---
 .../feedback-form.component.html              | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index a5de058854..6ca584c82e 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -3,7 +3,7 @@
     <h1>{{ 'info.feedback.head' | translate }}</h1>
     <p>{{ 'info.feedback.info' | translate }}</p>
     <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
-      <div class="row">
+      <div class="row mt-3">
         <div class="control-group col-sm-12">
           <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
           <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
@@ -11,33 +11,39 @@
         </div>
       </div>
 
-      <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
-        class="alert">
-        <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-        <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-      </ng-container>
-      <div class="row">
+      <div *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)" class="row">
+        <div class="col-sm-12 alert">
+          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+        </div>
+      </div>
+
+      <div class="row mt-3">
         <div class="control-group col-sm-12">
           <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
           <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
         </div>
       </div>
-      <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
-        class="alert">
-        <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
-      </ng-container>
-      <div class="row">
+
+      <div *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)" class="row">
+        <div class="col-sm-12 alert">
+          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+        </div>
+      </div>
+
+      <div class="row mt-3">
         <div class="control-group col-sm-12">
           <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
           <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
           <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
       </div>
-      <div class="row py-2">
+
+      <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
           <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
   </div>
-</div>
+</div>
\ No newline at end of file

From 5e594037796df145ce864baa36cb8a9c18dcda8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Sat, 11 May 2024 17:37:38 -0600
Subject: [PATCH 0197/1286] Update: replaced logic of allMetadataValues method
 by allMetadataNoExcludingValues logic

---
 .../item-search-result-list-element.component.html   |  2 +-
 .../search-result-list-element.component.ts          | 12 +-----------
 2 files changed, 2 insertions(+), 12 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 69d28c79d2..f7a687048a 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
@@ -29,7 +29,7 @@
           <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
           </ng-container>
           <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataNoExcludingValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                 <span *ngIf="!last">; </span>
             </span>
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 0621998729..1d65dd8b12 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
@@ -37,23 +37,13 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     }
   }
 
-  /**
-   * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
-   *
-   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
-   * @returns {string[]} the matching string values or an empty array.
-   */
-  allMetadataValues(keyOrKeys: string | string[]): string[] {
-    return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
-  }
-
   /**
    * Gets all matching metadata string values from hitHighlights or dso metadata.
    *
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
    * @returns {string[]} the matching string values or an empty array.
    */
-  allMetadataNoExcludingValues(keyOrKeys: string | string[]): string[] {
+  allMetadataValues(keyOrKeys: string | string[]): string[] {
     let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
     let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
     let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));

From d55b0c0dd301432a348dc338511749809b5c5f0d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 3 May 2024 15:08:11 -0500
Subject: [PATCH 0198/1286] After English, reorder languages alphabetically by
 code

---
 config/config.example.yml        | 50 ++++++++++++++++----------------
 src/config/default-app-config.ts | 21 +++++++-------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index bcdc447db5..1ce83f2f72 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -179,6 +179,9 @@ languages:
   - code: ar
     label: العربية
     active: true
+  - code: bn
+    label: বাংলা
+    active: true
   - code: ca
     label: Català
     active: true
@@ -188,24 +191,36 @@ languages:
   - code: de
     label: Deutsch
     active: true
+  - code: el
+    label: Ελληνικά
+    active: true
   - code: es
     label: Español
     active: true
+  - code: fi
+    label: Suomi
+    active: true
   - code: fr
     label: Français
     active: true
   - code: gd
     label: Gàidhlig
     active: true
-  - code: it
-    label: Italiano
-    active: true
-  - code: lv
-    label: Latviešu
+  - code: hi
+    label: हिंदी
     active: true
   - code: hu
     label: Magyar
     active: true
+  - code: it
+    label: Italiano
+    active: true
+  - code: kk
+    label: Қазақ
+    active: true
+  - code: lv
+    label: Latviešu
+    active: true
   - code: nl
     label: Nederlands
     active: true
@@ -221,8 +236,8 @@ languages:
   - code: sr-lat
     label: Srpski (lat)
     active: true
-  - code: fi
-    label: Suomi
+  - code: sr-cyr
+    label: Српски
     active: true
   - code: sv
     label: Svenska
@@ -230,27 +245,12 @@ languages:
   - code: tr
     label: Türkçe
     active: true
-  - code: vi
-    label: Tiếng Việt
-    active: true
-  - code: kk
-    label: Қазақ
-    active: true
-  - code: bn
-    label: বাংলা
-    active: true
-  - code: hi
-    label: हिंदी
-    active: true
-  - code: el
-    label: Ελληνικά
-    active: true
-  - code: sr-cyr
-    label: Српски
-    active: true
   - code: uk
     label: Yкраї́нська
     active: true
+  - code: vi
+    label: Tiếng Việt
+    active: true
 
 
 # Browse-By Pages
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 5eced97ee2..e7024d5075 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -216,30 +216,31 @@ 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: 'ar', label: 'العربية', active: true },
+    { code: 'bn', label: 'বাংলা', active: true },
     { code: 'ca', label: 'Català', active: true },
     { code: 'cs', label: 'Čeština', active: true },
     { code: 'de', label: 'Deutsch', active: true },
+    { code: 'el', label: 'Ελληνικά', active: true },
     { code: 'es', label: 'Español', active: true },
+    { code: 'fi', label: 'Suomi', active: true },
     { code: 'fr', label: 'Français', active: true },
     { code: 'gd', label: 'Gàidhlig', active: true },
-    { code: 'it', label: 'Italiano', active: true },
-    { code: 'lv', label: 'Latviešu', active: true },
+    { code: 'hi', label: 'हिंदी', active: true },
     { code: 'hu', label: 'Magyar', active: true },
+    { code: 'it', label: 'Italiano', active: true },
+    { code: 'kk', label: 'Қазақ', active: true },
+    { code: 'lv', label: 'Latviešu', active: true },
     { code: 'nl', label: 'Nederlands', active: true },
     { code: 'pl', label: 'Polski', active: true },
     { code: 'pt-PT', label: 'Português', active: true },
     { code: 'pt-BR', label: 'Português do Brasil', active: true },
-    { code: 'sr-lat', label: 'Srpski (lat)', active: true},
-    { code: 'fi', label: 'Suomi', active: true },
+    { code: 'sr-lat', label: 'Srpski (lat)', active: true },
+    { code: 'sr-cyr', label: 'Српски', active: true },
     { code: 'sv', label: 'Svenska', active: true },
     { code: 'tr', label: 'Türkçe', active: true },
+    { code: 'uk', label: 'Yкраї́нська', active: true },
     { code: 'vi', label: 'Tiếng Việt', active: true },
-    { code: 'kk', label: 'Қазақ', active: true },
-    { code: 'bn', label: 'বাংলা', active: true },
-    { code: 'hi', label: 'हिंदी', active: true},
-    { code: 'el', label: 'Ελληνικά', active: true },
-    { code: 'sr-cyr', label: 'Српски', active: true},
-    { code: 'uk', label: 'Yкраї́нська', active: true}
   ];
 
   // Browse-By Pages

From d9a5f324a5cf9d147c4e1c4c94340f9a701ed10c Mon Sep 17 00:00:00 2001
From: NTK <root@dspace.test.ntkcz.cz>
Date: Thu, 9 May 2024 17:01:05 +0200
Subject: [PATCH 0199/1286] Czech DSpace 7 UI translation by NTK

---
 src/assets/i18n/cs.json5 | 10832 ++++++++++++++++++++++++++-----------
 1 file changed, 7628 insertions(+), 3204 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index e28caf53b2..36765cf77f 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1,267 +1,269 @@
 {
 
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "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": "Nemáte oprávnění k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "401.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "401.link.home-page": "Take me to the home page",
-
-  // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-
+  "401.link.home-page": "Návrat na domovskou stránku",
 
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "Neautorizovaný přístup",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "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": "Nemáte povolení k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Přesměrujte mě na domovskou stránku",
 
-  // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Přístup zakázán",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "Služba je nedostupná",
 
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Server není dočasně schopen obsloužit váš požadavek z důvodu výpadku údržby nebo kapacitních problémů. Zkuste to prosím později.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Návrat na domovskou stránku",
 
   // "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": "Nepodařilo se najít stránku, kterou hledáte. Je možné, že stránka byla přesunuta nebo smazána. Pomocí tlačítka níže můžete přejít na domovskou stránku. ",
+  "404.help": "Nemůžeme najít stránku, kterou hledáte. Stránka mohla být přesunuta nebo smazána. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku. ",
 
   // "404.link.home-page": "Take me to the home page",
-  "404.link.home-page": "Přejít na domovskou stránku",
+  "404.link.home-page": "Návrat na domovskou stránku",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "stránka nenalezena",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Stránka nebyla nalezena",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "Neautorizovaný přístup",
+
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Přístup zakázán",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "Služba je nedostupná",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Stránka nebyla nenalezena",
+
+  // "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": "Při přihlašování přes ORCID došlo k chybě. Ujistěte se, že jste sdíleli e-mailovou adresu připojenou ke svému účtu ORCID s DSpace. Pokud chyba přetrvává, kontaktujte správce",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargo",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Pouze metadata",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Otevřený přístup",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Omezený přístup",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Status neznámý",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Kurátorská úloha systému",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Kurátorská úloha systému",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Kurátorská úloha systému",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Registr formátů",
 
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Formát souboru",
 
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Při vytváření nového formátu souboru došlo k chybě.",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Vytváření nového formátu souboru selhalo",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Vytvořit formát souboru",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Přidat nový formát souboru",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "Nový formát souboru byl úspěšně vytvořen.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Úspěšně vytvořeno",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Nepodařilo se odstranit formát(y) {{ amount }}",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Odstranění formátu souboru selhalo",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "Úspěšně odstraněno {{ amount }} formatů",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Úspěšně odstraněno",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  "admin.registries.bitstream-formats.description": "Tento seznam formátů souborů poskytuje informace o známých formátech a o úrovni jejich podpory.",
+  "admin.registries.bitstream-formats.description": "Tento seznam formátů souboru poskytuje informace o známých formátech a úrovni jejich podpory.",
 
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formát souboru",
 
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Popis",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Přípony jsou přípony souborů, které se používají k automatické identifikaci formátu nahraných souborů. Pro každý formát můžete zadat několik přípon.",
 
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Přípony souborů",
 
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Zadejte příponu souboru bez tečky",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Při úpravě formátu souboru došlo k chybě.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Úprava formátu souboru selhala",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formát souboru: {{ format }}",
 
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO New key - Add a translation
-  "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": "Formáty označené jako interní jsou uživateli skryté a používají se pro účely správy.",
 
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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": "Typ MIME spojený s tímto formátem, nemusí být jedinečný.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Typ MIME",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
-  // TODO New key - Add a translation
-  "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": "Jedinečný název pro tento formát (např. Microsoft Word XP nebo Microsoft Word 2000)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Název",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "Formát souboru byl úspěšně upraven.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Úspěšně upraveno",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Úroveň podpory, kterou vaše instituce slibuje pro tento formát.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Úroveň podpory",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registr formátů souborů",
+  "admin.registries.bitstream-formats.head": "Registr formátu souboru",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "Žádné formáty souboru k zobrazení.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Smazat vybrané",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Zrušit výběr všech",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "Interní",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Typ MIME",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Název",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
   // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "Name",
-  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.return": "Return",
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.registries.bitstream-formats.table.return": "Zpět",
 
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Známé",
 
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Podporované",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Neznámé",
 
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Úroveň podpory",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registr formátů souboru",
+
+  // "admin.registries.bitstream-formats.select": "Select",
   // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Registr formátů souborů",
-
+  "admin.registries.bitstream-formats.select": "Select",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.deselect": "Deselect",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Registr metadat",
 
   // "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": "Registr metadat je seznam všech metadatových polí dostupných v repozitáři. Tyto pole mohou být rozdělena do více schémat. DSpace však vyžaduje použití schématu Kvalifikovaný Dublin Core.",
+  "admin.registries.metadata.description": "Registr metadat udržuje seznam všech polí metadat dostupných v úložišti. Tato pole mohou být rozdělena mezi více schémat. DSpace však vyžaduje kvalifikované schéma Dublin Core.",
 
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Vytvořit metadatové schéma",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Upravit metadatové schéma",
 
   // "admin.registries.metadata.form.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Název",
 
   // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
   "admin.registries.metadata.form.namespace": "Namespace",
 
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Registr metadat",
 
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  "admin.registries.metadata.schemas.no-items": "Žádná schémata metadat.",
+  "admin.registries.metadata.schemas.no-items": "Žádná schémata metadat k zobrazení.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
+  // TODO New key - Add a translation
+  "admin.registries.metadata.schemas.select": "Select",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.metadata.schemas.deselect": "Deselect",
 
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Smazat vybrané",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
   // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.selected": "Selected schemas",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
@@ -270,1304 +272,1848 @@
   "admin.registries.metadata.schemas.table.name": "Název",
 
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  "admin.registries.metadata.schemas.table.namespace": "Jmenný prostor",
-
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Registr metadat",
-
+  "admin.registries.metadata.schemas.table.namespace": "Namespace",
 
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registr metadat",
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Metadatové schéma",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  "admin.registries.schema.description": "Toto je schéma metadat pro „{{namespace}}“.",
+  "admin.registries.schema.description": "Toto je metadatové schéma pro \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.select": "Select",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.deselect": "Deselect",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Pole schématu metadat",
+  "admin.registries.schema.fields.head": "Metadatové pole schématu",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
-  "admin.registries.schema.fields.no-items": "Žádná metadatová pole.",
+  "admin.registries.schema.fields.no-items": "Žádná metadatová pole k zobrazení.",
 
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Smazat vybrané",
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Pole",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
   // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+
+  // "admin.registries.schema.fields.table.id": "ID",
+  // TODO Source message changed - Revise the translation
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Poznámka o rozsahu",
+  "admin.registries.schema.fields.table.scopenote": "Poznámka k rozsahu",
 
   // "admin.registries.schema.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Vytvořit metadatové pole",
 
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Upravit metadatové pole",
 
   // "admin.registries.schema.form.element": "Element",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Termín",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Kvalifikátor",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Poznámka k rozsahu",
 
   // "admin.registries.schema.head": "Metadata Schema",
-  "admin.registries.schema.head": "Schéma metadat",
+  "admin.registries.schema.head": "Metadatové schéma",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Metadatové schéma bylo Úspěšně vytvořeno \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "Nepodařilo se odstranit metadatové schéma {{amount}}",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "Úspěšně odstraněno {{amount}} metadatových schémat",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Úspěšně upraveno metadatové schéma \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Chyba",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "Úspěšně vytvořeno metadatové pole \"{{field}}\"",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "Nepodařilo se smazat metadatové pole {{amount}}",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "Úspěšně odstraněno {{amount}} polí metadat",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Úspěšně upraveno metadatové pole \"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "V pořádku",
 
-  // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "Return",
+  // "admin.registries.schema.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.registries.schema.return": "Zpět",
 
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Registr schémat metadat",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registr metadatových schémat",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Hromadná správa přístupu",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Prohledávat výsledky",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Hromadná správa přístupu",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Hromadná správa přístupu",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Krok 1: Vybrat záznam",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Hledat",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Aktuální výběr({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Krok 2: Provést operaci",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Smazat uživatele",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Simulace jiného uživatele",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Resetovat heslo",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Přestat simulovat jiného uživatele",
 
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Uživatelé",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Uživatelé",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
   // TODO New key - Add a translation
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
+  "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.edit.title": "New EPerson",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.add.title": "Add EPerson",
 
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Uživatelé",
 
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Hledat",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Procházet vše",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.search.scope.email": "E-mail (přesný)",
 
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Hledat",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Hledat uživatele...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Přidat uživatele",
 
   // "admin.access-control.epeople.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.table.id": "ID",
 
   // "admin.access-control.epeople.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Jméno",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.table.email": "E-mail (přesný)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Upravit",
 
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Upravit \"{{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": "Nejste oprávněni upravovat tuto skupinu",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Odstranit \"{{name}}\"",
 
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Žádní uživatelé k zobrazení.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Vytvořit uživatele",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Upravit uživatele",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Křestní jméno",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Příjmení",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
+  // "admin.access-control.epeople.form.email": "Email",
+  // TODO Source message changed - Revise the translation
   "admin.access-control.epeople.form.email": "E-mail",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.epeople.form.emailHint": "Musí to být platná e-mailová adresa",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Lze se přihlásit",
 
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Vyžaduje certifikát",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Zpět",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "Úspěšně vytvořen uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Nepodařilo se vytvořit uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se vytvořit uživatele \"{{name}}\", e-mail \"{{email}}\" je již používán.",
 
   // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se upravit uživatele \"{{name}}\", e-mail \"{{email}}\" je již používán.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "Úspěšně upraven uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Nepodařilo se upravit uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Úspěšně smazán uživatel \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Nepodařilo se smazat uživatele \"{{name}}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Člen těchto skupin:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.form.table.id": "ID",
 
   // "admin.access-control.epeople.form.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Jméno",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Tento uživatel není členem žádné skupiny",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Přidat do skupin",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Nepodařilo se odstranit uživatele: \"{{name}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Úspěšně odstraněn uživatel: \"{{name}}\"",
 
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Skupiny",
 
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Skupiny",
 
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Upravit skupinu",
 
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Upravit skupinu",
 
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Nová skupina",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nová skupina",
 
   // "admin.access-control.groups.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Skupiny",
 
   // "admin.access-control.groups.button.add": "Add group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Přidat skupinu",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Hledat skupiny",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Hledat",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Hledat skupiny...",
 
   // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.table.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.name": "Name",
+  "admin.access-control.groups.table.name": "Název",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Členové",
 
   // "admin.access-control.groups.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Upravit",
 
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Upravit \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Odstranit \"{{name}}\"",
 
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto jako UUID,",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Úspěšně odstraněna skupina \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Nepodařilo se odstranit skupinu \"{{name}}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-
-
+  "admin.access-control.groups.notification.deleted.failure.content": "Důvod: \"{{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.",
-  // TODO New key - Add a translation
-  "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": "Tato skupina je trvalá, takže ji nelze upravit ani odstranit. Přesto můžete členy skupiny přidávat a odebírat pomocí této stránky.",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Tuto skupinu nelze změnit či vymazat, protože odpovídá roli v zadávání a workflow v \"{{name}}\" {{comcol}}. Můžete ji vymazat z <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> záložce na stránce editace {{comcol}}. Na této stránce můžete přidávat či odebírat členy skupiny.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Vytvořit skupinu",
 
   // "admin.access-control.groups.form.head.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Upravit skupinu",
 
   // "admin.access-control.groups.form.groupName": "Group name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Název skupiny",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Komunita nebo kolekce",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Popis",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Úspěšně vytvořena skupina \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Nepodařilo se vytvořit skupinu \"{{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.",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se vytvořit skupinu s názvem: \"{{name}}\", ujistěte se, že název již není používán.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "Nepodařilo se upravit skupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Název \"{{name}}\" je již používán!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Úspěšně upravena skupina \"{{name}}\"",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Odstranit skupinu",
 
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Odstranit skupinu \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "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": "Určitě chcete odstranit skupinu \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Zrušit",
 
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Odstranit",
 
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Úspěšně odstraněna skupina \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Nepodařilo se odstranit skupinu \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Důvod: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "Uživatelé",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Přidat uživatele",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.headMembers": "Aktuální členové",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Hledat",
 
   // "admin.access-control.groups.form.members-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.table.id": "ID",
 
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "Název",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identita",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "E-mail",
+
+  // "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",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.members-list.table.edit": "Odstranit / Přidat",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Odebrat člena jménem \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Úspěšně přidán člen: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se přidat člena: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Úspěšně odstraněn člen: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se smazat člena: \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Přidat člena jménem \"{{name}}\"",
 
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "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": "Žádná aktuální aktivní skupina, nejprve zadejte jméno.",
 
   // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "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": "Ve skupině zatím nejsou žádní členové, vyhledejte je a přidejte.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyly nalezeni žádní uživatelé",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Neúspěch: Něco se pokazilo: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Skupiny",
 
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Přidat podskupinu",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Aktuální podskupiny",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Hledat",
 
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.table.id": "ID",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Název",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Kolekce/Komunita",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Odstranit / Přidat",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Odebrat podskupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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.currentGroup": "Current group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Přidat podskupinu s názvem \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Úspěšně přidána podskupina: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Nepodařilo se přidat podskupinu: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Úspěšně odstraněna podskupina: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "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": "Podskupinu se nepodařilo odstranit: \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "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": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  // TODO New key - Add a translation
-  "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": "Toto je aktuální skupina, nelze přidat.",
 
   // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto 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": "Ve skupině zatím nejsou žádné podskupiny.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.access-control.groups.form.return": "Zpět",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
+  "admin.quality-assurance.breadcrumbs": "Quality Assurance",
 
-  // "admin.access-control.groups.form.return": "Return to groups",
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
   // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
+  "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  // TODO New key - Add a translation
+  "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  // TODO New key - Add a translation
+  "admin.quality-assurance.page.title": "Quality Assurance",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  // TODO New key - Add a translation
+  "admin.notifications.source.breadcrumbs": "Quality Assurance",
+
+  // "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.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pro přidání nebo odebrání uživatele z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno pro vyhledání uživatele (použijte roletku na levé straně vyhledávacího okna a vyberte, zda chcete prohledávat pomocí metadat nebo e-mailu). Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Pro přidání nebo odebrání podskupiny z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno níže pro vyhledání uživatele. Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
 
 
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Administrátorské vyhledávání",
 
   // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Upravit",
 
   // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Upravit",
 
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Odstranit",
 
   // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Upravit",
 
-  // "admin.search.item.make-private": "Make Private",
-  // TODO New key - Add a translation
-  "admin.search.item.make-private": "Make Private",
+  // "admin.search.item.make-private": "Make non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "admin.search.item.make-private": "Učinit nedohledatelným",
 
-  // "admin.search.item.make-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
+  // "admin.search.item.make-public": "Make discoverable",
+  // TODO Source message changed - Revise the translation
+  "admin.search.item.make-public": "Učinit dohledatelným",
 
   // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
+  "admin.search.item.move": "Přesunout",
 
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Obnovit",
 
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Stáhnout",
 
   // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
+  "admin.search.title": "Administrátorské vyhledávání",
 
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-
-
-
+  "administrativeView.search.results.head": "Administrátorské vyhledávání",
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Spravovat workflow",
 
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Spravovat workflow",
 
   // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Pracovní prostor",
+
   // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Smazat",
 
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Odeslat zpět",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiky pro záznam",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervize",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importovat metadata",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importovat dávku",
 
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Importovat metadata",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importovat dávku",
 
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Importovat metadata",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importovat dávku",
 
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "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": "Sem můžete přetáhnout nebo vybrat CSV soubory, které obsahují dávkové operace na metadatech souborů",
+
+  // "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": "Vyberte kolekci, do které budete importovat. Poté přetáhněte nebo vyberte soubor typu Simple Archive Format (SAF), který obsahuje záznamy k importu",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "Import je možné provést buď pomocí nahrání souboru, nebo prostřednictvím URL adresy. Použijte přepínač výše k určení zdroje vstupu",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "Přetáhněte CSV soubor s metadaty k importu",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Přetáhněte soubor ZIP k importu",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "CSV k importu",
 
-  // "admin.metadata-import.page.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "Return",
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Nahraďte přetažením soubor ZIP k importu",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "admin.metadata-import.page.button.return": "Zpět",
 
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Pokračovat",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Vybrat kolekci",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "Nejprve vyberte soubor!",
 
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Nejprve vložte URL adresu souboru!",
 
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "Nejprve vyberte soubor ZIP!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Nahrát",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Vložte url ZIP souboru pro import",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Pouze ověřit",
+
+  // "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": "Po výběru bude nahraný CSV ověřen. Obdržíte zprávu o zjištěných změnách, ale žádné změny nebudou uloženy.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Hodnocení",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Musíte ohodnotit záznam",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Recenze",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Pro odeslání tohoto hodnocení musíte zadat recenzi",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Níže vyberte hodnocení",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Vyberte prosím hodnocení níže a přidejte recenzi",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Před odesláním si prosím vyberte jednoho recenzenta.",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Před odesláním vyberte jednoho nebo více recenzentů.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Uživatelé",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Přidat uživatele",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Prohledávat vše",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktuální členové",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hledat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Jméno",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identita",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Odstranit / Přidat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Odstranit člena jménem \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Úspěšně přidaný uživatel: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Nepodařilo se přidat člena: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Úspěšně odstraněný uživatel: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Nepodařilo se odstranit uživatele: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Přidat uživatele jménem \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktivní skupina, nejdříve vložte název.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Žádní členové ve skupině, nejdříve vyhledejte a přidejte.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nebyl vybrán žádný recenzent.",
+
+  // "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": "Po výběru bude nahraný ZIP validován. Obdržíte zprávu o zjištěných změnách, ale žádné změny nebudou uloženy.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "Odstranit",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Neplatná e-mailová adresa nebo heslo.",
 
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  "auth.messages.expired": "Vaše relace vypršela. Prosím, znova se přihlaste.",
+  "auth.messages.expired": "Vaše relace vypršela. Přihlaste se prosím znovu.",
 
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "Nepodařilo se obnovit váš přístupový token. Prosím přihlašte se znovu.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Zpět" ,
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Upravit politiky souboru",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Upravit politiky souboru",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Zpět",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "Soubor: ",
 
   // "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>\".",
-  // TODO New key - Add a translation
-  "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": "Zadejte případně stručný popis souboru, např. \"<i>Hlavní článek</i>\" nebo \"<i>Experimentální data</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Popis",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "První den, od něhož je povolen přístup. <b>Toto datum nelze změnit v tomto formuláři.</b> K nastavení embarga pro tento soubor jděte na záložku <i>Stav záznamu</i>, klikněte na <i>Oprávnění...</i>, vytvořte nebo upravte politiku souboru <i>ČÍST</i> a nastavte <i>Datum zahájení</i> podle potřeby.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "Do určitého data pod embargem",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Změňte jméno souboru. Pozor - změní to zobrazované URL souboru, ale původní odkazy budou i nadále fungovat, pokud se nezmění ID sekvence.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Název souboru",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Popište nový formát",
 
   // "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>\").",
-  // TODO New key - Add a translation
-  "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": "Aplikace, kterou jste použili k vytvoření souboru, a číslo verze (například \"<i>ACMESoft SuperApp verze 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "Primární soubor",
 
   // "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\".",
-  // TODO New key - Add a translation
-  "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": "Pokud formát není ve výše uvedeném seznamu, <b>vyberte \"format not in list\" výše</b> a popište v části \"Describe new format\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Vybraný formát",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "Formát není v seznamu",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Došlo k chybě při ukládání formátu bitového toku",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Při ukládání primárního datového toku došlo k chybě",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF štítek",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Canvas štítek pro tento obrázek. Pokud nebude zadán, bude využit přednastavený štítek.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "IIIF obsah",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "Přidáním textu na toto místo se vytvoří začátek nového rozsahu obsahu.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "IIIF šířka plátna",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "Šířka plátna by obvykle měla odpovídat šířce obrázku.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "IIIF výška plátna",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "Výška plátna by obvykle měla odpovídat výšce obrázku.",
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Vaše změny v tomto souboru byly uloženy.",
 
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Soubor uložen",
 
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Upravit soubor",
 
+  // "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": "K tomuto souboru již máte přístup. Pokud chcete soubor stáhnout, klikněte zde",
 
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "zde",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Vyžádat si kopii souboru",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Zadejte následující informace, abyste si vyžádali kopii následující záznamy: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Žádám o kopii následujícího souboru: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Žádám o všechny soubory. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Název *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Název je vyžadován",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "Vaše e-mailová adresa *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Tato e-mailová adresa se používá pro odeslání souboru.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Zadejte prosím platnou e-mailovou adresu.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Soubory",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Pouze požadovaný soubor",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Všechny soubory (tohoto záznamu) v omezeném přístupu",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Zpráva",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Zpět",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Žádost o kopii",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "Požadavek na záznam byl úspěšně odeslán.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Něco se pokazilo při odesílání požadavku na záznam.",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Všechny výsledky procházení",
 
   // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Podle autora",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Podle data vydání",
 
   // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Podle předmětu",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Podle předmětu",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
   // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.nsi": "By Norwegian Science Index",
 
   // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Podle názvu",
 
   // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Procházet",
 
   // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
+  "browse.empty": "Žádné záznamy k zobrazení",
 
   // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
+  "browse.metadata.author": "Autor",
 
   // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Datum vydání",
 
   // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Předmět",
 
   // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Název",
+
+  // "browse.metadata.srsc": "Subject Category",
   // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
+  "browse.metadata.srsc": "Subject Category",
 
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Procházet podle autora",
 
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Procházet podle data vydání",
 
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Procházet podle předmětu",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Procházet podle předmětu",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Procházet podle názvu",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Další",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Předchozí",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Žádné další stránky výsledků",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", začíná na {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Vyberte, na co začíná)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Vyberte rok)",
 
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  // TODO New key - Add a translation
-  "browse.startsWith.jump": "Jump to a point in the index:",
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Vyberte rok vydání",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.jump": "Filtrovat výsledky podle roku nebo měsíce",
 
   // "browse.startsWith.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Duben",
 
   // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Srpen",
 
   // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Prosinec",
 
   // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Únor",
 
   // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Leden",
 
   // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Červenec",
 
   // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Červen",
 
   // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Březen",
 
   // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Květen",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Vyberte měsíc)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Vyberte měsíc vydání",
 
   // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Listopad",
 
   // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Říjen",
 
   // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Září",
 
-  // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
+  // "browse.startsWith.submit": "Browse",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.submit": "Procházet",
 
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date": "Or type in a date (year-month):",
+  // "browse.startsWith.type_date": "Filter results by date",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.type_date": "Filtrovat výsledky podle data",
 
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Nebo zadejte datum (rok-měsíc) a klikněte na tlačítko Procházet",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Prohlížíte {{ collection }} dle {{ field }} {{ value }}",
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  // TODO Source message changed - Revise the translation
+  "browse.startsWith.type_text": "Filtrovat výsledky zadáním několika prvních písmen",
 
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrovat",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Procházet",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  // TODO Source message changed - Revise the translation
+  "browse.title": "Procházet {{ collection }} podle {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Procházet {{ collection }} podle {{ field }}. {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Zpět na seznam výsledků",
 
   // "chips.remove": "Remove chip",
+  "chips.remove": "Odstranit chip",
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Schváleno",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět vkladateli",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
+
+  // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
-
+  "collection.create.breadcrumbs": "Create collection",
 
+  // "collection.browse.logo": "Browse for a collection logo",
+  // TODO New key - Add a translation
+  "collection.browse.logo": "Browse for a collection logo",
 
   // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
+  "collection.create.head": "Vytvořit kolekci",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Úspěšně vytvořena kolekce",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Vytvořit kolekci pro komunitu {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Kurátorovat kolekci: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Zrušit",
 
   // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Potvrdit",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Odstranit",
 
   // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Odstranit kolekci",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  // TODO New key - Add a translation
-  "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Kolekce nemůže být odstraněna",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Kolekce byla úspěšně odstraněna",
 
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-
-
+  "collection.delete.text": "Určitě chcete odstranit kolekci \"{{ dso }}\"",
 
   // "collection.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Smazat tuto kolekci",
 
   // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Upravit kolekci",
 
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-
-
+  "collection.edit.breadcrumbs": "Upravit kolekci",
 
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapování do kolekce",
 
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Upravit kolekci - Mapování do kolekce",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Zrušit",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Kolekce: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Mapovat vybrané záznamy",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Toto je nástroj mapování záznamů, který umožňuje správcům kolekcí mapovat záznamy z jiných kolekcí do této kolekce. Můžete vyhledávat záznamy z jiných kolekcí a mapovat je nebo procházet seznam aktuálně mapovaných záznamů.",
 
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Mapování do kolekce - Mapování záznamů z jiných kolekcí",
 
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Zadejte prosím dotaz pro vyhledávání",
 
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Při mapování {{amount}} záznamů došlo k chybám.",
 
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Chyba při mapování",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "Úspěšně namapováno {{amount}} záznamů.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapování dokončeno",
 
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "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": "Při odstraňování mapování {{amount}} záznamů došlo k chybám.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Chyba při odstraňování mapování",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Úspěšně odstraněno mapování {{amount}} záznamů.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Odstranění mapování dokončeno",
 
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Odstranit vybrané mapování záznamů",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Hledat záznamy...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Procházet mapované záznamy",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Mapovat nové záznamy",
 
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Smazat logo",
 
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Zrušit odstranění",
 
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logo kolekce",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Nahrání loga kolekce se nezdařilo. Před dalším pokusem ověřte obsah.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Nahrání loga kolekce proběhlo úspěšně.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logo odstraněno",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo kolekce",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Chyba při mazání loga",
 
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-
-
+  "collection.edit.logo.upload": "Odstranit logo kolekce k nahrání",
 
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Úspěšně upravena kolekce",
 
-  // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
+  // "collection.edit.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "collection.edit.return": "Zpět",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Řízení přístupu",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Úprava kolekce - Řízení přístupu",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Kurátorovat",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Upravit kolekci - kurátorovat",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Oprávnění",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Upravit kolekci - Oprávnění",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Načíst další svazky",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Načíst další",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Zobrazit politiky souboru pro svazek",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Upravit metadata",
 
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Upravit kolekci - Metadata",
 
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Přidělit role",
 
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Upravit kolekci - Role",
 
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Tato kolekce získává svůj obsah z externího zdroje",
 
   // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  // TODO New key - Add a translation
-  "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": "Musíte zadat id cílové kolekce.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Harvestování obsahu",
 
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Konfigurace externího zdroje",
 
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Formát metadat",
 
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "OAI ID konkrétní sady",
 
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "Poskytovatel OAI",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "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": "Sklízet metadata a soubory (vyžaduje podporu ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "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": "Sklízet metadata a odkazy na soubory (vyžaduje podporu ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Sklízet pouze metadata",
 
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Zdroj obsahu",
 
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "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": "Vaše změny byly vyřazeny. Chcete-li své změny obnovit, klikněte na tlačítko Zpět",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  // TODO Source message changed - Revise the translation
+  "collection.edit.tabs.source.notifications.discarded.title": "Změny vyřazeny",
 
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "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": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadata neplatná",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "Vaše změny ve zdroji obsahu této kolekce byly uloženy.",
 
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Zdroj obsahu uložen",
 
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-
-
+  "collection.edit.tabs.source.title": "Úprava kolekce - zdroj obsahu",
 
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Přidat",
 
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Šablona záznamu",
 
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Zrušit",
 
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Odstranit",
 
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Upravit",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Při načítání šablony pro záznam došlo k chybě",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Upravit šablonu pro kolekci \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Šablona pro záznam",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Načítání šablony pro záznam...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "Nepodařilo se odstranit šablonu pro záznam",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Úspěšně odstraněna šablona pro záznam",
 
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-
-
+  "collection.edit.template.title": "Upravit šablonu",
 
   // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Krátký popis",
 
   // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Úvodní text (HTML)",
 
   // "collection.form.errors.title.required": "Please enter a collection name",
-  // TODO New key - Add a translation
-  "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Zadejte prosím název kolekce",
 
   // "collection.form.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
+  "collection.form.license": "Licence",
 
   // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Původ",
 
   // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Copyright (HTML)",
 
   // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Novinky (HTML)",
 
   // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
-
+  "collection.form.title": "Název",
 
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Typ subjektu",
 
   // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Kolekce",
+
+  // "collection.logo": "Collection logo",
   // TODO New key - Add a translation
-  "collection.listelement.badge": "Collection",
+  "collection.logo": "Collection logo",
 
-
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Poslední příspěvky",
-
-  // "collection.page.browse.recent.empty": "No items to show",
+  // "collection.page.browse.search.head": "Search",
   // TODO New key - Add a translation
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Upravit tuto kolekci",
 
   // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "Permanentní URI k tomuto záznamu",
 
   // "collection.page.license": "License",
   "collection.page.license": "Licence",
@@ -1575,316 +2121,359 @@
   // "collection.page.news": "News",
   "collection.page.news": "Novinky",
 
-
+  // "collection.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "collection.search.results.head": "Search Results",
 
   // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Potvrdit vybrané",
 
   // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Žádná kolekce k zobrazení",
+
+  // "collection.select.table.selected": "Selected collections",
   // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
+  "collection.select.table.selected": "Selected collections",
+
+  // "collection.select.table.select": "Select collection",
+  // TODO New key - Add a translation
+  "collection.select.table.select": "Select collection",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  // TODO New key - Add a translation
+  "collection.select.table.deselect": "Deselect collection",
 
   // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
+  "collection.select.table.title": "Název",
 
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Kontroly harvestu",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Něco se pokazilo při zahájení testování nastavení",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "Skript pro testování nastavení selhal",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "Skript pro testování nastavení byl úspěšně dokončen",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Test konfigurace",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Testování konfigurace...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "Import byl úspěšně zahájen",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Něco se pokazilo při zahájení importu",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importovat nyní",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importováno...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Během importu došlo k chybě",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "Import byl dokončen",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "Reset a opětovný import byl úspěšně zahájen",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Něco se pokazilo při zahájení resetu a opětovného importu",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Během resetování a opětovnému importu došlo k chybě",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Reset a opětovný import byl dokončen",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Reset a opětovný import",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Probíhá resetování a opětovný import...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Stav harvestu:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Čas zahájení harvestu:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Naposledy harvestováno:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Informace o harevstu:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "Není k dispozi",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "Zadané nastavení bylo testováno a nefungovalo.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Chyba serveru",
 
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Seznam komunit",
 
-
-  // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Seznam komunit",
 
   // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
+  "communityList.title": "Seznam komunit",
 
   // "communityList.showMore": "Show More",
+  "communityList.showMore": "Zobrazit více",
+
+  // "communityList.expand": "Expand {{ name }}",
   // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
+  "communityList.expand": "Expand {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  // TODO New key - Add a translation
+  "communityList.collapse": "Collapse {{ name }}",
 
+  // "community.browse.logo": "Browse for a community logo",
+  // TODO New key - Add a translation
+  "community.browse.logo": "Browse for a community logo",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  // TODO New key - Add a translation
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
+  // "community.create.breadcrumbs": "Create Community",
+  // TODO New key - Add a translation
+  "community.create.breadcrumbs": "Create Community",
 
   // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
+  "community.create.head": "Vytvořit komunitu",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Úspěšně vytvořena komunita",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  // TODO New key - Add a translation
-  "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Kurátorství komunity: {{ community }}",
 
   // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Zrušit",
 
   // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Potvrdit",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Probíhá odstraňování...",
 
   // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
+  "community.delete.head": "Odstranit komunitu",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  // TODO New key - Add a translation
-  "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Komunita nemůže být odstraněna",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Úspěšně odstraněna komunita",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  // TODO New key - Add a translation
-  "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Určitě chcete odstranit komunitu \"{{ dso }}\"",
 
   // "community.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Odstranit tuto komunitu",
 
   // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
+  "community.edit.head": "Upravit komunitu",
 
   // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Upravit komunitu",
 
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Odstranit logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Zrušit odstranění",
 
   // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Logo komunity",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Nahrání loga komunity se nezdařilo. Před dalším pokusem ověřte obsah.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Nahrání loga komunity proběhlo úspěšně.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logo odstraněno",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo komunity",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
-
+  "community.edit.logo.notifications.delete.error.title": "Chyba při odstraňování loga",
 
+  // "community.edit.logo.upload": "Drop a community logo to upload",
+  "community.edit.logo.upload": "Nahrát logo komunity",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Komunita byla úspěšně upravena",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  // TODO New key - Add a translation
-  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-
-  // "community.edit.notifications.error": "An error occured while editing the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.error": "An error occured while editing the Community",
-
-  // "community.edit.return": "Return",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
+  "community.edit.notifications.unauthorized": "K provedení této změny nemáte oprávnění",
 
+  // "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "Při úpravě komunity došlo k chybě",
 
+  // "community.edit.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "community.edit.return": "Zpět",
 
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Kurátorovat",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Upravit komunitu - kurátorovat",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Řízení přístupu",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Upravit komunitu - Řízení přístupu",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Upravit metadata",
 
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Upravit komunitu - Metadata",
 
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Přiřadit role",
 
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Upravit komunitu - role",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Oprávnění",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-
-
+  "community.edit.tabs.authorizations.title": "Upravit komunitu - Oprávnění",
 
   // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Komunita",
+
+  // "community.logo": "Community logo",
   // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-
-
+  "community.logo": "Community logo",
 
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Žádná skupina",
 
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Vytvořit",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Nepodařilo se vytvořit skupinu pro roli '{{ role }}'",
 
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Omezit",
 
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Smazat",
 
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Nepodařilo se smazat skupinu pro roli '{{ role }}'",
 
   // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "Správci",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-
+  "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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).",
-  // TODO New key - Add a translation
-  "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": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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).",
-  // TODO New key - Add a translation
-  "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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Vkladatelé",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  // TODO New key - Add a translation
-  "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": "Uživatelé a skupiny, které mají oprávnění ke vkládání nových záznamů do této kolekce.",
 
   // "comcol-role.edit.item_read.name": "Default item read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Výchozí přístup ke čtení záznamů",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Uživatelé a skupiny, které mohou číst nové záznamy odeslané do této kolekce. Změny této role nejsou retroaktivní. Stávající záznamy v systému budou stále zobrazitelné pro ty, kteří měli přístup ke čtení v době jejich přidání.",
 
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-
+  "comcol-role.edit.item_read.anonymous-group": "Výchozí čtení pro příchozí záznamy je v současné době nastaveno na hodnotu Anonymní.",
 
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Výchozí přístup ke čtení souboru",
 
-  // "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).",
-  // TODO New key - Add a translation
-  "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": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  // TODO Source message changed - Revise the translation
+  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-
+  "comcol-role.edit.bitstream_read.anonymous-group": "Výchozí čtení pro příchozí soubory je v současné době nastaveno na hodnotu Anonymní.",
 
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editoři",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  // TODO New key - Add a translation
-  "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": "Editoři mohou upravovat metadata příchozích příspěvků a poté je přijmout nebo odmítnout.",
 
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Finální editoři",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  // TODO New key - Add a translation
-  "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": "Finální editoři mohou upravovat metadata příchozích příspěvků, ale nebudou je moci odmítnout.",
 
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Recenzenti",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Recenzenti mohou přijímat nebo odmítat příchozí příspěvky. Nemohou však upravovat metadata příspěvků.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Recenzenti výsledků",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Recenzenti mohou hodnotit příchozí příspěvky což určí, zda příspěvek bude zamítnut či nikoliv.",
 
   // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
+  "community.form.abstract": "Krátký popis",
 
   // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Úvodní text (HTML)",
 
   // "community.form.errors.title.required": "Please enter a community name",
-  // TODO New key - Add a translation
-  "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Zadejte název komunity",
 
   // "community.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Text autorských práv (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Novinky (HTML)",
 
   // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
+  "community.form.title": "Název",
 
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
+  "community.page.edit": "Upravit tuto komunitu",
 
   // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "Stálý URI pro tuto komunitu",
 
   // "community.page.license": "License",
   "community.page.license": "Licence",
@@ -1893,513 +2482,648 @@
   "community.page.news": "Novinky",
 
   // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Dílčí komunity a kolekce",
+
+  // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
-  "community.all-lists.head": "Subcommunities and Collections",
-
-  // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "Kolekce v této komunitě",
-
-  // "community.sub-community-list.head": "Communities of this Community",
-  // TODO New key - Add a translation
-  "community.sub-community-list.head": "Communities of this Community",
+  "community.search.results.head": "Search Results",
 
+  // "community.sub-collection-list.head": "Collections in this Community",
+  // TODO Source message changed - Revise the translation
+  "community.sub-collection-list.head": "Kolekce této komunity",
 
+  // "community.sub-community-list.head": "Communities in this Community",
+  // TODO Source message changed - Revise the translation
+  "community.sub-community-list.head": "Komunity této komunity",
 
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Přijmout vše",
 
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Přijmout vybrané",
 
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Tato aplikace je načtena ve výchozím nastavení (ale můžete se odhlásit)",
 
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(odhlásit se)",
 
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "účel",
 
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Tato aplikace je vždy vyžadována",
 
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(vždy vyžadováno)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Pomocí tohoto přepínače povolíte nebo zakážete všechny služby.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Povolit nebo zakázat všechny služby.",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Od vaší poslední návštěvy došlo ke změnám, aktualizujte prosím svůj souhlas.",
 
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
+  "cookies.consent.close": "Zavřít",
 
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Odmítnout",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "V pořádku.",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Uložit",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Souhlas se soubory Cookie",
 
   // "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}.",
-  // TODO New key - Add a translation
-  "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": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <br/> Chcete-li se dozvědět více, přečtěte si prosím naše {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": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <strong>Využíváme osobní údaje pro tyto účely:",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "Přizpůsobit",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Zde můžete zobrazit a přizpůsobit informace, které o vás shromažďujeme.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "zásady ochrany osobních údajů",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Chcete-li se dozvědět více, přečtěte si prosím naše {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Informace, které shromažďujeme",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "služby",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "služba",
 
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Ověřování",
 
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
-
+  "cookies.consent.app.description.authentication": "Vyžadováno pro přihlášení",
 
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preference",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
-
-
+  "cookies.consent.app.description.preferences": "Vyžadováno pro uložení Vašich preferencí",
 
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Potvrzení",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-
-
+  "cookies.consent.app.description.acknowledgement": "Vyžadováno pro uložení Vašich potvrzení a souhlasů",
 
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Umožňuje nám sledovat statistické údaje",
 
+  // "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": "Při registraci a obnově hesla používáme službu Google reCAPTCHA",
 
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funkční",
 
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Statistický",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registrace a obnovení hesla",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label": "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Sdílení",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Vytvořit stránku s citacemi",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Zkontrolovat odkazy v metadatech",
 
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
   "curation-task.task.noop.label": "NOOP",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Formáty profilů souboru",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Kontrola požadovaných metadat",
 
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Překladač Microsoft",
 
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
-
+  "curation-task.task.vscan.label": "Antivirová kontrola",
 
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Zaregistrujte DOI",
 
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Úloha:",
 
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
   "curation.form.submit": "Start",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "Kurátorská úloha byla úspěšně spuštěna",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Budete přesměrováni na příslušnou stránku procesu.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Spuštění kurátorské úlohy se nezdařilo.",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Při pokusu o spuštění kurátorské úlohy došlo k chybě.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Nepodařilo se určit handle pro tento objekt",
 
   // "curation.form.handle.label": "Handle:",
-  // TODO New key - Add a translation
   "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": "Nápověda: Zadejte [your-handle-prefix]/0 pro spuštění úlohy na celém webu (ne všechny úlohy mohou tuto možnost podporovat)",
+
+  // "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": "V reakci na Vaši žádost Vám bohužel musím oznámit, že Vám není možné zaslat kopii souboru(ů), který(é) jste požadoval(a), týkající se dokumentu: \"{{ itemUrl }}\" ({{ itemName }}), jehož jsem autorem.\n\nS pozdravem,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Žádost o kopii dokumentu",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Došlo k chybě",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Zamítnout žádost o kopii",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Tato zpráva bude zaslána žadateli o kopii",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Úspěšně zamítnuta žádost o kopii záznamy",
+
+  // "dropdown.clear": "Clear selection",
   // TODO New key - Add a translation
-  "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
+  "dropdown.clear": "Clear selection",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  // TODO New key - Add a translation
+  "dropdown.clear.tooltip": "Clear the selected option",
 
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Bez názvu",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Beze jména",
 
   // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Nová kolekce",
 
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Vytvořit novou kolekci v",
 
   // "dso-selector.create.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Nová komunita",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "or",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Vytvořit novou komunitu v",
 
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Vytvořit novou komunitu nejvyšší úrovně",
 
   // "dso-selector.create.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Nový záznam",
 
   // "dso-selector.create.item.sub-level": "Create a new item in",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "Vytvořit nový záznam v",
 
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nový příspěvek",
 
   // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Upravit kolekci",
 
   // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Upravit komunitu",
 
   // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Upravit záznam",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Při hledání {{ type }} došlo k chybě",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  // TODO New key - Add a translation
-  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Exportovat metadata z",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Exportovat dávku (ZIP) z",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importovat dávku z",
 
   // "dso-selector.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "Nebyl nalezen žádný {{ type }}",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Hledat {{ type }}",
+
+  // "dso-selector.placeholder.type.community": "community",
   // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder.type.community": "community",
 
+  // "dso-selector.placeholder.type.collection": "collection",
+  // TODO New key - Add a translation
+  "dso-selector.placeholder.type.collection": "collection",
 
+  // "dso-selector.placeholder.type.item": "item",
+  // TODO New key - Add a translation
+  "dso-selector.placeholder.type.item": "item",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Vyberte kolekci",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Vyberte oblast vyhledávání",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Prohledávat celý repozitář",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "nebo",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Vyhledat komunitu nebo kolekci",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Tipy na profily",
+
+  // "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": "Toto jsou existující profily, které s vámi mohou souviset. Pokud se v některém z těchto profilů poznáváte, vyberte jej a na stránce s podrobnostmi mezi možnostmi zvolte, zda jej chcete nárokovat. V opačném případě si můžete vytvořit nový profil od začátku pomocí tlačítka níže.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Žádný z těchto záznamů není můj",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Vytvořit nový",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Něco se nepovedlo, zkuste, prosím, načíst znovu ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Výběr skupiny supervize",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Vyberte typ příkazu",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "ŽÁDNÝ",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Vyberte skupinu",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Zrušit",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Uložit",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Prosím, vyberte typ příkazu",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Prosím, vyberte skupinu",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Úspěšně vytvořen příkaz supervize pro skupinu {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Chyba",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Příkaz k supervizi již existuje na tomto záznamu pro vybranou skupinu",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Exportovat metadata pro {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Určitě chcete exportovat metadata pro {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Zrušit",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Exportovat",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportní dávka (ZIP) pro {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Určitě chcete exportovat dávku (ZIP) pro {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Zrušit",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportovat",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Odstranit uživatele \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Určitě chcete odstranit uživatele \"{{ dsoName }}}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Zrušit",
 
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Odstranit",
 
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Odstranit profil",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Určitě chcete odstranit svůj profil",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Zrušit",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Odstranit",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Zrušit odběr notifikací",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Jste si jistí, že chcete odhlásit odběr notifikací \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Zrušit",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Smazat",
 
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Chyba při načítání souboru",
 
   // "error.browse-by": "Error fetching items",
-  "error.browse-by": "Chyba během stahování záznamů",
+  "error.browse-by": "Chyba při načítání záznamů",
 
   // "error.collection": "Error fetching collection",
-  "error.collection": "Chyba během stahování kolekce",
+  "error.collection": "Chyba při načítání kolekce",
 
   // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
+  "error.collections": "Chyba při načítání kolekce",
 
   // "error.community": "Error fetching community",
-  "error.community": "Chyba během stahování komunity",
+  "error.community": "Chyba při načítání komunity",
 
   // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
+  "error.identifier": "Pro identifikátor nebyl nalezen žádný záznam",
 
   // "error.default": "Error",
   "error.default": "Chyba",
 
   // "error.item": "Error fetching item",
-  "error.item": "Chyba během stahování záznamu",
+  "error.item": "Chyba při načítání záznamu",
 
   // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
+  "error.items": "Chyba při načítání záznamů",
 
   // "error.objects": "Error fetching objects",
-  "error.objects": "Chyba během stahování objektů",
+  "error.objects": "Chyba při načítání objektů",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-  "error.recent-submissions": "Chyba během stahování posledních příspěvků",
+  "error.recent-submissions": "Chyba při načítání nedávných příspěvků",
 
   // "error.search-results": "Error fetching search results",
-  "error.search-results": "Chyba během stahování výsledků hledání",
+  "error.search-results": "Chyba při načítání výsledků vyhledávání",
+
+  // "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": "Vyhledávací dotaz není platný. Další informace o této chybě naleznete v osvědčených postupech <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Chyba během stahování subkolekcí",
+  "error.sub-collections": "Chyba při načítání dílčích kolekcí",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Chyba při načítání dílčích komunit",
 
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
-  // TODO New key - Add a translation
-  "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": "Při inicializaci sekce došlo k chybě, zkontrolujte prosím konfiguraci vstupního formuláře. Podrobnosti jsou uvedeny níže : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Chyba během stahování komunit nejvyšší úrovně",
+  "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Pro dokončení zaslání Musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
+  "error.validation.license.notgranted": "eslání. Pokud tuto licenci v tuto chvíli nemůžete udělit, můžete svou práci uložit a vrátit se k ní později nebo podání odstranit.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  // TODO New key - Add a translation
-  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "Nahrání souboru je povinné",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Toto pole je povinné",
+
+  // "error.validation.NotValidEmail": "This is not a valid email",
+  "error.validation.NotValidEmail": "Tento e-mail není platný e-mail",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "Tento e-mail je již obsazen",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Tato skupina již existuje",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery. Místo toho použijte schéma Dublin Core",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Toto pole nesmí obsahovat více než 32 znaků",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Toto pole nesmí obsahovat více než 256 znaků",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery. Místo toho použijte pole kvalifikátorů",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Toto pole nesmí obsahovat více než 64 znaků",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Toto pole nesmí obsahovat tečky, čárky nebo mezery",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Toto pole nesmí obsahovat více než 64 znaků",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Synchronizační kanál",
+
+  // "file-download-link.restricted": "Restricted bitstream",
   // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
-
-
+  "file-download-link.restricted": "Restricted bitstream",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
-
-
+  "file-section.error.header": "Chyba při získávání souborů pro tento záznam",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
-  "footer.link.dspace": "software DSpace",
+  "footer.link.dspace": "DSpace software",
 
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
 
   // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Nastavení souborů cookie",
 
   // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Zásady ochrany osobních údajů",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Smlouva s koncovým uživatelem",
+
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Odeslat zpětnou vazbu",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
   // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
-
-  // "footer.link.end-user-agreement":"End User Agreement",
-  // TODO New key - Add a translation
-  "footer.link.end-user-agreement": "End User Agreement",
-
-
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Zapomenuté heslo",
 
-  // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.info": "Zadejte e-mailovou adresu přidruženou k účtu.",
 
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "E-mailová adresa *",
 
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Vyplňte prosím e-mailovou adresu",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Vyplňte prosím platnou e-mailovou adresu",
 
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.email.hint": "Na tuto adresu bude zaslán e-mail s dalšími pokyny.",
 
-  // "forgot-email.form.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
+  // "forgot-email.form.submit": "Reset password",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.submit": "Obnovit heslo",
 
-  // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
+  // "forgot-email.form.success.head": "Password reset email sent",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.success.head": "E-mail pro obnovení hesla odeslán",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.head": "Error when trying to register email",
-
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální adresu URL a další pokyny.",
 
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  // TODO Source message changed - Revise the translation
+  "forgot-email.form.error.head": "Chyba při pokusu o obnovení hesla",
 
+  // "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": "Při pokusu o obnovení hesla k účtu přiřazenému k následující e-mailové adrese došlo k chybě: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Zapomenuté heslo",
 
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "Zapomenuté heslo",
 
-  // "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.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "forgot-password.form.info": "Zadejte nové heslo do níže uvedeného pole a potvrďte jej opětovným zadáním do druhého pole.",
 
   // "forgot-password.form.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Zabezpečení",
 
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identifikace",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "E-mailová adresa: ",
 
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Heslo",
 
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Zadejte znovu pro ověření",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  // TODO Source message changed - Revise the translation
+  "forgot-password.form.error.empty-password": "Zadejte prosím heslo do níže uvedeného pole.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.matching-passwords": "Hesla se neshodují.",
 
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Chyba při pokusu o zadání nového hesla",
 
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "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": "Změna hesla byla úspěšná. Byli jste přihlášeni jako vytvořený uživatel.",
 
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "Obnovení hesla bylo dokončeno",
 
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Odeslat heslo",
 
-
-
-  // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
+  // "form.add": "Add more",
+  "form.add": "Přidat další",
 
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Klikněte zde pro přidání aktuálního záznamu a pro přidání dalšího",
 
   // "form.cancel": "Cancel",
   "form.cancel": "Zrušit",
 
   // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "Clear",
+  "form.clear": "Vymazat",
 
   // "form.clear-help": "Click here to remove the selected value",
-  // TODO New key - Add a translation
-  "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Klikněte zde pro odstranění vybrané hodnoty",
+
+  // "form.discard": "Discard",
+  "form.discard": "Vyřadit",
+
+  // "form.drag": "Drag",
+  "form.drag": "Přetáhnout",
 
   // "form.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "Edit",
+  "form.edit": "Upravit",
 
   // "form.edit-help": "Click here to edit the selected value",
-  // TODO New key - Add a translation
-  "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Klikněte zde pro úpravu vybrané hodnoty",
 
   // "form.first-name": "First name",
   "form.first-name": "Křestní jméno",
@@ -2408,933 +3132,1137 @@
   "form.group-collapse": "Sbalit",
 
   // "form.group-collapse-help": "Click here to collapse",
-  "form.group-collapse-help": "Kliknutím sem sbalíte",
+  "form.group-collapse-help": "Klikněte zde pro sbalení",
 
   // "form.group-expand": "Expand",
   "form.group-expand": "Rozbalit",
 
   // "form.group-expand-help": "Click here to expand and add more elements",
-  "form.group-expand-help": "Kliknutím sem rozbalíte a přidáte další prvky",
+  "form.group-expand-help": "Klikněte zde pro rozbalení a přidání dalších prvků",
 
   // "form.last-name": "Last name",
   "form.last-name": "Příjmení",
 
   // "form.loading": "Loading...",
-  "form.loading": "Načítá se...",
+  "form.loading": "Načítání...",
 
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
+  "form.lookup": "Vyhledat",
 
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Klikněte zde pro vyhledání existujícího vztahu",
 
   // "form.no-results": "No results found",
-  "form.no-results": "Nebyli nalezeny žádné výsledky",
+  "form.no-results": "Nebyly nalezeny žádné výsledky",
 
   // "form.no-value": "No value entered",
-  "form.no-value": "Nebyla zadána hodnota",
+  "form.no-value": "Nebyla zadána žádná hodnota",
+
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Email",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Jméno",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Zaindexováno v Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Instituce",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Příjmení",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
 
   // "form.remove": "Remove",
-  "form.remove": "Smazat",
+  "form.remove": "Odstranit",
 
   // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
+  "form.save": "Uložit",
 
   // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
+  "form.save-help": "Uložit změny",
 
   // "form.search": "Search",
   "form.search": "Hledat",
 
   // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Klikněte zde pro vyhledání existující korespondence",
+
+  // "form.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "form.submit": "Uložit",
+
+  // "form.create": "Create",
+  "form.create": "Vytvořit",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
   // TODO New key - Add a translation
-  "form.search-help": "Click here to look for an existing correspondence",
+  "form.number-picker.decrement": "Decrement {{field}}",
 
-  // "form.submit": "Submit",
-  "form.submit": "Odeslat",
+  // "form.number-picker.increment": "Increment {{field}}",
+  // TODO New key - Add a translation
+  "form.number-picker.increment": "Increment {{field}}",
 
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Přetáhněte záznam na novou pozici",
 
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Neposílat kopii",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Zpět",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Zpráva",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Zadejte prosím zprávu",
+
+  // "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": "Při této příležitosti můžete přehodnotit omezení přístupu k dokumentu, abyste nemuseli na tyto žádosti odpovídat. Pokud chcete požádat správce úložiště o zrušení těchto omezení, zaškrtněte prosím políčko níže.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Změnit na otevřený přístup",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Odeslat",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Předmět",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Zadejte prosím předmět zprávy",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Odeslat kopii",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Žádost o kopii dokumentu",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Přesměrujte mne na domovskou stránku",
+
+  // "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": "Pokud jste jedním z autorů dokumentu <a href='{{ url }}'>{{ name }}</a>, použijte prosím jednu z níže uvedených možností, abyste odpověděli na žádost uživatele.",
+
+  // "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": "Po výběru možnosti se zobrazí návrh e-mailové odpovědi, který můžete upravit.",
+
+  // "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": " Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Žádost o kopii dokumentu",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Došlo k chybě",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Žádost o kopii dokumentu",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "Tato zpráva bude zaslána žadateli. Požadovaný(é) dokument(y) bude(ou) přiložen(y).",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Úspěšně vyřízená žádost o záznam",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Stav systému",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Stav systému",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Informace",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Status",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Služba kontrolující stav systému je momentálně nedostupná.",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Kód statusu",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Databáze",
+
+  // "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",
+  // TODO New key - Add a translation
+  "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": "Application Backend",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Status",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Funkční",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Zjištěny problémy",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Zjištěny možné problémy",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Stav systému",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Nebyly zjištěny žádné problémy",
 
   // "home.description": "",
   "home.description": "",
 
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Domů",
 
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Domů",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Hledat v repozitáři...",
+
+  // "home.title": "Home",
+  "home.title": "Domů",
 
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Komunity v DSpace",
+  "home.top-level-communities.head": "Komunity",
 
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  "home.top-level-communities.help": "Vybráním komunity můžete prohlížet její kolekce.",
-
-
+  "home.top-level-communities.help": "Vyberte komunitu a procházejte její kolekce.",
 
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "Přečetl/a jsem si a souhlasím se smlouvou s koncovým uživatelem",
 
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Při přijímání dohody s koncovým uživatelem došlo k chybě",
 
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "Smlouva s koncovým uživatelem byla úspěšně aktualizována",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Smlouva s koncovým uživatelem",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Zrušit",
 
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Uložit",
 
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Smlouva s koncovým uživatelem",
 
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Smlouva s koncovým uživatelem",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "Česká republika",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Prohlášení o ochraně osobních údajů",
 
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Prohlášení o ochraně osobních údajů",
 
   // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Prohlášení o ochraně osobních údajů",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Zpětná vazba",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Zpětná vazba",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Zpětná vazba",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Děkujeme za zpětnou vazbu k systému DSpace. Vašich připomínek si vážíme!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Tato adresa bude použita pro následné vyřízení vaší zpětné vazby.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Odeslat zpětnou vazbu",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Komentáře",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Váš e-mail",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Zpětná vazba úspěšně odeslána!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Je vyžadována platná e-mailová adresa",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Je vyžadován komentář",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Stránka",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Stránka, která se týká vaší zpětné vazby",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
   // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
+  "info.coar-notify-support.title": "COAR Notify Support",
 
-
-
-  // "item.alerts.private": "This item is private",
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
   // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.alerts.private": "Tento záznam je nezobrazitelný",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Tento záznam byl stažen",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
   // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Pomocí tohoto editoru můžete zobrazit a měnit politiky záznamu a také měnit politiky jednotlivých součástí záznamu: svazků a souborů. Stručně řečeno, záznam je kontejnerem svazků a svazky jsou kontejnery souborů. Kontejnery mají obvykle zásady ADD/REMOVE/READ/WRITE, zatímco soubory mají pouze zásady READ/WRITE.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Upravit politiky záznamu",
 
-
-
-  // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
+  // "item.badge.private": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.badge.private": "Nedohledatelné",
 
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-
-
+  "item.badge.withdrawn": "Zrušeno",
 
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Svazek",
 
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  // TODO Source message changed - Revise the translation
+  "item.bitstreams.upload.bundle.placeholder": "Vyberte svazek nebo zadejte nový název svazku",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Vytvořit svazek",
 
   // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Tento záznam neobsahuje žádné svazky, do kterých by bylo možné nahrát soubor.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Zrušit",
 
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Přetáhnout soubor k nahrání",
 
   // "item.bitstreams.upload.item": "Item: ",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Záznam: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Úspěšně vytvořen nový svazek.",
 
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Vytvořit svazek",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Nahrávání se nezdařilo. Před dalším pokusem ověřte obsah.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-
-
+  "item.bitstreams.upload.title": "Nahrát soubor",
 
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Nahrát",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Aktuálně zobrazuje {{ amount }} souborů z {{ total }}.",
 
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Načíst všechny ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Načíst více",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "Svazek: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Zahodit",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Stáhnout",
 
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Přetáhnout",
 
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Upravit",
 
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Odstranit",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Tento záznam neobsahuje žádné soubory. Klikněte na tlačítko pro nahrání a nějaký vytvořte.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Akce",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Svazek",
 
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Popis",
 
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Formát",
 
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Název",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Undo'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Změny zahozeny",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Chyba při přesunu souborů",
 
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "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": "Vaše změny v souborech a svazcích tohoto záznamu byly uloženy.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Změny uloženy",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "Záznam, na které právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Chyba při odstraňování souboru.",
 
   // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  // TODO New key - Add a translation
-  "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": "Vaše změny odstranění souborů u tohoto záznamu byly uloženy.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Odstranění změn uloženo",
 
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Vrátit zpět",
 
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Uložit",
 
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-
-
+  "item.edit.bitstreams.upload-button": "Nahrát",
 
   // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Zrušit",
 
   // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Smazat",
 
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
-  // TODO New key - Add a translation
-  "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": "Jste si jisti, že má být tento záznam zcela odstraněn? Pozor: V současné době by nezůstala žádná poznámka.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  // TODO New key - Add a translation
-  "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Při mazání záznamu došlo k chybě",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Smazat záznam: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  // TODO New key - Add a translation
-  "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "Záznam byl odstraněn",
 
   // "item.edit.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
+  "item.edit.head": "Upravit záznam",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Upravit záznam",
 
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "K této kartě nemáte oprávnění",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Mapování do jiných kolekcí",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Upravit záznam - Mapování do jiných kolekcí",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Neznámý",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Čeká na registraci",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Čeká na rezervaci",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrováno",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Rezervováno",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Rezervováno (aktualizace ve frontě)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrováno (aktualizace ve frontě)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Čeká na aktualizaci a registraci",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Ve frontě na smazání",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Smazáno",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Čeká na vyřízení (nezaregistrováno)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Vydáno (nezaregistrováno)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrace nového nebo čekání na nové DOI",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Zaregistrujte DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Zaregistrujte nové DOI nebo čekající k registraci",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Níže zkontrolujte všechny identifikátory a metadata ve frontě. Zvolte \"Potvrdit\" pro pokračování v registraci DOI nebo \"Zrušit\" pro přerušení procesu.",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Potvrdit",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Zrušit",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI ve frontě úspěšně zaregistrováno.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Chyba při registraci DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "Toto DOI již bylo vydáno a bude zařazeno k online registraci",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Mapovat záznam do vybraných kolekcí",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Odebrat mapování záznamu pro vybrané kolekce",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Zrušit",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tuto záznam na jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Mapování do jiných kolekcí - mapovat záznam do kolekcí",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Záznam: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Zadejte prosím dotaz pro vyhledávání",
 
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "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": "Při mapování záznamu do {{amount}} kolekcí  došlo k chybám.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Chyby při mapování",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "Úspěšné mapování záznamu do {{amount}} kolekcí .",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapování dokončeno",
 
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "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": "Při odstraňování mapování do {{amount}} kolekcí  došlo k chybám.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Odstranění chyb při mapování",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Úspěšně odstraněno mapování záznamu do {{amount}} kolekcí .",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Odstranění mapování dokončeno",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Hledat kolekce...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Procházet mapované kolekce",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
-
-
+  "item.edit.item-mapper.tabs.map": "Mapovat nové kolekce",
 
   // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Přidat",
 
   // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Vyřadit",
+
+  // "item.edit.metadata.edit.language": "Edit language",
   // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.edit.language": "Edit language",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.value": "Edit value",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Potvrdit",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Přetažením změnit pořadí",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Upravit",
 
   // "item.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Odstranit",
 
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
+
+  // "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.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z příbuzné entity. Nemůže být zděděna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "Záznam aktuálně neobsahuje žádná metadata. Kliknutím na tlačítko Přidat začněte přidávat hodnotu metadat.",
 
   // "item.edit.metadata.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Upravit",
 
   // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Pole",
 
   // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Jazyk",
 
   // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Hodnota",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
   // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.metadatafield": "Edit field",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Při ověřování metadatového pole se vyskytla chyba",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Prosím, vyberte platné metadatové pole",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  // TODO Source message changed - Revise the translation
+  "item.edit.metadata.notifications.discarded.title": "Změny zahozeny",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "Došlo k chybě",
 
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "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": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Metadata neplatná",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  // TODO Source message changed - Revise the translation
+  "item.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat této záznamu byly uloženy.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadata uložena",
 
   // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Vrátit zpět",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Vrátit zpět příkaz",
 
   // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Uložit",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
   // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.authority.label": "Authority: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
 
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Pole",
 
   // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Jazyk",
 
   // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Hodnota",
 
+  // "item.edit.move.cancel": "Back",
+  // TODO Source message changed - Revise the translation
+  "item.edit.move.cancel": "Zpět",
 
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Uložit",
 
-  // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Vyřadit",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Vyberte kolekci, do které chcete tento záznam přesunout. Chcete-li omezit seznam zobrazených kolekcí, můžete do pole zadat vyhledávací dotaz.",
 
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO New key - Add a translation
-  "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Při pokusu o přesun záznamu došlo k chybě",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Přesunout záznam: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Zdědit politiky",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Zdědit výchozí politiky cílové kolekce",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
   // TODO New key - Add a translation
-  "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
 
   // "item.edit.move.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
+  "item.edit.move.move": "Přesunout",
 
   // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Přesouvám...",
 
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
-  // TODO New key - Add a translation
-  "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Zadejte vyhledávací dotaz pro hledání kolekcí",
 
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO New key - Add a translation
-  "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "Záznam byl úspěšně přesunut",
 
   // "item.edit.move.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
-
-
+  "item.edit.move.title": "Přesunout záznam",
 
   // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Zrušit",
 
-  // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.confirm": "Učinit nedohledatelným",
 
-  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.description": "Jste si jisti, že by tento záznam neměl být v archivu objeven?",
 
-  // "item.edit.private.error": "An error occurred while making the item private",
-  // TODO New key - Add a translation
-  "item.edit.private.error": "An error occurred while making the item private",
-
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item private: {{ id }}",
-
-  // "item.edit.private.success": "The item is now private",
-  // TODO New key - Add a translation
-  "item.edit.private.success": "The item is now private",
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.error": "Při změně stavu záznamu na nedohledatelný došlo k chybě",
 
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Změnit stav záznamu na nedohledatelný: {{ id }}",
 
+  // "item.edit.private.success": "The item is now non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.private.success": "Záznam je nyní nedohledatelný",
 
   // "item.edit.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Zrušit",
 
-  // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
+  // "item.edit.public.confirm": "Make it discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.confirm": "Učinit dohledatelným",
 
-  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  // TODO New key - Add a translation
-  "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.description": "Jste si jisti, že by tento záznam měl být v archivu dohledatelný?",
 
-  // "item.edit.public.error": "An error occurred while making the item public",
-  // TODO New key - Add a translation
-  "item.edit.public.error": "An error occurred while making the item public",
-
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item public: {{ id }}",
-
-  // "item.edit.public.success": "The item is now public",
-  // TODO New key - Add a translation
-  "item.edit.public.success": "The item is now public",
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.error": "Při změně záznamu na dohledatelnou došlo k chybě",
 
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Učinit záznam dohledatelným: {{ id }}",
 
+  // "item.edit.public.success": "The item is now discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.public.success": "Záznam je nyní dohledatelný",
 
   // "item.edit.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Zrušit",
 
   // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Obnovit",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Určitě má být tento záznam znovu zařazen do archivu?",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Při obnovování záznamu došlo k chybě",
 
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Obnovit záznam: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.success": "The item was reinstated successfully",
-
-
+  "item.edit.reinstate.success": "Záznam byl úspěšně obnoven",
 
   // "item.edit.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Vyřadit",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Přidat",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Odstranit",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Vrátit změny",
 
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "Žádné vztahy",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Změny vyřazeny",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "Chyba při úpravě vztahů",
 
   // "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",
-  // TODO New key - Add a translation
-  "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou vyřazeny, aby se zabránilo konfliktům",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Vaše změny vztahů tohoto záznamu byly uloženy.",
 
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Vztahy uloženy",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Vrátit zpět",
 
   // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Uložit",
 
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-
+  "item.edit.relationships.no-entity-type": "Přidat metadata 'dspace.entity.type' pro povolení vztahů pro tuto záznam",
 
+  // "item.edit.return": "Back",
+  "item.edit.return": "Zpět",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Soubor",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Úprava záznamu - soubor",
 
   // "item.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Kurátorovat",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Úprava záznamu - Kurátorovat",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Kurátorovat záznam: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Kontrola přístupu",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Úprava záznamu - Kontrola přístupu",
 
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO New key - Add a translation
   "item.edit.tabs.metadata.head": "Metadata",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO New key - Add a translation
-  "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Úprava záznamu - Metadata",
 
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Vztahy",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Úprava záznamu - Vztahy",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Autorizace...",
 
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Upravit zásady autorizace záznamu",
 
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Trvale odstranit",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Úplně vymazat záznam",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Mapované kolekce",
 
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Spravovat mapované kolekce",
 
   // "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 this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Přesunout...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Přesunout záznam do jiné kolekce",
 
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.button": "Make it private...",
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.private.button": "Učinit nedohledatelným...",
 
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.private.label": "Make item private",
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.private.label": "Učinit záznam nedohledatelným",
 
-  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.public.button": "Učinit dohledatelným...",
 
-  // "item.edit.tabs.status.buttons.public.label": "Make item public",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.public.label": "Make item public",
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  // TODO Source message changed - Revise the translation
+  "item.edit.tabs.status.buttons.public.label": "Učinit záznam dohledatelným",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Obnovit...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Obnovit záznam do repozitáře",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Nejste oprávněni provést tuto akci",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Odstranit...",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Odstranit záznam z repozitáře",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Vítejte na stránce pro správu záznamů. Odtud můžete záznam stáhnout, obnovit, přesunout nebo odstranit. Na ostatních záložkách můžete také aktualizovat nebo přidávat nová metadata / bitové toky.",
 
   // "item.edit.tabs.status.head": "Status",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.head": "Status",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.labels.handle": "Handle",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "Položka Internal ID",
 
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Stránka záznamu",
 
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Poslední úprava",
 
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Úprava záznamu - Status",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Historie verzí",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Úprava záznamu - Historie verzí",
 
   // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  // TODO New key - Add a translation
-  "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": "V tomto uživatelském rozhraní zatím není možné upravovat nebo přidávat nové verze.",
 
   // "item.edit.tabs.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Zobrazit záznam",
 
   // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
-
-
+  "item.edit.tabs.view.title": "Úprava záznamu - zobrazení",
 
   // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Zrušit",
 
   // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Potvrdit",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Jste si jisti, že by tento záznam měl být odebrán z archivu?",
 
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Při odebírání záznamu došlo k chybě",
 
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Odebrat záznam: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.success": "The item was withdrawn successfully",
-
+  "item.edit.withdraw.success": "Záznam byl úspěšně odebrán",
 
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Zpět",
 
   // "item.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "item.listelement.badge": "Item",
+  "item.listelement.badge": "Záznam",
 
   // "item.page.description": "Description",
-  // TODO New key - Add a translation
-  "item.page.description": "Description",
+  "item.page.description": "Popis",
 
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN časopisu",
 
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Název časopisu",
 
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
+  "item.page.publisher": "Vydavatel",
 
   // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
-  "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Záznam: ",
 
   // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Název svazku",
 
   // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Výsleky vyhledávání",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "Hledat",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Zobrazit více",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Sbalit",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
   // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
-  // "item.search.title": "DSpace Angular :: Item Search",
+  // "item.qa-event-notification-info.check.button": "View",
   // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
+  "item.qa-event-notification-info.check.button": "View",
 
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Smazat příkaz k supervizi",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Jste si jistí, že chcete smazat příkaz k supervizi?",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Zrušit",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Smazat",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Úspěšně smazán příkaz k supervizi \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervizován:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu supervize",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Abstrakt",
@@ -3343,339 +4271,696 @@
   "item.page.author": "Autor",
 
   // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
+  "item.page.citation": "Citace",
 
   // "item.page.collections": "Collections",
   "item.page.collections": "Kolekce",
 
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Načítání...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Načíst další",
+
   // "item.page.date": "Date",
   "item.page.date": "Datum",
 
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
+  "item.page.edit": "Upravit tento záznam",
 
   // "item.page.files": "Files",
   "item.page.files": "Soubory",
 
   // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Popis:",
 
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Stáhnout",
 
   // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Formát:",
 
   // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Název:",
 
   // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Velikost:",
 
   // "item.page.journal.search.title": "Articles in this journal",
-  // TODO New key - Add a translation
-  "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Úplný záznam",
 
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Minimální záznam",
+  "item.page.link.simple": "Jednoduchý záznam",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Otevřít stránku nastavení ORCID",
 
   // "item.page.person.search.title": "Articles by this author",
-  // TODO New key - Add a translation
-  "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Články tohoto autora",
 
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Zobrazit {{ amount }} více",
 
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Skrýt poslední {{ amount }}",
 
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Publikace",
 
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Publikace",
 
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autoři",
 
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Výzkumné projekty",
 
   // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
+  "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
 
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Zobrazit více",
 
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Sbalit",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.bitstreams.primary": "Primary",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "Původní svazek",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "Licence svazku",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Zpět",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "Vytvořit novou verzi",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
   // TODO New key - Add a translation
-  "item.page.filesection.license.bundle": "License bundle",
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí právě probíhá zadání nové verze.",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Prohlásit",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Prohlásit tento záznam za profilovou",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  // TODO New key - Add a translation
+  "item.page.image.alt.ROR": "ROR logo",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identifikátor:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autoři:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Datum vydání:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Abstrakt:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Další identifikátor:",
 
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Jazyk:",
 
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Témata:",
 
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Název:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Typ:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Číslo",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "Ročník",
+
+  // "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": "Identifikátor:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "Časopis nebo seriál",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Nakladatel:",
 
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Příjmení:",
 
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Jméno:",
 
   // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
 
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Financující subjekt:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Identifikátor financujícího subjektu:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "Identifikátor zdroje financování:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Akronym:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Jurisdikce:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Tok finančních prostředků:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  // TODO New key - Add a translation
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  // TODO New key - Add a translation
+  "item.preview.organization.address.addressCountry": "Country",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  // TODO New key - Add a translation
+  "item.preview.organization.foundingDate": "Founding Date",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  // TODO New key - Add a translation
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  // TODO New key - Add a translation
+  "item.preview.organization.legalName": "Legal Name",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Potvrdit vybrané",
 
   // "item.select.empty": "No items to show",
+  "item.select.empty": "Žádné záznamy k zobrazení",
+
+  // "item.select.table.selected": "Selected items",
   // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
+  "item.select.table.selected": "Selected items",
+
+  // "item.select.table.select": "Select item",
+  // TODO New key - Add a translation
+  "item.select.table.select": "Select item",
+
+  // "item.select.table.deselect": "Deselect item",
+  // TODO New key - Add a translation
+  "item.select.table.deselect": "Deselect item",
 
   // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
+  "item.select.table.author": "Autor",
 
   // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Kolekce",
 
   // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "Title",
-
+  "item.select.table.title": "Název",
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Pro tento záznam zatím neexistují žádné další verze.",
 
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
+  "item.version.history.head": "Historie verzí",
 
-  // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
+  // "item.version.history.return": "Back",
+  // TODO Source message changed - Revise the translation
+  "item.version.history.return": "Zpět",
 
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Vybraná verze",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Právě si prohlížíte verzi {{version}} záznamu.",
 
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Verze",
 
   // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
-  "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Záznam",
 
   // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Upravit",
 
   // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
-  "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Datum",
 
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Souhrn",
 
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Položka pracovního prostoru",
 
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Záznam ve workflow",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Akce",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Upravit záznam pracovního prostoru",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Upravit souhrn",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Uložit úpravy souhrnu",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Vyřadit souhrnné úpravy",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Vytvořit novou verzi z této verze",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Smazat verzi",
+
+  // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
 
   // "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": "Toto není nejnovější verze tohoto záznamu. Nejnovější verzi naleznete <a href='{{destination}}'>zde</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nová verze",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
   // TODO New key - Add a translation
-  "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
 
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
 
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Vytvořit novou verzi pro tento záznam",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "počínaje verzí {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Vytvořit",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Vytvořit novou verzi",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Zrušit",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Nevytvářet novou verzi",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Souhrn",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Vložit souhrn nové verze",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Vytváření nové verze...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "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": "Vytváří se nová verze. To může nějakou dobu trvat, pokud má záznam mnoho vztahů.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Byla vytvořena nová verze s číslem verze {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "Nová verze nebyla vytvořena",
+
+  // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Smazat verzi",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Chcete smazat verzi {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Smazat",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Smazat tuto verzi",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Zrušit",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Nemažte tuto verzi",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "Verze číslo {{version}} byla odstraněna",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "Verze číslo {{version}} nebyla odstraněna",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Souhrn verze číslo {{version}} byl změněn",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "Souhrn verze číslo {{version}} nebyl změněn",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Přidat",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Vyřadit",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Potvrdit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Změnit pořadí přetažením",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Upravit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Odstranit",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Vrátit změny",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "Šablona záznamu aktuálně neobsahuje žádná metadata. Kliknutím na Přidat začnete vyplňovat hodnotu metadat.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Upravit",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Pole",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Jazyk",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Hodnota",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Při ověřování metadatového pole se vyskytla chyba",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Prosím zvolte platné metadatové pole",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Chcete-li obnovit své změny, klikněte na tlačítko 'Zpět'.",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Změny byly zahozeny",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Vyskytla se chyba",
+
+  // "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.content": "Vaše změny nebyly uloženy. Před uložením se ujistěte, že všechna pole jsou platná.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Neplatná metadata",
+
+  // "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.content": "Šablona záznamu, na které pracujete, byla změněna jiným uživatelem. Vaše změny byly zahozeny, aby se předešlo chybám.",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Vaše změny v šabloně metadat tohoto záznamu byly uloženy.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uloženy",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Vrátit zpět",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Vrátit zpět příkaz",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Uložit",
 
   // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Časopis",
 
   // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
+  "journal.page.description": "Popis",
 
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Upravit tento záznam",
 
   // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Šéfredaktor",
 
   // "journal.page.issn": "ISSN",
-  // TODO New key - Add a translation
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Vydavatel",
 
   // "journal.page.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Časopis: ",
 
   // "journal.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal.search.results.head": "Journal Search Results",
-
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  // TODO New key - Add a translation
-  "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.results.head": "Výsledky vyhledávání časopisu",
 
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Výsledky vyhledávání časopisu",
 
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Vyhledávání časopisu",
 
   // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Číslo časopisu",
 
   // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
+  "journalissue.page.description": "Popis",
 
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Upravit tento záznam",
 
   // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Datum vydání",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN časopisu",
 
   // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Název časopisu",
 
   // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Klíčová slova",
 
   // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
+  "journalissue.page.number": "Číslo",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Číslo časopisu: ",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
   // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
-
-
+  "journalissue.search.results.head": "Journal Issue Search Results",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Ročník časopisu",
 
   // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Popis",
 
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Upravit tento záznam",
 
   // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Datum vydání",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Ročník časopisu: ",
 
   // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Ročník",
+
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
   // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
+  "journalvolume.search.results.head": "Journal Volume Search Results",
 
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Média dokumentů",
 
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Dokument: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Trvalý odkaz: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Číslo: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Popis: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Použijte celou obrazovku pro lepší zobrazení.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Média obrázku",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Obrázek: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Trvalý odkaz: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Číslo: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Popis: ",
 
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Načítá se soubor...",
 
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Načítají se soubory...",
 
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Načítají se záznamy...",
 
   // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Načítá se stránka...",
 
   // "loading.collection": "Loading collection...",
   "loading.collection": "Načítá se kolekce...",
 
   // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
+  "loading.collections": "Načítají se kolekce...",
 
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
+  "loading.content-source": "Načítá se zdroj obsahu...",
 
   // "loading.community": "Loading community...",
   "loading.community": "Načítá se komunita...",
@@ -3687,34 +4972,29 @@
   "loading.item": "Načítá se záznam...",
 
   // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
+  "loading.items": "Načítají se záznamy...",
 
   // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Načítají se záznamy...",
 
   // "loading.objects": "Loading...",
   "loading.objects": "Načítá se...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
-  "loading.recent-submissions": "Načítají se poslední příspěvky...",
+  "loading.recent-submissions": "Načítají se nejnovější příspěvky...",
 
   // "loading.search-results": "Loading search results...",
-  "loading.search-results": "Načítají se výsledky hledání...",
+  "loading.search-results": "Načítají se výsledky vyhledávání...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Načítají se subkolekce...",
+  "loading.sub-collections": "Načítají se dílčí kolekce...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  // TODO New key - Add a translation
-  "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Načítají se dílčí komunity...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "E-mailová adresa",
 
@@ -3722,33 +5002,31 @@
   "login.form.forgot-password": "Zapomněli jste své heslo?",
 
   // "login.form.header": "Please log in to DSpace",
-  "login.form.header": "Prosím, přihlaste se do DSpace",
+  "login.form.header": "Přihlaste se prosím do DSpace",
 
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Nový uživatel? Zaregistrujte se kliknutím sem.",
+  "login.form.new-user": "Jste nový uživatel? Klikněte zde pro registraci.",
 
-  // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Přihlásit se pomocí OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Přihlásit se pomocí ORCID",
 
   // "login.form.password": "Password",
   "login.form.password": "Heslo",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Přihlásit se pomocí Shibboleth",
 
   // "login.form.submit": "Log in",
   "login.form.submit": "Přihlásit se",
 
   // "login.title": "Login",
-  "login.title": "Přihlásit se",
+  "login.title": "Přihlášení",
 
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-
-
+  "login.breadcrumbs": "Přihlášení",
 
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Odhlásit se z DSpace",
@@ -3757,559 +5035,807 @@
   "logout.form.submit": "Odhlásit se",
 
   // "logout.title": "Logout",
-  "logout.title": "Odhlásit se",
+  "logout.title": "Odhlášení",
 
-
-
-  // "menu.header.admin": "Admin",
+  // "menu.header.nav.description": "Admin navigation bar",
   // TODO New key - Add a translation
-  "menu.header.admin": "Admin",
+  "menu.header.nav.description": "Admin navigation bar",
+
+  // "menu.header.admin": "Management",
+  // TODO Source message changed - Revise the translation
+  "menu.header.admin": "Management",
 
   // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
-
+  "menu.header.image.logo": "Logo úložiště",
 
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Management menu",
 
   // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Řízení přístupu",
 
   // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Oprávnění",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Hromadná správa přístupu",
 
   // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Skupiny",
 
   // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Lidé",
+
+  // "menu.section.reports": "Reports",
   // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
+  "menu.section.reports": "Reports",
 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
 
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-
-
+  "menu.section.admin_search": "Administrátorské vyhledávání",
 
   // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Tato komunita",
 
   // "menu.section.browse_community_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Podle autora",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Podle data vydání",
 
   // "menu.section.browse_community_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Podle názvu",
 
   // "menu.section.browse_global": "All of DSpace",
-  // TODO New key - Add a translation
-  "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Procházet podle",
 
   // "menu.section.browse_global_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Podle autora",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Podle data vydání",
 
   // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Podle předmětu",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Podle předmětové kategorie",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
   // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
 
   // "menu.section.browse_global_by_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Podle názvu",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-
-
+  "menu.section.browse_global_communities_and_collections": "Komunity & kolekce",
 
   // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Ovládací panel",
 
   // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
-
-
+  "menu.section.curation_task": "Kurátorská úloha",
 
   // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
+  "menu.section.edit": "Upravit",
 
   // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Kolekce",
 
   // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Komunita",
 
   // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
-
-
+  "menu.section.edit_item": "Záznam",
 
   // "menu.section.export": "Export",
-  // TODO New key - Add a translation
   "menu.section.export": "Export",
 
   // "menu.section.export_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Kolekce",
 
   // "menu.section.export_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
+  "menu.section.export_community": "Komunita",
 
   // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
+  "menu.section.export_item": "Záznam",
 
   // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
 
-
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Dávkový export (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Sekce menu Řízení přístupu",
+
+  // "menu.section.icon.reports": "Reports menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Sekce menu Administrátorské vyhledávání",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Sekce menu Ovládací panel",
 
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_task": "Curation Task menu section",
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Sekce menu Kurátorská úloha",
 
   // "menu.section.icon.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Sekce menu Upravit",
 
   // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Exportovat sekci menu",
 
   // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Najít sekci menu",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Kontrola stavu sekce menu",
 
   // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Importovat sekci menu",
 
   // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Nová sekce menu",
 
   // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Připnout postranní panel",
 
-  // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
+  // "menu.section.icon.processes": "Processes Health",
+  // TODO Source message changed - Revise the translation
+  "menu.section.icon.processes": "zdravotní stav procesů",
 
   // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Sekce menu Registry",
 
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Sekce menu Statistická úloha",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Sekce menu pro administrativní workflow",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Odepnout postranní panel",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
   // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
-
-
+  "menu.section.icon.notifications": "Notifications menu section",
 
   // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
+  "menu.section.import": "Importovat",
 
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Dávkový import (ZIP)",
 
   // "menu.section.import_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.import_metadata": "Metadata",
 
-
-
   // "menu.section.new": "New",
-  // TODO New key - Add a translation
-  "menu.section.new": "New",
+  "menu.section.new": "Nový",
 
   // "menu.section.new_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Kolekce",
 
   // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
+  "menu.section.new_community": "Komunita",
 
   // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
+  "menu.section.new_item": "Záznam",
 
   // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Verze záznamu",
 
   // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Proces",
+
+  // "menu.section.notifications": "Notifications",
   // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
+  "menu.section.notifications": "Notifications",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  // TODO New key - Add a translation
+  "menu.section.quality-assurance": "Quality Assurance",
 
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  // TODO New key - Add a translation
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Připnout postranní panel",
 
   // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
-
-
+  "menu.section.unpin": "Odepnout postranní panel",
 
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-
+  "menu.section.processes": "Procesy",
 
+  // "menu.section.health": "Health",
+  "menu.section.health": "Stav systému",
 
   // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
+  "menu.section.registries": "Rejstřík",
 
   // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Formát",
 
   // "menu.section.registries_metadata": "Metadata",
-  // TODO New key - Add a translation
   "menu.section.registries_metadata": "Metadata",
 
-
-
   // "menu.section.statistics": "Statistics",
-  // TODO New key - Add a translation
-  "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Statistika",
 
   // "menu.section.statistics_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
-
-
+  "menu.section.statistics_task": "Statistická úloha",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Přepnout sekci Řízení přístupu",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
   // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Přepnout sekci ovládacího panelu",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Přepnout sekci Kurátorská úloha",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Přepnout sekci Úpravy",
 
   // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Přepnout sekci Export",
 
   // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Přepnout sekci Najít",
 
   // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Přepnout sekci Import",
 
   // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Přepnout sekci Nová",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Přepnout sekci Rejstříky",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-
+  "menu.section.toggle.statistics_task": "Přepnout sekci Statistická úloha",
 
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Spravovat workflow",
 
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Exportovat výsledky vyhledávání jako CSV",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "Export byl úspěšně spuštěn",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Spuštění exportu se nezdařilo",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Můj DSpace",
 
   // "mydspace.description": "",
-  // TODO New key - Add a translation
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  // TODO New key - Add a translation
-  "mydspace.general.text-here": "here",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  // TODO New key - Add a translation
-  "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu vkladateli záznamu.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Zde vložte svou zprávu...",
 
   // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Skrýt zprávu",
 
   // "mydspace.messages.mark-as-read": "Mark as read",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Označit jako přečtené",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Označit jako nepřečtené",
 
   // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Žádný obsah.",
 
   // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Zatím žádné zprávy.",
 
   // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Odeslat",
 
   // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Zobrazit zprávu",
 
   // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Předmět...",
 
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-  // TODO New key - Add a translation
-  "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Zvolte tuto možnost, chcete-li odeslat zprávu správci.",
 
   // "mydspace.messages.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Zprávy",
 
   // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
+  "mydspace.messages.to": "Komu",
 
   // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Nový příspěvek",
 
   // "mydspace.new-submission-external": "Import metadata from external source",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Importovat metadata z externího zdroje",
 
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Váš příspěvek",
 
   // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Žádný abstrakt",
 
   // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Žádní autoři",
 
   // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Žádné datum",
 
   // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Žádné soubory",
 
   // "mydspace.results.no-results": "There were no items to show",
-  // TODO New key - Add a translation
-  "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Nebyly zde žádné záznamy k zobrazení",
 
   // "mydspace.results.no-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Žádný název",
 
-  // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
+  // TODO Source message changed - Revise the translation
+  "mydspace.results.no-uri": "Žádné Uri",
 
-  // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
+  "mydspace.search-form.placeholder": "Hledat v mém dspace...",
 
-  // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workflow": "Workflow tasks",
+  // TODO Source message changed - Revise the translation
+  "mydspace.show.workflow": "Úlohy workflow",
+
+  // "mydspace.show.workspace": "Your submissions",
+  // TODO Source message changed - Revise the translation
+  "mydspace.show.workspace": "Váš příspěvek",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
 
   // "mydspace.status.mydspaceArchived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivováno",
 
   // "mydspace.status.mydspaceValidation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Ověřování",
 
   // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Čeká na kontrolu",
 
   // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
   "mydspace.status.mydspaceWorkflow": "Workflow",
 
   // "mydspace.status.mydspaceWorkspace": "Workspace",
-  // TODO New key - Add a translation
-  "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Pracovní prostor",
 
   // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
+  "mydspace.title": "Můj DSpace",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Chyba při vytváření nového pracovního prostoru. Před dalším pokusem ověřte nahraný obsah.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "Nezpracovatelný soubor. Zjištěno příliš mnoho záznamů, ale povolen pouze jeden pro soubor",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "Nezpracovatelný požadavek. Je povolen pouze jeden soubor.",
 
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
-
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} nově vytvořené záznamy pracovního prostoru.",
 
   // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Zobrazit",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
   // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
 
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
 
   // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Celý repozitář",
 
   // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Podle komunity",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Zobrazení nápovědy a tipů",
 
   // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
+  "nav.language": "Přepínání jazyků",
 
   // "nav.login": "Log In",
   "nav.login": "Přihlásit se",
 
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
+  "nav.user-profile-menu-and-logout": "Menu uživatelského profilu a odhlášení",
+
   // "nav.logout": "Log Out",
-  "nav.logout": "Odhlásit se",
+  "nav.logout": "Menu uživatelského profilu a odhlášení",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Hlavní navigační panel",
 
   // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Můj DSpace",
 
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
+  "nav.profile": "Profil",
 
   // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
+  "nav.search": "Hledat",
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Vyhledat",
 
   // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Statistika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Přestat simulovat jiného uživatele",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Nastavení notifikací",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Přepnout navigaci",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Panel uživatelského profilu ",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Záznam",
+
+  // "quality-assurance.title": "Quality Assurance",
   // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
+  "quality-assurance.title": "Quality Assurance",
 
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
 
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  // TODO New key - Add a translation
+  "quality-assurance.source.description": "Below you can see all the notification's sources.",
+
+  // "quality-assurance.topics": "Current Topics",
+  // TODO New key - Add a translation
+  "quality-assurance.topics": "Current Topics",
+
+  // "quality-assurance.source": "Current Sources",
+  // TODO New key - Add a translation
+  "quality-assurance.source": "Current Sources",
+
+  // "quality-assurance.table.topic": "Topic",
+  // TODO New key - Add a translation
+  "quality-assurance.table.topic": "Topic",
+
+  // "quality-assurance.table.source": "Source",
+  // TODO New key - Add a translation
+  "quality-assurance.table.source": "Source",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  // TODO New key - Add a translation
+  "quality-assurance.table.last-event": "Last Event",
+
+  // "quality-assurance.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "quality-assurance.table.actions": "Actions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noTopics": "No topics found.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noSource": "No sources found.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  // TODO New key - Add a translation
+  "notifications.events.title": "Quality Assurance Suggestions",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  // TODO New key - Add a translation
+  "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  // TODO New key - Add a translation
+  "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+
+  // "quality-assurance.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "quality-assurance.loading": "Loading ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  // TODO New key - Add a translation
+  "quality-assurance.events.topic": "Topic:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  // TODO New key - Add a translation
+  "quality-assurance.noEvents": "No suggestions found.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.trust": "Trust",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.publication": "Publication",
+
+  // "quality-assurance.event.table.details": "Details",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.details": "Details",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.project-details": "Project details",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.actions": "Actions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.accept": "Accept suggestion",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.ignore": "Ignore suggestion",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "Delete",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.reject": "Reject suggestion",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.import": "Import project and accept suggestion",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.pidtype": "PID Type:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.pidvalue": "PID Value:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.subjectValue": "Subject Value:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.abstract": "Abstract:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.project": "Project title:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.acronym": "Acronym:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.code": "Code:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.funder": "Funder:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.fundingProgram": "Funding program:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back": "Back to topics",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.less": "Show less",
+
+  // "quality-assurance.event.table.more": "Show more",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.more": "Show more",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.found": "Bound to the local record:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.notFound": "No local record found",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.sure": "Are you sure?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  // TODO New key - Add a translation
+  "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.cancel": "Cancel",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.title": "Choose a project to bound",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.publication": "Publication:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.select": "Project search",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.search": "Search",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.clear": "Clear",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.cancel": "Cancel",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.bound": "Bound project",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.remove": "Remove",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.modal.project.notFound": "No project found.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  // TODO New key - Add a translation
+  "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+
+  // "quality-assurance.event.reason": "Reason",
+  // TODO New key - Add a translation
+  "quality-assurance.event.reason": "Reason",
 
   // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Organizační jednotka",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Bez názvu",
 
   // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
+  "orgunit.page.city": "Město",
 
   // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
+  "orgunit.page.country": "Stát",
 
   // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Datum založení.",
 
   // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
+  "orgunit.page.description": "Popis",
 
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Upravit tento záznam",
 
   // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Organizační jednotka: ",
+
+  // "orgunit.page.ror": "ROR Identifier",
   // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
-
+  "orgunit.page.ror": "ROR Identifier",
 
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Možnosti stránkování",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Výsledků na stránku",
@@ -4318,935 +5844,1131 @@
   "pagination.showing.detail": "{{ range }} z {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Zobrazují se záznamy ",
+  "pagination.showing.label": "Nyní se zobrazuje ",
 
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Seřazení",
-
-
+  "pagination.sort-direction": "Možnosti řazení",
 
   // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
+  "person.listelement.badge": "Osoba",
 
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "Nebylo nalezeno žádné jméno",
 
   // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Datum narození",
 
   // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
+  "person.page.edit": "Upravit tento záznam",
 
   // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
+  "person.page.email": "Emailová adresa",
 
   // "person.page.firstname": "First Name",
-  // TODO New key - Add a translation
-  "person.page.firstname": "First Name",
+  "person.page.firstname": "Křestní jméno",
 
   // "person.page.jobtitle": "Job Title",
-  // TODO New key - Add a translation
-  "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Název pracovní pozice",
 
   // "person.page.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
+  "person.page.lastname": "Příjmení",
+
+  // "person.page.name": "Name",
+  "person.page.name": "Jméno",
 
   // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Zobrazit všechna metadata",
 
   // "person.page.orcid": "ORCID",
-  // TODO New key - Add a translation
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  // TODO New key - Add a translation
-  "person.page.staffid": "Staff ID",
+  "person.page.staffid": "ID zaměstnance",
 
   // "person.page.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Osoba: ",
 
   // "person.search.results.head": "Person Search Results",
-  // TODO New key - Add a translation
-  "person.search.results.head": "Person Search Results",
-
-  // "person.search.title": "DSpace Angular :: Person Search",
-  // TODO New key - Add a translation
-  "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.results.head": "Výsledky vyhledávání osob",
 
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Výsledky vyhledávání osob",
 
+  // "person.search.title": "Person Search",
+  "person.search.title": "Vyledatávání osob",
 
   // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parametry",
+
+  // "process.new.select-parameter": "Select parameter",
   // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
+  "process.new.select-parameter": "Select parameter",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  // TODO New key - Add a translation
+  "process.new.add-parameter": "Add a parameter...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  // TODO New key - Add a translation
+  "process.new.delete-parameter": "Delete parameter",
+
+  // "process.new.parameter.label": "Parameter value",
+  // TODO New key - Add a translation
+  "process.new.parameter.label": "Parameter value",
 
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
+  "process.new.cancel": "Zrušit",
 
-  // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
+  // "process.new.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "process.new.submit": "Uložit",
 
   // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
-  "process.new.select-script": "Script",
+  "process.new.select-script": "Skript",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  // TODO New key - Add a translation
-  "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Vyberte skript...",
 
   // "process.new.select-script.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Je vyžadován skript",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Vyberte soubor...",
 
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Vyberte prosím soubor",
 
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Hodnota parametru je povinná",
 
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "hodnota",
 
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "soubor",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Následující parametry jsou povinné, ale stále chybí:",
 
   // "process.new.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Proběhlo úspěšně",
 
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "Proces byl úspěšně vytvořen",
 
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Chyba",
 
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Při vytváření tohoto procesu došlo k chybě",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "Soubor přesáhl povolený limit na velikost souboru",
 
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
+  "process.new.header": "Vytvořit nový proces",
 
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
+  "process.new.title": "Vytvořit nový proces",
 
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Vytvořit nový proces",
 
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Argumenty",
 
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Tento proces neobsahuje žádné argumenty",
 
-  // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments": "Arguments",
+  // "process.detail.back": "Back",
+  "process.detail.back": "Zpět",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty": "This process doesn't contain any arguments",
-
-  // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back": "Back",
-
-  // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output": "Process Output",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "Výstup procesu",
 
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Získat výstup procesu",
 
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Načítá se",
 
   // "process.detail.logs.none": "This process has no output",
-  // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Tento proces nemá žádný výstup",
 
-  // "process.detail.output-files" : "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files": "Output Files",
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "Výstupní soubory",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  // TODO New key - Add a translation
-  "process.detail.output-files.empty": "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Tento proces neobsahuje žádné výstupní soubory",
 
-  // "process.detail.script" : "Script",
-  // TODO New key - Add a translation
-  "process.detail.script": "Script",
+  // "process.detail.script": "Script",
+  "process.detail.script": "Skript",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title": "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Proces: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time": "Start time",
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Čas zahájení",
 
-  // "process.detail.end-time" : "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time": "Finish time",
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Čas zakončení",
 
-  // "process.detail.status" : "Status",
-  // TODO New key - Add a translation
+  // "process.detail.status": "Status",
   "process.detail.status": "Status",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "Vytvořit podobný proces",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Akce",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Smazat proces",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Smazat proces",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Určitě chcete smazat aktuální proces?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Zrušit",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Smazat proces",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Proces byl úspěšně smazán.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Při mazání procesu se něco pokazilo",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
   // TODO New key - Add a translation
-  "process.detail.create": "Create similar process",
+  "process.detail.refreshing": "Auto-refreshing…",
 
-
-
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.completed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.overview.table.finish": "Finish time",
+  "process.overview.table.completed.info": "Finish time (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.completed.title": "Succeeded processes",
   // TODO New key - Add a translation
-  "process.overview.table.id": "Process ID",
+  "process.overview.table.completed.title": "Succeeded processes",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.empty": "No matching processes found.",
   // TODO New key - Add a translation
-  "process.overview.table.name": "Name",
+  "process.overview.table.empty": "No matching processes found.",
 
-  // "process.overview.table.start" : "Start time",
+  // "process.overview.table.failed.info": "Finish time (UTC)",
   // TODO New key - Add a translation
-  "process.overview.table.start": "Start time",
+  "process.overview.table.failed.info": "Finish time (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.failed.title": "Failed processes",
   // TODO New key - Add a translation
+  "process.overview.table.failed.title": "Failed processes",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Čas ukončení (UTC)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID procesu",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "Název",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  // TODO New key - Add a translation
+  "process.overview.table.running.title": "Running processes",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Čas zahájení (UTC)",
+
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user": "User",
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Uživatel",
 
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
+  "process.overview.title": "Přehled procesů",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Přehled procesů",
 
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
+  "process.overview.new": "Nový",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Akce",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Smazat {{count}} procesů",
+
+  // "process.overview.delete-process": "Delete process",
+  // TODO New key - Add a translation
+  "process.overview.delete-process": "Delete process",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Zrušit výběr mazá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": "Smazává se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Určitě chcete smazat {{count}} procesů",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Smazat procesy",
+
+  // "process.overview.unknown.user": "Unknown",
+  // TODO New key - Add a translation
+  "process.overview.unknown.user": "Unknown",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Chyba při mazání procesu",
+
+  // "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": "Proces s ID {{processId}} se nepodařilo smazat. Zbývající procesy budou nadále mazány. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} procesů bylo úspěšně odstraněno",
 
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Aktualizovat profil",
 
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
+  "profile.card.identify": "Identifikace",
 
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
+  "profile.card.security": "Zabezpečení",
 
-  // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
+  // "profile.form.submit": "Save",
+  // TODO Source message changed - Revise the translation
+  "profile.form.submit": "Uložit",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Autorizační skupiny, do kterých patříte",
 
-  // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Speciální autorizační skupiny, do kterých patříte",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Křestní jméno je povinné",
 
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Příjmení je povinné",
 
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "E-mailová adresa",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Křestní jméno",
 
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Jazyk",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Příjmení",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Kontaktní telefon",
 
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "Vaše změny v profilu byly uloženy.",
 
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Profil uložen",
 
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "V profilu nebyly provedeny žádné změny.",
 
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Žádné změny",
 
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "Hesla se neshodují.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-
-  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "profile.security.form.info": "Volitelně můžete zadat nové heslo do políčka níže a potvrdit je opětovným zadáním do druhého políčka.",
 
   // "profile.security.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Heslo",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Opakujte pro potvrzení",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Aktuální heslo",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "Vaše změny hesla byly uloženy.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Heslo uloženo",
 
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Chyba při změně hesla",
 
-  // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
+  // "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": "Při pokusu o změnu hesla došlo k chybě. Zkontrolujte prosím, zda je aktuální heslo správné.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Zadaná hesla nejsou stejná.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Vyplňte prosím povinná pole bezpečnostního formuláře.",
 
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-
+  "profile.title": "Aktualizovat profil",
 
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Profil výzkumníka",
 
   // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Výzkumný projekt",
 
   // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
+  "project.page.contributor": "Přispěvatelé",
 
   // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
+  "project.page.description": "Popis",
 
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
+  "project.page.edit": "Upravit tento záznam",
 
   // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Předpokládané dokončení",
 
   // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
+  "project.page.funder": "Poskytovatelé finací",
 
   // "project.page.id": "ID",
-  // TODO New key - Add a translation
   "project.page.id": "ID",
 
   // "project.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "project.page.keyword": "Keywords",
+  "project.page.keyword": "Klíčová slova",
 
   // "project.page.status": "Status",
-  // TODO New key - Add a translation
   "project.page.status": "Status",
 
   // "project.page.titleprefix": "Research Project: ",
-  // TODO New key - Add a translation
-  "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Výzkumný projekt: ",
 
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-
+  "project.search.results.head": "Výsledky vyhledávání projektu",
 
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Výsledky vyhledávání projektu",
 
   // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Publikace",
 
   // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
+  "publication.page.description": "Popis",
 
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Upravit tento záznam",
 
   // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN časopisu",
 
   // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Název časopisu",
 
   // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Vydavatel",
 
   // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Publikace: ",
 
   // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Název svazku",
 
   // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Výsledky vyhledávání publikací",
 
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Výsledky vyhledávání publikací",
 
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Vyhledávání publikací",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Další",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Předchozí",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Playlist",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
+  "register-email.title": "Registrace nového uživatele",
 
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Vytvořit profil",
 
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identifikace",
 
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "E-mailová adresa",
 
   // "register-page.create-profile.identification.first-name": "First Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Křestní jméno *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Vyplňte prosím křesní jméno",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Příjmení *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Vyplňte prosím příjmení",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Kontaktní telefon",
 
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Jazyk",
 
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "Zabezpečení",
 
-  // "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.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+  // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box.",
+  // TODO Source message changed - Revise the translation
+  "register-page.create-profile.security.info": "Zadejte prosím heslo do níže uvedeného pole a potvrďte jej opětovným zadáním do druhého pole.",
 
   // "register-page.create-profile.security.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "Heslo *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Opakujte pro potvrzení *",
 
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Zadejte prosím heslo do níže uvedeného pole.",
 
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-
-  // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+  "register-page.create-profile.security.error.matching-passwords": "Hesla se neshodují.",
 
   // "register-page.create-profile.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Dokončit registraci",
 
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Při registraci nového uživatele se něco pokazilo.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Registrace se nezdařila",
 
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "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": "Registrace proběhla úspěšně. Byli jste přihlášeni jako vytvořený uživatel.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-
+  "register-page.create-profile.submit.success.head": "Registrace byla dokončena",
 
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Registrace nového uživatele",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru sbírek pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
 
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "E-mailová adresa *",
 
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Vyplňte prosím e-mailovou adresu",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Prosím vyplňte platnou emailovou adresu.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Použijte email s povolenými doménami: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Tato adresa bude ověřena a použita jako vaše přihlašovací jméno.",
 
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registrovat",
 
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "Ověřovací e-mail byl odeslán",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální  URL adresu a další pokyny.",
 
   // "register-page.registration.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "Chyba při pokusu o registraci e-mailu",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "Došlo k chybě při registraci následující e-mailové adresy: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Chyba při pokusu o ověření pomocí 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": "Pro registraci musíte přijmout soubory cookie <b>Registrace a obnovení hesla</b> (Google reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Tato emailová adresa není na seznamu povolených domén, prostřednictvím kterých se lze registrovat. Povolené domény jsou {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Otevřít nastavení souborů cookie",
+
+  // "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": "Při ověřování reCaptcha došlo k chybě",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Ověření vypršelo. Zopakujte prosím ověření.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Účet může být založen jen na základě emailové adresy na povolených doménách.",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
-  "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": "Pro typ vztahu {{ type }} mezi dvěma záznamy nebyla nalezena žádná vhodná shoda.",
 
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
-  "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "Server vrátil chybu",
 
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "Nelze přidat vztah",
 
   // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Autoři",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Autoři (osoby)",
 
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autoři (organizační jednotky)",
 
   // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Čísla časopisu",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf.JournalIssue": "Journal Issue",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Číslo časopisu",
 
   // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Časopisy",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
+  "relationships.isJournalVolumeOf": "Journal Volume",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Organizační jednotky",
 
   // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Autoři",
 
   // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Výzkumné projekty",
 
   // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Publikace",
 
   // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Články",
 
   // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Časopisu",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Ročník časopisu",
 
   // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Ročníky časopisu",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf.JournalVolume": "Journal Volume",
 
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Přispěvatelé",
 
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Přispěvatel (Organizační jednotka)",
 
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Přispěvatel",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Poskytovatel financí",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logo repozitáře",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Institucionální digitální repozitář",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "IDR :: ",
 
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Přidat",
 
   // "resource-policies.add.for.": "Add a new policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Přidat novou politiku",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Přidat novou politiku souboru",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Přidat novou politiku svazku",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Přidat novou politiku záznamu",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Přidat novou politiku komunity",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Přidat novou politiku kolekce",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Vytvořit novou politiku zdrojů pro ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "Při vytváření politiky zdrojů došlo k chybě.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operace byla úspěšná",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Vytvoření nové politiky zdrojů",
 
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Smazat vybrané",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Odstranění vybraných politik zdrojů",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "Při odstraňování vybraných politik zdrojů došlo k chybě.",
 
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "Operace proběhla úspěšně",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Upravit politiku zdrojů ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "Při úpravě vybraných politik zdrojů došlo k chybě.",
+
+  // "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": "Při úpravě cíle (uživatele nebo skupiny) politiky zdrojů došlo k chybě.",
+
+  // "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": "Při úpravě politiky zdrojů došlo k chybě. Cíl (uživatel nebo skupina) byl úspěšně aktualizován.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "Operace byla úspěšná",
 
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Upravit politiku zdrojů ",
 
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Vyberte typ akce",
 
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "Je třeba vybrat akci politiky zdrojů.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "Uživatel nebo skupina, které bude uděleno oprávnění",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Vybrat",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Vyhledat uživatele",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Vyhledat skupinu",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Akce",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
 
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Název",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Typ nelze změnit",
+
+  // "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": "Není možné nahradit uživatele skupinou.",
+
+  // "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": "Není možné nahradit skupinu uživatelem.",
+
+  // "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": "Odstranit aktuální politiku zdrojů a vytvořit novou s požadovaným typem.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Datum ukončení",
 
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Datum zahájení",
 
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Popis",
 
   // "resource-policies.form.name.label": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Název",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   // TODO New key - Add a translation
   "resource-policies.form.name.hint": "Max 30 characters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "vyberte typ politiky",
 
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Je třeba vybrat typ politiky zdrojů.",
 
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Akce",
 
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Datum ukončení",
 
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Datum zahájení",
 
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Upravit",
 
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Upravit skupinu",
 
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Upravit politiku",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "Osoba",
 
   // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Skupina",
+
+  // "resource-policies.table.headers.select-all": "Select all",
   // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.select-all": "Select all",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.deselect-all": "Deselect all",
+
+  // "resource-policies.table.headers.select": "Select",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.select": "Select",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  // TODO New key - Add a translation
+  "resource-policies.table.headers.deselect": "Deselect",
 
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.id": "ID",
 
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Název",
 
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "Typ",
 
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Politiky souboru",
 
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Politiky svazku",
 
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Politiky záznamu",
 
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Politiky komunity",
 
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Politiky kolekce",
+
+  // "root.skip-to-content": "Skip to main content",
   // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-
-
+  "root.skip-to-content": "Skip to main content",
 
   // "search.description": "",
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-  // TODO New key - Add a translation
-  "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Zobrazit",
 
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Hledat",
+  // "search.title": "Search",
+  "search.title": "Hledat",
 
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Hledat",
 
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Hledat v repozitáři...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  // TODO New key - Add a translation
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
 
   // "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": "Do data",
+  "search.filters.applied.f.dateIssued.max": "Datum ukončení",
 
   // "search.filters.applied.f.dateIssued.min": "Start date",
-  "search.filters.applied.f.dateIssued.min": "Od data",
+  "search.filters.applied.f.dateIssued.min": "Datum zahájení",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Date vložení",
 
-  // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "search.filters.applied.f.discoverable": "Nedohledatelné",
 
   // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Typ záznamu",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Má soubory",
 
-  // "search.filters.applied.f.itemtype": "Type",
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
   // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.original_bundle_filenames": "File name",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.original_bundle_descriptions": "File description",
+
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Typ",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
   "search.filters.applied.f.namedresourcetype": "Status",
 
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Vkladatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Název pracovní pozice",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Datum narozdení do",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Datum narození od",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Zkontrolováno",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Zrušeno",
+
+  // "search.filters.applied.operator.equals": "",
   // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notequals": " not equals",
 
+  // "search.filters.applied.operator.authority": "",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notauthority": " not authority",
+
+  // "search.filters.applied.operator.contains": " contains",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.contains": " contains",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.notcontains": " not contains",
+
+  // "search.filters.applied.operator.query": "",
+  // TODO New key - Add a translation
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.head": "Title",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.placeholder": "Title",
+
+  // "search.filters.filter.title.label": "Search Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.label": "Search Title",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -5254,145 +6976,200 @@
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Jméno autora",
 
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Hledat jméno autora",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Datum narození",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Datum narození",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Hledat datum narození",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Sbalit filtr",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Datum zveřejnění",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Datum zveřejnění",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Hledat datum zveřejnění",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-  // TODO New key - Add a translation
   "search.filters.filter.creativeWorkEditor.head": "Editor",
 
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  // TODO New key - Add a translation
   "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
 
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Hledat editora",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Předmět",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Předmět",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Předmět hledání",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Vydavatel",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Vydavatel",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Hledat vydavatele",
 
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Datum",
 
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "Datum od",
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.dateIssued.max.placeholder": "Maximální datum",
 
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "Datum do",
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Konec",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.dateIssued.min.placeholder": "Minimální Datum",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Začátek",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Datum vložení",
 
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Datum vložení",
 
-  // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Hledat datum vložení",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
+  "search.filters.filter.discoverable.head": "Nedohledatelné",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Zrušeno",
 
   // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Typ záznamu",
 
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Typ záznamu",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Hledat typ záznamu",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Rozbalit filtr",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Má soubory",
 
-  // "search.filters.filter.itemtype.head": "Type",
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
   // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.original_bundle_filenames.head": "File name",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_filenames.label": "Search File name",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.head": "File description",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  // TODO New key - Add a translation
+  "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Typ",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Typ",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Hledat typ",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Název pracovní pozice",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Název pracovní pozice",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Hledat pracovní pozici",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Známý jazyk",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Známý jazyk",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Známý jazyk",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-  // TODO New key - Add a translation
   "search.filters.filter.namedresourcetype.head": "Status",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-  // TODO New key - Add a translation
   "search.filters.filter.namedresourcetype.placeholder": "Status",
 
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Hledat status",
+
   // "search.filters.filter.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Lidé",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Lidé",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Hledat lidi",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Stát",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Stát",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Hledat stát",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Město",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Město",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Hledat město",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Datum založení",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Datum založení",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Hledat datum založení",
 
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Rozsah",
@@ -5400,6 +7177,9 @@
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
 
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Hledat filtr rozsahu",
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
 
@@ -5412,88 +7192,170 @@
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Předmět",
 
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Hledat předmět",
+
   // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Vkladatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Vkladatel",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Hledat vkladatele",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Procházet {{ name }} podle",
+
+  // "search.filters.filter.funding.head": "Funding",
   // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.funding.head": "Funding",
 
+  // "search.filters.filter.funding.placeholder": "Funding",
+  // TODO New key - Add a translation
+  "search.filters.filter.funding.placeholder": "Funding",
 
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.head": "Supervised By",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.label": "Search Supervised By",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Číslo časopisu",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Ročník časopisu",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Organizační jednotka",
+
+  // "search.filters.entityType.Person": "Person",
   // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Ano",
 
   // "search.filters.has_content_in_original_bundle.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "Ne",
 
   // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "Ne",
 
   // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Ano",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
   // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
+  "search.filters.namedresourcetype.Archived": "Archived",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Validation": "Validation",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Workflow": "Workflow",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  // TODO New key - Add a translation
+  "search.filters.namedresourcetype.Workspace": "Workspace",
 
   // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Ano",
 
   // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
-
+  "search.filters.withdrawn.false": "Ne",
 
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtry",
 
   // "search.filters.reset": "Reset filters",
-  "search.filters.reset": "Obnovit filtry",
+  "search.filters.reset": "Resetovat filtry",
 
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Odeslat",
 
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.authority.text": "Authority",
+  // TODO New key - Add a translation
+  "search.filters.operator.authority.text": "Authority",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  // TODO New key - Add a translation
+  "search.filters.operator.notauthority.text": "Not Authority",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.query.text": "Query",
+  // TODO New key - Add a translation
+  "search.filters.operator.query.text": "Query",
 
   // "search.form.search": "Search",
   "search.form.search": "Hledat",
 
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Hledat v DSpace",
-
-  // "search.form.search_mydspace": "Search MyDSpace",
-  // TODO New key - Add a translation
-  "search.form.search_mydspace": "Search MyDSpace",
-
+  // "search.form.search_dspace": "All repository",
+  // TODO Source message changed - Revise the translation
+  "search.form.search_dspace": "Celý repozitář",
 
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Celý repozitář",
 
   // "search.results.head": "Search Results",
-  "search.results.head": "Výsledky hledání",
+  "search.results.head": "Výsledky vyhledávání",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Nebyli nalezeny žádné výsledky",
+  "search.results.no-results": "Vaše vyhledávání nevrátilo žádné výsledky. Máte potíže s nalezením toho, co hledáte? Zkuste vložit",
 
   // "search.results.no-results-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "v uvozovkách",
 
   // "search.results.empty": "Your search returned no results.",
-  // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "Vaše vyhledávání nevrátilo žádné výsledky.",
 
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Zobrazit",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Při zpracování dotazu došlo k chybě, zkuste to prosím později",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Výsledky vyhledávání",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Výsledky vyhledávání",
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Zpět na výsledky",
@@ -5502,41 +7364,62 @@
   "search.sidebar.filters.title": "Filtry",
 
   // "search.sidebar.open": "Search Tools",
-  "search.sidebar.open": "Vyhledávací nástroje",
+  "search.sidebar.open": "Nástroje pro vyhledávání",
 
   // "search.sidebar.results": "results",
   "search.sidebar.results": "výsledky",
 
   // "search.sidebar.settings.rpp": "Results per page",
-  "search.sidebar.settings.rpp": "Výsledků na stránku",
+  "search.sidebar.settings.rpp": "Výsledky na stránku",
 
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Řadit dle",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.title": "Advanced Search",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.filter-by": "Filter by",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.filters": "Filters",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.operators": "Operators",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  // TODO New key - Add a translation
+  "search.sidebar.advanced-search.add": "Add",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Nastavení",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Zobrazit detail",
 
   // "search.view-switch.show-grid": "Show as grid",
-  "search.view-switch.show-grid": "Zobrazit mřížku",
+  "search.view-switch.show-grid": "Zobrazit jako mřížku",
 
   // "search.view-switch.show-list": "Show as list",
-  "search.view-switch.show-list": "Zobrazit seznam",
+  "search.view-switch.show-list": "Zobrazit jako seznam",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  // TODO New key - Add a translation
+  "selectable-list-item-control.deselect": "Deselect item",
 
+  // "selectable-list-item-control.select": "Select item",
+  // TODO New key - Add a translation
+  "selectable-list-item-control.select": "Select item",
 
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
+  "sorting.ASC": "Vzestupně",
 
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
+  "sorting.DESC": "Sestupně",
 
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Název vzestupně",
@@ -5544,1072 +7427,3613 @@
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Název sestupně",
 
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevance",
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Nejméně relevantní",
 
+  // "sorting.score.DESC": "Most Relevant",
+  // TODO Source message changed - Revise the translation
+  "sorting.score.DESC": "Nejvíce relevantní",
 
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Datum vydání vzestupně",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Datum vydání sestupně",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Datum přírůstku vzestupně",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Datum přírůstku sestupně",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Naposledy upraveno vzestupně",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Naposledy upraveno sestupně",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
 
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
+  "statistics.title": "Statistiky",
 
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Statistiky pro {{ scope }}",
 
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Statistika",
 
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Žádná data nejsou k dispozici",
 
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Žádná data nejsou k dispozici",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Celkový počet návštěv",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Celkový počet návštěv za měsíc",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Návštěvy souborů",
 
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Nejvíce zobrazení ze státu",
 
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Nejvíce zobrazení z města",
 
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Zobrazení",
 
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(název objektu nelze načíst)",
 
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Upravit příspěvek",
 
   // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Upravit příspěvek",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  // TODO New key - Add a translation
-  "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Zrušit",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  // TODO Source message changed - Revise the translation
+  "submission.general.cannot_submit": "Nemáte oprávnění k vytvoření nového příspěvku.",
 
   // "submission.general.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Vložit do repozitáře",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Zrušit",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Tuto operaci nelze vzít zpět. Jste si jisti?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Ano, jsem si jistý",
 
   // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Vyřadit příspěvek",
 
   // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Vyřadit",
+
+  // "submission.general.back.submit": "Back",
   // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Uloženo",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Neuložené změny",
 
   // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
+  "submission.general.save": "Průběžně uložit záznam",
 
   // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for later",
-
+  "submission.general.save-later": "Uložit na později",
 
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importovat metadata z externího zdroje",
 
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Importovat metadata z externího zdroje",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importovat časopis z externího zdroje",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importovat číslo časopisu z externího zdroje",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importovat ročník časopisu z externího zdroje",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importovat vydavatele z externího zdroje",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importovat osobu z externího zdroje",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importovat projekt z externího zdroje",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importovat publikaci z externího zdroje",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importovat metadata z externího zdroje",
 
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  // TODO New key - Add a translation
-  "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": "Zadejte výše uvedený dotaz, abyste našli záznamy z webu, které chcete importovat do systému DSpace.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  // TODO New key - Add a translation
-  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "Zpět do Mého DSpace",
 
   // "submission.import-external.search.placeholder": "Search the external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Prohledat externí zdroj",
 
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Hledat",
 
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Napište několik slov k vyhledávání",
 
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Vyberte externí zdroj",
 
   // "submission.import-external.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
 
-  // "submission.import-external.source.loading": "Loading ...",
+  // "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.doi": "DOI",
   // TODO New key - Add a translation
-  "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.doi": "DOI",
+
+  // "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": "European Patent Office (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Načítá se ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
 
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals podle ISSN",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
 
-  // "submission.import-external.source.orcid": "ORCID",
+  // "submission.import-external.source.openaire": "OpenAIRE Authors",
   // TODO New key - Add a translation
+  "submission.import-external.source.openaire": "OpenAIRE Authors",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Titles",
+  // TODO New key - Add a translation
+  "submission.import-external.source.openaireTitle": "OpenAIRE Titles",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Funding",
+  // TODO New key - Add a translation
+  "submission.import-external.source.openaireFunding": "OpenAIRE Funding",
+
+  // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
 
   // "submission.import-external.source.pubmed": "Pubmed",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
   "submission.import-external.source.lcname": "Library of Congress Names",
 
-  // "submission.import-external.preview.title": "Item Preview",
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
   // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Náhled záznamu",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Náhled publikace",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Náhled záznamu",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Náhled časopisu",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Náhled organizační jednotky",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Náhled osoby",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Náhled projektu",
 
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "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": "Níže uvedená metadata byla importována z externího zdroje. Budou předvyplněna při zahájení odesílání..",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Zahájit odesílání",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Chyba při odesílání",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "Během procesu importu externí zdrojového záznamu došlo k chybě.",
 
   // "submission.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Zavřít",
 
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Lokálně uložený záznam úspěšně přidán do výběru.",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uloženého autora",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložený časopis",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložené číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložený ročník časopisu",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekt",
+
+  // "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": "Importovat externě uložený záznam",
+
+  // "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": "Importovat externě uloženou událost",
+
+  // "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": "Importovat externě uložený produkt",
+
+  // "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": "Importovat externě uložené vybavení",
+
+  // "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": "Importovat externě uloženou organizační jednotku",
+
+  // "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": "Importovat fond",
+
+  // "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": "Importovat externě uloženou osobu",
+
+  // "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": "Importovat externě uložený 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": "Importovat externě uložený projekt",
+
+  // "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": "Importovat externě uloženou publikaci",
+
+  // "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": "Přidána nová entita!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekt",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uloženého autora",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "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": "Lokální autor úspěšně přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "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": "Externí autor úspěšně importován a přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autorita",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "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": "Importovat jako nový záznam lokální autority",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Zrušit",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "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": "Vyberte kolekci, do které chcete importovat nové záznamy",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entity",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "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": "Importovat jako novou lokální entitu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "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": "Import z LC Name",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Import z ORCID",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE Authors",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE Authors",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE Titles",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE Titles",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE Funding",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE Funding",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  // TODO New key - Add a translation
-  "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": "Import z Sherpa Journal",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "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": "Import z Sherpa Publisher",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "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": "Import z 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": "Import z arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložený časopis",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "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": "Lokálně uložený časopis úspěšně přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  // TODO New key - Add a translation
-  "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": "Externě uložený časopis úspěšně importován a přidán do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložené číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "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": "Úspěšně přidáno lokálně uložené číslo časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "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": "Úspěšně importováno a přidáno externě uložené číslo časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  // TODO New key - Add a translation
-  "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": "Importovat externě uložený ročník časopisu",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  // TODO New key - Add a translation
-  "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": "Úspěšně přidán lokálně uložený ročník časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  // TODO New key - Add a translation
-  "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": "Úspěšně importován a přidán externě uložený ročník časopisu do výběru",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Vyberte lokální shodu:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Zrušit výběr všech",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Zrušit výběr stránky",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Načítá se...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Vyhledávací dotaz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Hledání",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Hledání...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Vybrat vše",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Vybrat stránku",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "Vybrané {{ size }} záznamy",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Lokálně uložení autoři ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Lokálně uložené časopisy({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Lokálně uložené projekty ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Lokálně uložené publikace ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Lokálně uložení autoři ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokálně uložené organizační jednotky ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokálně uložené datové balíky ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokálně uložené datové soubory ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokálně uložené časopisy ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokálně uložená čísla časopisu ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Lokálně uložená čísla časopisu ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Lokálně uložené ročníky časopisu ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Lokálně uložené ročníky časopisu ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  // TODO New key - Add a translation
   "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 }})",
-  // TODO New key - Add a translation
   "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 }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  // TODO New key - Add a translation
   "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.ror": "ROR ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Authors ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Authors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Titles ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Titles ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Funding ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Funding ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ 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": "Vyhledat financující agentury",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Vyhledat financování",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Vyhledat organizační jednotky",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projekty",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Poskytovatel financí na projekt",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publikace autora",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekt",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projekty",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Poskytovatel financí na projekt",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Hledat...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Aktuální výběr ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Čísla časopisu",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Čísla časopisu",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Ročníky časopisu",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Ročníky časopisu",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Časopisy",
 
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autoři",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Financující agentura",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projekty",
 
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publikace",
 
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autoři",
 
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizační jednotky",
 
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Datové balíky",
 
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Datové soubory",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Financující agentura",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Projekt, ke kterému publikace náleží",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadřazená organizační jednotka",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publikace",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Přepnutí rozbalovacího seznamu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Nastavení",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Váš výběr je momentálně prázdný.",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Vybraní autoři",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Vybrané časopisy",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Vybraný ročník časopisu",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Vybrané projekty",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Vybrané publikace",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Vybraní Autoři",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Vybrané organizační jednotky",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Vybrané datové balíky",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Vybrané datové soubory",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Vybrané časopisy",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Vybrané číslo časopisu",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Vybraný ročník časopisu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Vybraná financující agentura",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Vybrané financování",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Vybrané číslo časopisu",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Vybrané organizační jednotka",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Výsledky vyhledávání",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Výsledky vyhledávání",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Výsledky vyhledávání",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Chcete uložit \"{{ value }}\" jako variantu jména pro tuto osobu, abyste ji vy i ostatní mohli opakovaně použít pro budoucí příspěvky? Pokud ne, můžete ji stále použít pro tento příspěvek.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Uložit novou variantu názvu",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Použít pouze pro tento příspěvek",
 
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Typ licence",
 
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Vyberte typ licence...",
 
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Změnit typ licence...",
 
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "Žádné licence nejsou k dispozici",
 
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Vyberte možnost...",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Vybrali jste následující licenci:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Uděluji výše uvedenou licenci",
 
   // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Přidat další",
+
+  // "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": "Vklad nelze dokončit kvůli chybám ve formuláři.<br>Pro dokončení vkladu vyplňte všechna požadovaná pole.",
 
   // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Kolekce",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "Při odesílání záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Příspěvek úspěšně uložen.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Při vyřazování záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Příspěvek byl úspěšně vyřazen.",
 
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Do sekce <strong>{{sectionId}}</strong> byla extrahována a přidána nová metadata.",
 
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-  // TODO New key - Add a translation
-  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "Do příspěvku byla přidána nová <strong>{{sectionId}}</strong> sekce.",
 
   // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Nebyla nalezena žádná kolekce",
+
+  // "submission.sections.general.no-entity": "No entity types found",
   // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-entity": "No entity types found",
 
   // "submission.sections.general.no-sections": "No options available",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "Nejsou k dispozici žádné volby",
 
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "Při ukládání záznamu došlo k problému, zkuste to prosím později.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Příspěvek byl úspěšně uložen.",
 
   // "submission.sections.general.search-collection": "Search for a collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Vyhledat kolekci",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  // TODO New key - Add a translation
-  "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Existují neúplné sekce.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Pro tento záznam budou vytvořeny následující identifikátory:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Tomuto záznamu nybyl přidělen žádný handle.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Tomuto záznamu nebylo přiděleno žádné DOI.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Jiné identifikátory: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Podmínky přístupu k záznamům",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Licence Creative Commons",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Opětovně použít",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Popsat",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Základní informace o dokumentu",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Popsat",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identifikátory",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Vložit licenci",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Politiky Sherpa",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Nahrát soubory",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informace o politice otevřeného přístupu vydavatele",
+
+  // "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": "Nejsou k dispozici žádné informace o politice vydavatele. Pokud má vaše práce přiřazené ISSN, zadejte jej výše, abyste viděli všechny související politiky otevřeného přístupu vydavatele.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Chyby",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Platný",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Varování",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "má chyby",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "je platný",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "má varování",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Doplňující informace",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Doplňující informace",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Otevřít sekci",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Zavřít sekci",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Rozbalit {{sectionHeader}} sekci",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Sbalit {{sectionHeader}} sekci",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
   // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
-
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
 
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Zrušit",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Tuto operaci nelze vzít zpět. Jste si jisti?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Ano, jsem si jistý",
 
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Smazat soubor",
 
   // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Smazat",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Stáhnout soubor",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  // TODO New key - Add a translation
-  "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Přetáhnout soubory a připojit je k záznamu",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Upravit soubor",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Typ podmínky přístupu",
+
+  // "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": "Vyberte podmínku přístupu, která se použije na soubor poté, co bude záznam uložen",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Je vyžadováno datum.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Udělit přístup od požadovaného data.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Udělit přístup do požadovaného data.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Udělit přístup od",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Vyberte datum, od kterého se použije související podmínka přístupu",
 
   // "submission.sections.upload.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Od",
 
   // "submission.sections.upload.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Skupina",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Je vyžadována skupina.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Udělit přístup do",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Zvolte datum, do kterého platí související podmínka přístupu",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Až do",
 
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
-  // TODO New key - Add a translation
-  "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": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následující skupiny (skupin):",
 
   // "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):",
-  // TODO New key - Add a translation
-  "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": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následující skupiny (skupin):",
 
   // "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 by dragging & dropping them anywhere on the page.</strong>",
-  // TODO New key - Add a translation
-  "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 by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "Zde najdete všechny soubory, které jsou aktuálně v záznamu. Můžete aktualizovat metadata souborů a podmínky přístupu nebo <strong>nahrát další soubory pouhým přetažením kdekoli na stránku</strong>.",
 
   // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "Ne",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Zatím nebyl nahrán žádný soubor.",
 
   // "submission.sections.upload.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Uložit metadata",
 
   // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Zrušit",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Nahrání se nezdařilo",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Úspěšně nahráno",
+
+  // "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": "Když je zaškrtnuto, bude tento záznam zjistitelný ve vyhledávání/prohlížení. Když není zaškrtnuto, záznam bude dostupný pouze prostřednictvím přímého odkazu a nikdy se nezobrazí ve vyhledávání/přehledu.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Dohledatelné",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Typ podmínky přístupu",
+
+  // "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": "Zvolte podmínku přístupu, která se použije na záznam po jeho uložení",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Je vyžadováno datum.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Udělit přístup od požadovaného data.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Udělit přístup do požadovaného data.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Udělit přístup od",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Vyberte datum, od kterého se použije související podmínka přístupu",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Od",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Skupina",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Skupina je vyžadována.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Udělit přístup do",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Zvolte datum, do kterého platí související podmínka přístupu",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Do",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
   // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.duplicates.none": "No duplicates were detected.",
 
-
-
-  // "submission.submit.title": "Submission",
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
   // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
 
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
 
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Potvrzuji výše uvedenou licenci",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Musíte souhlasit s licencí",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "Musíte licenci přijmout",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informace o publikaci",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Název",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN",
+
+  // "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": "Nakladatel",
+
+  // "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": "Politika nakladatele",
+
+  // "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": "Níže uvedené informace byly zjištěny prostřednictvím Sherpa Romeo. Na základě zásad vašeho vydavatele poskytuje rady ohledně toho, zda může být nutné embargo a/nebo které soubory smíte nahrát. Pokud máte dotazy, obraťte se na správce webu prostřednictvím formuláře pro zpětnou vazbu v zápatí.",
+
+  // "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": "Cesty otevřeného přístupu povolené politikou tohoto časopisu jsou uvedeny níže podle verze článku. Kliknutím na cestu získáte podrobnější zobrazení.",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Další informace naleznete na následujících odkazech:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Verze",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Bez embarga",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Bez místa",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licence",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Předpoklady",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Místo",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Podmínky",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Aktualizovat",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informace o záznamu",
+
+  // "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": "Vytvořeno",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Naposledy upraveno",
+
+  // "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": "Informace ze Sherpa Romeo se nepodařilo načíst.",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Nově podaný záznam",
+
+  // "submission.submit.title": "New submission",
+  // TODO Source message changed - Revise the translation
+  "submission.submit.title": "Nově podaný záznam",
 
   // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Smazat",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  // TODO New key - Add a translation
-  "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": "Select this option to discard this item. You will then be asked to confirm it.",
+  // TODO Source message changed - Revise the translation
+  "submission.workflow.generic.delete-help": "Pokud chcete tento záznam vyřadit, zvolte \"Smazat\". Poté budete vyzváni k potvrzení.",
 
   // "submission.workflow.generic.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Upravit",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Zvolte tuto možnost, chcete-li změnit metadata záznamu.",
 
   // "submission.workflow.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Zobrazit",
 
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Tuto možnost vyberte, chcete-li zobrazit metadata záznamu.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Vybrat recenzenta",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Hodnotit",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Schválit",
 
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
-  // TODO New key - Add a translation
-  "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": "Pokud jste záznam zkontrolovali a je vhodný pro zařazení do kolekce, vyberte možnost \"Schválit\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Upravit",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Zvolte tuto možnost, chcete-li změnit metadata záznamu.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Odmítnout",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může vkladatel problém odstranit a podání znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Popište důvod odmítnutí",
 
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Odmítnout záznam",
 
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Důvod",
 
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu předložit.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
 
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
-  // TODO New key - Add a translation
-  "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": "Vrátit úlohu do fondu, aby ji mohl provést jiný uživatel.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Během operace došlo k chybě...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Zadavatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
-
-
+  "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Vyžádat si",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Přiřaďte si tento úkol.",
 
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Skrýt detail",
 
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Zobrazit detail",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
   // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Zobrazit",
 
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Zvolte tuto možnost pro zobrazení metadat záznamu.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/A",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Notifikace",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Notifikace na změny záznamů",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Notifikace na změny v kolekcích",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Notifikace na změny v komunitách",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Typ notifikace",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Frekvence notifikací",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Denní frekvence",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Měsíční frekvence",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Týdenní frekvence",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Potvrdit",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Notifikace",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Typ a frekvence notifikací",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Zavřít",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pokud chcete zrušit notifikace, navštivte prosím Nastavení notifikací pod Vaším uživatelským profilem",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Obsah",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Denní frekvence",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Týdenní frekvence",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Měsíční frekvence",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Potvrdit",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Zpracování...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Nastavení notifikace {{ type }} bylo úspěšně zpracováno.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Notifikace byla zrušena.",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Notifikace {{ type }} byla aktualizována.",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Během nastavování notifikce došlo k chybě.",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Během rušení notifikce došlo k chybě.",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Během aktualizace notifikce došlo k chybě.",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Předmět",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Typ notifikace",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Frekvence notifikace",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Akce",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editovat",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Smazat",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Nedostupné",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "Záznam byl smazán, nebo nemáte oprávnění zobrazit si tento záznam.",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Momentálně nemáte nastavené žádné notifikace. K nastavení emailových notifikací na komunitu či kolekci, klikněte prosím na tlačítko notifikací u příslušné komunity či kolekce.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Náhled",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Náhled není k dispozici",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logo projektu",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Dočasné logo projektu",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logo organizační jednotky",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Dočasné logo organizační jednotky",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Profilový obrázek",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Dočasný profilový obrázek",
 
   // "title": "DSpace",
   "title": "DSpace",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Hierarchické stromové zobrazení",
 
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Další",
 
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Resetovat",
 
   // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Hledat",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
   // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
 
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "Nebyly zobrazeny žádné záznamy",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "Norský vědecký index",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-
+  "vocabulary-treeview.tree.description.srsc": "Kategorie předmětů výzkumu",
 
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Vyberte předmět, aby mohl být použit jako filtr pro vyhledávání",
 
   // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
+  "uploader.browse": "procházet",
 
   // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Přetáhněte sem své soubory",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Smazat",
 
   // "uploader.or": ", or ",
-  // TODO New key - Add a translation
-  "uploader.or": ", or ",
+  "uploader.or": ", nebo ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO New key - Add a translation
-  "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "(nyní je bezpečné tuto stránku zavřít)",
 
   // "uploader.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Délka fronty",
 
   // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "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": "Vyberte typy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Virtuální metadata tohoto vztahu",
 
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "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": "Vyberte záznamy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Zkontrolované záznamy",
 
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Moje záznamy",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Spravovat workflow",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Kroky workflow",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Úlohy Workflow a osobního pracovního prostoru",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
   // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
+  "orgunit.search.results.head": "Organizational Unit Search Results",
 
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Upravit workflow",
 
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Upravit workflow",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Odstraněno",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Tento záznam ve workflow byl úspěšně odstraněn",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Něco se pokazilo",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "Záznam ve workflow se nepodařilo odstranit",
 
   // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Smazat záznam ve workflow",
 
   // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Smazat záznam ve workflow",
 
   // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Zrušit",
 
   // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-
+  "workflow-item.delete.button.confirm": "Smazat",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Odesláno zpět vkladateli",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně odeslán zpět vkladateli",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Něco se pokazilo",
 
   // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "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": "Záznam ve workflow se nepodařilo odeslat zpět vkladateli",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Odeslat záznam ve workflow zpět vladateli",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Odeslat záznam ve workflow zpět vladateli",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Zrušit",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  // TODO Source message changed - Revise the translation
+  "workflow-item.send-back.button.confirm": "Odeslat zpět",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Zobrazení workflow",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Zobrazení pracovního prostoru",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Zobrazení pracovní prostoru",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Vymazat obsah pracovního prostoru",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Smazat záznam v pracovním prostoru",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Smazat",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Zrušit",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Smazáno",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Záznam v pracovním prostoru byl úspěšně odstraněn",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Něco se pokazilo",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Záznam v pracovním prostoru nemohl být odstraněn",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Pokročilé workflow",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "Recenzent pro tento záznam byl úspěšně vybrán",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Něco se pokazilo",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Nebylo možné vybrat recenzenta pro tento záznam",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Vybrat recenzenta",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Zrušit",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Potvrdit",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Hodnocení kontroly",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "Hodnocení tohoto záznamu bylo úspěšně zaznamenáno",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Něco se pokazilo",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Nebylo možné zkontrolovat tento záznam",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Zkontrolovat tento záznam",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Zkontrolovat tento záznam",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Zrušit",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Potvrdit",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "Relace brzy vyprší",
+
+  // "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": "Z bezpečnostních důvodů relace uživatelů vyprší po {{ timeToExpire }} minutách nečinnosti. Vaše relace brzy vyprší. Chcete ji prodloužit nebo se odhlásit?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Odhlásit se",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prodloužit relaci",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Zpracovává se...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil výzkumníka propojen",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Při změně viditelnosti profilu došlo k neočekávané chybě",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Vytvořit nový",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil výzkumníka byl úspěšně vytvořen",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Při vytváření profilu výzkumníka došlo k chybě",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Smazat",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Vystavit",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Skrýt",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Není propojeno s profilem výzkumníka",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Zobrazit",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "SOUKROMÉ",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "VEŘEJNÉ",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Status:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Nemáte oprávnění nárokovat tento záznam. Pro více informací kontaktujte správce(y).",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Při nárokování profilu došlo k chybě, zkuste to prosím později",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Chyba",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil byl úspěšně nárokován",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Povedlo se",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Vytvořit ORCID ID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Udělená oprávnění",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Udělit oprávnění",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Propojit s ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Propojení profilu s 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": "Něco se pokazilo při propojování profilu s ORCID. Pokud problém přetrvává, kontaktujte správce.",
+
+  // "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": "ORCID iD tohoto profilu ({{ orcid }}) ještě nebyl propojen s účtem v registru ORCID nebo platnost propojení vypršela.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Odpojit od ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Zpracovává se...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Chybějící oprávnění",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Chybí následující oprávnění:",
+
+  // "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": "Skvělé! Toto pole je prázdné, takže jste udělili všechna přístupová práva k používání všech funkcí, které vaše instituce nabízí.",
+
+  // "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": "Profil není propojen s ORCID iD. Kliknutím na tlačítko níže je možné tento profil propojit s ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preference profilu",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preference zdrojů financování",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preference publikací",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Pokud potřebujete odebrat ORCID, kontaktujte prosím správce úložiště",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Aktualizovat nastavení",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Biografické údaje",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Vzdělání",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifikátory",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Všechny zdroje financování",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mé zdroje financování",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Vybrané zdroje financování",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Zakázáno",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Všechny publikace",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Moje publikace",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Vybrané publikace",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Zakázáno",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Zahodit změnu a nesynchronizovat s registrem ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "Zahození změny registru ORCID se nezdařilo",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "Změna registru ORCID byla úspěšně zahozena",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "Registr fronty ORCID je prázdný",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Typ",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Popis",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Akce",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Země",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Vzdělání",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Externí identifikátory",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Další jména",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Kvalifikace",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL výzkumníka",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Klíčová slova",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Přidat nový záznam do registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Aktualizovat tento záznam v registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Odstranit tento záznam z registru ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publikace",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekt",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliace",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Vzdělání",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Kvalifikace",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Další jméno",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Země",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Klíčové slovo",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Externí identifikátor",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL výzkumníka",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchronizovat s registrem 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": "Odeslání do ORCID se nezdařilo z důvodu chybějících oprávnění.",
+
+  // "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": "Klikněte <a href='{{orcid}}'>zde</a> a znovu udělte požadovaná oprávnění. Pokud problém přetrvává, kontaktujte správce.",
+
+  // "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": "Odeslání do ORCID se nezdařilo, protože zdroj odeslaný do registru ORCID není platný",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "Podání do ORCID se nezdařilo",
+
+  // "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": "Odeslání do ORCID se nezdařilo, protože zdroj se již nachází v registru 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": "Zdroj již v registru ORCID neexistuje.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "Odeslání do ORCID bylo úspěšně dokončeno",
+
+  // "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": "Data, která chcete odeslat do ORCID, jsou neplatná",
+
+  // "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": "Je vyžadováno zadat měnu částky",
+
+  // "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": "Zdroj, který má být odeslán, vyžaduje alespoň jeden identifikátor",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Název je vyžadován",
+
+  // "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": "Je vyžadováno pole 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": "Je vyžadováno počáteční datum",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Je vyžadováno zadání sponzora",
+
+  // "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": "Neplatný dvojmístný kód země podle ISO 3166",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Organizace je povinná",
+
+  // "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": "Název organizace je povinný",
+
+  // "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": "Datum zveřejnění musí být jeden rok po roce 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": "Organizace, která má být odeslána, vyžaduje adresu",
+
+  // "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": "Adresa organizace vyžaduje uvedení města",
+
+  // "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": "Adresa organizace vyžaduje platný dvoumístný kód země podle ISO 3166",
+
+  // "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": "Je vyžadován identifikátor pro rozklíčování organizací. Podporovány jsou identifikátory GRID, Ringgold, identifikátory právnických osob (LEI) a identifikátory registru poskytovatelů finančních prostředků Crossref.",
+
+  // "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": "Identifikátory organizace vyžadují hodnotu",
+
+  // "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": "Identifikátory organizace vyžadují zdroj",
+
+  // "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": "Zdroj jednoho z identifikátorů organizace je neplatný. Podporovanými zdroji jsou RINGGOLD, GRID, LEI a FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Režim synchronizace",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Dávkově",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Synchronizační režim",
+
+  // "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": "Vyberte prosím, jakým způsobem chcete synchronizaci s ORCID provádět. Mezi možnosti patří \"Ručně\" (musíte odeslat data do ORCID ručně) nebo \"Dávkově\" (systém odešle vaše data do ORCID prostřednictvím naplánovaného skriptu).",
+
+  // "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": "Zvolte, zda se mají propojené entity projektu odeslat do seznamu informací o financování vašeho profilu 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": "Vyberte, zda se mají vaše propojené entity Publikace posílat do seznamu děl vašeho profilu 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": "Zvolte, zda se mají do vašeho profilu ORCID odesílat vaše biografické údaje nebo osobní identifikátory.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Nastavení synchronizace bylo úspěšně aktualizováno",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Aktualizace nastavení synchronizace se nezdařila",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuálně",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Zřiďte si ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Čtěte vaše informace s viditelností nastavenou na důvěryhodné strany.",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Přidat/aktualizovat vaše výzkumné aktivity",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Přidat/aktualizovat další informace o vás",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Odpojení profilu od registru ORCID proběhlo úspěšně",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Při odpojování mezi profilem a registrem ORCID došlo k chybě. Zkuste to znovu",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Nastavení synchronizace ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Fronta do registru ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "ORCID oprávnění",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Nedávné příspěvky",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Tento objekt se nepodařilo načíst",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "V",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} den(dny),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hodina(y) a",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuta(y):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Systémová upozornění",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Systémová upozornění",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Zrušir",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Uložit",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "AKTIVNÍ",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "NEAKTIVNÍ",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "Systémové upozornění musí mít obsah",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Obsah upozornění",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočítávací měřič",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Nápověda: Nastavte odpočítávací měřič. Je-li to povoleno, lze datum nastavit i v budoucnosti a systémový upozornění bude uvádět odpočítávání do nastaveného data. Ve chvíli, kdy skončí odpočítávání, zmizí i odpočítávač z upozornění. Server NEBUDE automaticky zastaven.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
   // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
+  "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
 
-  // "workflow-item.send-back.button.confirm": "Send back"
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Náhled systémového upozornění",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "Systémové upozornění bylo úspěšně aktualizováno",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Něco se pokazilo při aktualizaci systémového upozornění",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "Systémové upozornění bylo úspěšně vytvořeno",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Něco se pokazilo při vytváření systémového upozornění",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Systémová upozornění",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Systémová upozornění",
+
+  // "discover.filters.head": "Discover",
   // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back",
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Tento formulář umožňuje provést změny typu přístupu k metadatovému záznamu nebo souborům.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Tento formulář umožňuje provést změny typu přístupu u všech záznamů v této kolekci. Změny mohou být uplatněny bud na všechny metadatové záznamy nebo veškerý obsah (soubory).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Tento formulář umožňuje provést změny typu přístupu u všech záznamů v kolekcích této komunity. Změny mohou být uplatněny bud na všechny metadatové záznamy nebo veškerý obsah (soubory).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadata záznamu",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  // TODO New key - Add a translation
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  // TODO New key - Add a translation
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Soubory",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mód",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Typ přístupu",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Momentálně není nastaven typ přístupu. Pokud provedete tuto akci, typ přístupu bude přenastaven podle nastavení typu přístupu na kolekci.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Nahradit typ přístupu",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Přidat k existujícím",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Uplatnit změny pouze na specifikované soubory",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Aktualozivat všechny soubory u daného záznamu",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "vybrány soubory",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  // TODO New key - Add a translation
+  "access-control-bitstreams-select": "Select bitstreams",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Zrušit",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Provést",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Přidat další",
+
+  // "access-control-remove": "Remove access condition",
+  // TODO New key - Add a translation
+  "access-control-remove": "Remove access condition",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Vybrat soubory",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Žádné záznamy k zobrazení.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Zavřít",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Typ přístupu",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Vybrat typ přístupu k vybraným objektům.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Povolit přístup od",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Vyberte datum, od kterého má být typ přístupu aktivován",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Povolit přístup do",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Vyberte datum, do kterého má být typ přístupu aktivován",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  // TODO New key - Add a translation
+  "vocabulary-treeview.search.form.add": "Add",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  // TODO New key - Add a translation
+  "item.page.cc.license.title": "Creative Commons license",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  // TODO New key - Add a translation
+  "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 
 
-}
+}
\ No newline at end of file

From 7a364fddeb87fd6f3597d0a84cd7f7c765b8d4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20G=C3=B3mez?= <abgolla@gmail.com>
Date: Fri, 10 May 2024 02:09:37 +0200
Subject: [PATCH 0200/1286] Add HTML support to system-wide alert banner. Fixes
 #3019.

(cherry picked from commit b9fb4e2159626eae2498edf0979b68e2413506a6)
---
 .../alert-banner/system-wide-alert-banner.component.html        | 2 +-
 .../alert-form/system-wide-alert-form.component.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index d97d3d5d70..63ccc295b7 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -21,7 +21,7 @@
             } }}
         </span>
             </span>
-            <span>{{(systemWideAlert$ |async)?.message}}</span>
+            <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
         </div>
     </div>
 </div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 95c7a69448..da9446b572 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -99,7 +99,7 @@
             } }}
         </span>
             </span>
-            <span>{{formMessage.value}}</span>
+            <span [innerHTML]="formMessage.value"></span>
         </div>
     </div>
 

From 40b4df63544fe2a899a49d25316b8b28c697f18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20G=C3=B3mez?= <abgolla@gmail.com>
Date: Fri, 10 May 2024 02:10:37 +0200
Subject: [PATCH 0201/1286] Fix code alignment

(cherry picked from commit af193282da7d1dced620d74f811d888ace0cd25b)
---
 .../system-wide-alert-banner.component.html   | 32 +++----
 .../system-wide-alert-form.component.html     | 88 +++++++------------
 2 files changed, 46 insertions(+), 74 deletions(-)

diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index 63ccc295b7..c2c1942cdd 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -2,26 +2,20 @@
     <div class="rounded-0 alert alert-warning w100 m-0 px-1">
         <div class="container">
             <span class="font-weight-bold">
-        <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-            {{'system-wide-alert-banner.countdown.prefix' | translate }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
-                days: countDownDays|async
-            } }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
-                hours: countDownHours| async
-            } }}
-        </span>
-            <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
-                minutes: countDownMinutes|async
-            } }}
-        </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0">
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
+                </span>
+                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
+                </span>
             </span>
             <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index da9446b572..770f465a4b 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -5,23 +5,22 @@
             <div class="row mb-2">
                 <div class="col">
                     <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
-                               [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
-                               [checked]="formActive.value"
-                               (change)="setActive($event)"></ui-switch>
+                        [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
+                        [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
                 </div>
             </div>
             <div class="row">
                 <div class="col">
                     <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
                     <textarea id="formMessage" rows="5"
-                              [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
-                              formControlName="formMessage">
+                        [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
+                        formControlName="formMessage">
                 </textarea>
                     <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
-                         class="invalid-feedback show-feedback">
-                <span *ngIf="formMessage.errors">
-                {{ 'system-wide-alert.form.error.message' | translate }}
-            </span>
+                        class="invalid-feedback show-feedback">
+                        <span *ngIf="formMessage.errors">
+                            {{ 'system-wide-alert.form.error.message' | translate }}
+                        </span>
                     </div>
                 </div>
             </div>
@@ -29,10 +28,8 @@
     </div>
     <div class="row">
         <div class="col mb-2 d-flex align-items-end">
-            <ui-switch size="small"
-                       [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
-                       [checked]="counterEnabled$ |async"
-                       (change)="setCounterEnabled($event)"></ui-switch>
+            <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
+                [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
             <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
         </div>
     </div>
@@ -40,18 +37,10 @@
         <div class="row">
             <div class="col-sm-12 col-md-6">
                 <div class="input-group">
-                    <input
-                            class="form-control"
-                            placeholder="yyyy-mm-dd"
-                            name="dp"
-                            [(ngModel)]="date"
-                            [minDate]="minDate"
-                            ngbDatepicker
-                            #d="ngbDatepicker"
-                            (ngModelChange)="updatePreviewTime()"
-                    />
+                    <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
+                        [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
                     <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
-                            (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+                        (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
                     </button>
                 </div>
             </div>
@@ -68,49 +57,38 @@
         </div>
     </div>
     <div class="mb-2">
-        <span class="text-muted"> {{'system-wide-alert.form.label.countdownTo.hint' | translate}}</span>
+        <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
     </div>
-
-
     <div *ngIf="formMessage.value">
         <div class="row">
             <div class="col">
-                <label>{{ 'system-wide-alert.form.label.preview' | translate }}</label>
+                <label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
             </div>
         </div>
         <div class="rounded-0 alert alert-warning">
             <span class="font-weight-bold">
-        <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-            {{'system-wide-alert-banner.countdown.prefix' | translate }}
-        </span>
-            <span *ngIf="previewDays > 0">
-            {{'system-wide-alert-banner.countdown.days' | translate: {
-                days: previewDays
-            } }}
-        </span>
-            <span *ngIf="previewDays > 0 || previewHours > 0 ">
-            {{'system-wide-alert-banner.countdown.hours' | translate: {
-                hours: previewHours
-            } }}
-        </span>
-            <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-            {{'system-wide-alert-banner.countdown.minutes' | translate: {
-                minutes: previewMinutes
-            } }}
-        </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
+                </span>
+                <span *ngIf="previewDays > 0">
+                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
+                </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
+                </span>
+                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
+                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
+                </span>
             </span>
             <span [innerHTML]="formMessage.value"></span>
         </div>
     </div>
-
     <div class="btn-row float-right space-children-mr mt-2">
-        <button (click)="back()"
-                class="btn btn-outline-secondary"><i
-                class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid"
-                (click)="save()">
-            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
+        <button (click)="back()" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
+        </button>
+        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
+            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-
-</div>
+</div>
\ No newline at end of file

From 96748b9bacd8540af53bf7cf6e067b066c43128c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@hsu-hh.de>
Date: Wed, 20 Mar 2024 11:39:17 +0100
Subject: [PATCH 0202/1286] added missing interfaces

---
 ...lection-admin-search-result-grid-element.component.ts | 9 ++++++---
 ...mmunity-admin-search-result-grid-element.component.ts | 9 ++++++---
 ...lection-admin-search-result-list-element.component.ts | 9 ++++++---
 ...mmunity-admin-search-result-list-element.component.ts | 9 ++++++---
 .../collection-curate/collection-curate.component.ts     | 7 +++++--
 .../collection-source-controls.component.ts              | 2 +-
 .../forgot-password-form.component.ts                    | 7 +++++--
 .../item-register-doi/item-register-doi.component.ts     | 7 +++++--
 .../item-version-history.component.ts                    | 7 +++++--
 .../simple/related-items/related-items-component.ts      | 3 ++-
 .../date-value-input/date-value-input.component.ts       | 5 +++--
 .../string-value-input/string-value-input.component.ts   | 5 +++--
 .../process-parameters/process-parameters.component.ts   | 5 +++--
 .../dso-edit-menu-expandable-section.component.ts        | 3 ++-
 src/app/shared/error/error.component.ts                  | 8 +++++---
 .../dynamic-lookup-relation-selection-tab.component.ts   | 5 +++--
 .../access-status-badge/access-status-badge.component.ts | 4 +++-
 ...rkflow-item-search-result-detail-element.component.ts | 9 ++++++---
 ...kspace-item-search-result-detail-element.component.ts | 9 ++++++---
 .../item/item-search-result-grid-element.component.ts    | 7 +++++--
 .../identifier-data/identifier-data.component.ts         | 3 ++-
 ...imed-approved-search-result-list-element.component.ts | 5 +++--
 ...imed-declined-search-result-list-element.component.ts | 5 +++--
 ...workflow-item-search-result-list-element.component.ts | 5 +++--
 ...orkspace-item-search-result-list-element.component.ts | 5 +++--
 .../collection-search-result-list-element.component.ts   | 7 +++++--
 .../community-search-result-list-element.component.ts    | 8 +++++---
 .../sidebar-search-list-element.component.ts             | 7 +++++--
 .../abstract-paginated-drag-and-drop-list.component.ts   | 5 +++--
 src/app/shared/upload/uploader/uploader.component.ts     | 8 +++++---
 .../identifiers/section-identifiers.component.ts         | 6 +++---
 31 files changed, 126 insertions(+), 67 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 172226dd07..38352e7816 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
@@ -21,10 +24,10 @@ import { SearchResultGridElementComponent } from '../../../../../shared/object-g
 /**
  * The component for displaying a list element for a collection search result on the admin search page
  */
-export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> {
+export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index 50be35229d..509c1e9266 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
@@ -21,10 +24,10 @@ import { SearchResultGridElementComponent } from '../../../../../shared/object-g
 /**
  * The component for displaying a list element for a community search result on the admin search page
  */
-export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> {
+export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 37afbf14fe..0924379ea5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,10 +25,10 @@ import { SearchResultListElementComponent } from '../../../../../shared/object-l
 /**
  * The component for displaying a list element for a collection search result on the admin search page
  */
-export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 5861f15c1f..c4146dbd60 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,10 +25,10 @@ import { SearchResultListElementComponent } from '../../../../../shared/object-l
 /**
  * The component for displaying a list element for a community search result on the admin search page
  */
-export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
index 14ba01421b..370506e473 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -1,5 +1,8 @@
 import { AsyncPipe } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -28,7 +31,7 @@ import { hasValue } from '../../../shared/empty.util';
   ],
   standalone: true,
 })
-export class CollectionCurateComponent {
+export class CollectionCurateComponent implements OnInit {
   dsoRD$: Observable<RemoteData<Collection>>;
   collectionName$: Observable<string>;
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 3b51a8e9d9..fdd65a43c7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -95,7 +95,7 @@ export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
   ) {
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     // ensure the contentSource gets updated after being set to stale
     this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe(
       getAllSucceededRemoteDataPayload(),
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 442e4bf9fa..7b2b1beedd 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -2,7 +2,10 @@ import {
   AsyncPipe,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import {
   ActivatedRoute,
   Router,
@@ -45,7 +48,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 /**
  * Component for a user to enter a new password for a forgot token.
  */
-export class ForgotPasswordFormComponent {
+export class ForgotPasswordFormComponent implements OnInit {
 
   registration$: Observable<Registration>;
 
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index 9acc12e95d..d9e0283267 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -3,7 +3,10 @@ import {
   NgForOf,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import {
   ActivatedRoute,
   Router,
@@ -47,7 +50,7 @@ import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstrac
 /**
  * Component responsible for rendering the Item Register DOI page
  */
-export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent {
+export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent implements OnInit {
 
   protected messageKey = 'register-doi';
   doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update';
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index 9c61231164..a414af0ce4 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -2,7 +2,10 @@ import {
   AsyncPipe,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -28,7 +31,7 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
 /**
  * Component for listing and managing an item's version history
  */
-export class ItemVersionHistoryComponent {
+export class ItemVersionHistoryComponent implements OnInit {
   /**
    * The item to display the version history for
    */
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index b65f903a5d..434093ba2a 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -10,6 +10,7 @@ import {
   ElementRef,
   Inject,
   Input,
+  OnInit,
   PLATFORM_ID,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -43,7 +44,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
  * This component is used for displaying relations between items
  * It expects a parent item and relationship type, as well as a label to display on top
  */
-export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> {
+export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> implements OnInit {
 
   /**
    * The parent of the list of related items to display
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index 29b2a85d57..74ee21471c 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -2,6 +2,7 @@ import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
+  OnInit,
   Optional,
 } from '@angular/core';
 import {
@@ -27,7 +28,7 @@ import { ValueInputComponent } from '../value-input.component';
   standalone: true,
   imports: [FormsModule, NgIf, TranslateModule],
 })
-export class DateValueInputComponent extends ValueInputComponent<string> {
+export class DateValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
    * The current value of the date string
    */
@@ -38,7 +39,7 @@ export class DateValueInputComponent extends ValueInputComponent<string> {
    */
   @Input() initialValue;
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.value = this.initialValue;
   }
 
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index d19e149311..d7fa528544 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -2,6 +2,7 @@ import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
+  OnInit,
   Optional,
 } from '@angular/core';
 import {
@@ -27,7 +28,7 @@ import { ValueInputComponent } from '../value-input.component';
   standalone: true,
   imports: [FormsModule, NgIf, TranslateModule],
 })
-export class StringValueInputComponent extends ValueInputComponent<string> {
+export class StringValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
    * The current value of the string
    */
@@ -38,7 +39,7 @@ export class StringValueInputComponent extends ValueInputComponent<string> {
    */
   @Input() initialValue;
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.value = this.initialValue;
   }
 
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index 0b72b086c1..ac174e338b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -7,6 +7,7 @@ import {
   EventEmitter,
   Input,
   OnChanges,
+  OnInit,
   Optional,
   Output,
   SimpleChanges,
@@ -39,7 +40,7 @@ import { ParameterSelectComponent } from './parameter-select/parameter-select.co
   standalone: true,
   imports: [NgIf, NgFor, ParameterSelectComponent, TranslateModule],
 })
-export class ProcessParametersComponent implements OnChanges {
+export class ProcessParametersComponent implements OnChanges, OnInit {
   /**
    * The currently selected script
    */
@@ -59,7 +60,7 @@ export class ProcessParametersComponent implements OnChanges {
    */
   parameterValues: ProcessParameter[];
 
-  ngOnInit() {
+  ngOnInit(): void {
     if (hasValue(this.initialParams)) {
       this.parameterValues = this.initialParams;
     }
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8f458d4e56..94d0ddd260 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -8,6 +8,7 @@ import {
   Component,
   Inject,
   Injector,
+  OnInit,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -34,7 +35,7 @@ import { MenuService } from '../../../menu/menu.service';
   standalone: true,
   imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe],
 })
-export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
+export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
   menuID: MenuID = MenuID.DSO_EDIT;
   itemModel;
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index 900ea67887..168415c0b1 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -1,6 +1,8 @@
 import {
   Component,
   Input,
+  OnDestroy,
+  OnInit,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
@@ -15,7 +17,7 @@ import { AlertType } from '../alert/alert-type';
   standalone: true,
   imports: [AlertComponent],
 })
-export class ErrorComponent {
+export class ErrorComponent implements OnDestroy, OnInit {
 
   @Input() message = 'Error...';
 
@@ -31,7 +33,7 @@ export class ErrorComponent {
 
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     if (this.message === undefined) {
       this.subscription = this.translate.get('error.default').subscribe((message: string) => {
         this.message = message;
@@ -39,7 +41,7 @@ export class ErrorComponent {
     }
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     if (this.subscription !== undefined) {
       this.subscription.unsubscribe();
     }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index d1e516513b..51229be599 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -6,6 +6,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnInit,
   Output,
 } from '@angular/core';
 import { Router } from '@angular/router';
@@ -57,7 +58,7 @@ import { PaginatedSearchOptions } from '../../../../../search/models/paginated-s
 /**
  * Tab for inside the lookup model that represents the currently selected relationships
  */
-export class DsDynamicLookupRelationSelectionTabComponent {
+export class DsDynamicLookupRelationSelectionTabComponent implements OnInit {
   /**
    * A string that describes the type of relationship
    */
@@ -120,7 +121,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   /**
    * Set up the selection and pagination on load
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.resetRoute();
     this.selectionRD$ = this.searchConfigService.paginatedSearchOptions
       .pipe(
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 5b69a7e72a..0b86b782f6 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -5,6 +5,8 @@ import {
 import {
   Component,
   Input,
+  OnDestroy,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -35,7 +37,7 @@ import { AccessStatusObject } from './access-status.model';
 /**
  * Component rendering the access status of an item as a badge
  */
-export class AccessStatusBadgeComponent {
+export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
 
   @Input() object: DSpaceObject;
   accessStatus$: Observable<string>;
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
index cd28223013..1453d9246e 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 import { Context } from 'src/app/core/shared/context.model';
@@ -29,7 +32,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.DetailedListElement)
-export class WorkflowItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnInit {
 
   /**
    * The item object that belonging to the result object
@@ -51,7 +54,7 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
index 5c51e3464f..b88cef64b5 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 
@@ -29,7 +32,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.DetailedListElement)
-export class WorkspaceItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkspaceItemSearchResult, WorkspaceItem> {
+export class WorkspaceItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
 
   /**
    * The item object that belonging to the result object
@@ -51,7 +54,7 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
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 c9c56daff1..a0c8ec84ce 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
@@ -3,7 +3,10 @@ import {
   NgFor,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -35,7 +38,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
 /**
  * The component for displaying a grid element for an item search result of the type Publication
  */
-export class ItemSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
   /**
    * Route to the item's page
    */
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index ecc0bd1ca3..af658c6cf2 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Input,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -28,7 +29,7 @@ import { IdentifierData } from './identifier-data.model';
 /**
  * Component rendering an identifier, eg. DOI or handle
  */
-export class IdentifierDataComponent {
+export class IdentifierDataComponent implements OnInit {
 
   @Input() item: Item;
   identifiers$: Observable<IdentifierData>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index fc024944e8..f94effe2a4 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -40,7 +41,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
-export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
+export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
 
   /**
    * A boolean representing if to show submitter information
@@ -69,7 +70,7 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index fa5f7a3a04..d69b9ecda0 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -40,7 +41,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
-export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
+export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
 
   /**
    * A boolean representing if to show submitter information
@@ -69,7 +70,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 7c88dcc36d..d7f735e1ad 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -43,7 +44,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement)
-export class WorkflowItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnInit {
   LinkTypes = CollectionElementLinkType;
 
   ViewModes = ViewMode;
@@ -75,7 +76,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.deriveSearchResult();
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 8938064da6..4a8863d22f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -43,7 +44,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement)
-export class  WorkspaceItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkspaceItemSearchResult, WorkspaceItem> {
+export class  WorkspaceItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
   LinkTypes = CollectionElementLinkType;
 
   ViewModes = ViewMode;
@@ -75,7 +76,7 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.deriveSearchResult();
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 58cd875ce2..2641792b02 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -2,7 +2,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Collection } from '../../../../core/shared/collection.model';
@@ -23,7 +26,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
  * Component representing a collection search result in list view
  */
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement)
-export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> implements OnInit {
 
   /**
    * Display thumbnails if required by configuration
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index 52d7ad6e6b..e8e3c57959 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -2,7 +2,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Community } from '../../../../core/shared/community.model';
@@ -23,13 +26,12 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
  * Component representing a community search result in list view
  */
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement)
-export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> implements OnInit {
   /**
    * Display thumbnails if required by configuration
    */
   showThumbnails: boolean;
 
-
   ngOnInit(): void {
     super.ngOnInit();
     this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index c262dee259..e65883cd3e 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -3,7 +3,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   Observable,
@@ -41,7 +44,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
  * It displays the name of the parent, title and description of the object. All of which are customizable in the child
  * component by overriding the relevant methods of this component
  */
-export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> {
+export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> implements OnInit {
   /**
    * Observable for the title of the parent object (displayed above the object's title)
    */
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
index 1ebf626484..444e7bc14c 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
@@ -7,6 +7,7 @@ import {
   ElementRef,
   EventEmitter,
   OnDestroy,
+  OnInit,
   Output,
   ViewChild,
 } from '@angular/core';
@@ -65,7 +66,7 @@ export const compareArraysUsingFieldUuids = () =>
   selector: 'ds-paginated-drag-drop-abstract',
   template: '',
 })
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
+export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnInit, OnDestroy {
   /**
    * A view on the child pagination component
    */
@@ -142,7 +143,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   /**
    * Initialize the observables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.initializeObjectsRD();
     this.initializeURL();
     this.initializeUpdates();
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index f4b2c35314..fbab09be3e 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -1,12 +1,14 @@
 import { CommonModule } from '@angular/common';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   EventEmitter,
   HostListener,
   Input,
+  OnInit,
   Output,
   ViewEncapsulation,
 } from '@angular/core';
@@ -42,7 +44,7 @@ import { UploaderProperties } from './uploader-properties.model';
   standalone: true,
   imports: [TranslateModule, FileUploadModule, CommonModule],
 })
-export class UploaderComponent {
+export class UploaderComponent implements OnInit, AfterViewInit {
 
   /**
    * The message to show when drag files on the drop zone
@@ -122,7 +124,7 @@ export class UploaderComponent {
   /**
    * Method provided by Angular. Invoked after the constructor.
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.uploaderId = 'ds-drag-and-drop-uploader' + uniqueId();
     this.checkConfig(this.uploadFilesOptions);
     this.uploader = new FileUploader({
@@ -147,7 +149,7 @@ export class UploaderComponent {
     }
   }
 
-  ngAfterViewInit() {
+  ngAfterViewInit(): void {
     this.uploader.onAfterAddingAll = ((items) => {
       this.onFileSelected.emit(items);
     });
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index 1483ea47b7..e297c795df 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import {
   TranslateModule,
@@ -47,7 +48,7 @@ import { SectionsService } from '../sections.service';
   standalone: true,
 })
 
-export class SubmissionSectionIdentifiersComponent extends SectionModelComponent {
+export class SubmissionSectionIdentifiersComponent extends SectionModelComponent implements OnInit {
   /**
    * The Alert categories.
    * @type {AlertType}
@@ -76,7 +77,6 @@ export class SubmissionSectionIdentifiersComponent extends SectionModelComponent
   /**
    * Initialize instance variables.
    *
-   * @param {PaginationService} paginationService
    * @param {TranslateService} translate
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
@@ -93,7 +93,7 @@ export class SubmissionSectionIdentifiersComponent extends SectionModelComponent
     super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
   }
 

From 479adf6519dcf88b539d525fa3703671a6fe99a3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 14 May 2024 17:46:43 +0200
Subject: [PATCH 0203/1286] 115046: Fixed failing tests & added new test to
 cover added code

---
 .../core/data/relationship-data.service.ts    |   2 +-
 .../edit-item-relationships.service.spec.ts   | 293 +++++++++++++++-
 .../edit-item-relationships.service.ts        |  10 +-
 .../edit-relationship-list.component.spec.ts  | 331 +++++++++---------
 .../edit-relationship-list.component.ts       |   4 +-
 .../item-relationships.component.spec.ts      |  10 +-
 .../shared/testing/base-data-service.stub.ts  |   7 +
 .../edit-item-relationships.service.stub.ts   |  48 +++
 .../testing/entity-type-data.service.stub.ts  |   5 +
 .../shared/testing/item-data.service.stub.ts  |   8 +
 .../testing/object-updates.service.stub.ts    |  24 ++
 .../testing/relationship-data.service.stub.ts |  86 +++++
 12 files changed, 655 insertions(+), 173 deletions(-)
 create mode 100644 src/app/shared/testing/edit-item-relationships.service.stub.ts
 create mode 100644 src/app/shared/testing/entity-type-data.service.stub.ts
 create mode 100644 src/app/shared/testing/item-data.service.stub.ts
 create mode 100644 src/app/shared/testing/object-updates.service.stub.ts
 create mode 100644 src/app/shared/testing/relationship-data.service.stub.ts

diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index b002d4c9ce..a7ab4eb31c 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -196,7 +196,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * Method to remove an item that's part of a relationship from the cache
    * @param item The item to remove from the cache
    */
-  public refreshRelationshipItemsInCache(item) {
+  public refreshRelationshipItemsInCache(item: Item): void {
     this.objectCache.remove(item._links.self.href);
     this.requestService.removeByHrefSubstring(item.uuid);
     observableCombineLatest([
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
index af5ec5ea04..93a5425a6c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -1,16 +1,303 @@
 import { TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
 
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable,
+} from '../../../core/data/object-updates/object-updates.reducer';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { EntityTypeDataServiceStub } from '../../../shared/testing/entity-type-data.service.stub';
+import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { ObjectUpdatesServiceStub } from '../../../shared/testing/object-updates.service.stub';
+import { RelationshipDataServiceStub } from '../../../shared/testing/relationship-data.service.stub';
 import { EditItemRelationshipsService } from './edit-item-relationships.service';
 
 describe('EditItemRelationshipsService', () => {
   let service: EditItemRelationshipsService;
 
+  let itemService: ItemDataServiceStub;
+  let objectUpdatesService: ObjectUpdatesServiceStub;
+  let notificationsService: NotificationsServiceStub;
+  let relationshipService: RelationshipDataServiceStub;
+  let entityTypeDataService: EntityTypeDataServiceStub;
+
+  let currentItem: Item;
+
+  let relationshipItem1: Item;
+  let relationshipIdentifiable1: RelationshipIdentifiable;
+  let relationship1: Relationship;
+
+  let relationshipItem2: Item;
+  let relationshipIdentifiable2: RelationshipIdentifiable;
+  let relationship2: Relationship;
+
+  let orgUnitType: ItemType;
+  let orgUnitToOrgUnitType: RelationshipType;
+
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    itemService = new ItemDataServiceStub();
+    objectUpdatesService = new ObjectUpdatesServiceStub();
+    notificationsService = new NotificationsServiceStub();
+    relationshipService = new RelationshipDataServiceStub();
+    entityTypeDataService = new EntityTypeDataServiceStub();
+
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        { provide: ItemDataService, useValue: itemService },
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: EntityTypeDataService, useValue: entityTypeDataService },
+      ],
+    });
     service = TestBed.inject(EditItemRelationshipsService);
   });
 
-  it('should be created', () => {
-    expect(service).toBeTruthy();
+  beforeEach(() => {
+    currentItem = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink1',
+        },
+      },
+    });
+
+    relationshipItem1 = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink2',
+        },
+      },
+    });
+    relationshipIdentifiable1 = {
+      originalItem: currentItem,
+      relatedItem: relationshipItem1,
+      type: orgUnitToOrgUnitType,
+      uuid: `1-${relationshipItem1.uuid}`,
+    } as RelationshipIdentifiable;
+    relationship1 = Object.assign(new Relationship(), {
+      _links: {
+        leftItem: currentItem._links.self,
+        rightItem: relationshipItem1._links.self,
+      },
+    });
+
+    relationshipItem2 = Object.assign(new Item(), {
+      uuid: uuidv4(),
+      metadata: {
+        'dspace.entity.type': 'OrgUnit',
+      },
+      _links: {
+        self: {
+          href: 'selfLink3',
+        },
+      },
+    });
+    relationshipIdentifiable2 = {
+      originalItem: currentItem,
+      relatedItem: relationshipItem2,
+      type: orgUnitToOrgUnitType,
+      uuid: `1-${relationshipItem2.uuid}`,
+    } as RelationshipIdentifiable;
+    relationship2 = Object.assign(new Relationship(), {
+      _links: {
+        leftItem: currentItem._links.self,
+        rightItem: relationshipItem2._links.self,
+      },
+    });
+
+    orgUnitType = Object.assign(new ItemType(), {
+      id: '2',
+      label: 'OrgUnit',
+    });
+    orgUnitToOrgUnitType = Object.assign(new RelationshipType(), {
+      id: '1',
+      leftMaxCardinality: null,
+      leftMinCardinality: 0,
+      leftType: createSuccessfulRemoteDataObject$(orgUnitType),
+      leftwardType: 'isOrgUnitOfOrgUnit',
+      rightMaxCardinality: null,
+      rightMinCardinality: 0,
+      rightType: createSuccessfulRemoteDataObject$(orgUnitType),
+      rightwardType: 'isOrgUnitOfOrgUnit',
+      uuid: 'relationshiptype-1',
+    });
+  });
+
+  describe('submit', () => {
+    let fieldUpdateAddRelationship1: FieldUpdate;
+    let fieldUpdateRemoveRelationship2: FieldUpdate;
+
+    beforeEach(() => {
+      fieldUpdateAddRelationship1 = {
+        changeType: FieldChangeType.ADD,
+        field: relationshipIdentifiable1,
+      };
+      fieldUpdateRemoveRelationship2 = {
+        changeType: FieldChangeType.REMOVE,
+        field: relationshipIdentifiable2,
+      };
+
+      spyOn(service, 'addRelationship').withArgs(relationshipIdentifiable1).and.returnValue(createSuccessfulRemoteDataObject$(relationship1));
+      spyOn(service, 'deleteRelationship').withArgs(relationshipIdentifiable2 as DeleteRelationship).and.returnValue(createSuccessfulRemoteDataObject$({}));
+      spyOn(itemService, 'invalidateByHref').and.callThrough();
+    });
+
+    it('should support performing multiple relationships manipulations in one submit() call', () => {
+      spyOn(objectUpdatesService, 'getFieldUpdates').and.returnValue(observableOf({
+        [`1-${relationshipItem1.uuid}`]: fieldUpdateAddRelationship1,
+        [`1-${relationshipItem2.uuid}`]: fieldUpdateRemoveRelationship2,
+      } as FieldUpdates));
+      service.submit(currentItem, `/entities/orgunit/${currentItem.uuid}/edit/relationships`);
+
+      expect(service.addRelationship).toHaveBeenCalledWith(relationshipIdentifiable1);
+      expect(service.deleteRelationship).toHaveBeenCalledWith(relationshipIdentifiable2 as DeleteRelationship);
+
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(currentItem.self);
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem1.self);
+      // TODO currently this isn't done yet
+      // expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem2.self);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('deleteRelationship', () => {
+    beforeEach(() => {
+      spyOn(relationshipService, 'deleteRelationship').and.callThrough();
+    });
+
+    it('should pass "all" as copyVirtualMetadata when the user want to keep the data on both sides', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: true,
+        keepRightVirtualMetadata: true,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'all', false);
+    });
+
+    it('should pass "left" as copyVirtualMetadata when the user only want to keep the data on the left side', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: true,
+        keepRightVirtualMetadata: false,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'left', false);
+    });
+
+    it('should pass "right" as copyVirtualMetadata when the user only want to keep the data on the right side', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: false,
+        keepRightVirtualMetadata: true,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'right', false);
+    });
+
+    it('should pass "none" as copyVirtualMetadata when the user doesn\'t want to keep the virtual metadata', () => {
+      service.deleteRelationship({
+        uuid: relationshipItem1.uuid,
+        keepLeftVirtualMetadata: false,
+        keepRightVirtualMetadata: false,
+      } as DeleteRelationship);
+
+      expect(relationshipService.deleteRelationship).toHaveBeenCalledWith(relationshipItem1.uuid, 'none', false);
+    });
+  });
+
+  describe('addRelationship', () => {
+    beforeEach(() => {
+      spyOn(relationshipService, 'addRelationship').and.callThrough();
+    });
+
+    it('should call the addRelationship from relationshipService correctly when original item is on the right', () => {
+      service.addRelationship({
+        originalItem: currentItem,
+        originalIsLeft: false,
+        relatedItem: relationshipItem1,
+        type: orgUnitToOrgUnitType,
+        uuid: `1-${relationshipItem1.uuid}`,
+      } as RelationshipIdentifiable);
+      expect(relationshipService.addRelationship).toHaveBeenCalledWith(orgUnitToOrgUnitType.id, relationshipItem1, currentItem, undefined, null, false);
+    });
+
+    it('should call the addRelationship from relationshipService correctly when original item is on the left', () => {
+      service.addRelationship({
+        originalItem: currentItem,
+        originalIsLeft: true,
+        relatedItem: relationshipItem1,
+        type: orgUnitToOrgUnitType,
+        uuid: `1-${relationshipItem1.uuid}`,
+      } as RelationshipIdentifiable);
+
+      expect(relationshipService.addRelationship).toHaveBeenCalledWith(orgUnitToOrgUnitType.id, currentItem, relationshipItem1, null, undefined, false);
+    });
+  });
+
+  describe('displayNotifications', () => {
+    it('should show one success notification when multiple requests succeeded', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createSuccessfulRemoteDataObject({}),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+    });
+
+    it('should show one success notification even when some requests failed', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed'),
+        createSuccessfulRemoteDataObject({}),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+      expect(notificationsService.error).toHaveBeenCalledTimes(1);
+    });
+
+    it('should show a separate error notification for each failed request', () => {
+      service.displayNotifications([
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed 1'),
+        createSuccessfulRemoteDataObject({}),
+        createFailedRemoteDataObject('Request Failed 2'),
+      ]);
+
+      expect(notificationsService.success).toHaveBeenCalledTimes(1);
+      expect(notificationsService.error).toHaveBeenCalledTimes(2);
+    });
   });
 });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
index 4a5e37c0e9..2cecd878b7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -10,7 +10,7 @@ import {
 } from '../../../core/data/object-updates/object-updates.reducer';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { EMPTY, Observable, BehaviorSubject } from 'rxjs';
+import { EMPTY, Observable, BehaviorSubject, Subscription } from 'rxjs';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Item } from '../../../core/shared/item.model';
@@ -109,7 +109,7 @@ export class EditItemRelationshipsService {
   /**
    * Sends all initial values of this item to the object updates service
    */
-  public initializeOriginalFields(item: Item, url: string) {
+  public initializeOriginalFields(item: Item, url: string): Subscription {
     return this.relationshipService.getRelatedItems(item).pipe(
       take(1),
     ).subscribe((items: Item[]) => {
@@ -157,7 +157,7 @@ export class EditItemRelationshipsService {
    * - Success notification in case there's at least one successful response
    * @param responses
    */
-  displayNotifications(responses: RemoteData<NoContent>[]) {
+  displayNotifications(responses: RemoteData<NoContent>[]): void {
     const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
     const successfulResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
 
@@ -175,7 +175,7 @@ export class EditItemRelationshipsService {
    * Get translated notification title
    * @param key
    */
-  getNotificationTitle(key: string) {
+  getNotificationTitle(key: string): string {
     return this.translateService.instant(this.notificationsPrefix + key + '.title');
   }
 
@@ -183,7 +183,7 @@ export class EditItemRelationshipsService {
    * Get translated notification content
    * @param key
    */
-  getNotificationContent(key: string) {
+  getNotificationContent(key: string): string {
     return this.translateService.instant(this.notificationsPrefix + key + '.content');
 
   }
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 4cd663f0fb..3a627232a4 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -32,67 +32,70 @@ import { ConfigurationProperty } from '../../../../core/shared/configuration-pro
 import { Router } from '@angular/router';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
-
-let comp: EditRelationshipListComponent;
-let fixture: ComponentFixture<EditRelationshipListComponent>;
-let de: DebugElement;
-
-let linkService;
-let objectUpdatesService;
-let relationshipService;
-let selectableListService;
-let paginationService;
-let hostWindowService;
-const relationshipTypeService = {};
-
-const url = 'http://test-url.com/test-url';
-
-let item;
-let entityType;
-let relatedEntityType;
-let author1;
-let author2;
-let fieldUpdate1;
-let fieldUpdate2;
-let relationships;
-let relationshipType;
-let paginationOptions;
+import { EditItemRelationshipsServiceStub } from '../../../../shared/testing/edit-item-relationships.service.stub';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { cold } from 'jasmine-marbles';
 
 describe('EditRelationshipListComponent', () => {
 
+  let comp: EditRelationshipListComponent;
+  let fixture: ComponentFixture<EditRelationshipListComponent>;
+  let de: DebugElement;
+
+  let linkService;
+  let objectUpdatesService;
+  let relationshipService;
+  let selectableListService;
+  let paginationService: PaginationServiceStub;
+  let hostWindowService: HostWindowServiceStub;
+  const relationshipTypeService = {};
+  let editItemRelationshipsService: EditItemRelationshipsServiceStub;
+
+  const url = 'http://test-url.com/test-url';
+
+  let itemLeft: Item;
+  let entityTypeLeft: ItemType;
+  let entityTypeRight: ItemType;
+  let itemRight1: Item;
+  let itemRight2: Item;
+  let fieldUpdate1;
+  let fieldUpdate2;
+  let relationships: Relationship[];
+  let relationshipType: RelationshipType;
+  let paginationOptions: PaginationComponentOptions;
+
   const resetComponent = () => {
     fixture = TestBed.createComponent(EditRelationshipListComponent);
     comp = fixture.componentInstance;
     de = fixture.debugElement;
-    comp.item = item;
-    comp.itemType = entityType;
+    comp.item = itemLeft;
+    comp.itemType = entityTypeLeft;
     comp.url = url;
     comp.relationshipType = relationshipType;
     comp.hasChanges = observableOf(false);
     fixture.detectChanges();
   };
 
-  beforeEach(waitForAsync(() => {
-
-    entityType = Object.assign(new ItemType(), {
-      id: 'Publication',
-      uuid: 'Publication',
-      label: 'Publication',
+  function init(leftType: string, rightType: string): void {
+    entityTypeLeft = Object.assign(new ItemType(), {
+      id: leftType,
+      uuid: leftType,
+      label: leftType,
     });
 
-    relatedEntityType = Object.assign(new ItemType(), {
-      id: 'Author',
-      uuid: 'Author',
-      label: 'Author',
+    entityTypeRight = Object.assign(new ItemType(), {
+      id: rightType,
+      uuid: rightType,
+      label: rightType,
     });
 
     relationshipType = Object.assign(new RelationshipType(), {
       id: '1',
       uuid: '1',
-      leftType: createSuccessfulRemoteDataObject$(entityType),
-      rightType: createSuccessfulRemoteDataObject$(relatedEntityType),
-      leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor',
+      leftType: createSuccessfulRemoteDataObject$(entityTypeLeft),
+      rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
+      leftwardType: `is${rightType}Of${leftType}`,
+      rightwardType: `is${leftType}Of${rightType}`,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -101,13 +104,13 @@ describe('EditRelationshipListComponent', () => {
       currentPage: 1,
     });
 
-    author1 = Object.assign(new Item(), {
-      id: 'author1',
-      uuid: 'author1'
+    itemRight1 = Object.assign(new Item(), {
+      id: `${rightType}-1`,
+      uuid: `${rightType}-1`,
     });
-    author2 = Object.assign(new Item(), {
-      id: 'author2',
-      uuid: 'author2'
+    itemRight2 = Object.assign(new Item(), {
+      id: `${rightType}-2`,
+      uuid: `${rightType}-2`,
     });
 
     relationships = [
@@ -116,25 +119,25 @@ describe('EditRelationshipListComponent', () => {
         id: '2',
         uuid: '2',
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
-        leftItem: createSuccessfulRemoteDataObject$(item),
-        rightItem: createSuccessfulRemoteDataObject$(author1),
+        leftItem: createSuccessfulRemoteDataObject$(itemLeft),
+        rightItem: createSuccessfulRemoteDataObject$(itemRight1),
       }),
       Object.assign(new Relationship(), {
         self: url + '/3',
         id: '3',
         uuid: '3',
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
-        leftItem: createSuccessfulRemoteDataObject$(item),
-        rightItem: createSuccessfulRemoteDataObject$(author2),
+        leftItem: createSuccessfulRemoteDataObject$(itemLeft),
+        rightItem: createSuccessfulRemoteDataObject$(itemRight2),
       })
     ];
 
-    item = Object.assign(new Item(), {
+    itemLeft = Object.assign(new Item(), {
       _links: {
         self: { href: 'fake-item-url/publication' }
       },
-      id: 'publication',
-      uuid: 'publication',
+      id: `1-${leftType}`,
+      uuid: `1-${leftType}`,
       relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
     });
 
@@ -166,7 +169,7 @@ describe('EditRelationshipListComponent', () => {
 
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
-        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])),
+        getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([itemRight1, itemRight2])),
         getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
         isLeftItem: observableOf(true),
       }
@@ -202,6 +205,8 @@ describe('EditRelationshipListComponent', () => {
       }))
     });
 
+    editItemRelationshipsService = new EditItemRelationshipsServiceStub();
+
     const environmentUseThumbs = {
       browseBy: {
         showThumbnails: true
@@ -224,6 +229,7 @@ describe('EditRelationshipListComponent', () => {
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: EditItemRelationshipsService, useValue: editItemRelationshipsService },
         { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ], schemas: [
         NO_ERRORS_SCHEMA
@@ -231,114 +237,127 @@ describe('EditRelationshipListComponent', () => {
     }).compileComponents();
 
     resetComponent();
-  }));
+  }
 
-  describe('changeType is REMOVE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.REMOVE;
-      fixture.detectChanges();
-    });
-    it('the div should have class alert-danger', () => {
-      const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement;
-      expect(element.classList).toContain('alert-danger');
-    });
-  });
+  describe('Publication - Author relationship', () => {
+    beforeEach(waitForAsync(() => init('Publication', 'Author')));
 
-  describe('pagination component', () => {
-    let paginationComp: PaginationComponent;
-
-    beforeEach(() => {
-      paginationComp = de.query(By.css('ds-pagination')).componentInstance;
-    });
-
-    it('should receive the correct pagination config', () => {
-      expect(paginationComp.paginationOptions).toEqual(paginationOptions);
-    });
-
-    it('should receive correct collection size', () => {
-      expect(paginationComp.collectionSize).toEqual(relationships.length);
-    });
-
-  });
-
-  describe('relationshipService.getItemRelationshipsByLabel', () => {
-    it('should receive the correct pagination info', () => {
-      expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-      const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-      const findListOptions = callArgs[2];
-      const linksToFollow = callArgs[5];
-      expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
-      expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
-      expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail');
-
-    });
-
-    describe('when the publication is on the left side of the relationship', () => {
+    describe('changeType is REMOVE', () => {
       beforeEach(() => {
-        relationshipType = Object.assign(new RelationshipType(), {
-          id: '1',
-          uuid: '1',
-          leftType: createSuccessfulRemoteDataObject$(entityType), // publication
-          rightType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
-          leftwardType: 'isAuthorOfPublication',
-          rightwardType: 'isPublicationOfAuthor',
-        });
-        relationshipService.getItemRelationshipsByLabel.calls.reset();
-        resetComponent();
-      });
-
-      it('should fetch isAuthorOfPublication', () => {
-        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-        const label = callArgs[1];
-
-        expect(label).toEqual('isAuthorOfPublication');
-      });
-    });
-
-    describe('when the publication is on the right side of the relationship', () => {
-      beforeEach(() => {
-        relationshipType = Object.assign(new RelationshipType(), {
-          id: '1',
-          uuid: '1',
-          leftType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
-          rightType: createSuccessfulRemoteDataObject$(entityType), // publication
-          leftwardType: 'isPublicationOfAuthor',
-          rightwardType: 'isAuthorOfPublication',
-        });
-        relationshipService.getItemRelationshipsByLabel.calls.reset();
-        resetComponent();
-      });
-
-      it('should fetch isAuthorOfPublication', () => {
-        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
-
-        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
-        const label = callArgs[1];
-
-        expect(label).toEqual('isAuthorOfPublication');
-      });
-    });
-
-
-
-    describe('changes managment for add buttons', () => {
-
-      it('should show enabled add buttons', () => {
-        const element = de.query(By.css('.btn-success'));
-        expect(element.nativeElement?.disabled).toBeFalse();
-      });
-
-      it('after hash changes changed', () => {
-        comp.hasChanges = observableOf(true);
+        fieldUpdate1.changeType = FieldChangeType.REMOVE;
         fixture.detectChanges();
-        const element = de.query(By.css('.btn-success'));
-        expect(element.nativeElement?.disabled).toBeTrue();
+      });
+      it('the div should have class alert-danger', () => {
+        const element = de.queryAll(By.css('.relationship-row'))[1].nativeElement;
+        expect(element.classList).toContain('alert-danger');
       });
     });
 
+    describe('pagination component', () => {
+      let paginationComp: PaginationComponent;
+
+      beforeEach(() => {
+        paginationComp = de.query(By.css('ds-pagination')).componentInstance;
+      });
+
+      it('should receive the correct pagination config', () => {
+        expect(paginationComp.paginationOptions).toEqual(paginationOptions);
+      });
+
+      it('should receive correct collection size', () => {
+        expect(paginationComp.collectionSize).toEqual(relationships.length);
+      });
+
+    });
+
+    describe('relationshipService.getItemRelationshipsByLabel', () => {
+      it('should receive the correct pagination info', () => {
+        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+        const findListOptions = callArgs[2];
+        const linksToFollow = callArgs[5];
+        expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
+        expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
+        expect(linksToFollow.linksToFollow[0].name).toEqual('thumbnail');
+
+      });
+
+      describe('when the publication is on the left side of the relationship', () => {
+        beforeEach(() => {
+          relationshipType = Object.assign(new RelationshipType(), {
+            id: '1',
+            uuid: '1',
+            leftType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication
+            rightType: createSuccessfulRemoteDataObject$(entityTypeRight), // author
+            leftwardType: 'isAuthorOfPublication',
+            rightwardType: 'isPublicationOfAuthor',
+          });
+          relationshipService.getItemRelationshipsByLabel.calls.reset();
+          resetComponent();
+        });
+
+        it('should fetch isAuthorOfPublication', () => {
+          expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+          const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+          const label = callArgs[1];
+
+          expect(label).toEqual('isAuthorOfPublication');
+        });
+      });
+
+      describe('when the publication is on the right side of the relationship', () => {
+        beforeEach(() => {
+          relationshipType = Object.assign(new RelationshipType(), {
+            id: '1',
+            uuid: '1',
+            leftType: createSuccessfulRemoteDataObject$(entityTypeRight), // author
+            rightType: createSuccessfulRemoteDataObject$(entityTypeLeft), // publication
+            leftwardType: 'isPublicationOfAuthor',
+            rightwardType: 'isAuthorOfPublication',
+          });
+          relationshipService.getItemRelationshipsByLabel.calls.reset();
+          resetComponent();
+        });
+
+        it('should fetch isAuthorOfPublication', () => {
+          expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+          const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+          const label = callArgs[1];
+
+          expect(label).toEqual('isAuthorOfPublication');
+        });
+      });
+
+
+
+      describe('changes managment for add buttons', () => {
+
+        it('should show enabled add buttons', () => {
+          const element = de.query(By.css('.btn-success'));
+          expect(element.nativeElement?.disabled).toBeFalse();
+        });
+
+        it('after hash changes changed', () => {
+          comp.hasChanges = observableOf(true);
+          fixture.detectChanges();
+          const element = de.query(By.css('.btn-success'));
+          expect(element.nativeElement?.disabled).toBeTrue();
+        });
+      });
+
+    });
   });
 
+  describe('OrgUnit - OrgUnit relationship', () => {
+    beforeEach(waitForAsync(() => init('OrgUnit', 'OrgUnit')));
+
+    it('should emit the relatedEntityType$ even for same entity relationships', () => {
+      expect(comp.relatedEntityType$).toBeObservable(cold('(a|)', {
+        a: entityTypeRight,
+      }));
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 54c870cfae..57f8116b9c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -58,7 +58,6 @@ import {
   PaginationComponentOptions
 } from '../../../../shared/pagination/pagination-component-options.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
@@ -116,7 +115,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   private currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
 
-  private relatedEntityType$: Observable<ItemType>;
+  relatedEntityType$: Observable<ItemType>;
 
   /**
    * The translation key for the entity type
@@ -178,7 +177,6 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected objectUpdatesService: ObjectUpdatesService,
     protected linkService: LinkService,
     protected relationshipService: RelationshipDataService,
-    protected relationshipTypeService: RelationshipTypeDataService,
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index b7bd0f789f..24dc86cc3d 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -29,6 +29,7 @@ import { RelationshipTypeDataService } from '../../../core/data/relationship-typ
 import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
+import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -52,7 +53,7 @@ const notificationsService = jasmine.createSpyObj('notificationsService',
 const router = new RouterStub();
 let relationshipTypeService;
 let routeStub;
-let itemService;
+let itemService: ItemDataServiceStub;
 
 const url = 'http://test-url.com/test-url';
 router.url = url;
@@ -137,10 +138,7 @@ describe('ItemRelationshipsComponent', () => {
       changeType: FieldChangeType.REMOVE
     };
 
-    itemService = jasmine.createSpyObj('itemService', {
-      findByHref: createSuccessfulRemoteDataObject$(item),
-      findById: createSuccessfulRemoteDataObject$(item)
-    });
+    itemService = new ItemDataServiceStub();
     routeStub = {
       data: observableOf({}),
       parent: {
@@ -232,6 +230,8 @@ describe('ItemRelationshipsComponent', () => {
   }));
 
   beforeEach(() => {
+    spyOn(itemService, 'findByHref').and.returnValue(item);
+    spyOn(itemService, 'findById').and.returnValue(item);
     fixture = TestBed.createComponent(ItemRelationshipsComponent);
     comp = fixture.componentInstance;
     de = fixture.debugElement;
diff --git a/src/app/shared/testing/base-data-service.stub.ts b/src/app/shared/testing/base-data-service.stub.ts
index f4b6f25923..b8b71845d6 100644
--- a/src/app/shared/testing/base-data-service.stub.ts
+++ b/src/app/shared/testing/base-data-service.stub.ts
@@ -1,11 +1,18 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
 
 /**
  * Stub class for {@link BaseDataService}
  */
 export abstract class BaseDataServiceStub<T extends CacheableObject> {
 
+  findByHref(_href$: string | Observable<string>, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
   invalidateByHref(_href: string): Observable<boolean> {
     return observableOf(true);
   }
diff --git a/src/app/shared/testing/edit-item-relationships.service.stub.ts b/src/app/shared/testing/edit-item-relationships.service.stub.ts
new file mode 100644
index 0000000000..1d29569793
--- /dev/null
+++ b/src/app/shared/testing/edit-item-relationships.service.stub.ts
@@ -0,0 +1,48 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+
+import {
+  DeleteRelationship,
+  RelationshipIdentifiable,
+} from '../../core/data/object-updates/object-updates.reducer';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+/**
+ * Stub class of {@link EditItemRelationshipsService}
+ */
+export class EditItemRelationshipsServiceStub {
+
+  submit(_item: Item, _url: string): void {
+  }
+
+  initializeOriginalFields(_item: Item, _url: string): Subscription {
+    return new Subscription();
+  }
+
+  deleteRelationship(_deleteRelationship: DeleteRelationship): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$({});
+  }
+
+  addRelationship(_addRelationship: RelationshipIdentifiable): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  displayNotifications(_responses: RemoteData<NoContent>[]): void {
+  }
+
+  getNotificationTitle(_key: string): string {
+    return '';
+  }
+
+  getNotificationContent(_key: string): string {
+    return '';
+  }
+
+}
diff --git a/src/app/shared/testing/entity-type-data.service.stub.ts b/src/app/shared/testing/entity-type-data.service.stub.ts
new file mode 100644
index 0000000000..367eeb5f74
--- /dev/null
+++ b/src/app/shared/testing/entity-type-data.service.stub.ts
@@ -0,0 +1,5 @@
+/**
+ * Stub class of {@link EntityTypeDataService}
+ */
+export class EntityTypeDataServiceStub {
+}
diff --git a/src/app/shared/testing/item-data.service.stub.ts b/src/app/shared/testing/item-data.service.stub.ts
new file mode 100644
index 0000000000..eed5d4bb11
--- /dev/null
+++ b/src/app/shared/testing/item-data.service.stub.ts
@@ -0,0 +1,8 @@
+import { Item } from '../../core/shared/item.model';
+import { IdentifiableDataServiceStub } from './identifiable-data-service.stub';
+
+/**
+ * Stub class of {@link ItemDataService}
+ */
+export class ItemDataServiceStub extends IdentifiableDataServiceStub<Item> {
+}
diff --git a/src/app/shared/testing/object-updates.service.stub.ts b/src/app/shared/testing/object-updates.service.stub.ts
new file mode 100644
index 0000000000..c66cc3aa0d
--- /dev/null
+++ b/src/app/shared/testing/object-updates.service.stub.ts
@@ -0,0 +1,24 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { Identifiable } from '../../core/data/object-updates/identifiable.model';
+import { PatchOperationService } from '../../core/data/object-updates/patch-operation-service/patch-operation.service';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+
+/**
+ * Stub class of {@link ObjectUpdatesService}
+ */
+export class ObjectUpdatesServiceStub {
+
+  initialize(_url: string, _fields: Identifiable[], _lastModified: Date, _patchOperationService?: GenericConstructor<PatchOperationService>): void {
+  }
+
+  getFieldUpdates(_url: string, _initialFields: Identifiable[], _ignoreStates?: boolean): Observable<FieldUpdates> {
+    return observableOf({});
+  }
+
+}
diff --git a/src/app/shared/testing/relationship-data.service.stub.ts b/src/app/shared/testing/relationship-data.service.stub.ts
new file mode 100644
index 0000000000..f0463b3e6c
--- /dev/null
+++ b/src/app/shared/testing/relationship-data.service.stub.ts
@@ -0,0 +1,86 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { MetadataRepresentation } from '../../core/shared/metadata-representation/metadata-representation.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+
+/**
+ * Stub class of {@link RelationshipDataService}
+ */
+export class RelationshipDataServiceStub {
+
+  deleteRelationship(_id: string, _copyVirtualMetadata: string, _shouldRefresh = true): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$({});
+  }
+
+  addRelationship(_typeId: string, _item1: Item, _item2: Item, _leftwardValue?: string, _rightwardValue?: string, _shouldRefresh = true): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  refreshRelationshipItemsInCache(_item: Item): void {
+  }
+
+  getItemRelationshipsArray(_item: Item, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<Relationship[]> {
+    return observableOf([]);
+  }
+
+  getRelatedItems(_item: Item): Observable<Item[]> {
+    return observableOf([]);
+  }
+
+  getRelatedItemsByLabel(_item: Item, _label: string, _options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Item>());
+  }
+
+  getItemRelationshipsByLabel(_item: Item, _label: string, _options?: FindListOptions, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  getRelationshipByItemsAndLabel(_item1: Item, _item2: Item, _label: string, _options?: FindListOptions): Observable<Relationship> {
+    return observableOf(new Relationship());
+  }
+
+  setNameVariant(_listID: string, _itemID: string, _nameVariant: string): void {
+  }
+
+  getNameVariant(_listID: string, _itemID: string): Observable<string> {
+    return observableOf('');
+  }
+
+  updateNameVariant(_item1: Item, _item2: Item, _relationshipLabel: string, _nameVariant: string): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  isLeftItem(_relationship: Relationship, _item: Item): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  update(_object: Relationship): Observable<RemoteData<Relationship>> {
+    return createSuccessfulRemoteDataObject$(new Relationship());
+  }
+
+  searchByItemsAndType(_typeId: string, _itemUuid: string, _relationshipLabel: string, _arrayOfItemIds: string[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  searchBy(_searchMethod: string, _options?: FindListOptions, _useCachedVersionIfAvailable?: boolean, _reRequestOnStale?: boolean, ..._linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
+    return createSuccessfulRemoteDataObject$(new PaginatedList<Relationship>());
+  }
+
+  resolveMetadataRepresentation(_metadatum: MetadataValue, _parentItem: DSpaceObject, _itemType: string): Observable<MetadataRepresentation> {
+    return observableOf({} as MetadataRepresentation);
+  }
+
+}

From eeb562dd1496e7da85376999199bd84fb5066ed2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 May 2024 12:12:55 -0500
Subject: [PATCH 0204/1286] Disable inlineCriticalCss by default for better SSR
 performance

---
 config/config.example.yml                  | 4 ++--
 src/environments/environment.production.ts | 2 +-
 src/environments/environment.test.ts       | 3 ++-
 src/environments/environment.ts            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 1ce83f2f72..8c2ab38980 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -21,8 +21,8 @@ universal:
   # Whether to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation;
   # this option can be disabled to boost server performance at the expense of
-  # loading smoothness.
-  inlineCriticalCss: true
+  # loading smoothness. For improved SSR performance, DSpace defaults this to false (disabled).
+  inlineCriticalCss: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 7dd9bd2aa3..931dd422e3 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,6 +8,6 @@ export const environment: Partial<BuildConfig> = {
     preboot: true,
     async: true,
     time: false,
-    inlineCriticalCss: true,
+    inlineCriticalCss: false,
   }
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index cb9d2c7130..1fb8d1d43b 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -10,7 +10,8 @@ export const environment: BuildConfig = {
   universal: {
     preboot: true,
     async: true,
-    time: false
+    time: false,
+    inlineCriticalCss: false,
   },
 
   // Angular Universal server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 10f71618e1..7c09793790 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,7 +13,7 @@ export const environment: Partial<BuildConfig> = {
     preboot: false,
     async: true,
     time: false,
-    inlineCriticalCss: true,
+    inlineCriticalCss: false,
   }
 };
 

From 071fa370bfd1ec483b99223163a17ad507e70b55 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:05:38 +0000
Subject: [PATCH 0205/1286] Update pt-PT.json5

Addition of new translation keys (following DSpace 7.6.1 release) & revision/improvement of some of the already existing.

(cherry picked from commit 02792d28bc7e7caafc9313cb38eb6f0140714a9d)
---
 src/assets/i18n/pt-PT.json5 | 354 +++++++++++++++++++++++++++++-------
 1 file changed, 291 insertions(+), 63 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 60ef361374..06dcc2a253 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,6 +1,6 @@
 {
 
-  // Dspace v7.x > i18n pt-PT > last reviewed 16-06-2023
+  // Dspace v7.x > i18n pt-PT > last updated December 7, 2023
 
   // "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": "Não está autorizado a aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
@@ -215,6 +215,9 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
 
+  // "admin.registries.bitstream-formats.select": "Select bitstream format",
+  "admin.registries.bitstream-formats.select": "Selecionar formato de 'bitstream'",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registo de metadados",
 
@@ -332,6 +335,30 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registo de esquemas de metadados",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestão do acesso em lote",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultados de pesquisa",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestão do acesso em lote",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestão do acesso em lote",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Passo 1: Selecionar objectos",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Pesquisa",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Passo 2: Operação a realizar",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Apagar utilizador",
 
@@ -350,6 +377,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Utilizadores",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nova 'EPessoa'",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nova 'EPessoa'",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Adicionar 'EPessoa'",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Adicionar 'EPessoa'",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Utilizadores",
 
@@ -467,8 +506,8 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Adicionar a grupos",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "Falha ao apagar utilizador: \"{{name}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\" e mensagem: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Utilizador removido com sucesso: \"{{name}}\"",
@@ -740,11 +779,11 @@
   // "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.editGroupPage": "Nesta página, pode modificar as propriedades e os membros de um grupo. Na secção superior, pode editar o nome e a descrição do grupo, a menos que se trate de um grupo administrativo para uma coleção ou comunidade, em que o nome e a descrição do grupo são auto-gerados e não podem ser editados. Nas seções seguintes, pode editar o nome e a descrição do grupo. Ver [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+ou+gerir+a+utilizador+grupo) para mais detalhes.",
 
-  // "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.addEpeople": "Para adicionar ou remover um utilizador de/para este grupo, clique no botão 'Procurar tudo' ou use a barra de pesquisa em baixo para procurar utilizadores (use o menu suspenso, à esquerda da barra de pesquisa, para escolher se pretende pesquisar por metadados ou por e-mail). Depois clique no ícone 'mais' para cada utilizador que deseja adicionar na lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos no final da lista para navegar para as páginas seguintes. Quando estiver pronto, guarde as suas alterações clicando no botão 'Guardar' na seção superior.",
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para adicionar ou remover um utilizador de/para este grupo, clique no botão 'Procurar tudo' ou use a barra de pesquisa em baixo para procurar utilizadores (use o menu suspenso, à esquerda da barra de pesquisa, para escolher se pretende pesquisar por metadados ou por e-mail). Depois clique no ícone 'mais' para cada utilizador que deseja adicionar na lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos no final da lista para navegar para as páginas seguintes.",
 
-  // "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.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar utilizadores. Depois clique no ícone 'mais' para cada utilizador que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada utilizador que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes. Quando estiver pronto, guarde as suas alterações clicando no botão 'Guardar' na seção superior.",
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar grupos. Depois clique no ícone 'mais' para cada grupo que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada grupo que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa administrativa",
@@ -1151,6 +1190,9 @@
   // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "Por vocabulário controlado (SRSC)",
 
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Por 'Norwegian Science Index'",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por título",
 
@@ -1158,7 +1200,7 @@
   "browse.comcol.head": "Navegar",
 
   // "browse.empty": "No items to show.",
-  "browse.empty": "Sem itens a exibir.",
+  "browse.empty": "Sem itens para exibir.",
 
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "autor",
@@ -1182,7 +1224,10 @@
   "browse.metadata.subject.breadcrumbs": "Percorrer por assunto",
 
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
-  "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado (SRSC)",
+  "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",
@@ -1268,6 +1313,9 @@
   // "browse.startsWith.input": "Filter",
   "browse.startsWith.input": "Filtrar",
 
+  // "browse.taxonomy_srsc.title": "Browsing by Subject Category",
+  "browse.taxonomy_srsc.title": "Percorrer por vocabulário controlado",
+
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Pesquisar",
 
@@ -1427,6 +1475,12 @@
   // "collection.edit.return": "Back",
   "collection.edit.return": "Voltar",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Editar coleção - Controlo de acesso",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curadoria",
 
@@ -1604,6 +1658,12 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Nenhuma coleção a mostrar",
 
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Selecionar coleção",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Desmarcar coleção",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
@@ -1781,6 +1841,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Editar comunidade - curadoria",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Editar comunidade - Controlo de acesso",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadados",
 
@@ -1850,6 +1916,9 @@
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Leitura predefinida de ficheiros (DEFAULT_BITSTREAM_READ)",
 
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "E-Pessoas e grupos que podem ler novos 'bitstreams' submetidos a esta coleção. As alterações feitas esta função não são retroactivas. Os 'bitstreams' existentes no sistema continuarão a poder ser visualizados por quem tinha acesso de leitura no momento da sua adição.",
+
   // "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": "Os 'Administradores de comunidades' podem criar sub-comunidades e coleções, bem como gerir ou delegar a gestão dessas sub-comunidade ou coleções. Adicionalmente, decidem quem pode depositar itens em qualquer coleção, editar metadados (após depósito) e mapear itens de outras coleções (sujeito a autorização).",
 
@@ -1913,10 +1982,10 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-comunidade e coleções",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Coleções desta comunidade",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Comunidades desta comunidade",
 
   // "cookies.consent.accept-all": "Accept all",
@@ -2386,6 +2455,9 @@
   // "feed.description": "Syndication feed",
   "feed.description": "Feed",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "'Bitstream' restrito",
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Erro na obteção de ficheiros para este item!",
 
@@ -3077,7 +3149,7 @@
   "item.edit.item-mapper.notifications.remove.error.head": "Erros de remoção de mapeamento",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Mapeamento do item removido com sucesso de {{amount}} coleção.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Completou a remoção de mapeamento",
@@ -3097,6 +3169,12 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Cancelar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3208,6 +3286,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Herdar as politicas padrões da coleção destino",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando activada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
 
@@ -3340,17 +3421,23 @@
   // "item.edit.curate.title": "Curate Item: {{item}}",
   "item.edit.curate.title": "Curar item: {{item}}",
 
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Controlo de acesso",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Editar item - Controlo de acesso",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadados do item",
 
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  "item.edit.tabs.metadata.title": "Editar Item -  Metadados",
+  "item.edit.tabs.metadata.title": "Editar item -  Metadados",
 
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "Relações do item",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
-  "item.edit.tabs.relationships.title": "Editar Item - Relacionamentos",
+  "item.edit.tabs.relationships.title": "Editar item - Relacionamentos",
 
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Permissões...",
@@ -3479,7 +3566,7 @@
   "item.page.titleprefix": "Item: ",
 
   // "item.page.volume-title": "Volume Title",
-  "item.page.volume-title": "Título do Volume",
+  "item.page.volume-title": "Título do volume",
 
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Resultados da pesquisa de item",
@@ -3488,7 +3575,7 @@
   "item.search.title": "Pesquisa de item",
 
   // "item.truncatable-part.show-more": "Show more",
-  "item.truncatable-part.show-more": "Mostrar mais",
+  "item.truncatable-part.show-more": "Expandir",
 
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Colapsar",
@@ -3663,12 +3750,14 @@
 
   // "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:",
   "itemm.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista ou Série",
 
   // "item.preview.dc.identifier.doi": "DOI",
@@ -3710,6 +3799,12 @@
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nenhum item para mostrar.",
 
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Selecionar item",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Desmarcar item",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
 
@@ -3860,6 +3955,12 @@
   // "itemtemplate.edit.metadata.discard-button": "Discard",
   "itemtemplate.edit.metadata.discard-button": "Rejeitar",
 
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar lidioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -4157,6 +4258,9 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizações",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestão do acesso em lote",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
 
@@ -4191,7 +4295,10 @@
   "menu.section.browse_global_by_subject": "Por assunto",
 
   // "menu.section.browse_global_by_srsc": "By Subject Category",
-  "menu.section.browse_global_by_srsc": "Por vocabulário controlado (SRSC)",
+  "menu.section.browse_global_by_srsc": "Por vocabulário controlado",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Por 'Norwegian Science Index'",
 
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por título",
@@ -4473,7 +4580,7 @@
   "mydspace.show.supervisedWorkspace": "Itens supervisionados",
 
   // "mydspace.status.mydspaceArchived": "Archived",
-  "mydspace.status.mydspaceArchived": "Depósito aceite",
+  "mydspace.status.mydspaceArchived": "Depositado",
 
   // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "Em validação",
@@ -4652,6 +4759,18 @@
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parâmetros",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Selecionar parâmetro",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  process.new.add-parameter": "Adicionar um parâmetro...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Apagar parâmetro",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor do parâmetro",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
 
@@ -4809,28 +4928,31 @@
   "process.overview.table.actions": "Ações",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  "process.overview.delete": "Remover {{count}} processos",
+  "process.overview.delete": "Apagar {{count}} processos",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Apagar processo",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  "process.overview.delete.clear": "Limpar selecção a remover",
+  "process.overview.delete.clear": "Limpar selecção a apagar",
 
   // "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": "{{count}} processo(s) estão a ser removidos. Por favor aguarde pela remoção completa. Notar que esta operação pode demorar algum tempo.",
+  "process.overview.delete.processing": "{{count}} processo(s) estão a ser apagados. Por favor aguarde pela remoção completa. Notar que esta operação pode demorar algum tempo.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
-  "process.overview.delete.body": "Tem a certeza de que quer remover o(s) processo(s) {{count}}?",
+  "process.overview.delete.body": "Tem a certeza que quer apagar o(s) processo(s) {{count}}?",
 
   // "process.overview.delete.header": "Delete processes",
-  "process.overview.delete.header": "Remover processos",
+  "process.overview.delete.header": "Apagar processos",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
-  "process.bulk.delete.error.head": "Ocorreu um erro ao remover os processos",
+  "process.bulk.delete.error.head": "Ocorreu um erro ao apagar os processos",
 
   // "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": "O processo com  o ID {{{processId}} não pôde ser removido. Os restantes processos continuarão a ser removidos.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
-  "process.bulk.delete.success": "{{count}} processso(s) foram removidos com sucesso",
+  "process.bulk.delete.success": "{{count}} processso(s) foram apagados com sucesso",
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Atualizar perfil",
@@ -5349,6 +5471,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Selecionar tudo",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Desmarcar tudo",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Selecionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Desmarcar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5373,6 +5507,9 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
 
+ // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Ir para o conteúdo principal",
+
   // "search.description": "",
   "search.description": "",
 
@@ -5388,6 +5525,9 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Pesquisar no repositório...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Remover filtro de tipo {{ type }} com valor {{ value }}",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5676,6 +5816,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sim",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Depositado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Em validação",
+
+  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
+  "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Em fluxo de trabalho",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Por terminar",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sim",
 
@@ -5754,6 +5909,12 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  selectable-list-item-control.deselect": "Desmarcar item",
+
+  // "selectable-list-item-control.select": "Select item",
+  selectable-list-item-control.select": "Selecionar item",
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -6451,7 +6612,7 @@
   "submission.sections.general.add-more": "Adicionar mais",
 
   // "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": "O depósito não pode ser preenchido devido a erros no formulário.<br>Por favor preencha todos os campos necessários para completar o depósito.",
+  "submission.sections.general.cannot_deposit": "O depósito não pode ser concluído devido a erros ou falhas de preenchimento em campos obrigatórios do formulário.<br>Por favor preencha todos os campos necessários para completar o depósito!",
 
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Coleção",
@@ -7062,11 +7223,14 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "pesquisar",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados inserindo as primeiras letras",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Não existem itens para mostrar",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  "vocabulary-treeview.tree.description.nsi": "O Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "O 'Norwegian Science Index'",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Investigação",
@@ -7686,6 +7850,9 @@
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Dica: Defina um temporizador de contagem decrescente. Quando ativado, pode ser definida uma data no futuro e o 'banner' de alerta geral do sistema irá realizar uma contagem decrescente para a data definida. Quando este temporizador terminar, desaparecerá do alerta. O servidor NÃO pára automaticamente.",
 
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Selecionar data utilizando o calendário",
+
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
   "system-wide-alert.form.label.preview": "Pré-visualização de alerta geral do sistema",
 
@@ -7707,45 +7874,109 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas gerais do sistema",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus 'bitstreams'.",
 
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a esta coleção. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (bitstreams).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a qualquer coleção desta comunidade. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (bitstreams).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadados do item",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Ativar a opção para efetuar alterações nos metadados do item",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Desativar a opção para efetuar alterações nos metadados do itema",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Bitstreams",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Ativar a opção para efetuar alterações nos 'bitstreams'",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Desativar a opção para efetuar alterações nos 'bitstreams'",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Modo",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condições de acesso",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Atualmente, não estão especificadas condições de acesso em baixo. Se for executado, esta operação substituirá as condições de acesso actuais pelas condições predefinidas herdadas da coleção proprietária.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Substituir as condições de acesso",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Adicionar aos existentes",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar as alterações a 'bitstreams' específicos",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Atualizar todos os 'bitstreams' no item",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "bitstreams selecionados",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Selecionar 'bitstreams'",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancelar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Adicionar mais",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Remover condição de acesso",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Selecionar 'bitstreams'",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Sem itens para mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Fechar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipo de condição de acesso",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Selecionar uma condição de acesso a aplicar ao(s) 'ficheiro(s)' seleccionados.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Conceder acesso a partir de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Selecionar a data a partir da qual a condição de acesso é aplicada",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Conceder acesso até",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Selecionar a data até à qual a condição de acesso é aplicada",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Adicionar",
 
   // Other strings...
   // Missing, Duplicate or Redundant ???
 
-  // NOT FOUND 16-06-2023
+  // NOT FOUND 08-12-2023
 
   // "browse.metadata.srsc": "Subject Category",
-  "browse.metadata.srsc": "vocabulário controlado (SRSC)",
-
-  // "mydspace.status.mydspaceArchived": "Archived",
-  "mydspace.status.mydspaceArchived": "Depositado",
-
-  // "mydspace.status.mydspaceValidation": "Validation",
-  "mydspace.status.mydspaceValidation": "Em validação",
-
-  // "mydspace.status.mydspaceWaitingController": "Waiting for Controller",
-  "mydspace.status.mydspaceWaitingController": "Aguarda validador",
-
-  // "mydspace.status.mydspaceWorkflow": "Workflow",
-  "mydspace.status.mydspaceWorkflow": "Em fluxo de trabalho",
-
-  // "mydspace.status.mydspaceWorkspace": "Workspace",
-  "mydspace.status.mydspaceWorkspace": "Depósito por terminar",
-
-  // "search.filters.namedresourcetype.Archived": "Archived",
-  "search.filters.namedresourcetype.Archived": "Depositado",
-
-  // "search.filters.namedresourcetype.Validation": "Validation",
-  "search.filters.namedresourcetype.Validation": "Em validação",
-
-  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
-  "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
-
-  // "search.filters.namedresourcetype.Workflow": "Workflow",
-  "search.filters.namedresourcetype.Workflow": "Em fluxo de trabalho",
-
-  // "search.filters.namedresourcetype.Workspace": "Workspace",
-  "search.filters.namedresourcetype.Workspace": "Por terminar",
+  "browse.metadata.srsc": "Vocabulário controlado (SRSC)",
 
   // "datafile.listelement.badge": "Data file",
   "datafile.listelement.badge": "Ficheiro de dados",
@@ -7759,9 +7990,6 @@
   // "browse.previous.button": "Previous",
   "browse.previous.button": "Anterior",
 
-  // "curation-task.task.registerdoi.label": "DOI check",
-  "curation-task.task.registerdoi.label": "Verificação de DOIs",
-
   // "mydspace.general.text-here": "here",
   "mydspace.general.text-here": "aqui",
 

From c2ddaf286d0edc890644c74d921b3751b200b7ea Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:22:02 +0000
Subject: [PATCH 0206/1286] Update pt-PT.json5

Addition of new translation keys (following DSpace 7.6.1 release) & revision/improvement of some of the already existing.

(cherry picked from commit 18085698b26a22fd433ef11b19b2367088f0f856)
---
 src/assets/i18n/pt-PT.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 06dcc2a253..95460baf69 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -3170,7 +3170,7 @@
   "item.edit.metadata.discard-button": "Cancelar",
 
   // "item.edit.metadata.edit.language": "Edit language",
-  item.edit.metadata.edit.language": "Editar idioma",
+  "item.edit.metadata.edit.language": "Editar idioma",
 
   // "item.edit.metadata.edit.value": "Edit value",
   "item.edit.metadata.edit.value": "Editar valor",

From 170c7ac6cccef258229175ac243054ac75fe601c Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:41:06 +0000
Subject: [PATCH 0207/1286] Update pt-PT.json5

(cherry picked from commit 38eacf31bfb0af9c9314bc4eeff5dee804eede9f)
---
 src/assets/i18n/pt-PT.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 95460baf69..18c7e0f442 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -4763,7 +4763,7 @@
   "process.new.select-parameter": "Selecionar parâmetro",
 
   // "process.new.add-parameter": "Add a parameter...",
-  process.new.add-parameter": "Adicionar um parâmetro...",
+  "process.new.add-parameter": "Adicionar um parâmetro...",
 
   // "process.new.delete-parameter": "Delete parameter",
   "process.new.delete-parameter": "Apagar parâmetro",

From 242043b3f87bd0f2e9b2152c57bb6c761cdfa803 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:46:05 +0000
Subject: [PATCH 0208/1286] Update pt-PT.json5

(cherry picked from commit 3262e00d6e2f192486dc72da03005442a5826492)
---
 src/assets/i18n/pt-PT.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 18c7e0f442..1321cecadb 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -5910,10 +5910,10 @@
   "search.view-switch.show-list": "Mostrar como lista",
 
   // "selectable-list-item-control.deselect": "Deselect item",
-  selectable-list-item-control.deselect": "Desmarcar item",
+  "selectable-list-item-control.deselect": "Desmarcar item",
 
   // "selectable-list-item-control.select": "Select item",
-  selectable-list-item-control.select": "Selecionar item",
+  "selectable-list-item-control.select": "Selecionar item",
 
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",

From bb055e12fb0179780612230d2d021011c696153d Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:50:21 +0000
Subject: [PATCH 0209/1286] Update pt-PT.json5

(cherry picked from commit 6c5e971dc1f6b9b7c748d7b8d2aefebf0ed518d3)
---
 src/assets/i18n/pt-PT.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 1321cecadb..35b3fb3c0a 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -5508,7 +5508,7 @@
   "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
 
  // "root.skip-to-content": "Skip to main content",
-  "root.skip-to-content": "Ir para o conteúdo principal",
+ "root.skip-to-content": "Ir para o conteúdo principal",
 
   // "search.description": "",
   "search.description": "",

From ba1eee27b3a98af9960cffeb2710a1126e23b7f1 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Sat, 9 Dec 2023 19:02:20 +0000
Subject: [PATCH 0210/1286] Update pt-PT.json5

(cherry picked from commit c4142e7a809ec6da8e06a2ead33cdf73137d1e24)
---
 src/assets/i18n/pt-PT.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 35b3fb3c0a..3bc86adc2e 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -5507,8 +5507,8 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
 
- // "root.skip-to-content": "Skip to main content",
- "root.skip-to-content": "Ir para o conteúdo principal",
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Ir para o conteúdo principal",
 
   // "search.description": "",
   "search.description": "",

From 83b67149a6bcc944c89c753fdb54fc465ffb65c3 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Tue, 14 May 2024 19:15:27 +0100
Subject: [PATCH 0211/1286] Update pt-PT.json5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revision and improvement of some of the already existing translation keys upon reviewers’ suggestions.

(cherry picked from commit 16c5665b314f45e63ec1be59e5caea194c64e0ce)
---
 src/assets/i18n/pt-PT.json5 | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 3bc86adc2e..0398f4ab36 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,6 +1,6 @@
 {
 
-  // Dspace v7.x > i18n pt-PT > last updated December 7, 2023
+  // Dspace v7.x > i18n pt-PT > last updated 14th of May 2024
 
   // "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": "Não está autorizado a aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
@@ -135,13 +135,13 @@
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Indique uma extenção de ficheiro sem o ponto",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
-  "admin.registries.bitstream-formats.edit.failure.content": "Ocorreu um erro ao editar o formato de bitstream.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Ocorreu um erro ao editar o formato de ficheiro.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Falha",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  "admin.registries.bitstream-formats.edit.head": "Formato de bitstream: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formato de ficheiro: {{ 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": "Formatos marcados como internos são ocultos para o utilizador, usados por motivos administrativos.",
@@ -162,7 +162,7 @@
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Nome",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  "admin.registries.bitstream-formats.edit.success.content": "O formato de bitstream foi editado com sucesso.",
+  "admin.registries.bitstream-formats.edit.success.content": "O formato de ficheiro foi editado com sucesso.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Sucesso",
@@ -177,7 +177,7 @@
   "admin.registries.bitstream-formats.head": "Registo de formatos de ficheiros",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-  "admin.registries.bitstream-formats.no-items": "Nenhum formato de bitstream para exibir.",
+  "admin.registries.bitstream-formats.no-items": "Nenhum formato de ficheiro para exibir.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Apagar selecionado(s)",
@@ -216,7 +216,7 @@
   "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
 
   // "admin.registries.bitstream-formats.select": "Select bitstream format",
-  "admin.registries.bitstream-formats.select": "Selecionar formato de 'bitstream'",
+  "admin.registries.bitstream-formats.select": "Selecionar formato de ficheiro",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registo de metadados",
@@ -336,16 +336,16 @@
   "admin.registries.schema.title": "Registo de esquemas de metadados",
 
   // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
-  "admin.access-control.bulk-access.breadcrumbs": "Gestão do acesso em lote",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestão de permissões em lote",
 
   // "administrativeBulkAccess.search.results.head": "Search Results",
   "administrativeBulkAccess.search.results.head": "Resultados de pesquisa",
 
   // "admin.access-control.bulk-access": "Bulk Access Management",
-  "admin.access-control.bulk-access": "Gestão do acesso em lote",
+  "admin.access-control.bulk-access": "Gestão de permissões em lote",
 
   // "admin.access-control.bulk-access.title": "Bulk Access Management",
-  "admin.access-control.bulk-access.title": "Gestão do acesso em lote",
+  "admin.access-control.bulk-access.title": "Gestão de permissões em lote",
 
   // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
   "admin.access-control.bulk-access-browse.header": "Passo 1: Selecionar objectos",
@@ -1032,10 +1032,10 @@
   "bitstream.download.page.back": "Voltar",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.link": "Editar políticas dos bitstreams",
+  "bitstream.edit.authorizations.link": "Editar políticas dos ficheiros",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.title": "Editar políticas dos bitstreams",
+  "bitstream.edit.authorizations.title": "Editar políticas dos ficheiros",
 
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Voltar",
@@ -1500,7 +1500,7 @@
   "collection.edit.item.authorizations.load-more-button": "Carregar mais",
 
   // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
-  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar as políticas do bitstream para o pacote",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar as políticas do ficheiro para o pacote",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Editar metadados",
@@ -1752,7 +1752,7 @@
   "communityList.title": "Lista de comunidades",
 
   // "communityList.showMore": "Show More",
-  "communityList.showMore": "Mostrar mais",
+  "communityList.showMore": "Expandir",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Criar uma comunidade",
@@ -1917,7 +1917,7 @@
   "comcol-role.edit.bitstream_read.name": "Leitura predefinida de ficheiros (DEFAULT_BITSTREAM_READ)",
 
   // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
-  "comcol-role.edit.bitstream_read.description": "E-Pessoas e grupos que podem ler novos 'bitstreams' submetidos a esta coleção. As alterações feitas esta função não são retroactivas. Os 'bitstreams' existentes no sistema continuarão a poder ser visualizados por quem tinha acesso de leitura no momento da sua adição.",
+  "comcol-role.edit.bitstream_read.description": "E-Pessoas e grupos que podem ler novos ficheiros submetidos a esta coleção. As alterações feitas esta função não são retroactivas. Os ficheiros existentes no sistema continuarão a poder ser visualizados por quem tinha acesso de leitura no momento da sua adição.",
 
   // "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": "Os 'Administradores de comunidades' podem criar sub-comunidades e coleções, bem como gerir ou delegar a gestão dessas sub-comunidade ou coleções. Adicionalmente, decidem quem pode depositar itens em qualquer coleção, editar metadados (após depósito) e mapear itens de outras coleções (sujeito a autorização).",
@@ -3491,7 +3491,7 @@
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar item da vista pública do repositório",
 
   // "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": "Bem-vindo à página de gestão de itens. Nesta área, pode retirar, restabelecer, mover ou apagar definitivamente o item. Adicionalmente, também pode atualizar ou adicionar novos metadados / bitstreams percorrendo pelas outras abas.",
+  "item.edit.tabs.status.description": "Bem-vindo à página de gestão de itens. Nesta área, pode retirar, restabelecer, mover ou apagar definitivamente o item. Adicionalmente, também pode atualizar ou adicionar novos metadados / ficheiros percorrendo pelas outras abas.",
 
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Estado do item",
@@ -4259,7 +4259,7 @@
   "menu.section.access_control_authorizations": "Autorizações",
 
   // "menu.section.access_control_bulk": "Bulk Access Management",
-  "menu.section.access_control_bulk": "Gestão do acesso em lote",
+  "menu.section.access_control_bulk": "Gestão de permissões em lote",
 
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
@@ -4340,7 +4340,7 @@
   "menu.section.export_metadata": "Metadados",
 
   // "menu.section.export_batch": "Batch Export (ZIP)",
-  "menu.section.export_batch": "Importação em lote (ZIP)",
+  "menu.section.export_batch": "Exportação em lote (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secção do menu controle de acesso",
@@ -5760,10 +5760,10 @@
   "search.filters.filter.scope.label": "Filtro do âmbito da pesquisa",
 
   // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Mostrar menos",
+  "search.filters.filter.show-less": "Colapsar",
 
   // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Mostrar mais",
+  "search.filters.filter.show-more": "Expandir",
 
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Assunto",
@@ -7008,7 +7008,7 @@
   "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": "Se reviu o item e está conformidade para inclusão na coleção, selecione 'Aprovar'.",
+  "submission.workflow.tasks.claimed.approve_help": "Se reviu o item e está em conformidade para entrada na coleção, selecione 'Aprovar'.",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Editar",
@@ -7875,13 +7875,13 @@
   "admin.system-wide-alert.title": "Alertas gerais do sistema",
 
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
-  "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus 'bitstreams'.",
+  "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus ficheiros.",
 
   // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
-  "collection-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a esta coleção. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (bitstreams).",
+  "collection-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a esta coleção. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (ficheiros).",
 
   // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
-  "community-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a qualquer coleção desta comunidade. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (bitstreams).",
+  "community-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso de todos os itens pertencentes a qualquer coleção desta comunidade. As alterações podem ser efectuadas quer nos metadados do item, quer em todo o conteúdo (ficheiros).",
 
   // "access-control-item-header-toggle": "Item's Metadata",
   "access-control-item-header-toggle": "Metadados do item",
@@ -7893,13 +7893,13 @@
   "access-control-item-toggle.disable": "Desativar a opção para efetuar alterações nos metadados do itema",
 
   // "access-control-bitstream-header-toggle": "Bitstreams",
-  "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Ficheiros",
 
   // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
-  "access-control-bitstream-toggle.enable": "Ativar a opção para efetuar alterações nos 'bitstreams'",
+  "access-control-bitstream-toggle.enable": "Ativar a opção para efetuar alterações nos ficheiros",
 
   // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
-  "access-control-bitstream-toggle.disable": "Desativar a opção para efetuar alterações nos 'bitstreams'",
+  "access-control-bitstream-toggle.disable": "Desativar a opção para efetuar alterações nos ficheiros",
 
   // "access-control-mode": "Mode",
   "access-control-mode": "Modo",
@@ -7917,16 +7917,16 @@
   "access-control-add-to-existing": "Adicionar aos existentes",
 
   // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
-  "access-control-limit-to-specific": "Limitar as alterações a 'bitstreams' específicos",
+  "access-control-limit-to-specific": "Limitar as alterações a ficheiros específicos",
 
   // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
-  "access-control-process-all-bitstreams": "Atualizar todos os 'bitstreams' no item",
+  "access-control-process-all-bitstreams": "Atualizar todos os ficheiros no item",
 
   // "access-control-bitstreams-selected": "bitstreams selected",
-  "access-control-bitstreams-selected": "bitstreams selecionados",
+  "access-control-bitstreams-selected": "ficheiros selecionados",
 
   // "access-control-bitstreams-select": "Select bitstreams",
-  "access-control-bitstreams-select": "Selecionar 'bitstreams'",
+  "access-control-bitstreams-select": "Selecionar ficheiros",
 
   // "access-control-cancel": "Cancel",
   "access-control-cancel": "Cancelar",
@@ -7941,7 +7941,7 @@
   "access-control-remove": "Remover condição de acesso",
 
   // "access-control-select-bitstreams-modal.title": "Select bitstreams",
-  "access-control-select-bitstreams-modal.title": "Selecionar 'bitstreams'",
+  "access-control-select-bitstreams-modal.title": "Selecionar ficheiros",
 
   // "access-control-select-bitstreams-modal.no-items": "No items to show.",
   "access-control-select-bitstreams-modal.no-items": "Sem itens para mostrar.",

From 66832eeb28af5c96ea66f4438380ba6c5efd9aae Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Tue, 6 Feb 2024 16:53:30 +0100
Subject: [PATCH 0212/1286] embed the item to submission patch request to fix
 issue where the submission form would revert to the previous data on save

---
 src/app/core/json-patch/json-patch-operations.service.spec.ts | 4 ++--
 src/app/core/json-patch/json-patch-operations.service.ts      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 10fc2f2ed8..3fba1c6cf6 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -147,7 +147,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceType(resourceEndpoint, resourceScope, testJsonPatchResourceType).subscribe());
       scheduler.flush();
 
@@ -237,7 +237,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceID(resourceEndpoint, resourceScope, testJsonPatchResourceType, testJsonPatchResourceId).subscribe());
       scheduler.flush();
 
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index 1dfbd404cc..1b37665f22 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -18,6 +18,7 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { CoreState } from '../core-state.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -125,7 +126,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
    *    instance of PatchRequestDefinition
    */
   protected getRequestInstance(uuid: string, href: string, body?: any): PatchRequestDefinition {
-    return new this.patchRequestConstructor(uuid, href, body);
+    return new this.patchRequestConstructor(uuid, new URLCombiner(href, '?embed=item').toString(), body);
   }
 
   protected getEndpointByIDHref(endpoint, resourceID): string {

From d1890e0253c500fb86f7208e7f4dfb241f885ade Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Wed, 24 Apr 2024 10:54:54 +0200
Subject: [PATCH 0213/1286] move embed item fix to
 SubmissionJsonPatchOperationsService

---
 .../json-patch-operations.service.spec.ts       |  4 ++--
 .../json-patch/json-patch-operations.service.ts |  3 +--
 ...ission-json-patch-operations.service.spec.ts | 15 +++++++++++++++
 .../submission-json-patch-operations.service.ts | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 3fba1c6cf6..10fc2f2ed8 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -147,7 +147,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceType(resourceEndpoint, resourceScope, testJsonPatchResourceType).subscribe());
       scheduler.flush();
 
@@ -237,7 +237,7 @@ describe('JsonPatchOperationsService test suite', () => {
     });
 
     it('should send a new SubmissionPatchRequest', () => {
-      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref + '?embed=item', patchOpBody);
+      const expected = new SubmissionPatchRequest(requestService.generateRequestId(), resourceHref, patchOpBody);
       scheduler.schedule(() => service.jsonPatchByResourceID(resourceEndpoint, resourceScope, testJsonPatchResourceType, testJsonPatchResourceId).subscribe());
       scheduler.flush();
 
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index 1b37665f22..1dfbd404cc 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -18,7 +18,6 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { CoreState } from '../core-state.model';
-import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -126,7 +125,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
    *    instance of PatchRequestDefinition
    */
   protected getRequestInstance(uuid: string, href: string, body?: any): PatchRequestDefinition {
-    return new this.patchRequestConstructor(uuid, new URLCombiner(href, '?embed=item').toString(), body);
+    return new this.patchRequestConstructor(uuid, href, body);
   }
 
   protected getEndpointByIDHref(endpoint, resourceID): string {
diff --git a/src/app/core/submission/submission-json-patch-operations.service.spec.ts b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
index 5472e86856..c67d171537 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.spec.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
@@ -18,6 +18,9 @@ describe('SubmissionJsonPatchOperationsService', () => {
   const rdbService = {} as RemoteDataBuildService;
   const halEndpointService = {} as HALEndpointService;
 
+  const uuid = '91ecbeda-99fe-42ac-9430-b9b75af56f78';
+  const href = 'https://rest.api/some/self/link?with=maybe&a=few&other=parameters';
+
   function initTestService() {
     return new SubmissionJsonPatchOperationsService(
       requestService,
@@ -37,4 +40,16 @@ describe('SubmissionJsonPatchOperationsService', () => {
     expect((service as any).patchRequestConstructor).toEqual(SubmissionPatchRequest);
   });
 
+  describe(`getRequestInstance`, () => {
+    it(`should add a parameter to embed the item to the request URL`, () => {
+      const result = (service as any).getRequestInstance(uuid, href);
+      const resultURL = new URL(result.href);
+      expect(resultURL.searchParams.get('embed')).toEqual('item');
+
+      // if we delete the embed item param, it should be identical to the original url
+      resultURL.searchParams.delete('embed', 'item');
+      expect(href).toEqual(resultURL.toString());
+    });
+  });
+
 });
diff --git a/src/app/core/submission/submission-json-patch-operations.service.ts b/src/app/core/submission/submission-json-patch-operations.service.ts
index 5771c85b57..117056008a 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.ts
@@ -9,6 +9,7 @@ import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-respon
 import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * A service that provides methods to make JSON Patch requests.
@@ -27,4 +28,20 @@ export class SubmissionJsonPatchOperationsService extends JsonPatchOperationsSer
     super();
   }
 
+  /**
+   * Return an instance for RestRequest class
+   *
+   * @param uuid
+   *    The request uuid
+   * @param href
+   *    The request href
+   * @param body
+   *    The request body
+   * @return Object<PatchRequestDefinition>
+   *    instance of PatchRequestDefinition
+   */
+  protected getRequestInstance(uuid: string, href: string, body?: any): SubmissionPatchRequest {
+    return new this.patchRequestConstructor(uuid, new URLCombiner(href, '?embed=item').toString(), body);
+  }
+
 }

From 3edb663b21b817071a3bf6c31655ba268f5c6ef4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 May 2024 13:28:19 -0500
Subject: [PATCH 0214/1286] Minor bug fix to specs

---
 .../submission/submission-json-patch-operations.service.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/submission/submission-json-patch-operations.service.spec.ts b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
index c67d171537..b186c27c33 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.spec.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.spec.ts
@@ -47,7 +47,7 @@ describe('SubmissionJsonPatchOperationsService', () => {
       expect(resultURL.searchParams.get('embed')).toEqual('item');
 
       // if we delete the embed item param, it should be identical to the original url
-      resultURL.searchParams.delete('embed', 'item');
+      resultURL.searchParams.delete('embed');
       expect(href).toEqual(resultURL.toString());
     });
   });

From e0fb590b02dd916050a2cd66560e7734846b4ae3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 15 May 2024 00:06:07 +0200
Subject: [PATCH 0215/1286] Don't encode the uri parameter of
 /api/authz/authorizations/search/object since the returned self link doesn't
 encode the uri param

(cherry picked from commit b0991db1d4421ed52685e34923a54ab960d39dc8)
---
 .../feature-authorization/authorization-data.service.spec.ts   | 2 +-
 .../data/feature-authorization/authorization-data.service.ts   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
index ae44d590a4..9e1e892be2 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.spec.ts
@@ -64,7 +64,7 @@ describe('AuthorizationDataService', () => {
     const ePersonUuid = 'fake-eperson-uuid';
 
     function createExpected(providedObjectUrl: string, providedEPersonUuid?: string, providedFeatureId?: FeatureID): FindListOptions {
-      const searchParams = [new RequestParam('uri', providedObjectUrl)];
+      const searchParams = [new RequestParam('uri', providedObjectUrl, false)];
       if (hasValue(providedFeatureId)) {
         searchParams.push(new RequestParam('feature', providedFeatureId));
       }
diff --git a/src/app/core/data/feature-authorization/authorization-data.service.ts b/src/app/core/data/feature-authorization/authorization-data.service.ts
index 9573042272..be1c1b0901 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -132,7 +132,8 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
     if (isNotEmpty(options.searchParams)) {
       params = [...options.searchParams];
     }
-    params.push(new RequestParam('uri', objectUrl));
+    // TODO fix encode the uri parameter in the self link in the backend and set encodeValue to true afterwards
+    params.push(new RequestParam('uri', objectUrl, false));
     if (hasValue(featureId)) {
       params.push(new RequestParam('feature', featureId));
     }

From f65b96412a9c0a81d1f228cff899eeb574e2c03a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 17 May 2024 14:34:24 +0200
Subject: [PATCH 0216/1286] Fixed multiple edit relationship bugs

- Fixed issue making it impossible to add new relationships until the page is refreshed after deleting an existing one (only when you refreshed the page after creating the initial relationship)
- Fixed NPE in DsDynamicLookupRelationModalComponent
- Grouped buttons on relationship page in order to assure that they always have the same behaviour
---
 .../abstract-item-update.component.ts         |  6 ++
 .../item-bitstreams.component.html            | 16 ++--
 .../edit-item-relationships.service.spec.ts   |  2 -
 .../item-relationships.component.html         | 82 +++++++++----------
 .../item-relationships.component.spec.ts      |  7 +-
 .../item-relationships.component.ts           |  3 +
 ...namic-lookup-relation-modal.component.html |  2 +-
 ...dynamic-lookup-relation-modal.component.ts |  7 +-
 ...ic-lookup-relation-search-tab.component.ts |  6 +-
 ...ic-lookup-relation-search-tab.component.ts |  4 +-
 ...lookup-relation-selection-tab.component.ts |  6 +-
 src/assets/i18n/en.json5                      |  2 +
 12 files changed, 73 insertions(+), 70 deletions(-)

diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 80002f614b..15ce7dbd53 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -35,6 +35,10 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   updates$: Observable<FieldUpdates>;
 
+  hasChanges$: Observable<boolean>;
+
+  isReinstatable$: Observable<boolean>;
+
   /**
    * Route to the item's page
    */
@@ -82,6 +86,8 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
     this.url = this.router.url;
+    this.hasChanges$ = this.hasChanges();
+    this.isReinstatable$ = this.isReinstatable();
     if (this.url.indexOf('?') > 0) {
       this.url = this.url.substr(0, this.url.indexOf('?'));
     }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..32b8288bb9 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -5,18 +5,18 @@
             class="fas fa-upload"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
     </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+    <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.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
             (click)="submit()"><i
             class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
     </button>
-    <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+            [disabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -48,18 +48,18 @@
 
   <div class="button-row bottom">
     <div class="mt-4 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+      <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.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
               (click)="submit()"><i
         class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
       </button>
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+              [disabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
index 93a5425a6c..f969416783 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -185,8 +185,6 @@ describe('EditItemRelationshipsService', () => {
 
       expect(itemService.invalidateByHref).toHaveBeenCalledWith(currentItem.self);
       expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem1.self);
-      // TODO currently this isn't done yet
-      // expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem2.self);
 
       expect(notificationsService.success).toHaveBeenCalledTimes(1);
     });
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 3b9a119ea6..755731f576 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,23 +1,7 @@
 <div class="item-relationships">
-  <ng-container *ngIf="entityType$ | async as entityType">
-    <div class="button-row top d-flex space-children-mr">
-      <button class="btn btn-danger ml-auto" *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>
-      <button class="btn btn-warning ml-auto" *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)"
-              (click)="submit()"><span *ngIf="isSaving$ | async" class="spinner-border spinner-border-sm" role="status"
-                                                     aria-hidden="true"></span>
-        <i *ngIf="!(isSaving$ | async)" class="fas fa-save"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-      </button>
+  <ng-container *ngIf="entityType$ | async as entityType; else noEntityType">
+    <div class="button-row top d-flex justify-content-end">
+      <ng-container *ngTemplateOutlet="buttons"></ng-container>
     </div>
     <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
       <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
@@ -26,36 +10,46 @@
           [item]="item"
           [itemType]="entityType"
           [relationshipType]="relationshipType"
-          [hasChanges]="hasChanges()"
+          [hasChanges]="hasChanges$"
         ></ds-edit-relationship-list>
       </div>
     </div>
-    <ng-template #loading>
-      <ds-themed-loading></ds-themed-loading>
-    </ng-template>
     <div class="button-row bottom">
-      <div class="float-right space-children-mr ml-gap">
-        <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>
-        <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)"
-                (click)="submit()"><i
-            class="fas fa-save"></i>
-          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-        </button>
+      <div class="float-right ml-gap">
+        <ng-container *ngTemplateOutlet="buttons"></ng-container>
       </div>
     </div>
-    <div *ngIf="!entityType"
-         class="alert alert-info mt-2" role="alert">
-      {{ 'item.edit.relationships.no-entity-type' | translate }}
-    </div>
   </ng-container>
 </div>
+
+<ng-template #noEntityType>
+  <ds-alert [type]="AlertType.Info" class="d-block mt-2">
+    {{ 'item.edit.relationships.no-entity-type' | translate }}
+  </ds-alert>
+</ng-template>
+
+<ng-template #loading>
+  <ds-themed-loading></ds-themed-loading>
+</ng-template>
+
+<ng-template #buttons>
+  <div class="d-flex space-children-mr justify-content-end">
+    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+            [disabled]="(hasChanges$ | async) !== true"
+            (click)="discard()">
+      <i aria-hidden="true" class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
+    </button>
+    <button class="btn btn-warning" *ngIf="isReinstatable() | async" (click)="reinstate()">
+      <i aria-hidden="true" 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) !== true || (isSaving$ | async) === true"
+            (click)="submit()">
+      <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
+      <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.save-button' | translate }}</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index 24dc86cc3d..4f7f1a86c6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -2,9 +2,7 @@ import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { getTestScheduler } from 'jasmine-marbles';
 import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RestResponse } from '../../../core/cache/response.models';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
@@ -30,6 +28,7 @@ import { relationshipTypes } from '../../../shared/testing/relationship-types.mo
 import { ThemeService } from '../../../shared/theme-support/theme.service';
 import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
 import { ItemDataServiceStub } from '../../../shared/testing/item-data.service.stub';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -58,7 +57,6 @@ let itemService: ItemDataServiceStub;
 const url = 'http://test-url.com/test-url';
 router.url = url;
 
-let scheduler: TestScheduler;
 let item;
 let author1;
 let author2;
@@ -206,9 +204,8 @@ describe('ItemRelationshipsComponent', () => {
       }
     );
 
-    scheduler = getTestScheduler();
     TestBed.configureTestingModule({
-      imports: [SharedModule, TranslateModule.forRoot()],
+      imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()],
       declarations: [ItemRelationshipsComponent],
       providers: [
         { provide: ThemeService, useValue: getMockThemeService() },
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 758978f8d8..a405a8b1d2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -28,6 +28,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { EditItemRelationshipsService } from './edit-item-relationships.service';
 import { compareArraysUsingIds } from '../../simple/item-types/shared/item-relationships-utils';
+import { AlertType } from '../../../shared/alert/aletr-type';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -54,6 +55,8 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     return this.editItemRelationshipsService.isSaving$;
   }
 
+  readonly AlertType = AlertType;
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index 25c3535836..71cc8de0ac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -32,7 +32,7 @@
                 </ng-template>
             </li>
             <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)[idx] } }}</a>
+                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
                 <ng-template ngbNavContent>
                     <ds-themed-dynamic-lookup-relation-external-source-tab
                             [label]="label"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 9215cb88e4..ac436639bc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -30,6 +30,7 @@ import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/ope
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -217,7 +218,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    * Select (a list of) objects and add them to the store
    * @param selectableObjects
    */
-  select(...selectableObjects: SearchResult<Item>[]) {
+  select(...selectableObjects: SearchResult<DSpaceObject>[]) {
     this.zone.runOutsideAngular(
       () => {
         const obs: Observable<any[]> = observableCombineLatest([...selectableObjects.map((sri: SearchResult<Item>) => {
@@ -260,11 +261,11 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    * Deselect (a list of) objects and remove them from the store
    * @param selectableObjects
    */
-  deselect(...selectableObjects: SearchResult<Item>[]) {
+  deselect(...selectableObjects: SearchResult<DSpaceObject>[]) {
     this.zone.runOutsideAngular(
       () => selectableObjects.forEach((object) => {
         this.subMap[object.indexableObject.uuid].unsubscribe();
-        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
+        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject as Item, this.relationshipOptions.relationshipType, this.submissionId));
       })
     );
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 9452918a97..3e874d8c50 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -96,12 +96,12 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
   /**
    * Send an event to deselect an object from the list
    */
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Send an event to select an object from the list
    */
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Search results
@@ -178,7 +178,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selection$
       .pipe(take(1))
       .subscribe((selection: SearchResult<Item>[]) => {
-        const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
+        const filteredPage: SearchResult<DSpaceObject>[] = page.filter((pageItem: SearchResult<DSpaceObject>) => selection.findIndex((selected: SearchResult<Item>) => selected.equals(pageItem)) < 0);
         this.selectObject.emit(...filteredPage);
       });
     this.selectableListService.select(this.listId, page);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
index d44f8f84a0..d3ad1e2b78 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -43,9 +43,9 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
 
   @Input() isEditRelationship: boolean;
 
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index a78bf8896c..3c3422ce16 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -13,6 +13,8 @@ import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { Context } from '../../../../../../core/shared/context.model';
 import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-selection-tab',
@@ -63,12 +65,12 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   /**
    * Send an event to deselect an object from the list
    */
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * Send an event to select an object from the list
    */
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<SearchResult<DSpaceObject>> = new EventEmitter();
 
   /**
    * The initial pagination to use
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..e1d66b63bc 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3088,6 +3088,8 @@
 
   "orgunit.page.titleprefix": "Organizational Unit: ",
 
+  "orgunit.search.results.head": "Organizational Unit Search Results",
+
   "pagination.options.description": "Pagination options",
 
   "pagination.results-per-page": "Results Per Page",

From 9053489ddd612c7002c7d226fba3c52b9a31e387 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 17 May 2024 18:51:23 +0200
Subject: [PATCH 0217/1286] 115046: Fixed url parameters not being filtered out
 of the url before hasChanges$ & isReinstatable$ is calculated

---
 .../abstract-item-update/abstract-item-update.component.ts   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 15ce7dbd53..964405dfdd 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -85,12 +85,9 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     }
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.url = this.router.url;
+    this.url = this.router.url.split('?')[0];
     this.hasChanges$ = this.hasChanges();
     this.isReinstatable$ = this.isReinstatable();
-    if (this.url.indexOf('?') > 0) {
-      this.url = this.url.substr(0, this.url.indexOf('?'));
-    }
     this.hasChanges().pipe(first()).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();

From f8a8b905568c47bf8ba5f9be32de28b7a190e459 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 23 Apr 2024 23:02:21 +0200
Subject: [PATCH 0218/1286] Aligned communities search results like collections
 on md screens

(cherry picked from commit c2684d30789e4d2782915cff963af196b75a4169)
---
 .../community-search-result-list-element.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index d38170e863..f4a0aa917f 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-md-2"></div>
+  <div *ngIf="showThumbnails" class="offset-3 offset-md-2"></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>

From da439000ac8781b555e27631ee0e1a584dd8efa0 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 24 Apr 2024 00:37:07 +0200
Subject: [PATCH 0219/1286] Fixed item-edit.cy.ts regularly failing because of
 aria-required-children for role="row" & added missing roles to edit comcol
 tabs

(cherry picked from commit 77d0f9cd605c2c0afe1bbf4682e9cb79228d6afa)
---
 cypress/e2e/item-edit.cy.ts                                | 5 +++++
 .../edit-comcol-page/edit-comcol-page.component.html       | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index b4c01a1a94..44c8f567bd 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -18,6 +18,11 @@ describe('Edit Item > Edit Metadata tab', () => {
         // <ds-edit-item-page> tag must be loaded
         cy.get('ds-edit-item-page').should('be.visible');
 
+        // wait for all the ds-dso-edit-metadata-value components to be rendered
+        cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
+            cy.wrap($row).find('div[role="cell"]').should('be.visible');
+        });
+
         // Analyze <ds-edit-item-page> for accessibility issues
         testA11y('ds-edit-item-page');
     });
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index a8ca674c26..7797ba13c9 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -11,9 +11,10 @@
         </div>
       </div>
       <div class="pt-2">
-        <ul class="nav nav-tabs justify-content-start mb-2">
-          <li *ngFor="let page of pages" class="nav-item">
-            <a class="nav-link"
+        <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
+          <li *ngFor="let page of pages" class="nav-item" role="presentation">
+            <a class="nav-link" role="tab"
+               [attr.aria-selected]="page === currentPage"
                [ngClass]="{'active' : page === currentPage}"
                [routerLink]="['./' + page]"
                [attr.data-test]="page">

From 6cab13a876b84f20ac976f13d4f8bc25a0e1c3c7 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 12 May 2024 00:22:36 +0200
Subject: [PATCH 0220/1286] Added missing alt & replaced remaining dspace logo
 PNGs with SVGs

(cherry picked from commit 56c786d3f7fcc6326a8ca156083903f8ac696666)
---
 cypress/e2e/submission.cy.ts                     |   2 +-
 src/app/login-page/login-page.component.html     |   2 +-
 src/app/logout-page/logout-page.component.html   |   2 +-
 src/assets/images/dspace-logo.png                | Bin 8609 -> 0 bytes
 .../app/login-page/login-page.component.html     |  10 ----------
 .../app/login-page/login-page.component.scss     |   4 ----
 .../app/logout-page/logout-page.component.html   |   9 ---------
 .../app/logout-page/logout-page.component.scss   |   1 -
 8 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 src/assets/images/dspace-logo.png

diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index 4402410f23..8215b4749d 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -137,7 +137,7 @@ describe('New Submission page', () => {
 
         // Upload our DSpace logo via drag & drop onto submission form
         // cy.get('div#section_upload')
-        cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.png', {
+        cy.get('div.ds-document-drop-zone').selectFile('src/assets/images/dspace-logo.svg', {
             action: 'drag-drop'
         });
 
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index c38444bec8..8318b8c22b 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -1,7 +1,7 @@
 <div class="container w-100 h-100">
   <div class="text-center mt-5 row justify-content-center">
     <div>
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png" alt="{{'repository.image.logo' | translate}}">
+      <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
       <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
       <ds-themed-log-in
       [isStandalonePage]="true"></ds-themed-log-in>
diff --git a/src/app/logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html
index b5012ed53b..edb86583fd 100644
--- a/src/app/logout-page/logout-page.component.html
+++ b/src/app/logout-page/logout-page.component.html
@@ -1,7 +1,7 @@
 <div class="container w-100 h-100">
   <div class="text-center mt-5 row justify-content-md-center">
     <div class="mx-auto">
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
+      <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
       <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
       <ds-log-out></ds-log-out>
     </div>
diff --git a/src/assets/images/dspace-logo.png b/src/assets/images/dspace-logo.png
deleted file mode 100644
index 40b59feeaaf5ab7d9b885f02820956ddda24e431..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8609
zcmb7qbyOVP_9YM?xCD0(1Z&(SI0W}5xI>V}-AQmK!8O5yHQrbw!QCCwjcbAvq?vs0
zy?Hb9-*4)yYp3?z`<$v;cinYY#cF9N;bKu@At52*swm6r{B2$TDH!N~>p|n!4}TkE
zPaP#$q}oa9!@mPeH)SJFBqVI2e+n{EP9FJRfRUpf&<m)pCT0zC;kL8^S=n;?xw!pB
zBOyuniT&-m*m_yg`?)x~dW!i;GX4u8_P76!8^B2aFNl|uBqLB=i(U@oVM{N_Ex^sg
zD1}8&PcPwNV<)B~ulS$oe@Bvx4qjevVgP`zuP?VRKR3w39>6OqDhlA?1Mu;2{Y7wj
z`n!5r`f<5>GX0z6fAh%OdRlupx_LQ*T<QPewX_0xdr2}f{v-6?>)&yDIokanC0Eb?
zr1dvJz(02Yyxcs1|8oDGD)En3Ow+^B_OJ3k{8GFU|3dyhzW?Y*0R9pGzk>O9rvLK(
zO;rj@0`T9*CWWQe$7+OxL<dumm(lY>J~hS6A{l5tJL>>7;(td$LE&Sd)Mgrdx&2B{
zUf>AFk`VPp3@@*E&JQ<t?AKFSKZ22wGk+$G@b6(t$a-mgW{Xe_qfe^tALbeFUhjH%
z3f(vxTNn2wC8YMNbLuWwGaaj}dY%{cu4=D(pQdKdXz@QZx6c^EO4(;wuQ}M?G?<9_
zWzN!kEquD&%i01|Zp3g%pKm%i8J<T8{%JZo3UYb4(ZTf+{IPG_UP~}7aOf#ai?mLX
zE-kG7Ef2ATJ#z9*12iqV31yW>4sAJkR0)m_sBHk+s1NI~8`GQfJz8n2b3GTqR-&P|
zo5nV@wKr))QS_>-2@i@pNwiDP+{|9XIb|)@g1YPt)VKpVH%}diZ*E!v`!jT|E6C;y
z?kv+N0|TYt?TN5&rCZhs{9%6<RIR($ZUwgbg`ySGI@odhj`7i&kDhul<3Y=9QS2=O
zXeN=xjiHhsenYk&LXNJ0EP_~OUT=-{1>aD|sHE1Hp;Pwf_Q_nYd|Gn#!wVDAqT+nd
zJmN?-Ji{20Fzc<AZ!O>Tf)5o{ZPqpDcXhS4z3neA`{j#%2El}b%7zSi<WGr=wT&%&
zzZa(lGfgYzEc4`{Hq+gQ1^nnC&GlObD_`4K)Z<I7X%2X4MrHjMiKEBjDstvm$t$aC
z@HT>PuR)R;a7Cu=r&zcc+L0egT1{3HG{C^1V8eDI`J)~#t&hp#BsViyNtX8w<=p*G
zsmyWdK0X}@xE1Nk%X)S`Vyl;4gs#@qJgUgh5(`xUQmh|Vc*)IMZ{)g?H#$C?czhJE
z<QtJ#FXX9JBDbIKE;afhSivq5v0geiASYY+B?h45o86F0XcIdQmhZ2kbWI!xC_Kt`
ze_riNyriQRypy*!OXf>*^I56$Cc2#bN`vM}QUY!gQeYGf&a=m*{c?Ms5IA|Fx%Wpf
zG}(Hvy@24;0nSyEC8obB)#{*b(#&00JcCLHHbTI7)woQFZ5d@^#?1#b6qdSg!(HBL
ze#0Nqs_OP}9^54^O0lH)QHN0AUQ;3NO@qS4bXAi$mqEvv6}TC4cXDG?gO{lgzMM`$
z!#lmXN}RZN<7s~JeHNRPASB^BpcC3iyXNB-RGF$Gz$ie$8P0C)8j^GDew>p0O3k--
zakZ*!wQ6ItgJ3QSwJ8KOc|}J?u5pFL$*%hwAR%?8n>rAAVqIA)k-<Q$3`n3kI_k^a
zemc`=_yAykh+)^wluG@T`Sh#Ain=G&T3g>kg!50UbZD{fc@u8*EYfT8+lybf^H9!H
zqpa5w3u7<<<hK~8`!vKn<B2%oP{d2wmiA)dD}_Iv(l41!^N6?Z?5ThU$Pfjq)>%l6
ztzcPYfpc!hp4PD&^O~TC4Iy)-02f;DJ-Z9J<Pfa=;A=w))UO}A&D49V3Jlo0@lM=N
zL7Gw-k9_++VnTalx7pNxLNgjKyeSy#P(wN}^2gBHHQTm?nZok51?`{ARa0+0UtE6u
zv@z?#B#iH^`-Z+*c<fxOgsDOZE53kD(cI%uDOe&$Xk&}p3%!FSIdZ&`3UxeFs{^u)
zZ-5iei7_Zw=vzudj0xjK?XBh4@z$YhOoJnRpUy)L5}{|J35%wm5a@D_Tqs+>RgM)m
zE!psjov{}6r}MNKvNTad8p;D%nBt2$MokIcoXGQo@D26WUUJwv8w<AzLw&fBa~x{_
z9!jdYrDZZtqW>+%Ha!oeJ>xQd?|QdkZ&2)<QzInEK=o+%>b>PF_PnQ}dqyqtP*vXY
zHTG-TpTQ_o*$B9cWoI84GZOg-+s#vBcX$EUu|OE)St8HT@MyWY=S%NWC-#<3K!@U+
zg&X$(<Erw`G07n2<stGCQ+C;+XD|Q0*@9EbEqd-oTI?Y!2@z8OM1bX0lE1z_WnT92
z!Gsr#UM~yXF{PAzJV@1A-EHiQ%UhSu`1j0ErPrF2uYLDSOrymLWFS(}78+A2!pA++
zrp=ZJBA(Bp#AsoYBTIM=wAH-!lw2Jm1S;cmo~wuUbJaD~{#<{QN)HXWFFjKm0tBtx
z5L(dAy&>e`Wt#H8sptJ;eD<`qTplrzy6daC0z_sc%qP&N2?q^SD=FU||F#d*Muum;
z>x!}oA_%wXWyu<Ri8}fU{VGnueMDzi4qD(LIVn=5-d*q}ES0x`r|>N+#0nzN;-Y)q
zYaaalUKF*{@0Np%dwkp%fpS>EN0RePC>nkyIGx!2#$ydGXniYV^&%|05s`QDaypID
zAx7c^5b&T4g%YW{X-hZ_e86^kFM#xPg3_wYXvE)J-Ys;b%zlvhIK7=<9sEawt4jtj
z{qun*o0J+SbvQp==<#AQjd$WH>MkVF*Wu$r1VaR=LtK@`XEZgMur1Vt9qO%X!PQ87
z%?{5WxgpO<q2A*XP-T1Fa}SL@uie<=G`(KT_iD9h+Mlj59A|i}-F?po2d)>2z40>p
zF6JCyoiXITU~?=q>sV}nqQ0^f@savj@Q1;-i@Z`d+Z!Xt8W^$1+(9-)0<{UY2Dwgh
zq2r^TCUFl;a1vH|?5mha_NeGjk{Rrl@33o$4yDr0P@&=!%-oo=p_bW5&zqIcLEj+U
zCU|3M-pYb&>9ZL5FJ0L`<c%n(6tnL4s|<;}t#j{0Yol`37%M03=KmGpj=9LJZp9L$
zIhvcE>>lPHXcUx#&0epoBK}5nc0#r=AtC)*RN0q@fMysHRMD3Xrrog7zIR|X{lweB
zF#32Yok+2Lv!XQn!RGc$cYwQjv0ATbLcW5pJtb>?v3F444&z3{Z@X2{fDHh`kkxzA
zL%-SD!9%}PF2h3{&7Vm0_4lqw_GJutzooM&W&f)Pqip{hC)pYkzKC<<JnyX8p-7T%
zZd3+bzx&`41B@J5MzHlVJ>xl@0k}tDPp0n4cIFr+Z_@T>GL}kZxQS)erRS*8HWo)x
zPssHw+NEbe2W{_H4_-2~sOe$Db*WszY2ws~nwi%M+B}9MhQYwuBx#({8ZPzX=!^}p
z3(-zG5l23yU{?8OF1!!sDbvOZA1VXx|1N*!bsN*=onj}!)z}$@&l7pwlW0IXz9iLA
za6r76PNO(+XJNd`!h><4Q#B^E?dV+7r@b+cD+@h6lEJ9aSl@PTb&pi#Lp95?Gb&9)
z_cWb(6Fem*-gt*#-^}9`fjh*;no(TzL^a?@dvL%QYW_4r^bJ}dJRRsFLOk{kg*1J5
zCMM%}qJ^xja}h@F?Agp)`sr(t7+B{!%+29fxF(g|BW&+>>j0<mjPq>8pgqy6wCW;*
zADzS|{t1=f_#-UxZFlf??(Y=Vt(kSBkRfq3;wwM<w4@OD#!}p6*$vG}AZ?u!yb8d=
zXDFt`RP~W8Yu!_>*&%$m;&anp`*8T|mh*G6?~=jk-hEo?^1i`1!pSmDZ@_5<Typ5|
zVKLQ8c>Amg8$FSl906LVwFk*4gjQM<G(9GbEhQ^9D4JgTsEC)oH@^cbF>{-(%mQUB
zyM>>LZ>^Nm=XK~XQ{S9^U|wxY;i(QKhMimzUm4F9KTT{As`byJC7iZ7GM_yTs^5l=
z`0;RwJ=I3=*Wm4no&A&v!E~H^6Yic>ld<FChdu|dOKLA11IK5-ueVl$5WO4xx{yms
zdew`Utqax*JAplL36<<{Ojft->VaeQKh!37KCT(%E)uwLn;tNCa7Uuz23yWlTwX%d
zrsAa1Jik^_sw_S%`KownuPB^Sz0ZWu<YGuNx+~5=4w?87Vtgd@Oz)zhT(~e2oRWYO
z`ZSy<;2?ur@Jqrwct(|WVXSt&1jx~@V4DwzUq_!=G=|o&rAZ))X>C*Tv4I}aU9EfE
z6zQBC>-%@pA{e%+y4LEgC5}55#mR-6S~S7+6z`s}i|z<_5|f)nW$`z1H4oV=Sx20S
z^Lx;kV_UvPFFs|)EZ}V&vZ|@Yh2D3DuKAd%Bc5$dUVSu`cJt4puEM3cFz*6u%bV|L
zsw*5W*lkI#3m--3#`9dY#Lbwz;{=Ljv{(IhEZ{sw)r@-LFmcRqWvDJl_;po%5Zyeu
zIvjk(!Oc~6Pg<9CC1QT0nXJ0LU&-ao$U>ZiZHnd)@;)UbU?6`B;9eO?ioF&9k;q`t
zz$eXf)AsK;!#X~0pnm1k*JqXJNLYP@dgzl@mY!&pU3A*Rs(uS7K-|3Uzn||9*x4_!
z$_q~cheu9Ta>A^PdGM@A<E>!MMC98t)ohG|My>?0<+kEQJ8z3tqmQ+j>H}Q7^?MT$
zPFwBiAqQlEY6?fTAMDR45v*4rv4za{7T_=B#~*tL(as_7ARB0QU|35tP<KSWUVSXe
zeXY2e!zY9)Tw7xbmU&vLWNQBjp@TK(|D9-ZV88t<P~XK#gt~h9I;8)jHwXKz`*KRa
zsGR1PE+zfa7jnql-20tONDk$rIx?21R#lhnV|SH@9p`E!6@5qzRz)r~l{nQ;bxH`y
z?R-N#{n+e+_;($Ru_aV1LFa6Lzna0a<cs9@N7MKVm-;w&GFqr^G*5g<B)Qyf3-ptg
z2Ij&BerubS%_3{4<oOxgBAPFv$;>cEtPD_}vPnSXC?vayh&6z5s8NI?{8avdGhnn_
ziTq_fgGk8kNTIXT`Yb^(0cq~X6@n%Y1z1&$7g;}2RsPtN6Ml=7at|BYor+G&V0D6i
zb@G>WjXcx7TX#oCt2D}7B~B6XfjE*JEcEM+sv98y!ot+H*L10?E5^TPS{q*X`OXX8
zwq5MnZY;jX^%nZ{r*3NEa5wMlV&y{QQQbwIm<;KAvyeO<_3GT?!HY{FD2@y~u$j4x
z*Sf#3oH>DeJdh;Sq+Zs#QXrLwGO<eCyAbUbhInBZwcBNGa{ju!AxBxM5Y>M1^uprq
z+1FPOH+o#utS8oARe9z7>vL#qEimKl7x^eJpY!}2*CgNXi2NBV@=Ip*cbT<5$;Ocf
z2H_LRuTlR0?0Jdc=R<kzrc5wQxF-Z^zS6?geOp~rgmg^%RI*~)Zu%uz;*gtbP|!rI
zT}f`JXvq9TJDHBVCwf)~Y?}?5={TPKQrY2{z8##JnNWec^s$5sr+;{QXFcgG*6XS>
zDXE7{ZNUhU|0y`t8M8{HhyN4C(~8cK8%xXh#i^(85=q=8I(SpA>8JKL#blAED~7Ht
zC709U!G?wgkM%g3d{k;KT~1beKg#_GbJAKbuFPE=c-7DViSn>cQ~H^55|K)Sdnz}T
z7Dp|*N#PJCrjssWJ(h?S&s}7l0-Qy;(e6EjxVWe(OrxiWiQhe{c7|Z=_iaqV>B(n*
z7uK2T^-^_@4i&Pe)t@cfB{F$O-gU3C3hEc{#+SQ1Vh34oSeQu&GHT`r$Z6ZzEz$r}
z+$axhiv)ITI3{H)@S<fyrQIxky>MErRtaqQ-aGBc@0xdX8N(C=iOwx&{lS6O<{znh
zu6KfaS5kZPo9^8^#Fen$49h4%sKmuqQDFbL5%jW6vXM{+->!oRHhgw*L6cde4VLlF
zLSV3PHzGMW<QbX=UspVu1(Pkiw73KDvhbx}_O&4s74oG^SJYHOT1$35c?YcOtqwNw
zc`m9ypZY+i`g8h_hQF4D#jB4xyk{=j8cXgHF5o0$`{{>y9xfR*S8VdC^&%o=UXN^5
z=iKp96Cnb+JT@tZC5Kiq(}E{LyB3@p?Is`qan=VsCJa^vEyh=5g)hPvwN&YU$M32Z
zh9I3MV8t*iu&|_@!I!IZ_a=`wzAtTuzeVEcs*g%i`odFo<~CjnG*(${_HKq6A;#0t
z6e$u!TtX5h8bE)}ZvRFZ7@)*x2{swG0xQ2{$1~~j*!8R<A9qRTzFsV1QZIDhj!-in
zl+?%^tFnrv98<2e_rDtt<YY}hIzA$+0fOi2h~AY9HM)bc#c%f}j8;VLqhuLkcL}pf
z_o}70$E|}PnD!DLPTWF+bbXjV1Km%ZT#{&e#QN>5pS|sBFHd@z8qFSNW<6Qc9q-{e
z%nj8%#y{sN_-iLeC)*>Bw}1zWZ;Rm5#d39vi;LY+vikC15KqJ@FKzOar7ov^Dh5Z+
z&bw<O@_Ar_JF+Zl6MaST6U@Sau1<>wNH~}jx<?qVU=0z4NasrUA2oBn7)z7K$Nx<f
ze3U@Z_*(S$>C2J<?NX6!DkGj+0RJ{RVm1s8QkrBtR`=X{>h`VMj3+4?=ezje=!&Q~
z`q>MeUs$TaZ*+qbp}%JaNP}SG*}_k00>ykI)joI^gp0>jQT?gy7CcSD#Pi2gvibgp
z-u4P@x(fZmb4Ude$1R|0Dm}6!yt?nhw4L{rn$Y)<@BYPioQ6DQ=kt*vk)4|658M3c
zaR714FM4b1iCEi_Lc#}Jn#j|?BoPO4XdD@U{JZhla&G?}m^99J2`yex%2++Y`K4b$
z_lK-@>FCCGVlPt&P`S9rge*Fzj6kAH!ortL>yg>z(vQ=>UY@LV_@b~IC-Z1$RG*yW
z&dwB@tEga-;F1on#sj59#M`>@p?t_K?>~cNPxG-X^i3F1n3}y6xAUZe?c5FQ7F{ef
zP=nIX1M96q2R;tbh3<^o7n=HP%$65&KHAv-5uGMpqsA*w{If#S@}}sE`u&}Yxn;pY
zSlsfdPic4Y86ui4z)j0jccWgb!q$PU!n||HmgLjyTBe=;cGU2F15ZY6>fKrM)LGYY
z63ISjAbTiOv5C#cC18p+^EMJHLI32oBO7GfUnr7`I<_GneuC5hEfzu==AMoP$r5L)
zgiAj|N=klTjBPc`+X#0uqN-?8C8u6&IUwfW21afwJ4zJt$b7V{_dz`Vl0<eR)jBn*
zS)5B*=kdcxN~PY<9Q$Aivz5!ovu7y%Oixq$y^EiN$tirymg3L@!XMmS9jknq#T%sZ
z21`B2QrW+Av+&5f2`#esMebIh{Yja6F3@mxfK`l)FuA5bI@INH8N4q|6#H?J%edvU
zc^EOaD@CHaxW`ZW%pKLS46bkI3zICZ?9}p{RxtqJk4*DRiD&bvyM6O|<4X$8{g#XM
z;2<Uo6gUJDN(ogQgWV+@_6v1%#fee=l;3dmJwI9TG?>Vfv|klmBG%?gGtybf5e!6}
zCoimFhS;lFueY3KM7TR^^-;X~xKWCtwz0;Rj39rW8GDUOD^XAWVOH)<)ad3l9DAx}
zTJKsgBQxPDpldFxuV^D9MrIox50Jt?hejz@>ZC=4FDlqj_6<aHyv+q-R6gBp-*OZN
z9D&DrnzkY`dYf8o<~Eh|7w$07Z*EnZ!q&`^+I~=|pe2JD%%l_ZboMiYBC<&e1-jz|
zZyNpTS=m=XqY<g)Plt%pH3Fp*Bo@qXU(k(>4ejoN4EwS7L5|uLbsRPdkiK2Fk9%7e
zU6S=b&753ajoLkS8-Ib(hzJbk*%XgJ5kw-KdyLNt6d3j#KMV*(b@T*maqhGHi?y^G
zR-9kyUAlf8@NyI&A6=YU9Z4BJ9;WAGC%~x=r;B0}{7$X0U-Q{vnv&oD;;K<5P!$VT
zk%jaqg@H*?HXrQDQ;&j6CDeIN`Qlo_k0Z~FmEl^9YZ2_JA}1HN`lX?<0gA7F;lif*
z-kK3tT^zX6l993ZVkBXXUk&kwD2#TU=FWLIJ7-jGVjAYxcrPBD&{{L06g!NnhwhzW
zIN9wu36U}%OxBX&=&^B1DlT0k5Te!*S>N@UDCFPY+b<RZ$)FX#gQN?a_3S)uYpNv&
zX=aQ6%DAp*um1>1UbAb&f60$wg|k)BJTEN7t*(wgO`PF!G*6K!VmjIQ=8YEmyLv(T
zt4CEp*WF-eE@%VhA*$5owwOM(4<Qt2DVeRTt|oRFhWXeurV>~PghgFkc(}Jw!ON|&
zo^0d>%4XGqNllWh7hX0!6uC6HQ+A;2P#w`2Cb~rEfLdMRzsqWt^@a1`QUv@K7l{q`
zUlXuM82)gWRvuy!TydXE-p{F2*h=?={6J1=(bT<sZ!HS(pR4T%xoAAUqTyFBpCX0*
zwzUajVdA&eQ&b#eOCVJG${Xe{<lNO@^a0QC*>(4l!^~>i5&N^HfPe7jpBSZjlFu-~
zEQGDtX@)ZA1=|Acqow?Ed4c;NMX)zzgi*p$ow>BO@HE*X+tak)@?GVin3uB%hT8NY
z4?Gp=Ga#;(e;MO73=XR2CB_nd+h@#cP<@o<{>*!f#qdRLYEly4+~d{Cx85ZQpEc5%
zQLI^N2IZf?C^9o3*mWe06;!<pwf`|B?qjCq*><xySXKs&h}HAVSX|7=nmf$%TCpXX
zvJO%<v)}DqdYC64-<Bgs*E^5+dnQrZYzwls-X43&A)VXgypl$jj^}WxBr^M>)XZCd
z#?fMVx84rzPOw=}57bS_q=?f8+I;xc^}rz0+qLJ_?lC0}8rN^L&wka9<%P!RqQ7fT
z(rXd+9(BqC3WvjC3C2KRR?L{aNR<P_X`80FJRx}X@msHTtN6}fRMbFyPT;~4jZ{~0
zw+~O<U{nr+AFbBHYLJYH{?YY3u|ATon|I^FFTm#q4d=A|{KlL@p>v4D;>z6}&19rJ
zvHB`9G!73P-lMLpDFxSSRIBT}z_LTx3591YG3l16<rd_pci>nhC(=@CeD%bMeC|-B
zi+%9HJ1oX4HJynOApKTGUm~acd{aZGAnd%{Qz?ov(m7BggT&8Jot~4v-G#-zihDii
zUOdYIT}tM`ct$pc4`iC4+kJc1BE}Jg%Uf8OCVOdeo3y0_*VDhmB;FVl|JB*$I9mc*
zu(V=Y+x1b+Hu7&Igw-sWhf1P5rDauBW8+ePR^s9=xJgV)+n1IP;GKweBh?W=d2I2l
zMk$MQgBKE0^4Sbq?f@=asCXwuTBzg=s^jVdx}{}!uqV{h6wOybJ*}Zq&X{;AR9Itt
zHmyMFXpR?}DZ|Q7O`?%SGufIs0*($_A>|opFM78C=G{BU#8Q<he^-je^U>JM=%0Wj
zQu)G2%_^^xgdat(f=|x3iodCp4H>8x{lu~ULH|0^y>G_@BB9Gh=gj87BcS7vpnPub
z>X@X7qh%^aebc83$mhWlIJZstc+SjeFJUO_@<hQew-qjiEuNpW@^>G&@u}@LBEuC<
zsB6?`5o)Grx3_&D*D5FecwPvCLU4i^KNail^#U!ZG5wpZDWA3zUc3^xH2%<k849_G
za5wnAW7RP>+>9SR+d=-a%_iN^qTt&H%`w&6DL;Fbqht>j8Y+hSFA)*EqEGj@z{B%^
zdpTUh&EB8ZNt`Bh#Om^F{fMQvKtCIK%2LM?e!fpM6%G@y2DjM2m2HRojSB;j3(;<#
z_cmvAlN#1nS*((9#zo6roNqRxpDC=Xg^vG_@AG!EP-Ff|ssg`rBfQ=(DY9Vugu8{O
z-7Q-j+1`{dRv*e6f%v4V%oRd(){if|C3>G%XAV2}yN{fKRiBIp?oB+L?ItGTPW7g6
zC(G-R&#i3v1WJ5fchJzdQGT36p37j4DS=o9f9)AKzENw3MP+BlS$ThzICZl$@834w
z0m>)Bwrg}f?~5p%;djM{Q<Xe=T76)`q^d5iV^^q^<U&LVXhod>HD!MP{WC)J$-)=U
z3c09G5a?(Q`;z_TO&q4h4?v%u12-D_csi)sw4*Sg=SvYQBaH4qOXCMqTnQeffbtJZ
zv(5y+!_fGjrtG5mElw6crhms2ftPPi*r5RnRr)r{;?b~C(jU9z>J4irC;KVtL2TiH
zyi#+5W4(`$2%?ub61$;6Qsw|0B|V-)S>PC1L!s4^k>PagOhav5-Sf#d&2B_&QD#eR
zMOg)v{hxK(+tO~Ftx}8k9elHL;8ph^u&IIDeBlAmpIU<T%O66cAP0<uc*iUYgu^rR
zcz-?Q&pn7yJ$(znu<iF6U7uJHM`Wos*!y@fG+3mnrPdXVoxqX>h>S86zsE^)#AHY(
z^*B6Rs)_hKrCewt`!w%NJfxwTa%fexS5sM89OgA7^MY8{+fF>MmMR;GvWFH6T`0}*
zGyBenRK}dz#X7|EkC?)T53T{JyUZ3TW&Cx}kPDKlB`&$mxD_Hk&_Y$FG~2Vy5X9Tt
z8-Of4KJ@)-o*KR#cmX_NOi4*K>J!}V>1?!;BdHc0v?i!Ei-sJ8&;oW*3xQ$r9`&4+
zna%KRMax)T2AVgo90aQsovI?DY4H5l<hDXXIXV@dktriyZ<mRY##sEkKba8T%8T{Y
zy>08t&b%5O<LG(YGqP@!d4J!2@nS*04q<(LbSj3+#}w<%qM#s=VfLZIDTu#p@a*j>
zhE1K&$8V=s0xIX;P#@{-q2ybk`K70_N(ja7l0>ocfw$spc?r;rDY0mc9Fr@Z{bu`e
zPGrd_5i%V!;6)QnthKASj(YjCRWogo#MFPcb#i!Qq)mdKKM)n^72eYpEH0AdyJ6SG
zD3w};YE=)f%z<*(LR8fKgT>9Q(npN<dcIT+R635X*Hd3hFdcuD@&js#)?Ts(k>lg%
zlhilXqvmV4&X(Cf9MVthUuOcNH4a!BW{z|G5MPBQ=6Gv6bl%kLS1Wf9x>HiJ82h%q
z_cP|><gAhOnpIKz`-aL5V(|MJC2B?;R9~!&e)<$&G&olB_!!i3KTn!V-StE?d%XR<
zPqvcaU1@w!@((3v=0o=G;Z*P4Y3t>BOU%9F7d~abNJBmkA045T0G!OR=Z55a{)hGx
c$nYCVCo#dKEWlLq&wmpt3L5gYvKA5l3vLXp!T<mO

diff --git a/src/themes/custom/app/login-page/login-page.component.html b/src/themes/custom/app/login-page/login-page.component.html
index 1a83892c24..e69de29bb2 100644
--- a/src/themes/custom/app/login-page/login-page.component.html
+++ b/src/themes/custom/app/login-page/login-page.component.html
@@ -1,10 +0,0 @@
-<div class="container w-100 h-100">
-  <div class="text-center mt-5 row justify-content-center">
-    <div>
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
-      <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
-      <ds-themed-log-in
-      [isStandalonePage]="true"></ds-themed-log-in>
-    </div>
-  </div>
-</div>
diff --git a/src/themes/custom/app/login-page/login-page.component.scss b/src/themes/custom/app/login-page/login-page.component.scss
index d628a5089f..e69de29bb2 100644
--- a/src/themes/custom/app/login-page/login-page.component.scss
+++ b/src/themes/custom/app/login-page/login-page.component.scss
@@ -1,4 +0,0 @@
-.login-logo {
-  height: var(--ds-login-logo-height);
-  width: var(--ds-login-logo-width);
-}
diff --git a/src/themes/custom/app/logout-page/logout-page.component.html b/src/themes/custom/app/logout-page/logout-page.component.html
index b5012ed53b..e69de29bb2 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.html
+++ b/src/themes/custom/app/logout-page/logout-page.component.html
@@ -1,9 +0,0 @@
-<div class="container w-100 h-100">
-  <div class="text-center mt-5 row justify-content-md-center">
-    <div class="mx-auto">
-      <img class="mb-4 login-logo" src="assets/images/dspace-logo.png">
-      <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
-      <ds-log-out></ds-log-out>
-    </div>
-  </div>
-</div>
diff --git a/src/themes/custom/app/logout-page/logout-page.component.scss b/src/themes/custom/app/logout-page/logout-page.component.scss
index a25e77fb6b..e69de29bb2 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.scss
+++ b/src/themes/custom/app/logout-page/logout-page.component.scss
@@ -1 +0,0 @@
-@import '../login-page/login-page.component.scss';

From 99384a70605b2eccaaae249103673c3735da8c85 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 21 May 2024 12:02:15 +0200
Subject: [PATCH 0221/1286] 115051: Created ThemedAdminSearchPageComponent

---
 src/app/admin/admin-routing.module.ts         |  4 +--
 .../admin-search-page/admin-search.module.ts  |  2 ++
 .../themed-admin-search-page.component.ts     | 26 +++++++++++++++++++
 .../admin-search-page.component.html          |  0
 .../admin-search-page.component.scss          |  0
 .../admin-search-page.component.ts            | 12 +++++++++
 src/themes/custom/lazy-theme.module.ts        |  4 +--
 7 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 src/app/admin/admin-search-page/themed-admin-search-page.component.ts
 create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html
 create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss
 create mode 100644 src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts

diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 1ea20bc9a0..3e3a8924ac 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
-import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+import { ThemedAdminSearchPageComponent } from './admin-search-page/themed-admin-search-page.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
@@ -20,7 +20,7 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
       {
         path: 'search',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
-        component: AdminSearchPageComponent,
+        component: ThemedAdminSearchPageComponent,
         data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }
       },
       {
diff --git a/src/app/admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts
index 353d6dd498..b45eca15c4 100644
--- a/src/app/admin/admin-search-page/admin-search.module.ts
+++ b/src/app/admin/admin-search-page/admin-search.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '../../shared/shared.module';
+import { ThemedAdminSearchPageComponent } from './themed-admin-search-page.component';
 import { AdminSearchPageComponent } from './admin-search-page.component';
 import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
 import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
@@ -31,6 +32,7 @@ const ENTRY_COMPONENTS = [
     ResearchEntitiesModule.withEntryComponents()
   ],
   declarations: [
+    ThemedAdminSearchPageComponent,
     AdminSearchPageComponent,
     ...ENTRY_COMPONENTS
   ]
diff --git a/src/app/admin/admin-search-page/themed-admin-search-page.component.ts b/src/app/admin/admin-search-page/themed-admin-search-page.component.ts
new file mode 100644
index 0000000000..741a3b04f9
--- /dev/null
+++ b/src/app/admin/admin-search-page/themed-admin-search-page.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { AdminSearchPageComponent } from './admin-search-page.component';
+
+/**
+ * Themed wrapper for {@link AdminSearchPageComponent}
+ */
+@Component({
+  selector: 'ds-themed-admin-search-page',
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedAdminSearchPageComponent extends ThemedComponent<AdminSearchPageComponent> {
+
+  protected getComponentName(): string {
+    return 'AdminSearchPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/admin/admin-search-page/admin-search-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./admin-search-page.component');
+  }
+
+}
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts
new file mode 100644
index 0000000000..358f11f0d1
--- /dev/null
+++ b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { AdminSearchPageComponent as BaseComponent } from '../../../../../app/admin/admin-search-page/admin-search-page.component';
+
+@Component({
+  selector: 'ds-admin-search-page',
+  // styleUrls: ['./admin-search-page.component.scss'],
+  styleUrls: ['../../../../../app/admin/admin-search-page/admin-search-page.component.scss'],
+  // templateUrl: './admin-search-page.component.html',
+  templateUrl: '../../../../../app/admin/admin-search-page/admin-search-page.component.html',
+})
+export class AdminSearchPageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index d2ac0ae787..4f35854e5e 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -114,6 +114,7 @@ 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 { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -168,8 +169,7 @@ const DECLARATIONS = [
   BrowseByMetadataPageComponent,
   BrowseByDatePageComponent,
   BrowseByTitlePageComponent,
-
-
+  AdminSearchPageComponent,
 ];
 
 @NgModule({

From 61e52cd2abb8ec5dea4b17170e93fe190b086dc9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 21 May 2024 13:26:19 +0200
Subject: [PATCH 0222/1286] Fixed navbar overflowing over breadcrumbs in mobile
 mode in custom theme

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

diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 90cf07caa4..f2f87a8bb6 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,6 +1,6 @@
 <nav [ngClass]="{'open': (menuCollapsed | async) !== true}"
      [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-light navbar-expand-md px-md-0 pt-md-0 pt-3 navbar-container" role="navigation"
+     class="navbar navbar-light navbar-expand-md px-md-0 navbar-container" role="navigation"
      [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
   <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
   <div class="navbar-inner-container w-100" [class.container]="(isMobile$ | async) !== true">

From 975e9fd3565e247c1b08766d1123f12c0c256dbe Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <15611173@utgz.edu.mx>
Date: Wed, 22 May 2024 00:23:51 -0600
Subject: [PATCH 0223/1286] Hide search text field when number of facet values
 is less than the maximum (#3061)

Hide search text field in the filter section if the number of facet values does not exceed the maximum number of facet values shown.
---
 .../search-authority-filter.component.html                  | 1 +
 .../search-facet-filter/search-facet-filter.component.ts    | 6 ++++++
 .../search-hierarchy-filter.component.html                  | 1 +
 .../search-text-filter/search-text-filter.component.html    | 1 +
 4 files changed, 9 insertions(+)

diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index fdf154bc04..91738c6e9a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -26,5 +26,6 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 994b488d9c..6f56b627b1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -61,6 +61,10 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   isLastPage$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
+  /**
+   * Emits true if show the search text
+   */
+  isAvailableForShowSearchText: BehaviorSubject<boolean> = new BehaviorSubject(false);
   /**
    * The value of the input field that is used to query for possible values for this filter
    */
@@ -297,6 +301,8 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
             getFirstSucceededRemoteData(),
             tap((rd: RemoteData<FacetValues>) => {
               this.isLastPage$.next(hasNoValue(rd?.payload?.next));
+              const hasLimitFacets =  rd?.payload?.page.length < rd?.payload?.facetLimit;
+              this.isAvailableForShowSearchText.next(hasLimitFacets && hasNoValue(rd?.payload?.next));
             }),
             map((rd: RemoteData<FacetValues>) => ({
                 values: observableOf(rd),
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 eb49235641..11db5f25d7 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
@@ -26,6 +26,7 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl
     ></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index fdf154bc04..91738c6e9a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -26,5 +26,6 @@
                           (submitSuggestion)="onSubmit($event)"
                           (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
+                          *ngIf="!(isAvailableForShowSearchText | async)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>

From 970b19bf0104a9f361717d148bfc66a60e70e239 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 22 May 2024 14:02:41 +0200
Subject: [PATCH 0224/1286] 115051: Created ThemedAdminWorkflowPageComponent

---
 src/app/admin/admin-routing.module.ts         |  3 ++-
 .../admin-workflow.module.ts                  |  2 ++
 .../themed-admin-workflow-page.component.ts   | 26 +++++++++++++++++++
 .../admin-workflow-page.component.html        |  0
 .../admin-workflow-page.component.scss        |  0
 .../admin-workflow-page.component.ts          | 12 +++++++++
 src/themes/custom/lazy-theme.module.ts        |  2 ++
 7 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts
 create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html
 create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss
 create mode 100644 src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts

diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 3e3a8924ac..58ccd54c76 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -8,6 +8,7 @@ import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.ser
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
 import { REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
+import { ThemedAdminWorkflowPageComponent } from './admin-workflow-page/themed-admin-workflow-page.component';
 
 @NgModule({
   imports: [
@@ -26,7 +27,7 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
       {
         path: 'workflow',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
-        component: AdminWorkflowPageComponent,
+        component: ThemedAdminWorkflowPageComponent,
         data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }
       },
       {
diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
index 85e8f00a46..1622a3b290 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow.module.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
@@ -6,6 +6,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-sear
 import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
 import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
 import { SearchModule } from '../../shared/search/search.module';
+import { ThemedAdminWorkflowPageComponent } from './themed-admin-workflow-page.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -19,6 +20,7 @@ const ENTRY_COMPONENTS = [
     SharedModule.withEntryComponents()
   ],
   declarations: [
+    ThemedAdminWorkflowPageComponent,
     AdminWorkflowPageComponent,
     WorkflowItemAdminWorkflowActionsComponent,
     ...ENTRY_COMPONENTS
diff --git a/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts
new file mode 100644
index 0000000000..fe84c44d0e
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
+
+/**
+ * Themed wrapper for {@link AdminWorkflowPageComponent}
+ */
+@Component({
+  selector: 'ds-themed-admin-workflow-page',
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedAdminWorkflowPageComponent extends ThemedComponent<AdminWorkflowPageComponent> {
+
+  protected getComponentName(): string {
+    return 'AdminWorkflowPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/admin/admin-workflow-page/admin-workflow-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./admin-workflow-page.component');
+  }
+
+}
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts
new file mode 100644
index 0000000000..27c7e57fed
--- /dev/null
+++ b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { AdminWorkflowPageComponent as BaseComponent } from '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component';
+
+@Component({
+  selector: 'ds-admin-workflow-page',
+  // styleUrls: ['./admin-workflow-page.component.scss'],
+  styleUrls: ['../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.scss'],
+  // templateUrl: './admin-workflow-page.component.html',
+  templateUrl: '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.html',
+})
+export class AdminWorkflowPageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 4f35854e5e..1939483c4f 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -115,6 +115,7 @@ import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadat
 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 { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
+import { AdminWorkflowPageComponent } from './app/admin/admin-workflow-page/admin-workflow-page.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -170,6 +171,7 @@ const DECLARATIONS = [
   BrowseByDatePageComponent,
   BrowseByTitlePageComponent,
   AdminSearchPageComponent,
+  AdminWorkflowPageComponent,
 ];
 
 @NgModule({

From f1b397fc11e35eed8d5a36a375bbecda95a0d7d0 Mon Sep 17 00:00:00 2001
From: Kuno Vercammen <kuno.vercammen@atmire.com>
Date: Wed, 24 Apr 2024 11:41:35 +0200
Subject: [PATCH 0225/1286] 114624: Refactored legacyBitstreamURL resolver into
 a guard to set the redirect status code to 301 Moved Permanently

(cherry picked from commit 369bd693d4bdcbb3a289e5ee0984206207aa6bfc)
---
 .../bitstream-page-routing.module.ts          |  10 +-
 ...egacy-bitstream-url-redirect.guard.spec.ts | 153 ++++++++++++++++++
 .../legacy-bitstream-url-redirect.guard.ts    |  53 ++++++
 .../legacy-bitstream-url.resolver.spec.ts     | 145 -----------------
 .../legacy-bitstream-url.resolver.ts          |  48 ------
 .../testing/server-response-service.stub.ts   |  30 ++++
 6 files changed, 239 insertions(+), 200 deletions(-)
 create mode 100644 src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
 create mode 100644 src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
 delete mode 100644 src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
 delete mode 100644 src/app/bitstream-page/legacy-bitstream-url.resolver.ts
 create mode 100644 src/app/shared/testing/server-response-service.stub.ts

diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 3960ccb743..f378b301aa 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -8,7 +8,7 @@ import { ResourcePolicyCreateComponent } from '../shared/resource-policies/creat
 import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
+import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
 import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
@@ -27,17 +27,13 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         // Resolve XMLUI bitstream download URLs
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
-        resolve: {
-          bitstream: LegacyBitstreamUrlResolver
-        },
+        canActivate: [legacyBitstreamURLRedirectGuard],
       },
       {
         // Resolve JSPUI bitstream download URLs
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
-        resolve: {
-          bitstream: LegacyBitstreamUrlResolver
-        },
+        canActivate: [legacyBitstreamURLRedirectGuard],
       },
       {
         // Resolve angular bitstream download URLs
diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
new file mode 100644
index 0000000000..8ca14231e8
--- /dev/null
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
@@ -0,0 +1,153 @@
+import { EMPTY } from 'rxjs';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { RequestEntryState } from '../core/data/request-entry-state.model';
+import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
+import { RouterStub } from '../shared/testing/router.stub';
+import { ServerResponseServiceStub } from '../shared/testing/server-response-service.stub';
+import { fakeAsync } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { Bitstream } from '../core/shared/bitstream.model';
+
+describe('legacyBitstreamURLRedirectGuard', () => {
+  let resolver: any;
+  let bitstreamDataService: BitstreamDataService;
+  let remoteDataMocks: { [type: string]: RemoteData<any> };
+  let route;
+  let state;
+  let serverResponseService: ServerResponseServiceStub;
+  let router: RouterStub;
+
+  beforeEach(() => {
+    route = {
+      params: {},
+      queryParams: {}
+    };
+    router = new RouterStub();
+    serverResponseService = new ServerResponseServiceStub();
+    state = {};
+    remoteDataMocks = {
+      RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, new Bitstream(), 200),
+      NoContent: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, undefined, 204),
+      Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
+    };
+    bitstreamDataService = {
+      findByItemHandle: () => undefined
+    } as any;
+    resolver = legacyBitstreamURLRedirectGuard;
+  });
+
+  describe(`resolve`, () => {
+    describe(`For JSPUI-style URLs`, () => {
+      beforeEach(() => {
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+        route = Object.assign({}, route, {
+          params: {
+            prefix: '123456789',
+            suffix: '1234',
+            filename: 'some-file.pdf',
+            sequence_id: '5'
+          }
+        });
+      });
+      it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
+        resolver(route, state, bitstreamDataService, serverResponseService, router);
+        expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+          `${route.params.prefix}/${route.params.suffix}`,
+          route.params.sequence_id,
+          route.params.filename
+        );
+      });
+    });
+
+    describe(`For XMLUI-style URLs`, () => {
+      describe(`when there is a sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+            queryParams: {
+              sequenceId: '5'
+            }
+          });
+        });
+        it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
+          resolver(route, state, bitstreamDataService, serverResponseService, router);
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+            `${route.params.prefix}/${route.params.suffix}`,
+            route.queryParams.sequenceId,
+            route.params.filename
+          );
+        });
+      });
+      describe(`when there's no sequenceId query parameter`, () => {
+        beforeEach(() => {
+          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
+          route = Object.assign({}, route, {
+            params: {
+              prefix: '123456789',
+              suffix: '1234',
+              filename: 'some-file.pdf',
+            },
+          });
+        });
+        it(`should call findByItemHandle with the handle, and filename from the route`, () => {
+          resolver(route, state, bitstreamDataService, serverResponseService, router);
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
+            `${route.params.prefix}/${route.params.suffix}`,
+            undefined,
+            route.params.filename
+          );
+        });
+      });
+    });
+    describe('should return and complete after the RemoteData has...', () => {
+      it('...failed', fakeAsync(() => {
+        spyOn(router, 'createUrlTree').and.callThrough();
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.Error,
+        }));
+        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
+        });
+      }));
+
+      it('...succeeded without content', fakeAsync(() => {
+        spyOn(router, 'createUrlTree').and.callThrough();
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.NoContent,
+        }));
+        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
+        });
+      }));
+
+      it('...succeeded', fakeAsync(() => {
+        spyOn(serverResponseService, 'setStatus').and.callThrough();
+        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
+          a: remoteDataMocks.RequestPending,
+          b: remoteDataMocks.ResponsePending,
+          c: remoteDataMocks.Success,
+        }));
+        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
+          expect(serverResponseService.setStatus).toHaveBeenCalledWith(301);
+          expect(router.parseUrl).toHaveBeenCalled();
+        });
+      }));
+    });
+  });
+});
diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
new file mode 100644
index 0000000000..6c6357b5a5
--- /dev/null
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
@@ -0,0 +1,53 @@
+import { inject } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivateFn, UrlTree, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { hasNoValue } from '../shared/empty.util';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { ServerResponseService } from '../core/services/server-response.service';
+import { map, tap } from 'rxjs/operators';
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+
+/**
+ * Redirects to a bitstream based on the handle of the item, and the sequence id or the filename of the
+ * bitstream. In production mode the status code will also be set the status code to 301 marking it as a permanent URL
+ * redirect for bots.
+ *
+ * @returns Observable<UrlTree> Returns a URL to redirect the user to the new URL format
+ */
+export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
+  route: ActivatedRouteSnapshot,
+  state: RouterStateSnapshot,
+  bitstreamDataService: BitstreamDataService = inject(BitstreamDataService),
+  serverResponseService: ServerResponseService = inject(ServerResponseService),
+  router: Router = inject(Router),
+): Observable<UrlTree> => {
+  const prefix = route.params.prefix;
+  const suffix = route.params.suffix;
+  const filename = route.params.filename;
+  let sequenceId = route.params.sequence_id;
+  if (hasNoValue(sequenceId)) {
+    sequenceId = route.queryParams.sequenceId;
+  }
+  return bitstreamDataService.findByItemHandle(
+    `${prefix}/${suffix}`,
+    sequenceId,
+    filename,
+  ).pipe(
+    getFirstCompletedRemoteData(),
+    tap((rd: RemoteData<Bitstream>) => {
+      if (rd.hasSucceeded && !rd.hasNoContent) {
+        serverResponseService.setStatus(301);
+      }
+    }),
+    map((rd: RemoteData<Bitstream>) => {
+      if (rd.hasSucceeded && !rd.hasNoContent) {
+        return router.parseUrl(`/bitstreams/${rd.payload.uuid}/download`);
+      } else {
+        return router.createUrlTree([PAGE_NOT_FOUND_PATH]);
+      }
+    })
+  );
+};
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
deleted file mode 100644
index aec8cd22f4..0000000000
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
-import { EMPTY } from 'rxjs';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
-import { RemoteData } from '../core/data/remote-data';
-import { TestScheduler } from 'rxjs/testing';
-import { RequestEntryState } from '../core/data/request-entry-state.model';
-
-describe(`LegacyBitstreamUrlResolver`, () => {
-  let resolver: LegacyBitstreamUrlResolver;
-  let bitstreamDataService: BitstreamDataService;
-  let testScheduler;
-  let remoteDataMocks;
-  let route;
-  let state;
-
-  beforeEach(() => {
-    testScheduler = new TestScheduler((actual, expected) => {
-      expect(actual).toEqual(expected);
-    });
-
-    route = {
-      params: {},
-      queryParams: {}
-    };
-    state = {};
-    remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, {}, 200),
-      Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
-    };
-    bitstreamDataService = {
-      findByItemHandle: () => undefined
-    } as any;
-    resolver = new LegacyBitstreamUrlResolver(bitstreamDataService);
-  });
-
-  describe(`resolve`, () => {
-    describe(`For JSPUI-style URLs`, () => {
-      beforeEach(() => {
-        spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-        route = Object.assign({}, route, {
-          params: {
-            prefix: '123456789',
-            suffix: '1234',
-            filename: 'some-file.pdf',
-            sequence_id: '5'
-          }
-        });
-      });
-      it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
-        testScheduler.run(() => {
-          resolver.resolve(route, state);
-          expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-            `${route.params.prefix}/${route.params.suffix}`,
-            route.params.sequence_id,
-            route.params.filename
-          );
-        });
-      });
-    });
-
-    describe(`For XMLUI-style URLs`, () => {
-      describe(`when there is a sequenceId query parameter`, () => {
-        beforeEach(() => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-          route = Object.assign({}, route, {
-            params: {
-              prefix: '123456789',
-              suffix: '1234',
-              filename: 'some-file.pdf',
-            },
-            queryParams: {
-              sequenceId: '5'
-            }
-          });
-        });
-        it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
-          testScheduler.run(() => {
-            resolver.resolve(route, state);
-            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-              `${route.params.prefix}/${route.params.suffix}`,
-              route.queryParams.sequenceId,
-              route.params.filename
-            );
-          });
-        });
-      });
-      describe(`when there's no sequenceId query parameter`, () => {
-        beforeEach(() => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(EMPTY);
-          route = Object.assign({}, route, {
-            params: {
-              prefix: '123456789',
-              suffix: '1234',
-              filename: 'some-file.pdf',
-            },
-          });
-        });
-        it(`should call findByItemHandle with the handle, and filename from the route`, () => {
-          testScheduler.run(() => {
-            resolver.resolve(route, state);
-            expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
-              `${route.params.prefix}/${route.params.suffix}`,
-              undefined,
-              route.params.filename
-            );
-          });
-        });
-      });
-    });
-    describe(`should return and complete after the remotedata has...`, () => {
-      it(`...failed`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Error,
-          }));
-          const expected = '----(c|)';
-          const values = {
-            c: remoteDataMocks.Error,
-          };
-
-          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
-        });
-      });
-      it(`...succeeded`, () => {
-        testScheduler.run(({ cold, expectObservable }) => {
-          spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
-            a: remoteDataMocks.RequestPending,
-            b: remoteDataMocks.ResponsePending,
-            c: remoteDataMocks.Success,
-          }));
-          const expected = '----(c|)';
-          const values = {
-            c: remoteDataMocks.Success,
-          };
-
-          expectObservable(resolver.resolve(route, state)).toBe(expected, values);
-        });
-      });
-    });
-  });
-});
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
deleted file mode 100644
index 948bec2473..0000000000
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { hasNoValue } from '../shared/empty.util';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
-
-/**
- * This class resolves a bitstream based on the DSpace 6 XMLUI or JSPUI bitstream download URLs
- */
-@Injectable({
-  providedIn: 'root'
-})
-export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>> {
-  constructor(protected bitstreamDataService: BitstreamDataService) {
-  }
-
-  /**
-   * Resolve a bitstream based on the handle of the item, and the sequence id or the filename of the
-   * bitstream
-   *
-   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
-   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
-   * @returns Observable<<RemoteData<Item>> Emits the found bitstream based on the parameters in
-   * current route, or an error if something went wrong
-   */
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
-    Observable<RemoteData<Bitstream>> {
-      const prefix = route.params.prefix;
-      const suffix = route.params.suffix;
-      const filename = route.params.filename;
-
-      let sequenceId = route.params.sequence_id;
-      if (hasNoValue(sequenceId)) {
-        sequenceId = route.queryParams.sequenceId;
-      }
-
-      return this.bitstreamDataService.findByItemHandle(
-        `${prefix}/${suffix}`,
-        sequenceId,
-        filename,
-      ).pipe(
-        getFirstCompletedRemoteData()
-      );
-  }
-}
diff --git a/src/app/shared/testing/server-response-service.stub.ts b/src/app/shared/testing/server-response-service.stub.ts
new file mode 100644
index 0000000000..fd6e4a0d24
--- /dev/null
+++ b/src/app/shared/testing/server-response-service.stub.ts
@@ -0,0 +1,30 @@
+/* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+/**
+ * Stub class of {@link ServerResponseService}
+ */
+export class ServerResponseServiceStub {
+
+  setStatus(_code: number, _message?: string): this {
+    return this;
+  }
+
+  setUnauthorized(_message = 'Unauthorized'): this {
+    return this;
+  }
+
+  setForbidden(_message = 'Forbidden'): this {
+    return this;
+  }
+
+  setNotFound(_message = 'Not found'): this {
+    return this;
+  }
+
+  setInternalServerError(_message = 'Internal Server Error'): this {
+    return this;
+  }
+
+  setHeader(_header: string, _content: string): void {
+  }
+
+}

From c3326006336cbc56335d3e8f5fde9af49b5b2280 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 24 May 2024 14:21:57 +0200
Subject: [PATCH 0226/1286] 114624: Made the legacyBitstreamURLRedirectGuard
 return false for valid bitstream urls in combination with a
 HardRedirectService#redirect, this will make ensure the redirect is visible
 for curl instead of being performed by Angular

(cherry picked from commit 23644e9ec70bef8bfbb3159412c56314e89c2106)
---
 ...egacy-bitstream-url-redirect.guard.spec.ts | 53 ++++++++++---------
 .../legacy-bitstream-url-redirect.guard.ts    | 33 ++++++------
 src/app/core/data/bitstream-data.service.ts   |  2 +-
 3 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
index 8ca14231e8..38be4dbb38 100644
--- a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts
@@ -1,14 +1,15 @@
+import { cold } from 'jasmine-marbles';
 import { EMPTY } from 'rxjs';
+
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { RequestEntryState } from '../core/data/request-entry-state.model';
-import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
-import { RouterStub } from '../shared/testing/router.stub';
-import { ServerResponseServiceStub } from '../shared/testing/server-response-service.stub';
-import { fakeAsync } from '@angular/core/testing';
-import { cold } from 'jasmine-marbles';
-import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { BrowserHardRedirectService } from '../core/services/browser-hard-redirect.service';
+import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { Bitstream } from '../core/shared/bitstream.model';
+import { RouterStub } from '../shared/testing/router.stub';
+import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
 
 describe('legacyBitstreamURLRedirectGuard', () => {
   let resolver: any;
@@ -16,21 +17,26 @@ describe('legacyBitstreamURLRedirectGuard', () => {
   let remoteDataMocks: { [type: string]: RemoteData<any> };
   let route;
   let state;
-  let serverResponseService: ServerResponseServiceStub;
+  let hardRedirectService: HardRedirectService;
   let router: RouterStub;
 
+  let bitstream: Bitstream;
+
   beforeEach(() => {
     route = {
       params: {},
       queryParams: {}
     };
     router = new RouterStub();
-    serverResponseService = new ServerResponseServiceStub();
+    hardRedirectService = new BrowserHardRedirectService(window.location);
     state = {};
+    bitstream = Object.assign(new Bitstream(), {
+      uuid: 'bitstream-id',
+    });
     remoteDataMocks = {
       RequestPending: new RemoteData(undefined, 0, 0, RequestEntryState.RequestPending, undefined, undefined, undefined),
       ResponsePending: new RemoteData(undefined, 0, 0, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, new Bitstream(), 200),
+      Success: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, bitstream, 200),
       NoContent: new RemoteData(0, 0, 0, RequestEntryState.Success, undefined, undefined, 204),
       Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
     };
@@ -54,7 +60,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
         });
       });
       it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
-        resolver(route, state, bitstreamDataService, serverResponseService, router);
+        resolver(route, state, bitstreamDataService, hardRedirectService, router);
         expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
           `${route.params.prefix}/${route.params.suffix}`,
           route.params.sequence_id,
@@ -79,7 +85,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           });
         });
         it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
-          resolver(route, state, bitstreamDataService, serverResponseService, router);
+          resolver(route, state, bitstreamDataService, hardRedirectService, router);
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             route.queryParams.sequenceId,
@@ -99,7 +105,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           });
         });
         it(`should call findByItemHandle with the handle, and filename from the route`, () => {
-          resolver(route, state, bitstreamDataService, serverResponseService, router);
+          resolver(route, state, bitstreamDataService, hardRedirectService, router);
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             undefined,
@@ -109,45 +115,44 @@ describe('legacyBitstreamURLRedirectGuard', () => {
       });
     });
     describe('should return and complete after the RemoteData has...', () => {
-      it('...failed', fakeAsync(() => {
+      it('...failed', () => {
         spyOn(router, 'createUrlTree').and.callThrough();
         spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
           a: remoteDataMocks.RequestPending,
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.Error,
         }));
-        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
           expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
         });
-      }));
+      });
 
-      it('...succeeded without content', fakeAsync(() => {
+      it('...succeeded without content', () => {
         spyOn(router, 'createUrlTree').and.callThrough();
         spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
           a: remoteDataMocks.RequestPending,
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.NoContent,
         }));
-        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
           expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
         });
-      }));
+      });
 
-      it('...succeeded', fakeAsync(() => {
-        spyOn(serverResponseService, 'setStatus').and.callThrough();
+      it('...succeeded', () => {
+        spyOn(hardRedirectService, 'redirect');
         spyOn(bitstreamDataService, 'findByItemHandle').and.returnValue(cold('a-b-c', {
           a: remoteDataMocks.RequestPending,
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.Success,
         }));
-        resolver(route, state, bitstreamDataService, serverResponseService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
-          expect(serverResponseService.setStatus).toHaveBeenCalledWith(301);
-          expect(router.parseUrl).toHaveBeenCalled();
+          expect(hardRedirectService.redirect).toHaveBeenCalledWith(new URL(`/bitstreams/${bitstream.uuid}/download`, window.location.origin).href, 301);
         });
-      }));
+      });
     });
   });
 });
diff --git a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
index 6c6357b5a5..d8d8932c30 100644
--- a/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts
@@ -1,14 +1,21 @@
 import { inject } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateFn, UrlTree, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivateFn,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { hasNoValue } from '../shared/empty.util';
-import { BitstreamDataService } from '../core/data/bitstream-data.service';
-import { ServerResponseService } from '../core/services/server-response.service';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
+
 import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { HardRedirectService } from '../core/services/hard-redirect.service';
+import { Bitstream } from '../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { hasNoValue } from '../shared/empty.util';
 
 /**
  * Redirects to a bitstream based on the handle of the item, and the sequence id or the filename of the
@@ -21,9 +28,9 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
   bitstreamDataService: BitstreamDataService = inject(BitstreamDataService),
-  serverResponseService: ServerResponseService = inject(ServerResponseService),
+  serverHardRedirectService: HardRedirectService = inject(HardRedirectService),
   router: Router = inject(Router),
-): Observable<UrlTree> => {
+): Observable<UrlTree | boolean> => {
   const prefix = route.params.prefix;
   const suffix = route.params.suffix;
   const filename = route.params.filename;
@@ -37,14 +44,10 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
     filename,
   ).pipe(
     getFirstCompletedRemoteData(),
-    tap((rd: RemoteData<Bitstream>) => {
-      if (rd.hasSucceeded && !rd.hasNoContent) {
-        serverResponseService.setStatus(301);
-      }
-    }),
     map((rd: RemoteData<Bitstream>) => {
       if (rd.hasSucceeded && !rd.hasNoContent) {
-        return router.parseUrl(`/bitstreams/${rd.payload.uuid}/download`);
+        serverHardRedirectService.redirect(new URL(`/bitstreams/${rd.payload.uuid}/download`, serverHardRedirectService.getCurrentOrigin()).href, 301);
+        return false;
       } else {
         return router.createUrlTree([PAGE_NOT_FOUND_PATH]);
       }
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bb4ec28166..bf8e3585df 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -171,7 +171,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
       searchParams.push(new RequestParam('sequenceId', sequenceId));
     }
     if (hasValue(filename)) {
-      searchParams.push(new RequestParam('filename', filename));
+      searchParams.push(new RequestParam('filename', encodeURIComponent(filename)));
     }
 
     const hrefObs = this.getSearchByHref(

From a77d80946b1e945c7f10b0f1f97ba60889fb5562 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 May 2024 17:22:04 +0200
Subject: [PATCH 0227/1286] 115428: Fixed EventEmitter being triggered multiple
 times because its name was the same as a standard DOM event

(cherry picked from commit 4d89a119431de1292c65eec9edab55a12f3fb9ee)
---
 .../page-size-selector/page-size-selector.component.html      | 4 ++--
 .../search/search-settings/search-settings.component.html     | 2 +-
 src/app/shared/sidebar/sidebar-dropdown.component.html        | 2 +-
 src/app/shared/sidebar/sidebar-dropdown.component.ts          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/page-size-selector/page-size-selector.component.html b/src/app/shared/page-size-selector/page-size-selector.component.html
index d7db450d7b..de7cb34967 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.html
+++ b/src/app/shared/page-size-selector/page-size-selector.component.html
@@ -2,7 +2,7 @@
     <ds-sidebar-dropdown
             [id]="'search-sidebar-rpp'"
             [label]="'search.sidebar.settings.rpp'"
-            (change)="reloadRPP($event)"
+            (changed)="reloadRPP($event)"
     >
         <option *ngFor="let pageSizeOption of (paginationOptions$ | async).pageSizeOptions"
                 [value]="pageSizeOption"
@@ -10,4 +10,4 @@
             {{pageSizeOption}}
         </option>
     </ds-sidebar-dropdown>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
index 40bca8e4e8..6469f8ce7e 100644
--- a/src/app/shared/search/search-settings/search-settings.component.html
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -4,7 +4,7 @@
     <ds-sidebar-dropdown *ngIf="sortOptionsList"
                          [id]="'search-sidebar-sort'"
                          [label]="'search.sidebar.settings.sort-by'"
-                         (change)="reloadOrder($event)">
+                         (changed)="reloadOrder($event)">
         <option *ngFor="let sortOptionsEntry of sortOptionsList"
                 [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
                 [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 2eadac09f7..644e1e0d27 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.html
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.html
@@ -1,6 +1,6 @@
 <div class="setting-option mb-3 p-3">
   <h4><label for="{{id}}">{{label | translate}}</label></h4>
-  <select id="{{id}}" class="form-control" (change)="change.emit($event)">
+  <select id="{{id}}" class="form-control" (change)="changed.emit($event)">
     <ng-content></ng-content>
   </select>
 </div>
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.ts b/src/app/shared/sidebar/sidebar-dropdown.component.ts
index 471d357e25..030b7487a9 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.ts
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.ts
@@ -12,5 +12,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 export class SidebarDropdownComponent {
   @Input() id: string;
   @Input() label: string;
-  @Output() change: EventEmitter<any> = new EventEmitter<number>();
+  @Output() changed: EventEmitter<any> = new EventEmitter<number>();
 }

From 28436594166d479a1ef700a5593e45bf4dd14ac1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 24 May 2024 17:49:42 +0200
Subject: [PATCH 0228/1286] 115427: Fixed delete item page freezing when it has
 relationships

(cherry picked from commit e6086e16ea6189a8371f8052cb9340fe5136f903)
---
 .../item-delete/item-delete.component.html    | 28 +++---
 .../item-delete/item-delete.component.ts      | 93 +++++++++++++------
 2 files changed, 81 insertions(+), 40 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 5191e705d0..ed6ba3eabc 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -6,30 +6,29 @@
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
-            <ng-container *ngVar="(types$ | async) as types">
+            <ng-container *ngVar="(typeDTOs$ | async) as types">
 
                 <div *ngIf="types && types.length > 0" class="mb-4">
 
                     {{'virtual-metadata.delete-item.info' | translate}}
 
-                    <div *ngFor="let type of types" class="mb-4">
-
-                        <div *ngVar="(isSelected(type) | async) as selected"
+                    <div *ngFor="let typeDto of types" class="mb-4">
+                        <div *ngVar="(typeDto.isSelected$ | async) as selected"
                              class="d-flex flex-row">
 
-                            <div class="m-2" (click)="setSelected(type, !selected)">
+                            <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected">
+                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
                             <div class="flex-column flex-grow-1">
-                                <h5 (click)="setSelected(type, !selected)">
-                                    {{getRelationshipMessageKey(getLabel(type) | async) | translate}}
+                                <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
+                                    {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
                                 </h5>
-                                <div *ngFor="let relationship of (getRelationships(type) | async)"
+                                <div *ngFor="let relationshipDto of (typeDto.relationshipDTOs$ | async)"
                                      class="d-flex flex-row">
-                                    <ng-container *ngVar="(getRelatedItem(relationship) | async) as relatedItem">
+                                    <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
 
                                         <ds-listable-object-component-loader
                                                 *ngIf="relatedItem"
@@ -46,7 +45,7 @@
                                         </div>
 
                                         <ng-template #virtualMetadataModal>
-                                            <div>
+                                            <div class="thumb-font-1">
                                                 <div class="modal-header">
                                                     {{'virtual-metadata.delete-item.modal-head' | translate}}
                                                     <button type="button" class="close"
@@ -60,7 +59,7 @@
                                                             [object]="relatedItem"
                                                             [viewMode]="viewMode">
                                                     </ds-listable-object-component-loader>
-                                                    <div *ngFor="let metadata of (getVirtualMetadata(relationship) | async)">
+                                                    <div *ngFor="let metadata of (relationshipDto.virtualMetadata$ | async)">
                                                         <div>
                                                             <div class="font-weight-bold">
                                                                 {{metadata.metadataField}}
@@ -87,10 +86,11 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button (click)="performAction()"
+              <button [disabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+              <button [disabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+                      class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
             </div>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 9012ebe7d7..0a512c8976 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line max-classes-per-file
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
 import {
@@ -37,6 +38,34 @@ import { getItemEditRoute } from '../../item-page-routing-paths';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NoContent } from '../../../core/shared/NoContent.model';
 
+/**
+ * Data Transfer Object used to prevent the HTML template to call function returning Observables
+ */
+class RelationshipTypeDTO {
+
+  relationshipType: RelationshipType;
+
+  isSelected$: Observable<boolean>;
+
+  label$: Observable<string>;
+
+  relationshipDTOs$: Observable<RelationshipDTO[]>;
+
+}
+
+/**
+ * Data Transfer Object used to prevent the HTML template to call function returning Observables
+ */
+class RelationshipDTO {
+
+  relationship: Relationship;
+
+  relatedItem$: Observable<Item>;
+
+  virtualMetadata$: Observable<VirtualMetadata[]>;
+
+}
+
 @Component({
   selector: 'ds-item-delete',
   templateUrl: '../item-delete/item-delete.component.html'
@@ -64,7 +93,7 @@ export class ItemDeleteComponent
    * A list of the relationship types for which this item has relations as an observable.
    * The list doesn't contain duplicates.
    */
-  types$: BehaviorSubject<RelationshipType[]> = new BehaviorSubject([]);
+  typeDTOs$: BehaviorSubject<RelationshipTypeDTO[]> = new BehaviorSubject([]);
 
   /**
    * A map which stores the relationships of this item for each type as observable lists
@@ -93,6 +122,8 @@ export class ItemDeleteComponent
    */
   private subs: Subscription[] = [];
 
+  public isDeleting$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
   constructor(protected route: ActivatedRoute,
               protected router: Router,
               protected notificationsService: NotificationsService,
@@ -146,14 +177,25 @@ export class ItemDeleteComponent
               }, [])
             ),
           );
-        })
-      ).subscribe((types: RelationshipType[]) => this.types$.next(types)));
+        }),
+      ).subscribe((types: RelationshipType[]) => this.typeDTOs$.next(types.map((relationshipType: RelationshipType) => Object.assign(new RelationshipTypeDTO(), {
+        relationshipType: relationshipType,
+        isSelected$: this.isSelected(relationshipType),
+        label$: this.getLabel(relationshipType),
+        relationshipDTOs$: this.getRelationships(relationshipType).pipe(
+          map((relationships: Relationship[]) => relationships.map((relationship: Relationship) => Object.assign(new RelationshipDTO(), {
+            relationship: relationship,
+            relatedItem$: this.getRelatedItem(relationship),
+            virtualMetadata$: this.getVirtualMetadata(relationship),
+          } as RelationshipDTO))),
+        ),
+      })))));
     }
 
-    this.subs.push(this.types$.pipe(
+    this.subs.push(this.typeDTOs$.pipe(
       take(1),
-    ).subscribe((types) =>
-      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified)
+    ).subscribe((types: RelationshipTypeDTO[]) =>
+      this.objectUpdatesService.initialize(this.url, types.map((relationshipTypeDto: RelationshipTypeDTO) => relationshipTypeDto.relationshipType), this.item.lastModified),
     ));
   }
 
@@ -326,34 +368,33 @@ export class ItemDeleteComponent
    * @param selected  whether the type should be selected
    */
   setSelected(type: RelationshipType, selected: boolean): void {
-    this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected);
+    if (this.isDeleting$.value === false) {
+      this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected);
+    }
   }
 
   /**
    * Perform the delete operation
    */
-  performAction() {
-
-    this.subs.push(this.types$.pipe(
-      switchMap((types) =>
+  performAction(): void {
+    this.isDeleting$.next(true);
+    this.subs.push(this.typeDTOs$.pipe(
+      switchMap((types: RelationshipTypeDTO[]) =>
         combineLatest(
-          types.map((type) => this.isSelected(type))
+          types.map((type: RelationshipTypeDTO) => type.isSelected$),
         ).pipe(
           defaultIfEmpty([]),
-          map((selection) => types.filter(
-            (type, index) => selection[index]
+          map((selection: boolean[]) => types.filter(
+            (type: RelationshipTypeDTO, index: number) => selection[index],
           )),
-          map((selectedTypes) => selectedTypes.map((type) => type.id)),
-        )
+          map((selectedDtoTypes: RelationshipTypeDTO[]) => selectedDtoTypes.map((typeDto: RelationshipTypeDTO) => typeDto.relationshipType.id)),
+        ),
       ),
-      switchMap((types) =>
-        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData())
-      )
-    ).subscribe(
-      (rd: RemoteData<NoContent>) => {
-        this.notify(rd.hasSucceeded);
-      }
-    ));
+      switchMap((types: string[]) => this.itemDataService.delete(this.item.id, types)),
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<NoContent>) => {
+      this.notify(rd.hasSucceeded);
+    }));
   }
 
   /**
@@ -363,10 +404,10 @@ export class ItemDeleteComponent
   notify(succeeded: boolean) {
     if (succeeded) {
       this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success'));
-      this.router.navigate(['']);
+      void this.router.navigate(['']);
     } else {
       this.notificationsService.error(this.translateService.get('item.edit.' + this.messageKey + '.error'));
-      this.router.navigate([getItemEditRoute(this.item)]);
+      void this.router.navigate([getItemEditRoute(this.item)]);
     }
   }
 

From 8b3010be0c7491d222a18a4faa1a08678a1e2786 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 May 2024 10:32:46 +0200
Subject: [PATCH 0229/1286] 115427: Fixed edit item pages not redirecting to
 404 with invalid id

(cherry picked from commit 249cac4f27b126ca8648403510574fe094e1e91c)
---
 .../item-page/full/full-item-page.component.spec.ts |  8 --------
 src/app/item-page/full/full-item-page.component.ts  |  4 +---
 src/app/item-page/item-page.resolver.spec.ts        | 13 ++++++++-----
 src/app/item-page/item-page.resolver.ts             |  6 +++++-
 .../item-page/simple/item-page.component.spec.ts    |  7 -------
 src/app/item-page/simple/item-page.component.ts     |  4 ----
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts
index 9fc078c2cd..ac82134f27 100644
--- a/src/app/item-page/full/full-item-page.component.spec.ts
+++ b/src/app/item-page/full/full-item-page.component.spec.ts
@@ -15,7 +15,6 @@ import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
@@ -54,7 +53,6 @@ describe('FullItemPageComponent', () => {
   let comp: FullItemPageComponent;
   let fixture: ComponentFixture<FullItemPageComponent>;
 
-  let authService: AuthService;
   let routeStub: ActivatedRouteStub;
   let routeData;
   let authorizationDataService: AuthorizationDataService;
@@ -75,11 +73,6 @@ describe('FullItemPageComponent', () => {
   };
 
   beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
-    });
-
     routeData = {
       dso: createSuccessfulRemoteDataObject(mockItem),
     };
@@ -117,7 +110,6 @@ describe('FullItemPageComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: ItemDataService, useValue: {} },
         { provide: MetadataService, useValue: metadataServiceStub },
-        { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 31dd2c5fc2..c91ea8bfe6 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -13,7 +13,6 @@ import { Item } from '../../core/shared/item.model';
 
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
-import { AuthService } from '../../core/auth/auth.service';
 import { Location } from '@angular/common';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -49,7 +48,6 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     protected route: ActivatedRoute,
     protected router: Router,
     protected items: ItemDataService,
-    protected authService: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected _location: Location,
     protected responseService: ServerResponseService,
@@ -57,7 +55,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     protected linkHeadService: LinkHeadService,
     @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-    super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
+    super(route, router, items, authorizationService, responseService, signpostingDataService, linkHeadService, platformId);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts
index 533f97d0c0..f22eba5732 100644
--- a/src/app/item-page/item-page.resolver.spec.ts
+++ b/src/app/item-page/item-page.resolver.spec.ts
@@ -3,14 +3,15 @@ import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { MetadataValueFilter } from '../core/shared/metadata.models';
 import { first } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import { Router, RouterModule } from '@angular/router';
 import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { AuthServiceStub } from '../shared/testing/auth-service.stub';
+import { AuthService } from '../core/auth/auth.service';
 
 describe('ItemPageResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule.withRoutes([{
+      imports: [RouterModule.forRoot([{
         path: 'entities/:entity-type/:id',
         component: {} as any
       }])]
@@ -21,7 +22,8 @@ describe('ItemPageResolver', () => {
     let resolver: ItemPageResolver;
     let itemService: any;
     let store: any;
-    let router: any;
+    let router: Router;
+    let authService: AuthServiceStub;
 
     const uuid = '1234-65487-12354-1235';
     let item: DSpaceObject;
@@ -41,7 +43,8 @@ describe('ItemPageResolver', () => {
         store = jasmine.createSpyObj('store', {
           dispatch: {},
         });
-        resolver = new ItemPageResolver(itemService, store, router);
+        authService = new AuthServiceStub();
+        resolver = new ItemPageResolver(itemService, store, router, authService as unknown as AuthService);
       });
 
       it('should redirect to the correct route for the entity type', (done) => {
diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index e9b287406e..e3c1703e06 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -9,6 +9,8 @@ import { map } from 'rxjs/operators';
 import { hasValue } from '../shared/empty.util';
 import { getItemPageRoute } from './item-page-routing-paths';
 import { ItemResolver } from './item.resolver';
+import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { AuthService } from '../core/auth/auth.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
@@ -19,7 +21,8 @@ export class ItemPageResolver extends ItemResolver {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
+    protected authService: AuthService,
   ) {
     super(itemService, store, router);
   }
@@ -33,6 +36,7 @@ export class ItemPageResolver extends ItemResolver {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     return super.resolve(route, state).pipe(
+      redirectOn4xx(this.router, this.authService),
       map((rd: RemoteData<Item>) => {
         if (rd.hasSucceeded && hasValue(rd.payload)) {
           const thisRoute = state.url;
diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
index b3202108f4..b1bc61a8f7 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -19,7 +19,6 @@ import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -57,7 +56,6 @@ const mockSignpostingLinks: SignpostingLink[] = [mocklink, mocklink2];
 describe('ItemPageComponent', () => {
   let comp: ItemPageComponent;
   let fixture: ComponentFixture<ItemPageComponent>;
-  let authService: AuthService;
   let authorizationDataService: AuthorizationDataService;
   let serverResponseService: jasmine.SpyObj<ServerResponseService>;
   let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
@@ -74,10 +72,6 @@ describe('ItemPageComponent', () => {
   });
 
   beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
-    });
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
       isAuthorized: observableOf(false),
     });
@@ -107,7 +101,6 @@ describe('ItemPageComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: MetadataService, useValue: mockMetadataService },
         { provide: Router, useValue: {} },
-        { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
         { provide: ServerResponseService, useValue: serverResponseService },
         { provide: SignpostingDataService, useValue: signpostingDataService },
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index b9be6bebfb..3fd97d3261 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -11,9 +11,7 @@ import { Item } from '../../core/shared/item.model';
 import { fadeInOut } from '../../shared/animations/fade';
 import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { AuthService } from '../../core/auth/auth.service';
 import { getItemPageRoute } from '../item-page-routing-paths';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ServerResponseService } from '../../core/services/server-response.service';
@@ -72,7 +70,6 @@ export class ItemPageComponent implements OnInit, OnDestroy {
     protected route: ActivatedRoute,
     protected router: Router,
     protected items: ItemDataService,
-    protected authService: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected responseService: ServerResponseService,
     protected signpostingDataService: SignpostingDataService,
@@ -88,7 +85,6 @@ export class ItemPageComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Item>),
-      redirectOn4xx(this.router, this.authService)
     );
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),

From 799302046384794864c4dfafb72c6b201ef50b5e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 May 2024 16:09:35 +0200
Subject: [PATCH 0230/1286] 115427: Fixed delete item not redirecting when
 having some virtual metadata that needs to be copied

(cherry picked from commit b8d9c650f5819ba7980f6d987c9e7b2e2f71f8e2)
---
 src/app/core/data/base/delete-data.spec.ts | 5 +++++
 src/app/core/data/base/delete-data.ts      | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index a076473b0f..8ffb471528 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -198,6 +198,11 @@ describe('DeleteDataImpl', () => {
             method: RestRequestMethod.DELETE,
             href: 'some-href?copyVirtualMetadata=a&copyVirtualMetadata=b&copyVirtualMetadata=c',
           }));
+
+          const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1];
+          callback();
+          expect(service.invalidateByHref).toHaveBeenCalledWith('some-href');
+
           done();
         });
       });
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 807d9d838e..26f9d1cc53 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -68,15 +68,16 @@ export class DeleteDataImpl<T extends CacheableObject> extends IdentifiableDataS
   deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     const requestId = this.requestService.generateRequestId();
 
+    let deleteHref: string = href;
     if (copyVirtualMetadata) {
       copyVirtualMetadata.forEach((id) =>
-        href += (href.includes('?') ? '&' : '?')
+        deleteHref += (deleteHref.includes('?') ? '&' : '?')
           + 'copyVirtualMetadata='
           + id,
       );
     }
 
-    const request = new DeleteRequest(requestId, href);
+    const request = new DeleteRequest(requestId, deleteHref);
     if (hasValue(this.responseMsToLive)) {
       request.responseMsToLive = this.responseMsToLive;
     }

From c687d3ff5d1d6a6008718c885329b1d0017a2db4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 30 May 2024 10:58:23 +0200
Subject: [PATCH 0231/1286] 115046: Fixed performance issues in virtual
 metadata popup

---
 .../virtual-metadata.component.html           | 12 ++---
 .../virtual-metadata.component.spec.ts        |  1 +
 .../virtual-metadata.component.ts             | 50 +++++++++++++++----
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index b83b93d8f1..927f7dbb48 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -5,9 +5,9 @@
         </button>
     </div>
     <div class="modal-body">
-        <ng-container *ngFor="let item of items; trackBy: trackItem">
-            <div *ngVar="(isSelectedVirtualMetadataItem(item) | async) as selected"
-                 (click)="setSelectedVirtualMetadataItem(item, !selected)"
+        <ng-container *ngFor="let itemDTO of itemDTOs$ | async; trackBy: trackItemDTO">
+            <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
+                 (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
                  class="item d-flex flex-row">
                 <div class="m-2">
                     <label>
@@ -15,9 +15,9 @@
                     </label>
                 </div>
                 <div class="flex-column">
-                    <ds-listable-object-component-loader [object]="item">
+                    <ds-listable-object-component-loader [object]="itemDTO.item">
                     </ds-listable-object-component-loader>
-                    <div *ngFor="let metadata of virtualMetadata.get(item.uuid)">
+                    <div *ngFor="let metadata of virtualMetadata.get(itemDTO.item.uuid)">
                         <div class="font-weight-bold">
                             {{metadata.metadataField}}
                         </div>
@@ -31,7 +31,7 @@
         <div class="d-flex flex-row-reverse m-2">
             <button class="btn btn-primary save"
                     (click)="save.emit()">
-                <i class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
+                <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
             </button>
         </div>
     </div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
index 9391df4755..b835031e30 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
@@ -61,6 +61,7 @@ describe('VirtualMetadataComponent', () => {
     comp.url = url;
     comp.leftItem = item;
     comp.rightItem = relatedItem;
+    comp.ngOnChanges();
     comp.relationshipId = relationshipId;
 
     fixture.detectChanges();
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index 6f8991dc73..7b66f40010 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,9 +1,18 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import {Observable} from 'rxjs';
+import { Component, EventEmitter, Inject, Input, OnInit, Output, OnChanges, OnDestroy } from '@angular/core';
+import { Observable, Subscription, BehaviorSubject } from 'rxjs';
 import {Item} from '../../../core/shared/item.model';
 import {MetadataValue} from '../../../core/shared/metadata.models';
 import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service';
 import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { hasValue } from '../../../shared/empty.util';
+
+interface ItemDTO {
+
+  item: Item;
+
+  isSelectedVirtualMetadataItem$: Observable<boolean>;
+
+}
 
 @Component({
   selector: 'ds-virtual-metadata',
@@ -14,7 +23,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
  * The component is shown when a relationship is marked to be deleted.
  * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata.
  */
-export class VirtualMetadataComponent implements OnInit {
+export class VirtualMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
   /**
    * The current url of this page
@@ -55,9 +64,9 @@ export class VirtualMetadataComponent implements OnInit {
   /**
    * Get an array of the left and the right item of the relationship to be deleted.
    */
-  get items() {
-    return [this.leftItem, this.rightItem];
-  }
+  itemDTOs$: BehaviorSubject<ItemDTO[]> = new BehaviorSubject([]);
+
+  subs: Subscription[] = [];
 
   public virtualMetadata: Map<string, VirtualMetadata[]> = new Map<string, VirtualMetadata[]>();
 
@@ -109,14 +118,33 @@ export class VirtualMetadataComponent implements OnInit {
   /**
    * Prevent unnecessary rerendering so fields don't lose focus
    */
-  trackItem(index, item: Item) {
-    return item && item.uuid;
+  trackItemDTO(index, itemDTO: ItemDTO): string {
+    return itemDTO?.item?.uuid;
   }
 
   ngOnInit(): void {
-    this.items.forEach((item) => {
-      this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item));
-    });
+    this.subs.push(this.itemDTOs$.subscribe((itemDTOs: ItemDTO[]) => {
+      itemDTOs.forEach((itemDTO: ItemDTO) => this.virtualMetadata.set(itemDTO.item.uuid, this.getVirtualMetadata(itemDTO.item)));
+    }));
+  }
+
+  ngOnChanges(): void {
+    if (hasValue(this.leftItem) && hasValue(this.rightItem)) {
+      this.itemDTOs$.next([
+        {
+          item: this.leftItem,
+          isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.leftItem),
+        },
+        {
+          item: this.rightItem,
+          isSelectedVirtualMetadataItem$: this.isSelectedVirtualMetadataItem(this.rightItem),
+        },
+      ]);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
   }
 }
 

From 4a70382072507ce876f26834b070e056a68e49dd Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 May 2024 13:38:23 +0200
Subject: [PATCH 0232/1286] 115046: Fixed incorrect name variant being saved in
 the store when marking relationship ready for deletion

---
 .../edit-relationship-list.component.ts              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 57f8116b9c..30e274dd35 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -305,16 +305,16 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.submitEv = () => {
       modalComp.isPending = true;
       const isLeft = this.currentItemIsLeftItem$.getValue();
-      const addOperations = modalComp.toAdd.map((searchResult: any) => ({ type: 'add', searchResult }));
-      const removeOperations = modalComp.toRemove.map((searchResult: any) => ({ type: 'remove', searchResult }));
+      const addOperations = modalComp.toAdd.map((searchResult: ItemSearchResult) => ({ type: 'add', searchResult }));
+      const removeOperations = modalComp.toRemove.map((searchResult: ItemSearchResult) => ({ type: 'remove', searchResult }));
       observableFrom([...addOperations, ...removeOperations]).pipe(
-        concatMap(({ type, searchResult }: { type: string, searchResult: any }) => {
+        concatMap(({ type, searchResult }: { type: string, searchResult: ItemSearchResult }) => {
+          const relatedItem: Item = searchResult.indexableObject;
           if (type === 'add') {
-            const relatedItem = searchResult.indexableObject;
             return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
               map((nameVariant) => {
                 const update = {
-                  uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
+                  uuid: `${this.relationshipType.id}-${relatedItem.uuid}`,
                   nameVariant,
                   type: this.relationshipType,
                   originalIsLeft: isLeft,
@@ -327,7 +327,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
               take(1)
             );
           } else if (type === 'remove') {
-            return this.relationshipService.getNameVariant(this.listId, searchResult.indexableObjectuuid).pipe(
+            return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
               switchMap((nameVariant) => {
                 return this.getRelationFromId(searchResult.indexableObject).pipe(
                   map( (relationship: Relationship) => {

From 227d47154ce2d65c635174a1a132cc4ee2de06fd Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 30 May 2024 16:55:35 +0200
Subject: [PATCH 0233/1286] 115046: Fixed issue where store operations would
 sometimes be performed in incorrect order

---
 .../object-updates/object-updates.service.ts   | 18 +++++++++++++++---
 .../edit-relationship-list.component.ts        | 10 ++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index 2fb6d47d31..c3746f0283 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -19,7 +19,7 @@ import {
   SetEditableFieldUpdateAction,
   SetValidFieldUpdateAction
 } from './object-updates.actions';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
 import {
   hasNoValue,
   hasValue,
@@ -198,8 +198,14 @@ export class ObjectUpdatesService {
    * @param url The page's URL for which the changes are saved
    * @param field An updated field for the page's object
    */
-  saveAddFieldUpdate(url: string, field: Identifiable) {
+  saveAddFieldUpdate(url: string, field: Identifiable): Observable<boolean> {
+    const update$: Observable<boolean> = this.getFieldUpdatesExclusive(url, [field]).pipe(
+      filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.ADD),
+      take(1),
+      map(() => true),
+    );
     this.saveFieldUpdate(url, field, FieldChangeType.ADD);
+    return update$;
   }
 
   /**
@@ -207,8 +213,14 @@ export class ObjectUpdatesService {
    * @param url The page's URL for which the changes are saved
    * @param field An updated field for the page's object
    */
-  saveRemoveFieldUpdate(url: string, field: Identifiable) {
+  saveRemoveFieldUpdate(url: string, field: Identifiable): Observable<boolean> {
+    const update$: Observable<boolean> = this.getFieldUpdatesExclusive(url, [field]).pipe(
+      filter((fieldUpdates: FieldUpdates) => fieldUpdates[field.uuid].changeType === FieldChangeType.REMOVE),
+      take(1),
+      map(() => true),
+    );
     this.saveFieldUpdate(url, field, FieldChangeType.REMOVE);
+    return update$;
   }
 
   /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 30e274dd35..c4b2bba36f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -312,7 +312,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           const relatedItem: Item = searchResult.indexableObject;
           if (type === 'add') {
             return this.relationshipService.getNameVariant(this.listId, relatedItem.uuid).pipe(
-              map((nameVariant) => {
+              switchMap((nameVariant) => {
                 const update = {
                   uuid: `${this.relationshipType.id}-${relatedItem.uuid}`,
                   nameVariant,
@@ -321,8 +321,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                   originalItem: this.item,
                   relatedItem,
                 } as RelationshipIdentifiable;
-                this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
-                return update;
+                return this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
               }),
               take(1)
             );
@@ -339,9 +338,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                       originalItem: this.item,
                       relationship,
                     } as RelationshipIdentifiable;
-                    this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
-                    return update;
-                  })
+                    return this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
+                  }),
                 );
               }),
               take(1)

From be817b0ab6eaadac6d21ec2be1e0f7874c16e1d5 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Mon, 22 Jan 2024 14:56:00 +0100
Subject: [PATCH 0234/1286] Fix cache invalidation for versioning

---
 .../base/identifiable-data.service.spec.ts    | 22 +++++++++------
 .../data/base/identifiable-data.service.ts    | 17 ++++++++++-
 .../data/version-history-data.service.spec.ts | 13 +++++----
 .../core/data/version-history-data.service.ts | 28 +++++++++++++++----
 .../submission/workflowitem-data.service.ts   |  8 ++----
 ...med-task-actions-approve.component.spec.ts | 11 ++++++--
 .../claimed-task-actions-approve.component.ts | 25 +++++++++++++----
 .../submission-objects.effects.spec.ts        |  7 +++++
 .../objects/submission-objects.effects.ts     |  9 ++++--
 9 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/src/app/core/data/base/identifiable-data.service.spec.ts b/src/app/core/data/base/identifiable-data.service.spec.ts
index 11af83ff9f..817779fae7 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -5,7 +5,6 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindListOptions } from '../find-list-options.model';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
@@ -13,7 +12,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
 import { RequestEntryState } from '../request-entry-state.model';
-import { Observable, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
@@ -21,7 +20,8 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
 import { IdentifiableDataService } from './identifiable-data.service';
 import { EMBED_SEPARATOR } from './base-data.service';
 
-const endpoint = 'https://rest.api/core';
+const base = 'https://rest.api/core';
+const endpoint = 'test';
 
 class TestService extends IdentifiableDataService<any> {
   constructor(
@@ -30,11 +30,7 @@ class TestService extends IdentifiableDataService<any> {
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
   ) {
-    super(undefined, requestService, rdbService, objectCache, halService);
-  }
-
-  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
-    return observableOf(endpoint);
+    super(endpoint, requestService, rdbService, objectCache, halService);
   }
 }
 
@@ -51,7 +47,7 @@ describe('IdentifiableDataService', () => {
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
-    halService = new HALEndpointServiceStub('url') as any;
+    halService = new HALEndpointServiceStub(base) as any;
     rdbService = getMockRemoteDataBuildService();
     objectCache = {
 
@@ -143,4 +139,12 @@ describe('IdentifiableDataService', () => {
       expect(result).toEqual(expected);
     });
   });
+
+  describe('invalidateById', () => {
+    it('should invalidate the correct resource by href', () => {
+      spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
+      service.invalidateById('123');
+      expect(service.invalidateByHref).toHaveBeenCalledWith(`${base}/${endpoint}/123`);
+    });
+  });
 });
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index 904f925765..fae6fd88c1 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -8,7 +8,7 @@
 import { CacheableObject } from '../../cache/cacheable-object.model';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { RemoteData } from '../remote-data';
 import { BaseDataService } from './base-data.service';
 import { RequestService } from '../request.service';
@@ -80,4 +80,19 @@ export class IdentifiableDataService<T extends CacheableObject> extends BaseData
     return this.getEndpoint().pipe(
       map((endpoint: string) => this.getIDHref(endpoint, resourceID, ...linksToFollow)));
   }
+
+  /**
+   * Invalidate a cached resource by its identifier
+   * @param resourceID  the identifier of the resource to invalidate
+   */
+  invalidateById(resourceID: string): Observable<boolean> {
+    const ok$ = this.getIDHrefObs(resourceID).pipe(
+      take(1),
+      switchMap((href) => this.invalidateByHref(href))
+    );
+
+    ok$.subscribe();
+
+    return ok$;
+  }
 }
diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 03bf6c8bcb..1d55b4b2f1 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -65,6 +65,10 @@ describe('VersionHistoryDataService', () => {
       },
     },
   });
+  const version1WithDraft = Object.assign(new Version(), {
+    ...version1,
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistoryDraft),
+  });
   const versions = [version1, version2];
   versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions));
   const item1 = Object.assign(new Item(), {
@@ -186,21 +190,18 @@ describe('VersionHistoryDataService', () => {
   });
 
   describe('hasDraftVersion$', () => {
-    beforeEach(waitForAsync(() => {
-      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1));
-    }));
     it('should return false if draftVersion is false', fakeAsync(() => {
-      versionService.getHistoryFromVersion.and.returnValue(of(versionHistory));
+      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1));
       service.hasDraftVersion$('href').subscribe((res) => {
         expect(res).toBeFalse();
       });
     }));
+
     it('should return true if draftVersion is true', fakeAsync(() => {
-      versionService.getHistoryFromVersion.and.returnValue(of(versionHistoryDraft));
+      versionService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$<Version>(version1WithDraft));
       service.hasDraftVersion$('href').subscribe((res) => {
         expect(res).toBeTrue();
       });
     }));
   });
-
 });
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b331c4f2e4..ee49c82e26 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -91,7 +91,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list');
     requestOptions.headers = requestHeaders;
 
-    return this.halService.getEndpoint(this.versionsEndpoint).pipe(
+    const response$ = this.halService.getEndpoint(this.versionsEndpoint).pipe(
       take(1),
       map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`),
       map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)),
@@ -99,6 +99,16 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
       getFirstCompletedRemoteData()
     ) as Observable<RemoteData<Version>>;
+
+    response$.subscribe((versionRD: RemoteData<Version>) => {
+      // invalidate version history
+      // note: we should do this regardless of whether the request succeeds,
+      //       because it may have failed due to cached data that is out of date
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href);
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href);
+    });
+
+    return response$;
   }
 
   /**
@@ -158,14 +168,20 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    * @returns `true` if a workspace item exists, `false` otherwise, or `null` if a version history does not exist
    */
   hasDraftVersion$(versionHref: string): Observable<boolean> {
-    return this.versionDataService.findByHref(versionHref, true, true, followLink('versionhistory')).pipe(
+    return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((res) => {
         if (res.hasSucceeded && !res.hasNoContent) {
-          return of(res).pipe(
-            getFirstSucceededRemoteDataPayload(),
-            switchMap((version) => this.versionDataService.getHistoryFromVersion(version)),
-            map((versionHistory) => versionHistory ? versionHistory.draftVersion : false),
+          return res.payload.versionhistory.pipe(
+            getFirstCompletedRemoteData(),
+            map((versionHistoryRD) => {
+              if (res.hasSucceeded) {
+                const versionHistory = versionHistoryRD.payload;
+                return versionHistory ? versionHistory.draftVersion : false;
+              } else {
+                return false;
+              }
+            }),
           );
         } else {
           return of(false);
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 7f8649b2e6..5381627c19 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -13,7 +13,6 @@ import { RemoteData } from '../data/remote-data';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { WorkspaceItem } from './models/workspaceitem.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { FindListOptions } from '../data/find-list-options.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
@@ -28,7 +27,6 @@ import { dataService } from '../data/base/data-service.decorator';
 @Injectable()
 @dataService(WorkflowItem.type)
 export class WorkflowItemDataService extends IdentifiableDataService<WorkflowItem> implements SearchData<WorkflowItem>, DeleteData<WorkflowItem> {
-  protected linkPath = 'workflowitems';
   protected searchByItemLinkPath = 'item';
   protected responseMsToLive = 10 * 1000;
 
@@ -42,7 +40,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
   ) {
-    super('workspaceitems', requestService, rdbService, objectCache, halService);
+    super('workflowitems', requestService, rdbService, objectCache, halService);
 
     this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
@@ -105,7 +103,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
    * @param options        The {@link FindListOptions} object
    * @param linksToFollow  List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
+  public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<WorkflowItem>[]): Observable<RemoteData<WorkflowItem>> {
     const findListOptions = new FindListOptions();
     findListOptions.searchParams = [new RequestParam('uuid', uuid)];
     const href$ = this.searchData.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
@@ -126,7 +124,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
    * @return {Observable<RemoteData<PaginatedList<T>>}
    *    Return an observable that emits response from the server
    */
-  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+  public searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkflowItem>[]): Observable<RemoteData<PaginatedList<WorkflowItem>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
index b79040fb12..617fd95b04 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/co
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { of, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 
 import { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
@@ -18,6 +18,7 @@ import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { RequestService } from '../../../../core/data/request.service';
+import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
 
 let component: ClaimedTaskActionsApproveComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsApproveComponent>;
@@ -27,6 +28,7 @@ const searchService = getMockSearchService();
 const requestService = getMockRequestService();
 
 let mockPoolTaskDataService: PoolTaskDataService;
+let mockWorkflowItemDataService: WorkflowItemDataService;
 
 describe('ClaimedTaskActionsApproveComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
@@ -36,6 +38,10 @@ describe('ClaimedTaskActionsApproveComponent', () => {
 
   beforeEach(waitForAsync(() => {
     mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
+    mockWorkflowItemDataService = jasmine.createSpyObj('WorkflowItemDataService', {
+      'invalidateByHref': observableOf(false),
+    });
+
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
@@ -53,6 +59,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestService },
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
+        { provide: WorkflowItemDataService, useValue: mockWorkflowItemDataService },
       ],
       declarations: [ClaimedTaskActionsApproveComponent],
       schemas: [NO_ERRORS_SCHEMA]
@@ -89,7 +96,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
 
     beforeEach(() => {
       spyOn(component.processCompleted, 'emit');
-      spyOn(component, 'startActionExecution').and.returnValue(of(null));
+      spyOn(component, 'startActionExecution').and.returnValue(observableOf(null));
 
       expectedBody = {
         [component.option]: 'true'
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 467d1514c9..ebee0f0108 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -10,6 +10,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
 
 export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
 
@@ -28,12 +29,15 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
    */
   option = WORKFLOW_TASK_OPTION_APPROVE;
 
-  constructor(protected injector: Injector,
-              protected router: Router,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected searchService: SearchService,
-              protected requestService: RequestService) {
+  constructor(
+    protected injector: Injector,
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected workflowItemDataService: WorkflowItemDataService,
+  ) {
     super(injector, router, notificationsService, translate, searchService, requestService);
   }
 
@@ -48,4 +52,13 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
     return reloadedObject;
   }
 
+  public handleReloadableActionResponse(result: boolean, dso: DSpaceObject): void {
+    super.handleReloadableActionResponse(result, dso);
+
+    // Item page version table includes labels for workflow Items, determined
+    // based on the result of /workflowitems/search/item?uuid=...
+    // In order for this label to be in sync with the workflow state, we should
+    // invalidate WFIs as they are approved.
+    this.workflowItemDataService.invalidateByHref(this.object?._links.workflowitem?.href);
+  }
 }
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index a1bb878aa5..11eb375cc6 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -66,6 +66,8 @@ describe('SubmissionObjectEffects test suite', () => {
   let submissionServiceStub;
   let submissionJsonPatchOperationsServiceStub;
   let submissionObjectDataServiceStub;
+  let workspaceItemDataService;
+
   const collectionId: string = mockSubmissionCollectionId;
   const submissionId: string = mockSubmissionId;
   const submissionDefinitionResponse: any = mockSubmissionDefinitionResponse;
@@ -82,6 +84,10 @@ describe('SubmissionObjectEffects test suite', () => {
 
     submissionServiceStub.hasUnsavedModification.and.returnValue(observableOf(true));
 
+    workspaceItemDataService = jasmine.createSpyObj('WorkspaceItemDataService', {
+      invalidateById: observableOf(true),
+    });
+
     TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({}, storeModuleConfig),
@@ -106,6 +112,7 @@ describe('SubmissionObjectEffects test suite', () => {
         { provide: WorkflowItemDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
         { provide: SubmissionObjectDataService, useValue: submissionObjectDataServiceStub },
+        { provide: WorkspaceitemDataService, useValue: workspaceItemDataService },
       ],
     });
 
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 2c19224336..4623d808e2 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -55,6 +55,7 @@ import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionE
 import { FormState } from '../../shared/form/form.reducer';
 import { SubmissionSectionObject } from './submission-section-object.model';
 import { SubmissionSectionError } from './submission-section-error.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -258,6 +259,7 @@ export class SubmissionObjectEffects {
   depositSubmissionSuccess$ = createEffect(() => this.actions$.pipe(
     ofType(SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_SUCCESS),
     tap(() => this.notificationsService.success(null, this.translate.get('submission.sections.general.deposit_success_notice'))),
+    tap((action: DepositSubmissionSuccessAction) => this.workspaceItemDataService.invalidateById(action.payload.submissionId)),
     tap(() => this.submissionService.redirectToMyDSpace())), { dispatch: false });
 
   /**
@@ -326,14 +328,17 @@ export class SubmissionObjectEffects {
     ofType(SubmissionObjectActionTypes.DISCARD_SUBMISSION_ERROR),
     tap(() => this.notificationsService.error(null, this.translate.get('submission.sections.general.discard_error_notice')))), { dispatch: false });
 
-  constructor(private actions$: Actions,
+  constructor(
+    private actions$: Actions,
     private notificationsService: NotificationsService,
     private operationsService: SubmissionJsonPatchOperationsService,
     private sectionService: SectionsService,
     private store$: Store<any>,
     private submissionService: SubmissionService,
     private submissionObjectService: SubmissionObjectDataService,
-    private translate: TranslateService) {
+    private translate: TranslateService,
+    private workspaceItemDataService: WorkspaceitemDataService,
+  ) {
   }
 
   /**

From 5f5f6da067be22d843c1f98ecfddeffdb9b4eecb Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 7 Feb 2024 10:01:39 +0100
Subject: [PATCH 0235/1286] Clean up VersionHistoryDataService changes

---
 .../core/data/version-history-data.service.ts | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index ee49c82e26..8229083535 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -6,23 +6,21 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HttpHeaders } from '@angular/common/http';
 import { PostRequest } from './request.models';
-import { Observable, of } from 'rxjs';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list.model';
 import { Version } from '../shared/version.model';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import { filter, find, map, switchMap, take } from 'rxjs/operators';
 import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { VersionDataService } from './version-data.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../shared/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { hasValueOperator } from '../../shared/empty.util';
+import { hasValue, hasValueOperator } from '../../shared/empty.util';
 import { Item } from '../shared/item.model';
 import { FindListOptions } from './find-list-options.model';
-import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
 import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
 
@@ -86,29 +84,31 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    * @param summary the summary of the new version
    */
   createVersion(itemHref: string, summary: string): Observable<RemoteData<Version>> {
+    const requestId = this.requestService.generateRequestId();
     const requestOptions: HttpOptions = Object.create({});
     let requestHeaders = new HttpHeaders();
     requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list');
     requestOptions.headers = requestHeaders;
 
-    const response$ = this.halService.getEndpoint(this.versionsEndpoint).pipe(
+    this.halService.getEndpoint(this.versionsEndpoint).pipe(
       take(1),
       map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`),
-      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)),
-      sendRequest(this.requestService),
-      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
-      getFirstCompletedRemoteData()
-    ) as Observable<RemoteData<Version>>;
+      find((href: string) => hasValue(href)),
+    ).subscribe((href) => {
+      const request = new PostRequest(requestId, href, itemHref, requestOptions);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
 
-    response$.subscribe((versionRD: RemoteData<Version>) => {
-      // invalidate version history
-      // note: we should do this regardless of whether the request succeeds,
-      //       because it may have failed due to cached data that is out of date
-      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href);
-      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href);
+      this.requestService.send(request);
     });
 
-    return response$;
+    return this.rdbService.buildFromRequestUUIDAndAwait<Version>(requestId, (versionRD) => combineLatest([
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.self.href),
+      this.requestService.setStaleByHrefSubstring(versionRD.payload._links.versionhistory.href),
+    ])).pipe(
+      getFirstCompletedRemoteData(),
+    );
   }
 
   /**
@@ -147,7 +147,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       switchMap((res) => res.versionhistory),
       getFirstSucceededRemoteDataPayload(),
       switchMap((versionHistoryRD) => this.getLatestVersionFromHistory$(versionHistoryRD)),
-    ) : of(null);
+    ) : observableOf(null);
   }
 
   /**
@@ -158,8 +158,8 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
   isLatest$(version: Version): Observable<boolean> {
     return version ? this.getLatestVersion$(version).pipe(
       take(1),
-      switchMap((latestVersion) => of(version.version === latestVersion.version))
-    ) : of(null);
+      switchMap((latestVersion) => observableOf(version.version === latestVersion.version))
+    ) : observableOf(null);
   }
 
   /**
@@ -170,21 +170,20 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
   hasDraftVersion$(versionHref: string): Observable<boolean> {
     return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
-      switchMap((res) => {
-        if (res.hasSucceeded && !res.hasNoContent) {
-          return res.payload.versionhistory.pipe(
+      switchMap((versionRD: RemoteData<Version>) => {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent) {
+          return versionRD.payload.versionhistory.pipe(
             getFirstCompletedRemoteData(),
-            map((versionHistoryRD) => {
-              if (res.hasSucceeded) {
-                const versionHistory = versionHistoryRD.payload;
-                return versionHistory ? versionHistory.draftVersion : false;
+            map((versionHistoryRD: RemoteData<VersionHistory>) => {
+              if (versionHistoryRD.hasSucceeded && !versionHistoryRD.hasNoContent) {
+                return versionHistoryRD.payload.draftVersion;
               } else {
                 return false;
               }
             }),
           );
         } else {
-          return of(false);
+          return observableOf(false);
         }
       }),
     );

From 73be8a972c259772d1ba55fb34653cf77129ceb3 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 7 Feb 2024 11:13:53 +0100
Subject: [PATCH 0236/1286] Always wait for correct draft status, fix spelling

---
 .../dso-versioning-modal.service.ts                  |  7 ++-----
 src/assets/i18n/bn.json5                             |  6 +++---
 src/assets/i18n/ca.json5                             |  6 +++---
 src/assets/i18n/en.json5                             |  6 +++---
 src/assets/i18n/es.json5                             |  6 +++---
 src/assets/i18n/fr.json5                             |  6 +++---
 src/assets/i18n/gd.json5                             |  6 +++---
 src/assets/i18n/hu.json5                             | 12 ++++++------
 src/assets/i18n/it.json5                             |  7 ++++---
 src/assets/i18n/kk.json5                             |  6 +++---
 src/assets/i18n/pt-BR.json5                          |  6 +++---
 src/assets/i18n/pt-PT.json5                          |  6 +++---
 src/assets/i18n/sv.json5                             | 10 +++++-----
 13 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
index 46792294dd..b9c77dc56b 100644
--- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -1,7 +1,7 @@
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Version } from '../../../core/shared/version.model';
-import { map, startWith, switchMap, tap } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { Item } from '../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -13,9 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service';
 import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { ItemVersionsSharedService } from '../../../item-page/versions/item-versions-shared.service';
-import {
-  ItemVersionsSummaryModalComponent
-} from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
+import { ItemVersionsSummaryModalComponent } from '../../../item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component';
 
 /**
  * Service to take care of all the functionality related to the version creation modal
@@ -86,7 +84,6 @@ export class DsoVersioningModalService {
       // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null
       // (hasDraftVersion is null when a version history does not exist)
       map((res) => Boolean(res)),
-      startWith(true),
     );
   }
 
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index 165552a00f..66a5d5d52f 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -3121,7 +3121,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "নতুন সংস্করণ তৈরি করুন",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3250,7 +3250,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "মুছে ফেলুন সংস্করণ",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
 
@@ -3291,7 +3291,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "নতুন সংস্করণ তৈরি করা হয়নি",
 
-  // "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" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "একটি নতুন সংস্করণ তৈরি করা যাবে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
 
 
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index 4af472680f..20f838bf59 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -3376,7 +3376,7 @@
   // "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": "A new version cannot be created because there is an in-progress 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",
@@ -3535,7 +3535,7 @@
   // "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": "A new version cannot be created because there is an in-progress 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",
 
 
@@ -3582,7 +3582,7 @@
   // "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" : "A new version cannot be created because there is an in-progress 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",
 
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f04ccdf79a..246978ac0c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2502,7 +2502,7 @@
 
   "item.page.version.create": "Create new version",
 
-  "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.page.claim.button": "Claim",
 
@@ -2614,7 +2614,7 @@
 
   "item.version.history.table.action.deleteVersion": "Delete version",
 
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
 
@@ -2644,7 +2644,7 @@
 
   "item.version.create.notification.failure": "New version has not been created",
 
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
   "item.version.delete.modal.header": "Delete version",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 3609d58966..2140114d43 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -3660,7 +3660,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nueva version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
   // "item.page.claim.button": "Claim",
@@ -3819,7 +3819,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Borrar versión",
 
-  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3864,7 +3864,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "No se ha creado una nueva versión",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
 
   // "item.version.delete.modal.header": "Delete version",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index ab0422b702..92b865d157 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -3169,7 +3169,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Créer une nouvelle version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3295,7 +3295,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Supprimer la version",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3334,7 +3334,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "La nouvelle version n'a pas été créée",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
 
   // "item.version.delete.modal.header": "Delete version",
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 179cfbccae..4bd6980e42 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -3106,7 +3106,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Cruthaich dreach ùr",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3235,7 +3235,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Dubh às dreach",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
@@ -3276,7 +3276,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Cha deach dreach ùr a chruthachadh",
 
-  // "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" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index db03a3140e..af451153eb 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -3975,9 +3975,9 @@
   // TODO New key - Add a translation
   "item.page.version.create": "Create new version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   // "item.page.claim.button": "Claim",
   // TODO New key - Add a translation
@@ -4162,9 +4162,9 @@
   // TODO New key - Add a translation
   "item.version.history.table.action.deleteVersion": "Delete version",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -4223,9 +4223,9 @@
   // TODO New key - Add a translation
   "item.version.create.notification.failure": "New version has not been created",
 
-  // "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" : "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.delete.modal.header": "Delete version",
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index d038697db8..8c2410acb1 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -3663,7 +3663,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crea una nuova versione",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Impossibile creare una nuova versione perché è presente un'submission in corso nella cronologia delle versioni",
 
   // "item.page.claim.button": "Claim",
@@ -3822,7 +3822,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Elimina versione",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
 
 
@@ -3869,7 +3869,8 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "Non è stata creata una nuova versione",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
+  // TODO Source message changed - Revise the translation
   "item.version.create.notification.inProgress": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
 
 
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 3cc4750df0..0946a57d34 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -3321,7 +3321,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Жаңа нұсқасын жасау",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
   // "item.page.claim.button": "Claim",
@@ -3481,7 +3481,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Нұсқаны өшіру",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар",
 
 
@@ -3528,7 +3528,7 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Жаңа нұсқа жасалмады",
 
-  // "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" : "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
 
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 8f4384effe..e85494ebec 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -3669,7 +3669,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.page.claim.button": "Claim",
@@ -3828,7 +3828,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Apagar versão",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3873,7 +3873,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "A nova versão não foi criada",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
 
   // "item.version.delete.modal.header": "Delete version",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 0398f4ab36..b2c48b0f9a 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -3706,7 +3706,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Um nova versão não pode ser criada porque já se encontra uma submisão em curso no histórico de versões.",
 
   // "item.page.claim.button": "Claim",
@@ -3871,7 +3871,7 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Remover versão",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões",
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3916,7 +3916,7 @@
   // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "Nova versão não foi criada",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "Uma nova versão não pode ser criada porque se encontra um depósito em curso no histórico de versões",
 
   // "item.version.delete.modal.header": "Delete version",
diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5
index 05d77728f6..81bf4ab939 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -3151,7 +3151,7 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Skapa ny version",
 
-  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Ny version kan inte skapas pga pågående uppladdning i versionshistoriken",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
@@ -3281,9 +3281,9 @@
   // "item.version.history.table.action.deleteVersion": "Delete version",
   "item.version.history.table.action.deleteVersion": "Radera version",
 
-  // "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": "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3323,9 +3323,9 @@
   // "item.version.create.notification.failure" : "New version has not been created",
   "item.version.create.notification.failure": "Ny version har inte skapats",
 
-  // "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" : "A new version cannot be created because there is an in-progress submission in the version history",
   // TODO New key - Add a translation
-  "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": "A new version cannot be created because there is an in-progress submission in the version history",
 
 
   // "item.version.delete.modal.header": "Delete version",

From 7d5e499f2190650cfd45e52c474e1f7f49252301 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Tue, 9 May 2023 17:20:54 +0200
Subject: [PATCH 0237/1286] make a call to ensure a correct XSRF token before
 performing any non-GET requests

---
 .../group-form/group-form.component.spec.ts   |  2 +
 src/app/core/data/request.service.spec.ts     |  9 ++-
 src/app/core/data/request.service.ts          | 14 +++-
 .../core/xsrf/browser-xsrf.service.spec.ts    | 64 +++++++++++++++++++
 src/app/core/xsrf/browser-xsrf.service.ts     | 26 ++++++++
 src/app/core/xsrf/server-xsrf.service.spec.ts | 32 ++++++++++
 src/app/core/xsrf/server-xsrf.service.ts      | 14 ++++
 src/app/core/xsrf/xsrf.service.spec.ts        | 20 ++++++
 src/app/core/xsrf/xsrf.service.ts             | 10 +++
 src/modules/app/browser-app.module.ts         | 14 +++-
 src/modules/app/server-app.module.ts          |  6 ++
 11 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 src/app/core/xsrf/browser-xsrf.service.spec.ts
 create mode 100644 src/app/core/xsrf/browser-xsrf.service.ts
 create mode 100644 src/app/core/xsrf/server-xsrf.service.spec.ts
 create mode 100644 src/app/core/xsrf/server-xsrf.service.ts
 create mode 100644 src/app/core/xsrf/xsrf.service.spec.ts
 create mode 100644 src/app/core/xsrf/xsrf.service.ts

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 f8c5f3cd87..e281377c24 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
@@ -23,6 +23,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { UUIDService } from '../../../core/shared/uuid.service';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
@@ -211,6 +212,7 @@ describe('GroupFormComponent', () => {
         { provide: HttpClient, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 61091c7940..c557066e16 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,6 +1,6 @@
 import { Store, StoreModule } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { EMPTY, Observable, of as observableOf } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
@@ -8,6 +8,7 @@ import { defaultUUID, getMockUUIDService } from '../../shared/mocks/uuid.service
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { coreReducers} from '../core.reducers';
 import { UUIDService } from '../shared/uuid.service';
+import { XSRFService } from '../xsrf/xsrf.service';
 import { RequestConfigureAction, RequestExecuteAction, RequestStaleAction } from './request.actions';
 import {
   DeleteRequest,
@@ -35,6 +36,7 @@ describe('RequestService', () => {
   let uuidService: UUIDService;
   let store: Store<CoreState>;
   let mockStore: MockStore<CoreState>;
+  let xsrfService: XSRFService;
 
   const testUUID = '5f2a0d2a-effa-4d54-bd54-5663b960f9eb';
   const testHref = 'https://rest.api/endpoint/selfLink';
@@ -80,10 +82,15 @@ describe('RequestService', () => {
     store = TestBed.inject(Store);
     mockStore = store as MockStore<CoreState>;
     mockStore.setState(initialState);
+    xsrfService = {
+      tokenInitialized$: new BehaviorSubject(false),
+    } as XSRFService;
+
     service = new RequestService(
       objectCache,
       uuidService,
       store,
+      xsrfService,
       undefined
     );
     serviceAsAny = service as any;
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 9f43c3f599..0af6e4098f 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -11,6 +11,7 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { IndexState, MetaIndexState } from '../index/index.reducer';
 import { requestIndexSelector, getUrlWithoutEmbedParams } from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
+import { XSRFService } from '../xsrf/xsrf.service';
 import {
   RequestConfigureAction,
   RequestExecuteAction,
@@ -137,6 +138,7 @@ export class RequestService {
   constructor(private objectCache: ObjectCacheService,
               private uuidService: UUIDService,
               private store: Store<CoreState>,
+              protected xsrfService: XSRFService,
               private indexStore: Store<MetaIndexState>) {
   }
 
@@ -419,7 +421,17 @@ export class RequestService {
    */
   private dispatchRequest(request: RestRequest) {
     this.store.dispatch(new RequestConfigureAction(request));
-    this.store.dispatch(new RequestExecuteAction(request.uuid));
+    // If it's a GET request, or we have an XSRF token, dispatch it immediately
+    if (request.method === RestRequestMethod.GET || this.xsrfService.tokenInitialized$.getValue() === true) {
+      this.store.dispatch(new RequestExecuteAction(request.uuid));
+    } else {
+      // Otherwise wait for the XSRF token first
+      this.xsrfService.tokenInitialized$.pipe(
+        find((hasInitialized: boolean) => hasInitialized === true),
+      ).subscribe(() => {
+        this.store.dispatch(new RequestExecuteAction(request.uuid));
+      });
+    }
   }
 
   /**
diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
new file mode 100644
index 0000000000..378df0e46b
--- /dev/null
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -0,0 +1,64 @@
+import { BrowserXSRFService } from './browser-xsrf.service';
+import { HttpClient } from '@angular/common/http';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+describe(`BrowserXSRFService`, () => {
+  let service: BrowserXSRFService;
+  let httpClient: HttpClient;
+  let httpTestingController: HttpTestingController;
+
+  const endpointURL = new RESTURLCombiner('/security/csrf').toString();
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ HttpClientTestingModule ],
+      providers: [ BrowserXSRFService ]
+    });
+    httpClient = TestBed.inject(HttpClient);
+    httpTestingController = TestBed.inject(HttpTestingController);
+    service = TestBed.inject(BrowserXSRFService);
+  });
+
+  describe(`initXSRFToken`, () => {
+    it(`should perform a POST to the csrf endpoint`, () => {
+      service.initXSRFToken(httpClient)();
+
+      const req = httpTestingController.expectOne({
+        url: endpointURL,
+        method: 'POST'
+      });
+
+      req.flush({});
+      httpTestingController.verify();
+    });
+
+    describe(`when the POST succeeds`, () => {
+      it(`should set tokenInitialized$ to true`, () => {
+        service.initXSRFToken(httpClient)();
+
+        const req = httpTestingController.expectOne(endpointURL);
+
+        req.flush({});
+        httpTestingController.verify();
+
+        expect(service.tokenInitialized$.getValue()).toBeTrue();
+      });
+    });
+
+    describe(`when the POST fails`, () => {
+      it(`should set tokenInitialized$ to true`, () => {
+        service.initXSRFToken(httpClient)();
+
+        const req = httpTestingController.expectOne(endpointURL);
+
+        req.error(new ErrorEvent('415'));
+        httpTestingController.verify();
+
+        expect(service.tokenInitialized$.getValue()).toBeTrue();
+      });
+    });
+
+  });
+});
diff --git a/src/app/core/xsrf/browser-xsrf.service.ts b/src/app/core/xsrf/browser-xsrf.service.ts
new file mode 100644
index 0000000000..271e8dca47
--- /dev/null
+++ b/src/app/core/xsrf/browser-xsrf.service.ts
@@ -0,0 +1,26 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { take, catchError } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
+import { XSRFService } from './xsrf.service';
+
+@Injectable()
+export class BrowserXSRFService extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => new Promise((resolve) => {
+      httpClient.post(new RESTURLCombiner('/security/csrf').toString(), undefined).pipe(
+        // errors are to be expected if the token and the cookie don't match, that's what we're
+        // trying to fix for future requests, so just emit any observable to end up in the
+        // subscribe
+        catchError(() => observableOf(null)),
+        take(1),
+      ).subscribe(() => {
+        this.tokenInitialized$.next(true);
+      });
+
+      // return immediately, the rest of the app doesn't need to wait for this to finish
+      resolve();
+    });
+  }
+}
diff --git a/src/app/core/xsrf/server-xsrf.service.spec.ts b/src/app/core/xsrf/server-xsrf.service.spec.ts
new file mode 100644
index 0000000000..b2ace67dd0
--- /dev/null
+++ b/src/app/core/xsrf/server-xsrf.service.spec.ts
@@ -0,0 +1,32 @@
+import { ServerXSRFService } from './server-xsrf.service';
+import { HttpClient } from '@angular/common/http';
+
+describe(`ServerXSRFService`, () => {
+  let service: ServerXSRFService;
+  let httpClient: HttpClient;
+
+  beforeEach(() => {
+    httpClient = jasmine.createSpyObj(['post', 'get', 'request']);
+    service = new ServerXSRFService();
+  });
+
+  describe(`initXSRFToken`, () => {
+    it(`shouldn't perform any requests`, (done: DoneFn) => {
+      service.initXSRFToken(httpClient)().then(() => {
+        for (const prop in httpClient) {
+          if (httpClient.hasOwnProperty(prop)) {
+            expect(httpClient[prop]).not.toHaveBeenCalled();
+          }
+        }
+        done();
+      });
+    });
+
+    it(`should leave tokenInitialized$ on false`, (done: DoneFn) => {
+      service.initXSRFToken(httpClient)().then(() => {
+        expect(service.tokenInitialized$.getValue()).toBeFalse();
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/xsrf/server-xsrf.service.ts b/src/app/core/xsrf/server-xsrf.service.ts
new file mode 100644
index 0000000000..1577893f95
--- /dev/null
+++ b/src/app/core/xsrf/server-xsrf.service.ts
@@ -0,0 +1,14 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { XSRFService } from './xsrf.service';
+
+@Injectable()
+export class ServerXSRFService extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => new Promise((resolve) => {
+      // return immediately, and keep tokenInitialized$ false. The server side can make only GET
+      // requests, since it can never get a valid XSRF cookie
+      resolve();
+    });
+  }
+}
diff --git a/src/app/core/xsrf/xsrf.service.spec.ts b/src/app/core/xsrf/xsrf.service.spec.ts
new file mode 100644
index 0000000000..a7c5c01cb7
--- /dev/null
+++ b/src/app/core/xsrf/xsrf.service.spec.ts
@@ -0,0 +1,20 @@
+import { XSRFService } from './xsrf.service';
+import { HttpClient } from '@angular/common/http';
+
+class XSRFServiceImpl extends XSRFService {
+  initXSRFToken(httpClient: HttpClient): () => Promise<any> {
+    return () => null;
+  }
+}
+
+describe(`XSRFService`, () => {
+  let service: XSRFService;
+
+  beforeEach(() => {
+    service = new XSRFServiceImpl();
+  });
+
+  it(`should start with tokenInitialized$.hasValue() === false`, () => {
+    expect(service.tokenInitialized$.getValue()).toBeFalse();
+  });
+});
diff --git a/src/app/core/xsrf/xsrf.service.ts b/src/app/core/xsrf/xsrf.service.ts
new file mode 100644
index 0000000000..fb8dfe74b3
--- /dev/null
+++ b/src/app/core/xsrf/xsrf.service.ts
@@ -0,0 +1,10 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+@Injectable()
+export abstract class XSRFService {
+  public tokenInitialized$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  abstract initXSRFToken(httpClient: HttpClient): () => Promise<any>;
+}
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index d6295cf791..2f1f6a200e 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { NgModule } from '@angular/core';
+import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { BrowserModule, BrowserTransferStateModule, makeStateKey, TransferState } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
@@ -32,6 +32,8 @@ 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 { ReferrerService } from '../../app/core/services/referrer.service';
+import { BrowserXSRFService } from '../../app/core/xsrf/browser-xsrf.service';
+import { XSRFService } from '../../app/core/xsrf/xsrf.service';
 import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
@@ -73,6 +75,16 @@ export function getRequest(transferState: TransferState): any {
       useFactory: getRequest,
       deps: [TransferState]
     },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: (xsrfService: XSRFService, httpClient: HttpClient) => xsrfService.initXSRFToken(httpClient),
+      deps: [ XSRFService, HttpClient ],
+      multi: true,
+    },
+    {
+      provide: XSRFService,
+      useClass: BrowserXSRFService,
+    },
     {
       provide: AuthService,
       useClass: AuthService
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index b3d718b0b2..970a852be4 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -35,6 +35,8 @@ import { ServerAuthRequestService } from '../../app/core/auth/server-auth-reques
 import { ServerInitService } from './server-init.service';
 import { XhrFactory } from '@angular/common';
 import { ServerXhrService } from '../../app/core/services/server-xhr.service';
+import { ServerXSRFService } from '../../app/core/xsrf/server-xsrf.service';
+import { XSRFService } from '../../app/core/xsrf/xsrf.service';
 import { ReferrerService } from '../../app/core/services/referrer.service';
 import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
 
@@ -94,6 +96,10 @@ export function createTranslateLoader(transferState: TransferState) {
       provide: AuthRequestService,
       useClass: ServerAuthRequestService,
     },
+    {
+      provide: XSRFService,
+      useClass: ServerXSRFService,
+    },
     {
       provide: LocaleService,
       useClass: ServerLocaleService

From 769210bef2cda11a9e3103730a5e71fbcf145a95 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 3 Apr 2024 10:25:43 -0500
Subject: [PATCH 0238/1286] Update code to use GET request. Cleanup lint errors
 & add in basic TypeDocs

---
 .../core/xsrf/browser-xsrf.service.spec.ts    | 36 ++++++++-----------
 src/app/core/xsrf/browser-xsrf.service.ts     | 20 ++++++-----
 src/app/core/xsrf/server-xsrf.service.spec.ts |  3 +-
 src/app/core/xsrf/server-xsrf.service.ts      |  7 +++-
 src/app/core/xsrf/xsrf.service.spec.ts        |  3 +-
 src/app/core/xsrf/xsrf.service.ts             |  5 +++
 6 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
index 378df0e46b..aba3edd330 100644
--- a/src/app/core/xsrf/browser-xsrf.service.spec.ts
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -1,8 +1,12 @@
-import { BrowserXSRFService } from './browser-xsrf.service';
 import { HttpClient } from '@angular/common/http';
-import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { BrowserXSRFService } from './browser-xsrf.service';
 
 describe(`BrowserXSRFService`, () => {
   let service: BrowserXSRFService;
@@ -14,7 +18,7 @@ describe(`BrowserXSRFService`, () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [ HttpClientTestingModule ],
-      providers: [ BrowserXSRFService ]
+      providers: [ BrowserXSRFService ],
     });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
@@ -22,20 +26,22 @@ describe(`BrowserXSRFService`, () => {
   });
 
   describe(`initXSRFToken`, () => {
-    it(`should perform a POST to the csrf endpoint`, () => {
+    it(`should perform a GET to the csrf endpoint`, (done: DoneFn) => {
       service.initXSRFToken(httpClient)();
 
       const req = httpTestingController.expectOne({
         url: endpointURL,
-        method: 'POST'
+        method: 'GET',
       });
 
       req.flush({});
       httpTestingController.verify();
+      expect().nothing();
+      done();
     });
 
-    describe(`when the POST succeeds`, () => {
-      it(`should set tokenInitialized$ to true`, () => {
+    describe(`when the GET succeeds`, () => {
+      it(`should set tokenInitialized$ to true`, (done: DoneFn) => {
         service.initXSRFToken(httpClient)();
 
         const req = httpTestingController.expectOne(endpointURL);
@@ -44,19 +50,7 @@ describe(`BrowserXSRFService`, () => {
         httpTestingController.verify();
 
         expect(service.tokenInitialized$.getValue()).toBeTrue();
-      });
-    });
-
-    describe(`when the POST fails`, () => {
-      it(`should set tokenInitialized$ to true`, () => {
-        service.initXSRFToken(httpClient)();
-
-        const req = httpTestingController.expectOne(endpointURL);
-
-        req.error(new ErrorEvent('415'));
-        httpTestingController.verify();
-
-        expect(service.tokenInitialized$.getValue()).toBeTrue();
+        done();
       });
     });
 
diff --git a/src/app/core/xsrf/browser-xsrf.service.ts b/src/app/core/xsrf/browser-xsrf.service.ts
index 271e8dca47..121defc061 100644
--- a/src/app/core/xsrf/browser-xsrf.service.ts
+++ b/src/app/core/xsrf/browser-xsrf.service.ts
@@ -1,21 +1,25 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { take } from 'rxjs/operators';
+
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
-import { take, catchError } from 'rxjs/operators';
-import { of as observableOf } from 'rxjs';
 import { XSRFService } from './xsrf.service';
 
+/**
+ * Browser (CSR) Service to obtain a new CSRF/XSRF token when needed by our RequestService
+ * to perform a modify request (e.g. POST/PUT/DELETE).
+ * NOTE: This is primarily necessary before the *first* modifying request, as the CSRF
+ * token may not yet be initialized.
+ */
 @Injectable()
 export class BrowserXSRFService extends XSRFService {
   initXSRFToken(httpClient: HttpClient): () => Promise<any> {
-    return () => new Promise((resolve) => {
-      httpClient.post(new RESTURLCombiner('/security/csrf').toString(), undefined).pipe(
-        // errors are to be expected if the token and the cookie don't match, that's what we're
-        // trying to fix for future requests, so just emit any observable to end up in the
-        // subscribe
-        catchError(() => observableOf(null)),
+    return () => new Promise<void>((resolve) => {
+      // Force a new token to be created by calling the CSRF endpoint
+      httpClient.get(new RESTURLCombiner('/security/csrf').toString(), undefined).pipe(
         take(1),
       ).subscribe(() => {
+        // Once token is returned, set tokenInitialized to true.
         this.tokenInitialized$.next(true);
       });
 
diff --git a/src/app/core/xsrf/server-xsrf.service.spec.ts b/src/app/core/xsrf/server-xsrf.service.spec.ts
index b2ace67dd0..05728edb42 100644
--- a/src/app/core/xsrf/server-xsrf.service.spec.ts
+++ b/src/app/core/xsrf/server-xsrf.service.spec.ts
@@ -1,6 +1,7 @@
-import { ServerXSRFService } from './server-xsrf.service';
 import { HttpClient } from '@angular/common/http';
 
+import { ServerXSRFService } from './server-xsrf.service';
+
 describe(`ServerXSRFService`, () => {
   let service: ServerXSRFService;
   let httpClient: HttpClient;
diff --git a/src/app/core/xsrf/server-xsrf.service.ts b/src/app/core/xsrf/server-xsrf.service.ts
index 1577893f95..f729aa49a7 100644
--- a/src/app/core/xsrf/server-xsrf.service.ts
+++ b/src/app/core/xsrf/server-xsrf.service.ts
@@ -1,11 +1,16 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+
 import { XSRFService } from './xsrf.service';
 
+/**
+ * Server (SSR) Service to obtain a new CSRF/XSRF token. Because SSR only triggers GET
+ * requests a CSRF token is never needed.
+ */
 @Injectable()
 export class ServerXSRFService extends XSRFService {
   initXSRFToken(httpClient: HttpClient): () => Promise<any> {
-    return () => new Promise((resolve) => {
+    return () => new Promise<void>((resolve) => {
       // return immediately, and keep tokenInitialized$ false. The server side can make only GET
       // requests, since it can never get a valid XSRF cookie
       resolve();
diff --git a/src/app/core/xsrf/xsrf.service.spec.ts b/src/app/core/xsrf/xsrf.service.spec.ts
index a7c5c01cb7..56564a294c 100644
--- a/src/app/core/xsrf/xsrf.service.spec.ts
+++ b/src/app/core/xsrf/xsrf.service.spec.ts
@@ -1,6 +1,7 @@
-import { XSRFService } from './xsrf.service';
 import { HttpClient } from '@angular/common/http';
 
+import { XSRFService } from './xsrf.service';
+
 class XSRFServiceImpl extends XSRFService {
   initXSRFToken(httpClient: HttpClient): () => Promise<any> {
     return () => null;
diff --git a/src/app/core/xsrf/xsrf.service.ts b/src/app/core/xsrf/xsrf.service.ts
index fb8dfe74b3..99b27021b6 100644
--- a/src/app/core/xsrf/xsrf.service.ts
+++ b/src/app/core/xsrf/xsrf.service.ts
@@ -2,6 +2,11 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
+/**
+ * Abstract CSRF/XSRF Service used to track whether a CSRF token has been received
+ * from the DSpace REST API. Once it is received, the "tokenInitialized$" flag will
+ * be set to "true".
+ */
 @Injectable()
 export abstract class XSRFService {
   public tokenInitialized$: BehaviorSubject<boolean> = new BehaviorSubject(false);

From 950038e6dfda0d2149e0c0559a5d6dc7b2289535 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 3 Apr 2024 11:48:13 -0500
Subject: [PATCH 0239/1286] Fix tests. Add XSRFService to all specs which need
 it to be initialized

---
 .../bitstream-formats/bitstream-formats.component.spec.ts     | 4 +++-
 ...earch-result-admin-workflow-list-element.component.spec.ts | 4 +++-
 ...on-search-result-list-submission-element.component.spec.ts | 2 ++
 .../edit-relationship-list.component.spec.ts                  | 2 ++
 .../file-section/file-section.component.spec.ts               | 2 ++
 src/app/login-page/login-page.component.spec.ts               | 4 +++-
 src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts  | 2 ++
 .../auth-nav-menu/user-menu/user-menu.component.spec.ts       | 4 +++-
 .../relation-group/dynamic-relation-group.component.spec.ts   | 4 +++-
 .../dynamic-lookup-relation-modal.component.spec.ts           | 2 ++
 src/app/shared/form/form.component.spec.ts                    | 4 +++-
 .../listable-object-component-loader.component.spec.ts        | 2 ++
 .../item-detail-preview/item-detail-preview.component.spec.ts | 2 ++
 .../collection-search-result-grid-element.component.spec.ts   | 2 ++
 .../community-search-result-grid-element.component.spec.ts    | 4 +++-
 .../item-types/item/item-list-element.component.spec.ts       | 2 ++
 src/app/shared/search/search.component.spec.ts                | 2 ++
 src/app/submission/edit/submission-edit.component.spec.ts     | 3 ++-
 .../sections/accesses/section-accesses.component.spec.ts      | 3 +++
 .../sections/license/section-license.component.spec.ts        | 2 ++
 .../file/edit/section-upload-file-edit.component.spec.ts      | 2 ++
 21 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 8a44240b7e..0cfdf3bd29 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -15,6 +15,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import {
@@ -108,7 +109,8 @@ describe('BitstreamFormatsComponent', () => {
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: NotificationsService, useValue: notificationsServiceStub },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: XSRFService, useValue: {} },
       ]
     }).compileComponents();
   };
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
index ab5d8b79a8..8c5258e9c6 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -9,6 +9,7 @@ import { CollectionElementLinkType } from '../../../../../shared/object-collecti
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import {
   WorkflowItemSearchResultAdminWorkflowListElementComponent
 } from './workflow-item-search-result-admin-workflow-list-element.component';
@@ -58,7 +59,8 @@ describe('WorkflowItemSearchResultAdminWorkflowListElementComponent', () => {
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: LinkService, useValue: linkService },
           { provide: DSONameService, useClass: DSONameServiceMock },
-          { provide: APP_CONFIG, useValue: environment }
+          { provide: APP_CONFIG, useValue: environment },
+          { provide: XSRFService, useValue: {} },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       })
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
index 9e4d347150..ba11253922 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -20,6 +20,7 @@ import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../../core/shared/item.model';
 import { UUIDService } from '../../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
@@ -115,6 +116,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: Store, useValue: {}},
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 3a627232a4..1cdd0e0fdb 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -28,6 +28,7 @@ import { ConfigurationDataService } from '../../../../core/data/configuration-da
 import { LinkHeadService } from '../../../../core/services/link-head.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
 import { Router } from '@angular/router';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
@@ -230,6 +231,7 @@ describe('EditRelationshipListComponent', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: EditItemRelationshipsService, useValue: editItemRelationshipsService },
+        { provide: XSRFService, useValue: {} },
         { provide: APP_CONFIG, useValue: environmentUseThumbs }
       ], schemas: [
         NO_ERRORS_SCHEMA
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 8acf405b55..02579b7900 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,6 +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 { XSRFService } from '../../../../core/xsrf/xsrf.service';
 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';
@@ -66,6 +67,7 @@ describe('FileSectionComponent', () => {
       }), BrowserAnimationsModule],
       declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
+        { provide: XSRFService, useValue: {} },
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: APP_CONFIG, useValue: environment }
diff --git a/src/app/login-page/login-page.component.spec.ts b/src/app/login-page/login-page.component.spec.ts
index baaa3430ac..7f5f3a7080 100644
--- a/src/app/login-page/login-page.component.spec.ts
+++ b/src/app/login-page/login-page.component.spec.ts
@@ -6,6 +6,7 @@ import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { XSRFService } from '../core/xsrf/xsrf.service';
 import { LoginPageComponent } from './login-page.component';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 
@@ -31,7 +32,8 @@ describe('LoginPageComponent', () => {
       declarations: [LoginPageComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Store, useValue: store }
+        { provide: Store, useValue: store },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index e3d3ef7fc5..6abb111e5c 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -14,6 +14,7 @@ import { HostWindowService } from '../host-window.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { AuthService } from '../../core/auth/auth.service';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { of } from 'rxjs';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -86,6 +87,7 @@ describe('AuthNavMenuComponent', () => {
         providers: [
           { provide: HostWindowService, useValue: window },
           { provide: AuthService, useValue: authService },
+          { provide: XSRFService, useValue: {} },
         ],
         schemas: [
           CUSTOM_ELEMENTS_SCHEMA
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index 04270f97cd..3ef4847168 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -7,6 +7,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { UserMenuComponent } from './user-menu.component';
 import { authReducer, AuthState } from '../../../core/auth/auth.reducer';
 import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 import { EPersonMock } from '../../testing/eperson.mock';
 import { AppState } from '../../../app.reducer';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
@@ -69,7 +70,8 @@ describe('UserMenuComponent', () => {
         })
       ],
       providers: [
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
+        { provide: XSRFService, useValue: {} },
       ],
       declarations: [
         UserMenuComponent
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index feca7f95c6..39cdd49702 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -25,6 +25,7 @@ import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service
 import { StoreMock } from '../../../../../testing/store.mock';
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
 import { storeModuleConfig } from '../../../../../../app.reducer';
+import { XSRFService } from '../../../../../../core/xsrf/xsrf.service';
 
 export let FORM_GROUP_TEST_MODEL_CONFIG;
 
@@ -129,7 +130,8 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         FormComponent,
         FormService,
         { provide: VocabularyService, useValue: new VocabularyServiceStub() },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9d57296f82..3bce307359 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -24,6 +24,7 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -128,6 +129,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
             }
           }
         },
+        { provide: XSRFService, useValue: {} },
         { provide: NgZone, useValue: new NgZone({}) },
         NgbActiveModal
       ],
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 2f3be3fded..5369f669f9 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -24,6 +24,7 @@ import { FormFieldMetadataValueObject } from './builder/models/form-field-metada
 import { createTestComponent } from '../testing/utils.test';
 import { BehaviorSubject } from 'rxjs';
 import { storeModuleConfig } from '../../app.reducer';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 
 let TEST_FORM_MODEL;
 
@@ -156,7 +157,8 @@ describe('FormComponent test suite', () => {
         FormBuilderService,
         FormComponent,
         FormService,
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index e3d2ad64b1..dcaa061bad 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -26,6 +26,7 @@ import { FileService } from '../../../../core/shared/file.service';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { ChangeDetectionStrategy } from '@angular/core';
 import { SearchResultListElementComponent } from '../../../object-list/search-result-list-element/search-result-list-element.component';
+import { XSRFService } from 'src/app/core/xsrf/xsrf.service';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -72,6 +73,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
         { provide: FileService, useValue: fileService },
         { provide: ThemeService, useValue: themeService },
         { provide: TruncatableService, useValue: truncatableService },
+        { provide: XSRFService, useValue: {} },
       ]
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
index 0b5acd343b..99facd9829 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
@@ -20,6 +20,7 @@ import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
@@ -99,6 +100,7 @@ describe('ItemDetailPreviewComponent', () => {
         { provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: CommunityDataService, useValue: {} },
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index 15548d6608..0be0d12e22 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -13,6 +13,7 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { Collection } from '../../../../core/shared/collection.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -80,6 +81,7 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
+        { provide: XSRFService, useValue: {} },
         { provide: LinkService, useValue: linkService }
       ],
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index 710fbf3f67..f98bb36d17 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -13,6 +13,7 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { Community } from '../../../../core/shared/community.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { XSRFService } from '../../../../core/xsrf/xsrf.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -80,7 +81,8 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
+        { provide: XSRFService, useValue: {} },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
index a222c49871..60231c5d27 100644
--- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts
@@ -3,6 +3,7 @@ import { ChangeDetectionStrategy } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { ItemListElementComponent } from './item-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { of as observableOf } from 'rxjs';
 import { ListableObjectComponentLoaderComponent } from '../../../../object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -91,6 +92,7 @@ describe('ItemListElementComponent', () => {
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: XSRFService, useValue: {} },
         { provide: FileService, useValue: fileService },
         { provide: ThemeService, useValue: themeService },
         { provide: TruncatableService, useValue: truncatableService },
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 69f4dfd6aa..4eb055d80e 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -20,6 +20,7 @@ import { SidebarService } from '../sidebar/sidebar.service';
 import { SearchFilterService } from '../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { RouteService } from '../../core/services/route.service';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { PaginatedSearchOptions } from './models/paginated-search-options.model';
@@ -208,6 +209,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
         provide: SearchFilterService,
         useValue: {}
       },
+      { provide: XSRFService, useValue: {} },
       {
         provide: SEARCH_CONFIG_SERVICE,
         useValue: searchConfigurationServiceStub
diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts
index 8013162d85..a476c9ab1f 100644
--- a/src/app/submission/edit/submission-edit.component.spec.ts
+++ b/src/app/submission/edit/submission-edit.component.spec.ts
@@ -18,6 +18,7 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { XSRFService } from '../../core/xsrf/xsrf.service';
 import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
 
@@ -54,7 +55,7 @@ describe('SubmissionEditComponent Component', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: route },
-
+        { provide: XSRFService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index c70758a4df..651223c04b 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -40,6 +40,7 @@ import { AppState } from '../../../app.reducer';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import { mockAccessesFormData } from '../../../shared/mocks/submission.mock';
 import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 
 describe('SubmissionSectionAccessesComponent', () => {
   let component: SubmissionSectionAccessesComponent;
@@ -96,6 +97,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: TranslateService, useValue: getMockTranslateService() },
           { provide: FormService, useValue: getMockFormService() },
           { provide: Store, useValue: storeStub },
+          { provide: XSRFService, useValue: {} },
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
@@ -188,6 +190,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: TranslateService, useValue: getMockTranslateService() },
           { provide: FormService, useValue: getMockFormService() },
           { provide: Store, useValue: storeStub },
+          { provide: XSRFService, useValue: {} },
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 35fea95b8d..f15dcf9964 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -38,6 +38,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { License } from '../../../core/shared/license.model';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { cold } from 'jasmine-marbles';
+import { XSRFService } from '../../../core/xsrf/xsrf.service';
 
 const collectionId = mockSubmissionCollectionId;
 const licenseText = 'License text';
@@ -137,6 +138,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: 'collectionIdProvider', useValue: collectionId },
         { provide: 'sectionDataProvider', useValue: Object.assign({}, sectionObject) },
         { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: XSRFService, useValue: {} },
         ChangeDetectorRef,
         FormBuilderService,
         SubmissionSectionLicenseComponent
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index 72c555f39c..251f9aea81 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -47,6 +47,7 @@ import {
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import { of } from 'rxjs';
+import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 
 const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
   add: jasmine.createSpy('add'),
@@ -103,6 +104,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
         { provide: SectionUploadService, useValue: getMockSectionUploadService() },
+        { provide: XSRFService, useValue: {} },
         FormBuilderService,
         ChangeDetectorRef,
         SubmissionSectionUploadFileEditComponent,

From df8f0db784da575e2fa40772852d988b5cf02872 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 3 Apr 2024 14:00:42 -0500
Subject: [PATCH 0240/1286] Update build script to use "docker compose" instead
 of "docker-compose". Fixes random failures starting e2e test backend via
 Docker

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd655a3932..50b260b59e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
-      # Project name to use when running docker-compose prior to e2e tests
+      # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
@@ -108,12 +108,12 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
-      # Using docker-compose start backend using CI configuration
+      # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
         run: |
-          docker-compose -f ./docker/docker-compose-ci.yml up -d
-          docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
+          docker compose -f ./docker/docker-compose-ci.yml up -d
+          docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
           docker container ls
 
       # Run integration tests via Cypress.io
@@ -182,7 +182,7 @@ jobs:
         run: kill -9 $(lsof -t -i:4000)
 
       - name: Shutdown Docker containers
-        run: docker-compose -f ./docker/docker-compose-ci.yml down
+        run: docker compose -f ./docker/docker-compose-ci.yml down
 
   # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
   # job above. This is necessary because Codecov uploads seem to randomly fail at times.

From 2d81a487d3a44a5d5ddaeff2067470969dfed569 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 5 Apr 2024 09:43:47 +0200
Subject: [PATCH 0241/1286] [DURACOM-247] Move check for initialized token to
 request effects

---
 src/app/core/data/request.effects.ts      | 13 ++++++++++---
 src/app/core/data/request.service.spec.ts |  9 +--------
 src/app/core/data/request.service.ts      | 19 +++----------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 889d909bfa..d79dd9a283 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,7 +1,7 @@
 import { Injectable, Injector } from '@angular/core';
 
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, take, withLatestFrom } from 'rxjs/operators';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
@@ -9,6 +9,7 @@ import { getClassForType } from '../cache/builders/build-decorators';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { XSRFService } from '../xsrf/xsrf.service';
 import {
   RequestActionTypes,
   RequestErrorAction,
@@ -19,6 +20,7 @@ import {
 import { RequestService } from './request.service';
 import { ParsedResponse } from '../cache/response.models';
 import { RequestError } from './request-error.model';
+import { RestRequestMethod } from './rest-request-method';
 import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { RequestEntry } from './request-entry.model';
 
@@ -33,7 +35,11 @@ export class RequestEffects {
       );
     }),
     filter((entry: RequestEntry) => hasValue(entry)),
-    map((entry: RequestEntry) => entry.request),
+    withLatestFrom(this.xsrfService.tokenInitialized$),
+    // If it's a GET request, or we have an XSRF token, dispatch it immediately
+    // Otherwise wait for the XSRF token first
+    filter(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request.method === RestRequestMethod.GET || tokenInitialized === true),
+    map(([entry, tokenInitialized]: [RequestEntry, boolean]) => entry.request),
     mergeMap((request: RestRequestWithResponseParser) => {
       let body = request.body;
       if (isNotEmpty(request.body) && !request.isMultipart) {
@@ -73,7 +79,8 @@ export class RequestEffects {
     private actions$: Actions,
     private restApi: DspaceRestService,
     private injector: Injector,
-    protected requestService: RequestService
+    protected requestService: RequestService,
+    protected xsrfService: XSRFService,
   ) { }
 
 }
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index c557066e16..ae07a1c3d5 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,6 +1,6 @@
 import { Store, StoreModule } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { BehaviorSubject, EMPTY, Observable, of as observableOf } from 'rxjs';
+import { EMPTY, Observable, of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
@@ -8,7 +8,6 @@ import { defaultUUID, getMockUUIDService } from '../../shared/mocks/uuid.service
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { coreReducers} from '../core.reducers';
 import { UUIDService } from '../shared/uuid.service';
-import { XSRFService } from '../xsrf/xsrf.service';
 import { RequestConfigureAction, RequestExecuteAction, RequestStaleAction } from './request.actions';
 import {
   DeleteRequest,
@@ -36,7 +35,6 @@ describe('RequestService', () => {
   let uuidService: UUIDService;
   let store: Store<CoreState>;
   let mockStore: MockStore<CoreState>;
-  let xsrfService: XSRFService;
 
   const testUUID = '5f2a0d2a-effa-4d54-bd54-5663b960f9eb';
   const testHref = 'https://rest.api/endpoint/selfLink';
@@ -82,16 +80,11 @@ describe('RequestService', () => {
     store = TestBed.inject(Store);
     mockStore = store as MockStore<CoreState>;
     mockStore.setState(initialState);
-    xsrfService = {
-      tokenInitialized$: new BehaviorSubject(false),
-    } as XSRFService;
 
     service = new RequestService(
       objectCache,
       uuidService,
       store,
-      xsrfService,
-      undefined
     );
     serviceAsAny = service as any;
   });
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 0af6e4098f..063b19f801 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -8,10 +8,9 @@ import cloneDeep from 'lodash/cloneDeep';
 import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../../shared/empty.util';
 import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { IndexState, MetaIndexState } from '../index/index.reducer';
+import { IndexState } from '../index/index.reducer';
 import { requestIndexSelector, getUrlWithoutEmbedParams } from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
-import { XSRFService } from '../xsrf/xsrf.service';
 import {
   RequestConfigureAction,
   RequestExecuteAction,
@@ -137,9 +136,7 @@ export class RequestService {
 
   constructor(private objectCache: ObjectCacheService,
               private uuidService: UUIDService,
-              private store: Store<CoreState>,
-              protected xsrfService: XSRFService,
-              private indexStore: Store<MetaIndexState>) {
+              private store: Store<CoreState>) {
   }
 
   generateRequestId(): string {
@@ -421,17 +418,7 @@ export class RequestService {
    */
   private dispatchRequest(request: RestRequest) {
     this.store.dispatch(new RequestConfigureAction(request));
-    // If it's a GET request, or we have an XSRF token, dispatch it immediately
-    if (request.method === RestRequestMethod.GET || this.xsrfService.tokenInitialized$.getValue() === true) {
-      this.store.dispatch(new RequestExecuteAction(request.uuid));
-    } else {
-      // Otherwise wait for the XSRF token first
-      this.xsrfService.tokenInitialized$.pipe(
-        find((hasInitialized: boolean) => hasInitialized === true),
-      ).subscribe(() => {
-        this.store.dispatch(new RequestExecuteAction(request.uuid));
-      });
-    }
+    this.store.dispatch(new RequestExecuteAction(request.uuid));
   }
 
   /**

From 33b59c739dc0ee541e800f0af5fa31726c8014fb Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 28 May 2024 15:53:00 +0200
Subject: [PATCH 0242/1286] 115284: Fix issue with same type relationships

---
 .../edit-item-page/edit-item-page.module.ts   |   4 +
 .../edit-item-relationships.service.spec.ts   |  89 +++++++++++++++
 .../edit-item-relationships.service.ts        |  49 +++++++-
 ...t-relationship-list-wrapper.component.html |  30 +++++
 ...t-relationship-list-wrapper.component.scss |   0
 ...elationship-list-wrapper.component.spec.ts | 108 ++++++++++++++++++
 ...dit-relationship-list-wrapper.component.ts |  91 +++++++++++++++
 .../edit-relationship-list.component.spec.ts  |   6 +-
 .../edit-relationship-list.component.ts       |  42 ++-----
 .../item-relationships.component.html         |   4 +-
 ...namic-lookup-relation-modal.component.html |   1 +
 ...dynamic-lookup-relation-modal.component.ts |   5 +
 ...-lookup-relation-search-tab.component.html |   1 +
 ...ic-lookup-relation-search-tab.component.ts |   5 +
 ...ic-lookup-relation-search-tab.component.ts |   4 +-
 .../shared/search/search.component.spec.ts    |   2 +
 src/app/shared/search/search.component.ts     |  20 +++-
 .../shared/search/themed-search.component.ts  |   4 +-
 18 files changed, 425 insertions(+), 40 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
 create mode 100644 src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts

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 0a75394ddd..60aa2828bd 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
@@ -46,6 +46,9 @@ import { ResultsBackButtonModule } from '../../shared/results-back-button/result
 import {
   AccessControlFormModule
 } from '../../shared/access-control-form-container/access-control-form.module';
+import {
+  EditRelationshipListWrapperComponent
+} from './item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -94,6 +97,7 @@ import {
     ItemRegisterDoiComponent,
     ItemCurateComponent,
     ItemAccessControlComponent,
+    EditRelationshipListWrapperComponent,
   ],
   providers: [
     BundleDataService,
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
index f969416783..6ca7f57739 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -265,6 +265,95 @@ describe('EditItemRelationshipsService', () => {
     });
   });
 
+  describe('isProvidedItemTypeLeftType', () => {
+    it('should return true if the provided item corresponds to the left type of the relationship', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'leftType'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeTrue();
+        done();
+      });
+    });
+
+    it('should return false if the provided item corresponds to the right type of the relationship', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'rightType'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+
+    it('should return undefined if the provided item corresponds does not match any of the relationship types', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'something-else'} );
+      const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+      const result = service.isProvidedItemTypeLeftType(relationshipType, itemType, item);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeUndefined();
+        done();
+      });
+    });
+  });
+
+  describe('relationshipMatchesBothSameTypes', () => {
+    it('should return true if both left and right type of the relationship type are the same and match the provided itemtype', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id:  'sameType'}),
+        rightType: createSuccessfulRemoteDataObject$({id:'sameType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'sameType'} );
+
+      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeTrue();
+        done();
+      });
+    });
+    it('should return false if both left and right type of the relationship type are the same and do not match the provided itemtype', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'something-else'} );
+
+      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+    it('should return false if both left and right type of the relationship type are different', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
+        rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+      });
+      const itemType = Object.assign(new ItemType(), {id: 'leftType'} );
+
+      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
+  });
+
   describe('displayNotifications', () => {
     it('should show one success notification when multiple requests succeeded', () => {
       service.displayNotifications([
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
index 2cecd878b7..f14e95f66f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -10,7 +10,7 @@ import {
 } from '../../../core/data/object-updates/object-updates.reducer';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { EMPTY, Observable, BehaviorSubject, Subscription } from 'rxjs';
+import { EMPTY, Observable, BehaviorSubject, Subscription, combineLatest as observableCombineLatest } from 'rxjs';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Item } from '../../../core/shared/item.model';
@@ -20,6 +20,9 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { TranslateService } from '@ngx-translate/core';
+import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
 
 @Injectable({
   providedIn: 'root'
@@ -169,6 +172,49 @@ export class EditItemRelationshipsService {
     }
   }
 
+  isProvidedItemTypeLeftType(relationshipType: RelationshipType, itemType: ItemType, item: Item): Observable<boolean> {
+    return this.getRelationshipLeftAndRightType(relationshipType).pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.id === itemType.id) {
+          return true;
+        }
+
+        if (rightType.id === itemType.id) {
+          return false;
+        }
+
+        // should never happen...
+        console.warn(`The item ${item.uuid} is not on the right or the left side of relationship type ${relationshipType.uuid}`);
+        return undefined;
+      })
+    );
+  }
+
+  relationshipMatchesBothSameTypes(relationshipType: RelationshipType, itemType: ItemType): Observable<boolean> {
+    return this.getRelationshipLeftAndRightType(relationshipType).pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        return leftType.id === itemType.id && rightType.id === itemType.id;
+      })
+    );
+  }
+
+  protected getRelationshipLeftAndRightType(relationshipType: RelationshipType): Observable<[ItemType, ItemType]> {
+    const leftType$: Observable<ItemType> = relationshipType.leftType.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+
+    const rightType$: Observable<ItemType> = relationshipType.rightType.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    );
+
+    return observableCombineLatest([
+      leftType$,
+      rightType$,
+    ]);
+  }
+
 
 
   /**
@@ -185,6 +231,5 @@ export class EditItemRelationshipsService {
    */
   getNotificationContent(key: string): string {
     return this.translateService.instant(this.notificationsPrefix + key + '.content');
-
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
new file mode 100644
index 0000000000..e6c1aa25f7
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
@@ -0,0 +1,30 @@
+<ng-container *ngIf="bothItemsMatchType$ | async">
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="isLeftItem$"
+    ></ds-edit-relationship-list>
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="isRightItem$"
+    ></ds-edit-relationship-list>
+</ng-container>
+
+<ng-container *ngIf="!(bothItemsMatchType$ | async)">
+    <ds-edit-relationship-list
+            [url]="url"
+            [item]="item"
+            [itemType]="itemType"
+            [relationshipType]="relationshipType"
+            [hasChanges]="hasChanges"
+            [currentItemIsLeftItem$]="currentItemIsLeftItem$"
+    ></ds-edit-relationship-list>
+</ng-container>
+
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
new file mode 100644
index 0000000000..6c1aa9dafe
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
@@ -0,0 +1,108 @@
+import { ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { EditRelationshipListWrapperComponent } from './edit-relationship-list-wrapper.component';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { By } from '@angular/platform-browser';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { Item } from '../../../../core/shared/item.model';
+
+describe('EditRelationshipListWrapperComponent', () => {
+  let editItemRelationshipsService: EditItemRelationshipsService;
+  let comp: EditRelationshipListWrapperComponent;
+  let fixture: ComponentFixture<EditRelationshipListWrapperComponent>;
+
+  const leftType = Object.assign(new ItemType(), {id: 'leftType', label: 'leftTypeString'});
+  const rightType = Object.assign(new ItemType(), {id: 'rightType', label: 'rightTypeString'});
+
+  const relationshipType = Object.assign(new RelationshipType(), {
+    id: '1',
+    leftMaxCardinality: null,
+    leftMinCardinality: 0,
+    leftType: createSuccessfulRemoteDataObject$(leftType),
+    leftwardType: 'isOrgUnitOfOrgUnit',
+    rightMaxCardinality: null,
+    rightMinCardinality: 0,
+    rightType: createSuccessfulRemoteDataObject$(rightType),
+    rightwardType: 'isOrgUnitOfOrgUnit',
+    uuid: 'relationshiptype-1',
+  });
+
+  const item = Object.assign(new Item(), {uuid: 'item-uuid'});
+
+  beforeEach(waitForAsync(() => {
+
+    editItemRelationshipsService = jasmine.createSpyObj('editItemRelationshipsService', {
+      isProvidedItemTypeLeftType: observableOf(true),
+      relationshipMatchesBothSameTypes: observableOf(false)
+    });
+
+
+    TestBed.configureTestingModule({
+      // imports: [NoopAnimationsModule, SharedModule, TranslateModule.forRoot()],
+      declarations: [EditRelationshipListWrapperComponent],
+      providers: [
+        {provide: EditItemRelationshipsService, useValue: editItemRelationshipsService},
+        ChangeDetectorRef
+      ], schemas: [
+        CUSTOM_ELEMENTS_SCHEMA
+      ]
+    }).compileComponents();
+
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditRelationshipListWrapperComponent);
+    comp = fixture.componentInstance;
+    comp.relationshipType = relationshipType;
+    comp.itemType = leftType;
+    comp.item = item;
+
+    fixture.detectChanges();
+  });
+
+  describe('onInit', () => {
+    it('should render the component', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should set currentItemIsLeftItem$ and bothItemsMatchType$  based on the provided relationshipType, itemType and item', () => {
+      expect(editItemRelationshipsService.isProvidedItemTypeLeftType).toHaveBeenCalledWith(relationshipType, leftType, item);
+      expect(editItemRelationshipsService.relationshipMatchesBothSameTypes).toHaveBeenCalledWith(relationshipType, leftType);
+
+      expect(comp.currentItemIsLeftItem$.getValue()).toEqual(true);
+      expect(comp.bothItemsMatchType$.getValue()).toEqual(false);
+    });
+  });
+
+  describe('when the current item is left', () => {
+    it('should render one relationship list section', () => {
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(1);
+    });
+  });
+
+  describe('when the current item is right', () => {
+    it('should render one relationship list section', () => {
+      (editItemRelationshipsService.isProvidedItemTypeLeftType as jasmine.Spy).and.returnValue(observableOf(false));
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(1);
+    });
+  });
+
+  describe('when the current item is both left and right', () => {
+    it('should render two relationship list sections', () => {
+      (editItemRelationshipsService.relationshipMatchesBothSameTypes as jasmine.Spy).and.returnValue(observableOf(true));
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      const relationshipLists = fixture.debugElement.queryAll(By.css('ds-edit-relationship-list'));
+      expect(relationshipLists.length).toEqual(2);
+    });
+  });
+
+});
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
new file mode 100644
index 0000000000..8231eaa542
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -0,0 +1,91 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { Item } from '../../../../core/shared/item.model';
+import { hasValue } from '../../../../shared/empty.util';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+
+@Component({
+  selector: 'ds-edit-relationship-list-wrapper',
+  styleUrls: ['./edit-relationship-list-wrapper.component.scss'],
+  templateUrl: './edit-relationship-list-wrapper.component.html',
+})
+/**
+ * A component creating a list of editable relationships of a certain type
+ * The relationships are rendered as a list of related items
+ */
+export class EditRelationshipListWrapperComponent implements OnInit, OnDestroy {
+
+  /**
+   * The item to display related items for
+   */
+  @Input() item: Item;
+
+  @Input() itemType: ItemType;
+
+  /**
+   * The URL to the current page
+   * Used to fetch updates for the current item from the store
+   */
+  @Input() url: string;
+
+  /**
+   * The label of the relationship-type we're rendering a list for
+   */
+  @Input() relationshipType: RelationshipType;
+
+  /**
+   * If updated information has changed
+   */
+  @Input() hasChanges!: Observable<boolean>;
+
+  /**
+   * The event emmiter to submit the new information
+   */
+  @Output() submitModal: EventEmitter<void> = new EventEmitter();
+
+  /**
+   * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
+   * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
+   */
+  currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
+
+
+  isLeftItem$ = new BehaviorSubject(true);
+
+  isRightItem$ = new BehaviorSubject(false);
+
+  bothItemsMatchType$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  constructor(
+    protected editItemRelationshipsService: EditItemRelationshipsService,
+  ) {
+  }
+
+
+  ngOnInit(): void {
+    this.subs.push(this.editItemRelationshipsService.isProvidedItemTypeLeftType(this.relationshipType, this.itemType, this.item)
+      .subscribe((nextValue: boolean) => {
+        this.currentItemIsLeftItem$.next(nextValue);
+      }));
+
+    this.subs.push(this.editItemRelationshipsService.relationshipMatchesBothSameTypes(this.relationshipType, this.itemType)
+      .subscribe((nextValue: boolean) => {
+        this.bothItemsMatchType$.next(nextValue);
+      }));
+  }
+
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 3a627232a4..9504ebb078 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -2,7 +2,7 @@ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
@@ -63,6 +63,7 @@ describe('EditRelationshipListComponent', () => {
   let relationships: Relationship[];
   let relationshipType: RelationshipType;
   let paginationOptions: PaginationComponentOptions;
+  let currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
 
   const resetComponent = () => {
     fixture = TestBed.createComponent(EditRelationshipListComponent);
@@ -73,6 +74,7 @@ describe('EditRelationshipListComponent', () => {
     comp.url = url;
     comp.relationshipType = relationshipType;
     comp.hasChanges = observableOf(false);
+    comp.currentItemIsLeftItem$ = currentItemIsLeftItem$;
     fixture.detectChanges();
   };
 
@@ -293,6 +295,7 @@ describe('EditRelationshipListComponent', () => {
             leftwardType: 'isAuthorOfPublication',
             rightwardType: 'isPublicationOfAuthor',
           });
+          currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
           relationshipService.getItemRelationshipsByLabel.calls.reset();
           resetComponent();
         });
@@ -317,6 +320,7 @@ describe('EditRelationshipListComponent', () => {
             leftwardType: 'isPublicationOfAuthor',
             rightwardType: 'isAuthorOfPublication',
           });
+          currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(false);
           relationshipService.getItemRelationshipsByLabel.calls.reset();
           resetComponent();
         });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index c4b2bba36f..c105f0ef93 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -113,7 +113,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
    * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
    */
-  private currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
+  @Input() currentItemIsLeftItem$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
 
   relatedEntityType$: Observable<ItemType>;
 
@@ -213,18 +213,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    * Get the relevant label for this relationship type
    */
   private getLabel(): Observable<string> {
-    return observableCombineLatest([
-      this.relationshipType.leftType,
-      this.relationshipType.rightType,
-    ].map((itemTypeRD) => itemTypeRD.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    ))).pipe(
-      map((itemTypes: ItemType[]) => [
-        this.relationshipType.leftwardType,
-        this.relationshipType.rightwardType,
-      ][itemTypes.findIndex((itemType) => itemType.id === this.itemType.id)]),
-    );
+    return this.currentItemIsLeftItem$.pipe(
+      map((currentItemIsLeftItem) => {
+        if (currentItemIsLeftItem) {
+          return this.relationshipType.leftwardType;
+        } else {
+          return this.relationshipType.rightwardType;
+        }
+      })
+      );
   }
 
   /**
@@ -251,6 +248,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(
       getFirstSucceededRemoteDataPayload()
@@ -424,24 +422,6 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
     this.relationshipMessageKey$ = this.getRelationshipMessageKey();
 
-    this.subs.push(this.relationshipLeftAndRightType$.pipe(
-      map(([leftType, rightType]: [ItemType, ItemType]) => {
-        if (leftType.id === this.itemType.id) {
-          return true;
-        }
-
-        if (rightType.id === this.itemType.id) {
-          return false;
-        }
-
-        // should never happen...
-        console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
-        return undefined;
-      })
-    ).subscribe((nextValue: boolean) => {
-      this.currentItemIsLeftItem$.next(nextValue);
-    }));
-
 
     // initialize the pagination options
     this.paginationConfig = new PaginationComponentOptions();
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 755731f576..85f41a25d9 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -5,13 +5,13 @@
     </div>
     <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
       <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
-        <ds-edit-relationship-list
+        <ds-edit-relationship-list-wrapper
           [url]="url"
           [item]="item"
           [itemType]="entityType"
           [relationshipType]="relationshipType"
           [hasChanges]="hasChanges$"
-        ></ds-edit-relationship-list>
+        ></ds-edit-relationship-list-wrapper>
       </div>
     </div>
     <div class="button-row bottom">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index 71cc8de0ac..703fb8c812 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -19,6 +19,7 @@
                             [repeatable]="repeatable"
                             [context]="context"
                             [query]="query"
+                            [hiddenQuery]="hiddenQuery"
                             [relationshipType]="relationshipType"
                             [isLeft]="isLeft"
                             [item]="item"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index ac436639bc..1881cc1efa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -97,6 +97,11 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
   query: string;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  hiddenQuery: string;
+
   /**
    * A map of subscriptions within this component
    */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 00bfa7981a..caf3116a53 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -2,6 +2,7 @@
            [configuration]="this.relationship.searchConfiguration"
            [context]="context"
            [fixedFilterQuery]="this.relationship.filter"
+           [hiddenQuery]="hiddenQuery"
            [inPlaceSearch]="true"
            [linkType]="linkTypes.ExternalLink"
            [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 3e874d8c50..24b5ae3595 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -93,6 +93,11 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   @Input() isEditRelationship: boolean;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  @Input() hiddenQuery: string;
+
   /**
    * Send an event to deselect an object from the list
    */
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
index d3ad1e2b78..9770de9745 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -18,7 +18,7 @@ import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'
 })
 export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedComponent<DsDynamicLookupRelationSearchTabComponent> {
   protected inAndOutputNames: (keyof DsDynamicLookupRelationSearchTabComponent & keyof this)[] = ['relationship', 'listId',
-    'query', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
+    'query', 'hiddenQuery', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
     'deselectObject', 'selectObject', 'resultFound'];
 
   @Input() relationship: RelationshipOptions;
@@ -27,6 +27,8 @@ export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedCompone
 
   @Input() query: string;
 
+  @Input() hiddenQuery: string;
+
   @Input() repeatable: boolean;
 
   @Input() selection$: Observable<ListableObject[]>;
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index d0d9bdda86..876390e3a8 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -108,6 +108,7 @@ const searchServiceStub = jasmine.createSpyObj('SearchService', {
 }) as SearchService;
 const configurationParam = 'default';
 const queryParam = 'test query';
+const hiddenQuery = 'hidden query';
 const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
 const fixedFilter = 'fixed filter';
 
@@ -250,6 +251,7 @@ describe('SearchComponent', () => {
     comp = fixture.componentInstance; // SearchComponent test instance
     comp.inPlaceSearch = false;
     comp.paginationId = paginationId;
+    comp.hiddenQuery = hiddenQuery;
 
     spyOn((comp as any), 'getSearchOptions').and.returnValue(paginatedSearchOptions$.asObservable());
 
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 61f3a119c8..a5bc4c19cb 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -75,6 +75,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() fixedFilterQuery: string;
 
+  /**
+   * A hidden query that will be used but not displayed in the url/searchbar
+   */
+  @Input() hiddenQuery: string;
+
   /**
    * If this is true, the request will only be sent if there's
    * no valid cached version. Defaults to true
@@ -337,6 +342,7 @@ export class SearchComponent implements OnInit {
       if (combinedOptions.query === '') {
         combinedOptions.query = this.query;
       }
+
       const newSearchOptions = new PaginatedSearchOptions(combinedOptions);
       // check if search options are changed
       // if so retrieve new related results otherwise skip it
@@ -440,8 +446,18 @@ export class SearchComponent implements OnInit {
     if (this.configuration === 'supervision') {
       followLinks.push(followLink<WorkspaceItem>('supervisionOrders', { isOptional: true }) as any);
     }
+
+    const searchOptionsWithHidden = Object.assign (new PaginatedSearchOptions({}), searchOptions);
+    if (isNotEmpty(this.hiddenQuery)) {
+      if (isNotEmpty(searchOptionsWithHidden.query)) {
+        searchOptionsWithHidden.query = searchOptionsWithHidden.query + ' AND ' + this.hiddenQuery;
+      } else {
+        searchOptionsWithHidden.query = this.hiddenQuery;
+      }
+    }
+
     this.service.search(
-      searchOptions,
+      searchOptionsWithHidden,
       undefined,
       this.useCachedVersionIfAvailable,
       true,
@@ -450,7 +466,7 @@ export class SearchComponent implements OnInit {
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         if (results.hasSucceeded) {
           if (this.trackStatistics) {
-            this.service.trackSearch(searchOptions, results.payload);
+            this.service.trackSearch(searchOptionsWithHidden, results.payload);
           }
           if (results.payload?.page?.length > 0) {
             this.resultFound.emit(results.payload);
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index fe531e4f0f..5ca2dceab1 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -19,7 +19,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
-  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
+  protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'hiddenQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showThumbnails', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics', 'query'];
 
   @Input() configurationList: SearchConfigurationOption[];
 
@@ -29,6 +29,8 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() fixedFilterQuery: string;
 
+  @Input() hiddenQuery: string;
+
   @Input() useCachedVersionIfAvailable: boolean;
 
   @Input() inPlaceSearch: boolean;

From f1706e24c29a36547e8f3f780eb10132cc26c240 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 3 Jun 2024 11:56:59 +0200
Subject: [PATCH 0243/1286] 115046: Fixed related item not invalidating on
 relationship deletion & automatically invalidate the isSelected value after
 updating relationship on item

---
 .../data/relationship-data.service.spec.ts    | 13 ++++++++++-
 .../core/data/relationship-data.service.ts    |  7 +++++-
 .../edit-item-relationships.service.spec.ts   |  1 +
 .../edit-item-relationships.service.ts        | 12 +++++++++-
 .../edit-relationship-list.component.ts       | 23 ++++++++++++++++---
 5 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 4432d5213a..625e0d62f4 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -125,7 +125,8 @@ describe('RelationshipDataService', () => {
 
   const itemService = jasmine.createSpyObj('itemService', {
     findById: (uuid) => createSuccessfulRemoteDataObject(relatedItems.find((relatedItem) => relatedItem.id === uuid)),
-    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
+    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0]),
+    getIDHrefObs: (uuid: string) => observableOf(`https://demo.dspace.org/server/api/core/items/${uuid}`),
   });
 
   function initTestService() {
@@ -240,6 +241,16 @@ describe('RelationshipDataService', () => {
     });
   });
 
+  describe('searchByItemsAndType', () => {
+    it('should call addDependency for each item to invalidate the request when one of the items is update', () => {
+      spyOn(service as any, 'addDependency');
+
+      service.searchByItemsAndType(relationshipType.id, item.id, relationshipType.leftwardType, ['item-id-1', 'item-id-2']);
+
+      expect((service as any).addDependency).toHaveBeenCalledTimes(2);
+    });
+  });
+
   describe('resolveMetadataRepresentation', () => {
     const parentItem: Item = Object.assign(new Item(), {
       id: 'parent-item',
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index a7ab4eb31c..e3776d9bca 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -555,13 +555,18 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       );
     });
 
-    return this.searchBy(
+    const searchRD$: Observable<RemoteData<PaginatedList<Relationship>>> = this.searchBy(
       'byItemsAndType',
       {
         searchParams: searchParams
       },
     ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
+    arrayOfItemIds.forEach((itemId: string) => {
+      this.addDependency(searchRD$, this.itemService.getIDHrefObs(encodeURIComponent(itemId)));
+    });
+
+    return searchRD$;
   }
 
   /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
index 6ca7f57739..ef66f91691 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -185,6 +185,7 @@ describe('EditItemRelationshipsService', () => {
 
       expect(itemService.invalidateByHref).toHaveBeenCalledWith(currentItem.self);
       expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem1.self);
+      expect(itemService.invalidateByHref).toHaveBeenCalledWith(relationshipItem2.self);
 
       expect(notificationsService.success).toHaveBeenCalledTimes(1);
     });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
index f14e95f66f..a3d45d6c70 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -61,7 +61,17 @@ export class EditItemRelationshipsService {
       // process each update one by one, while waiting for the previous to finish
       concatMap((update: FieldUpdate) => {
         if (update.changeType === FieldChangeType.REMOVE) {
-          return this.deleteRelationship(update.field as DeleteRelationship).pipe(take(1));
+          return this.deleteRelationship(update.field as DeleteRelationship).pipe(
+            take(1),
+            switchMap((deleteRD: RemoteData<NoContent>) => {
+              if (deleteRD.hasSucceeded) {
+                return this.itemService.invalidateByHref((update.field as DeleteRelationship).relatedItem._links.self.href).pipe(
+                  map(() => deleteRD),
+                );
+              }
+              return [deleteRD];
+            }),
+          );
         } else if (update.changeType === FieldChangeType.ADD) {
           return this.addRelationship(update.field as RelationshipIdentifiable).pipe(
             take(1),
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index c105f0ef93..f57859220a 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -33,6 +33,7 @@ import {
 } from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
   getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
@@ -334,6 +335,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                       type: this.relationshipType,
                       originalIsLeft: isLeft,
                       originalItem: this.item,
+                      relatedItem,
                       relationship,
                     } as RelationshipIdentifiable;
                     return this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
@@ -483,10 +485,24 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             this.relationshipService.isLeftItem(relationship, this.item).pipe(
               // emit an array containing both the relationship and whether it's the left item,
               // as we'll need both
-              map((isLeftItem: boolean) => [relationship, isLeftItem])
-            )
+              switchMap((isLeftItem: boolean) => {
+                if (isLeftItem) {
+                  return relationship.rightItem.pipe(
+                    getFirstCompletedRemoteData(),
+                    getRemoteDataPayload(),
+                    map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]),
+                  );
+                } else {
+                  return relationship.leftItem.pipe(
+                    getFirstCompletedRemoteData(),
+                    getRemoteDataPayload(),
+                    map((relatedItem: Item) => [relationship, isLeftItem, relatedItem]),
+                  );
+                }
+              }),
+            ),
           ),
-          map(([relationship, isLeftItem]: [Relationship, boolean]) => {
+          map(([relationship, isLeftItem, relatedItem]: [Relationship, boolean, Item]) => {
             // turn it into a RelationshipIdentifiable, an
             const nameVariant =
               isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
@@ -496,6 +512,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
               relationship,
               originalIsLeft: isLeftItem,
               originalItem: this.item,
+              relatedItem: relatedItem,
               nameVariant,
             } as RelationshipIdentifiable;
           }),

From 8ee375016f1e7dbd5db5f6d0621848d7aa70a373 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 3 Jun 2024 12:46:04 +0200
Subject: [PATCH 0244/1286] 115046: Fixed loading animation not resetting hen
 closing modal

---
 .../edit-relationship-list.component.ts             | 10 ++++++++--
 .../dynamic-lookup-relation-modal.component.spec.ts |  2 --
 .../dynamic-lookup-relation-modal.component.ts      | 13 +++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index f57859220a..6cca52ba96 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -26,7 +26,7 @@ import {
   toArray,
   concatMap
 } from 'rxjs/operators';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../../../shared/empty.util';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import {
   RelationshipType
@@ -278,7 +278,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                 }
               }
 
-              this.loading$.next(true);
+              this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove));
               // emit the last page again to trigger a fieldupdates refresh
               this.relationshipsRd$.next(this.relationshipsRd$.getValue());
             });
@@ -296,6 +296,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         } else {
           modalComp.toRemove.push(searchResult);
         }
+        this.loading$.next(isNotEmpty(modalComp.toAdd) || isNotEmpty(modalComp.toRemove));
       });
     };
 
@@ -369,6 +370,11 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
       modalComp.toAdd = [];
       modalComp.toRemove = [];
+      this.loading$.next(false);
+    };
+
+    modalComp.closeEv = () => {
+      this.loading$.next(false);
     };
 
     this.relatedEntityType$
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9d57296f82..10adffb12a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -7,7 +7,6 @@ import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
@@ -119,7 +118,6 @@ describe('DsDynamicLookupRelationModalComponent', () => {
         {
           provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
         },
-        { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
         {
           provide: Store, useValue: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 1881cc1efa..a61432170a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -17,7 +17,6 @@ import {
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../app.reducer';
 import { Context } from '../../../../../core/shared/context.model';
@@ -164,7 +163,6 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     public modal: NgbActiveModal,
     private selectableListService: SelectableListService,
     private relationshipService: RelationshipDataService,
-    private relationshipTypeService: RelationshipTypeDataService,
     private externalSourceService: ExternalSourceDataService,
     private lookupRelationService: LookupRelationService,
     private searchConfigService: SearchConfigurationService,
@@ -217,6 +215,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.toAdd = [];
     this.toRemove = [];
     this.modal.close();
+    this.closeEv();
   }
 
   /**
@@ -311,13 +310,19 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   /**
-   * Called when discard button is clicked, emit discard event to parent to conclude functionality
+   * Called when close button is clicked
+   */
+  closeEv(): void {
+  }
+
+  /**
+   * Called when discard button is clicked
    */
   discardEv(): void {
   }
 
   /**
-   * Called when submit button is clicked, emit submit event to parent to conclude functionality
+   * Called when submit button is clicked
    */
   submitEv(): void {
   }

From 6d1e6f90fcad329a8963fef73c2a6ad57b2308bc Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 3 Jun 2024 13:50:42 +0200
Subject: [PATCH 0245/1286] 115046: Fixed issue where relationsToItems would
 never emit when an empty array was passed to it

---
 .../shared/item-relationships-utils.ts        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
index b4c3da2cdc..a3531bda05 100644
--- a/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
+++ b/src/app/item-page/simple/item-types/shared/item-relationships-utils.ts
@@ -1,4 +1,4 @@
-import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -46,17 +46,19 @@ export const compareArraysUsingIds = <T extends { id: string }>() =>
 /**
  * Operator for turning a list of relationships into a list of the relevant items
  * @param {string} thisId       The item's id of which the relations belong to
- * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const relationsToItems = (thisId: string) =>
+export const relationsToItems = (thisId: string): (source: Observable<Relationship[]>) => Observable<Item[]> =>
   (source: Observable<Relationship[]>): Observable<Item[]> =>
     source.pipe(
-      mergeMap((rels: Relationship[]) =>
-        observableZip(
-          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem))
-        )
-      ),
-      map((arr) =>
+      mergeMap((relationships: Relationship[]) => {
+        if (relationships.length === 0) {
+          return observableOf([]);
+        }
+        return observableZip(
+          ...relationships.map((rel: Relationship) => observableCombineLatest([rel.leftItem, rel.rightItem])),
+        );
+      }),
+      map((arr: [RemoteData<Item>, RemoteData<Item>][]) =>
         arr
           .filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded)
           .map(([leftItem, rightItem]) => {
@@ -75,9 +77,8 @@ export const relationsToItems = (thisId: string) =>
  * Operator for turning a paginated list of relationships into a paginated list of the relevant items
  * The result is wrapped in the original RemoteData and PaginatedList
  * @param {string} thisId       The item's id of which the relations belong to
- * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const paginatedRelationsToItems = (thisId: string) =>
+export const paginatedRelationsToItems = (thisId: string): (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>> =>
   (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
     source.pipe(
       getFirstSucceededRemoteData(),

From 3f7e273597f14e9a5cff6c3307b792706c2bd29c Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Tue, 5 Mar 2024 17:18:25 +0100
Subject: [PATCH 0246/1286] Avoid metadata representation element is rendered
 twice when checking the browse configuration

---
 .../specific-field/item-page-field.component.ts             | 6 +++---
 .../metadata-representation-list.component.ts               | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index fc526dabcc..3a18666a81 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -4,7 +4,7 @@ import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import { getRemoteDataPayload } from '../../../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -57,8 +57,8 @@ export class ItemPageFieldComponent {
      */
     get browseDefinition(): Observable<BrowseDefinition> {
       return this.browseDefinitionDataService.findByFields(this.fields).pipe(
-        getRemoteDataPayload(),
-        map((def) => def)
+        getFirstCompletedRemoteData(),
+        map((def) => def.payload)
       );
     }
 }
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 59a5377f77..30ec064e68 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
@@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 import { Item } from '../../../core/shared/item.model';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 import { map } from 'rxjs/operators';
-import { getRemoteDataPayload } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import {
   MetadatumRepresentation
 } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
@@ -96,8 +96,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
               searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
             });
             return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
-              getRemoteDataPayload(),
-              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum))
+              getFirstCompletedRemoteData(),
+              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum))
             );
           }
         }),

From 813db7cc9facd2114a62b9d84ceeb9d97940c427 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 7 Jun 2024 13:02:14 +0200
Subject: [PATCH 0247/1286] 115046: Fixed same type entity relationships with
 same leftward/rightward type displaying twice

---
 .../edit-item-relationships.service.spec.ts   | 27 ++++++++++++++++---
 .../edit-item-relationships.service.ts        | 12 ++++++---
 ...t-relationship-list-wrapper.component.html |  5 ++--
 ...elationship-list-wrapper.component.spec.ts |  9 ++++---
 ...dit-relationship-list-wrapper.component.ts |  7 ++---
 .../edit-relationship.component.ts            |  8 +++---
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
index ef66f91691..ebc2a82d84 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.spec.ts
@@ -318,23 +318,42 @@ describe('EditItemRelationshipsService', () => {
       const relationshipType = Object.assign(new RelationshipType(), {
         leftType: createSuccessfulRemoteDataObject$({id:  'sameType'}),
         rightType: createSuccessfulRemoteDataObject$({id:'sameType'}),
+        leftwardType: 'isDepartmentOfDivision',
+        rightwardType: 'isDivisionOfDepartment',
       });
       const itemType = Object.assign(new ItemType(), {id: 'sameType'} );
 
-      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
       result.subscribe((resultValue) => {
         expect(resultValue).toBeTrue();
         done();
       });
     });
+    it('should return false if both left and right type of the relationship type are the same and match the provided itemtype but the leftwardType & rightwardType is identical', (done) => {
+      const relationshipType = Object.assign(new RelationshipType(), {
+        leftType: createSuccessfulRemoteDataObject$({ id: 'sameType' }),
+        rightType: createSuccessfulRemoteDataObject$({ id: 'sameType' }),
+        leftwardType: 'isOrgUnitOfOrgUnit',
+        rightwardType: 'isOrgUnitOfOrgUnit',
+      });
+      const itemType = Object.assign(new ItemType(), { id: 'sameType' });
+
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
+      result.subscribe((resultValue) => {
+        expect(resultValue).toBeFalse();
+        done();
+      });
+    });
     it('should return false if both left and right type of the relationship type are the same and do not match the provided itemtype', (done) => {
       const relationshipType = Object.assign(new RelationshipType(), {
         leftType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
         rightType: createSuccessfulRemoteDataObject$({id: 'sameType'}),
+        leftwardType: 'isDepartmentOfDivision',
+        rightwardType: 'isDivisionOfDepartment',
       });
       const itemType = Object.assign(new ItemType(), {id: 'something-else'} );
 
-      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
       result.subscribe((resultValue) => {
         expect(resultValue).toBeFalse();
         done();
@@ -344,10 +363,12 @@ describe('EditItemRelationshipsService', () => {
       const relationshipType = Object.assign(new RelationshipType(), {
         leftType: createSuccessfulRemoteDataObject$({id: 'leftType'}),
         rightType: createSuccessfulRemoteDataObject$({id: 'rightType'}),
+        leftwardType: 'isAuthorOfPublication',
+        rightwardType: 'isPublicationOfAuthor',
       });
       const itemType = Object.assign(new ItemType(), {id: 'leftType'} );
 
-      const result = service.relationshipMatchesBothSameTypes(relationshipType, itemType);
+      const result = service.shouldDisplayBothRelationshipSides(relationshipType, itemType);
       result.subscribe((resultValue) => {
         expect(resultValue).toBeFalse();
         done();
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
index a3d45d6c70..b9f3738e7b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-item-relationships.service.ts
@@ -200,11 +200,17 @@ export class EditItemRelationshipsService {
     );
   }
 
-  relationshipMatchesBothSameTypes(relationshipType: RelationshipType, itemType: ItemType): Observable<boolean> {
+  /**
+   * Whether both side of the relationship need to be displayed on the edit relationship page or not.
+   *
+   * @param relationshipType The relationship type
+   * @param itemType         The item type
+   */
+  shouldDisplayBothRelationshipSides(relationshipType: RelationshipType, itemType: ItemType): Observable<boolean> {
     return this.getRelationshipLeftAndRightType(relationshipType).pipe(
       map(([leftType, rightType]: [ItemType, ItemType]) => {
-        return leftType.id === itemType.id && rightType.id === itemType.id;
-      })
+        return leftType.id === itemType.id && rightType.id === itemType.id && relationshipType.leftwardType !== relationshipType.rightwardType;
+      }),
     );
   }
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
index e6c1aa25f7..ed7fb190f2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="bothItemsMatchType$ | async">
+<ng-container *ngIf="shouldDisplayBothRelationshipSides$ | async">
     <ds-edit-relationship-list
             [url]="url"
             [item]="item"
@@ -6,6 +6,7 @@
             [relationshipType]="relationshipType"
             [hasChanges]="hasChanges"
             [currentItemIsLeftItem$]="isLeftItem$"
+            class="d-block mb-4"
     ></ds-edit-relationship-list>
     <ds-edit-relationship-list
             [url]="url"
@@ -17,7 +18,7 @@
     ></ds-edit-relationship-list>
 </ng-container>
 
-<ng-container *ngIf="!(bothItemsMatchType$ | async)">
+<ng-container *ngIf="(shouldDisplayBothRelationshipSides$ | async) === false">
     <ds-edit-relationship-list
             [url]="url"
             [item]="item"
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
index 6c1aa9dafe..a6f0c9e0a5 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.spec.ts
@@ -8,6 +8,7 @@ import { RelationshipType } from '../../../../core/shared/item-relationships/rel
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { Item } from '../../../../core/shared/item.model';
+import { cold } from 'jasmine-marbles';
 
 describe('EditRelationshipListWrapperComponent', () => {
   let editItemRelationshipsService: EditItemRelationshipsService;
@@ -36,7 +37,7 @@ describe('EditRelationshipListWrapperComponent', () => {
 
     editItemRelationshipsService = jasmine.createSpyObj('editItemRelationshipsService', {
       isProvidedItemTypeLeftType: observableOf(true),
-      relationshipMatchesBothSameTypes: observableOf(false)
+      shouldDisplayBothRelationshipSides: observableOf(false),
     });
 
 
@@ -69,10 +70,10 @@ describe('EditRelationshipListWrapperComponent', () => {
     });
     it('should set currentItemIsLeftItem$ and bothItemsMatchType$  based on the provided relationshipType, itemType and item', () => {
       expect(editItemRelationshipsService.isProvidedItemTypeLeftType).toHaveBeenCalledWith(relationshipType, leftType, item);
-      expect(editItemRelationshipsService.relationshipMatchesBothSameTypes).toHaveBeenCalledWith(relationshipType, leftType);
+      expect(editItemRelationshipsService.shouldDisplayBothRelationshipSides).toHaveBeenCalledWith(relationshipType, leftType);
 
       expect(comp.currentItemIsLeftItem$.getValue()).toEqual(true);
-      expect(comp.bothItemsMatchType$.getValue()).toEqual(false);
+      expect(comp.shouldDisplayBothRelationshipSides$).toBeObservable(cold('(a|)', { a: false }));
     });
   });
 
@@ -96,7 +97,7 @@ describe('EditRelationshipListWrapperComponent', () => {
 
   describe('when the current item is both left and right', () => {
     it('should render two relationship list sections', () => {
-      (editItemRelationshipsService.relationshipMatchesBothSameTypes as jasmine.Spy).and.returnValue(observableOf(true));
+      (editItemRelationshipsService.shouldDisplayBothRelationshipSides as jasmine.Spy).and.returnValue(observableOf(true));
       comp.ngOnInit();
       fixture.detectChanges();
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
index 8231eaa542..8ff408cb79 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -56,7 +56,7 @@ export class EditRelationshipListWrapperComponent implements OnInit, OnDestroy {
 
   isRightItem$ = new BehaviorSubject(false);
 
-  bothItemsMatchType$: BehaviorSubject<boolean> = new BehaviorSubject(undefined);
+  shouldDisplayBothRelationshipSides$: Observable<boolean>;
 
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
@@ -76,10 +76,7 @@ export class EditRelationshipListWrapperComponent implements OnInit, OnDestroy {
         this.currentItemIsLeftItem$.next(nextValue);
       }));
 
-    this.subs.push(this.editItemRelationshipsService.relationshipMatchesBothSameTypes(this.relationshipType, this.itemType)
-      .subscribe((nextValue: boolean) => {
-        this.bothItemsMatchType$.next(nextValue);
-      }));
+    this.shouldDisplayBothRelationshipSides$ = this.editItemRelationshipsService.shouldDisplayBothRelationshipSides(this.relationshipType, this.itemType);
   }
 
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index cf0c610f8f..b56fc24ebb 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -90,13 +90,11 @@ export class EditRelationshipComponent implements OnChanges {
         getRemoteDataPayload(),
         filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
       );
-      this.relatedItem$ = observableCombineLatest(
+      this.relatedItem$ = observableCombineLatest([
         this.leftItem$,
         this.rightItem$,
-      ).pipe(
-        map((items: Item[]) =>
-          items.find((item) => item.uuid !== this.editItem.uuid)
-        )
+      ]).pipe(
+        map(([leftItem, rightItem]: [Item, Item]) => leftItem.uuid === this.editItem.uuid ? rightItem : leftItem),
       );
     } else {
       this.relatedItem$ = of(this.update.relatedItem);

From 31ab05f4fee355a6e4c4b52975e76b4179690f61 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 27 May 2024 00:27:25 +0200
Subject: [PATCH 0248/1286] 115434: Passed relatedEntityType parameter to
 byLabel endpoint

---
 .../edit-relationship-list.component.ts               | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 24ab999f62..a0b12e22ba 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -64,6 +64,7 @@ import { FieldChangeType } from '../../../../core/data/object-updates/field-chan
 import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
 import { itemLinksToFollow } from '../../../../shared/utils/relation-query.utils';
 import { EditItemRelationshipsService } from '../edit-item-relationships.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -464,15 +465,19 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       observableCombineLatest([
         currentPagination$,
         this.currentItemIsLeftItem$,
+        this.relatedEntityType$,
       ]).pipe(
-        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) => {
-          // get the relationships for the current item, relationshiptype and page
+        switchMap(([currentPagination, currentItemIsLeftItem, relatedEntityType]: [PaginationComponentOptions, boolean, ItemType]) => {
+          // get the relationships for the current page, item, relationship type and related entity type
           return this.relationshipService.getItemRelationshipsByLabel(
             this.item,
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage
+              currentPage: currentPagination.currentPage,
+              searchParams: [
+                new RequestParam('relatedEntityType', relatedEntityType.label),
+              ],
             },
             true,
             true,

From 66e1a2488b14c84b41486fabc77350f17d722b0d Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Fri, 7 Jun 2024 14:58:50 +0200
Subject: [PATCH 0249/1286] [DURACOM-273] fix markdown rendering applying
 before mathjax rendering

---
 src/app/core/shared/client-math.service.ts |  4 +--
 src/app/core/shared/math.service.spec.ts   |  4 +--
 src/app/core/shared/math.service.ts        |  2 +-
 src/app/core/shared/server-math.service.ts |  2 +-
 src/app/shared/utils/markdown.directive.ts | 42 +++++++++++++---------
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/app/core/shared/client-math.service.ts b/src/app/core/shared/client-math.service.ts
index 2fde521ba9..0630ec3246 100644
--- a/src/app/core/shared/client-math.service.ts
+++ b/src/app/core/shared/client-math.service.ts
@@ -31,7 +31,7 @@ export class ClientMathService extends MathService {
 
   protected mathJaxOptions = {
     tex: {
-      inlineMath: [['$', '$'], ['\\(', '\\)']],
+      inlineMath: [['$', '$'], ['$$', '$$'], ['\\(', '\\)']],
     },
     svg: {
       fontCache: 'global',
@@ -108,7 +108,7 @@ export class ClientMathService extends MathService {
    */
   render(element: HTMLElement) {
     if (environment.markdown.mathjax) {
-      this._window.nativeWindow.MathJax.typesetPromise([element]);
+      return (window as any).MathJax.typesetPromise([element]) as Promise<any>;
     }
   }
 }
diff --git a/src/app/core/shared/math.service.spec.ts b/src/app/core/shared/math.service.spec.ts
index cc0b2814f2..75d8bf1024 100644
--- a/src/app/core/shared/math.service.spec.ts
+++ b/src/app/core/shared/math.service.spec.ts
@@ -22,8 +22,8 @@ export class MockMathService extends MathService {
     return of(true);
   }
 
-  render(element: HTMLElement): void {
-    return;
+  render(element: HTMLElement): Promise<any> {
+    return Promise.resolve();
   }
 }
 
diff --git a/src/app/core/shared/math.service.ts b/src/app/core/shared/math.service.ts
index c06ce06220..909e039564 100644
--- a/src/app/core/shared/math.service.ts
+++ b/src/app/core/shared/math.service.ts
@@ -15,5 +15,5 @@ export abstract class MathService {
 
   protected abstract registerMathJaxAsync(config: MathJaxConfig): Promise<any>;
   abstract ready(): Observable<boolean>;
-  abstract render(element: HTMLElement): void;
+  abstract render(element: HTMLElement): Promise<any>;
 }
diff --git a/src/app/core/shared/server-math.service.ts b/src/app/core/shared/server-math.service.ts
index 75fa775fee..62070dbafc 100644
--- a/src/app/core/shared/server-math.service.ts
+++ b/src/app/core/shared/server-math.service.ts
@@ -47,6 +47,6 @@ export class ServerMathService extends MathService {
   }
 
   render(element: HTMLElement) {
-    return;
+    return Promise.resolve();
   }
 }
diff --git a/src/app/shared/utils/markdown.directive.ts b/src/app/shared/utils/markdown.directive.ts
index a38b079ffd..0540e25cc5 100644
--- a/src/app/shared/utils/markdown.directive.ts
+++ b/src/app/shared/utils/markdown.directive.ts
@@ -55,30 +55,40 @@ export class MarkdownDirective implements OnInit, OnDestroy {
 
   async render(value: string, forcePreview = false): Promise<SafeHtml> {
     if (isEmpty(value) || (!environment.markdown.enabled && !forcePreview)) {
-      return value;
+      this.el.innerHTML = value;
+      return;
+    } else {
+      if (environment.markdown.mathjax) {
+        this.renderMathjaxThenMarkdown(value);
+      } else {
+        this.renderMarkdown(value);
+      }
     }
+  }
+
+  private renderMathjaxThenMarkdown(value: string) {
+    const sanitized = this.sanitizer.sanitize(SecurityContext.HTML, value);
+    this.el.innerHTML = sanitized;
+    this.mathService.ready().pipe(
+      filter((ready) => ready),
+      take(1),
+      takeUntil(this.alive$),
+    ).subscribe(() => {
+      this.mathService.render(this.el)?.then(_ => {
+        this.renderMarkdown(this.el.innerHTML, true);
+      });
+    });
+  }
+
+  private async renderMarkdown(value: string, alreadySanitized = false) {
     const MarkdownIt = await this.markdownIt;
     const md = new MarkdownIt({
       html: true,
       linkify: true,
     });
 
-    const html = this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
+    const html = alreadySanitized ? md.render(value) : this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
     this.el.innerHTML = html;
-
-    if (environment.markdown.mathjax) {
-      this.renderMathjax();
-    }
-  }
-
-  private renderMathjax() {
-    this.mathService.ready().pipe(
-      filter((ready) => ready),
-      take(1),
-      takeUntil(this.alive$),
-    ).subscribe(() => {
-      this.mathService.render(this.el);
-    });
   }
 
   ngOnDestroy() {

From cc975bb0b517cd73adcc7a4eb5cd362ece936903 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 13 Jun 2024 13:07:51 +0200
Subject: [PATCH 0250/1286] add lint rule (use-lifecycle-interface)

---
 .eslintrc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4cc8c6dbc5..dc76a7dea3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -165,6 +165,7 @@
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
         "@angular-eslint/no-conflicting-lifecycle": "warn",
+        "@angular-eslint/use-lifecycle-interface": "error"
 
         "@typescript-eslint/no-inferrable-types":[
           "error",

From 3cedeffec93b41fce27ea432552b335b37a30894 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 13 Jun 2024 13:12:35 +0200
Subject: [PATCH 0251/1286] add missing comma

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

diff --git a/.eslintrc.json b/.eslintrc.json
index dc76a7dea3..5fb4c12171 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -165,7 +165,7 @@
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
         "@angular-eslint/no-conflicting-lifecycle": "warn",
-        "@angular-eslint/use-lifecycle-interface": "error"
+        "@angular-eslint/use-lifecycle-interface": "error",
 
         "@typescript-eslint/no-inferrable-types":[
           "error",

From 2d9ad8e5cf6f04805dc27e147708ae9367864935 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@hsu-hh.de>
Date: Thu, 13 Jun 2024 13:46:57 +0200
Subject: [PATCH 0252/1286] add missing imports of Angular lifecycle interfaces

---
 .../metadata-registry/metadata-registry.component.ts      | 7 +++++--
 .../filtered-collections.component.ts                     | 3 ++-
 .../filtered-items/filtered-items.component.ts            | 5 +++--
 .../core/submission/submission-duplicate-data.service.ts  | 8 ++++++--
 .../person/person-search-result-list-element.component.ts | 3 ++-
 .../recent-item-list/recent-item-list.component.ts        | 3 ++-
 .../edit-item-page/item-status/item-status.component.ts   | 3 ++-
 .../orcid-page/orcid-queue/orcid-queue.component.ts       | 3 ++-
 .../project-entry-import-modal.component.ts               | 3 ++-
 .../qa/source/quality-assurance-source.component.ts       | 4 +++-
 .../publication-claim/publication-claim.component.ts      | 3 ++-
 .../profile-page-security-form.component.ts               | 3 ++-
 .../ds-dynamic-form-control-container.component.ts        | 5 ++++-
 .../models/onebox/dynamic-onebox.component.ts             | 3 ++-
 .../shared/form/number-picker/number-picker.component.ts  | 3 ++-
 .../item/item-search-result-list-element.component.ts     | 7 +++++--
 .../collection/submission-form-collection.component.ts    | 3 ++-
 .../submission-upload-files.component.ts                  | 3 ++-
 .../sections/duplicates/section-duplicates.component.ts   | 3 ++-
 19 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index a148559bd2..be989d49e2 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -4,7 +4,10 @@ import {
   NgForOf,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+} from '@angular/core';
 import {
   Router,
   RouterLink,
@@ -60,7 +63,7 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
  * A component used for managing all existing metadata schemas within the repository.
  * The admin can create, edit or delete metadata schemas here.
  */
-export class MetadataRegistryComponent {
+export class MetadataRegistryComponent implements OnDestroy {
 
   /**
    * A list of all the current metadata schemas within the repository
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index b4bebfc924..e1f54bd8d3 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -4,6 +4,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  OnInit,
   ViewChild,
 } from '@angular/core';
 import {
@@ -40,7 +41,7 @@ import { FilteredCollections } from './filtered-collections.model';
   ],
   standalone: true,
 })
-export class FilteredCollectionsComponent {
+export class FilteredCollectionsComponent implements OnInit {
 
   queryForm: FormGroup;
   results: FilteredCollections = new FilteredCollections();
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 9fd4643573..4cb93aa9be 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -5,6 +5,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  OnInit,
   ViewChild,
 } from '@angular/core';
 import {
@@ -66,7 +67,7 @@ import { QueryPredicate } from './query-predicate.model';
   ],
   standalone: true,
 })
-export class FilteredItemsComponent {
+export class FilteredItemsComponent implements OnInit {
 
   collections: OptionVO[];
   presetQueries: PresetQuery[];
@@ -90,7 +91,7 @@ export class FilteredItemsComponent {
     private formBuilder: FormBuilder,
     private restService: DspaceRestService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.loadCollections();
     this.loadPresetQueries();
     this.loadMetadataFields();
diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts
index 755fec05c2..b327342469 100644
--- a/src/app/core/submission/submission-duplicate-data.service.ts
+++ b/src/app/core/submission/submission-duplicate-data.service.ts
@@ -1,5 +1,8 @@
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model';
@@ -33,7 +36,8 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
  *
  */
 @Injectable({ providedIn: 'root' })
-export class SubmissionDuplicateDataService extends BaseDataService<Duplicate> implements SearchData<Duplicate> {
+export class SubmissionDuplicateDataService extends BaseDataService<Duplicate>
+  implements SearchData<Duplicate>, OnDestroy {
 
   /**
    * The ResponseParsingService constructor name
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index ac8bac2f13..86ead8b825 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -7,6 +7,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -36,7 +37,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
 /**
  * The component for displaying a list element for an item search result of the type Person
  */
-export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent implements OnInit {
 
   public constructor(
     protected truncatableService: TruncatableService,
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 351677fce4..65c1998b7a 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -10,6 +10,7 @@ import {
   Component,
   ElementRef,
   Inject,
+  OnDestroy,
   OnInit,
   PLATFORM_ID,
 } from '@angular/core';
@@ -62,7 +63,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   standalone: true,
   imports: [VarDirective, NgIf, NgClass, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
-export class RecentItemListComponent implements OnInit {
+export class RecentItemListComponent implements OnInit, OnDestroy {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
   paginationConfig: PaginationComponentOptions;
   sortConfig: SortOptions;
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index bbd7b99a97..1bb17dc77c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -7,6 +7,7 @@ import {
 import {
   ChangeDetectionStrategy,
   Component,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -79,7 +80,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 /**
  * Component for displaying an item's status
  */
-export class ItemStatusComponent implements OnInit {
+export class ItemStatusComponent implements OnInit, OnDestroy {
 
   /**
    * The item to display the status for
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 0f02d7083c..dfc7fac526 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import {
   Component,
   Input,
+  OnChanges,
   OnDestroy,
   OnInit,
   SimpleChanges,
@@ -56,7 +57,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
   ],
   standalone: true,
 })
-export class OrcidQueueComponent implements OnInit, OnDestroy {
+export class OrcidQueueComponent implements OnInit, OnDestroy, OnChanges {
 
   /**
    * The item for which showing the orcid settings
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4b31e2316a..b2d45916d2 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -6,6 +6,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -110,7 +111,7 @@ export interface QualityAssuranceEventData {
  * Component to display a modal window for linking a project to an Quality Assurance event
  * Shows information about the selected project and a selectable list.
  */
-export class ProjectEntryImportModalComponent implements OnInit {
+export class ProjectEntryImportModalComponent implements OnInit, OnDestroy {
   /**
    * The external source entry
    */
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index a918b8c3b6..c7457c5d2b 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -5,7 +5,9 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewInit,
   Component,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -40,7 +42,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   standalone: true,
   imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
-export class QualityAssuranceSourceComponent implements OnInit {
+export class QualityAssuranceSourceComponent implements OnDestroy, OnInit, AfterViewInit {
 
   /**
    * The pagination system configuration for HTML listing.
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 136466b4ac..952bf9c75b 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Input,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -50,7 +51,7 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
   ],
   standalone: true,
 })
-export class PublicationClaimComponent implements OnInit {
+export class PublicationClaimComponent implements OnDestroy, OnInit {
 
   /**
    * The source for which to list targets
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 7c0bf9ea2d..0fdee2080b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -44,7 +45,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
  * Component for a user to edit their security information
  * Displays a form containing a password field and a confirmation of the password
  */
-export class ProfilePageSecurityFormComponent implements OnInit {
+export class ProfilePageSecurityFormComponent implements OnDestroy, OnInit {
 
   /**
    * Emits the validity of the password
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 595a1304a0..a373c53984 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -6,11 +6,13 @@ import {
   NgTemplateOutlet,
 } from '@angular/common';
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   ComponentFactoryResolver,
   ContentChildren,
+  DoCheck,
   EventEmitter,
   Inject,
   Input,
@@ -143,7 +145,8 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
   ],
   standalone: true,
 })
-export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
+export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent
+  implements OnInit, OnChanges, OnDestroy, AfterViewInit, DoCheck {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
   // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 23cec6b502..22f8dce244 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -9,6 +9,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
   ViewChild,
@@ -92,7 +93,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
   ],
   standalone: true,
 })
-export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnInit {
+export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
 
   @Input() group: UntypedFormGroup;
   @Input() model: DynamicOneboxModel;
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index e268919101..b097236659 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -4,6 +4,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnChanges,
   OnInit,
   Output,
   SimpleChanges,
@@ -36,7 +37,7 @@ import { isEmpty } from '../../empty.util';
   standalone: true,
 })
 
-export class NumberPickerComponent implements OnInit, ControlValueAccessor {
+export class NumberPickerComponent implements OnChanges, OnInit, ControlValueAccessor {
   @Input() id: string;
   @Input() step: number;
   @Input() min: number;
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 8afafa2b86..26a1d7e655 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -4,7 +4,10 @@ import {
   NgFor,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Item } from '../../../../../../core/shared/item.model';
@@ -30,7 +33,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
 /**
  * The component for displaying a list element for an item search result of the type Publication
  */
-export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> implements OnInit {
   /**
    * Route to the item's page
    */
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index dcbcfd9cb3..2aec1c9e30 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -5,6 +5,7 @@ import {
   EventEmitter,
   Input,
   OnChanges,
+  OnDestroy,
   OnInit,
   Output,
   SimpleChanges,
@@ -58,7 +59,7 @@ import { SubmissionService } from '../../submission.service';
     ThemedCollectionDropdownComponent,
   ],
 })
-export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
+export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges, OnInit {
 
   /**
    * The current collection id this submission belonging to
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index e694a868ca..3632ec6760 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   Input,
   OnChanges,
+  OnDestroy,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -43,7 +44,7 @@ import parseSectionErrors from '../../utils/parseSectionErrors';
   ],
   standalone: true,
 })
-export class SubmissionUploadFilesComponent implements OnChanges {
+export class SubmissionUploadFilesComponent implements OnChanges, OnDestroy {
 
   /**
    * The collection id this submission belonging to
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
index d90a0ca85a..885511ca52 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import {
   TranslateModule,
@@ -48,7 +49,7 @@ import { SectionsService } from '../sections.service';
   standalone: true,
 })
 
-export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
+export class SubmissionSectionDuplicatesComponent extends SectionModelComponent implements OnInit {
   protected readonly Metadata = Metadata;
   /**
    * The Alert categories.

From 53fb9f85fc7f4d6a7ea4eb2e0363e9b91a82aa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eike=20Martin=20L=C3=B6hden?=
 <eike.loehden@ub.uni-marburg.de>
Date: Thu, 6 Jun 2024 09:42:41 +0200
Subject: [PATCH 0253/1286] Change key-listener to keydown in order to work on
 chrome browsers.

(cherry picked from commit a4e9a9a4b85cd2219281d00028251b051f4cc855)
---
 src/app/shared/menu/menu-item/link-menu-item.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 58a3cec10c..71eeda2e68 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -6,6 +6,6 @@
    [queryParams]="item.queryParams"
    (click)="$event.stopPropagation()"
    (keyup.space)="navigate($event)"
-   (keyup.enter)="navigate($event)"
+   (keydown.enter)="navigate($event)"
    href="javascript:void(0);"
 >{{item.text | translate}}</a>

From 36266dffefc5cf7e29525aa32dc34e5b3d8170d8 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Tue, 4 Jun 2024 17:23:57 -0300
Subject: [PATCH 0254/1286] Melhorando acessibilidade do componente ds-loading

(cherry picked from commit e96d64a622ff1fd575ffeb1e80c6fe92a25902ac)
---
 src/app/shared/loading/loading.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index bb407098d7..e391cedbea 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="!spinner">
-  <label *ngIf="showMessage && message">{{ message }}</label>
-  <div class="loader">
+  <label *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
+  <div class="loader" aria-hidden="true">
     <span class="l-1"></span>
     <span class="l-2"></span>
     <span class="l-3"></span>
@@ -13,6 +13,6 @@
     <span class="l-10"></span>
   </div>
 </div>
-<div *ngIf='spinner' class="spinner spinner-border" role="status">
+<div *ngIf='spinner' class="spinner spinner-border" role="status" aria-live="polite">
   <span class="sr-only">{{ message }}</span>
 </div>

From 983e955398f7c741e9174a5ed7fb59b8a3013434 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Tue, 21 May 2024 17:08:40 -0300
Subject: [PATCH 0255/1286] DSpace #1176 - Browse by Author serious issues

---
 .../starts-with/text/starts-with-text.component.html       | 7 +++++--
 .../starts-with/text/starts-with-text.component.scss       | 4 ++++
 src/assets/i18n/en.json5                                   | 1 +
 src/assets/i18n/es.json5                                   | 2 ++
 src/assets/i18n/pt-BR.json5                                | 5 ++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/starts-with/text/starts-with-text.component.html b/src/app/shared/starts-with/text/starts-with-text.component.html
index 926a2f932d..edbd1f1960 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/app/shared/starts-with/text/starts-with-text.component.html
@@ -1,10 +1,13 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
+<div class="mb-3">
   <div class="row">
-    <div class="form-group input-group col-8 col-sm-12 col-md-6">
-      <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.startsWith.type_text' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
+    <div class="form-group input-group col-sm-12 col-md-6 col-auto">
+      <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.search-form.placeholder' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
       <span class="input-group-append">
         <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
       </span>
     </div>
   </div>
+  <small class="text-muted">{{'browse.startsWith.type_text' | translate}}</small>
+</div>
 </form>
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.scss b/src/app/shared/starts-with/text/starts-with-text.component.scss
index 4576be4b28..619da40956 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.scss
+++ b/src/app/shared/starts-with/text/starts-with-text.component.scss
@@ -3,3 +3,7 @@
   background-color: var(--bs-input-bg);
   color: var(--bs-input-color);
 }
+
+.form-group {
+  margin-bottom: 0;
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 7fb383e3f0..36d08ed27a 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5366,4 +5366,5 @@
 
   "process.overview.unknown.user": "Unknown",
 
+  "browse.search-form.placeholder": "Search the repository",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 2140114d43..4850f69155 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7828,6 +7828,8 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
+//"browse.search-form.placeholder": "Search the repository",
+"browse.search-form.placeholder": "Buscar en el repositorio",
 
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index e85494ebec..4ebf3b8110 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1290,7 +1290,7 @@
   "browse.startsWith.type_date.label": "Ou digite na data (year-month) e clique no botão de Ir",
 
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
-  "browse.startsWith.type_text": "Filtrar resultados informando as primeiras letras:",
+  "browse.startsWith.type_text": "Filtrar resultados informando as primeiras letras",
 
   // "browse.startsWith.input": "Filter", (Auto-Translated)
   "browse.startsWith.input": "Filtro",
@@ -7854,4 +7854,7 @@
 
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied", (Auto-Translated)
   "access-control-option-end-date-note": "Selecione a data até a qual a condição de acesso relacionada é aplicada",
+
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar no repositório",
 }

From ebb846f2a9e9c4799f1b38173ab46004a76ed76e Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 22 May 2024 09:12:54 -0300
Subject: [PATCH 0256/1286] Correcting a formatting error

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

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 4850f69155..8295d9119f 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7828,8 +7828,8 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-//"browse.search-form.placeholder": "Search the repository",
-"browse.search-form.placeholder": "Buscar en el repositorio",
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar en el repositorio",
 
 
 }

From 1444271e69884f7ba1605034a7cd3cfc8b489dd3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 14 Jun 2024 22:56:57 +0200
Subject: [PATCH 0257/1286] 115046: Fixed edit item bitstream tab buttons not
 updating correctly & removed method calls retuning observables in edit
 collection's content source tab

---
 .../collection-source.component.html          | 18 +++---
 .../collection-source.component.ts            | 55 ++++++++-----------
 .../abstract-item-update.component.ts         | 10 +---
 .../item-bitstreams.component.ts              |  6 +-
 .../abstract-trackable.component.spec.ts      |  7 ++-
 .../trackable/abstract-trackable.component.ts | 16 +++++-
 6 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index d7b0d0c475..825bcce658 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,18 +1,18 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
-        <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+        <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+                [disabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
         </button>
-        <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+        <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() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -44,19 +44,19 @@
     <div class="row">
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
-                <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                        [disabled]="!(hasChanges() | async)"
+                <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
+                        [disabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
                 </button>
-                <button class="btn btn-warning" *ngIf="isReinstatable() | async"
+                <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() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -66,7 +66,7 @@
     </div>
 </div>
 <ds-collection-source-controls
-        [isEnabled]="!(hasChanges()|async)"
+        [isEnabled]="(hasChanges$ | async) !== true"
         [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
         [collection]="(collectionRD$ |async)?.payload"
 >
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 2d1308cc83..95295386c0 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -204,11 +204,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   formGroup: UntypedFormGroup;
 
-  /**
-   * Subscription to update the current form
-   */
-  updateSub: Subscription;
-
   /**
    * The content harvesting type used when harvesting is disabled
    */
@@ -228,28 +223,29 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   displayedNotifications: INotification[] = [];
 
-  public constructor(public objectUpdatesService: ObjectUpdatesService,
-                     public notificationsService: NotificationsService,
-                     protected location: Location,
-                     protected formService: DynamicFormService,
-                     protected translate: TranslateService,
-                     protected route: ActivatedRoute,
-                     protected router: Router,
-                     protected collectionService: CollectionDataService,
-                     protected requestService: RequestService) {
-    super(objectUpdatesService, notificationsService, translate);
+  subs: Subscription[] = [];
+
+  public constructor(
+    public objectUpdatesService: ObjectUpdatesService,
+    public notificationsService: NotificationsService,
+    public translateService: TranslateService,
+    public router: Router,
+    protected location: Location,
+    protected formService: DynamicFormService,
+    protected route: ActivatedRoute,
+    protected collectionService: CollectionDataService,
+    protected requestService: RequestService,
+  ) {
+    super(objectUpdatesService, notificationsService, translateService, router);
   }
 
   /**
    * Initialize properties to setup the Field Update and Form
    */
   ngOnInit(): void {
+    super.ngOnInit();
     this.notificationsPrefix = 'collection.edit.tabs.source.notifications.';
     this.discardTimeOut = environment.collection.edit.undoTimeout;
-    this.url = this.router.url;
-    if (this.url.indexOf('?') > 0) {
-      this.url = this.url.substr(0, this.url.indexOf('?'));
-    }
     this.formGroup = this.formService.createFormGroup(this.formModel);
     this.collectionRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
 
@@ -263,10 +259,9 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     });
 
     this.updateFieldTranslations();
-    this.translate.onLangChange
-      .subscribe(() => {
-        this.updateFieldTranslations();
-      });
+    this.subs.push(this.translateService.onLangChange.subscribe(() => {
+      this.updateFieldTranslations();
+    }));
   }
 
   /**
@@ -281,7 +276,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe(
       map((updates: FieldUpdates) => updates[initialContentSource.uuid])
     );
-    this.updateSub = this.update$.subscribe((update: FieldUpdate) => {
+    this.subs.push(this.update$.subscribe((update: FieldUpdate) => {
       if (update) {
         const field = update.field as ContentSource;
         let configId;
@@ -308,7 +303,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
         }
         this.contentSource.metadataConfigId = configId;
       }
-    });
+    }));
   }
 
   /**
@@ -342,18 +337,18 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    * @param fieldModel
    */
   private updateFieldTranslation(fieldModel: DynamicFormControlModel) {
-    fieldModel.label = this.translate.instant(this.LABEL_KEY_PREFIX + fieldModel.id);
+    fieldModel.label = this.translateService.instant(this.LABEL_KEY_PREFIX + fieldModel.id);
     if (isNotEmpty(fieldModel.validators)) {
       fieldModel.errorMessages = {};
       Object.keys(fieldModel.validators).forEach((key) => {
-        fieldModel.errorMessages[key] = this.translate.instant(this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
+        fieldModel.errorMessages[key] = this.translateService.instant(this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
       });
     }
     if (fieldModel instanceof DynamicOptionControlModel) {
       if (isNotEmpty(fieldModel.options)) {
         fieldModel.options.forEach((option) => {
           if (hasNoValue(option.label)) {
-            option.label = this.translate.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value);
+            option.label = this.translateService.instant(this.OPTIONS_KEY_PREFIX + fieldModel.id + '.' + option.value);
           }
         });
       }
@@ -470,8 +465,6 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    * Make sure open subscriptions are closed
    */
   ngOnDestroy(): void {
-    if (this.updateSub) {
-      this.updateSub.unsubscribe();
-    }
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
   }
 }
diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 964405dfdd..4c73797814 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -35,10 +35,6 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   updates$: Observable<FieldUpdates>;
 
-  hasChanges$: Observable<boolean>;
-
-  isReinstatable$: Observable<boolean>;
-
   /**
    * Route to the item's page
    */
@@ -58,7 +54,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     public translateService: TranslateService,
     public route: ActivatedRoute
   ) {
-    super(objectUpdatesService, notificationsService, translateService);
+    super(objectUpdatesService, notificationsService, translateService, router);
   }
 
   /**
@@ -83,11 +79,9 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
         this.setItem(rd.payload);
       });
     }
+    super.ngOnInit();
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.url = this.router.url.split('?')[0];
-    this.hasChanges$ = this.hasChanges();
-    this.isReinstatable$ = this.isReinstatable();
     this.hasChanges().pipe(first()).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index ee53bd919c..a9aad655e9 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { filter, map, switchMap, take } from 'rxjs/operators';
-import { Observable, Subscription, zip as observableZip } from 'rxjs';
+import { Observable, Subscription, zip as observableZip, combineLatest } from 'rxjs';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -222,7 +222,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   isReinstatable(): Observable<boolean> {
     return this.bundles$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.isReinstatable(bundle.self)))),
+      switchMap((bundles: Bundle[]) => combineLatest(bundles.map((bundle: Bundle) => this.objectUpdatesService.isReinstatable(bundle.self)))),
       map((reinstatable: boolean[]) => reinstatable.includes(true))
     );
   }
@@ -232,7 +232,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   hasChanges(): Observable<boolean> {
     return this.bundles$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) => this.objectUpdatesService.hasUpdates(bundle.self)))),
+      switchMap((bundles: Bundle[]) => combineLatest(bundles.map((bundle: Bundle) => this.objectUpdatesService.hasUpdates(bundle.self)))),
       map((hasChanges: boolean[]) => hasChanges.includes(true))
     );
   }
diff --git a/src/app/shared/trackable/abstract-trackable.component.spec.ts b/src/app/shared/trackable/abstract-trackable.component.spec.ts
index c538f074c5..ad2d821ada 100644
--- a/src/app/shared/trackable/abstract-trackable.component.spec.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.spec.ts
@@ -9,6 +9,8 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestScheduler } from 'rxjs/testing';
 import { getTestScheduler } from 'jasmine-marbles';
+import { RouterStub } from '../testing/router.stub';
+import { Router } from '@angular/router';
 
 describe('AbstractTrackableComponent', () => {
   let comp: AbstractTrackableComponent;
@@ -27,6 +29,7 @@ describe('AbstractTrackableComponent', () => {
       success: successNotification
     }
   );
+  let router: RouterStub;
 
   const url = 'http://test-url.com/test-url';
 
@@ -42,6 +45,8 @@ describe('AbstractTrackableComponent', () => {
         isValidPage: observableOf(true)
       }
     );
+    router = new RouterStub();
+    router.url = url;
 
     scheduler = getTestScheduler();
 
@@ -51,6 +56,7 @@ describe('AbstractTrackableComponent', () => {
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
         { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
@@ -60,7 +66,6 @@ describe('AbstractTrackableComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(AbstractTrackableComponent);
     comp = fixture.componentInstance;
-    comp.url = url;
 
     fixture.detectChanges();
   });
diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts
index e1a99d90b9..396d743855 100644
--- a/src/app/shared/trackable/abstract-trackable.component.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.ts
@@ -2,7 +2,8 @@ import { ObjectUpdatesService } from '../../core/data/object-updates/object-upda
 import { NotificationsService } from '../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 /**
  * Abstract Component that is able to track changes made in the inheriting component using the ObjectUpdateService
@@ -11,7 +12,7 @@ import { Component } from '@angular/core';
   selector: 'ds-abstract-trackable',
   template: ''
 })
-export class AbstractTrackableComponent {
+export class AbstractTrackableComponent implements OnInit {
 
   /**
    * The time span for being able to undo discarding changes
@@ -21,14 +22,25 @@ export class AbstractTrackableComponent {
   public url: string;
   public notificationsPrefix = 'static-pages.form.notification';
 
+  hasChanges$: Observable<boolean>;
+
+  isReinstatable$: Observable<boolean>;
+
   constructor(
     public objectUpdatesService: ObjectUpdatesService,
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
+    public router: Router,
   ) {
 
   }
 
+  ngOnInit(): void {
+    this.url = this.router.url.split('?')[0];
+    this.hasChanges$ = this.hasChanges();
+    this.isReinstatable$ = this.isReinstatable();
+  }
+
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this

From 7b554a48f965575bc9eb3dd00dedb45412e86870 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 17 Jun 2024 10:41:08 -0500
Subject: [PATCH 0258/1286] Bump braces from 3.0.2 to 3.0.3

---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 712690662b..f778bd56be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3729,11 +3729,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
@@ -5884,10 +5884,10 @@ filesize@^6.1.0:
   resolved "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"
   integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 

From 69eedf40150bd064f5899523d6b6743b73ef0266 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 17 Jun 2024 13:04:59 -0500
Subject: [PATCH 0259/1286] Bump tar to 6.2.1

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f778bd56be..1e3a29352e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11135,13 +11135,13 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"

From f4eb8876c241b4043eb76bf7a63e247223375ce4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 17 Jun 2024 14:37:28 -0500
Subject: [PATCH 0260/1286] Bump express from 4.18.2 to 4.19.2

---
 yarn.lock | 80 +++++++++++++------------------------------------------
 1 file changed, 19 insertions(+), 61 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1e3a29352e..1cc414b2e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3652,24 +3652,6 @@ bluebird@^3.7.2:
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.1, body-parser@^1.19.0:
-  version "1.20.1"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 body-parser@1.20.2:
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
@@ -3688,6 +3670,24 @@ body-parser@1.20.2:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@^1.19.0:
+  version "1.20.1"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 bonjour-service@^1.0.11:
   version "1.1.1"
   resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
@@ -4359,11 +4359,6 @@ cookie@0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
 cookie@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
@@ -5668,44 +5663,7 @@ express-static-gzip@^2.1.7:
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.3, express@^4.18.2:
-  version "4.18.2"
-  resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.1"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.5.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.2.0"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-express@^4.19.2:
+express@^4.17.3, express@^4.18.2, express@^4.19.2:
   version "4.19.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
   integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==

From 8990a2d1327cde46563e962c252e70a97304be7b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 17 Jun 2024 15:03:05 -0500
Subject: [PATCH 0261/1286] Bump postcss to 8.4.38

---
 yarn.lock | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1e3a29352e..b2b170efff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8433,11 +8433,16 @@ mute-stream@0.0.8:
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.4, nanoid@^3.3.6:
+nanoid@^3.3.4:
   version "3.3.6"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+
 natural-compare-lite@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
@@ -9527,7 +9532,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
 
 postcss@8.4.21:
   version "8.4.21"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
   integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
   dependencies:
     nanoid "^3.3.4"
@@ -9552,13 +9557,13 @@ postcss@^7.0.14:
     source-map "^0.6.1"
 
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
-    nanoid "^3.3.6"
+    nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -10804,6 +10809,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+
 source-map-loader@4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz"

From 8615c70ccc13a794bb7e9251611bf59400204ba0 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 17 Jun 2024 16:21:54 -0500
Subject: [PATCH 0262/1286] Bump ws from 7.5.9 to 7.5.10

---
 yarn.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1cc414b2e7..566eec3230 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12112,18 +12112,18 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^7.3.1, ws@^7.4.6:
-  version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.11.0, ws@^8.13.0, ws@^8.4.2:
-  version "8.13.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 ws@~8.11.0:
   version "8.11.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
   integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 xhr2@^0.2.0:

From 2d881c962139f55652bae9fb20a2d0358edfb673 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Sat, 8 Jun 2024 08:34:43 +0300
Subject: [PATCH 0263/1286] =?UTF-8?q?src/assets/i18n:=20CrossRef=20?=
 =?UTF-8?q?=E2=86=92=20Crossref?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As part of a rebranding in 2015 Crossref started stylizing their
name as "Crossref" instead of "CrossRef".

See: https://www.crossref.org/blog/the-logo-has-landed/
---
 src/assets/i18n/ar.json5     |  4 ++--
 src/assets/i18n/ca.json5     |  4 ++--
 src/assets/i18n/cs.json5     | 12 ++++++------
 src/assets/i18n/el.json5     |  2 +-
 src/assets/i18n/en.json5     |  2 +-
 src/assets/i18n/es.json5     |  4 ++--
 src/assets/i18n/fi.json5     |  4 ++--
 src/assets/i18n/fr.json5     |  4 ++--
 src/assets/i18n/hi.json5     |  2 +-
 src/assets/i18n/hu.json5     |  4 ++--
 src/assets/i18n/it.json5     |  4 ++--
 src/assets/i18n/kk.json5     |  4 ++--
 src/assets/i18n/pl.json5     |  2 +-
 src/assets/i18n/pt-BR.json5  |  4 ++--
 src/assets/i18n/pt-PT.json5  |  6 +++---
 src/assets/i18n/sr-cyr.json5 |  2 +-
 src/assets/i18n/sr-lat.json5 |  2 +-
 src/assets/i18n/vi.json5     |  2 +-
 18 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index ba0a33c520..0e15293e0a 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -4362,8 +4362,8 @@
   // "item.preview.organization.foundingDate": "Founding Date",
   "item.preview.organization.foundingDate": "تاريخ التأسيس",
 
-  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
-  "item.preview.organization.identifier.crossrefid": "CrossRef معرف",
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "Crossref معرف",
 
   // "item.preview.organization.identifier.isni": "ISNI",
   "item.preview.organization.identifier.isni": "ISNI",
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index 20f838bf59..1e8290c8ae 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -5648,8 +5648,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 36765cf77f..0b4168cca9 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4481,9 +4481,9 @@
   // TODO New key - Add a translation
   "item.preview.organization.foundingDate": "Founding Date",
 
-  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
   // TODO New key - Add a translation
-  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "Crossref ID",
 
   // "item.preview.organization.identifier.isni": "ISNI",
   // TODO New key - Add a translation
@@ -7616,8 +7616,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
@@ -7972,9 +7972,9 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
   // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index 19aed4f908..8bb7388296 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -1885,7 +1885,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.epo": "Ευρωπαϊκό Γραφείο Διπλωμάτων Ευρεσιτεχνίας (EPO)",
   "submission.import-external.source.lcname": "Βιβλιοθήκη Ονομάτων του Κογκρέσου (Library of Congress Names)",
   "submission.import-external.source.loading": "Φόρτωση ...",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 36d08ed27a..0a1804fa5c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4106,7 +4106,7 @@
 
   "submission.import-external.source.cinii": "CiNii",
 
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   "submission.import-external.source.datacite": "DataCite",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 8295d9119f..3bc98a9502 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -5971,8 +5971,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index fc40952e58..a87cdada70 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -5925,8 +5925,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 92b865d157..a9b545fbce 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -5208,8 +5208,8 @@
   // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
-  "submission.import-external.source.crossref": "CrossRef (DOI)",
+  // "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref (DOI)",
 
   //"submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite (DOI)",
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index ce9a93be89..77b4929cc4 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -3815,7 +3815,7 @@
 
   "submission.import-external.source.cinii": "CiNii",
 
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   "submission.import-external.source.epo": "यूरोपीय पेटेंट कार्यालय",
 
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index af451153eb..7f939a071e 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -6584,9 +6584,9 @@
   // TODO New key - Add a translation
   "submission.import-external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "CrossRef",
+  // "submission.import-external.source.crossref": "Crossref",
   // TODO New key - Add a translation
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   // TODO New key - Add a translation
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index 8c2410acb1..0dd3b31983 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -6064,8 +6064,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 0946a57d34..1a3829847f 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -5583,8 +5583,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index a3a01d5011..12ffae66bb 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -1726,7 +1726,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.loading": "ładowanie...",
   "submission.import-external.source.sherpaJournal": "Czasopisma w SHERPA",
   "submission.import-external.source.sherpaJournalIssn": "Czasopisma w SHERPA wg ISSN",
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 4ebf3b8110..aae51b3671 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -5998,8 +5998,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite", (Auto-Translated)
   "submission.import-external.source.datacite": "DataCite",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index b2c48b0f9a..f00e1142d2 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -6086,8 +6086,8 @@
   // "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.crossref": "Crossref",
+  "submission.import-external.source.crossref": "Crossref",
 
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
@@ -7728,7 +7728,7 @@
   "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "O endereço da organização a enviar requer um país ISO 3166 válido de 2 dígitos",
 
   // "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": "É necessário um identificador para desambiguar as organizações. Os identificadores suportados são os identificadores GRID, RINGGOLD, Legal Entity Identity (LEIs) e Crossref Funder Registry (CrossRef)",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "É necessário um identificador para desambiguar as organizações. Os identificadores suportados são os identificadores GRID, RINGGOLD, Legal Entity Identity (LEIs) e Crossref Funder Registry (Crossref)",
 
   // "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": "Os identificadores da organização requerem um valor",
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
index 6dd1b48a1c..548343ed61 100644
--- a/src/assets/i18n/sr-cyr.json5
+++ b/src/assets/i18n/sr-cyr.json5
@@ -1997,7 +1997,7 @@
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.ads": "NASA/ADS",
   "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.scielo": "SciELO",
   "submission.import-external.source.scopus": "Scopus",
diff --git a/src/assets/i18n/sr-lat.json5 b/src/assets/i18n/sr-lat.json5
index 48376ee6d9..38faa7aa18 100644
--- a/src/assets/i18n/sr-lat.json5
+++ b/src/assets/i18n/sr-lat.json5
@@ -1997,7 +1997,7 @@
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.ads": "NASA/ADS",
   "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.scielo": "SciELO",
   "submission.import-external.source.scopus": "Scopus",
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
index 278f560e8b..4ebe2c05d1 100644
--- a/src/assets/i18n/vi.json5
+++ b/src/assets/i18n/vi.json5
@@ -2029,7 +2029,7 @@
   "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.cinii": "CiNii",
-  "submission.import-external.source.crossref": "CrossRef",
+  "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.datacite": "submission.import-external.source.datacite",
   "submission.import-external.source.epo": "Văn phòng Bằng sáng chế Châu Âu (EPO)",
   "submission.import-external.source.lcname": "Tên Thư viện Quốc hội",

From 4eacdfb113a149103fb9c0281cac253240607f3d Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Wed, 19 Jun 2024 13:11:40 +0200
Subject: [PATCH 0264/1286] [DURACOM-282] fix issue with removing duplicated
 json patch operations, which in some case changed the order in the queue

---
 .../json-patch-operations.reducer.spec.ts     | 380 ++++++++++++++++++
 .../json-patch-operations.reducer.ts          |  10 +-
 2 files changed, 387 insertions(+), 3 deletions(-)

diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 34a68a8801..7af2f1377f 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -339,4 +339,384 @@ describe('jsonPatchOperationsReducer test suite', () => {
     });
   });
 
+  describe('dedupeOperationEntries', () => {
+    it('should not remove duplicated keys if operations are not sequential', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024-06',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  operation: {
+                    op: 'replace',
+                    path: '/sections/publicationStep/dc.date.issued/0',
+                    value: {
+                      value: '2023-06-19',
+                      language: null,
+                      authority: null,
+                      display: '2023-06-19',
+                      confidence: -1,
+                      place: 0,
+                      otherInformation: null,
+                    },
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-19',
+          language: null,
+          authority: null,
+          display: '2024-06-19',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06',
+                'language': null,
+                'authority': null,
+                'display': '2024-06',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'replace',
+            'path': '/sections/publicationStep/dc.date.issued/0',
+            'value': {
+              'value': '2023-06-19',
+              'language': null,
+              'authority': null,
+              'display': '2023-06-19',
+              'confidence': -1,
+              'place': 0,
+              'otherInformation': null,
+            },
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-19',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-19',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+
+    it('should remove duplicated keys if operations are sequential', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024-06',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  operation: {
+                    op: 'replace',
+                    path: '/sections/publicationStep/dc.date.issued/0',
+                    value: {
+                      value: '2023-06-19',
+                      language: null,
+                      authority: null,
+                      display: '2023-06-19',
+                      confidence: -1,
+                      place: 0,
+                      otherInformation: null,
+                    },
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06-19',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06-19',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-20',
+          language: null,
+          authority: null,
+          display: '2024-06-20',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06',
+                'language': null,
+                'authority': null,
+                'display': '2024-06',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'replace',
+            'path': '/sections/publicationStep/dc.date.issued/0',
+            'value': {
+              'value': '2023-06-19',
+              'language': null,
+              'authority': null,
+              'display': '2023-06-19',
+              'confidence': -1,
+              'place': 0,
+              'otherInformation': null,
+            },
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-20',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-20',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+
+    it('should remove duplicated keys if all operations have same key', () => {
+      initState = {
+        sections: {
+          children: {
+            publicationStep: {
+              body: [
+                {
+                  operation: {
+                    op: 'add',
+                    path: '/sections/publicationStep/dc.date.issued',
+                    value: [
+                      {
+                        value: '2024',
+                        language: null,
+                        authority: null,
+                        display: '2024-06',
+                        confidence: -1,
+                        place: 0,
+                        otherInformation: null,
+                      },
+                    ],
+                  },
+                  timeCompleted: timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+                {
+                  'operation': {
+                    'op': 'add',
+                    'path': '/sections/publicationStep/dc.date.issued',
+                    'value': [
+                      {
+                        'value': '2024-06-19',
+                        'language': null,
+                        'authority': null,
+                        'display': '2024-06-19',
+                        'confidence': -1,
+                        'place': 0,
+                        'otherInformation': null,
+                      },
+                    ],
+                  },
+                  'timeCompleted': timestampBeforeStart,
+                },
+              ],
+            } as JsonPatchOperationsEntry,
+          },
+          transactionStartTime: null,
+          commitPending: false,
+        } as JsonPatchOperationsResourceEntry,
+      };
+
+      const value = [
+        {
+          value: '2024-06-20',
+          language: null,
+          authority: null,
+          display: '2024-06-20',
+          confidence: -1,
+          place: 0,
+          otherInformation: null,
+        },
+      ];
+      const action = new NewPatchAddOperationAction(
+        'sections',
+        'publicationStep',
+        '/sections/publicationStep/dc.date.issued',
+        value);
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      const expectedBody: any =  [
+        {
+          'operation': {
+            'op': 'add',
+            'path': '/sections/publicationStep/dc.date.issued',
+            'value': [
+              {
+                'value': '2024-06-20',
+                'language': null,
+                'authority': null,
+                'display': '2024-06-20',
+                'confidence': -1,
+                'place': 0,
+                'otherInformation': null,
+              },
+            ],
+          },
+          'timeCompleted': timestampBeforeStart,
+        },
+      ];
+
+      expect(newState.sections.children.publicationStep.body).toEqual(expectedBody);
+
+    });
+  });
 });
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 86edd339e8..9687bdf21d 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -361,14 +361,18 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
  * @returns deduped JSON patch operation object entries
  */
 function dedupeOperationEntries(body: JsonPatchOperationObject[]): JsonPatchOperationObject[] {
-  const ops = new Map<string, any>();
+  const ops = new Map<string, number>();
   for (let i = body.length - 1; i >= 0; i--) {
     const patch = body[i].operation;
     const key = `${patch.op}-${patch.path}`;
     if (!ops.has(key)) {
-      ops.set(key, patch);
+      ops.set(key, i);
     } else {
-      body.splice(i, 1);
+      const entry = ops.get(key);
+      if (entry - 1 === i) {
+        body.splice(i, 1);
+        ops.set(key, i);
+      }
     }
   }
 

From 3036e72c4c620ea7434373b841861fe2fa7b1ae9 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Wed, 19 Jun 2024 15:53:47 +0200
Subject: [PATCH 0265/1286] [DURACOM-282] fix issue with submission edit page
 when providing a not existing workspaceitem

---
 .../submission/submission-parent-breadcrumb.service.ts   | 9 ++++++++-
 src/app/core/submission/submission-rest.service.ts       | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/core/submission/submission-parent-breadcrumb.service.ts b/src/app/core/submission/submission-parent-breadcrumb.service.ts
index d7e02e878f..421226f80b 100644
--- a/src/app/core/submission/submission-parent-breadcrumb.service.ts
+++ b/src/app/core/submission/submission-parent-breadcrumb.service.ts
@@ -11,7 +11,10 @@ import { DSOBreadcrumbsService } from '../breadcrumbs/dso-breadcrumbs.service';
 import { getDSORoute } from '../../app-routing-paths';
 import { SubmissionService } from '../../submission/submission.service';
 import { CollectionDataService } from '../data/collection-data.service';
-import { hasValue } from '../../shared/empty.util';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
 
 /**
  * Service to calculate the parent {@link DSpaceObject} breadcrumbs for a {@link SubmissionObject}
@@ -35,6 +38,10 @@ export class SubmissionParentBreadcrumbsService implements BreadcrumbsProviderSe
    * @param submissionObject The {@link SubmissionObject} for which the parent breadcrumb structure needs to be created
    */
   getBreadcrumbs(submissionObject: SubmissionObject): Observable<Breadcrumb[]> {
+    if (isEmpty(submissionObject)) {
+      return observableOf([]);
+    }
+
     return combineLatest([
       (submissionObject.collection as Observable<RemoteData<Collection>>).pipe(
         getFirstCompletedRemoteData(),
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index a08d25a3dd..9292d474a0 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -19,8 +19,10 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
+import { ErrorResponse } from '../cache/response.models';
 import { RemoteData } from '../data/remote-data';
 import { SubmissionResponse } from './submission-response.model';
+import { RequestError } from '../data/request-error.model';
 import { RestRequest } from '../data/rest-request.model';
 
 /**
@@ -49,7 +51,7 @@ export class SubmissionRestService {
       getFirstCompletedRemoteData(),
       map((response: RemoteData<SubmissionResponse>) => {
         if (response.hasFailed) {
-          throw new Error(response.errorMessage);
+          throw new ErrorResponse({ statusText: response.errorMessage, statusCode: response.statusCode } as RequestError);
         } else {
           return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
         }

From a62397673eec68cd0c13cfa76ec986813c5ac6b2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 21 Jun 2024 15:00:29 -0500
Subject: [PATCH 0266/1286] Update version tag for development of next release

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

diff --git a/package.json b/package.json
index 3679208516..ada0525149 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "8.0.0",
+  "version": "8.1.0-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 087c203f725a0748042fd2b2dc30993641e15e55 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 25 Jun 2024 18:28:56 +0200
Subject: [PATCH 0267/1286] 116132: Fixed cookie issue

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

diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index a41b641dec..a09db759a6 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -183,7 +183,6 @@ export const klaroConfiguration: any = {
       purposes: ['registration-password-recovery'],
       required: false,
       cookies: [
-        [/^klaro-.+$/],
         CAPTCHA_COOKIE
       ],
       onAccept: `window.refreshCaptchaScript?.call()`,

From a23cdfbc2b1dd6dd4a494432c992fdac3a38fc70 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 26 Jun 2024 08:32:43 +0200
Subject: [PATCH 0268/1286] 115284: Add repeatable based on relationship max
 cardinality

---
 .../edit-relationship-list.component.ts         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 6cca52ba96..835ee4ad7a 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -232,6 +232,22 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     return update && update.field ? update.field.uuid : undefined;
   }
 
+  /**
+   * Check whether the current entity can have multiple relationships of this type
+   * This is based on the max cardinality of the relationship
+   * @private
+   */
+  private isRepeatable(): boolean {
+    const isLeft = this.currentItemIsLeftItem$.getValue();
+    if (isLeft) {
+      const leftMaxCardinality = this.relationshipType.leftMaxCardinality;
+      return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1;
+    } else {
+      const rightMaxCardinality = this.relationshipType.rightMaxCardinality;
+      return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1;
+    }
+  }
+
   /**
    * Open the dynamic lookup modal to search for items to add as relationships
    */
@@ -249,6 +265,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.repeatable = this.isRepeatable();
     modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(

From 105547598feef61d28a65832283665ff76c213db Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 26 Jun 2024 08:32:43 +0200
Subject: [PATCH 0269/1286] 115284: Add repeatable based on relationship max
 cardinality

---
 .../edit-relationship-list.component.ts         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 656d608935..4a60a9bf45 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -264,6 +264,22 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     return update && update.field ? update.field.uuid : undefined;
   }
 
+  /**
+   * Check whether the current entity can have multiple relationships of this type
+   * This is based on the max cardinality of the relationship
+   * @private
+   */
+  private isRepeatable(): boolean {
+    const isLeft = this.currentItemIsLeftItem$.getValue();
+    if (isLeft) {
+      const leftMaxCardinality = this.relationshipType.leftMaxCardinality;
+      return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1;
+    } else {
+      const rightMaxCardinality = this.relationshipType.rightMaxCardinality;
+      return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1;
+    }
+  }
+
   /**
    * Open the dynamic lookup modal to search for items to add as relationships
    */
@@ -281,6 +297,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.repeatable = this.isRepeatable();
     modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(

From f5f40c3dc75563bbd67ef98307e58ef33c8b2789 Mon Sep 17 00:00:00 2001
From: Mohamed Ali <66433220+mohamedali654321@users.noreply.github.com>
Date: Wed, 26 Jun 2024 00:51:14 -0700
Subject: [PATCH 0270/1286] Update Arabic Translation

Update Arabic Translation

Update  ar.json5 translation
---
 src/assets/i18n/ar.json5 | 11229 ++++++++++++++++++++++++++++++-------
 1 file changed, 9246 insertions(+), 1983 deletions(-)

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 6d97effb4c..cf7f7b05bd 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -1,3383 +1,10646 @@
 {
-  "401.help": "غير مصرح لك بالوصول إلى هذه الصفحة. ",
+
+  // "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": "غير مصرح لك بالوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "401.unauthorized": "بدون كمية كافية",
-  "403.help": "ليس لديك إمكانية الوصول إلى هذه الصفحة. ",
+
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "بدون تصريح",
+
+  // "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": "ليس لديك صلاحية الوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "اذهب إلى الصفحة الرئيسية",
+
+  // "403.forbidden": "Forbidden",
   "403.forbidden": "ممنوع",
-  "500.page-internal-server-error": "الخدمة غير دائمة",
-  "500.help": "خادم غير قادر على الرد على سؤالك بسبب توقف التوفير أو وجود مشاكل في السعة. ",
+
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "الخدمة غير متاحة",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "الخادم غير قادر مؤقتًا على تلبية طلبك بسبب توقف الصيانة أو وجود مشاكل في السعة. يرجى إعادة المحاولة في وقت لاحق.",
+
+  // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "404.help": "يمكنك العثور على الصفحة التي تبحث عنها.   ",
+
+  // "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": "تعذر العثور على الصفحة التي تبحث عنها. ربما تمت إزالتها أو حذفها. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.  ",
+
+  // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "404.page-not-found": "لم يتم العثور عليها على الصفحة",
-  "error-page.description.401": "بدون كمية كافية",
+
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "لم يتم العثور على الصفحة",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "بدون تصريح",
+
+  // "error-page.description.403": "Forbidden",
   "error-page.description.403": "ممنوع",
-  "error-page.description.500": "الخدمة غير دائمة",
-  "error-page.description.404": "لم يتم العثور عليها على الصفحة",
-  "error-page.orcid.generic-error": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. ",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "الخدمة غير متاحة",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "لم يتم العثور على الصفحة",
+
+  // "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": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. يرجى التأكد من أنك قمت بمشاركة عنوان البريد الإلكتروني الخاص بحساب أوركيد الخاص بك مع دي سبيس. إذا استمر الخطأ، فاتصل بالمسؤول",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
   "access-status.embargo.listelement.badge": "حظر",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
   "access-status.metadata.only.listelement.badge": "ميتاداتا فقط",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
   "access-status.open.access.listelement.badge": "وصول حر",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
   "access-status.restricted.listelement.badge": "مقيد",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
   "access-status.unknown.listelement.badge": "غير معروف",
-  "admin.curation-tasks.breadcrumbs": "واجبات النظام",
-  "admin.curation-tasks.title": "واجبات النظام",
-  "admin.curation-tasks.header": "واجبات النظام",
-  "admin.registries.bitstream-formats.breadcrumbs": "قم بالتسجيل",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "مهام أكرتة النظام",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "مهام أكرتة النظام",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "مهام أكرتة النظام",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "سجل التنسيق",
+
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.create.breadcrumbs": "تنسيق تدفق البت",
-  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تدفق البت الجديد.",
+
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تنسيق تدفق البت الجديد.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "فشل",
-  "admin.registries.bitstream-formats.create.head": "إنشاء تدفق بت",
-  "admin.registries.bitstream-formats.create.new": "تمت إضافة تدفق بت جديد",
-  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تدفق البت الجديد الفعال.",
+
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "إنشاء تنسيق تدفق بت",
+
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "إضافة تنسيق تدفق بت جديد",
+
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تنسيق تدفق البت الجديد بنجاح.",
+
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "نجاح",
-  "admin.registries.bitstream-formats.delete.failure.amount": "فشل في إزالة {{ amount }} تنسيقًا",
+
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "فشل إزالة {{ amount }} تنسيقًا",
+
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "فشل",
-  "admin.registries.bitstream-formats.delete.success.amount": "بعد إزالة {{ amount }} فعالة",
+
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "تمت إزالة {{ amount }} تنسيقًا بنجاح",
+
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "نجاح",
-  "admin.registries.bitstream-formats.description": "مطلوب قائمة تدفق المعلومات الأساسية حول ما هو مطلوب ومستوى دعمها.",
+
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "توفر قائمة تنسيقات تدفق البت معلومات حول التنسيقات المعروفة ومستوى دعمها.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.edit.breadcrumbs": "تنسيق تدفق البت",
+
+  // "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": "الوصف",
-  "admin.registries.bitstream-formats.edit.extensions.hint": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف الملفات المرفوعة الأصلية. ",
+
+  // "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": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف تنسيق الملفات المرفوعة تلقائيًا. يمكنك إدخال عدة امتدادات لكل تنسيق.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "امتدادات الملفات",
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بتوسعة ملف بدون النقطة",
-  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تدفق البت.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بإدخال امتداد ملف بدون النقطة",
+
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تنسيق تدفق البت.",
+
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "فشل",
-  "admin.registries.bitstream-formats.edit.head": "تدفق البت: {{ format }}",
-  "admin.registries.bitstream-formats.edit.internal.hint": "لاغراض إدارية خالية من المستخدم، لأغراض إدارية.",
+
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "تنسيق تدفق البت: {{ 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": "التنسيقات الداخلية مخفية من المستخدم، وتستخدم لأغراض إدارية.",
+
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "داخلي",
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "نوع الميمات المرغوبة لذلك، لا يجب أن يكون فريدًا.",
-  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع الميم",
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "اسم فريد لهذا الغرض، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
+
+  // "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": "نوع المايم المرتبط بهذا التنسيق، لا يجب أن يكون فريدًا.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع المايم",
+
+  // "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": "اسم فريد لهذا التنسيق، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
+
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "الاسم",
-  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير الجذر التدفق الفعال.",
+
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير تنسيق تدفق البت بنجاح.",
+
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "نجاح",
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم الذي تعهد به مؤسستك لهذا الغرض.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم التي تتعهد به مؤسستك لهذا التنسيق.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "مستوى الدعم",
-  "admin.registries.bitstream-formats.head": "سجل تدفق البت",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "سجل تنسيق تدفق البت",
+
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "لا توجد تنسيقات لتدفق البت.",
-  "admin.registries.bitstream-formats.table.delete": "حذف",
+
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "حذف المحدد",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "إلغاء تحديد الكل",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "داخلي",
-  "admin.registries.bitstream-formats.table.mimetype": "نوع الميم",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "نوع المايم",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "الاسم",
-  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البتات الأولية",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البت المحددة",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "المعرّف",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "رجوع",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "معروف",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "مدعوم",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "غير معروف",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "مستوى الدعم",
-  "admin.registries.bitstream-formats.title": "سجل تدفق البت",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "سجل تنسيق تدفق البت",
+
+  // "admin.registries.bitstream-formats.select": "Select",
   "admin.registries.bitstream-formats.select": "تحديد",
-  "admin.registries.bitstream-formats.deselect": "قم بإلغاء التحديد",
-  "admin.registries.metadata.breadcrumbs": "سجل المذكرات",
-  "admin.registries.metadata.description": "تدعو إلى تسجيل النداءات بقائمة شاملة لتغطية النداءات المتاحة في المستودع. ",
-  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاماتا",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "إلغاء تحديد",
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "سجل الميتاداتا",
+
+  // "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": "يحتفظ سجل الميتاداتا بقائمة بجميع حقول الميتاداتا المتاحة في المستودع. يمكن تقسيم تلك الحقول بين عدة تخطيطات، يتطلب دي سبيس مخطط دبلن كور المؤهل.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاداتا",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "تحرير مخطط الميتاداتا",
+
+  // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "الاسم",
-  "admin.registries.metadata.form.namespace": "اسم بعيد",
-  "admin.registries.metadata.head": "سجل المذكرات",
-  "admin.registries.metadata.schemas.no-items": "لا يوجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "مسافة الاسم",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "سجل الميتاداتا",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "لا توجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
   "admin.registries.metadata.schemas.select": "تحديد",
-  "admin.registries.metadata.schemas.deselect": "قم بإلغاء التحديد",
-  "admin.registries.metadata.schemas.table.delete": "حذف",
-  "admin.registries.metadata.schemas.table.selected": "التصنيفات المحددة",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "إلغاء تحديد",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "حذف المحدد",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "المخططات المحددة",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "المعرّف",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "الاسم",
-  "admin.registries.metadata.schemas.table.namespace": "اسم بعيد",
-  "admin.registries.metadata.title": "سجل المذكرات",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "مسافة الاسم",
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "سجل الميتاداتا",
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "مخطط الميتاداتا",
-  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ \"{{namespace}}\".",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ  \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
   "admin.registries.schema.fields.select": "تحديد",
-  "admin.registries.schema.fields.deselect": "قم بإلغاء التحديد",
-  "admin.registries.schema.fields.head": "يغطي مخطط الميتاداتا",
-  "admin.registries.schema.fields.no-items": "لا توجد مشكلة ميتاداتا للعرض.",
-  "admin.registries.schema.fields.table.delete": "حذف",
-  "admin.registries.schema.fields.table.field": "بحث متقدم",
-  "admin.registries.schema.fields.table.selected": "تكفير الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "إلغاء تحديد",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "حقول مخطط الميتاداتا",
+
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "لا توجد حقول ميتاداتا للعرض.",
+
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "حذف المحدد",
+
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "حقل",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "حقول الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "المعرّف",
-  "admin.registries.schema.fields.table.scopenote": "لاحظ النطاق",
-  "admin.registries.schema.form.create": "إنشاء بحث ميتا",
-  "admin.registries.schema.form.edit": "تحرير البحث ميتا",
+
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "ملاحظة النطاق",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "إنشاء حقل ميتاداتا",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "تحرير حقل ميتاداتا",
+
+  // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "عنصر",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "مؤهل",
-  "admin.registries.schema.form.scopenote": "لاحظ النطاق",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "ملاحظة النطاق",
+
+  // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "مخطط الميتاداتا",
-  "admin.registries.schema.notification.created": "تم إنشاء مخطط الميتاداتا \"{{prefix}}\"",
-  "admin.registries.schema.notification.deleted.failure": "فشل الحذف {{amount}} مخططات ميتا",
-  "admin.registries.schema.notification.deleted.success": "تم الحذف {{amount}} مخططات ميتا فعالة",
-  "admin.registries.schema.notification.edited": "تم فعالية تحرير مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "تم بنجاح إنشاء مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "فشل حذف {{amount}} مخطط ميتاداتا",
+
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "تم حذف {{amount}} مخطط ميتاداتا بنجاح",
+
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "تم بنجاح تحرير مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "خطأ",
-  "admin.registries.schema.notification.field.created": "تم إنشاء البحث العلمي \"{{field}}\"",
-  "admin.registries.schema.notification.field.deleted.failure": "فشل الحذف {{amount}} بحث ميتا",
-  "admin.registries.schema.notification.field.deleted.success": "تم الحذف {{amount}} بحثت عن نتائج ميتا فعالة",
-  "admin.registries.schema.notification.field.edited": "تم البحث الفعال عن البحث في الميتاداتا \"{{field}}\"",
+
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "تم بنجاح إنشاء حقل الميتاداتا  \"{{field}}\"",
+
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "فشل حذف {{amount}} حقل ميتاداتا",
+
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "تم حذف {{amount}} حقل ميتاداتا بنجاح",
+
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "تم بنجاح تحرير حقل الميتاداتا \"{{field}}\"",
+
+  // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "نجاح",
+
+  // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "رجوع",
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "سجل مخطط الميتاداتا",
+
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
   "admin.access-control.bulk-access.breadcrumbs": "إدارة الوصول بالجملة",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results",
   "administrativeBulkAccess.search.results.head": "نتائج البحث",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
   "admin.access-control.bulk-access.title": "إدارة الوصول بالجملة",
-  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بإنشاء الكائنات الحية",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بتحديد الكائنات",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
   "admin.access-control.bulk-access-browse.search.header": "بحث",
-  "admin.access-control.bulk-access-browse.selected.header": "التحديد الفعلي({{number}})",
-  "admin.access-control.bulk-access-settings.header": "الثانية: المراد بإجرائها",
-  "admin.access-control.epeople.actions.delete": "حذف الالكترونيات الشخصية",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "التحديد الحالي({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "الخطوة الثانية: العملية المراد إجراؤها",
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "حذف شخص إلكتروني",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "التصرف كشخص إلكتروني",
+
+  // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "إعادة تعيين كلمة المرور",
-  "admin.access-control.epeople.actions.stop-impersonating": "ضبط التصرف كشخص إلكتروني",
-  "admin.access-control.epeople.breadcrumbs": "يأتي إليكين",
-  "admin.access-control.epeople.title": "يأتي إليكين",
-  "admin.access-control.epeople.edit.breadcrumbs": "شخصي إلكتروني جديد",
-  "admin.access-control.epeople.edit.title": "شخصي إلكتروني جديد",
-  "admin.access-control.epeople.add.breadcrumbs": "إضافة خاصة إلكترونيات",
-  "admin.access-control.epeople.add.title": "إضافة خاصة إلكترونيات",
-  "admin.access-control.epeople.head": "يأتي إليكين",
+
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "بحث",
-  "admin.access-control.epeople.button.see-all": "مراجعة الكل",
-  "admin.access-control.epeople.search.scope.metadata": "ميداداتا",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "الميتاداتا",
+
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "البريد الإلكتروني (بالضبط)",
+
+  // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "بحث",
-  "admin.access-control.epeople.search.placeholder": "بحث الناس...",
-  "admin.access-control.epeople.button.add": "إضافة خاصة إلكترونيات",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "بحث الأشخاص...",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "المعرّف",
+
+  // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "الاسم",
+
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "البريد الإلكتروني (بالضبط)",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "تحرير",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "تحرير \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "غير مصرح لك لتحرير هذه المجموعة",
+
+  // "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": "غير مصرح لك بتحرير هذه المجموعة",
+
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "حذف \"{{name}}\"",
-  "admin.access-control.epeople.no-items": "لا يوجد رجل إلكترونين للعرض.",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "لا يوجد أشخاص إلكترونيين للعرض.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
   "admin.access-control.epeople.form.create": "إنشاء شخص إلكتروني",
-  "admin.access-control.epeople.form.edit": "تحرير الكمبيوتر الشخصي",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "تحرير شخص إلكتروني",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "الاسم الأول",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "اسم العائلة",
+
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "البريد الإلكتروني",
-  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد الإلكتروني صالح",
-  "admin.access-control.epeople.form.canLogIn": "يمكننا تسجيل الدخول",
-  "admin.access-control.epeople.form.requireCertificate": "أنا",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد إلكتروني صالح",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "يمكنه تسجيل الدخول",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "يتطلب شهادة",
+
+  // "admin.access-control.epeople.form.return": "Back",
   "admin.access-control.epeople.form.return": "رجوع",
+
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "تم إنشاء الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"، البريد الإلكتروني \"{{email}}\"تعمل بالفعل.",
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "فشل في تحرير الشخص الإلكتروني \"{{name}}\"، البريد الإلكتروني \"{{email}}\"تعمل بالفعل.",
+
+  // "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": "فشل إنشاء الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
+
+  // "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": "فشل تحرير الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
+
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "تم تحرير الشخص الإلكتروني \"{{name}}\"بنجاح",
-  "admin.access-control.epeople.form.notification.edited.failure": "فشل في تحرير الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "فشل تحرير الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "تم حذف الشخص الإلكتروني \"{{name}}\"بنجاح",
-  "admin.access-control.epeople.form.notification.deleted.failure": "فشل في حذف الهاتف الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "فشل حذف الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "عضو في هذه المجموعات:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "المعرّف",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "الاسم",
-  "admin.access-control.epeople.form.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "حاوية/مجتمع",
+
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "هذا الشخص الإلكتروني ليس عضواً في أي مجموعة",
-  "admin.access-control.epeople.form.goToGroups": "إضافة إلى مجموعات",
-  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف الشخص الإلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "تم حذف البريد الإلكتروني الخاص بالشخص: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.title": "مجموعات",
-  "admin.access-control.groups.breadcrumbs": "مجموعات",
-  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير المجموعة",
-  "admin.access-control.groups.title.singleGroup": "تحرير المجموعة",
+
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "أضف إلى مجموعات",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف شخص إلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "تم حذف الشخص الإلكتروني: \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "المجموعات",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "المجموعات",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير مجموعة",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "تحرير مجموعة",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
   "admin.access-control.groups.title.addGroup": "مجموعة جديدة",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
   "admin.access-control.groups.addGroup.breadcrumbs": "مجموعة جديدة",
-  "admin.access-control.groups.head": "مجموعات",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "المجموعات",
+
+  // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "إضافة مجموعة",
-  "admin.access-control.groups.search.head": "بحثت المجموعات",
-  "admin.access-control.groups.button.see-all": "مراجعة الكل",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "بحث المجموعات",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "بحث",
-  "admin.access-control.groups.search.placeholder": "بحث في المجموعات...",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "بحث المجموعات...",
+
+  // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "المعرّف",
+
+  // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "الاسم",
-  "admin.access-control.groups.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "حاوية/مجتمع",
+
+  // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "الأعضاء",
+
+  // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "تحرير",
+
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "تحرير \"{{name}}\"",
+
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "حذف \"{{name}}\"",
-  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات دي فيينا أو كمعرفي فريد",
+
+  // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات بهذا في اسمها أو كمعرف عمومي فريد",
+
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "تم حذف المجموعة \"{{name}}\"بنجاح",
-  "admin.access-control.groups.notification.deleted.failure.title": "فشل في حذف المجموعة \"{{name}}\"",
+
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "فشل حذف المجموعة \"{{name}}\"",
+
+  // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "السبب: \"{{cause}}\"",
-  "admin.access-control.groups.form.alert.permanent": "هذه المجموعة حقوق، حقوق لا يمكن تحريرها أو حذفها. ",
-  "admin.access-control.groups.form.alert.workflowGroup": "لا يمكن تعديل هذه المجموعة أو حذفها بشكل واضح مع دقة عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}.  <a href='{{comcolEditRolesRoute}}'>\"تعيين الضبط\"</a> في صفحة التحرير {{comcol}}. ",
+
+  // "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": "هذه المجموعة دائمة، لذا لا يمكن تحريرها أو حذفها. لكن لايزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة..",
+
+  // "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": "لا يمكن تعديل هذه المجموعة أو حذفها لأنها تتوافق مع دور في عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}. يمكنك حذفها من تبويب <a href='{{comcolEditRolesRoute}}'>\"تعيين الأدوار\"</a> في صفحة تحرير {{comcol}}. لا يزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة.",
+
+  // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "إنشاء مجموعة",
-  "admin.access-control.groups.form.head.edit": "تحرير المجموعة",
+
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "تحرير مجموعة",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "اسم المجموعة",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
   "admin.access-control.groups.form.groupCommunity": "مجتمع أو حاوية",
+
+  // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "الوصف",
+
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "تم إنشاء المجموعة \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "فشل إنشاء المجموعة \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "فشل في إنشاء المجموعة بالاسم: \"{{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": "فشل إنشاء المجموعة بالاسم: \"{{name}}\"، يرجى التأكد أن الاسم ليس قيد الاستخدام بالفعل.",
+
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "فشل تحرير المجموعة \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\"تعمل بالفعل!",
+
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\" قيد الاستخدام بالفعل!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "تم تحرير المجموعة \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "حذف المجموعة",
+
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "حذف المجموعة \"{{ 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": "هل أنت متأكد من أنك ترغب في حذف المجموعة \"{{ dsoName }}\"",
+
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "إلغاء",
+
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "حذف",
+
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "تم حذف المجموعة \"{{ name }}\"بنجاح",
-  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل في حذف المجموعة \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل حذف المجموعة \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "السبب: \"{{ cause }}\"",
-  "admin.access-control.groups.form.members-list.head": "يأتي إليكين",
-  "admin.access-control.groups.form.members-list.search.head": "إضافة المزيد من الإلكترونيات",
-  "admin.access-control.groups.form.members-list.button.see-all": "مراجعة الكل",
-  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحالية",
+
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "أشخاص إلكترونيين",
+
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحاليين",
+
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "بحث",
+
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "المعرّف",
+
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "الاسم",
-  "admin.access-control.groups.form.members-list.table.identity": "هوية",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "الهوية",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
   "admin.access-control.groups.form.members-list.table.email": "البريد الإلكتروني",
+
+  // "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": "إزالة / إضافة",
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف العضو باسم \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "أكمل إضافة العضو: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "فشل في إضافة الموضوع: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف عضو باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "تمت إضافة العضو: \"{{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": "فشل إضافة العضو: \"{{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": "تم حذف العضو: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "فشل في حذف العضو: \"{{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": "فشل حذف العضو: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
   "admin.access-control.groups.form.members-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
+
+  // "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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "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": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
-  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي شخص إلكترونين في هذا البحث",
+
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "هناك خطأ ما: \"{{cause}}\"",
-  "admin.access-control.groups.form.subgroups-list.head": "مجموعات",
+
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "المجموعات",
+
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "إضافة مجموعة فرعية",
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "مراجعة الكل",
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الشكلية",
+
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الفرعية الحالية",
+
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "بحث",
+
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "المعرّف",
+
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "الاسم",
-  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "ابدأ/المجتمع",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "إزالة / إضافة",
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة المجموعة الفرعية باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة مجموعة فرعية باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "إضافة مجموعة فرعية باسم \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "متابعة إضافة المجموعة: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "فشل في إضافة المجموعة الفرعية: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "تم حذف المجموعة اليدوية: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "فشل حذف المجموعة المصنوعة: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "هذه هي المجموعة الحالية، لا يمكن الاتصال بها.",
-  "admin.access-control.groups.form.subgroups-list.no-items": "لم يتم العثور على مجموعات بهذا الاسم في دارفور أو بكمعرفي فريد",
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "لا يوجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "تمت إضافة المجموعة الفرعية: \"{{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": "فشل إضافة مجموعة فرعية: \"{{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": "تم حذف المجموعة الفرعية: \"{{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": "فشل حذف المجموعة الفرعية: \"{{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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "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": "هذه هي المجموعة الحالية، لا يمكن إضافتها.",
+
+  // "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": "لم يتم العثور على مجموعات بهذا في اسمها أو بهذا كمعرف عمومي فريد",
+
+  // "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": "لا توجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "رجوع",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
   "admin.quality-assurance.breadcrumbs": "ضمان الجودة",
-  "admin.notifications.event.breadcrumbs": "آلات ضمان الجودة",
-  "admin.notifications.event.page.title": "آلات ضمان الجودة",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "مقترحات ضمان الجودة",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "مقترحات ضمان الجودة",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
   "admin.quality-assurance.page.title": "ضمان الجودة",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
   "admin.notifications.source.breadcrumbs": "مصدر ضمان الجودة",
-  "admin.access-control.groups.form.tooltip.editGroupPage": "في هذه الصفحة، يمكنك تعديل مجموعة الخصائص وأعضائها. ",
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "وتفكر شخصياً في هذه المجموعة أو تأسيسها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المسدلة الموجودة على يسار شريط البحث ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ",
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "وبعد مجموعة فرعية إلى هذه المجموعة أو التغطية منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ",
-  "admin.reports.collections.title": "تقرير تصفية المجموعة",
-  "admin.reports.collections.breadcrumbs": "تقرير تصفية المجموعة",
-  "admin.reports.collections.head": "تقرير تصفية المجموعة",
-  "admin.reports.button.show-collections": "عرض المجموعات",
-  "admin.reports.collections.collections-report": "تقرير التحصيل",
-  "admin.reports.collections.item-results": "نتائج البند",
-  "admin.reports.collections.community": "مجتمع",
-  "admin.reports.collections.collection": "مجموعة",
-  "admin.reports.collections.nb_items": "ملحوظة. ",
-  "admin.reports.collections.match_all_selected_filters": "مطابقة جميع المرشحات المحددة",
-  "admin.reports.items.breadcrumbs": "تقرير استعلام بيانات التعريف",
-  "admin.reports.items.head": "تقرير استعلام بيانات التعريف",
-  "admin.reports.items.run": "تشغيل استعلام العنصر",
-  "admin.reports.items.section.collectionSelector": "محدد المجموعة",
-  "admin.reports.items.section.metadataFieldQueries": "استعلامات حقل بيانات التعريف",
-  "admin.reports.items.predefinedQueries": "الاستعلامات المحددة مسبقًا",
-  "admin.reports.items.section.limitPaginateQueries": "استعلامات الحد/الصفحات",
-  "admin.reports.items.limit": "حد/",
-  "admin.reports.items.offset": "عوض",
-  "admin.reports.items.wholeRepo": "المستودع كله",
-  "admin.reports.items.anyField": "أي مجال",
-  "admin.reports.items.predicate.exists": "موجود",
-  "admin.reports.items.predicate.doesNotExist": "غير موجود",
-  "admin.reports.items.predicate.equals": "يساوي",
-  "admin.reports.items.predicate.doesNotEqual": "لا يساوي",
-  "admin.reports.items.predicate.like": "يحب",
-  "admin.reports.items.predicate.notLike": "لا يشبه",
-  "admin.reports.items.predicate.contains": "يتضمن",
-  "admin.reports.items.predicate.doesNotContain": "لا يحتوي",
-  "admin.reports.items.predicate.matches": "اعواد الكبريت",
-  "admin.reports.items.predicate.doesNotMatch": "غير متطابق",
-  "admin.reports.items.preset.new": "استعلام جديد",
-  "admin.reports.items.preset.hasNoTitle": "لا يوجد لديه عنوان",
-  "admin.reports.items.preset.hasNoIdentifierUri": "لا يوجد لديه dc.identifier.uri",
-  "admin.reports.items.preset.hasCompoundSubject": "لديه موضوع مركب",
-  "admin.reports.items.preset.hasCompoundAuthor": "يحتوي على مركب dc.contributor.author",
-  "admin.reports.items.preset.hasCompoundCreator": "لديه مجمع DC.creator",
-  "admin.reports.items.preset.hasUrlInDescription": "لديه عنوان URL في dc.description",
-  "admin.reports.items.preset.hasFullTextInProvenance": "يحتوي على النص الكامل في dc.description.provenance",
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "يحتوي على نص غير كامل في dc.description.provenance",
-  "admin.reports.items.preset.hasEmptyMetadata": "تحتوي على بيانات وصفية فارغة",
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "يحتوي على بيانات وصفية غير منقطعة في الوصف",
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "يحتوي على كيان XML في بيانات التعريف",
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "يحتوي على حرف غير ascii في البيانات الوصفية",
-  "admin.reports.items.number": "لا.",
+
+  // "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.editGroupPage": "في هذه الصفحة، يمكنك تعديل خصائص المجموعة وأعضائها. في القسم العلوي، يمكنك تحرير اسم المجموعة ووصفها، ما لم تكن هذه مجموعة إدارية لحاوية أو مجتمع، وفي هذه الحالة يتم إنشاء اسم المجموعة ووصفها تلقائياً ولا يمكن تحريرهما. في الأقسام التالية، يمكنك تعديل عضوية المجموعة. انظر [الويكي](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) للمزيد من التفاصيل.",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "لإضافة شخص إلكتروني إلى هذه المجموعة أو إزالته منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المنسدلة الموجودة على يسار شريط البحث لاختيار ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ثم قم بالنقر على أيقونة زائد لكل مستخدم ترغب في إضافته في القائمة أدناه، أو أيقونة سلة المهملات لكل مستخدم ترغب في إزالته. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "لإضافة مجموعة فرعية إلى هذه المجموعة أو إزالتها منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ثم قم بالنقر على أيقونة زائد لكل مجموعة ترغب في إضافتها في القائمة أدناه، أو أيقونة سلة المهملات لكل مجموعة ترغب في إزالتها. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
   "admin.reports.items.id": "UUID",
-  "admin.reports.items.collection": "مجموعة",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
   "admin.reports.items.handle": "URI",
-  "admin.reports.items.title": "عنوان",
-  "admin.reports.commons.filters": "المرشحات",
-  "admin.reports.commons.additional-data": "بيانات إضافية للعودة",
-  "admin.reports.commons.previous-page": "الصفحة السابقة",
-  "admin.reports.commons.next-page": "الصفحة التالية",
-  "admin.reports.commons.page": "صفحة",
-  "admin.reports.commons.of": "ل",
-  "admin.reports.commons.export": "تصدير لتحديث بيانات التعريف",
-  "admin.reports.commons.filters.deselect_all": "قم بإلغاء تحديد جميع المرشحات",
-  "admin.reports.commons.filters.select_all": "حدد كافة المرشحات",
-  "admin.reports.commons.filters.matches_all": "يطابق جميع المرشحات المحددة",
-  "admin.reports.commons.filters.property": "عوامل تصفية خصائص العنصر",
-  "admin.reports.commons.filters.property.is_item": "هل البند - صحيح دائمًا",
-  "admin.reports.commons.filters.property.is_withdrawn": "العناصر المسحوبة",
-  "admin.reports.commons.filters.property.is_not_withdrawn": "العناصر المتوفرة - لم يتم سحبها",
-  "admin.reports.commons.filters.property.is_discoverable": "العناصر القابلة للاكتشاف - ليست خاصة",
-  "admin.reports.commons.filters.property.is_not_discoverable": "غير قابل للاكتشاف - عنصر خاص",
-  "admin.reports.commons.filters.bitstream": "مرشحات تيار البت الأساسية",
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "يحتوي العنصر على تدفقات بت أصلية متعددة",
-  "admin.reports.commons.filters.bitstream.has_no_originals": "لا يحتوي العنصر على تدفقات بت أصلية",
-  "admin.reports.commons.filters.bitstream.has_one_original": "يحتوي العنصر على تدفق بت أصلي واحد",
-  "admin.reports.commons.filters.bitstream_mime": "عوامل تصفية Bitstream حسب نوع MIME",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "يحتوي العنصر على Doc Original Bitstream (PDF، Office، Text، HTML، XML، إلخ)",
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "يحتوي العنصر على تدفق بت للصورة الأصلية",
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "يحتوي على أنواع Bitstream أخرى (ليست Doc أو Image)",
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "يحتوي العنصر على أنواع متعددة من تدفقات البت الأصلية (Doc، Image، Other)",
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "يحتوي العنصر على تدفق بت أصلي بتنسيق PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "يحتوي العنصر على JPG Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "يحتوي على ملف PDF صغير بشكل غير عادي",
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "يحتوي على ملف PDF كبير الحجم بشكل غير عادي",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "يحتوي على تدفق بت للمستند بدون عنصر TEXT",
-  "admin.reports.commons.filters.mime": "عوامل تصفية نوع MIME المدعومة",
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "يتم دعم تدفقات البت لصورة العنصر",
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "يحتوي العنصر على Image Bitstream غير مدعوم",
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "يتم دعم تدفقات بت مستند العنصر",
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "يحتوي العنصر على تدفق بت للمستند غير مدعوم",
-  "admin.reports.commons.filters.bundle": "مرشحات حزمة Bitstream",
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "يحتوي على تدفق بت في حزمة غير مدعومة",
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "لديه صورة مصغرة صغيرة بشكل غير عادي",
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "يحتوي على تدفق بت أصلي بدون صورة مصغرة",
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "يحتوي على اسم صورة مصغرة غير صالح (بافتراض صورة مصغرة واحدة لكل نسخة أصلية)",
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "تحتوي على صورة مصغرة لم يتم إنشاؤها",
-  "admin.reports.commons.filters.bundle.no_license": "ليس لديه ترخيص",
-  "admin.reports.commons.filters.bundle.has_license_documentation": "لديه وثائق في حزمة الترخيص",
-  "admin.reports.commons.filters.permission": "مرشحات الأذونات",
-  "admin.reports.commons.filters.permission.has_restricted_original": "يحتوي العنصر على تدفق بت أصلي مقيد",
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "يحتوي العنصر على تدفق بت أصلي واحد على الأقل لا يمكن للمستخدم المجهول الوصول إليه",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "يحتوي العنصر على صورة مصغرة مقيدة",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "يحتوي العنصر على صورة مصغرة واحدة على الأقل لا يمكن للمستخدم المجهول الوصول إليها",
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "يحتوي العنصر على بيانات وصفية مقيدة",
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "يحتوي العنصر على بيانات تعريف لا يمكن للمستخدم المجهول الوصول إليها",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+  // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "بحث إداري",
+
+  // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "تحرير",
+
+  // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "تحرير",
+
+  // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "حذف",
+
+  // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "تحرير",
-  "admin.search.item.make-private": "اجعله غير للاكتشاف",
-  "admin.search.item.make-public": "اجعله للاكتشاف",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "اجعله غير قابل للاكتشاف",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "اجعله قابل للاكتشاف",
+
+  // "admin.search.item.move": "Move",
   "admin.search.item.move": "نقل",
+
+  // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "إعادة تعيين",
-  "admin.search.item.withdraw": "يسحب",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "سحب",
+
+  // "admin.search.title": "Administrative Search",
   "admin.search.title": "بحث إداري",
+
+  // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "بحث إداري",
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "أدر سير العمل",
+
+  // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "أدر سير العمل",
+
+  // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "سير العمل",
+
+  // "admin.workflow.item.workspace": "Workspace",
   "admin.workflow.item.workspace": "مساحة العمل",
+
+  // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "حذف",
-  "admin.workflow.item.send-back": "إعادة الإرسال",
-  "admin.workflow.item.policies": "تماما",
-  "admin.workflow.item.supervision": "شاهد",
-  "admin.metadata-import.breadcrumbs": "قم باستيراد الميتاداتا",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "إعادة إرسال",
+
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "السياسات",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "الإشراف",
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "استيراد الميتاداتا",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
   "admin.batch-import.breadcrumbs": "استيراد الدفعة",
-  "admin.metadata-import.title": "قم باستيراد الميتاداتا",
+
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "استيراد الميتاداتا",
+
+  // "admin.batch-import.title": "Import Batch",
   "admin.batch-import.title": "استيراد الدفعة",
-  "admin.metadata-import.page.header": "قم باستيراد الميتاداتا",
+
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "استيراد الميتاداتا",
+
+  // "admin.batch-import.page.header": "Import Batch",
   "admin.batch-import.page.header": "استيراد الدفعة",
-  "admin.metadata-import.page.help": "يمكنك أن تحتوي أو تستعرض ملفات CSV التي تحتوي على عمليات ميتة بالدفع على الملفات من هنا",
-  "admin.batch-import.page.help": "حدد المراد الاستيراد منها. ",
-  "admin.batch-import.page.toggle.help": "من خلال إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم المزيد لتعيين مصدر الإدخال",
-  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا للاستيراده",
+
+  // "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": "يمكنك إفلات أو استعراض ملفات CSV التي تحتوي على عمليات ميتاداتا بالدفعة على الملفات من هنا",
+
+  // "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": "حدد الحاوية المراد الاستيراد إليها. بعد ذلك، قم بإسقاط أو تصفح ملف مضغوط بتنسيق أرشيف بسيط (SAF) يتضمن المواد المراد استيرادها",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "من الممكن إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم التبديل أعلاه لتعيين مصدر الإدخال",
+
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا لاستيراده",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
   "admin.batch-import.page.dropMsg": "قم بإسقاط ZIP الدفعة المراد استيرادها",
-  "admin.metadata-import.page.dropMsgReplace": "قم بالمسح لاستبدال ملف CSV للميتاداتا المراد استيراده",
-  "admin.batch-import.page.dropMsgReplace": "قم بالمسح لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ملف CSV للميتاداتا المراد استيراده",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "رجوع",
+
+  // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "متابعة",
-  "admin.metadata-import.page.button.select-collection": "حدد",
-  "admin.metadata-import.page.error.addFile": "حدد ملف الجديد!",
-  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف الجديد!",
-  "admin.batch-import.page.error.addFile": "حدد ملف ZIP الجديد!",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "حدد الحاوية",
+
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "حدد ملف أولاً!",
+
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف أولاً!",
+
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "حدد ملف ZIP أولاً!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload",
   "admin.metadata-import.page.toggle.upload": "تحميل",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
   "admin.metadata-import.page.toggle.url": "عنوان URL",
-  "admin.metadata-import.page.urlMsg": "قم بالضغط على عنوان url لملف ZIP الخاص بالدفعة للاستيراده",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "قم بإدخال عنوان url لملف ZIP الخاص بالدفعة لاستيراده",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "التحقق فقط",
-  "admin.metadata-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
   "advanced-workflow-action.rating.form.rating.label": "التقييم",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
   "advanced-workflow-action.rating.form.rating.error": "يجب عليك تقييم هذه المادة",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
   "advanced-workflow-action.rating.form.review.label": "مراجعة",
-  "advanced-workflow-action.rating.form.review.error": "يجب عليك تفصيل تفاصيل لتقديم هذا التقييم",
-  "advanced-workflow-action.rating.description": "برجاء تحديد التقييم أدناه",
-  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم التفصيلي للمراجعة",
-  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مرشح واحد أدناه للمقدمة",
-  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مرشح واحد أو أكثر أدناه قبل التقديم",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "يأتي إليكين",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة المزيد من الإلكترونيات",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "مراجعة الكل",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحالية",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "يجب عليك إدخال مراجعة لتقديم هذا التقييم",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "يرجى تحديد التقييم أدناه",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم أدناه وإضافة مراجعة",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مراجع واحد أدناه قبل التقديم",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مراجع واحد أو أكثر أدناه قبل التقديم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "استعراض الكل",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحاليين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "بحث",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "المعرّف",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "الاسم",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "هوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "الهوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "البريد الإلكتروني",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "إزالة / إضافة",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "إزالة عضو باسم \"{{name}}\"",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "أكمل إضافة العضو: \"{{name}}\"بنجاح",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل في إضافة الموضوع: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل إضافة العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل في حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي شخص إلكترونين في هذا البحث",
-  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي زائر.",
-  "admin.batch-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة الملف الموجود الذي تم تحميله. ",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي مراجع.",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة الملف المضغوط الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "admin.batch-import.page.remove": "remove",
   "admin.batch-import.page.remove": "إزالة",
-  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة مرور غير صالحة.",
-  "auth.messages.expired": "لقد تعلمت. ",
-  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. ",
+
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة المرور غير صالحة.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "لقد انتهت جلستك. يرجى تسجيل الدخول مرة أخرى.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. يرجى تسجيل الدخول مرة أخرى.",
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "جاري الآن تنزيل {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "رجوع",
-  "bitstream.edit.authorizations.link": "تحرير سياسة تدفق البت",
-  "bitstream.edit.authorizations.title": "تحرير سياسة تدفق البت",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "رجوع",
+
+  // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "تدفق البت: ",
-  "bitstream.edit.form.description.hint": "اختياريًا، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\"أو\"<i>قراءات بيانات الخبرة</i>\".",
+
+  // "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": "اختيارياً، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\" أو \"<i>قراءات بيانات التجربة</i>\".",
+
+  // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "الوصف",
-  "bitstream.edit.form.embargo.hint": "أول يوم يسمح له بالوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر تدفق بت، قم بالذهاب إلى كتلة <i> المادة</i>، كوك بالنقر على <i>...تصاريح</i>، إنشاء أو تحرير أبو <i>يقرأ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ الميلاد</i> حسب الطلب.",
-  "bitstream.edit.form.embargo.label": "الحظر حتى تاريخ المحدد",
-  "bitstream.edit.form.fileName.hint": "تغيير اسم الملف لتدفق البت. ",
+
+  // "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": "أول يوم يسمح منه الوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر لتدفق بت، قم بالذهاب إلى تبويب <i> حالة المادة</i>، وقم بالنقر على <i>تصاريح...</i>، إنشاء أو تحرير سياسة <i>READ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ البدء</i> حسب الرغبة.",
+
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "حظر حتى تاريخ محدد",
+
+  // "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": "تغيير اسم الملف لتدفق البت. لاحظ أن هذا سيؤدي إلى تغيير عنوان URL لدفق البت المعروض، لكن الروابط القديمة ستظل تحل طالما لم يتغير معرف التسلسل.",
+
+  // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "اسم الملف",
-  "bitstream.edit.form.newFormat.label": "وصفه محدده جديده",
+
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "وصف التنسيق الجديد",
+
+  // "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": "التطبيق الذي قمت باستخدامه لإنشاء الملف، ورقم الإصدار (على سبيل المثال: \"<i>ACMESoft SuperApp الإصدار 1.5</i>\").",
-  "bitstream.edit.form.primaryBitstream.label": "التدفق الرئيسي للبيت",
-  "bitstream.edit.form.selectedFormat.hint": "إذا لم يكن متاحًا في المستقبل، <b>يجب أن يطلب \"التنسيق غير موجود في المستند\" مسبقًا</b> مسموح لها \"وصف التنسيق الجديد\".",
-  "bitstream.edit.form.selectedFormat.label": "البحث عن أداة",
-  "bitstream.edit.form.selectedFormat.unknown": "في حالة عدم وجودها في القائمة",
-  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تدفق البت",
-  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ التدفق الأساسي",
-  "bitstream.edit.form.iiifLabel.label": "ملصق التسمية IIIF",
-  "bitstream.edit.form.iiifLabel.hint": "تسمية قماش لهذه الصورة. ",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "تدفق البت الرئيسي",
+
+  // "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": "إذا لم يكن التنسيق موجوداً في القائمة أعلاه، <b>قم بتحديد \"التنسيق غير موجود في القائمة\" أعلاه</b> وقم بوصفه أدنى  \"وصف تنسيق جديد\".",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "التنسيق المحدد",
+
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "التنسيق غير موجود في القائمة",
+
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تنسيق تدفق البت",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ تدفق البت الرئيسي",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "ملصق تسمية 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 لهذه الصورة. إذا لم يتم توفير التسمية الافتراضية سيتم استخدامها.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
   "bitstream.edit.form.iiifToc.label": "جدول محتويات IIIF",
-  "bitstream.edit.form.iiifToc.hint": "إن إضافة نص هنا تجعل هذا بداية لنطاق محتويات جديد.",
-  "bitstream.edit.form.iiifWidth.label": "عرض قماش IIIF",
-  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض القماش مع عرض الصورة.",
-  "bitstream.edit.form.iiifHeight.label": "ارتفاع قماش IIIF",
-  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع القماش مع ارتفاع الصورة.",
-  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أحبها على تدفق هذا.",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "إن إضافة نص هنا تجعل هذا بداية لنطاق جدول محتويات جديد.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "عرض IIIF Canvas",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض Canvas عادةً مع عرض الصورة.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "ارتفاع Canvas IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع Canvas عادةً مع ارتفاع الصورة.",
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على تدفق البت هذا.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "تم حفظ تدفق البت",
+
+  // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "تحرير تدفق البت",
-  "bitstream-request-a-copy.alert.canDownload1": "لقد بالفعل حق الوصول إلى هذا الملف.  ",
+
+  // "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": "لديك بالفعل حق الوصول إلى هذا الملف. إذا كنت تريد تنزيل الملف، انقر ",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
   "bitstream-request-a-copy.alert.canDownload2": "هنا",
-  "bitstream-request-a-copy.header": "نسخة الطلب من الملف",
-  "bitstream-request-a-copy.intro": "يرجى إعادة المعلومات التالية لطلب النسخة التالية: ",
-  "bitstream-request-a-copy.intro.bitstream.one": "جاري الطلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "طلب نسخة من الملف",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "قم بإدخال المعلومات التالية لطلب نسخة للمادة التالية: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "جاري طلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "طلب كل الملفات. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
   "bitstream-request-a-copy.name.label": "الاسم *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "الاسم مطلوب",
-  "bitstream-request-a-copy.email.label": "عنوان بريدك الإلكتروني *",
-  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان البريد الإلكتروني هذا الملف.",
-  "bitstream-request-a-copy.email.error": "يرجى الاتصال بعنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "عنوان بريدك  الإلكتروني *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان هذا البريد الإلكتروني لإرسال الملف.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
   "bitstream-request-a-copy.allfiles.label": "ملفات",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
   "bitstream-request-a-copy.files-all-false.label": "الملف المطلوب فقط",
-  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المحدود",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المقيد",
+
+  // "bitstream-request-a-copy.message.label": "Message",
   "bitstream-request-a-copy.message.label": "رسالة",
+
+  // "bitstream-request-a-copy.return": "Back",
   "bitstream-request-a-copy.return": "رجوع",
-  "bitstream-request-a-copy.submit": "نسخة الطلب",
-  "bitstream-request-a-copy.submit.success": "تم تقديم طلب فعال.",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "طلب نسخة",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "تم تقديم طلب المادة بنجاح.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "حدث خطأ ما أثناء تقديم طلب المادة.",
-  "browse.back.all-results": "جميع النتائج حدثت",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "جميع نتائج الاستعراض",
+
+  // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "حسب المؤلف",
+
+  // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "حسب تاريخ الإصدار",
+
+  // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "حسب الموضوع",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "حسب فئة الموضوع",
-  "browse.comcol.by.nsi": "حسب فرس العلوم النرويجي",
-  "browse.comcol.by.title": "عنوان حسب الطلب",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "حسب فهرس العلوم النرويجي",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "حسب العنوان",
+
+  // "browse.comcol.head": "Browse",
   "browse.comcol.head": "استعراض",
-  "browse.empty": "لا يوجد شيء للعرض.",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty": "لا توجد مواد للعرض.",
+
+  // "browse.metadata.author": "Author",
   "browse.metadata.author": "المؤلف",
+
+  // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "تاريخ الإصدار",
+
+  // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "الموضوع",
-  "browse.metadata.title": "عنوان العنوان",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "العنوان",
+
+  // "browse.metadata.srsc": "Subject Category",
   "browse.metadata.srsc": "فئة الموضوع",
-  "browse.metadata.author.breadcrumbs": "مراجعة حسب المؤلف",
-  "browse.metadata.dateissued.breadcrumbs": "تاريخ المراجعة حسب التاريخ",
-  "browse.metadata.subject.breadcrumbs": "مراجعة حسب الموضوع",
-  "browse.metadata.srsc.breadcrumbs": "مراجعة حسب فئة الموضوع",
-  "browse.metadata.nsi.breadcrumbs": "مراجعة حسب هرس العلوم النرويجي",
-  "browse.metadata.title.breadcrumbs": "قم باستعراض العنوان حسب الطلب",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "استعراض حسب المؤلف",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "استعراض حسب التاريخ",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "استعراض حسب الموضوع",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "استعراض حسب فئة الموضوع",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "استعراض حسب فهرس العلوم النرويجي",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "استعراض حسب العنوان",
+
+  // "pagination.next.button": "Next",
   "pagination.next.button": "التالي",
-  "pagination.previous.button": "السابقة",
-  "pagination.next.button.disabled.tooltip": "لا تقرأ من الصفحات من النتائج",
-  "browse.startsWith": "، يبدأ بـ {{ startsWith }}",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "السابق",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "لا مزيد من الصفحات من النتائج",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", يبدأ بـ {{ startsWith }}",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(اختر الشهر)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(اختر السنة)",
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
   "browse.startsWith.choose_year.label": "اختر سنة الإصدار",
-  "browse.startsWith.jump": "تهذيب النتيجة حسب السنة أو الشهر",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "تنقيح النتائج حسب السنة أو الشهر",
+
+  // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "أبريل",
+
+  // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "أغسطس",
+
+  // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "ديسمبر",
+
+  // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "فبراير",
+
+  // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "يناير",
+
+  // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "يوليو",
+
+  // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "يونيو",
+
+  // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "مارس",
+
+  // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "مايو",
+
+  // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(اختر الشهر)",
-  "browse.startsWith.months.none.label": "تاريخ إنشاء الإصدار",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "اختر تاريخ الإصدار",
+
+  // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "نوفمبر",
+
+  // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "أكتوبر",
+
+  // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "سبتمبر",
+
+  // "browse.startsWith.submit": "Browse",
   "browse.startsWith.submit": "استعراض",
-  "browse.startsWith.type_date": "تأهيل النتائج حسب التاريخ",
-  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر المراجعة.",
-  "browse.startsWith.type_text": "تسهيل البحث عن طريق كتابة الرواية الأولى",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "تنقيح النتائج حسب التاريخ",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر استعراض.",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
+
+  // "browse.startsWith.input": "Filter",
   "browse.startsWith.input": "منقح",
+
+  // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "استعراض",
-  "browse.title": "مراجعة حسب الطلب {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title.page": "مراجعة حسب الطلب {{ field }} {{ value }}",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "استعراض حسب {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "استعراض حسب {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "العودة إلى النتائج",
-  "chips.remove": "إزالة الجانب",
+
+  // "chips.remove": "Remove chip",
+  "chips.remove": "إزالة الشريحة",
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
   "claimed-approved-search-result-list-element.title": "مقبول",
-  "claimed-declined-search-result-list-element.title": "تم الرفض وتمت إعادة إنتاجه إلى مقدم الطلب",
-  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت إعادة العمل إلى سير عمل مدير المراجعة",
-  "collection.browse.logo": "تمت القراءة للحصول على شعار للصورة",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى مقدم الطلب",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى سير عمل مدير المراجعة",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "استعراض للحصول على شعار للحاوية",
+
+  // "collection.create.head": "Create a Collection",
   "collection.create.head": "إنشاء حاوية",
-  "collection.create.notifications.success": "تم إنشاء فعال",
-  "collection.create.sub-head": "إنشاء خانة تمكين {{ parent }}",
+
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "تم إنشاء الحاوية بنجاح",
+
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "إنشاء حاوية للمجتمع {{ parent }}",
+
+  // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "أكرتة الحاوية: {{collection}}",
+
+  // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "إلغاء",
-  "collection.delete.confirm": "بالتأكيد",
-  "collection.delete.processing": "غاري الحذف",
-  "collection.delete.head": "تأكد من الحذف",
-  "collection.delete.notification.fail": "عذرا حف",
-  "collection.delete.notification.success": "تم الحذف الفعال",
-  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الهاتف \"{{ dso }}\"",
-  "collection.edit.delete": "حذف هذه الصورة",
-  "collection.edit.head": "تحرير",
-  "collection.edit.breadcrumbs": "تحرير",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "تأكيد",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "جاري الحذف",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "حذف الحاوية",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "تعذر حف الحاوية",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "تم حذف الحاوية بنجاح",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الحاوية \"{{ dso }}\"",
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "حذف هذه الحاوية",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "تحرير الحاوية",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "تحرير الحاوية",
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "مخطط المادة",
-  "collection.edit.tabs.item-mapper.title": "فتح المادة",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "تحرير الحاوية - مخطط المادة",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "إلغاء",
-  "collection.edit.item-mapper.collection": "التام: \"<b>{{name}}</b>\"",
+
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "الحاوية: \"<b>{{name}}</b>\"",
+
+  // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "تخطيط المواد المحددة",
-  "collection.edit.item-mapper.description": "هذه هي أداة المادة والتي بدأت لمديري في تخطيط المنتجات من كعكة صغيرة أخرى إلى هذه الثلاجة. ",
-  "collection.edit.item-mapper.head": "الخامة الأخرى - تخطيط مواد من توفيق",
-  "collection.edit.item-mapper.no-search": "يرجى الاتصال باستعلام للبحث",
-  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أثناء التخطيط {{amount}} مادة.",
+
+  // "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": "هذه هي أداة مخطط المادة والتي تتيح لمديري الحاوية بتخطيط مواد من حاويات أخرى إلى هذه الحاوية. يمكنك البحث عن مواد من حاويات أخرى وتخطيطها، أو استعراض قائمة بالمواد المخططة حاليًا.",
+
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "مخطط المادة - تخطيط مواد من حاويات أخرى",
+
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
+
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أخطاء أثناء تخطيط {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "أخطاء التخطيط",
-  "collection.edit.item-mapper.notifications.map.success.content": "تم التخطيط {{amount}} مادة فعالة.",
+
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "تم تخطيط {{amount}} مادة بنجاح.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "اكتمل التخطيط",
-  "collection.edit.item-mapper.notifications.unmap.error.content": "حدث خطأ أثناء إزالة التخطيطات {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "حدثت أخطأ أثناء إزالة تخطيطات {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "أخطاء إزالة التخطيط",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "بعد إزالة {{amount}} تخطيط فعّال.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "تمت إزالة {{amount}} تخطيط مادة بنجاح.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "اكتملت إزالة التخطيط",
-  "collection.edit.item-mapper.remove": "إزالة التخطيطات المحددة",
-  "collection.edit.item-mapper.search-form.placeholder": "المواد المدروسة...",
-  "collection.edit.item-mapper.tabs.browse": "فحص المواد الجيدة",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "إزالة تخطيطات المادة المحددة",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "بحث المواد...",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "استعراض المواد المخططة",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "تخطيط مواد جديدة",
+
+  // "collection.edit.logo.delete.title": "Delete logo",
   "collection.edit.logo.delete.title": "حذف الشعار",
-  "collection.edit.logo.delete-undo.title": "السماء عن الحذف",
-  "collection.edit.logo.label": "شعار تجاري",
-  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار التعليمات. ",
-  "collection.edit.logo.notifications.add.success": "تم تحميل فيتامين فعال.",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "التراجع عن الحذف",
+
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "شعار الحاوية",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار الحاوية. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "تم تحميل شعار الحاوية بنجاح.",
+
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
-  "collection.edit.logo.notifications.delete.success.content": "تم حذف الشعار الفعال",
+
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "تم حذف شعار الحاوية بنجاح",
+
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
-  "collection.edit.logo.upload": "قم بإسقاط شعار العلامة للتحميل",
-  "collection.edit.notifications.success": "تم تحرير فعال",
+
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "قم بإسقاط شعار الحاوية للتحميل",
+
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "تم تحرير الحاوية بنجاح",
+
+  // "collection.edit.return": "Back",
   "collection.edit.return": "رجوع",
+
+  // "collection.edit.tabs.access-control.head": "Access Control",
   "collection.edit.tabs.access-control.head": "التحكم في الوصول",
-  "collection.edit.tabs.access-control.title": "تحرير البدء - التحكم في الوصول",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "تحرير الحاوية - التحكم في الوصول",
+
+  // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "أكرتة",
-  "collection.edit.tabs.curate.title": "تحرير تحرير - كرتة",
-  "collection.edit.tabs.authorizations.head": ".تصاريح",
-  "collection.edit.tabs.authorizations.title": "تحرير - تصاريح",
+
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "تحرير الحاوية - أكرتة",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "تصاريح",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "تحرير الحاوية - تصاريح",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
   "collection.edit.item.authorizations.load-bundle-button": "تحميل المزيد من الحزم",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
   "collection.edit.item.authorizations.load-more-button": "تحميل المزيد",
-  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات التدفق الكامل",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات تدفق البت للحزمة",
+
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "تحرير الميتاداتا",
-  "collection.edit.tabs.metadata.title": "تحرير تحرير - الميتاداتا",
-  "collection.edit.tabs.roles.head": "تم تعيينه",
-  "collection.edit.tabs.roles.title": "تحرير - التعديل",
-  "collection.edit.tabs.source.external": "لتتمكن من هذه بحصاد محتوياتها من مصدر خارجي",
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "يجب عليك تقديم معرف حزمة التفاصيل الخاصة.",
-  "collection.edit.tabs.source.form.harvestType": "استمرار المحتوى",
-  "collection.edit.tabs.source.form.head": "قوة مصدر خارجي",
-  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميثاداتا",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "تحرير الحاوية - الميتاداتا",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "تعيين الأدوار",
+
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "تحرير الحاوية - الأدوار",
+
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "تقوم هذه الحاوية بحصاد محتواها من مصدر خارجي",
+
+  // "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": "يجب عليك تقديم معرف حزمة للحاوية المستهدفة.",
+
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "المحتوى الجاري حصاده",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "تهيئة مصدر خارجي",
+
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميتاداتا",
+
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "معرف حزمة محددة لمبادرة الأرشيفات المفتوحة",
-  "collection.edit.tabs.source.form.oaiSource": "مقدمة لخدمة المعلومات الأرشيفات المفتوحة",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "ميتاداتا وتدفقات البت (يتطلب دعم ORE)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "غاب الميتاداتا والمراجع إلى تدفقات البت (يطلب دعم ORE)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "موت الميتاتا فقط",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "مقدم خدمة مبادرة الأرشيفات المفتوحة",
+
+  // "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": "حصاد الميتاداتا وتدفقات البت (يتطلب دعم 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": "حصاد الميتاداتا والمراجع إلى تدفقات البت (يتطلب دعم ORE)",
+
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "حصاد الميتاداتا فقط",
+
+  // "collection.edit.tabs.source.head": "Content Source",
   "collection.edit.tabs.source.head": "مصدر المحتوى",
-  "collection.edit.tabs.source.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "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": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم النقر على زر 'تراجع'",
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "تم تجاهل التغييرات",
-  "collection.edit.tabs.source.notifications.invalid.content": "لم يتم الحفاظ على جديدك. ",
-  "collection.edit.tabs.source.notifications.invalid.title": "دياداتا غير صالحة",
-  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تفاصيلك على مصدر محتوى هذه الرسالة.",
+
+  // "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة كل الحقول قبل الحفظ.",
+
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تغييراتك على مصدر محتوى هذه الحاوية.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "تم حفظ مصدر المحتوى",
-  "collection.edit.tabs.source.title": "تحرير - مصدر المحتوى",
+
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "تحرير الحاوية - مصدر المحتوى",
+
+  // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "إضافة",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "قالب المادة",
+
+  // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "إلغاء",
+
+  // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "حذف",
+
+  // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "تحرير",
-  "collection.edit.template.error": "حدث خطأ أثناء حذف التصميم الإلكتروني",
-  "collection.edit.template.head": "تحرير قالب القالب للعباوية \"{{ collection }}\"",
-  "collection.edit.template.label": "قالب",
-  "collection.edit.template.loading": "جاري تحميل التصميم المعماري...",
-  "collection.edit.template.notifications.delete.error": "فشل في حذف قالب المادة",
-  "collection.edit.template.notifications.delete.success": "تم حذف القالب الفعال",
-  "collection.edit.template.title": "تحرير النموذج على موقع الكتروني",
-  "collection.form.abstract": "وصف قصير",
-  "collection.form.description": "نص استعدادي (HTML)",
-  "collection.form.errors.title.required": "يرجى الإدخال اسم العلبة",
-  "collection.form.license": "com",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "حدث خطأ أثناء استرداد عنصر القالب",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "تحرير عنصر القالب للحاوية \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "عنصر القالب",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "جاري تحميل عنصر القالب...",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "فشل حذف قالب المادة",
+
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "تم حذف قالب المادة بنجاح",
+
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "تحرير عنصر القالب",
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "وصف مختصر",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "نص تمهيدي (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "يرجى إدخال اسم الحاوية",
+
+  // "collection.form.license": "License",
+  "collection.form.license": "الترخيص",
+
+  // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "المنشأ",
+
+  // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "نص حقوق النشر (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "الأخبار (HTML)",
+
+  // "collection.form.title": "Name",
   "collection.form.title": "الاسم",
+
+  // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "نوع الكينونة",
-  "collection.listelement.badge": "ابدأ",
-  "collection.logo": "شعار تجاري",
-  "collection.page.browse.search.head": "يبحث",
-  "collection.page.edit": "تحرير هذه الجزئية",
-  "collection.page.handle": "URI الجديد لهذه الكائنات",
-  "collection.page.license": "com",
+
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "الحاوية",
+
+  // "collection.logo": "Collection logo",
+  "collection.logo": "شعار الحاوية",
+
+  // "collection.page.browse.search.head": "Search",
+  // TODO New key - Add a translation
+  "collection.page.browse.search.head": "Search",
+
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "تحرير هذه الحاوية",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI الدائم لهذه الحاوية",
+
+  // "collection.page.license": "License",
+  "collection.page.license": "الترخيص",
+
+  // "collection.page.news": "News",
   "collection.page.news": "الأخبار",
-  "collection.search.results.head": "نتائج البحث",
-  "collection.select.confirm": "بالتأكيد",
-  "collection.select.empty": "لا يوجد شيء للعرض",
-  "collection.select.table.selected": "محدد المعالم",
-  "collection.select.table.select": "تحديد الحاوية",
-  "collection.select.table.deselect": "إلغاء تحديد الحاوية",
-  "collection.select.table.title": "عنوان العنوان",
-  "collection.source.controls.head": "إعدادات التحكم في",
-  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء الاختبار",
-  "collection.source.controls.test.failed": "فشل العناصر المكونة لها",
-  "collection.source.controls.test.completed": "كلمات بمعنى: أدى إلى النهاية",
-  "collection.source.controls.test.submit": "تم اختبار التهيئة",
+
+  // "collection.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "collection.search.results.head": "Search Results",
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "تأكيد المحدد",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "لا توجد حاويات للعرض",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "الحاويات المحددة",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "تحديد حاوية",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "إلغاء تحديد حاوية",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "العنوان",
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "إعدادات التحكم في الحصاد",
+
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء اختبار الإعدادات",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "فشل البرنامج النصي لاختبار الإعدادات",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "انتهى البرنامج النصي لاختبار الإعدادات بنجاح",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "اختبار التهيئة",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "جاري اختبار التهيئة...",
-  "collection.source.controls.import.submit.success": "تم البدء بالتنشيط الفعال",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "تم بدء الاستيراد بنجاح",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "حدث خطأ ما أثناء بدء الاستيراد",
+
+  // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "استيراد الآن",
+
+  // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "جاري الاستيراد...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "حدث خطأ أثناء الاستيراد",
+
+  // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "اكتمل الاستيراد",
-  "collection.source.controls.reset.submit.success": "تم البدء في البدء في المستقبل البعيد للاستيراد الفعال",
-  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء البدء في إعادة الاستيراد",
-  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة الاستيراد",
-  "collection.source.controls.reset.completed": "اكتملت العملية المتعلقة بإعادة الاستيراد",
-  "collection.source.controls.reset.submit": "أعد تعيينه لإعادة الاستيراد",
-  "collection.source.controls.reset.running": "جاري إعادة المركز للاستيراد...",
-  "collection.source.controls.harvest.status": "حالة:",
-  "collection.source.controls.harvest.start": "وقت البدء:",
-  "collection.source.controls.harvest.last": "تم آخر مرة:",
-  "collection.source.controls.harvest.message": "معلومات هناك:",
-  "collection.source.controls.harvest.no-information": "غير محتمل",
-  "collection.source.update.notifications.error.content": "تم اختبارها ولم لا تعمل ك.",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "تم بدء عملية إعادة التعيين وإعادة الاستيراد بنجاح",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء بدء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "اكتملت عملية إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "إعادة تعيين وإعادة استيراد",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "جاري إعادة التعيين وإعادة الاستيراد...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "حالة الحصاد:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "وقت بدء الحصاد:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "آخر مرة تم الحصاد:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "معلومات الحصاد:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "غير قابل للتطبيق",
+
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "تم اختبار الإعدادات المتوفرة ولم تعملk.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "خطأ في الخادم",
-  "communityList.breadcrumbs": "اجمعها",
-  "communityList.tabTitle": "اجمعها",
-  "communityList.title": "اجمعها",
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "قائمة المجتمعات",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "قائمة المجتمعات",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title": "قائمة المجتمعات",
+
+  // "communityList.showMore": "Show More",
   "communityList.showMore": "عرض المزيد",
-  "communityList.expand": "الأوقات {{ name }}",
-  "communityList.collapse": "طيء {{ name }}",
-  "community.browse.logo": "تم الحصول على معلومات حول شعار المجتمع",
-  "community.subcoms-cols.breadcrumbs": "المجتمعات الفرعية والمجموعات",
+
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "توسيع {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "طي {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "استعراض للحصول على شعار المجتمع",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  // TODO New key - Add a translation
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
+  // "community.create.head": "Create a Community",
   "community.create.head": "إنشاء مجتمع",
-  "community.create.notifications.success": "تم إنشاء المجتمع الفعال",
-  "community.create.sub-head": "إنشاء مجتمع فرعي متاح {{ parent }}",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "تم إنشاء المجتمع بنجاح",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "إنشاء مجتمع فرعي للمجتمع {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "أكرتة المجتمع: {{community}}",
+
+  // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "إلغاء",
-  "community.delete.confirm": "بالتأكيد",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "تأكيد",
+
+  // "community.delete.processing": "Deleting...",
   "community.delete.processing": "جاري الحذف...",
+
+  // "community.delete.head": "Delete Community",
   "community.delete.head": "حذف المجتمع",
-  "community.delete.notification.fail": "عذرًا لحذف المجتمع",
-  "community.delete.notification.success": "تم حذف المجتمع الفعال",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "تعذر حذف المجتمع",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "تم حذف المجتمع بنجاح",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "هل أنت متأكد من أنك تريد حذف المجتمع \"{{ dso }}\"",
+
+  // "community.edit.delete": "Delete this community",
   "community.edit.delete": "حذف هذا المجتمع",
+
+  // "community.edit.head": "Edit Community",
   "community.edit.head": "تحرير المجتمع",
+
+  // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "تحرير المجتمع",
+
+  // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "حذف الشعار",
-  "community.edit.logo.delete-undo.title": "السماء عن الحذف",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "التراجع عن الحذف",
+
+  // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "شعار المجتمع",
-  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. ",
-  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع الفعال.",
+
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع بنجاح.",
+
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
-  "community.edit.logo.notifications.delete.success.content": "تم حذف العنصر الفعال",
+
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "تم حذف شعار المجتمع بنجاح",
+
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
+
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "قم بإسقاط شعار المجتمع للتحميل",
-  "community.edit.notifications.success": "تم تحرير المجتمع الفعال",
-  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لهذا الغد",
+
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "تم تحرير المجتمع بنجاح",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لإجراء هذا التغيير",
+
+  // "community.edit.notifications.error": "An error occured while editing the community",
   "community.edit.notifications.error": "حدث خطأ أثناء تحرير المجتمع",
+
+  // "community.edit.return": "Back",
   "community.edit.return": "رجوع",
+
+  // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "أكرتة",
-  "community.edit.tabs.curate.title": "تحرير المجتمع - كورة",
+
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "تحرير المجتمع - أكرتة",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
   "community.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
   "community.edit.tabs.access-control.title": "تحرير المجتمع - التحكم في الوصول",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "تحرير الميتاداتا",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "تحرير المجتمع - الميتاداتا",
-  "community.edit.tabs.roles.head": "مواعيد محددة",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "تعيين أدوار",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "تحرير المجتمع - أدوار",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "التصاريح",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "تحرير المجتمع - التصاريح",
+
+  // "community.listelement.badge": "Community",
   "community.listelement.badge": "مجتمع",
+
+  // "community.logo": "Community logo",
   "community.logo": "شعار المجتمع",
+
+  // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "لا شيء",
+
+  // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "إنشاء",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
   "comcol-role.edit.create.error.title": "فشل إنشاء مجموعة لدور '{{ role }}'",
-  "comcol-role.edit.restrict": "انها",
+
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "تقييد",
+
+  // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "حذف",
-  "comcol-role.edit.delete.error.title": "فشل في حذف مجموعة الدور '{{ role }}'",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "فشل حذف مجموعة الدور '{{ role }}'",
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "المسؤولون",
+
+  // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "المسؤولون",
-  "comcol-role.edit.community-admin.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو العهد، وإدارة أو تعيين المديرين المجتمعيين أو المعتمدين. ",
-  "comcol-role.edit.collection-admin.description": "تحديد مديري يبدأ من البدء في المواد إلى هذه المشاركة، وتحرير ميتاداتا المادة (بعد الحضور)، بحضور (تخطيط) المواد يبدأ من الآخر إلى هذه المشاركة (ترغب في المشاركة في المشاركة).",
-  "comcol-role.edit.submitters.name": "شيرون",
-  "comcol-role.edit.submitters.description": "الأشخاص الإلكترونيين والمجموعات الذين يملكون القدرة على تقديم منتجات جديدة إلى هذه البسيطة.",
-  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضية",
-  "comcol-role.edit.item_read.description": "الأشخاص الإلكترونيون والمجموعات الذين يمكنهم قراءة المواد الجديدة تم تقديمها إلى هذه البسيطة. ",
-  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الإلكترونية للمواد حاليًا إلى معرف غير معرف.",
+
+  // "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": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
+
+  // "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": "يقرر مديري الحاوية من يمكنه تقديم المواد إلى الحاوية، وتحريرميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحاوية من الحاويات الأخرى إلى هذه الحاوية (تخضع للتصريح لتلك الحاوية).",
+
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "المقدمون",
+
+  // "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": "الأشخاص الإلكترونيين والمجموعات الذين يملكون صلاحية تقديم مواد جديدة إلى هذه الحاوية.",
+
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضي",
+
+  // "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": "الأشخاص الإلكترونيون والمجموعات  الذين يمكنهم قراءة المواد الجديدة التي تم تقديمها إلى هذه الحاوية. التغييرات على هذا الدور ليست بأثر رجعي. ستظل المواد الحالية الموجودة في النظام قابلة للعرض بواسطة أولئك الذين يملكون الوصول للقراءة في وقت إضافتها.",
+
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الافتراضية للمواد الواردة حاليًا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "وصول قراءة تدفق البت الافتراضي",
-  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو العهد، وإدارة أو تعيين المديرين المجتمعيين أو المعتمدين. ",
-  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت حاليا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
+
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت الواردة حاليًا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "المحررون",
-  "comcol-role.edit.editor.description": "يمكن للمحررون تحرير ميتاداتا للعروض المقدمة، ثم قبولها أو رفضها.",
+
+  // "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": "يمكن للمحررون تحرير ميتاداتا التقديمات الواردة، ثم قبولها أو رفضها.",
+
+  // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "المحررون النهائيون",
-  "comcol-role.edit.finaleditor.description": "يمكن للمحرر النهائي لتحرير ميتاداتا التقديمات المقدمة، لكن لا يمكنهم رفضها.",
+
+  // "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": "يمكن للمحررون النهائيون تحرير ميتاداتا التقديمات الواردة، لكن لا يمكنهم رفضها.",
+
+  // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "المراجعون",
-  "comcol-role.edit.reviewer.description": "يمكن للمراجعين قبول أو رفض التقديم. ",
-  "comcol-role.edit.scorereviewers.name": "نقاط الضعفاء",
-  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين أن ترسل المشاركات إلينا، وهذا ما يحدد ما إذا كان الرفض أم لا.",
-  "community.form.abstract": "وصف قصير",
-  "community.form.description": "نص استعدادي (HTML)",
-  "community.form.errors.title.required": "الرجاء الاتصال باسم مجتمع",
+
+  // "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": "يمكن للمراجعين قبول أو رفض التقديمات الواردة. غير أنه لا يمكنهم تحرير ميتاداتا التقديم..",
+
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "نقاط المراجعين",
+
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين منح نقاط للمشاركات الواردة، وهذا سيحدد ما إذا كان سيتم رفض التقديم أم لا.",
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "وصف مختصر",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "نص تمهيدي (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "يرجى إدخال اسم مجتمع",
+
+  // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "نص حقوق النشر (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "الأخبار (HTML)",
+
+  // "community.form.title": "Name",
   "community.form.title": "الاسم",
+
+  // "community.page.edit": "Edit this community",
   "community.page.edit": "تحرير هذا المجتمع",
-  "community.page.handle": "URI الجديد لهذا المجتمع",
-  "community.page.license": "com",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "ال URI الدائم لهذا المجتمع",
+
+  // "community.page.license": "License",
+  "community.page.license": "الترخيص",
+
+  // "community.page.news": "News",
   "community.page.news": "الأخبار",
-  "community.all-lists.head": "الكونيات الحاويات",
-  "community.search.results.head": "نتائج البحث",
-  "community.sub-collection-list.head": "توفيق هذا المجتمع",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "المجتمعات الفرعية والحاويات",
+
+  // "community.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "community.search.results.head": "Search Results",
+
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "حاويات هذا المجتمع",
+
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "مجتمعات هذا المجتمع",
+
+  // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "قبول الكل",
-  "cookies.consent.accept-selected": "قبول البناء",
-  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك اختيار)",
+
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "قبول المحدد",
+
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك الانسحاب)",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(انسحاب)",
-  "cookies.consent.app.purpose": "اللحوم",
-  "cookies.consent.app.required.description": "هذا التطبيق مطلوب تكرارا",
-  "cookies.consent.app.required.title": "(مطلوب مرة أخرى)",
-  "cookies.consent.app.disable-all.description": "استخدم هذا الزر لتفعيل جميع الخدمات أو جونسونها.",
-  "cookies.consent.app.disable-all.title": "تفعيل أو تفعيل كل الخدمات",
-  "cookies.consent.update": "لقد قمت بتغيير بعض التغييرات منذ الآن، يرجى تحديث موافقتك.",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "الغرض",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "هذا التطبيق مطلوب دائماً",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(مطلوب دائماً)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "استخدم هذا التبديل لتفعيل كل الخدمات أو تعطيلها.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "تفعيل أو تعطيل كل الخدمات",
+
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "لقد حدثت بعض التغييرات منذ زيارتك الأخيرة، يرجى تحديث موافقتك.",
+
+  // "cookies.consent.close": "Close",
   "cookies.consent.close": "إغلاق",
-  "cookies.consent.decline": "الرفض",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "رفض",
+
+  // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "لا بأس",
+
+  // "cookies.consent.save": "Save",
   "cookies.consent.save": "حفظ",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
   "cookies.consent.content-notice.title": "الموافقة على ملفات تعريف الارتباط",
-  "cookies.consent.content-notice.description": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>. <br/> لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
-  "cookies.consent.content-notice.description.no-privacy": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>.",
+
+  // "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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>. <br/> لمعرفة المزيد، يرجى قراءة {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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>.",
+
+  // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "تخصيص",
-  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي تجمعها عنك.",
+
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي نقوم بجمعها عنك.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "سياسة الخصوصية",
+
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
-  "cookies.consent.content-modal.title": "المعلومات التي بجمعها",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "المعلومات التي نقوم بجمعها",
+
+  // "cookies.consent.content-modal.services": "services",
   "cookies.consent.content-modal.services": "خدمات",
+
+  // "cookies.consent.content-modal.service": "service",
   "cookies.consent.content-modal.service": "خدمة",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "استيثاق",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "مطلوب لتسجيل دخولك",
+
+  // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "التفضيلات",
-  "cookies.consent.app.description.preferences": "مطلوب تحسين تفضيلاتك",
-  "cookies.consent.app.title.acknowledgement": "تأهيل",
-  "cookies.consent.app.description.acknowledgement": "مطلوب حفظك وموافقتك",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "مطلوب لحفظ تفضيلاتك",
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "إقرار",
+
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "مطلوب لحفظ إقراراتك وموافقاتك",
+
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "تحليلات جوجل",
-  "cookies.consent.app.description.google-analytics": "يسمح لنا بتتبع البيانات الإحصائية",
+
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
   "cookies.consent.app.title.google-recaptcha": "جوجل ريكابتشا",
-  "cookies.consent.app.description.google-recaptcha": "نحن نستخدم خدمة google reCAPTCHA أثناء التسجيل واستعادة كلمة المرور",
-  "cookies.consent.purpose.functional": "فعالة",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  // TODO New key - Add a translation
+  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "وظيفي",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "إحصائي",
-  "cookies.consent.purpose.registration-password-recovery": "التسجيل و استعادة كلمة المرور",
+
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "التسجيل واستعادة كلمة المرور",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "مشاركة",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "إنشاء صفحة الاقتباس",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "التحقق من الروابط في الميتاداتا",
+
+  // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "لا توجد مهمة",
+
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "تنسيقات تدفق بت البروفايل",
-  "curation-task.task.requiredmetadata.label": "التحقق من الميتاداتا المطلوبة",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "التحقق للميتاداتا المطلوبة",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "مترجم ميكروسوفت",
-  "curation-task.task.vscan.label": "حذف الفيروسات",
-  "curation-task.task.registerdoi.label": "تسجيل المعرفة الرقمية",
-  "curation.form.task-select.label": "مهم:",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "مسح الفيروسات",
+
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "تسجيل معرف الكائن الرقمي",
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "المهمة:",
+
+  // "curation.form.submit": "Start",
   "curation.form.submit": "بدء",
-  "curation.form.submit.success.head": "تم بدء مهمة فعالة فعالة",
-  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى السجن.",
-  "curation.form.submit.error.head": "فشل تشغيل مهمة أخرى",
+
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "تم بدء مهمة الأكرتة بنجاح",
+
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى صفحة العملية المقابلة.",
+
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "فشل تشغيل مهمة الأكرتة",
+
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "حدث خطأ أثناء محاولة بدء مهمة الأكرتة.",
-  "curation.form.submit.error.invalid-handle": "تعذر تحديد يد هذا",
-  "curation.form.handle.label": "مقبض:",
-  "curation.form.handle.hint": "تلميح: قم برجاء زيارة [your-handle-prefix]/0 لاستخدام مهمة عبر الموقع قادرة (قد لا تدعم جميع هذه الإمكانية)",
-  "deny-request-copy.email.message": "عزيزي {{ recipientName }},\n{{ itemUrl }}\"({{ itemName }})، والتي قمت بتأليفها.\n\n\n{{ authorName }} <{{ authorEmail }}>",
-  "deny-request-copy.email.subject": "طلب نسخة من الوثيقة",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "تعذر تحديد هاندل هذا الكائن",
+
+  // "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "هاندل:",
+
+  // "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": "تلميح: قم بإدخال [your-handle-prefix]/0 لتشغيل مهمة عبر الموقع بأكمله (قد لا تدعم جميع المهام هذه الإمكانية)",
+
+  // "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": "عزيزي {{ recipientName }},\nردًا على طلبك، يؤسفني إبلاغك أنه لا يمكن إرسال نسخة من الملف الذي قمت بطلبه، فيما يتعلق بالوثيقة: \"{{ itemUrl }}\" ({{ itemName }}), والتي قمت بتأليفها.\n\nمع أطيب التحيات,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "deny-request-copy.error": "An error occurred",
   "deny-request-copy.error": "لقد حدث خطأ",
-  "deny-request-copy.header": "طلب طلب نسخة أوكلاند",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "رفض طلب نسخ الوثيقة",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
   "deny-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب",
-  "deny-request-copy.success": "تم الرفض للطلب الفعال",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "تم رفض طلب المادة بنجاح",
+
+  // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "بدون عنوان",
+
+  // "dso.name.unnamed": "Unnamed",
   "dso.name.unnamed": "بدون اسم",
+
+  // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "حاوية جديدة",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "إنشاء حاوية جديدة في",
+
+  // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "مجتمع جديد",
+
+  // "dso-selector.create.community.or-divider": "or",
   "dso-selector.create.community.or-divider": "أو",
+
+  // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "إنشاء مجتمع جديد في",
+
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "إنشاء مجتمع مستوى أعلى جديد",
+
+  // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "مادة جديدة",
+
+  // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "إنشاء مادة جديدة في",
+
+  // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "تقديم جديد",
-  "dso-selector.edit.collection.head": "تحرير",
+
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "تحرير الحاوية",
+
+  // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "تحرير المجتمع",
+
+  // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "تحرير المادة",
-  "dso-selector.error.title": "حدث خطأ أثناء البحث عنه {{ type }}",
-  "dso-selector.export-metadata.dspaceobject.head": "قم باستيراد بيانات ميتا من",
-  "dso-selector.export-batch.dspaceobject.head": "قم باستيراد دفعة (ZIP) من",
-  "dso-selector.import-batch.dspaceobject.head": "قم باستيراد دفعة من",
-  "dso-selector.no-results": "لم يتم العثور عليها {{ type }}",
-  "dso-selector.placeholder": "بحثت عن {{ type }}",
-  "dso-selector.select.collection.head": "تحديد الحاوية",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "حدث خطأ أثناء البحث عن {{ type }}",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "استيراد ميتاداتا من",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "استيراد دفعة (ZIP) من",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "استيراد دفعة من",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "لم يتم العثور على {{ type }}",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "بحث عن {{ type }}",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "تحديد حاوية",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
   "dso-selector.set-scope.community.head": "تحديد نطاق البحث",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "بحث دي سبيس بالكامل",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
   "dso-selector.set-scope.community.or-divider": "أو",
-  "dso-selector.set-scope.community.input-header": "ابحث عن حاوية أو مجتمع",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "البحث عن حاوية أو مجتمع",
+
+  // "dso-selector.claim.item.head": "Profile tips",
   "dso-selector.claim.item.head": "نصائح الملف الشخصي",
-  "dso-selector.claim.item.body": "هذه هي الملفات الشخصية التي قد تكون ذات صلة بك. ",
+
+  // "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": "هذه هي الملفات الشخصية الموجودة التي قد تكون ذات صلة بك. إذا تعرفت على نفسك في أحد هذه الملفات الشخصية، قم بتحديده وفي صفحة التفاصيل، من بين الخيارات، اختر المطالبة به. بخلاف ذلك، يمكنك إنشاء ملف شخصي جديد من البداية باستخدام الزر أدناه.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
   "dso-selector.claim.item.not-mine-label": "لا يعود أي من هذا لي",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "إنشاء واحد جديد",
-  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى تحديث مرة أخرى ↻",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى التحديث مرة أخرى ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
   "supervision-group-selector.header": "محدد مجموعة الإشراف",
-  "supervision-group-selector.select.type-of-order.label": "حدد نوع الصف",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "حدد نوع الرتبة",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
   "supervision-group-selector.select.type-of-order.option.none": "لا شيء",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
   "supervision-group-selector.select.type-of-order.option.editor": "محرر",
-  "supervision-group-selector.select.type-of-order.option.observer": "انتبه",
-  "supervision-group-selector.select.group.label": "حدد المجموعة",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "مراقب",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "حدد مجموعة",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
   "supervision-group-selector.button.cancel": "إلغاء",
+
+  // "supervision-group-selector.button.save": "Save",
   "supervision-group-selector.button.save": "حفظ",
-  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الطائرة",
-  "supervision-group-selector.select.group.error": "يرجى تحديد المجموعة",
-  "supervision-group-selector.notification.create.success.title": "تم إنشاء تشكيلة متنوعة فعالة {{ name }}",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الرتبة",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "يرجى تحديد مجموعة",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "تم إنشاء رتبة الإشراف للمجموعة بنجاح {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
   "supervision-group-selector.notification.create.failure.title": "خطأ",
-  "supervision-group-selector.notification.create.already-existing": "هناك بالفعل خيار البحث عن هذه المواد المحددة",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "يوجد بالفعل رتبة إشراف على هذه المادة للمجموعة المحددة",
+
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "تصدير الميتاداتا لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "هل أنت متأكد أنك تريد تصدير الميتاداتا لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "إلغاء",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "تصدير",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.header": "تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.info": "هل أنت متأكد أنك تريد تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
   "confirmation-modal.export-batch.cancel": "إلغاء",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
   "confirmation-modal.export-batch.confirm": "تصدير",
+
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "حذف الشخص الإلكتروني \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الهاتف الإلكتروني \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الشخص الإلكتروني \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "حذف",
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "حذف الملف الشخصي",
-  "confirmation-modal.delete-profile.info": "هل أنت متأكد من أنك تريد حذف ملفك الشخصي",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "هل أنت متأكد أنك تريد حذف ملف الشخصي الخاص بك",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
   "confirmation-modal.delete-profile.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "حذف",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
   "confirmation-modal.delete-subscription.header": "حذف الاشتراك",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
   "confirmation-modal.delete-subscription.info": "هل أنت متأكد من أنك تريد حذف الاشتراك لـ \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
   "confirmation-modal.delete-subscription.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
   "confirmation-modal.delete-subscription.confirm": "حذف",
-  "error.bitstream": "حدث خطأ أثناء تدفق البالت",
-  "error.browse-by": "حدث خطأ أثناء المواد",
-  "error.collection": "حدث خطأ أثناء دخول",
-  "error.collections": "حدث خطأ أثناء فترة مقبولة",
-  "error.community": "حدث خطأ أثناء المجتمع",
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "حدث خطأ أثناء جلب تدفق البت",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "حدث خطأ أثناء جلب المواد",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection": "حدث خطأ أثناء جلب الحاوية",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections": "حدث خطأ أثناء جلب الحاويات",
+
+  // "error.community": "Error fetching community",
+  "error.community": "حدث خطأ أثناء جلب المجتمع",
+
+  // "error.identifier": "No item found for the identifier",
   "error.identifier": "لم يتم العثور على أي مادة للمعرف",
+
+  // "error.default": "Error",
   "error.default": "خطأ",
-  "error.item": "حدث خطأ أثناء حضور المادة",
-  "error.items": "حدث خطأ أثناء المواد",
-  "error.objects": "حدث خطأ أثناء إجراء الكائنات الفضائية",
-  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث العروض",
-  "error.search-results": "حدث خطأ أثناء نتائج البحث",
-  "error.invalid-search-query": "استعلام البحث غير صالح.  <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على قراءة المعلومات حول هذا الخطأ.",
-  "error.sub-collections": "حدث خطأ أثناء تقديم العرض",
-  "error.sub-communities": "حدث خطأ أثناء النظر في الجسد",
-  "error.submission.sections.init-form-error": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج العنصر الخاص بك.  <br> <br>",
-  "error.top-level-communities": "حدث خطأ خلال مجتمعات المستوى الأعلى",
-  "error.validation.license.notgranted": "يجب عليك أن تطلب من هذا الأمر التقديم الخاص بك. ",
+
+  // "error.item": "Error fetching item",
+  "error.item": "حدث خطأ أثناء جلب المادة",
+
+  // "error.items": "Error fetching items",
+  "error.items": "حدث خطأ أثناء جلب المواد",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects": "حدث خطأ أثناء جلب الكائنات",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث التقديمات",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "حدث خطأ أثناء جلب نتائج البحث",
+
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "استعلام البحث غير صالح. يرجى مراجعة <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على مزيد من المعلومات حول هذا الخطأ.",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "حدث خطأ أثناء جلب الحاويات الفرعية",
+
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "حدث خطأ أثناء جلب المجتمعات الفرعية",
+
+  // "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": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج الإدخال الخاص بك. التفاصيل أدناه : <br> <br>",
+
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "حدث خطأ أثناء جلب مجتمعات المستوى الأعلى",
+
+  // "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": "يجب عليك منح هذا الترخيص لإكمال عملية التقديم الخاصة بك. إذا لم تتمكن من منح هذا الترخيص في هذا الوقت، يمكنك حفظ عملك والعودة لاحقاً أو إزالة التقديم.",
+
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "هذا الإدخال مقيد بالنمط الحالي: {{ pattern }}.",
-  "error.validation.filerequired": "تحميل الملف المشروط",
-  "error.validation.required": "هذا مطلوب الحقل",
+
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "تحميل الملف إلزامي",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "هذا الحقل مطلوب",
+
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "البريد الإلكتروني غير صالح",
-  "error.validation.emailTaken": "هذا البريد الإلكتروني السؤال بالفعل",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "هذا البريد الإلكتروني مأخوذ بالفعل",
+
+  // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "هذه المجموعة موجودة بالفعل",
-  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. ",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقول العنصر والمؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
   "error.validation.metadata.name.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 32 حرفاً",
-  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاً",
-  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. ",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاًs",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقل المؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
   "error.validation.metadata.element.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
   "error.validation.metadata.qualifier.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
   "error.validation.metadata.qualifier.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
-  "feed.description": " مشاركة التعليقات",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": " ملاحظات Syndication",
+
+  // "file-download-link.restricted": "Restricted bitstream",
   "file-download-link.restricted": "دفق البت المقيد",
-  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات هذه المادة",
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات لهذه المادة",
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "حقوق النشر © 2002-{{ year }}",
+
+  // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "برنامج دي سبيس",
+
+  // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "ليراسيس",
+
+  // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "إعدادات ملفات تعريف الارتباط",
+
+  // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "سياسة الخصوصية",
-  "footer.link.end-user-agreement": "الاستخدام النهائي",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "اتفاقية المستخدم النهائي",
+
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "إرسال الملاحظات",
-  "footer.link.coar-notify-support": "إخطار COAR",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
+  // TODO New key - Add a translation
+  "footer.link.coar-notify-support": "COAR Notify",
+
+  // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "هل نسيت كلمة المرور",
-  "forgot-email.form.info": "قم بالضغط على عنوان البريد الإلكتروني ليس بالحساب.",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "قم بإدخال عنوان البريد الإلكتروني المرتبط بالحساب.",
+
+  // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "عنوان البريد الإلكتروني *",
-  "forgot-email.form.email.error.required": "الرجاء ملء عنوان البريد الإلكتروني",
-  "forgot-email.form.email.error.not-email-form": "برجاء ملء عنوان بريد إلكتروني صالح",
-  "forgot-email.form.email.hint": "سيتم إرسال بريد الإلكتروني إلى هذا العنوان ويتضمن المزيد من التعليمات.",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "يرجى ملء عنوان البريد الإلكتروني",
+
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "يرجى ملء عنوان بريد إلكتروني صالح",
+
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "سيتم إرسال بريد إلكتروني إلى هذا العنوان يتضمن المزيد من التعليمات.",
+
+  // "forgot-email.form.submit": "Reset password",
   "forgot-email.form.submit": "إعادة تعيين كلمة المرور",
-  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني وإعادة تعيين كلمة المرور",
-  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL الخاص بالمزيد.",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني لإعادة تعيين كلمة المرور",
+
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL خاص وتعليمات إضافية.",
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور",
-  "forgot-email.form.error.content": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب بالإضافة إلى عنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "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": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب المرتبط بعنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "نسيت كلمة المرور",
+
+  // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "نسيت كلمة المرور",
-  "forgot-password.form.info": "قم بتأكيد كلمة المرور الجديدة في الشريط أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في الشريط الثاني.",
+
+  // "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": "قم بإدخال كلمة المرور الجديدة في المربع أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
+
+  // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "الحماية والأمان",
+
+  // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "تعريف",
+
+  // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "عنوان البريد الإلكتروني: ",
+
+  // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "كلمة المرور",
-  "forgot-password.form.label.passwordrepeat": "إعادة الكتابة للتأكيد",
-  "forgot-password.form.error.empty-password": "يرجى الاتصال بكلمة المرور في المجالات السابقة.",
+
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "يرجى إدخال كلمة المرور في المربعات أعلاه.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
+
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "حدث خطأ أثناء محاولة تقديم كلمة المرور الجديدة",
-  "forgot-password.form.notification.success.content": "تمت إعادة تعيين كلمة فعالة. ",
+
+  // "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": "تمت إعادة تعيين كلمة المرور بنجاح. لقد قمت بتسجيل الدخول كمستخدم تم إنشاؤه.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "اكتملت إعادة تعيين كلمة المرور",
+
+  // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "تقديم كلمة المرور",
+
+  // "form.add": "Add more",
   "form.add": "إضافة المزيد",
-  "form.add-help": "انقر هنا لإدخال النص الحالي",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "انقر هنا لإضافة الإدخال الحالي وإضافة إدخال آخر",
+
+  // "form.cancel": "Cancel",
   "form.cancel": "إلغاء",
-  "form.clear": "تعديل التعديل",
-  "form.clear-help": "انقر هنا القيمة المحددة",
-  "form.discard": "لا",
-  "form.drag": "يسحب",
+
+  // "form.clear": "Clear",
+  "form.clear": "مسح",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "انقر هنا لإزالة القيمة المحددة",
+
+  // "form.discard": "Discard",
+  "form.discard": "تجاهل",
+
+  // "form.drag": "Drag",
+  "form.drag": "سحب",
+
+  // "form.edit": "Edit",
   "form.edit": "تحرير",
+
+  // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "انقر هنا لتحرير القيمة المحددة",
+
+  // "form.first-name": "First name",
   "form.first-name": "الاسم الأول",
-  "form.group-collapse": "طيء",
+
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "طي",
+
+  // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "انقر هنا للطي",
-  "form.group-expand": "الأوقات",
-  "form.group-expand-help": "انقر هنا للتوسيع ولم المزيد من العناصر",
+
+  // "form.group-expand": "Expand",
+  "form.group-expand": "توسيع",
+
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "انقر هنا للتوسيع وإضافة المزيد من العناصر",
+
+  // "form.last-name": "Last name",
   "form.last-name": "اسم العائلة",
+
+  // "form.loading": "Loading...",
   "form.loading": "جاري التحميل...",
-  "form.lookup": "هان عن",
-  "form.lookup-help": "انقر هنا للبحث عن علاقة حالة",
-  "form.no-results": "لم يتم العثور على النتائج",
-  "form.no-value": "لم يتم توفير أي قيمة",
+
+  // "form.lookup": "Lookup",
+  "form.lookup": "ابحث عن",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "انقر هنا للبحث عن علاقة حالية",
+
+  // "form.no-results": "No results found",
+  "form.no-results": "لم يتم العثور على نتائج",
+
+  // "form.no-value": "No value entered",
+  "form.no-value": "لم يتم إدخال أي قيمة",
+
+  // "form.other-information.email": "Email",
   "form.other-information.email": "البريد الإلكتروني",
+
+  // "form.other-information.first-name": "First Name",
   "form.other-information.first-name": "الاسم الأول",
+
+  // "form.other-information.insolr": "In Solr Index",
   "form.other-information.insolr": "في فهرس سولر",
+
+  // "form.other-information.institution": "Institution",
   "form.other-information.institution": "المؤسسة",
+
+  // "form.other-information.last-name": "Last Name",
   "form.other-information.last-name": "اسم العائلة",
+
+  // "form.other-information.orcid": "ORCID",
   "form.other-information.orcid": "أوركيد",
+
+  // "form.remove": "Remove",
   "form.remove": "إزالة",
+
+  // "form.save": "Save",
   "form.save": "حفظ",
+
+  // "form.save-help": "Save changes",
   "form.save-help": "حفظ التغييرات",
+
+  // "form.search": "Search",
   "form.search": "بحث",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "انقر هنا للبحث عن المراسلات الحالية",
+
+  // "form.submit": "Save",
   "form.submit": "حفظ",
+
+  // "form.create": "Create",
   "form.create": "إنشاء",
-  "form.number-picker.decrement": "إن.قاص {{field}}",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "إنقاص {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
   "form.number-picker.increment": "زيادة {{field}}",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "قم بإسقاط المادة في الموضع الجديد",
-  "grant-deny-request-copy.deny": "لا تهتم بقراءة",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "لا تقم بإرسال نسخة",
+
+  // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "رجوع",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
   "grant-deny-request-copy.email.message": "رسالة إضافية اختيارية",
-  "grant-deny-request-copy.email.message.empty": "الرجاء إرسال الرسالة",
-  "grant-deny-request-copy.email.permissions.info": "يمكنك إلغاء هذه الطريقة لإلغاء النظر في الإلكترونيات للوصول إلى أكسفورد، وتقليل الاضطرار إلى الرد على هذه الطلبات. ",
-  "grant-deny-request-copy.email.permissions.label": "تغيير للوصول حر",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "يرجى إدخال رسالة",
+
+  // "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": "يمكنك استغلال هذه المناسبة لإعادة النظر في قيود الوصول على الوثيقة، لتجنب الاضطرار إلى الرد على هذه الطلبات. إذا كنت ترغب في مطالبة مديري المستودع بإزالة هذه القيود، فيرجى تحديد المربع أدناه.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "تغيير إلى وصول حر",
+
+  // "grant-deny-request-copy.email.send": "Send",
   "grant-deny-request-copy.email.send": "إرسال",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
   "grant-deny-request-copy.email.subject": "الموضوع",
-  "grant-deny-request-copy.email.subject.empty": "يرجى الإرسال موضوع",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "يرجى إدخال موضوع",
+
+  // "grant-deny-request-copy.grant": "Send copy",
   "grant-deny-request-copy.grant": "إرسال نسخة",
-  "grant-deny-request-copy.header": "نسخة الطلب من أوكسلي",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "طلب نسخة من الوثيقة",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
   "grant-deny-request-copy.home-page": "انتقل بي إلى الصفحة الرئيسية",
-  "grant-deny-request-copy.intro1": "إذا كنت أحد الكتبي في جامعة أكسفورد <a href='{{ url }}'>{{ name }}</a>، يرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
-  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد على آلية البريد الإلكتروني يمكنك تحريرها.",
-  "grant-deny-request-copy.processed": "تنفيذ هذا الطلب بالفعل. ",
-  "grant-request-copy.email.subject": "طلب نسخة من الوثيقة",
+
+  // "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": "إذا كنت أحد مؤلفي الوثيقة <a href='{{ url }}'>{{ name }}</a>, فيرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد مقترحة بالبريد الإلكتروني يمكنك تحريرها.",
+
+  // "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": "تمت معالجة هذا الطلب بالفعل. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "grant-request-copy.error": "An error occurred",
   "grant-request-copy.error": "لقد حدث خطأ",
-  "grant-request-copy.header": "طلب منح نسخة من أوسكار",
-  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. ",
-  "grant-request-copy.success": "تم تقديم المساعدة الفعالة",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "طلب منح نسخة من الوثيقة",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. وسيتم إرفاق الوثيقة المطلوبة.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "تم منح طلب المادة بنجاح",
+
+  // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "كشف الصحة",
+
+  // "health-page.heading": "Health",
   "health-page.heading": "كشف الصحة",
+
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "معلومات",
+
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "الحالة",
-  "health-page.error.msg": "خدمة الكتاب العام غير المؤقت",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "خدمة الفحص الصحي غير متاحة مؤقتاً",
+
+  // "health-page.property.status": "Status code",
   "health-page.property.status": "رمز الحالة",
-  "health-page.section.db.title": "قاعدة بيانات البيانات",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "قاعدة البيانات",
+
+  // "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": "سولر: جوهر الاستناد",
-  "health-page.section.solrOaiCore.title": "سولر: جو أوي",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "سولر: جوهر oai",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
   "health-page.section.solrSearchCore.title": "سولر: جوهر البحث",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
   "health-page.section.solrStatisticsCore.title": "سولر: جوهر الإحصائيات",
-  "health-page.section-info.app.title": "النهاية",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "الواجهة الخلفية للتطبيق",
+
+  // "health-page.section-info.java.title": "Java",
   "health-page.section-info.java.title": "جافا",
+
+  // "health-page.status": "Status",
   "health-page.status": "الحالة",
+
+  // "health-page.status.ok.info": "Operational",
   "health-page.status.ok.info": "تشغيلي",
-  "health-page.status.error.info": "تم كشف المشاكل",
-  "health-page.status.warning.info": "تم الكشف عن المشاكل الصغيرة",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "تم الكشف عن مشاكل",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "تم الكشف عن مشاكل محتملة",
+
+  // "health-page.title": "Health",
   "health-page.title": "كشف الصحة",
-  "health-page.section.no-issues": "لم يتم اكتشاف أي شيء",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "لم يتم اكتشاف أي مشكلات",
+
+  // "home.description": "",
   "home.description": "",
+
+  // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "الرئيسية",
-  "home.search-form.placeholder": "بحث المستودع...",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "بحث المستودع ...",
+
+  // "home.title": "Home",
   "home.title": "الرئيسية",
+
+  // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "المجتمعات في دي سبيس",
-  "home.top-level-communities.help": "هيا مجتمع لاستعراض مستحضراته.",
-  "info.end-user-agreement.accept": "لقد قمت بقراءة المنتج النهائي ووافقت عليه",
-  "info.end-user-agreement.accept.error": "حدث خطأ أثناء استخدام الاستخدام النهائي",
-  "info.end-user-agreement.accept.success": "تم تحديث الاستخدام النهائي بشكل فعال",
-  "info.end-user-agreement.breadcrumbs": "الاستخدام النهائي",
+
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "قم بتحديد مجتمع لاستعراض حاوياته.",
+
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "لقد قمت بقراءة اتفاقية المستخدم النهائي وأوافق عليها",
+
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "حدث خطأ أثناء قبول اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "تم بنجاح تحديث اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "إلغاء",
+
+  // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "حفظ",
-  "info.end-user-agreement.head": "الاستخدام النهائي",
-  "info.end-user-agreement.title": "الاستخدام النهائي",
+
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
   "info.end-user-agreement.hosting-country": "الولايات المتحدة",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "بيان الخصوصية",
+
+  // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "بيان الخصوصية",
+
+  // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "بيان الخصوصية",
-  "info.feedback.breadcrumbs": "مراجعة",
-  "info.feedback.head": "مراجعة",
-  "info.feedback.title": "مراجعة",
-  "info.feedback.info": "شكراً لمشاركتنا آراءك حول نظام دي سبيس. ",
-  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة بياناتك.",
-  "info.feedback.send": "قم بزيارة تعليقاتك",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "ملاحظات",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "ملاحظات",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "ملاحظات",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "شكراً لمشاركتنا ملاحظاتك حول نظام دي سبيس. نقدر تعليقاتكم!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة ملاحظاتك.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "قم بإرسال ملاحظاتك",
+
+  // "info.feedback.comments": "Comments",
   "info.feedback.comments": "تعليقات",
+
+  // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "البريد الإلكتروني الخاص بك",
-  "info.feedback.create.success": "تم تحفيزه بشكل فعال!",
-  "info.feedback.error.email.required": "مطلوب عنوان بريد الإلكتروني صالح",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "تم إرسال الملاحظات بنجاح!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "مطلوب عنوان بريد إلكتروني صالح",
+
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "مطلوب تعليق",
+
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "صفحة",
+
+  // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "الصفحة ذات الصلة بملاحظاتك",
-  "info.coar-notify-support.title": "COAR إخطار الدعم",
-  "info.coar-notify-support.breadcrumbs": "COAR إخطار الدعم",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  // TODO New key - Add a translation
+  "info.coar-notify-support.title": "COAR Notify Support",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  // TODO New key - Add a translation
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "هذه المادة غير قابلة للاكتشاف",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "تم سحب هذه المادة",
-  "item.alerts.reinstate-request": "طلب إعادة",
-  "quality-assurance.event.table.person-who-requested": "بتوصية من",
-  "item.edit.authorizations.heading": "باستخدام هذا المحرر، يمكنك عرض تغيير سياساتنا، بالإضافة إلى تغيير سياسات عناصر العناصر: الحزم والبنية. ",
-  "item.edit.authorizations.title": "تحرير سياسة المادة",
-  "item.badge.private": "غير للاكتشاف",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.alerts.reinstate-request": "Request reinstate",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
+
+  // "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": "باستخدام هذا المحرر ، يمكنك عرض وتغيير سياسات مادة ما، بالإضافة إلى تغيير سياسات مكونات المادة الفردية: الحزم وتدفق البت. باختصار، المادة عبارة عن حاوية من الحزم، والحزم عبارة عن حاويات لتدفقات البت. للحاويات في المعتاد سياسات ADD/REMOVE/READ/WRITE ، بينما يكون لتدفقات البت سياسات READ/WRITE فقط.",
+
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "تحرير سياسات المادة",
+
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "غير قابل للاكتشاف",
+
+  // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "مسحوب",
+
+  // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "الحزمة",
-  "item.bitstreams.upload.bundle.placeholder": "قم بالضغط على حزمة أو تسجيل اسم حزمة جديدة",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "قم بتحديد حزمة أو إدخال اسم حزمة جديدة",
+
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "إنشاء حزمة",
-  "item.bitstreams.upload.bundles.empty": "لا تحتوي على هذه المادة على أي حزم لتحميل تدفقات البت لها.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "لا تحتوي هذه المادة على أية حزم لتحميل تدفقات البت لها.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "إلغاء",
-  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف PDFه",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف لتحميله",
+
+  // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "المواد: ",
-  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة وفعالة.",
-  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم تحديدها",
-  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. ",
+
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة بنجاح.",
+
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم إنشاؤها",
+
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "تحميل تدفق البت",
+
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "تحميل",
-  "item.edit.bitstreams.bundle.displaying": "يتم العرض حاليًا {{ amount }} تدفقات بت من {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "يتم حالياً عرض {{ amount }} تدفقات بت من {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "تحميل الكل ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "تحميل المزيد",
-  "item.edit.bitstreams.bundle.name": "الصندوق: {{ name }}",
-  "item.edit.bitstreams.discard-button": "لا",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "الحزمة: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "تجاهل",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "تنزيل",
-  "item.edit.bitstreams.edit.buttons.drag": "يسحب",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "سحب",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "تحرير",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "إزالة",
-  "item.edit.bitstreams.edit.buttons.undo": "الحكمة عن التغييرات",
-  "item.edit.bitstreams.empty": "لا تحتوي على هذه المادة على أي تدفقات بت. ",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "التراجع عن التغييرات",
+
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "لا تحتوي هذه المادة على أية تدفقات بت. انقر على زر التحميل لإنشاء واحد.",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "إجراءات",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "الحزمة",
+
+  // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "الوصف",
-  "item.edit.bitstreams.headers.format": "حتى",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "التنسيق",
+
+  // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "الاسم",
-  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم بالنقر على زر 'تراجع'",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "خطأ أثناء نقل تدفقات البت",
-  "item.edit.bitstreams.notifications.move.saved.content": "تم حفظ التطورات الجديدة بك على حزم وتدفقات بت هذه المادة.",
-  "item.edit.bitstreams.notifications.move.saved.title": "تم الحفاظ على التطورات الجديدة",
-  "item.edit.bitstreams.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.bitstreams.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.bitstreams.notifications.remove.failed.title": "حدث خطأ أثناء حذف تدفق البت",
-  "item.edit.bitstreams.notifications.remove.saved.content": "تم حفظ التغييرات الخاصة بك على تدفقات بت هذه المادة.",
-  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ التغييرات الإزالة",
-  "item.edit.bitstreams.reinstate-button": "ديب",
+
+  // "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": "تم حفظ تغييرات النقل الخاصة بك على حزم وتدفقات بت هذه المادة.",
+
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "تم حفظ تغييرات النقل",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "خطأ أثناء حذف تدفق البت",
+
+  // "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": "تم حفظ تغييرات الإزالة الخاصة بك على تدفقات بت هذه المادة.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ تغييرات الإزالة",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "تراجع",
+
+  // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "حفظ",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "تحميل",
+
+  // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "إلغاء",
+
+  // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "حذف",
-  "item.edit.delete.description": "هل أنت متأكد من حذف هذه المادة التجارية؟ ",
+
+  // "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": "هل أنت متأكد من حذف هذه المادة تماماً؟ تحذير: في الوقت الحالي لن تتبقى أي آثار.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "حدث خطأ أثناء حذف المادة",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "حذف المادة: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "تم حذف هذه المادة",
+
+  // "item.edit.head": "Edit Item",
   "item.edit.head": "تحرير المادة",
+
+  // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "تحرير المادة",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "غير مصرح لك بالوصول إلى هذا التبويب",
-  "item.edit.tabs.mapper.head": "خطة مخططة",
-  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الغذاء",
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "مخطط الحاوية",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الحاوية",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
   "item.edit.identifiers.doi.status.UNKNOWN": "غير معروف",
-  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتشغيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
   "item.edit.identifiers.doi.status.TO_BE_RESERVED": "في قائمة الانتظار للحجز",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
   "item.edit.identifiers.doi.status.IS_REGISTERED": "مسجل",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
   "item.edit.identifiers.doi.status.IS_RESERVED": "محجوز",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
   "item.edit.identifiers.doi.status.UPDATE_RESERVED": "محجوز (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
   "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "مسجل (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
   "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "في قائمة الانتظار للتحديث والتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
   "item.edit.identifiers.doi.status.TO_BE_DELETED": "في قائمة الانتظار للحذف",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
   "item.edit.identifiers.doi.status.DELETED": "تم الحذف",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
   "item.edit.identifiers.doi.status.PENDING": "في الانتظار (غير مسجل)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
   "item.edit.identifiers.doi.status.MINTED": "مسكوك (غير مسجل)",
-  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل الكائن المعرفي الرقمي الجديد أو في الانتظار",
-  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل الهوية الرقمية...",
-  "item.edit.register-doi.header": "تسجيل الكائن المعرفي الرقمي الجديد أو في الانتظار",
-  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر المؤكد على متابعة تسجيل المعرفة الرقمية، أو إلغاء القفل للتراجع",
-  "item.edit.register-doi.confirm": "بالتأكيد",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل معرف كائن رقمي...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر على تأكيد لمتابعة تسجيل معرف الكائن الرقمي، أو إلغاء للتراجع",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "تأكيد",
+
+  // "item.edit.register-doi.cancel": "Cancel",
   "item.edit.register-doi.cancel": "إلغاء",
-  "item.edit.register-doi.success": "تم وضع الإعدادات الرقمية في قائمة الانتظار الفعالة.",
-  "item.edit.register-doi.error": "خطأ في تسجيل المدخلات الرقمية",
-  "item.edit.register-doi.to-update": "لقد تم بالفعل إنشاء المفتاح الرقمي التالي ووضعه في قائمة الانتظار للتشغيل عبر الإنترنت",
-  "item.edit.item-mapper.buttons.add": "تخطيط المادة إلى مادة محددة",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "تم وضع معرف الكائن الرقمي في قائمة الانتظار للتسجيل بنجاح.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "خطأ في تسجيل معرف الكائن الرقمي",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "لقد تم بالفعل سك معرف الكائن الرقمي التالي وسيتم وضعه في قائمة الانتظار للتسجيل عبر الإنترنت",
+
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "تخطيط مادة إلى حاويات محددة",
+
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "إزالة تحطيط مادة لحاويات محددة",
+
+  // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "إلغاء",
-  "item.edit.item-mapper.description": "هذه أداة مخططة للمادة التي بدأت لمديرين تخطيط هذه المادة لتوثيق أخرى. ",
-  "item.edit.item-mapper.head": "المادة - تخطيط المادة إلى مادة الفينيل",
+
+  // "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": "هذه أداة مخطط المادة التي تتيح للمديرين تخطيط هذه المادة إلى حاويات أخرى. يمكنك البحث عن الحاويات وتخطيطها، أو استعراض قائمة بالحاويات التي تم تخطيط هذه المادة لها حالياً.",
+
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "مخطط المادة - تخطيط مادة إلى حاويات",
+
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "المادة: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.no-search": "يرجى الاتصال باستعلام للبحث",
-  "item.edit.item-mapper.notifications.add.error.content": "أحدث الأخطاء أثناء تخطيط المادة إلى  {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
+
+  // "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": "حدثت أخطاء أثناء تخطيط مادة إلى  {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "أخطاء التخطيط",
-  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة {{amount}} حاوية فعالة.",
+
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة إلى {{amount}} حاوية بنجاح.",
+
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "اكتمل التخطيط",
-  "item.edit.item-mapper.notifications.remove.error.content": "أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
+
+  // "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": "حدثت أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "أخطاء إزالة التخطيط",
-  "item.edit.item-mapper.notifications.remove.success.content": "بعد إزالة تخطيط المادة {{amount}} حاوية فعالة.",
+
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "تمت إزالة تخطيط المادة إلى {{amount}} حاوية بنجاح.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "اكتملت إزالة التخطيط",
-  "item.edit.item-mapper.search-form.placeholder": "بحث مقبول...",
-  "item.edit.item-mapper.tabs.browse": "تم الاسترجاع المؤجل",
-  "item.edit.item-mapper.tabs.map": "تخطيط وثيقة جديدة",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "بحث الحاويات...",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "استعراض الحاويات المخططة",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "تخطيط حاويات جديدة",
+
+  // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "إضافة",
-  "item.edit.metadata.discard-button": "لا",
+
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "تجاهل",
+
+  // "item.edit.metadata.edit.language": "Edit language",
   "item.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "item.edit.metadata.edit.value": "Edit value",
   "item.edit.metadata.edit.value": "تحرير القيمة",
-  "item.edit.metadata.edit.authority.key": "تحرير مفتاح السلطة",
-  "item.edit.metadata.edit.buttons.confirm": "بالتأكيد",
-  "item.edit.metadata.edit.buttons.drag": "احصل على إعادة الترتيب",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "اسحب لإعادة ترتيب",
+
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "إزالة",
-  "item.edit.metadata.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "توقف عن التحرير",
-  "item.edit.metadata.edit.buttons.virtual": "هذه القيمة ميتا افتراضية، أي قيمة موروثة من كينونة ذات صلة.  ",
-  "item.edit.metadata.empty": "لا تحتوي المادة حاليا على أي ميتاداتا. ",
+
+  // "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.edit.buttons.virtual": "هذه قيمة ميتاداتا افتراضية، أي قيمة موروثة من كينونة ذات صلة. ولا يمكن تعديلها مباشرة. إضافة أو إزالة العلاقة المقابلة في تبويب \"العلاقات\" ",
+
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "لا تحتوي المادة حاليًا على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "تحرير",
-  "item.edit.metadata.headers.field": "حقل",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "الحقل",
+
+  // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "اللغة",
+
+  // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "القيمة",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
   "item.edit.metadata.metadatafield": "تحرير الحقل",
-  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة البحث في الميتاداتا",
-  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار البحث ميتاداتا صالح",
-  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة حقل الميتاداتا",
+
+  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر 'تراجع'",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   "item.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "لقد حدث خطأ",
-  "item.edit.metadata.notifications.invalid.content": "لم يتم الحفاظ على جديدك. ",
-  "item.edit.metadata.notifications.invalid.title": "دياداتا غير صالحة",
-  "item.edit.metadata.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.metadata.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.metadata.notifications.saved.content": "تم الحفاظ على نقصانك في ميتاداتا لهذه المادة.",
+
+  // "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة جميع الحقول قبل الحفظ.",
+
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "تم حفظ تغييراتك على ميتاداتا هذه المادة.",
+
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
-  "item.edit.metadata.reinstate-button": "ديب",
-  "item.edit.metadata.reset-order-button": "انعكاس عن إعادة الترتيب",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "تراجع",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "تراجع عن إعادة الترتيب",
+
+  // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "حفظ",
-  "item.edit.metadata.authority.label": "سلطة: ",
-  "item.edit.metadata.edit.buttons.open-authority-edition": "افتح قيمة مفتاح السلطة للتحرير اليدوي",
-  "item.edit.metadata.edit.buttons.close-authority-edition": "قفل قيمة مفتاح السلطة للتحرير اليدوي",
-  "item.edit.modify.overview.field": "بحث متقدم",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
+  // TODO New key - Add a translation
+  "item.edit.metadata.authority.label": "Authority: ",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "حقل",
+
+  // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "اللغة",
-  "item.edit.modify.overview.value": "القيمة",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "قيمة",
+
+  // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "رجوع",
+
+  // "item.edit.move.save-button": "Save",
   "item.edit.move.save-button": "حفظ",
-  "item.edit.move.discard-button": "لا",
-  "item.edit.move.description": "اختر ما تريد في نقل هذه المادة لها. ",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "تجاهل",
+
+  // "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": "اختر الحاوية التي ترغب في نقل هذه المادة لها. لتضييق قائمة الحاويات المعروضة، يمكنك إدخال استعلام بحث في المربع.",
+
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "حدث خطأ أثناء محاولة نقل المادة",
-  "item.edit.move.head": "المادة: {{id}}",
-  "item.edit.move.inheritpolicies.checkbox": "توريث",
-  "item.edit.move.inheritpolicies.description": "توريث خصيصاً للضوءية",
-  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، ستستبدل سيجروم الوصول للقراءة الخاصة بالمادة وأي ملفات لاستخدام بسياسة الوصول للقراءة افتراضية للغاوية. ",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "نقل المادة: {{id}}",
+
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "توريث السياسات",
+
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "توريث السياسات الافتراضية للحاوية المقصودة",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، سيتم استبدال سياسة الوصول للقراءة الخاصة بالمادة وأي ملفات مرتبطة بالمادة بسياسة الوصول للقراءة الافتراضية للحاوية. لا يمكن التراجع عنه هذا الإجراء.",
+
+  // "item.edit.move.move": "Move",
   "item.edit.move.move": "نقل",
+
+  // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "جاري النقل...",
-  "item.edit.move.search.placeholder": "قم برجاء التأكيد على البحث عن تيفين",
-  "item.edit.move.success": "تم نقل المادة الفعالة",
+
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "قم بإدخال استعلام بحث للبحث عن حاويات",
+
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "تم نقل المادة بنجاح",
+
+  // "item.edit.move.title": "Move item",
   "item.edit.move.title": "نقل المادة",
+
+  // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "إلغاء",
+
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "اجعلها غير قابلة للاكتشاف",
+
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
   "item.edit.private.description": "هل أنت متأكد من أن هذه المادة يجب أن تكون غير قابلة للاكتشاف في الأرشيف؟",
-  "item.edit.private.error": "حدث خطأ أثناء وضع المادة غير قابلة للاكتشاف",
-  "item.edit.private.header": "المادة غير قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "حدث خطأ أثناء جعل المادة غير قابلة للاكتشاف",
+
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "اجعل المادة غير قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "المادة الآن غير قابلة للاكتشاف",
+
+  // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "إلغاء",
-  "item.edit.public.confirm": "اجعلها للاكتشاف",
-  "item.edit.public.description": "هل أنت متأكد من أنه يجب أن تمتلك هذه المادة القابلة للاكتشاف في الأرشيف؟",
-  "item.edit.public.error": "حدث خطأ أثناء المادة القابلة للاكتشاف",
-  "item.edit.public.header": "المادة قابلة للاكتشاف: {{ id }}",
-  "item.edit.public.success": "المادة الآن للاكتشاف",
+
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "اجعلها قابلة للاكتشاف",
+
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "هل أنت متأكد من أنه يجب جعل هذه المادة قابلة للاكتشاف في الأرشيف؟",
+
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "حدث خطأ أثناء جعل المادة قابلة للاكتشاف",
+
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "اجعل المادة قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "المادة الآن قابلة للاكتشاف",
+
+  // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "إلغاء",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "إعادة تعيين",
+
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "هل أنت متأكد من إعادة تعيين هذه المادة إلى الأرشيف؟",
+
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "حدث خطأ أثناء إعادة تعيين المادة",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "إعادة تعيين المادة: {{ id }}",
-  "item.edit.reinstate.success": "إعادة تعيين المادة الفعالة",
-  "item.edit.relationships.discard-button": "لا",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "تمت إعادة تعيين المادة بنجاح",
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "تجاهل",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "إضافة",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "إزالة",
-  "item.edit.relationships.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "لا توجد علاقات",
-  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر  'تراجع'",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "حدث خطأ أثناء تحرير العلاقات",
-  "item.edit.relationships.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.relationships.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.relationships.notifications.saved.content": "تم الحفاظ على أفكارك على علاقات هذه المادة.",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "تم حفظ تغييراتك على علاقات هذه المادة.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "تم حفظ العلاقات",
-  "item.edit.relationships.reinstate-button": "ديب",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "تراجع",
+
+  // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "حفظ",
-  "item.edit.relationships.no-entity-type": "قم بإضافة ميتا 'dspace.entity.type' لتفعيل هذه العلاقات",
+
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "قم بإضافة ميتاداتا 'dspace.entity.type' لتفعيل العلاقات لهذه المادة",
+
+  // "item.edit.return": "Back",
   "item.edit.return": "رجوع",
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "تدفقات البت",
-  "item.edit.tabs.bitstreams.title": "المادة الخام - تدفقات البت",
+
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "تحرير المادة - تدفقات البت",
+
+  // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "أكرتة",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "تحرير المادة - أكرتة",
-  "item.edit.curate.title": "المادة المادة: {{item}}",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "أكرتة المادة: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
   "item.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
   "item.edit.tabs.access-control.title": "تحرير المادة - التحكم في الوصول",
-  "item.edit.tabs.metadata.head": "ميداداتا",
-  "item.edit.tabs.metadata.title": "تحرير المادة - الميتاداتا",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "الميتاداتا",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "تحرير المادة -  الميتاداتا",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "العلاقات",
+
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "تحرير الماة - العلاقات",
-  "item.edit.tabs.status.buttons.authorizations.button": "...تصاريح",
-  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات المادة",
-  "item.edit.tabs.status.buttons.delete.button": "حذف",
-  "item.edit.tabs.status.buttons.delete.label": "شطب المادة",
-  "item.edit.tabs.status.buttons.mappedCollections.button": "وثيقة الوثيقة",
-  "item.edit.tabs.status.buttons.mappedCollections.label": "غير متوقعة",
-  "item.edit.tabs.status.buttons.move.button": "قم بنقل هذه المادة إلى حاوية مختلفة",
-  "item.edit.tabs.status.buttons.move.label": "قم بنقل هذه المادة إلى حاوية مختلفة",
+
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "تصاريح...",
+
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات تصاريح المادة",
+
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "حذف نهائي",
+
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "شطب المادة تماماً",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "حاويات مخططة",
+
+  // "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 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": "نقل هذه المادة إلى حاوية مختلفة",
+
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
   "item.edit.tabs.status.buttons.private.button": "اجعلها غير قابلة للاكتشاف...",
-  "item.edit.tabs.status.buttons.private.label": "المادة غير قابلة للاكتشاف",
-  "item.edit.tabs.status.buttons.public.button": "اجعلها للاكتشاف...",
-  "item.edit.tabs.status.buttons.public.label": "المادة قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "اجعل المادة غير قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "اجعلها قابلة للاكتشاف...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "اجعل المادة قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "إعادة تعيين...",
+
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "إعادة تعيين المادة في المستودع",
-  "item.edit.tabs.status.buttons.unauthorized": "غير مصرح لك بهذا الاقتراح",
-  "item.edit.tabs.status.buttons.withdraw.button": "اسحب هذه المادة",
-  "item.edit.tabs.status.buttons.withdraw.label": "اسحب هذه المادة من المستودع",
-  "item.edit.tabs.status.description": "مرحبا بك في صفحة إدارة المادة. ",
+
+  // "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 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.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": "مرحباً بك في صفحة إدارة المادة. من هنا يمكنك سحب المادة، أو إعادة تعيينها، أو نقلها أو حذفها. كما يمكنك تحديث أو إضافة ميتاداتا/ تدفقات بت جديدة في التبويبات الأخرى.",
+
+  // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "الحالة",
-  "item.edit.tabs.status.labels.handle": "مقبض",
-  "item.edit.tabs.status.labels.id": "تم تعريف المادة داخليًا",
+
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "هاندل",
+
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "معرّف المادة الداخلي",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "صفحة المادة",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "آخر تعديل",
-  "item.edit.tabs.status.title": "تحرير المادة - الحالة",
-  "item.edit.tabs.versionhistory.head": "نسخة السجل",
-  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل النسخة",
-  "item.edit.tabs.versionhistory.under-construction": "تحرير أو إضافة إصدار جديد ليس ممكناً بعد في واجهة المستخدم هذه..",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "تحرير المادة -  الحالة",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "سجل الإصدارة",
+
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل الإصدارة",
+
+  // "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": "تحرير أو إضافة إصدارات جديدة ليس ممكناً بعد في واجهة المستخدم هذه..",
+
+  // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "عرض المادة",
-  "item.edit.tabs.view.title": "تحرير المادة - عرض",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "تحرير المادة -  عرض",
+
+  // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "إلغاء",
-  "item.edit.withdraw.confirm": "يسحب",
-  "item.edit.withdraw.description": "هل أنت متأكد من أنك لا تستطيع سحب هذه المادة من الأرشيف؟",
-  "item.edit.withdraw.error": "حدث خطأ أثناء المادة",
-  "item.edit.withdraw.header": "المادة: {{ id }}",
-  "item.edit.withdraw.success": "تم سحب المادة الفعالة",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "سحب",
+
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "هل أنت متأكد من ضرورة سحب هذه المادة من الأرشيف؟",
+
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "حدث خطأ أثناء سحب المادة",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "سحب المادة: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "تم سحب المادة بنجاح",
+
+  // "item.orcid.return": "Back",
   "item.orcid.return": "رجوع",
+
+  // "item.listelement.badge": "Item",
   "item.listelement.badge": "المادة",
+
+  // "item.page.description": "Description",
   "item.page.description": "الوصف",
+
+  // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ردمد الدورية",
-  "item.page.journal-title": "عنوان الدوري",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "عنوان الدورية",
+
+  // "item.page.publisher": "Publisher",
   "item.page.publisher": "الناشر",
+
+  // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "المادة: ",
+
+  // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "عنوان المجلد",
-  "item.search.results.head": "نتائج بحثت المواد",
-  "item.search.title": "بحثت المواد",
+
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "نتائج بحث المواد",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "بحث المواد",
+
+  // "item.truncatable-part.show-more": "Show more",
   "item.truncatable-part.show-more": "عرض المواد",
-  "item.truncatable-part.show-less": "طيء",
-  "item.qa-event-notification.check.notification-info": "هناك {{num}} في انتظار الاقتراحات المتعلقة بحسابك",
-  "item.qa-event-notification-info.check.button": "منظر",
-  "mydspace.qa-event-notification.check.notification-info": "هناك {{num}} في انتظار الاقتراحات المتعلقة بحسابك",
-  "mydspace.qa-event-notification-info.check.button": "منظر",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "طي",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "item.qa-event-notification-info.check.button": "View",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "حذف أمر الإشراف",
-  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر مهم؟",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
   "workflow-item.search.result.delete-supervision.modal.cancel": "إلغاء",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
   "workflow-item.search.result.delete-supervision.modal.confirm": "حذف",
-  "workflow-item.search.result.notification.deleted.success": "تم الحذف أمر فعال فعال \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "تم حذف أمر الإشراف بنجاح \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
   "workflow-item.search.result.notification.deleted.failure": "فشل في حذف أمر الإشراف \"{{name}}\"",
-  "workflow-item.search.result.list.element.supervised-by": "تحت الضربة:",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "تحت إشراف:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "إزالة مجموعة الإشراف",
-  "confidence.indicator.help-text.accepted": "تم تأكيد دقة قيمة الاستناد هذه من قبل مستخدم تفاعلي",
-  "confidence.indicator.help-text.uncertain": "القيمة مفردة وصالحة ولكن لم يراها الإنسان ويقبلها، لذا فهي لا تزال غير مؤكدة",
-  "confidence.indicator.help-text.ambiguous": "هناك العديد من قيم السلطة المطابقة ذات الصلاحية المتساوية",
-  "confidence.indicator.help-text.notfound": "لا توجد إجابات مطابقة في السلطة",
-  "confidence.indicator.help-text.failed": "واجهت السلطة فشلا داخليا",
-  "confidence.indicator.help-text.rejected": "توصي الهيئة برفض هذا التقديم",
-  "confidence.indicator.help-text.novalue": "ولم يتم إرجاع أي قيمة ثقة معقولة من الهيئة",
-  "confidence.indicator.help-text.unset": "لم يتم تسجيل الثقة بهذه القيمة أبدًا",
-  "confidence.indicator.help-text.unknown": "قيمة ثقة غير معروفة",
-  "item.page.abstract": "أ",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "خلاصة",
+
+  // "item.page.author": "Authors",
   "item.page.author": "المؤلفين",
-  "item.page.citation": "المرسل",
-  "item.page.collections": "مقبول",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation": "اقتباس",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections": "الحاويات",
+
+  // "item.page.collections.loading": "Loading...",
   "item.page.collections.loading": "جاري التحميل...",
+
+  // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "تحميل المزيد",
+
+  // "item.page.date": "Date",
   "item.page.date": "التاريخ",
+
+  // "item.page.edit": "Edit this item",
   "item.page.edit": "تحرير هذه المادة",
+
+  // "item.page.files": "Files",
   "item.page.files": "ملفات",
+
+  // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "الوصف:",
+
+  // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "تنزيل",
-  "item.page.filesection.format": "التنسيق:",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "تنسيق:",
+
+  // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "الاسم:",
+
+  // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "الحجم:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "مقالات في هذه الدورية",
-  "item.page.link.full": "صفحة المادة كاملة",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "صفحة المادة الكاملة",
+
+  // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "صفحة المادة البسيطة",
+
+  // "item.page.orcid.title": "ORCID",
   "item.page.orcid.title": "أوركيد",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
   "item.page.orcid.tooltip": "فتح صفحة إعداد أوركيد",
+
+  // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "مقالات بواسطة هذا المؤلف",
-  "item.page.related-items.view-more": "الإظهار {{ amount }} أكثر",
+
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "إظهار {{ amount }} أكثر",
+
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "إخفاء آخر {{ amount }}",
-  "item.page.relationships.isAuthorOfPublication": "منشورات",
-  "item.page.relationships.isJournalOfPublication": "منشورات",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "المنشورات",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "المنشورات",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "المؤلفين",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "مشاريع البحث",
-  "item.page.subject": "الكلمات الرئيسية",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "كلمات رئيسية",
+
+  // "item.page.uri": "URI",
   "item.page.uri": "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "عرض المزيد",
-  "item.page.bitstreams.collapse": "طيء",
-  "item.page.bitstreams.primary": "أساسي",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "طي",
+
+  // "item.page.bitstreams.primary": "Primary",
+  // TODO New key - Add a translation
+  "item.page.bitstreams.primary": "Primary",
+
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "الحزمة الرئيسية",
-  "item.page.filesection.license.bundle": "حزمة الحزمة",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "حزمة الترخيص",
+
+  // "item.page.return": "Back",
   "item.page.return": "رجوع",
-  "item.page.version.create": "إنشاء طبعة جديدة",
-  "item.page.withdrawn": "طلب سحب لهذا البند",
-  "item.page.reinstate": "طلب الإعادة",
-  "item.page.version.hasDraft": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "إنشاء إصدارة جديدة",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  // TODO New key - Add a translation
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.page.claim.button": "Claim",
   "item.page.claim.button": "مطالبة",
-  "item.page.claim.tooltip": "بسبب هذه المادة الشخصية",
-  "item.page.image.alt.ROR": "شعار ROR",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "المطالبة بهذه المادة كملف شخصي",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR شعار",
+
+  // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "المعرف:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "المؤلفين:",
+
+  // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "تاريخ النشر:",
-  "item.preview.dc.description.abstract": "السرعة:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "مستخلص:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "معرف آخر:",
+
+  // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "اللغة:",
-  "item.preview.dc.subject": "الموضوع:",
-  "item.preview.dc.title": "عنوان العنوان:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "الموضوعات:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "العنوان:",
+
+  // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "النوع:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "العدد",
-  "item.preview.oaire.citation.volume": "مجلد",
-  "item.preview.dc.relation.issn": "الرقم الدولي الموحد للدوريات",
-  "item.preview.dc.identifier.isbn": "رقم ISBN",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "المجلد",
+
+  // "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": "المعرف:",
-  "item.preview.dc.relation.ispartof": "الدوري",
-  "item.preview.dc.identifier.doi": "المعرفة الرقمية",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "الدورية",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "معرف الكائن الرقمي",
+
+  // "item.preview.dc.publisher": "Publisher:",
   "item.preview.dc.publisher": "الناشر:",
-  "item.preview.person.familyName": "يتمنى:",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "اللقب:",
+
+  // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "الاسم:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "أوركيد:",
+
+  // "item.preview.project.funder.name": "Funder:",
   "item.preview.project.funder.name": "الممول:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
   "item.preview.project.funder.identifier": "معرف الممول:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
   "item.preview.oaire.awardNumber": "معرف التمويل:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
   "item.preview.dc.title.alternative": "الحروف المختصرة:",
-  "item.preview.dc.coverage.spatial": "عدم التفويض:",
-  "item.preview.oaire.fundingStream": "التدفق:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "الاختصاص القضائي:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "تدفق التمويل:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
   "item.preview.oairecerif.identifier.url": "عنوان URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
   "item.preview.organization.address.addressCountry": "البلد",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
   "item.preview.organization.foundingDate": "تاريخ التأسيس",
-  "item.preview.organization.identifier.crossrefid": "معرف Crossref",
-  "item.preview.organization.identifier.isni": "إسني",
-  "item.preview.organization.identifier.ror": "معرف ROR",
-  "item.preview.organization.legalName": "الاسم الساقي",
-  "item.preview.dspace.entity.type": "نوع الكيان:",
-  "item.select.confirm": "بالتأكيد",
-  "item.select.empty": "لا يوجد شيء للعرض",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef معرف",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR معرف",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "الاسم القانوني",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "تأكيد المحدد",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "لا توجد مواد للعرض",
+
+  // "item.select.table.selected": "Selected items",
   "item.select.table.selected": "المواد المحددة",
-  "item.select.table.select": "المادة المحددة",
-  "item.select.table.deselect": "قم بإلغاء تحديد المادة",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "تحديد المادة",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "إلغاء تحديد المادة",
+
+  // "item.select.table.author": "Author",
   "item.select.table.author": "المؤلف",
-  "item.select.table.collection": "ابدأ",
-  "item.select.table.title": "عنوان العنوان",
-  "item.version.history.empty": "لا توجد إصدارات أخرى من هذه الخامة حتى الآن.",
-  "item.version.history.head": "نسخة السجل",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "الحاوية",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "العنوان",
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "لا توجد إصدارات أخرى لهذه المادة حتى الآن.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "سجل الإصدارة",
+
+  // "item.version.history.return": "Back",
   "item.version.history.return": "رجوع",
+
+  // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "افصدارة المحددة",
-  "item.version.history.selected.alert": "أنت حاليا تقوم بعرض النسخة {{version}} لذلك.",
-  "item.version.history.table.version": "النسخة",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "أنت حالياً تقوم بعرض الإصدارة {{version}} للمادة.",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "الإصدارة",
+
+  // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "المادة",
+
+  // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "المحرر",
+
+  // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "التاريخ",
+
+  // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "الملخص",
-  "item.version.history.table.workspaceItem": "نطاق العمل",
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "مادة نطاق العمل",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
   "item.version.history.table.workflowItem": "مادة سير العمل",
+
+  // "item.version.history.table.actions": "Action",
   "item.version.history.table.actions": "الإجراء",
-  "item.version.history.table.action.editWorkspaceItem": "تحرير مساحة العمل",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "تحرير مادة نطاق العمل",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
   "item.version.history.table.action.editSummary": "تحرير الملخص",
-  "item.version.history.table.action.saveSummary": "حفظ الملخص",
-  "item.version.history.table.action.discardSummary": "أهمل الملخص",
-  "item.version.history.table.action.newVersion": "إنشاء نسخة جديدة من هذه النسخة",
-  "item.version.history.table.action.deleteVersion": "حذف النسخة",
-  "item.version.history.table.action.hasDraft": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
-  "item.version.notice": "هذه ليست آخر نسخة من هذه المادة.  <a href='{{destination}}'>هنا</a>.",
-  "item.version.create.modal.header": "نسخة جديدة",
-  "item.qa.withdrawn.modal.header": "طلب الانسحاب",
-  "item.qa.reinstate.modal.header": "طلب إعادة",
-  "item.qa.reinstate.create.modal.header": "نسخة جديدة",
-  "item.version.create.modal.text": "خلق نسخة جديدة لهذه المادة",
-  "item.version.create.modal.text.startingFrom": "البدء من النسخة {{version}}",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "حفظ تعديلات الملخص",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "تجاهل تعديلات الملخص",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "إنشاء إصدارة جديدة من هذه الإصدارة",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "حذف الإصدارة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "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": "هذه ليست آخر إصدارة من هذه المادة. يمكن العثور على آخر إصدارة من <a href='{{destination}}'>هنا</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "إصدارة جديدة",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "إنشاء إصدارة جديدة لهذه المادة",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "بدءاً من الإصدارة {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
   "item.version.create.modal.button.confirm": "إنشاء",
-  "item.version.create.modal.button.confirm.tooltip": "إنشاء طبعة جديدة",
-  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "ارسل طلب",
-  "qa-withdrown.create.modal.button.confirm": "ينسحب",
-  "qa-reinstate.create.modal.button.confirm": "إعادة",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "إنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "إلغاء",
-  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "يلغي",
-  "item.version.create.modal.button.cancel.tooltip": "لا لتوقف عن الاصدار الجديد",
-  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "لا ترسل الطلب",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "لا تقم بإنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "الملخص",
-  "qa-withdrawn.create.modal.form.summary.label": "أنت تطلب سحب هذا البند",
-  "qa-withdrawn.create.modal.form.summary2.label": "الرجاء إدخال سبب الانسحاب",
-  "qa-reinstate.create.modal.form.summary.label": "أنت تطلب إعادة هذا العنصر",
-  "qa-reinstate.create.modal.form.summary2.label": "الرجاء إدخال سبب الإعادة",
-  "item.version.create.modal.form.summary.placeholder": "قم بالضغط على النسخة الجديدة",
-  "qa-withdrown.modal.form.summary.placeholder": "أدخل سبب السحب",
-  "qa-reinstate.modal.form.summary.placeholder": "أدخل سبب الإعادة",
-  "item.version.create.modal.submitted.header": "إنشاء طبعة جديدة...",
-  "item.qa.withdrawn.modal.submitted.header": "جارٍ إرسال الطلب المسحوب...",
-  "correction-type.manage-relation.action.notification.reinstate": "تم إرسال طلب الاستعادة.",
-  "correction-type.manage-relation.action.notification.withdrawn": "تم إرسال طلب السحب.",
-  "item.version.create.modal.submitted.text": "جاري إنشاء نسخة جديدة. ",
-  "item.version.create.notification.success": "تم إنشاء نسخة جديدة برقم الإصدار {{version}}",
-  "item.version.create.notification.failure": "لم يتم إنشاء إصدار جديد",
-  "item.version.create.notification.inProgress": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
-  "item.version.delete.modal.header": "حذف النسخة",
-  "item.version.delete.modal.text": "هل ترغب في حذف النسخة {{version}}؟",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "قم بإدخال ملخص الإصدارة الجديدة",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "إنشاء إصدارة جديدة...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "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": "جاري إنشاء الإصدارة الجديدة. قد يستغرق هذا بعض الوقت إذا كان لهذه المادة الكثير من العلاقات.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "تم إنشاء إصدارة جديدة برقم الإصدار {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "لم يتم إنشاء إصدارة جديدة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "حذف الإصدارة",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "هل ترغب في حذف الإصدارة {{version}}؟",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "حذف",
-  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه النسخة",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه الإصدارة",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
   "item.version.delete.modal.button.cancel": "إلغاء",
-  "item.version.delete.modal.button.cancel.tooltip": "لا تنسى حذف هذه النسخة",
-  "item.version.delete.notification.success": "تم حذف النسخة رقم {{version}}",
-  "item.version.delete.notification.failure": "لن يتم حذف النسخة رقم {{version}}",
-  "item.version.edit.notification.success": "تم تغيير ملخص النسخة رقم {{version}}",
-  "item.version.edit.notification.failure": "لم يتم تغيير ملخص النسخة رقم {{version}}",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "لا تقم بحذف هذه الإصدارة",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "تم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "لم يتم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "تم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "لم يتم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
   "itemtemplate.edit.metadata.add-button": "إضافة",
-  "itemtemplate.edit.metadata.discard-button": "لا",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "تجاهل",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
   "itemtemplate.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
   "itemtemplate.edit.metadata.edit.value": "تحرير القيمة",
-  "itemtemplate.edit.metadata.edit.buttons.confirm": "بالتأكيد",
-  "itemtemplate.edit.metadata.edit.buttons.drag": "قم بإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "اسحب لإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
   "itemtemplate.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
   "itemtemplate.edit.metadata.edit.buttons.remove": "إزالة",
-  "itemtemplate.edit.metadata.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
   "itemtemplate.edit.metadata.edit.buttons.unedit": "إيقاف التحرير",
-  "itemtemplate.edit.metadata.empty": "القالب الحالي لا يحتوي على أي ميتاداتا. ",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "قالب العنصر حاليًا لا يحتوي على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
   "itemtemplate.edit.metadata.headers.edit": "تحرير",
-  "itemtemplate.edit.metadata.headers.field": "حقل",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "الحقل",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
   "itemtemplate.edit.metadata.headers.language": "اللغة",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "القيمة",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
   "itemtemplate.edit.metadata.metadatafield": "تحرير الحقل",
-  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من البحث في الميتاداتا",
-  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار البحث ميتاداتا صالح",
-  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي اختارتها.  ",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من حقل الميتاداتا",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي أجريتها. لاستعادة التغييرات، قم بالنقر على زر 'تراجع' ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
   "itemtemplate.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
   "itemtemplate.edit.metadata.notifications.error.title": "حدث خطأ",
-  "itemtemplate.edit.metadata.notifications.invalid.content": "لم يتم حفظ التغييرات. ",
-  "itemtemplate.edit.metadata.notifications.invalid.title": "دياداتا غير صالحة",
-  "itemtemplate.edit.metadata.notifications.outdated.content": "تم تغيير المادة التي تعمل حاليا بواسطة مستخدم آخر. ",
-  "itemtemplate.edit.metadata.notifications.outdated.title": "اختر التغييرات",
-  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي استخدمتها على الميتاداتا لقالب المادة هذه.",
+
+  // "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.content": "لم يتم حفظ التغييرات. يرجى التأكد من أن جميع الحقول صالحة قبل الحفظ.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "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.content": "تم تغيير قالب المادة الذي تعمل عليه حالياً بواسطة مستخدم آخر. تم تجاهل التغييرات الحالية لمنع التعارضات",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على الميتاداتا لقالب المادة هذا.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
   "itemtemplate.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
-  "itemtemplate.edit.metadata.reinstate-button": "ديب",
-  "itemtemplate.edit.metadata.reset-order-button": "الادارة عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "تراجع",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "التراجع عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
   "itemtemplate.edit.metadata.save-button": "حفظ",
-  "journal.listelement.badge": "الدوري",
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "الدورية",
+
+  // "journal.page.description": "Description",
   "journal.page.description": "الوصف",
+
+  // "journal.page.edit": "Edit this item",
   "journal.page.edit": "تحرير هذه المادة",
+
+  // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "رئيس التحرير",
-  "journal.page.issn": "الرقم الدولي الموحد للدوريات",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+
+  // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "الناشر",
-  "journal.page.titleprefix": "الدوري: ",
-  "journal.search.results.head": "نتائج الدورية التي بحثتها",
-  "journal-relationships.search.results.head": "نتائج الدورية التي بحثتها",
-  "journal.search.title": "الدورية الدورية",
-  "journalissue.listelement.badge": "عدد الدوري",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "الدورية: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "نتائج بحث الدورية",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "نتائج بحث الدورية",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "بحث الدورية",
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "عدد الدورية",
+
+  // "journalissue.page.description": "Description",
   "journalissue.page.description": "الوصف",
+
+  // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "تحرير هذه المادة",
+
+  // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "تاريخ العدد",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "ردمد الدورية",
-  "journalissue.page.journal-title": "عنوان الدوري",
-  "journalissue.page.keyword": "الكلمات الرئيسية",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "عنوان الدورية",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "كلمات رئيسية",
+
+  // "journalissue.page.number": "Number",
   "journalissue.page.number": "رقم",
-  "journalissue.page.titleprefix": "عدد الدوري: ",
-  "journalissue.search.results.head": "نتائج البحث عدد الدوري",
-  "journalvolume.listelement.badge": "سلسلة الدورية",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "عدد الدورية: ",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "نتائج بحث عدد الدورية",
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "مجلد الدورية",
+
+  // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "الوصف",
+
+  // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "تحرير هذه المادة",
+
+  // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "تاريخ الإصدار",
-  "journalvolume.page.titleprefix": "دورة دورية: ",
-  "journalvolume.page.volume": "مجلد",
-  "journalvolume.search.results.head": "نتائج البحث في الدوري",
-  "iiifsearchable.listelement.badge": "وسائط الوسائط",
-  "iiifsearchable.page.titleprefix": "أوكلاند: ",
-  "iiifsearchable.page.doi": "الرابط الجديد: ",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "مجلد دورية: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "المجلد",
+
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "نتائج بحث مجلد الدورية",
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "وسائط الوثائق",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "الوثيقة: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "الرابط الدائم: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
   "iiifsearchable.page.issue": "العدد: ",
+
+  // "iiifsearchable.page.description": "Description: ",
   "iiifsearchable.page.description": "الوصف: ",
-  "iiifviewer.fullscreen.notice": "استخدم الشاشة بالكامل لمشاهدة أفضل.",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "استخدم الشاشة الكاملة لمشاهدة أفضل.",
+
+  // "iiif.listelement.badge": "Image Media",
   "iiif.listelement.badge": "وسائط الصور",
+
+  // "iiif.page.titleprefix": "Image: ",
   "iiif.page.titleprefix": "الصورة: ",
-  "iiif.page.doi": "الرابط الجديد: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "الرابط الدائم: ",
+
+  // "iiif.page.issue": "Issue: ",
   "iiif.page.issue": "العدد: ",
+
+  // "iiif.page.description": "Description: ",
   "iiif.page.description": "الوصف: ",
+
+  // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "جاري تحميل تدفق البت...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "جاري تحميل تدفقات البت...",
+
+  // "loading.browse-by": "Loading items...",
   "loading.browse-by": "جاري تحميل المواد...",
+
+  // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "جاري تحميل الصفحة...",
-  "loading.collection": "جاري تحميل...",
-  "loading.collections": "جاري التحميل ...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "جاري تحميل الحاوية...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "جاري تحميل الحاويات...",
+
+  // "loading.content-source": "Loading content source...",
   "loading.content-source": "جاري تحميل مصدر المحتوى...",
+
+  // "loading.community": "Loading community...",
   "loading.community": "جاري تحميل المجتمع...",
+
+  // "loading.default": "Loading...",
   "loading.default": "جاري التحميل...",
+
+  // "loading.item": "Loading item...",
   "loading.item": "جاري تحميل المادة...",
+
+  // "loading.items": "Loading items...",
   "loading.items": "جاري تحميل المواد...",
+
+  // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "جاري تحميل المواد...",
+
+  // "loading.objects": "Loading...",
   "loading.objects": "جاري التحميل...",
-  "loading.recent-submissions": "جاري تحميل أحدث العروض...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "جاري تحميل أحدث التقديمات...",
+
+  // "loading.search-results": "Loading search results...",
   "loading.search-results": "جاري تحميل نتائج البحث...",
-  "loading.sub-collections": "جاري تحميل مؤقت...",
-  "loading.sub-communities": "جاري تحميل الكنيسة...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "جاري تحميل الحاويات الفرعية...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "جاري تحميل المجتمعات الفرعية...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "جاري تحميل مجتمعات المستوى الأعلى...",
+
+  // "login.form.email": "Email address",
   "login.form.email": "عنوان البريد الإلكتروني",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "هل نسيت كلمة المرور؟",
+
+  // "login.form.header": "Please log in to DSpace",
   "login.form.header": "يرجى تسجيل الدخول إلى دي سبيس",
-  "login.form.new-user": "مستخدم جديد؟ ",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "مستخدم جديد؟ اضغط هنا للتسجيل.",
+
+  // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.orcid": "Log in with ORCID",
   "login.form.orcid": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.password": "Password",
   "login.form.password": "كلمة المرور",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "تسجيل الدخول باستخدام Shibboleth",
+
+  // "login.form.submit": "Log in",
   "login.form.submit": "تسجيل الدخول",
+
+  // "login.title": "Login",
   "login.title": "تسجيل الدخول",
+
+  // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "تسجيل الدخول",
+
+  // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "تسجيل الخروج من دي سبيس",
+
+  // "logout.form.submit": "Log out",
   "logout.form.submit": "خروج",
+
+  // "logout.title": "Logout",
   "logout.title": "خروج",
-  "menu.header.nav.description": "شريط التنقل المشرف",
+
+  // "menu.header.nav.description": "Admin navigation bar",
+  // TODO New key - Add a translation
+  "menu.header.nav.description": "Admin navigation bar",
+
+  // "menu.header.admin": "Management",
   "menu.header.admin": "إدارة",
-  "menu.header.image.logo": "مستودع الشعار",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "شعار المستودع",
+
+  // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "قائمة الإدارة",
+
+  // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "التحكم في الوصول",
-  "menu.section.access_control_authorizations": ".تصاريح",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "تصاريح",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
   "menu.section.access_control_bulk": "إدارة الوصول بالجملة",
+
+  // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "مجموعات",
-  "menu.section.access_control_people": "الأشخاص",
-  "menu.section.reports": "التقارير",
-  "menu.section.reports.collections": "المجموعات التي تمت تصفيتها",
-  "menu.section.reports.queries": "استعلام بيانات التعريف",
+
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "أشخاص",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+  // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "بحث إداري",
+
+  // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "هذا المجتمع",
+
+  // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "حسب المؤلف",
+
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "حسب تاريخ الإصدار",
-  "menu.section.browse_community_by_title": "عنوان حسب الطلب",
+
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "حسب العنوان",
+
+  // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "كل دي سبيس",
+
+  // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "حسب المؤلف",
+
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "حسب تاريخ الإصدار",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "حسب الموضوع",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
   "menu.section.browse_global_by_srsc": "حسب فئة الموضوع",
-  "menu.section.browse_global_by_nsi": "حسب فرس العلوم النرويجي",
-  "menu.section.browse_global_by_title": "عنوان حسب الطلب",
-  "menu.section.browse_global_communities_and_collections": "المجتمعات والاويات",
-  "menu.section.control_panel": "التحكم باللوحة",
-  "menu.section.curation_task": "مهمة اخرى",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "حسب فهرس العلوم النرويجي",
+
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "حسب العنوان",
+
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "المجتمعات والحاويات",
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "لوحة التحكم",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "مهمة الأكرتة",
+
+  // "menu.section.edit": "Edit",
   "menu.section.edit": "تحرير",
+
+  // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "حاوية",
+
+  // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "مجتمع",
+
+  // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "مادة",
+
+  // "menu.section.export": "Export",
   "menu.section.export": "تصدير",
+
+  // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "حاوية",
+
+  // "menu.section.export_community": "Community",
   "menu.section.export_community": "مجتمع",
+
+  // "menu.section.export_item": "Item",
   "menu.section.export_item": "مادة",
+
+  // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "ميتاداتا",
-  "menu.section.export_batch": "التصدير بالدفعة (ZIP)",
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "تصدير بالدفعة (ZIP)",
+
+  // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "قسم قائمة التحكم في الوصول",
-  "menu.section.icon.reports": "قسم قائمة التقارير",
-  "menu.section.icon.admin_search": "قسم قائمة البحث الإضافي",
+
+  // "menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "قسم قائمة البحث الإداري",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "قسم قائمة لوحة التحكم",
-  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الاخرة",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الأكرتة",
+
+  // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "قسم قائمة التحرير",
+
+  // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "قسم قائمة التصدير",
+
+  // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "قسم قائمة البحث",
+
+  // "menu.section.icon.health": "Health check menu section",
   "menu.section.icon.health": "قسم قائمة التحقق من الصحة",
+
+  // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "قسم قائمة الاستيراد",
-  "menu.section.icon.new": "قسم قائمة جديدة",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "قسم قائمة جديد",
+
+  // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "تدبيس الشريط الجانبي",
+
+  // "menu.section.icon.processes": "Processes Health",
   "menu.section.icon.processes": "قسم قائمة العمليات",
-  "menu.section.icon.registries": "قسم تسجيل التسجيل",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "قسم قائمة السجلات",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "قسم قائمة مهام الإحصائيات",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
   "menu.section.icon.workflow": "قسم قائمة إدارة عمليات سير العمل",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "إلغاء تدبيس الشريط الجانبي",
-  "menu.section.icon.notifications": "قسم قائمة الإخطارات",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "قسم قائمة الإشعارات",
+
+  // "menu.section.import": "Import",
   "menu.section.import": "استيراد",
-  "menu.section.import_batch": "اتصل بالدفعة (ملف صيفي)",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "استيراد بالدفعة (ملف مضغوط)",
+
+  // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "ميتاداتا",
+
+  // "menu.section.new": "New",
   "menu.section.new": "جديد",
+
+  // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "حاوية",
+
+  // "menu.section.new_community": "Community",
   "menu.section.new_community": "مجتمع",
+
+  // "menu.section.new_item": "Item",
   "menu.section.new_item": "مادة",
-  "menu.section.new_item_version": "المادة الإصدار",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "إصدارة المادة",
+
+  // "menu.section.new_process": "Process",
   "menu.section.new_process": "عملية",
+
+  // "menu.section.notifications": "Notifications",
   "menu.section.notifications": "الإشعارات",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
   "menu.section.quality-assurance": "ضمان الجودة",
-  "menu.section.notifications_publication-claim": "المطالبة بالنشر",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  // TODO New key - Add a translation
+  "menu.section.notifications_publication-claim": "Publication Claim",
+
+  // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "تدبيس الشريط الجانبي",
+
+  // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "إلغاء تدبيس الشريط الجانبي",
+
+  // "menu.section.processes": "Processes",
   "menu.section.processes": "العمليات",
+
+  // "menu.section.health": "Health",
   "menu.section.health": "كشف الصحة",
-  "menu.section.registries": "TI",
-  "menu.section.registries_format": "حتى",
-  "menu.section.registries_metadata": "ميداداتا",
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "السجلات",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "التنسيق",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "الميتاداتا",
+
+  // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "الإحصائيات",
+
+  // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "مهمة الإحصائيات",
+
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "قسم التحكم في الوصول للبدل",
-  "menu.section.toggle.reports": "تبديل قسم التقارير",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "قسم لوحة التحكم في البدل",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "قسم مهمة أكرتة البدل",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "قسم تحرير البدل",
+
+  // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "قسم تصدير البدل",
+
+  // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "قسم بحث البدل",
+
+  // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "قسم استيراد البدل",
+
+  // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "قسم بدل جديد",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "قسم سجلات البدل",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "قسم مهمة إحصائيات البدل",
+
+  // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "أدر سير العمل",
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "تصدير نتائج البحث كملف CSV",
-  "metadata-export-search.submit.success": "تم تفعيل التنفيذ الفعال",
-  "metadata-export-search.submit.error": "فشل في إنشاء التصدير",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "تم بدء التصدير بنجاح",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "فشل بدء التصدير",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "ماي دي سبيس",
+
+  // "mydspace.description": "",
   "mydspace.description": "",
-  "mydspace.messages.controller-help": "حدد هذا الخيار لإنشاء رسالة إلى مقدم المادة.",
-  "mydspace.messages.description-placeholder": "قم بتأكيد رسالتك هنا...",
-  "mydspace.messages.hide-msg": "استمرار الرسالة",
+
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "حدد هذا الخيار لإرسال رسالة إلى مقدم المادة.",
+
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "قم بإدخال رسالتك هنا...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "إخفاء الرسالة",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "حدد كمقروء",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "حدد كغير مقروء",
+
+  // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "لا يوجد محتوى.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "لا توجد رسائل بعد.",
+
+  // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "إرسال",
+
+  // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "عرض الرسالة",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "الموضوع...",
-  "mydspace.messages.submitter-help": "حدد هذا الخيار لرسالة إلى وحدة التحكم.",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "حدد هذا الخيار لإرسال رسالة إلى وحدة التحكم.",
+
+  // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "الرسائل",
+
+  // "mydspace.messages.to": "To",
   "mydspace.messages.to": "إلى",
+
+  // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "تقديم جديد",
-  "mydspace.new-submission-external": "استيراد الميتاداتا من المصدر الخارجي",
-  "mydspace.new-submission-external-short": "قم باستيراد الميتاداتا",
-  "mydspace.results.head": "تقديمك",
-  "mydspace.results.no-abstract": "لا يوجد روح",
-  "mydspace.results.no-authors": "لا يوجد كاتبين",
-  "mydspace.results.no-collections": "لا توجد الوثيقة",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "استيراد الميتاداتا من مصدر خارجي",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "استيراد الميتاداتا",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "تقديماتك",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "لا يوجد مستخلص",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "لا يوجد مؤلفين",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "لا توجد حاويات",
+
+  // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "لا يوجد تاريخ",
-  "mydspace.results.no-files": "لا يوجد ملفات",
-  "mydspace.results.no-results": "لا يوجد شيء للعرض",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "لا توجد ملفات",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "لا توجد مواد للعرض",
+
+  // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "لا يوجد عنوان",
-  "mydspace.results.no-uri": "لا يوجد أوري",
+
+  // "mydspace.results.no-uri": "No URI",
+  "mydspace.results.no-uri": "لا يوجد Uri",
+
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "بحث في ما دي سبيس...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "مهام سير العمل",
-  "mydspace.show.workspace": "تقديمك",
+
+  // "mydspace.show.workspace": "Your submissions",
+  "mydspace.show.workspace": "تقديماتك",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "مواد تحت الإشراف",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "في الأرشيف",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "تحقق",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "في انتظار المتحكم",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   "mydspace.status.mydspaceWorkflow": "سير العمل",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   "mydspace.status.mydspaceWorkspace": "مساحة العمل",
+
+  // "mydspace.title": "MyDSpace",
   "mydspace.title": "ماي دي سبيس",
-  "mydspace.upload.upload-failed": "خطأ أثناء إنشاء نطاق عمل جديد. ",
-  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. ",
-  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. ",
-  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} نطاق عمل جديد.",
+
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "خطأ اثناء إنشاء نطاق عمل جديد. يرجى التأكد من المحتوى المرفوع قبل إعادة المحاولة.",
+
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. تم اكتشاف عدد كبير جدًا من المدخلات ولكن تم السماح بإدخال واحد فقط للملف.",
+
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. يسمح بملف واحد فقط.",
+
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} مادة نطاق عمل جديدة.",
+
+  // "mydspace.view-btn": "View",
   "mydspace.view-btn": "عرض",
-  "nav.expandable-navbar-section-suffix": "(قائمة فرعية)",
-  "notification.suggestion": "وجدنا <b>{{count}} المنشورات</b> في ال {{source}} يبدو أن هذا مرتبط بملفك الشخصي.<br>",
-  "notification.suggestion.review": "مراجعة الاقتراحات",
-  "notification.suggestion.please": "لو سمحت",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  // TODO New key - Add a translation
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
+
+  // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "كل دي سبيس",
+
+  // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "حسب المجتمع",
-  "nav.context-help-toggle": "مساعدة تعطيل السياق",
-  "nav.language": "تغيير اللغة",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "مساعدة تبديل السياق",
+
+  // "nav.language": "Language switch",
+  "nav.language": "تبديل اللغة",
+
+  // "nav.login": "Log In",
   "nav.login": "تسجيل الدخول",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "قائمة ملف تعريف المستخدم وتسجيل الخروج",
+
+  // "nav.logout": "Log Out",
   "nav.logout": "خروج",
+
+  // "nav.main.description": "Main navigation bar",
   "nav.main.description": "شريط التصفح الرئيسي",
+
+  // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "ماي دي سبيس",
+
+  // "nav.profile": "Profile",
   "nav.profile": "الملف الشخصي",
+
+  // "nav.search": "Search",
   "nav.search": "بحث",
+
+  // "nav.search.button": "Submit search",
   "nav.search.button": "تقديم بحث",
+
+  // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "الإحصائيات",
-  "nav.stop-impersonating": "ضبط التصرف كشخص إلكتروني",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "الاشتراكات",
-  "nav.toggle": "تغيير التصفح",
-  "nav.user.description": "شريط تعريف المستخدم",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "تبديل التصفح",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "شريط ملف تعريف المستخدم",
+
+  // "none.listelement.badge": "Item",
   "none.listelement.badge": "المادة",
+
+  // "quality-assurance.title": "Quality Assurance",
   "quality-assurance.title": "ضمان الجودة",
-  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع المرسلة من الاشتراكات في {{source}}.",
-  "quality-assurance.source.description": "فيما يلي يمكنك رؤية جميع مصادر التنبيهات.",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "أدناه يمكنك رؤية جميع مصادر الإشعارات.",
+
+  // "quality-assurance.topics": "Current Topics",
   "quality-assurance.topics": "المواضيع الحالية",
-  "quality-assurance.source": "المصدر الحالي",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "المصادر الحالية",
+
+  // "quality-assurance.table.topic": "Topic",
   "quality-assurance.table.topic": "الموضوع",
+
+  // "quality-assurance.table.source": "Source",
   "quality-assurance.table.source": "المصدر",
-  "quality-assurance.table.last-event": "نهاية المطاف فعالة",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "آخر فعالية",
+
+  // "quality-assurance.table.actions": "Actions",
   "quality-assurance.table.actions": "إجراءات",
-  "quality-assurance.source-list.button.detail": "عرض المواضيع ل {{param}}",
-  "quality-assurance.topics-list.button.detail": "عرض اقتراحات ل {{param}}",
-  "quality-assurance.noTopics": "لم يتم توفيرها على المواضيع.",
-  "quality-assurance.noSource": "لم يتم العثور على المصادر.",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "لم يتم العثور على مواضيع.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "لم يتم العثور على مصادر.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
   "notifications.events.title": "اقتراحات ضمان الجودة",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
   "quality-assurance.topic.error.service.retrieve": "حدث خطأ أثناء تحميل موضوعات ضمان الجودة",
-  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل ضمان الجودة",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل مصدر ضمان الجودة",
+
+  // "quality-assurance.loading": "Loading ...",
   "quality-assurance.loading": "جاري التحميل ...",
+
+  // "quality-assurance.events.topic": "Topic:",
   "quality-assurance.events.topic": "الموضوع:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
   "quality-assurance.noEvents": "لم يتم العثور على أي اقتراحات.",
-  "quality-assurance.event.table.trust": "ثا",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "ثقة",
+
+  // "quality-assurance.event.table.publication": "Publication",
   "quality-assurance.event.table.publication": "النشر",
+
+  // "quality-assurance.event.table.details": "Details",
   "quality-assurance.event.table.details": "تفاصيل",
+
+  // "quality-assurance.event.table.project-details": "Project details",
   "quality-assurance.event.table.project-details": "تفاصيل المشروع",
-  "quality-assurance.event.table.reasons": "الأسباب",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
   "quality-assurance.event.table.actions": "إجراءات",
-  "quality-assurance.event.action.accept": "قبول الاقتراحات",
-  "quality-assurance.event.action.ignore": "تجاهل الاقتراحات",
-  "quality-assurance.event.action.undo": "يمسح",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "قبول الاقتراح",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
+
+  // "quality-assurance.event.action.undo": "DELETE",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "DELETE",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
   "quality-assurance.event.action.reject": "رفض الاقتراح",
-  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراحات",
-  "quality-assurance.event.table.pidtype": "نوع معرف المنتج:",
-  "quality-assurance.event.table.pidvalue": "قيمة معرف المنتج:",
-  "quality-assurance.event.table.subjectValue": "موضوع القيمة:",
-  "quality-assurance.event.table.abstract": "أخيرًا:",
-  "quality-assurance.event.table.suggestedProject": "بيانات المشروع من OpenAIRE",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراح",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "PID نوع:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "PID قيمة:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "قيمة الموضوع:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "خلاصة:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "بيانات المشروع المقترحة من OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
   "quality-assurance.event.table.project": "عنوان المشروع:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
   "quality-assurance.event.table.acronym": "حروف مختصرة:",
+
+  // "quality-assurance.event.table.code": "Code:",
   "quality-assurance.event.table.code": "رمز:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
   "quality-assurance.event.table.funder": "الممول:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
   "quality-assurance.event.table.fundingProgram": "برنامج التمويل:",
-  "quality-assurance.event.table.jurisdiction": "عدم التفويض:",
-  "quality-assurance.events.back": "العودة إلى المواضيع",
-  "quality-assurance.events.back-to-sources": "العودة إلى المصادر",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "الاختصاص القضائي:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "رجوع إلى المواضيع",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
   "quality-assurance.event.table.less": "عرض أقل",
+
+  // "quality-assurance.event.table.more": "Show more",
   "quality-assurance.event.table.more": "عرض المزيد",
-  "quality-assurance.event.project.found": "الارتباط المحلي:",
-  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيل محلي",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيلة محلية",
+
+  // "quality-assurance.event.sure": "Are you sure?",
   "quality-assurance.event.sure": "هل أنت متأكد؟",
-  "quality-assurance.event.ignore.description": "لا يمكن السماء عن هذه الطريقة. ",
-  "quality-assurance.event.undo.description": "لا يمكن التراجع عن هذه العملية!",
-  "quality-assurance.event.reject.description": "لا يمكن السماء عن هذه الطريقة. ",
-  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع من التجسس. ",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "لا يمكن التراجع عن هذه العملية. تجاهل هذا الاقتراح؟",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "لا يمكن التراجع عن هذه العملية. هل ترفض هذا الاقتراح؟",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع دي سبيس. سيتم إنشاء مشروع جديد بناءً على بيانات الاقتراح.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
   "quality-assurance.event.action.cancel": "إلغاء",
-  "quality-assurance.event.action.saved": "لقد تم حفظك الفعال.",
-  "quality-assurance.event.action.error": "حدث خطأ. ",
-  "quality-assurance.event.modal.project.title": "قم بإنشاء مشروعاً للربط",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "لقد تم حفظ قرارك بنجاح.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "حدث خطأ. لم يتم حفظ قرارك.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "اختر مشروعاً للربط",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
   "quality-assurance.event.modal.project.publication": "النشر:",
-  "quality-assurance.event.modal.project.bountToLocal": "الارتباط المحلي:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
   "quality-assurance.event.modal.project.select": "بحث المشروع",
+
+  // "quality-assurance.event.modal.project.search": "Search",
   "quality-assurance.event.modal.project.search": "بحث",
-  "quality-assurance.event.modal.project.clear": "تعديل التعديل",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "مسح",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
   "quality-assurance.event.modal.project.cancel": "إلغاء",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
   "quality-assurance.event.modal.project.bound": "ربط المشروع",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
   "quality-assurance.event.modal.project.remove": "إزالة",
-  "quality-assurance.event.modal.project.placeholder": "قم بتأكيد اسم المشروع",
-  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على المشروع.",
-  "quality-assurance.event.project.bounded": "تم التركيب الفعال.",
-  "quality-assurance.event.project.removed": "تم إلغاء الربط الفعال.",
-  "quality-assurance.event.project.error": "حدث خطأ. ",
-  "quality-assurance.event.reason": "هذا",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "قم بإدخال اسم المشروع",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على مشروع.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "تم ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "تم إلغاء ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "حدث خطأ. لم يتم تنفيذ أي عملية.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "السبب",
+
+  // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "وحدة مؤسسية",
+
+  // "orgunit.listelement.no-title": "Untitled",
   "orgunit.listelement.no-title": "بدون عنوان",
+
+  // "orgunit.page.city": "City",
   "orgunit.page.city": "المدينة",
+
+  // "orgunit.page.country": "Country",
   "orgunit.page.country": "البلد",
+
+  // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "تاريخ التأسيس",
+
+  // "orgunit.page.description": "Description",
   "orgunit.page.description": "الوصف",
+
+  // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "تحرير هذه المادة",
+
+  // "orgunit.page.id": "ID",
   "orgunit.page.id": "المعرف",
-  "orgunit.page.titleprefix": "الوحدة الوطنية: ",
-  "orgunit.page.ror": "معرف ROR",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "الوحدة المؤسسية: ",
+
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "ROR معرف",
+
+  // "pagination.options.description": "Pagination options",
   "pagination.options.description": "خيارات ترقيم الصفحات",
+
+  // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "النتائج لكل صفحة",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} من {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "يظهر الآن  ",
+
+  // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "خيارات الفرز",
-  "person.listelement.badge": "شخصي",
-  "person.listelement.no-title": "لم يتم العثور على الأسماء",
-  "person.page.birthdate": "تاريخ ميلادي",
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "شخص",
+
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "لم يتم العثور على أسماء",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "تاريخ الميلاد الميلادي",
+
+  // "person.page.edit": "Edit this item",
   "person.page.edit": "تحرير هذه المادة",
+
+  // "person.page.email": "Email Address",
   "person.page.email": "عنوان البريد الإلكتروني",
-  "person.page.firstname": "الاسم الأول",
-  "person.page.jobtitle": "مسؤول وظيفي",
+
+  // "person.page.firstname": "First Name",
+  // TODO New key - Add a translation
+  "person.page.firstname": "First Name",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "المسمي الوظيفي",
+
+  // "person.page.lastname": "Last Name",
   "person.page.lastname": "اسم العائلة",
+
+  // "person.page.name": "Name",
   "person.page.name": "الاسم",
-  "person.page.link.full": "عرض كل الدعوات",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "عرض كل الميتاداتا",
+
+  // "person.page.orcid": "ORCID",
   "person.page.orcid": "أوركيد",
+
+  // "person.page.staffid": "Staff ID",
   "person.page.staffid": "معرف الموظف",
+
+  // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "الشخص: ",
+
+  // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "نتائج بحث الشخص",
+
+  // "person-relationships.search.results.head": "Person Search Results",
   "person-relationships.search.results.head": "نتائج بحث الشخص",
+
+  // "person.search.title": "Person Search",
   "person.search.title": "بحث الشخص",
-  "process.new.select-parameters": "لا تزال",
-  "process.new.select-parameter": "تحديد النص",
-  "process.new.add-parameter": "إضافة نصوص...",
-  "process.new.delete-parameter": "حذف التقليد",
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "المتغيرات",
+
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "تحديد متغير",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "إضافة متغير...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "حذف متغير",
+
+  // "process.new.parameter.label": "Parameter value",
   "process.new.parameter.label": "قيمة المتغير",
+
+  // "process.new.cancel": "Cancel",
   "process.new.cancel": "إلغاء",
+
+  // "process.new.submit": "Save",
   "process.new.submit": "حفظ",
+
+  // "process.new.select-script": "Script",
   "process.new.select-script": "نص",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "اختر نص...",
+
+  // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "النص مطلوب",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "اختر ملف...",
-  "process.new.parameter.file.required": "يرجى تحديد الملف",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "يرجى تحديد ملف",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "قيمة المتغير مطلوبة",
+
+  // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "القيمة",
+
+  // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "ملف",
-  "process.new.parameter.required.missing": "التالية مطلوبة ولكنها لا تزال ناقصة:",
+
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "المتغيرات التالية مطلوبة ولكنها لا تزال ناقصة:",
+
+  // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "نجاح",
-  "process.new.notification.success.content": "تم إنشاء فعال",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "تم إنشاء العملية بنجاح",
+
+  // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "خطأ",
-  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء الطريق",
-  "process.new.notification.error.max-upload.content": "السماح بالملف الأقصى لحجم التحميل",
-  "process.new.header": "إنشاء إنشاءات جديدة",
-  "process.new.title": "إنشاء إنشاءات جديدة",
-  "process.new.breadcrumbs": "إنشاء إنشاءات جديدة",
-  "process.detail.arguments": "لماذا",
-  "process.detail.arguments.empty": "لا تحتوي هذه الطريقة على أي أسباب",
+
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء العملية",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "يتجاوز الملف الحد الأقصى لحجم التحميل",
+
+  // "process.new.header": "Create a new process",
+  "process.new.header": "إنشاء عملية جديدة",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title": "إنشاء عملية جديدة",
+
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "إنشاء عملية جديدة",
+
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "حجج",
+
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "لا تحتوي هذه العملية على أي حجج",
+
+  // "process.detail.back": "Back",
   "process.detail.back": "رجوع",
-  "process.detail.output": "مخرجات الطريقة",
-  "process.detail.logs.button": "استرجاع مخرجات الحرارة",
+
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "مخرجات العملية",
+
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "استرجاع مخرجات العملية",
+
+  // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "استرجاع",
-  "process.detail.logs.none": "ولا يوجد مخرجات لهذه الغاية",
-  "process.detail.output-files": "ملفات المنتج",
-  "process.detail.output-files.empty": "لا تحتوي على هذه الطريقة على أي من المواد التي تم إخراجها",
+
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "لا توجد مخرجات لهذه العملية",
+
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "ملفات الإخراج",
+
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "لا تحتوي هذه العملية على أي ملفات إخراج",
+
+  // "process.detail.script": "Script",
   "process.detail.script": "النص",
-  "process.detail.title": "الطريقة: {{ id }} - {{ name }}",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "العملية: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "وقت البدء",
-  "process.detail.end-time": "انتهى الوقت",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "وقت الانتهاء",
+
+  // "process.detail.status": "Status",
   "process.detail.status": "الحالة",
-  "process.detail.create": "إنشاء طريقة مماثلة",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "إنشاء عملية مماثلة",
+
+  // "process.detail.actions": "Actions",
   "process.detail.actions": "إجراءات",
-  "process.detail.delete.button": "حذف المعاملة",
-  "process.detail.delete.header": "حذف المعاملة",
-  "process.detail.delete.body": "هل أنت متأكد من أنك ترغب في الحذف الصحيح؟",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "حذف العملية",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "حذف العملية",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "هل أنت متأكد من أنك تريد حذف العملية الحالية؟",
+
+  // "process.detail.delete.cancel": "Cancel",
   "process.detail.delete.cancel": "إلغاء",
-  "process.detail.delete.confirm": "حذف المعاملة",
-  "process.detail.delete.success": "تم الحذف الفعال.",
-  "process.detail.delete.error": "حدث خطأ ما أثناء الحذف",
-  "process.detail.refreshing": "التحديث التلقائي…",
-  "process.overview.table.completed.info": "وقت الانتهاء (التوقيت العالمي المنسق)",
-  "process.overview.table.completed.title": "العمليات الناجحة",
-  "process.overview.table.empty": "لم يتم العثور على عمليات مطابقة.",
-  "process.overview.table.failed.info": "وقت الانتهاء (التوقيت العالمي المنسق)",
-  "process.overview.table.failed.title": "العمليات الفاشلة",
-  "process.overview.table.finish": "انتهى الوقت (التوقيت العالمي)",
-  "process.overview.table.id": "معرف الطريقة",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "حذف العملية",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "تم حذف العملية بنجاح.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "حدث خطأ ما أثناء حذف العملية",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
+  // TODO New key - Add a translation
+  "process.detail.refreshing": "Auto-refreshing…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.completed.info": "Finish time (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  // TODO New key - Add a translation
+  "process.overview.table.completed.title": "Succeeded processes",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  // TODO New key - Add a translation
+  "process.overview.table.empty": "No matching processes found.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.failed.info": "Finish time (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  // TODO New key - Add a translation
+  "process.overview.table.failed.title": "Failed processes",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "وقت الانتهاء (التوقيت العالمي)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "معرف العملية",
+
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "الاسم",
-  "process.overview.table.running.info": "وقت البدء (التوقيت العالمي المنسق)",
-  "process.overview.table.running.title": "ادارة العمليات",
-  "process.overview.table.scheduled.info": "وقت الإنشاء (التوقيت العالمي المنسق)",
-  "process.overview.table.scheduled.title": "العمليات المجدولة",
-  "process.overview.table.start": "التوقيت (التوقيت العالمي)",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  // TODO New key - Add a translation
+  "process.overview.table.running.title": "Running processes",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "وقت البدء (التوقيت العالمي)",
+
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "الحالة",
+
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "المستخدم",
+
+  // "process.overview.title": "Processes Overview",
   "process.overview.title": "نظرة عامة على العمليات",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "نظرة عامة على العمليات",
+
+  // "process.overview.new": "New",
   "process.overview.new": "جديد",
+
+  // "process.overview.table.actions": "Actions",
   "process.overview.table.actions": "إجراءات",
+
+  // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "حذف {{count}} عملية",
-  "process.overview.delete-process": "حذف المعاملة",
-  "process.overview.delete.clear": "حذف التحديد والحذف",
-  "process.overview.delete.processing": "سيتم حذفه {{count}} عملية. ",
-  "process.overview.delete.body": "هل أنت متأكد أنك تريد الحذف {{count}} العملية؟",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "حذف العملية",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "مسح تحديد الحذف",
+
+  // "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": "يجري حذف {{count}} عملية. يرجى الانتظار حتى يكتمل الحذف بالكامل. لاحظ أن ذلك قد يستغرق بعض الوقت.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "هل أنت متأكد أنك تريد حذف {{count}} عملية؟",
+
+  // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "حذف العمليات",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "خطأ في عملية الحذف",
-  "process.bulk.delete.error.body": "لا يمكن حذف الطريقة ذات المعرفة {{processId}}.  ",
-  "process.bulk.delete.success": "تم الحذف {{count}} فعالية فعالة",
+
+  // "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": "لا يمكن حذف العملية ذات المعرف {{processId}}. وسيستمر حذف العمليات المتبقية. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "تم حذف {{count}} عملية بنجاح",
+
+  // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "تحديث الملف الشخصي",
+
+  // "profile.card.identify": "Identify",
   "profile.card.identify": "تعريف",
+
+  // "profile.card.security": "Security",
   "profile.card.security": "الحماية والأمان",
+
+  // "profile.form.submit": "Save",
   "profile.form.submit": "حفظ",
-  "profile.groups.head": "المجموعات التي تقترحها",
-  "profile.special.groups.head": "المجموعات التي تقترحها",
+
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "مجموعات التفويض التي تنتمي إليها",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "مجموعات التفويض الخاصة التي تنتمي إليها",
+
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "الاسم الأول مطلوب",
+
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
   "profile.metadata.form.error.lastname.required": "اسم العائلة مطلوب",
+
+  // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "عنوان البريد الإلكتروني",
+
+  // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "الاسم الأول",
+
+  // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "اللغة",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "اسم العائلة",
-  "profile.metadata.form.label.phone": "هاتف",
-  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي استخدمتها على الملف الشخصي.",
+
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "هاتف الاتصال",
+
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على الملف الشخصي.",
+
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "تم حفظ الملف الشخصي",
-  "profile.notifications.warning.no-changes.content": "لم يتم عمل أي تغييرات على الملف الشخصي.",
+
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "لم يتم إجراء أي تغييرات على الملف الشخصي.",
+
+  // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "لا توجد تغييرات",
+
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
-  "profile.security.form.info": "اختياريًا، يمكنك تسجيل كلمة مرور في القسم السفلي، وتأكيدها عن طريق كتابتها مرة أخرى في الشريط الثاني.",
+
+  // "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": "اختيارياً، يمكنك إدخال كلمة مرور جديدة في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
+
+  // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "كلمة المرور",
-  "profile.security.form.label.passwordrepeat": "إعادة الكتابة للتأكيد",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "profile.security.form.label.current-password": "Current password",
   "profile.security.form.label.current-password": "كلمة المرور الحالية",
-  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي جربتها على كلمة المرور.",
+
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على كلمة المرور.",
+
+  // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "تم حفظ كلمة المرور",
+
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "حدث خطأ أثناء تغيير كلمات المرور",
-  "profile.security.form.notifications.error.change-failed": "حدث خطأ أثناء محاولة تغيير كلمة المرور. ",
-  "profile.security.form.notifications.error.not-same": "كلمات الترويج المختلفة.",
-  "profile.security.form.notifications.error.general": "يرجى استخدام الأغراض المتعددة في نموذج الحماية والأمان.",
+
+  // "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": "حدث خطأ أثناء محاولة تغيير كلمة المرور. يرجى التحقق مما إذا كانت كلمة المرور الحالية صحيحة.",
+
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "كلمات المرور المقدمة مختلفة.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "يرجى ملء الحقول المطلوبة في نموذج الحماية والأمان.",
+
+  // "profile.title": "Update Profile",
   "profile.title": "تحديث الملف الشخصي",
-  "profile.card.researcher": "الملف للباحث الشخصي",
-  "project.listelement.badge": "مشروع باحث",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "الملف الشخصي للباحث",
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "مشروع الباحث",
+
+  // "project.page.contributor": "Contributors",
   "project.page.contributor": "المساهمون",
+
+  // "project.page.description": "Description",
   "project.page.description": "الوصف",
+
+  // "project.page.edit": "Edit this item",
   "project.page.edit": "تحرير هذه المادة",
-  "project.page.expectedcompletion": "الاكمال المصيبة",
-  "project.page.funder": "الأمولين",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "الإكمال المتوقع",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder": "الممولين",
+
+  // "project.page.id": "ID",
   "project.page.id": "المعرف",
-  "project.page.keyword": "الكلمات الرئيسية",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "كلمات رئيسية",
+
+  // "project.page.status": "Status",
   "project.page.status": "الحالة",
+
+  // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "مشورع البحث: ",
-  "project.search.results.head": "نتائج البحث في المشروع",
-  "project-relationships.search.results.head": "نتائج البحث في المشروع",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "نتائج بحث المشروع",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "نتائج بحث المشروع",
+
+  // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "النشر",
+
+  // "publication.page.description": "Description",
   "publication.page.description": "الوصف",
+
+  // "publication.page.edit": "Edit this item",
   "publication.page.edit": "تحرير هذه المادة",
+
+  // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "ردمد الدورية",
-  "publication.page.journal-title": "عنوان الدوري",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "عنوان الدورية",
+
+  // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "الناشر",
-  "publication.page.titleprefix": "النشر: ",
+
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "المنشور: ",
+
+  // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "عنوان المجلد",
+
+  // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "نتائج بحث المنشور",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
   "publication-relationships.search.results.head": "نتائج بحث المنشور",
-  "publication.search.title": "بحثت في المنشور",
+
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "بحث المنشور",
+
+  // "media-viewer.next": "Next",
   "media-viewer.next": "التالي",
-  "media-viewer.previous": "السابقة",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "السابق",
+
+  // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "قائمة التشغيل",
-  "suggestion.loading": "تحميل ...",
-  "suggestion.title": "المطالبة بالنشر",
-  "suggestion.title.breadcrumbs": "المطالبة بالنشر",
-  "suggestion.targets.description": "أدناه يمكنك رؤية جميع الاقتراحات ",
-  "suggestion.targets": "الاقتراحات الحالية",
-  "suggestion.table.name": "اسم الباحث",
-  "suggestion.table.actions": "أجراءات",
-  "suggestion.button.review": "مراجعة {{ total }} اقتراحات)",
-  "suggestion.button.review.title": "مراجعة {{ total }} اقتراح (اقتراحات) ل ",
-  "suggestion.noTargets": "لم يتم العثور على هدف.",
-  "suggestion.target.error.service.retrieve": "حدث خطأ أثناء تحميل أهداف الاقتراح",
-  "suggestion.evidence.type": "يكتب",
-  "suggestion.evidence.score": "نتيجة",
-  "suggestion.evidence.notes": "ملحوظات",
-  "suggestion.approveAndImport": "الموافقة والاستيراد",
-  "suggestion.approveAndImport.success": "تم استيراد الاقتراح بنجاح. <a href='{{ url }}'>منظر.</a>",
-  "suggestion.approveAndImport.bulk": "الموافقة والاستيراد المحدد",
-  "suggestion.approveAndImport.bulk.success": "{{ count }} تم استيراد الاقتراحات بنجاح ",
-  "suggestion.approveAndImport.bulk.error": "{{ count }} لم يتم استيراد الاقتراحات بسبب حدوث أخطاء غير متوقعة في الخادم",
-  "suggestion.ignoreSuggestion": "تجاهل الاقتراح",
-  "suggestion.ignoreSuggestion.success": "لقد تم تجاهل الاقتراح",
-  "suggestion.ignoreSuggestion.bulk": "تجاهل الاقتراح المحدد",
-  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} لقد تم تجاهل الاقتراحات ",
-  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} لم يتم تجاهل الاقتراحات بسبب أخطاء غير متوقعة في الخادم",
-  "suggestion.seeEvidence": "انظر الأدلة",
-  "suggestion.hideEvidence": "إخفاء الأدلة",
-  "suggestion.suggestionFor": "اقتراحات ل",
-  "suggestion.suggestionFor.breadcrumb": "اقتراحات ل {{ name }}",
-  "suggestion.source.openaire": "الرسم البياني أوبن إير",
-  "suggestion.from.source": "من ",
-  "suggestion.count.missing": "لم يتبق لديك أي مطالبات بالنشر",
-  "suggestion.totalScore": "مجموع النقاط",
-  "suggestion.type.openaire": "أوبن إير",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
+
+  // "register-email.title": "New user registration",
   "register-email.title": "تسجيل مستخدم جديد",
+
+  // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "إنشاء ملف شخصي",
+
+  // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "تعريف",
+
+  // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "عنوان البريد الإلكتروني",
+
+  // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "الاسم الأول *",
-  "register-page.create-profile.identification.first-name.error": "يرجى الاتصال بالاسم الأول",
+
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "يرجى إدخال الاسم الأول",
+
+  // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "اسم العائلة *",
-  "register-page.create-profile.identification.last-name.error": "يرجى الاتصال باسم العائلة",
+
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "يرجى إدخال اسم العائلة",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "الهاتف",
+
+  // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "اللغة",
+
+  // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "الحماية والأمان",
-  "register-page.create-profile.security.info": "يرجى الاتصال برقم المرور في الشريط أدناه، وتأكيدها عن طريق كتابها مرة أخرى في الشريط الثاني. ",
+
+  // "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": "يرجى إدخال كلمة المرور في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني. يجب أن تتكون من ستة أحرف على الأقل.",
+
+  // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "كلمة المرور *",
-  "register-page.create-profile.security.label.passwordrepeat": "خطة إعادة الكتابة للتأكيد *",
-  "register-page.create-profile.security.error.empty-password": "الرجاء الاتصال بكلمة المرور في النطاق أدناه.",
-  "register-page.create-profile.security.error.matching-passwords": "كلمتي الطلب التي قمت بتأكيدها غير متطابقتين.",
+
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "أعد الكتابة للتأكيد *",
+
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "يرجى إدخال كلمة المرور في المربع أدناه.",
+
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "كلمتي المرور التي قمت بإدخالهما غير متطابقتين.",
+
+  // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "اكتمل التسجيل",
+
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
   "register-page.create-profile.submit.error.content": "حدث خطأ ما أثناء تسجيل مستخدم جديد.",
+
+  // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "فشل التسجيل",
-  "register-page.create-profile.submit.success.content": "تم التسجيل الفعال. ",
+
+  // "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": "تم التسجيل بنجاح. لقد قمت بتسجيل الدخول كالمستخدم الذي تم إنشاؤه.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "اكتمل التسجيل",
+
+  // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "تسجيل مستخدم جديد",
-  "register-page.registration.info": "قام بتسجيل حساب للاشتراك في Vitten لتحديثات البريد الإلكتروني، المساهمة في منتجات جديدة إلى دي سبيس.",
+
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "قم بتسجيل حساب للاشتراك في حاويات لتحديثات البريد الإلكتروني، وتقديم مواد جديدة إلى دي سبيس.",
+
+  // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "عنوان البريد الإلكتروني *",
-  "register-page.registration.email.error.required": "يرجى الاتصال بعنوان البريد الإلكتروني",
-  "register-page.registration.email.error.not-email-form": "يرجى الاتصال بعنوان بريد إلكتروني صالح.",
-  "register-page.registration.email.error.not-valid-domain": "استخدام البريد الإلكتروني بالنطاقات المخصصة: {{ domains }}",
-  "register-page.registration.email.hint": "تم التحقق من هذا العنوان نيكوله كاسم تسجيل الدخول الخاص بك.",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "يرجى إدخال عنوان البريد الإلكتروني",
+
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "استخدم البريد الإلكتروني بالنطاقات المسموح بها: {{ domains }}",
+
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "سيتم التحقق من هذا العنوان واستخدامه كاسم تسجيل الدخول الخاص بك.",
+
+  // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "تسجيل",
-  "register-page.registration.success.head": "إرسال رسالة بريد إلكتروني مؤكدة",
-  "register-page.registration.success.content": "يتم إرسال رسالة بريد الإلكتروني إلى {{ email }} تحتوي على عنوان URL خاص ومتزايد من التعلميات.",
-  "register-page.registration.error.head": "حدث خطأ أثناء محاولة تسجيل البريد الإلكتروني",
+
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "تم إرسال رسالة تأكيد البريد الإلكتروني",
+
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "تم إرسال رسالة بريد إلكتروني إلى {{ email }} تحتوي على عنوان URL خاص والمزيد من التعلميات.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "خطأ أثناء محاولة تسجيل البريد الإلكتروني",
+
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "حدث خطأ أثناء تسجيل عنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
   "register-page.registration.error.recaptcha": "حدث خطأ أثناء محاولة الاستيثاق باستخدام recaptcha",
-  "register-page.registration.google-recaptcha.must-accept-cookies": "للتسجيل، يجب عليك قبول ملفات تعريف الارتباط <b>التسجيل و استعادة كلمة المرور</b> (جوجل reCaptcha).",
-  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي تناسب التسجيل.  {{ domains }}",
+
+  // "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": "للتسجيل، يجب عليك قبول ملفات تعريف ارتباط <b>التسجيل واستعادة كلمة المرور</b> (جوجل reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي يمكنها التسجيل. النطاقات المسموح بها هي {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
   "register-page.registration.google-recaptcha.open-cookie-settings": "فتح إعدادات ملفات تعريف الارتباط",
-  "register-page.registration.google-recaptcha.notification.title": "جوجل ريكابتشا",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "جوجل reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
   "register-page.registration.google-recaptcha.notification.message.error": "حدث خطأ أثناء التحقق من reCaptcha",
-  "register-page.registration.google-recaptcha.notification.message.expired": "صلاحية التحقق. ",
-  "register-page.registration.info.maildomain": "يمكن تسجيل عقود لناوين البريد للنطاقات",
-  "relationships.add.error.relationship-type.content": "لا يمكن العثور على تطابق مناسب لنوع التوافق {{ type }} بين المادتين",
-  "relationships.add.error.server.content": "لقد ساعدت في خطأ",
-  "relationships.add.error.title": "غير قادر على الانضمام إلى إيران",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "انتهت صلاحية التحقق. يرجى التحقق مرة أخرى.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "يمكن تسجيل الحسابات لعناوين البريد للنطاقات",
+
+  // "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": "لا يمكن العثور على تطابق مناسب لنوع العلاقة {{ type }} بين المادتين",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "لقد أعاد الخادم خطأ",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "غير قادر على إضافة العلاقة",
+
+  // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "المؤلفين",
-  "relationships.isAuthorOf.Person": "المؤلفين (الأشخاص)",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "المؤلفين (أشخاص)",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "المؤلفين (وحدات مؤسسية)",
-  "relationships.isIssueOf": "سجل الدوري",
-  "relationships.isIssueOf.JournalIssue": "عدد الدوري",
-  "relationships.isJournalIssueOf": "عدد الدوري",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "أعداد الدورية",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "عدد الدورية",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "عدد الدورية",
+
+  // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "الدوريات",
-  "relationships.isJournalVolumeOf": "سلسلة الدورية",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "مجلد الدورية",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "وحدات مؤسسية",
+
+  // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "المؤلفين",
-  "relationships.isProjectOf": "مشاريع البحث",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "مشروعات البحث",
+
+  // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "منشورات",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "مقالات",
-  "relationships.isSingleJournalOf": "الدوري",
-  "relationships.isSingleVolumeOf": "سلسلة الدورية",
-  "relationships.isVolumeOf": "سلسلة الدوريات",
-  "relationships.isVolumeOf.JournalVolume": "سلسلة الدورية",
-  "relationships.isContributorOf": "خذ",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "الدورية",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "مجلد الدورية",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "مجلدات الدورية",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "مجلد الدورية",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "المساهمين",
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
   "relationships.isContributorOf.OrgUnit": "المساهم (وحدة مؤسسية)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
   "relationships.isContributorOf.Person": "المساهم",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "الممول",
-  "repository.image.logo": "مستودع الشعار",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "شعار المستودع",
+
+  // "repository.title": "DSpace Repository",
   "repository.title": "مستودع دي سبيس",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
   "repository.title.prefix": "مستودع دي سبيس :: ",
+
+  // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "إضافة",
-  "resource-policies.add.for.": "إضافة جديدة",
-  "resource-policies.add.for.bitstream": "إضافة لمزيد من التدفق بت جديدة",
-  "resource-policies.add.for.bundle": "إضافة حزمة جديدة",
-  "resource-policies.add.for.item": "إضافة مادة جديدة",
-  "resource-policies.add.for.community": "اضافة الى مجتمع جديد",
-  "resource-policies.add.for.collection": "إضافة ابي كوبين جديدة",
-  "resource-policies.create.page.heading": "إنشاء أشياء جديدة لـ ",
-  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء الموارد.",
-  "resource-policies.create.page.success.content": "فعال",
-  "resource-policies.create.page.title": "إنشاء أشياء جديدة",
-  "resource-policies.delete.btn": "حذف",
-  "resource-policies.delete.btn.title": "حذف الموارد المحددة",
-  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد الهامة.",
-  "resource-policies.delete.success.content": "عملية",
-  "resource-policies.edit.page.heading": "تحرير بولي المورد ",
-  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير المورد.",
+
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "إضافة سياسة جديدة",
+
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "إضافة سياسة تدفق بت جديدة",
+
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "إضافة سياسة حزمة جديدة",
+
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "إضافة سياسة مادة جديدة",
+
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "إضافة سياسة مجتمع جديدة",
+
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "إضافة سياسة حاوية جديدة",
+
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "إنشاء سياسة موارد جديدة لـ ",
+
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء سياسة الموارد.",
+
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "تمت العملية بنجاح",
+
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "إنشاء سياسة موارد جديدة",
+
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "حذف المحدد",
+
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "حذف سياسات الموارد المحددة",
+
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد المحددة.",
+
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "عملية ناجحة",
+
+  // "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "تحرير سياسة المورد ",
+
+  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير سياسة المورد.",
+
+  // "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": "حدث خطأ أثناء تحرير الهدف (الشخص الإلكتروني أو المجموعة) لسياسة الموارد.",
-  "resource-policies.edit.page.other-failure.content": "حدث خطأ أثناء تحرير الموارد. ",
-  "resource-policies.edit.page.success.content": "عملية",
-  "resource-policies.edit.page.title": "تحرير بولي المورد",
+
+  // "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": "حدث خطأ أثناء تحرير سياسة الموارد. تم تحديث الهدف (الشخص الإلكتروني أو المجموعة) بنجاح.",
+
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "عملية ناجحة",
+
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "تحرير سياسة المورد",
+
+  // "resource-policies.form.action-type.label": "Select the action type",
   "resource-policies.form.action-type.label": "تحديد نوع الإجراء",
-  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء إجراء المورد.",
-  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي يستفيد منها من هذه الامتيازات",
+
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء سياسة المورد.",
+
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي سيتم منحها هذه الصلاحية",
+
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "تحديد",
+
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
   "resource-policies.form.eperson-group-list.tab.eperson": "بحث عن شخص إلكتروني",
-  "resource-policies.form.eperson-group-list.tab.group": "بحثت عن مجموعة",
-  "resource-policies.form.eperson-group-list.table.headers.action": "صنع",
+
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "بحث عن مجموعة",
+
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "إجراء",
+
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "المعرف",
+
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "الاسم",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
   "resource-policies.form.eperson-group-list.modal.header": "لا يمكن تغيير النوع",
-  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "لا يمكن استبدال الشخص الحياتي.",
-  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "لا يمكن استبدال مجموعة الإلكترونيات الشخصية.",
-  "resource-policies.form.eperson-group-list.modal.text2": "قم بحذف طلبات الموارد الحالية ونقلها بالنوع المطلوب.",
-  "resource-policies.form.eperson-group-list.modal.close": "حسنًا",
+
+  // "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": "لا يمكن استبدال الشخص الإلكتروني بمجموعة.",
+
+  // "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": "لا يمكن استبدال مجموعة بشخص إلكتروني.",
+
+  // "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": "قم بحذف سياسة الموارد الحالية وإنشاء سياسة جديدة بالنوع المطلوب.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "موافق",
+
+  // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "تاريخ الانتهاء",
-  "resource-policies.form.date.start.label": "تاريخ الميلاد",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "تاريخ البدء",
+
+  // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "الوصف",
+
+  // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "الاسم",
+
+  // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "حدد نوع السياسة",
-  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع أبو الموارد.",
-  "resource-policies.table.headers.action": "صنع",
+
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع سياسة الموارد.",
+
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "إجراء",
+
+  // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "تاريخ الانتهاء",
-  "resource-policies.table.headers.date.start": "تاريخ الميلاد",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "تاريخ البدء",
+
+  // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "تحرير",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "تحرير المجموعة",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "تحرير السياسة",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "شخص إلكتروني",
+
+  // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "المجموعة",
+
+  // "resource-policies.table.headers.select-all": "Select all",
   "resource-policies.table.headers.select-all": "تحديد الكل",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
   "resource-policies.table.headers.deselect-all": "إلغاء تحديد الكل",
+
+  // "resource-policies.table.headers.select": "Select",
   "resource-policies.table.headers.select": "تحديد",
-  "resource-policies.table.headers.deselect": "قم بإلغاء التحديد",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "إلغاء تحديد",
+
+  // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "المعرف",
+
+  // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "الاسم",
+
+  // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "النوع",
-  "resource-policies.table.headers.title.for.bitstream": "سياسة تدفق البت",
+
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "سياسات تدفق البت",
+
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
   "resource-policies.table.headers.title.for.bundle": "سياسات الحزمة",
-  "resource-policies.table.headers.title.for.item": "هذه المادة",
-  "resource-policies.table.headers.title.for.community": "سياسة المجتمع",
-  "resource-policies.table.headers.title.for.collection": "تمام",
+
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "سياسات المادة",
+
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "سياسات المجتمع",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "سياسات الحاوية",
+
+  // "root.skip-to-content": "Skip to main content",
   "root.skip-to-content": "انتقل إلى المحتوى الرئيسي",
+
+  // "search.description": "",
   "search.description": "",
+
+  // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "عرض",
+
+  // "search.title": "Search",
   "search.title": "بحث",
+
+  // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "بحث",
-  "search.search-form.placeholder": "بحث المستودع...",
-  "search.filters.remove": "إزالة المنقح من النوع {{ type }} د {{ value }}",
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "بحث المستودع ...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "إزالة المنقح من النوع {{ type }} بقيمة {{ value }}",
+
+  // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "المؤلف",
+
+  // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "تاريخ الانتهاء",
-  "search.filters.applied.f.dateIssued.min": "تاريخ الميلاد",
-  "search.filters.applied.f.dateSubmitted": "التاريخ",
-  "search.filters.applied.f.discoverable": "غير للاكتشاف",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "تاريخ البدء",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "تاريخ التقديم",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "غير قابل للاكتشاف",
+
+  // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "نوع المادة",
+
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "بها ملفات",
+
+  // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "النوع",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "الحالة",
-  "search.filters.applied.f.subject": "بدلا",
-  "search.filters.applied.f.submitter": "شير",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "الموضع",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "المقدم",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "المسمى الوظيفي",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "نهاية تاريخ الميلاد",
+
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "بداية تاريخ الميلاد",
-  "search.filters.applied.f.supervisedBy": "تحت النار",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "تحت إشراف",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "مسحوب",
+
+  // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "المؤلف",
+
+  // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "اسم المؤلف",
-  "search.filters.filter.author.label": "بحثت باسم المؤلف",
-  "search.filters.filter.birthDate.head": "تاريخ",
-  "search.filters.filter.birthDate.placeholder": "تاريخ",
-  "search.filters.filter.birthDate.label": "تمت مناقشة تاريخ الميلاد",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "بحث اسم المؤلف",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "بحث تاريخ الميلاد",
+
+  // "search.filters.filter.collapse": "Collapse filter",
   "search.filters.filter.collapse": "طي المنقح",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
   "search.filters.filter.creativeDatePublished.label": "بحث تاريخ النشر",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "المحرر",
-  "search.filters.filter.creativeWorkEditor.label": "المحرر المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "بحث المحرر",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "الموضوع",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "الموضوع",
-  "search.filters.filter.creativeWorkKeywords.label": "موضوع البحث",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "بحث الموضوع",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "بحث الناشر",
+
+  // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "التاريخ",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.max.placeholder": "الحد الأقصى للتاريخ",
-  "search.filters.filter.dateIssued.max.label": "تنتهي",
-  "search.filters.filter.dateIssued.min.placeholder": "الحد للتاريخ",
-  "search.filters.filter.dateIssued.min.label": "المبتدئ",
-  "search.filters.filter.dateSubmitted.head": "التاريخ",
-  "search.filters.filter.dateSubmitted.placeholder": "التاريخ",
-  "search.filters.filter.dateSubmitted.label": "تاريخ العرض",
-  "search.filters.filter.discoverable.head": "غير للاكتشاف",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "انتهاء",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "الحد الأدنى للتاريخ",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "البدء",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "تاريخ التقديم",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "تاريخ التقديم",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "بحث تاريخ التقديم",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "غير قابل للاكتشاف",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "مسحوب",
+
+  // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "نوع المادة",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "نوع المادة",
-  "search.filters.filter.entityType.label": "تمت مناقشة نوع المادة",
-  "search.filters.filter.expand": "الأوقات المنقحة",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "بحث نوع المادة",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "توسيع المنقح",
+
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "بها ملفات",
+
+  // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "النوع",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "النوع",
+
+  // "search.filters.filter.itemtype.label": "Search type",
   "search.filters.filter.itemtype.label": "بحث النوع",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "المسمى الوظيفي",
-  "search.filters.filter.jobTitle.label": "بحث في المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "بحث المسمى الوظيفي",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "لغة معروفة",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "لغة معروفة",
-  "search.filters.filter.knowsLanguage.label": "اتصل بـ اسم معروف",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "بحث لغة معروفة",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "الحالة",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "الحالة",
-  "search.filters.filter.namedresourcetype.label": "الحالة المدروسة",
-  "search.filters.filter.objectpeople.head": "الأشخاص",
-  "search.filters.filter.objectpeople.placeholder": "الأشخاص",
-  "search.filters.filter.objectpeople.label": "بحث الناس",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "بحث الحالة",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "أشخاص",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "أشخاص",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "بحث الأشخاص",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
   "search.filters.filter.organizationAddressCountry.label": "بحث البلد",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "المدينة",
-  "search.filters.filter.organizationAddressLocality.label": "بحثت المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "بحث المدينة",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "تاريخ التأسيس",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "تاريخ التأسيس",
-  "search.filters.filter.organizationFoundingDate.label": "بحثت في تاريخها",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "بحث تاريخ التأسيس",
+
+  // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "النطاق",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "منقح النطاق",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
   "search.filters.filter.scope.label": "منقح نطاق البحث",
-  "search.filters.filter.show-less": "طيء",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "طي",
+
+  // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "عرض المزيد",
+
+  // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "الموضوع",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "الموضوع",
-  "search.filters.filter.subject.label": "موضوع البحث",
-  "search.filters.filter.submitter.head": "شير",
-  "search.filters.filter.submitter.placeholder": "شير",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "بحث الموضوع",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "المقدم",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "المقدم",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "مقدم البحث",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "استعراض شجرة {{ name }}",
-  "search.filters.filter.funding.head": "تمويل",
-  "search.filters.filter.funding.placeholder": "تمويل",
-  "search.filters.filter.supervisedBy.head": "تحت النار",
-  "search.filters.filter.supervisedBy.placeholder": "تحت النار",
-  "search.filters.filter.supervisedBy.label": "ابحث تحت البحث",
-  "search.filters.entityType.JournalIssue": "عدد الدوري",
-  "search.filters.entityType.JournalVolume": "سلسلة الدورية",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "التمويل",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "التمويل",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "البحث تحت إشراف",
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "عدد الدورية",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "مجلد الدورية",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "وحدة مؤسسية",
-  "search.filters.entityType.Person": "شخص",
-  "search.filters.entityType.Project": "مشروع",
-  "search.filters.entityType.Publication": "النشر",
+
+  // "search.filters.entityType.Person": "Person",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
+
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "نعم",
+
+  // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "لا",
+
+  // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "لا",
+
+  // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "نعم",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
   "search.filters.namedresourcetype.Archived": "مؤرشف",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
   "search.filters.namedresourcetype.Validation": "التحقق من الصحة",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
   "search.filters.namedresourcetype.Waiting for Controller": "في انتظار المراجع",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
   "search.filters.namedresourcetype.Workflow": "سير العمل",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
   "search.filters.namedresourcetype.Workspace": "مساحة العمل",
+
+  // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "نعم",
+
+  // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "لا",
+
+  // "search.filters.head": "Filters",
   "search.filters.head": "المنقحات",
-  "search.filters.reset": "إعادة تعيين المقحات",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "إعادة تعيين المنقحات",
+
+  // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "تقديم",
+
+  // "search.form.search": "Search",
   "search.form.search": "بحث",
+
+  // "search.form.search_dspace": "All repository",
   "search.form.search_dspace": "كل المستودع",
+
+  // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "كل دي سبيس",
+
+  // "search.results.head": "Search Results",
   "search.results.head": "نتائج البحث",
-  "search.results.no-results": "لم أسافر لبحثك عن أي نتائج. ",
-  "search.results.no-results-link": "راسي نص حوله",
-  "search.results.empty": "لم أسافر لبحثك عن أي نتائج.",
+
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "لم يسفر بحثك عن أي نتائج. هل تجد صعوبة في العثور على ما تبحث عنه؟ جرب وضع",
+
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "قوسي نص حوله",
+
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "لم يسفر بحثك عن أي نتائج.",
+
+  // "search.results.view-result": "View",
   "search.results.view-result": "عرض",
-  "search.results.response.500": "حدث خطأ أثناء التخطيط، يرجى إعادة محاولة مرة أخرى لاحقاً",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "حدث خطأ أثناء تنفيذ الاستعلام، يرجى إعادة المحاولة مرة أخرى لاحقاً",
+
+  // "default.search.results.head": "Search Results",
   "default.search.results.head": "نتائج البحث",
-  "default-relationships.search.results.head": "نتائج البحث",
+
+  // "default-relationships.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "default-relationships.search.results.head": "Search Results",
+
+  // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "العودة إلى النتائج",
+
+  // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "المنقحات",
+
+  // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "أدوات البحث",
+
+  // "search.sidebar.results": "results",
   "search.sidebar.results": "النتائج",
+
+  // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "النتائج لكل صفحة",
-  "search.sidebar.settings.sort-by": "فرز حسب الطلب",
-  "search.sidebar.settings.title": "عد",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "فرز حسب",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "الإعدادات",
+
+  // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "عرض التفاصل",
+
+  // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "عرض كشبكة",
-  "search.view-switch.show-list": "عرض القائمة",
-  "selectable-list-item-control.deselect": "قم بإلغاء تحديد المادة",
-  "selectable-list-item-control.select": "المادة المحددة",
-  "sorting.ASC": "تقييمياً",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "عرض كقائمة",
+
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "إلغاء تحديد المادة",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "تحديد المادة",
+
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "تصاعدياً",
+
+  // "sorting.DESC": "Descending",
   "sorting.DESC": "تنازلياً",
-  "sorting.dc.title.ASC": "العنوان تقييمياً",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "العنوان تصاعدياً",
+
+  // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "العنوان تنازلياً",
-  "sorting.score.ASC": "أقل صلة",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "الأقل صلة",
+
+  // "sorting.score.DESC": "Most Relevant",
   "sorting.score.DESC": "الأكثر صلة",
-  "sorting.dc.date.issued.ASC": "تاريخ الإصدار التقييمي",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "تاريخ الإصدار تصاعدياً",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
   "sorting.dc.date.issued.DESC": "تاريخ الإصدار تنازلياً",
-  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تقييميًا",
-  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع التنازلي",
-  "sorting.lastModified.ASC": "آخر تعديل تقييمياً",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تصاعدياً",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع تنازلياً",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "آخر تعديل تصاعدياً",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "آخر تعديل تنازلياً",
-  "sorting.person.familyName.ASC": "اللقب تصاعدي",
-  "sorting.person.familyName.DESC": "اللقب تنازلي",
-  "sorting.person.givenName.ASC": "الاسم تصاعدي",
-  "sorting.person.givenName.DESC": "اسم تنازلي",
-  "sorting.person.birthDate.ASC": "تاريخ الميلاد تصاعدي",
-  "sorting.person.birthDate.DESC": "تاريخ الميلاد تنازلي",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
+
+  // "statistics.title": "Statistics",
   "statistics.title": "الاحصائيات",
-  "statistics.header": "إحصائيات لـ {{ scope }}",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "احصائيات لـ {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "الاحصائيات",
-  "statistics.page.no-data": "لا توفر أي بيانات",
-  "statistics.table.no-data": "لا توفر أي بيانات",
-  "statistics.table.title.TotalVisits": "زيارة إجمالية",
+
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "لا تتوافر أي بيانات",
+
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "لا تتوافر أي بيانات",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "إجمالي الزيارات",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "إجمالي الزيارات لكل شهر",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "زيارات الملف",
-  "statistics.table.title.TopCountries": "أعلى المشاهدات على مستوى البلد",
-  "statistics.table.title.TopCities": "أعلى المشاهدات على مستوى المدينة",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "أعلى مشاهدات على مستوى البلد",
+
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "أعلى مشاهدات على مستوى المدينة",
+
+  // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "المشاهدات",
-  "statistics.table.no-name": "(تعذر تحميل اسم سميث)",
-  "submission.edit.breadcrumbs": "تحرير.التقديم",
-  "submission.edit.title": "تحرير.التقديم",
+
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(تعذر تحميل اسم الكائن)",
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "تحرير التقديم",
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "تحرير التقديم",
+
+  // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "إلغاء",
-  "submission.general.cannot_submit": "ليس لديك القدرة على تقديم الجديد.",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "ليس لديك صلاحية القيام بتقديم جديد.",
+
+  // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "إيداع",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "إلغاء",
-  "submission.general.discard.confirm.info": "لا يمكن السماء عن هذه الطريقة. ",
-  "submission.general.discard.confirm.submit": "نعم، بالتأكيد",
-  "submission.general.discard.confirm.title": "تجاهل",
-  "submission.general.discard.submit": "لا",
-  "submission.general.back.submit": "خلف",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "نعم، متأكد",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "تجاهل التقديم",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "تجاهل",
+
+  // "submission.general.back.submit": "Back",
+  // TODO New key - Add a translation
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "محفوظ",
-  "submission.general.info.pending-changes": "أخبار غير محفوظة",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "تغييرات غير محفوظة",
+
+  // "submission.general.save": "Save",
   "submission.general.save": "حفظ",
-  "submission.general.save-later": "لوقت لاحق",
-  "submission.import-external.page.title": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.title": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.title.Journal": "استيراد دورية من المصدر الخارجي",
-  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من المصدر الخارجي",
-  "submission.import-external.title.JournalVolume": "استيراد دورية من المصدر الخارجي",
-  "submission.import-external.title.OrgUnit": "استيراد ناشر من المصدر الخارجي",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "حفظ لوقت لاحق",
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "استيراد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من مصدر خارجيe",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "استيراد مجلد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "استيراد ناشر من مصدر خارجي",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
   "submission.import-external.title.Person": "استيراد شخص من مصدر خارجي",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
   "submission.import-external.title.Project": "استيراد مشروع من مصدر خارجي",
-  "submission.import-external.title.Publication": "استيراد منشور من المصدر الخارجي",
-  "submission.import-external.title.none": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.page.hint": "قم دائمًا بالاستعلام عن بعد لاستيراد البيانات إلى دي سبيس.",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "استيراد منشور من مصدر خارجي",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "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": "قم بإدخال استعلام أعلاه للعثور على مواد من الويب لاستيرادها إلى دي سبيس.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "العودة إلى ماي سبيس",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "بحث المصدر الخارجي",
+
+  // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "بحث",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "اكتب بعض الكلمات للبحث",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "اختر مصدراً خارجياً",
+
+  // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
+
+  // "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.ads": "ناسا/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
   "submission.import-external.source.crossref": "كروس ريف",
+
+  // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "داتاسايت",
+
+  // "submission.import-external.source.doi": "DOI",
+  // TODO New key - Add a translation
   "submission.import-external.source.doi": "DOI",
-  "submission.import-external.source.scielo": "سيلو",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
   "submission.import-external.source.scopus": "سكوبس",
+
+  // "submission.import-external.source.vufind": "VuFind",
   "submission.import-external.source.vufind": "فيوفايند",
+
+  // "submission.import-external.source.wos": "Web Of Science",
   "submission.import-external.source.wos": "شبكة العلوم",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
   "submission.import-external.source.orcidWorks": "أوركيد",
-  "submission.import-external.source.epo": "مكتب براءات الاصدار الأوروبي (EPO)",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "مكتب براءات الاختراع الأوروبي (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "جاري التحميل ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "دوريات شيربا",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
   "submission.import-external.source.sherpaJournalIssn": "دوريات شيربا بواسطة الردمد",
-  "submission.import-external.source.sherpaPublisher": "نشري شيربا",
-  "submission.import-external.source.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "ناشري شيربا",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "أوركيد",
-  "submission.import-external.source.pubmed": "نشر",
-  "submission.import-external.source.pubmedeu": "أوروبا المنشورة",
-  "submission.import-external.source.lcname": "اسماء مكتبة الكونجرس",
-  "submission.import-external.source.ror": "سجل المنظمات البحثية (ROR)",
-  "submission.import-external.preview.title": "عرض المادة",
-  "submission.import-external.preview.title.Publication": "قم بمراجعة المنشور",
-  "submission.import-external.preview.title.none": "عرض المادة",
-  "submission.import-external.preview.title.Journal": "مراجعة الدورية",
-  "submission.import-external.preview.title.OrgUnit": "نظرة عامة على الوحدة الوطنية",
-  "submission.import-external.preview.title.Person": "نظرة على الشخص",
-  "submission.import-external.preview.title.Project": "نظرة على المشروع",
-  "submission.import-external.preview.subtitle": "تم استيراد الميتاداتا أدناه من المصدر الخارجي. ",
-  "submission.import-external.preview.button.import": "البدء",
+
+  // "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": "أسماء مكتبة الكونجرس",
+
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "سجل المؤسسات البحثية (ROR)",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "معاينة المنشور",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "معاينة الدورية",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "معاينة الوحدة المؤسسية",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "معاينة الشخص",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "معاينة المشروع",
+
+  // "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": "تم استيراد الميتاداتا أدناه من مصدر خارجي. ستتم تعبئتها بشكل مسبق عند بدء التقديم.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "بدء التقديم",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
   "submission.import-external.preview.error.import.title": "خطأ في التقديم",
-  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد المصدر الخارجي.",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد مدخل المصدر الخارجي.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "إغلاق",
-  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي الفعال إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "استيراد الكاتب البعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي بنجاح إلى التحديد",
+
+  // "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": "استيراد مؤلف بعيد",
+
+  // "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": "استيراد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "استيراد عدد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "استيراد دورية بعيدة",
+
+  // "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": "استيراد عدد دورية بعيد",
+
+  // "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": "استيراد مجلد دورية بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "المشروع",
+
+  // "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": "استيراد مادة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "زراعة فعالة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "استيراد المنتج البعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "استيراد المعدات البعيدة",
+
+  // "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": "استيراد فعالية بعيدة",
+
+  // "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": "استيراد منتج بعيد",
+
+  // "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": "استيراد معدات بعيدة",
+
+  // "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": "استيراد وحدة مؤسسية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "استيراد التمويل البعيد",
+
+  // "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": "استيراد تمويل بعيد",
+
+  // "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": "استيراد شخص بعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "استيراد اختراع طويل",
+
+  // "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": "استيراد براءة اختراع بعيدة",
+
+  // "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": "استيراد مشروع بعيد",
+
+  // "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": "استيراد منشور بعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "أكمل إضافة كينونة جديدة!",
+
+  // "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": "تمت إضافة كينونة جديدة!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "مشروع",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "استيراد الكاتب البعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "تمت إضافة المؤلف المحلي الفعال إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "تم استيراد المصنع الخارجي بفعالية إلى التحديد",
+
+  // "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": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "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": "استيراد مؤلف بعيد",
+
+  // "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": "تمت إضافة المؤلف المحلي بنجاح إلى التحديد",
+
+  // "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": "تم استيراد وإضافة المؤلف الخارجي بنجاح إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "الاستناد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "أدخل كإستنباط محلي جديد",
+
+  // "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": "استيراد كإدخال استناد محلي جديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "إلغاء",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "اختر حاوية استيراد الإدخالات الجديدة الخاصة بها",
+
+  // "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": "حدد حاوية لاستيراد الإدخالات الجديدة إليها",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "الكينونات",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "استيراد كيكونة محلية جديدة",
+
+  // "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": "استيراد ككينونة محلية جديدة",
+
+  // "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": "استيراد من اسم مكتبة الكونجرس",
+
+  // "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": "استيراد من أوركيد",
+
+  // "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": "استيراد من دورية شيربا",
+
+  // "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": "استيراد من ناشر شيربا",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "استيراد من PubMed",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "استيراد من arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "استيراد من ROR",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "استيراد",
+
+  // "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": "استيراد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "أكمل إضافة الدورية الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "تم الانتهاء من حذف دورية خارجية إلى التحديد",
+
+  // "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": "تمت إضافة الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم بنجاح استيراد وإضافة دورية خارجية إلى التحديد",
+
+  // "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": "استيراد عدد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "تمت إضافة المزيد من الدوريات الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "تم استيراد عدد الدوريات الخارجية وإضافتها الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "استيراد دورة طويلة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "أكمل إضافة الدورية الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "تم استيراد سلسلة الدوري الخارجية وإضافتها الفعالة إلى التحديد",
+
+  // "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": "تمت إضافة عدد الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم استيراد عدد الدورية الخارجية وإضافته بنجاح إلى التحديد",
+
+  // "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": "استيراد مجلد دورية بعيدة",
+
+  // "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": "تمت إضافة مجلد الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم استيراد مجلد الدورية الخارجية وإضافته بنجاح إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "تحديد تطابق محلي:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "استيراد مؤسسة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد الفعال",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم التخلص من المصنع الخارجي إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد بنجاح",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم بنجاح استيراد وإضافة مؤسسة خارجية إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "إلغاء تحديد الكل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "إلغاء تحديد الصفحة",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
   "submission.sections.describe.relationship-lookup.search-tab.loading": "جاري التحميل...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "استعلام البحث",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "اذهب",
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحثت...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحث...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "تحديد الكل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "تحديد الصفحة",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "{{ size }} مادة محددة",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين المحليين ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "الدوريات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "المشاريع المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "المنشورات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "الوحدات الوطنية المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين المحليين ({{ 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": "الوحدات المؤسسية المحلية ({{ 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": "حزم البيانات المحلية ({{ 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": "ملفات البيانات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "سجل الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "سجل الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "خطوط الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "خطوط الدوريات المحلية ({{ 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": "أعداد الدوريات المحلية ({{ 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": "أعداد الدوريات المحلية ({{ 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": "مجلدات الدوريات المحلية ({{ 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": "مجلدات الدوريات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "دوريات شيربا ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "ناشري شيربا ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.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": "أسماء مكتبة الكونجرس ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "مجلات ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "أرخايف ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "معدل العائد ({{ 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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "أوركيد ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "كروسريف ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "سكوبس ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "تمويل OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "دوريات شيربا حسب ISSN ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "ابحث عن وكالات ممولة",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن التمويل",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات الوطنية",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "البحث عن وكالات ممولة",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن تمويل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "المشاريع",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "مول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "منشورات المؤلف",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة التنظيمية",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة المؤسسية للمشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "المشروع",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "المشاريع",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "مول المشروع",
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحثت...",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الفعلي ({{ count }})",
-  "submission.sections.describe.relationship-lookup.title.Journal": "الدوري",
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "سجل الدوري",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "سجل الدوري",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "سلسلة الدوريات",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "سلسلة الدوريات",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحث...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الحالي ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "أعداد الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "أعداد الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "مجلدات الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "مجلدات الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "الدوريات",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "المؤلفين",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "الوكالة الممولة",
-  "submission.sections.describe.relationship-lookup.title.Project": "المشاريع",
-  "submission.sections.describe.relationship-lookup.title.Publication": "منشورات",
+
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "المشروعات",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "المنشورات",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "المؤلفين",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات الوطنية",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "حزم البيانات",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات بيانات البيانات",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات البيانات",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "الوكالة الممولة",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "تمويل",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المحلية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المؤسسية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "النشر",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
   "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "وحدة مؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "قائمة التبديل المنسدلة",
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "عد",
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك بالكامل.",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "الإعدادات",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك فارغ حالياً.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين المحددين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "الدوريات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "دليل البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "مجلد الدورية المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "المشاريع المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "المنشورات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات الوطنية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين المحددين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات المؤسسية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "حزم البيانات المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ملفات البيانات المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "الدوريات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العثور على نتيجة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "دليل البحث",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل للبحث",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العثور على نتيجة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة الوطنية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العدد المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "مجلد الدورية المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العدد المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة المؤسسية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "نتائج البحث",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "هل ترغب في حفظ \"{{ value }}\" كمتغير اسم هذا الشخص حتى بدأت بالفعل في إعادة استخدامه بنجاح بنجاح؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدام هذا التقديم.",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ اسم جديد",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط هذا التقديم",
-  "submission.sections.ccLicense.type": "نوع الحكم",
-  "submission.sections.ccLicense.select": "قم بتحديد نوع الأمر…",
-  "submission.sections.ccLicense.change": "قم بتغيير نوع النظام…",
-  "submission.sections.ccLicense.none": "لا تتوفر أي تراخيص",
-  "submission.sections.ccLicense.option.select": "قم باختيار الخيار…",
-  "submission.sections.ccLicense.link": "لقد قمت بإلغاء الأمر التالي:",
-  "submission.sections.ccLicense.confirmation": "زيادة على ذلك",
+
+  // "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": "هل ترغب في حفظe \"{{ value }}\" كمتغير اسم لهذا الشخص حتى تتمكن أنت والآخرون من إعادة استخدامه لعمليات التقديم المستقبلية؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدامه لهذا التقديم.",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ متغير اسم جديد",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط لهذا التقديم",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "نوع الترخيص",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "قم بتحديد نوع الترخيص…",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "قم بتغيير نوع الترخيص…",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "لا تتوافر أي تراخيص",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "قم بتحديد خيار…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "لقد قمت بتحديد الترخيص التالي:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "أمنحك الترخيص أعلاه",
+
+  // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "إضافة المزيد",
-  "submission.sections.general.cannot_deposit": "لا يمكن تجاوز الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى تعبئة جميع الأغراض المطلوبة لجميع الإيداع.",
+
+  // "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": "لا يمكن إتمام الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى ملء جميع الحقول المطلوبة لإتمام الإيداع.",
+
+  // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "حاوية",
-  "submission.sections.general.deposit_error_notice": "تجربة تقديم المادة أثناء تقديم المادة، يرجى إعادة محاولة مرة أخرى لاحقاً.",
-  "submission.sections.general.deposit_success_notice": "تم تقديم التقديم الفعال.",
-  "submission.sections.general.discard_error_notice": "لا تتجاهل المشكلة، يرجى إعادة محاولة مرة أخرى لاحقًا.",
-  "submission.sections.general.discard_success_notice": "تم التقليل من التأثير.",
-  "submission.sections.general.metadata-extracted": "تم الانتهاء من ميتاداتا جديدة وإضافتها إلى القسم <strong>{{sectionId}}</strong>.",
-  "submission.sections.general.metadata-extracted-new-section": "أكمل إضافة قسم <strong>{{sectionId}}</strong> الجديد في التقديم.",
-  "submission.sections.general.no-collection": "لم يتم العثور على الوثيقة",
+
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "حدثت مشكلة أثناء تقديم المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "تم إيداع التقديم بنجاح.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "حدثت مشكلة أثناء تجاهل المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "تم تجاهل التقديم بنجاح.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "تم استخلاص ميتاداتا جديدة وإضافتها إلى قسم <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": "تمت إضافة قسم <strong>{{sectionId}}</strong> جديد إلى التقديم.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "لم يتم العثور على حاويات",
+
+  // "submission.sections.general.no-entity": "No entity types found",
   "submission.sections.general.no-entity": "لم يتم العثور على أنواع كينونات",
-  "submission.sections.general.no-sections": "لا تتوفر أي خيارات",
-  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة محاولة مرة أخرى لاحقًا.",
-  "submission.sections.general.save_success_notice": "تم دعم الفعال.",
-  "submission.sections.general.search-collection": "ابحث عن الحاوية",
+
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "لا تتوافر أي خيارات",
+
+  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "تم حفظ التقديم بنجاح.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "البحث عن حاوية",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "هناك أقسام غير مكتملة.",
-  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية الجديدة بك:",
-  "submission.sections.identifiers.no_handle": "ولم يتم استخدام أي يد لهذه المادة.",
-  "submission.sections.identifiers.no_doi": "ولم يتم البحث عن أي معرفات كائنية رقمية لهذه المادة.",
-  "submission.sections.identifiers.handle_label": "مقبض: ",
-  "submission.sections.identifiers.doi_label": "المعرفة الرقمية: ",
+
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية للمادة الخاصة بك:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "لم يتم سك أي هاندل لهذه المادة.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "لم يتم سك أي معرفات كائنات رقمية لهذه المادة.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "هاندل: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "معرف الكائن الرقمي: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
   "submission.sections.identifiers.otherIdentifiers_label": "معرفات أخرى: ",
-  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول إلى أبعد",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول للمادة",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "الإبداعية العامة",
-  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير رياضي",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "وصف",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "وصف",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "وصف",
-  "submission.sections.submit.progressbar.duplicates": "التكرارات المحتملة",
+
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "المعرفات",
-  "submission.sections.submit.progressbar.license": "ترخيص الإيداع",
-  "submission.sections.submit.progressbar.sherpapolicy": "سياسة شيربا",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "رخصة الإيداع",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "سياسات شيربا",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "تحميل الملفات",
-  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات عن الوصول الحر للناشر",
-  "submission.sections.sherpa-policy.title-empty": "لا اختيار معلومات حول الناشر. ",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات سياسة الوصول الحر للناشر",
+
+  // "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": "لا تتوفر معلومات حول سياسة الناشر. إذا كان لعملك رقم ISSN مرتبط، يرجى إدخاله أعلاه للاطلاع على أي سياسة وصول حر للناشرين ذوي الصلة.",
+
+  // "submission.sections.status.errors.title": "Errors",
   "submission.sections.status.errors.title": "أخطاء",
+
+  // "submission.sections.status.valid.title": "Valid",
   "submission.sections.status.valid.title": "صالح",
+
+  // "submission.sections.status.warnings.title": "Warnings",
   "submission.sections.status.warnings.title": "تحذيرات",
-  "submission.sections.status.errors.aria": "بسبب الأخطاء",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "به أخطاء",
+
+  // "submission.sections.status.valid.aria": "is valid",
   "submission.sections.status.valid.aria": "صالح",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
   "submission.sections.status.warnings.aria": "ذو تحذيرات",
-  "submission.sections.status.info.title": "معلومات اضافية",
-  "submission.sections.status.info.aria": "معلومات اضافية",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "معلومات إضافية",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "معلومات إضافية",
+
+  // "submission.sections.toggle.open": "Open section",
   "submission.sections.toggle.open": "فتح القسم",
+
+  // "submission.sections.toggle.close": "Close section",
   "submission.sections.toggle.close": "إغلاق القسم",
-  "submission.sections.toggle.aria.open": "قسم النهائي {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "توسيع قسم {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "طي قسم {{sectionHeader}}",
-  "submission.sections.upload.primary.make": "يصنع {{fileName}} تيار البت الأساسي",
-  "submission.sections.upload.primary.remove": "يزيل {{fileName}} باعتباره دفق البت الأساسي",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "إلغاء",
-  "submission.sections.upload.delete.confirm.info": "لا يمكن السماء عن هذه الطريقة. ",
-  "submission.sections.upload.delete.confirm.submit": "نعم، بالتأكيد",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "نعم، متأكد",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "حذف تدفق البت",
+
+  // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "حذف",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
   "submission.sections.upload.download.title": "تحميل تدفق البت",
-  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإختفاءها بالمادة",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإرفاقها بالمادة",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
   "submission.sections.upload.edit.title": "تحرير دفق البت",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "نوع شرط الوصول",
-  "submission.sections.upload.form.access-condition-hint": "حدد شرط الوصول إليه على تدفق المادة بمجرد إيداعها",
+
+  // "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": "حدد شرط الوصول لتطبيقه على تدفقات البت بمجرد إيداع المادة",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "التاريخ مطلوب.",
-  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول قبل مطلوب.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
   "submission.sections.upload.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
-  "submission.sections.upload.form.from-label": "أمنح من الوصول",
-  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة منذ البداية",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "منح الوصول من",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة منذ بلوغه",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "من",
+
+  // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "المجموعة",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "المجموعة مطلوبة.",
-  "submission.sections.upload.form.until-label": "أمنح حتى الوصول",
-  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة حتى المضي قدمًا",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "حتى",
-  "submission.sections.upload.header.policy.default.nolist": "ستكون الإجراءات المرفوعة في الكائنات الحية {{collectionName}} لا يمكن الوصول إلى المجموعات التالية:",
-  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في الحاوية {{collectionName}} ستكون قادرة على الوصول، بالإضافة إلى ما يقرر بوضوح للملف المفرد، مع المجموعات التالية:",
-  "submission.sections.upload.info": "مساهمة هنا في كل القضايا الموجودة في المادة حاليا.  <strong> تحميل الملفات الإضافية عن طريق سحبها وتسجيلها في أي مكان في الصفحة</strong>",
+
+  // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "ستكون الملفات المرفوعة في الحاوية {{collectionName}} قابلة للوصول وفقًا للمجموعات التالية:",
+
+  // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في حاوية {{collectionName}} ستكون قابلة للوصول، بالإضافة إلى ما تقرر بوضوح للملف المفرد، مع المجموعات التالية:",
+
+  // "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 by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "ستجد هنا كل الملفات الموجودة في المادة حاليًا. يمكنك تحديث ميتاداتا الملف وشروط الوصول أو <strong> تحميل ملفات إضافية عن طريق سحبها وإسقاطها في أي مكان في الصفحة</strong>",
+
+  // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "لا",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "لم يتم تحميل أي ملف حتى الآن.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "حفظ الميتاداتا",
+
+  // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "إلغاء",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "فشل التحميل",
-  "submission.sections.upload.upload-successful": "بدأ التحميل",
-  "submission.sections.accesses.form.discoverable-description": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. ",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "نجح التحميل",
+
+  // "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": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. عند إلغاء التحديد، ستكون المادة متاحة فقط عبر رابط مباشر ولن تظهر أبدًا في البحث/الاستعراض.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
   "submission.sections.accesses.form.discoverable-label": "قابل للاكتشاف",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "نوع شرط الوصول",
-  "submission.sections.accesses.form.access-condition-hint": "حدد شرط الوصول إلى المادة بمجرد إيداعها",
+
+  // "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": "حدد شرط الوصول لتطبيقه على المادة بمجرد إيداعها",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
   "submission.sections.accesses.form.date-required": "التاريخ مطلوب.",
-  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول قبل مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
   "submission.sections.accesses.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
-  "submission.sections.accesses.form.from-label": "منح قبل الوصول",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "منح الوصول منذ",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
   "submission.sections.accesses.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
   "submission.sections.accesses.form.from-placeholder": "من",
+
+  // "submission.sections.accesses.form.group-label": "Group",
   "submission.sections.accesses.form.group-label": "المجموعة",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
   "submission.sections.accesses.form.group-required": "المجموعة مطلوبة.",
-  "submission.sections.accesses.form.until-label": "أمنح حتى الوصول",
-  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة حتى المضي قدمًا",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "حتى",
-  "submission.sections.duplicates.none": "لم يتم اكتشاف أي تكرارات.",
-  "submission.sections.duplicates.detected": "تم الكشف عن التكرارات المحتملة. ",
-  "submission.sections.duplicates.in-workspace": "هذا العنصر موجود في مساحة العمل",
-  "submission.sections.duplicates.in-workflow": "هذا العنصر في سير العمل",
-  "submission.sections.license.granted-label": "وأرجح ذلك",
-  "submission.sections.license.required": "يجب عليك معارضة",
-  "submission.sections.license.notgranted": "يجب عليك معارضة",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.none": "No duplicates were detected.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "أؤكد الترخيص أعلاه",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "معلومات الناشر",
-  "submission.sections.sherpa.publication.information.title": "عنوان العنوان",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "العنوان",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
   "submission.sections.sherpa.publication.information.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": "الناشر",
-  "submission.sections.sherpa.publication.information.romeoPub": "حانة روميو",
-  "submission.sections.sherpa.publication.information.zetoPub": "حانة زيتو",
-  "submission.sections.sherpa.publisher.policy": "للناشر",
-  "submission.sections.sherpa.publisher.policy.description": "تم العثور على المعلومات أدناه عبر شيربا روميو. ",
-  "submission.sections.sherpa.publisher.policy.openaccess": "مسارات الوصول الحر التي تتيح لها هذه الدورية المدرجة أدناه حسب إصدار المقال. ",
-  "submission.sections.sherpa.publisher.policy.more.information": "لمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
-  "submission.sections.sherpa.publisher.policy.version": "النسخة",
+
+  // "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": "سياسة الناشر",
+
+  // "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": "تم العثور على المعلومات أدناه عبر شيربا روميو. وبناءً على سياسات الناشر الخاص بك، فإنه يقدم النصائح بشأن ما إذا كان الحظر ضروريًا أو الملفات المسموح لك بتحميلها. إذا كانت لديك أسئلة، يرجى الاتصال بمسؤول موقعك عبر نموذج التعليقات الموجود في التذييل.",
+
+  // "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": "مسارات الوصول الحر التي تسمح بها سياسة هذه الدورية مدرجة أدناه حسب إصدار المقال. انقر على المسار للحصول على عرض أكثر تفصيلاً",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "للمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "الإصدارة",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
   "submission.sections.sherpa.publisher.policy.embargo": "حظر",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
   "submission.sections.sherpa.publisher.policy.noembargo": "بلا حظر",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
   "submission.sections.sherpa.publisher.policy.nolocation": "لا شيء",
-  "submission.sections.sherpa.publisher.policy.license": "com",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "الترخيص",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
   "submission.sections.sherpa.publisher.policy.prerequisites": "المتطلبات الأساسية",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
   "submission.sections.sherpa.publisher.policy.location": "الموقع",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
   "submission.sections.sherpa.publisher.policy.conditions": "الشروط",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
   "submission.sections.sherpa.publisher.policy.refresh": "تحديث",
-  "submission.sections.sherpa.record.information": "تسجيل المعلومات",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "معلومات التسجيلة",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
   "submission.sections.sherpa.record.information.id": "المعرّف",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
   "submission.sections.sherpa.record.information.date.created": "تاريخ الإنشاء",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
   "submission.sections.sherpa.record.information.date.modified": "آخر تعديل",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
   "submission.sections.sherpa.record.information.uri": "URI",
-  "submission.sections.sherpa.error.message": "حدث خطأ أثناء حذف معلومات شيربا",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "حدث خطأ أثناء استرداد معلومات شيربا",
+
+  // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "تقديم جديد",
+
+  // "submission.submit.title": "New submission",
   "submission.submit.title": "تقديم جديد",
+
+  // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "حذف",
-  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. ",
+
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. سيُطلب منك بعد ذلك تأكيد ذلك.",
+
+  // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "تحرير",
-  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتكوين المادة.",
+
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "عرض",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
+
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
   "submission.workflow.generic.submit_select_reviewer": "حدد المراجع",
+
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
   "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
   "submission.workflow.generic.submit_score": "تقييم",
+
+  // "submission.workflow.generic.submit_score-help": "",
   "submission.workflow.generic.submit_score-help": "",
-  "submission.workflow.tasks.claimed.approve": "أوافق",
-  "submission.workflow.tasks.claimed.approve_help": "إذا قمت بمراجعة المادة الداخلية للاستهلاك الغذائي، اختر \"قبول\".",
+
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "قبول",
+
+  // "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": "إذا قمت بمراجعة المادة وكانت ملائمة للإدراج في الحاوية، اختر  \"قبول\".",
+
+  // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "تحرير",
-  "submission.workflow.tasks.claimed.edit_help": "سيقوم هذا الخيار بتغيير المادة.",
-  "submission.workflow.tasks.claimed.decline": "الرفض",
+
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "قم بتحديد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "رفض",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
   "submission.workflow.tasks.claimed.decline_help": "",
-  "submission.workflow.tasks.claimed.reject.reason.info": "يرجي التسجيل سبب الرفض في القسم أدناه، وقم بتوضيح ما إذا كان بإمكانه تصحيح المشكلة لتقديم الطلب.",
+
+  // "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": "يرجي إدخال سبب رفض التقديم في المربع أدناه، وقم بتوضيح ما إذا كان بإمكان المقدم تصحيح المشكلة وإعادة التقديم.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "قم بوصف سبب الرفض",
-  "submission.workflow.tasks.claimed.reject.reason.submit": "الموافقة على المادة",
-  "submission.workflow.tasks.claimed.reject.reason.title": "هذا",
-  "submission.workflow.tasks.claimed.reject.submit": "الرفض",
-  "submission.workflow.tasks.claimed.reject_help": "إذا قمت بمراجعة المادة وجدتها <strong>غير</strong> وجزء للإدراج في الصغار، اختر \"رفض\". ",
+
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "رفض المادة",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "السبب",
+
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "رفض",
+
+  // "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": "إذا قمت بمراجعة المادة ووجدتها <strong>غير</strong> ملائمة للإدراج في الحاوية، اختر \"رفض\". سيُطلب منك إدخال رسالة لتوضيح سبب عدم ملاءمة المادة، وما إذا كان يجب على المقدم إجراء بعض التغييرات وإعادة التقديم.",
+
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "إعادة إلى الصحن",
-  "submission.workflow.tasks.claimed.return_help": "إعادة مهمة إلى السخن لكي يقوم مستخدم آخر المهرج.",
-  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء...",
-  "submission.workflow.tasks.generic.processing": "جاريب...",
-  "submission.workflow.tasks.generic.submitter": "شير",
-  "submission.workflow.tasks.generic.success": "فعال",
+
+  // "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": "إعادة المهمة إلى الصحن لكي يقوم مستخدم آخر بأداء المهمة.",
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء العملية...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "جاري المعالجة...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "المقدم",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "تمت العملية بنجاح",
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "مطالبة",
-  "submission.workflow.tasks.pool.claim_help": "قم بهذه المهمة لأجلك.",
-  "submission.workflow.tasks.pool.hide-detail": "حفظ التفاصيل",
+
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "قم بتعيين هذه المهمة لنفسك.",
+
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "إخفاء التفاصيل",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "عرض التفاصيل",
-  "submission.workflow.tasks.duplicates": "تم الكشف عن التكرارات المحتملة لهذا العنصر. ",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  // TODO New key - Add a translation
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+
+  // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "عرض",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
-  "submitter.empty": "غير محتمل",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "غير قابل للتطبيق",
+
+  // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "الاشتراكات",
-  "subscriptions.item": "الاشتراكات للمواد",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "اشتراكات للمواد",
+
+  // "subscriptions.collection": "Subscriptions for collections",
   "subscriptions.collection": "اشتراكات للحاويات",
-  "subscriptions.community": "الاشتراكات المتاحة",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "اشتراكات للمجتمعات",
+
+  // "subscriptions.subscription_type": "Subscription type",
   "subscriptions.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.frequency": "Subscription frequency",
   "subscriptions.frequency": "تواتر الاشتراك",
+
+  // "subscriptions.frequency.D": "Daily",
   "subscriptions.frequency.D": "يومي",
+
+  // "subscriptions.frequency.M": "Monthly",
   "subscriptions.frequency.M": "شهري",
+
+  // "subscriptions.frequency.W": "Weekly",
   "subscriptions.frequency.W": "أسبوعي",
+
+  // "subscriptions.tooltip": "Subscribe",
   "subscriptions.tooltip": "اشتراك",
+
+  // "subscriptions.modal.title": "Subscriptions",
   "subscriptions.modal.title": "الاشتراكات",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
   "subscriptions.modal.type-frequency": "النوع والتواتر",
+
+  // "subscriptions.modal.close": "Close",
   "subscriptions.modal.close": "إغلاق",
-  "subscriptions.modal.delete-info": "إزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
-  "subscriptions.modal.new-subscription-form.type.content": "ال",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "لإزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "المحتوى",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
   "subscriptions.modal.new-subscription-form.frequency.D": "يومي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
   "subscriptions.modal.new-subscription-form.frequency.W": "أسبوعي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
   "subscriptions.modal.new-subscription-form.frequency.M": "شهري",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
   "subscriptions.modal.new-subscription-form.submit": "تقديم",
-  "subscriptions.modal.new-subscription-form.processing": "جاريب...",
-  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} فعالية.",
-  "subscriptions.modal.delete.success": "تم حذف الاشتراك الفعال",
-  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} فعالية",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "جاري المعالجة...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} بنجاح.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "تم حذف الاشتراك بنجاح",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} بنجاح",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
   "subscriptions.modal.create.error": "حدث خطأ أثناء إنشاء الاشتراك",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
   "subscriptions.modal.delete.error": "حدث خطأ أثناء حذف الاشتراك",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
   "subscriptions.modal.update.error": "حدث خطأ أثناء تحديث الاشتراك",
+
+  // "subscriptions.table.dso": "Subject",
   "subscriptions.table.dso": "الموضوع",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
   "subscriptions.table.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
   "subscriptions.table.subscription_frequency": "تواتر الاشتراك",
-  "subscriptions.table.action": "صنع",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "إجراء",
+
+  // "subscriptions.table.edit": "Edit",
   "subscriptions.table.edit": "تحرير",
+
+  // "subscriptions.table.delete": "Delete",
   "subscriptions.table.delete": "حذف",
+
+  // "subscriptions.table.not-available": "Not available",
   "subscriptions.table.not-available": "غير متاح",
-  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حاليا لمشاهدتها",
-  "subscriptions.table.empty.message": "ليس لديك أي اشتراك في هذا الوقت. ",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حالياً لمشاهدتها",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "ليس لديك أي اشتراكات في هذا الوقت. للاشتراك في تحديثات البريد الإلكتروني لمجتمع أو حاوية، استخدم زر الاشتراك الموجود في صفحة الكائن.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "صورة مصغرة",
-  "thumbnail.default.placeholder": "لا اختيار صورة مصغرة",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "لا تتوفر صورة مصغرة",
+
+  // "thumbnail.project.alt": "Project Logo",
   "thumbnail.project.alt": "شعار المشروع",
-  "thumbnail.project.placeholder": "صورة كمساهمة في المساهمة",
-  "thumbnail.orgunit.alt": "الشعار الوطني الوطني",
-  "thumbnail.orgunit.placeholder": "صورة الكارب النائي للوحدة الوطنية",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "صورة العنصر النائب للمشروع",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "شعار الوحدة المؤسسية",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "صورة العنصر النائي للوحدة المؤسسية",
+
+  // "thumbnail.person.alt": "Profile Picture",
   "thumbnail.person.alt": "صورة الملف الشخصي",
-  "thumbnail.person.placeholder": "عدم توفر صورة للملف الشخصي",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "لا تتوافر صورة للملف الشخصي",
+
+  // "title": "DSpace",
   "title": "دي سبيس",
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "عرض الشجرة الهرمية",
+
+  // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "تحميل المزيد",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "إعادة تعيين",
+
+  // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "بحث",
-  "vocabulary-treeview.search.form.search-placeholder": "تسهيل البحث عن طريق كتابة الرواية الأولى",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
+
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "لم تكن هناك مواد للعرض",
-  "vocabulary-treeview.tree.description.nsi": "فرس العلوم النرويجي",
-  "vocabulary-treeview.tree.description.srsc": "موضوع البحث",
-  "vocabulary-treeview.info": "قم بزيارة موضوع لإضافته كمنقح بحثه",
+
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "فهرس العلوم النرويجي",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "فئات موضوع البحث",
+
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "قم بتحديد موضوع لإضافته كمنقح بحث",
+
+  // "uploader.browse": "browse",
   "uploader.browse": "استعراض",
-  "uploader.drag-message": "قم بسحب وتسجيل ملفاتك هنا",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "قم بسحب وإسقاط ملفاتك هنا",
+
+  // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "حذف",
+
+  // "uploader.or": ", or ",
   "uploader.or": ", أو ",
-  "uploader.processing": "الملفات الجارية التي تم تحميلها... (أصبح من الآن ينتهك هذه الصفحة)",
+
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "جاري معالجة الملفات التي تم تحميلها... (أصبح من الآمن الآن إغلاق هذه الصفحة)",
+
+  // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "طول الصف",
-  "virtual-metadata.delete-item.info": "قم باختيار الأنواع التي تريد حفظ الميتاداتا لاستخدامها كميتاداتا فعلية",
-  "virtual-metadata.delete-item.modal-head": "استخدامات مفيدة لهذه المصالح",
-  "virtual-metadata.delete-relationship.modal-head": "قم بشراء المواد التي تريد حفظ الميتاداتا لاستخدامها كميتاداتا فعلية",
-  "supervisedWorkspace.search.results.head": "منتج للإشراف",
+
+  // "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": "قم بتحديد الأنواع التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "الميتاداتا الافتراضية لهذه العلاقة",
+
+  // "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": "قم بتحديد المواد التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
+
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "مواد خاضعة للإشراف",
+
+  // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "تقديمات",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "أدر سير العمل",
+
+  // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "مهام سير العمل",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "مهام سير العمل ومساحة العمل",
-  "orgunit.search.results.head": "نتائج البحث الوطني",
-  "workflow-item.edit.breadcrumbs": "تحرير سير العمل",
-  "workflow-item.edit.title": "تحرير سير العمل",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "نتائج بحث الوحدات المؤسسية",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "تحرير مادة سير العمل",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "تحرير مادة سير العمل",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "تم الحذف",
-  "workflow-item.delete.notification.success.content": "تم حذف المادة سير العمل هذه فعالة",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "تم حذف مادة سير العمل هذه بنجاح",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "لقد حدث خطأ ما",
-  "workflow-item.delete.notification.error.content": "عذر حذف سير العمل",
-  "workflow-item.delete.title": "حذف سير العمل",
-  "workflow-item.delete.header": "حذف سير العمل",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "تعذر حذف مادة سير العمل",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "حذف مادة سير العمل",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "حذف مادة سير العمل",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "إلغاء",
+
+  // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "حذف",
-  "workflow-item.send-back.notification.success.title": "إرسال إعادة إلى الأمام",
-  "workflow-item.send-back.notification.success.content": "أكمل إعادة صياغة سير العمل إلى هذه الإجراءات الفعالة",
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "إعادة إرسال إلى المقدم",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "تمت إعادة إرسال مادة سير العمل هذه إلى المقدم بنجاح",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "لقد حدث خطأ ما",
-  "workflow-item.send-back.notification.error.content": "تعذر إعادة إرسال المادة سير العمل إلى الأمام",
-  "workflow-item.send-back.title": "إرسال إعادة مادة سير العمل إلى شير",
-  "workflow-item.send-back.header": "إرسال إعادة مادة سير العمل إلى شير",
+
+  // "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": "تعذر إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "إلغاء",
-  "workflow-item.send-back.button.confirm": "إعادة الإرسال",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "إعادة إرسال",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
   "workflow-item.view.breadcrumbs": "عرض سير العمل",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
   "workspace-item.view.breadcrumbs": "عرض مساحة العمل",
+
+  // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "عرض مساحة العمل",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
   "workspace-item.delete.breadcrumbs": "حذف مساحة العمل",
-  "workspace-item.delete.header": "حذف مساحة العمل",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "حذف مادة مساحة العمل",
+
+  // "workspace-item.delete.button.confirm": "Delete",
   "workspace-item.delete.button.confirm": "حذف",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
   "workspace-item.delete.button.cancel": "إلغاء",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
   "workspace-item.delete.notification.success.title": "تم الحذف",
-  "workspace-item.delete.title": "تم حذف المساحة الفعالة",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "تم حذف مادة مساحة العمل بنجاح",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
   "workspace-item.delete.notification.error.title": "هناك خطأ ما",
-  "workspace-item.delete.notification.error.content": "عذر حذف مساحة العمل",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "تعذر حذف مادة مساحة العمل",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
   "workflow-item.advanced.title": "سير العمل المتقدم",
-  "workflow-item.selectrevieweraction.notification.success.title": "المراجع للبحث",
-  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاصة بما في ذلك سير العمل الفعال",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "المراجع المحدد",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاص بمادة سير العمل هذه بنجاح",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
   "workflow-item.selectrevieweraction.notification.error.title": "هناك خطأ ما",
-  "workflow-item.selectrevieweraction.notification.error.content": "عذر تحديد المراجع لعنصر سير العمل هذا",
-  "workflow-item.selectrevieweraction.title": "تحديد الزائر",
-  "workflow-item.selectrevieweraction.header": "تحديد الزائر",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "تعذر تحديد المراجع لعنصر سير العمل هذا",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
   "workflow-item.selectrevieweraction.button.cancel": "إلغاء",
-  "workflow-item.selectrevieweraction.button.confirm": "بالتأكيد",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "تأكيد",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
   "workflow-item.scorereviewaction.notification.success.title": "مراجعة التقييم",
-  "workflow-item.scorereviewaction.notification.success.content": "تم تقديم التقييم الخاص بعنصر سير العمل الفعال",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "تم إرسال التقييم الخاص بعنصر سير عمل هذه المادة بنجاح",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
   "workflow-item.scorereviewaction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
   "workflow-item.scorereviewaction.notification.error.content": "تعذر تقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
   "workflow-item.scorereviewaction.title": "قم بتقيم هذه المادة",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
   "workflow-item.scorereviewaction.header": "قم بتقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
   "workflow-item.scorereviewaction.button.cancel": "إلغاء",
-  "workflow-item.scorereviewaction.button.confirm": "بالتأكيد",
-  "idle-modal.header": "ستنتهي بعد قليل",
-  "idle-modal.info": "النهاية، انتهاء الجلسات المستخدمة بعد ذلك {{ timeToExpire }} دقيقة من عدم النشاط. ",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "تأكيد",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "ستنتهي الجلسة بعد قليل",
+
+  // "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": "لأسباب أمنية، تنتهي جلسات المستخدم بعد {{ timeToExpire }} دقيقة من عدم النشاط. ستنتهي جلستك بعد قليل. هل ترغب في تمديدها أم تسجيل الخروج؟",
+
+  // "idle-modal.log-out": "Log out",
   "idle-modal.log-out": "خروج",
+
+  // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "تمديد الجلسة",
-  "researcher.profile.action.processing": "جاريب...",
-  "researcher.profile.associated": "الملف للباحثين الشخصيين",
-  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير الملف الشخصي",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "جاري المعالجة...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "الملف الشخصي للباحث المرتبط",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير رؤية الملف الشخصي",
+
+  // "researcher.profile.create.new": "Create new",
   "researcher.profile.create.new": "إنشاء جديد",
-  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث الفعال",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث بنجاح",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
   "researcher.profile.create.fail": "حدث خطأ أثناء إنشاء الملف الشخصي للباحث",
+
+  // "researcher.profile.delete": "Delete",
   "researcher.profile.delete": "حذف",
+
+  // "researcher.profile.expose": "Expose",
   "researcher.profile.expose": "عرض",
+
+  // "researcher.profile.hide": "Hide",
   "researcher.profile.hide": "إخفاء",
-  "researcher.profile.not.associated": "الملف للباحث شخصي غير مرتبط بعد",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "الملف الشخصي للباحث غير مرتبط بعد",
+
+  // "researcher.profile.view": "View",
   "researcher.profile.view": "عرض",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "خاص",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "عام",
+
+  // "researcher.profile.status": "Status:",
   "researcher.profile.status": "الحالة:",
-  "researcherprofile.claim.not-authorized": "لا غير لك هذه المادة. ",
-  "researcherprofile.error.claim.body": "حدث خطأ أثناء استخدام الملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "لا يحق لك المطالبة بهذه المادة. لمزيد من التفاصيل يرجى الاتصال بالمسؤول.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "حدث خطأ أثناء المطالبة بالملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "خطأ",
-  "researcherprofile.success.claim.body": "أكمل بالملف الكامل الفعال",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "تمت المطالبة بالملف الشخصي بنجاح",
+
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "نجاح",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
   "person.page.orcid.create": "إنشاء معرف أوركيد",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "التصاريح الممنوحة",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "منح التصاريح",
-  "person.page.orcid.link": "الاتصال بمعرفة أوركيد",
-  "person.page.orcid.link.processing": "غاري الملف الشخصي بيوركيد...",
-  "person.page.orcid.link.error.message": "حدث ما حدث خطأ أثناء ربط الملف الشخصي بوركيد. ",
-  "person.page.orcid.orcid-not-linked-message": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم الاتصال به بعد بحسابك في سجل أوركيد أو صلاحية الاتصال.",
-  "person.page.orcid.unlink": "قطعة الاتصال بأوركيد",
-  "person.page.orcid.unlink.processing": "جاريب...",
-  "person.page.orcid.missing-authorizations": "لقد فقدت التصاريح",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "الاتصال بمعرف أوركيد",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "جاري ربط الملف الشخصي بأوركيد...",
+
+  // "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": "حدث خطأ ما أثناء ربط الملف الشخصي بأوركيد. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول.",
+
+  // "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": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم ربطه بعد بحساب في سجل أوركيد أو انتهت صلاحية الاتصال.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "قطع الاتصال بأوركيد",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "جاري المعالجة...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "تصاريح مفقودة",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
   "person.page.orcid.missing-authorizations-message": "التصاريح التالية مفقودة:",
-  "person.page.orcid.no-missing-authorizations-message": "عظيم! ",
-  "person.page.orcid.no-orcid-message": "لا يوجد معرف أوركيد مرتبط حتى الآن. ",
+
+  // "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": "عظيم! هذا المربع فارغ، لذا فقد قمت بمنح جميع حقوق الوصول لاستخدام جميع الوظائف التي تقدمها مؤسستك.",
+
+  // "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": "لا يوجد معرف أوركيد مرتبط حتى الآن. بالنقر على الزر أدناه من الممكن ربط هذا الملف الشخصي بحساب أوركيد.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
   "person.page.orcid.profile-preferences": "تفضيلات الملف الشخصي",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
   "person.page.orcid.funding-preferences": "تفضيلات التمويل",
-  "person.page.orcid.publications-preferences": "مفضلات النشر",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "تفضيلات النشر",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
   "person.page.orcid.remove-orcid-message": "إذا كنت بحاجة إلى إزالة أوركيد الخاص بك، يرجى الاتصال بمسؤول المستودع",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "تحديث الإعدادات",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "الانتسابات",
-  "person.page.orcid.sync-profile.biographical": "بيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "البيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "التعليم",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "المعرفات",
-  "person.page.orcid.sync-fundings.all": "كل التمويل",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "كل التمويلات",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "تمويلاتي",
-  "person.page.orcid.sync-fundings.my_selected": "التمويل المحدد",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "التمويلات المحددة",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "معطلة",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "كل المنشورات",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "منشوراتي",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "المنشورات المحددة",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "معطلة",
-  "person.page.orcid.sync-queue.discard": "لا ننسى ولا ننسى مع سجل أوركيد",
-  "person.page.orcid.sync-queue.discard.error": "فشلت في تجاهل تسجيل قائمة انتظار أوركيد",
-  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيل قائمة انتظار أوركيد الفعالة",
-  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد الكاملة",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "تجاهل التغيير ولا تقم بالمزامنة مع سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "فشل تجاهل تسجيلة قائمة انتظار أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيلة قائمة انتظار أوركيد بنجاح",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد فارغ",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "النوع",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "الوصف",
-  "person.page.orcid.sync-queue.table.header.action": "صنع",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "إجراء",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
   "person.page.orcid.sync-queue.description.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
   "person.page.orcid.sync-queue.description.country": "البلد",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
   "person.page.orcid.sync-queue.description.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
   "person.page.orcid.sync-queue.description.external_ids": "معرفات خارجية",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
   "person.page.orcid.sync-queue.description.other_names": "أسماء أخرى",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
   "person.page.orcid.sync-queue.description.qualification": "المؤهلات",
-  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحثين",
-  "person.page.orcid.sync-queue.description.keywords": "الكلمات الرئيسية",
-  "person.page.orcid.sync-queue.tooltip.insert": "إضافة حجم جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحث",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "كلمات رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "إضافة إدخال جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.update": "تحديث هذا الإدخال في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.delete": "إزالة هذا الإدخال من سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
   "person.page.orcid.sync-queue.tooltip.publication": "النشر",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
   "person.page.orcid.sync-queue.tooltip.project": "المشروع",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
   "person.page.orcid.sync-queue.tooltip.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
   "person.page.orcid.sync-queue.tooltip.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
   "person.page.orcid.sync-queue.tooltip.qualification": "المؤهل",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
   "person.page.orcid.sync-queue.tooltip.other_names": "اسم آخر",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
   "person.page.orcid.sync-queue.tooltip.country": "البلد",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
   "person.page.orcid.sync-queue.tooltip.keywords": "كلمة رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
   "person.page.orcid.sync-queue.tooltip.external_ids": "معرف خارجي",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "عنوان URL للباحث",
-  "person.page.orcid.sync-queue.send": "النت مع سجل أوركيد",
-  "person.page.orcid.sync-queue.send.unauthorized-error.title": "فشل تقديم أوركيد بسبب عيوب التراخيص.",
-  "person.page.orcid.sync-queue.send.unauthorized-error.content": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. ",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "المزامنة مع سجل أوركيد",
+
+  // "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": "فشل التقديم إلى أوركيد بسبب نقص تصاريح.",
+
+  // "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": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد الذي تم إرساله إلى سجل أوركيد غير صالح",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
   "person.page.orcid.sync-queue.send.error": "فشل التقديم إلى أوركيد",
-  "person.page.orcid.sync-queue.send.conflict-error": "فشل تقديم أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
-  "person.page.orcid.sync-queue.send.not-found-warning": "لم يعد موردًا موجودًا في سجل أوركيد.",
-  "person.page.orcid.sync-queue.send.success": "تم التقديم إلى أوركيد الفعال",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
+
+  // "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": "لم يعد المورد موجودًا في سجل أوركيد.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "تم اكتمال التقديم إلى أوركيد بنجاح",
+
+  // "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": "البيانات التي تريد مزامنتها مع أوركيد غير صالحة",
-  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "العملة الورقية المطلوبة",
-  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "يلزم المورد إرساله معرفًا جديدًا على الأقل",
+
+  // "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": "عملة المبلغ مطلوبة",
+
+  // "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": "يتطلب المورد المراد إرساله معرفًا واحدًا على الأقل",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
   "person.page.orcid.sync-queue.send.validation-error.title.required": "العنوان مطلوب",
+
+  // "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": "dc.type مطلوب",
-  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "تاريخ البدلة مطلوب",
+
+  // "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": "تاريخ البد مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
   "person.page.orcid.sync-queue.send.validation-error.funder.required": "الممول مطلوب",
+
+  // "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": "كود البلد المكون من رقمين ISO 3166 غير صالح",
-  "person.page.orcid.sync-queue.send.validation-error.organization.required": "مؤسسة مطلوبة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "المؤسسة مطلوبة",
+
+  // "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": "اسم المؤسسة مطلوب",
+
+  // "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": "يجب أن يكون تاريخ النشر بعد سنة واحدة من عام 1900",
-  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "الطلبات التي تقوم المؤسسة بإرسالها عنواناً",
-  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "مطلوب عنوان المؤسسة المراد نقلها لمدينة",
-  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "يلزم عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "مطلوب معرف لتوضيح المنظمة. ",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "المتطلبات المعرفية للهيئة",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "المتطلبات المعرفية المؤسسة مصدراً",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "مصدر أحد المؤسسات المعرفية غير الصالحة. ",
-  "person.page.orcid.synchronization-mode": "وضع النوارس",
+
+  // "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": "تتطلب المؤسسة التي سيتم إرسالها عنواناً",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها مدينة",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
+
+  // "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": "مطلوب معرف لتوضيح المؤسسات. المعرفات المدعومة هي GRID وRinggold ومعرفات الكينونات القانونية (LEIs) ومعرفات سجل Crossref Funder",
+
+  // "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": "تتطلب معرفات المؤسسة قيمة",
+
+  // "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": "تتطلب معرفات المؤسسة مصدراً",
+
+  // "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": "مصدر أحد معرفات المؤسسة غير صالح. المصادر المدعومة هي RINGGOLD وGRID وLEI وFUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "وضع المزامنة",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
   "person.page.orcid.synchronization-mode.batch": "دفعة",
-  "person.page.orcid.synchronization-mode.label": "وضع النوارس",
-  "person.page.orcid.synchronization-mode-message": "يرجى تحديد الطريقة التي تريد أن تتم من خلالها تشغيل النت مع أوركيد. ",
-  "person.page.orcid.synchronization-mode-funding-message": "حدد ما إذا كنت ترغب في استكمال الدراسة في كينونات المشروع، ثم قم بإدراج المعلومات الخاصة بالتمويل الخاص بشركة أوركيد الخاصة بك.",
-  "person.page.orcid.synchronization-mode-publication-message": "حدد ما إذا كنت ترغب في ترك كينونات ترغب في قائمة أعمال تسجيل أوركيد الخاصة بك.",
-  "person.page.orcid.synchronization-mode-profile-message": "حدد ما إذا كنت تريد إرسال بياناتك الشخصية أو معرفاتك الشخصية إلى تسجيل أوركيد الخاص بك.",
-  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات الروبوت الفعالة",
-  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات الناقلات",
-  "person.page.orcid.synchronization-mode.manual": "يدويا",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "وضع المزامنة",
+
+  // "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": "يرجى تحديد الطريقة التي تريد أن تتم بها المزامنة مع أوركيد. تتضمن الخيارات \"يدوي\" (يجب عليك إرسال بياناتك إلى أوركيد يدوياً)، أو \"بالدفعة\" (سيقوم النظام بإرسال بياناتك إلى أوركيد عبر برنامج نصي مجدول).",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات المشروع المرتبطة إلى قائمة معلومات التمويل الخاصة بتسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات النشر المرتبطة إلى قائمة أعمال تسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال بياناتات الشخصية أو معرفاتك الشخصية إلى تسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات المزامنة بنجاح",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات المزامنة",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "يدوي",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
   "person.page.orcid.scope.authenticate": "احصل على معرف أوركيد الخاص بك",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
   "person.page.orcid.scope.read-limited": "اقرأ معلوماتك مع ضبط مستوى الرؤية للأطراف الموثوقة",
-  "person.page.orcid.scope.activities-update": "إضافة/تحديث الدراسات الخاصة بك",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "إضافة/تحديث الأنشطة البحثية الخاصة بك",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
   "person.page.orcid.scope.person-update": "إضافة/تحديث معلومات أخرى عنك",
-  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وأوركيد فعال",
-  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وأوركيد. ",
-  "person.orcid.sync.setting": "إعدادات نوبات أوركيد",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وسجل أوركيد بنجاح",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وسجل أوركيد. يرجى إعادة المحاولة",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "إعدادات مزامنة أوركيد",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
   "person.orcid.registry.queue": "قائمة انتظار سجل أوركيد",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "تصاريح أوركيد",
-  "home.recent-submissions.head": "أحدث العروض",
-  "listable-notification-object.default-message": "تعذر على تجديد هذا",
-  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء حذف التنبيه على النظام",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "أحدث التقديمات",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "تعذر استرداد هذا الكائن",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء استرداد شعار التنبيه على مستوى النظام",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
   "system-wide-alert-banner.countdown.prefix": "خلال",
-  "system-wide-alert-banner.countdown.days": "{{days}} يوما,",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} يوماً,",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
   "system-wide-alert-banner.countdown.hours": "{{hours}} ساعة و",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} دقيقة:",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
   "system-wide-alert.form.header": "تنبيه على مستوى النظام",
-  "system-wide-alert-form.retrieval.error": "حدث ما خطأ أثناء تحديث التنبيه على النظام",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "حدث خطأ ما أثناء استرداد التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.cancel": "Cancel",
   "system-wide-alert.form.cancel": "إلغاء",
+
+  // "system-wide-alert.form.save": "Save",
   "system-wide-alert.form.save": "حفظ",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
   "system-wide-alert.form.label.active": "نشط",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
   "system-wide-alert.form.label.inactive": "غير نشط",
-  "system-wide-alert.form.error.message": "يجب أن يحتوي على تنبيه على النظام على رسالة",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "يجب أن يحتوي التنبيه على مستوى النظام على رسالة",
+
+  // "system-wide-alert.form.label.message": "Alert message",
   "system-wide-alert.form.label.message": "رسالة تنبيه",
-  "system-wide-alert.form.label.countdownTo.enable": "تفعيل تقويم التاريخ",
-  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط توقيت تقويم التقويم. ",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "تفعيل مؤقت العد التنازلي",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط مؤقت العد التنازلي. عند التفعيل، يمكن تعيين تاريخ في المستقبل وسيقوم شعار التنبيه على مستوى النظام بإجراء العد التنازلي للتاريخ المحدد. عندما ينتهي هذا المؤقت، سوف يختفي من التنبيه. لن يتم إيقاف الخادم تلقائياً.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
   "system-wide-alert-form.select-date-by-calendar": "حدد التاريخ باستخدام التقويم",
-  "system-wide-alert.form.label.preview": "معاينة التنبيه على النظام",
-  "system-wide-alert.form.update.success": "تم تحديث التنبيه على النظام الفعال",
-  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على النظام",
-  "system-wide-alert.form.create.success": "تم إنشاء تنبيه على النظام الفعال",
-  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء تنبيه على النظام",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "معاينة التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "تم تحديث التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "تم إنشاء التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء التنبيه على مستوى النظام",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
   "admin.system-wide-alert.breadcrumbs": "تنبيهات على مستوى النظام",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "تنبيهات على مستوى النظام",
-  "discover.filters.head": "يكتشف",
-  "item-access-control-title": "يتيح لك هذا النموذج عمل التغيرات في شروط الوصول إلى مادة ميتا أو تدفقات محددة خاصة بها.",
-  "collection-access-control-title": "يتيح لك هذا النموذج إجراء التغيرات في شروط الوصول لكل المواد المملوكة لهذه المجموعة. ",
-  "community-access-control-title": "يتيح لك هذا النموذج إجراء التغيرات في شروط الوصول لكل المواد المملوكة للمجموعة ضمن هذا المجتمع. ",
-  "access-control-item-header-toggle": "مادة ميتاداتا",
-  "access-control-item-toggle.enable": "تفعيل خيار عمل الخيارات على ميتاداتا المادة",
-  "access-control-item-toggle.disable": "السؤال الآن هو: القدرة على إحداث تغييرات على مادة ميتابادتا",
+
+  // "discover.filters.head": "Discover",
+  // TODO New key - Add a translation
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول إلى ميتاداتا المادة أو تدفقات البت الخاصة بها.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لهذه المجموعة. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لأي مجموعة ضمن هذا المجتمع. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "ميتاداتا المادة",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "تفعيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "تعطيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
   "access-control-bitstream-header-toggle": "تدفقات البت",
-  "access-control-bitstream-toggle.enable": "تفعيل خيار خيارات على تدفقات البت",
-  "access-control-bitstream-toggle.disable": "مطلوب خيار إجراء تغييرات على تدفقات البت",
-  "access-control-mode": "وضع",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "تفعيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "تعطيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
   "access-control-access-conditions": "شروط الوصول",
-  "access-control-no-access-conditions-warning-message": "في الوقت الحالي، لم يتم تحديد أي شروط الوصول أدناه. ",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "في الوقت الراهن، لم يتم تحديد أي شروط وصول أدناه. عند التنفيذ، سيتم استبدال شروط الوصول الحالية بشروط الوصول الافتراضية الموروثة من المجموعة المالكة.",
+
+  // "access-control-replace-all": "Replace access conditions",
   "access-control-replace-all": "استبدل شروط الوصول",
+
+  // "access-control-add-to-existing": "Add to existing ones",
   "access-control-add-to-existing": "إضافة إلى الموجود",
-  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بتجميلة",
-  "access-control-process-all-bitstreams": "تحديد كل التدفقات الواضحة في المادة",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بت معينة",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "تحديد كل تدفقات البت في المادة",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
   "access-control-bitstreams-selected": "تم تحديد تدفقات البت",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
   "access-control-bitstreams-select": "حدد تدفقات البت",
+
+  // "access-control-cancel": "Cancel",
   "access-control-cancel": "إلغاء",
+
+  // "access-control-execute": "Execute",
   "access-control-execute": "تنفيذ",
+
+  // "access-control-add-more": "Add more",
   "access-control-add-more": "إضافة المزيد",
+
+  // "access-control-remove": "Remove access condition",
   "access-control-remove": "إزالة شرط الوصول",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
   "access-control-select-bitstreams-modal.title": "حدد تدفقات البت",
-  "access-control-select-bitstreams-modal.no-items": "لا يوجد شيء.",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "لا توجد مواد.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
   "access-control-select-bitstreams-modal.close": "إلغاء",
+
+  // "access-control-option-label": "Access condition type",
   "access-control-option-label": "نوع شرط الوصول",
-  "access-control-option-note": "اختر شرط وصول لتطبيقه على المواد المحددة.",
-  "access-control-option-start-date": "أمنح من الوصول",
-  "access-control-option-start-date-note": "قم بتسجيل التاريخ الذي يبدأ منه تطبيق شرط ذي الوصول ذي الصلة",
-  "access-control-option-end-date": "أمنح حتى الوصول",
-  "access-control-option-end-date-note": "يجب البدء بالتاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى أوله",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "اختر شرط وصول لتطبيقه على الكائنات المحددة.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "منح الوصول من",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "قم بتحديد التاريخ الذي يبدأ منه تطبيق شرط الوصول ذي الصلة",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "منح الوصول حتى",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "قم بتحديد التاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "vocabulary-treeview.search.form.add": "Add",
   "vocabulary-treeview.search.form.add": "إضافة",
-  "admin.notifications.publicationclaim.breadcrumbs": "لكي بالنشر",
-  "admin.notifications.publicationclaim.page.title": "لكي بالنشر",
-  "filter.search.operator.placeholder": "لها",
-  "search.filters.filter.entityType.text": "نوع الفرن",
-  "search.filters.operator.equals.text": "يساوي",
-  "search.filters.operator.notequals.text": "لا يساوي",
-  "search.filters.operator.notcontains.text": "لا يحتوي على",
-  "search.filters.operator.contains.text": "يحتوي على",
-  "search.filters.filter.title.text": "عنوان العنوان",
-  "search.filters.applied.f.title": "عنوان العنوان",
-  "search.filters.filter.author.text": "المؤلف",
-  "coar-notify-support.title": "COAR التمهيدي",
-  "coar-notify-support-title.content": "هنا، نحن ندعم بشكل كامل بروتوكول COAR Notify، المصمم لتعزيز الاتصال بين المستودعات.  <a href=\\\"https://notify.coar-repositories.org/\\\">موقع إخطار COAR</a>.",
-  "coar-notify-support.ldn-inbox.title": "صندوق LDN بريد",
-  "coar-notify-support.ldn-inbox.content": "من أجل راحتك، يمكن الوصول بسهولة إلى صندوق الوارد الخاص بـ LDN (إشعارات البيانات المرتبطة) على {ldnInboxUrl}. ",
-  "coar-notify-support.message-moderation.title": "الإشراف على الرسالة",
-  "coar-notify-support.message-moderation.content": "ولتوفير بيئة آمنة ومنتجة، يتم مراقبة جميع الرسائل. ",
-  "coar-notify-support.message-moderation.feedback-form": " دفتر نموذج.",
-  "service.overview.delete.header": "حذف الخدمة",
-  "ldn-registered-services.title": "الخدمات المميزة",
-  "ldn-registered-services.table.name": "الاسم",
-  "ldn-registered-services.table.description": "الوصف",
-  "ldn-registered-services.table.status": "الحالة",
-  "ldn-registered-services.table.action": "فعل",
-  "ldn-registered-services.new": "جديد",
-  "ldn-registered-services.new.breadcrumbs": "الخدمات المميزة",
-  "ldn-service.overview.table.enabled": "ممكن",
-  "ldn-service.overview.table.disabled": "ه",
-  "ldn-service.overview.table.clickToEnable": "انقر للتمكين",
-  "ldn-service.overview.table.clickToDisable": "انقر للتعطيل",
-  "ldn-edit-registered-service.title": "تحرير الخدمة",
-  "ldn-create-service.title": "إنشاء الخدمة",
-  "service.overview.create.modal": "إنشاء الخدمة",
-  "service.overview.create.body": "الرجاء التأكيد على إنشاء هذه الخدمة.",
-  "ldn-service-status": "الحالة",
-  "service.confirm.create": "إنشاء",
-  "service.refuse.create": "إلغاء",
-  "ldn-register-new-service.title": "تسجيل خدمة جديدة",
-  "ldn-new-service.form.label.submit": "حفظ",
-  "ldn-new-service.form.label.name": "اسم",
-  "ldn-new-service.form.label.description": "الوصف",
-  "ldn-new-service.form.label.url": "عنوان URL للخدمة",
-  "ldn-new-service.form.label.ip-range": "لخدمة نطاق IP",
-  "ldn-new-service.form.label.score": "مستوى الثقة",
-  "ldn-new-service.form.label.ldnUrl": "عنوان URL لصندوق بريد LDN",
-  "ldn-new-service.form.placeholder.name": "يرجى تقديم اسم الخدمة",
-  "ldn-new-service.form.placeholder.description": "يرجى تقديم وصف بخصوص خدمتك",
-  "ldn-new-service.form.placeholder.url": "يرجى إدخال عنوان URL للمستخدمين للتحقق من مزيد من المعلومات حول الخدمة",
-  "ldn-new-service.form.placeholder.lowerIp": "نطاق IPv4 الحد الأدنى",
-  "ldn-new-service.form.placeholder.upperIp": "نطاق IPv4 الحد الأعلى",
-  "ldn-new-service.form.placeholder.ldnUrl": "يرجى تحديد عنوان URL لصندوق LDN الوارد",
-  "ldn-new-service.form.placeholder.score": "الرجاء إدخال قيمة بين 0 و1. استخدم \".\" ",
-  "ldn-service.form.label.placeholder.default-select": "حدد نمطًا",
-  "ldn-service.form.pattern.ack-accept.label": "الاعتراف والقبول",
-  "ldn-service.form.pattern.ack-accept.description": "يستخدم هذا النمط للإقرار بالطلب (العرض) وقبوله. ",
-  "ldn-service.form.pattern.ack-accept.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-reject.label": "الاعتراف والرفض",
-  "ldn-service.form.pattern.ack-reject.description": "يستخدم هذا النمط للإقرار بالطلب (العرض) ورفضه. ",
-  "ldn-service.form.pattern.ack-reject.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-tentative-accept.label": "الإقرار والقبول مبدئيا",
-  "ldn-service.form.pattern.ack-tentative-accept.description": "يُستخدم هذا النمط للإقرار بالطلب (العرض) وقبوله مبدئيًا. ",
-  "ldn-service.form.pattern.ack-tentative-accept.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-tentative-reject.label": "الاعتراف والرفض مبدئيا",
-  "ldn-service.form.pattern.ack-tentative-reject.description": "يُستخدم هذا النمط للإقرار بالطلب (العرض) ورفضه مبدئيًا. ",
-  "ldn-service.form.pattern.ack-tentative-reject.category": "شكر وتقدير",
-  "ldn-service.form.pattern.announce-endorsement.label": "إعلان المصادقة",
-  "ldn-service.form.pattern.announce-endorsement.description": "يُستخدم هذا النمط للإعلان عن وجود تأييد، مع الإشارة إلى المورد المعتمد.",
-  "ldn-service.form.pattern.announce-endorsement.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-ingest.label": "أعلن عن استيعاب",
-  "ldn-service.form.pattern.announce-ingest.description": "يُستخدم هذا النمط للإعلان عن استيعاب أحد الموارد.",
-  "ldn-service.form.pattern.announce-ingest.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-relationship.label": "أعلن عن العلاقة",
-  "ldn-service.form.pattern.announce-relationship.description": "يُستخدم هذا النمط للإعلان عن وجود علاقة بين مصدرين.",
-  "ldn-service.form.pattern.announce-relationship.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-review.label": "الإعلان عن المراجعة",
-  "ldn-service.form.pattern.announce-review.description": "يُستخدم هذا النمط للإعلان عن وجود مراجعة، مع الإشارة إلى المورد الذي تمت مراجعته.",
-  "ldn-service.form.pattern.announce-review.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-service-result.label": "الإعلان عن نتيجة الخدمة",
-  "ldn-service.form.pattern.announce-service-result.description": "يُستخدم هذا النمط للإعلان عن وجود \"نتيجة خدمة\"، مع الإشارة إلى المورد ذي الصلة.",
-  "ldn-service.form.pattern.announce-service-result.category": "الإعلانات",
-  "ldn-service.form.pattern.request-endorsement.label": "طلب المصادقة",
-  "ldn-service.form.pattern.request-endorsement.description": "يُستخدم هذا النمط لطلب المصادقة على مورد مملوك للنظام الأصلي.",
-  "ldn-service.form.pattern.request-endorsement.category": "الطلبات",
-  "ldn-service.form.pattern.request-ingest.label": "طلب استيعاب",
-  "ldn-service.form.pattern.request-ingest.description": "يُستخدم هذا النمط لمطالبة النظام المستهدف باستيعاب أحد الموارد.",
-  "ldn-service.form.pattern.request-ingest.category": "الطلبات",
-  "ldn-service.form.pattern.request-review.label": "طلب مراجعة",
-  "ldn-service.form.pattern.request-review.description": "يُستخدم هذا النمط لطلب مراجعة أحد الموارد المملوكة للنظام الأصلي.",
-  "ldn-service.form.pattern.request-review.category": "الطلبات",
-  "ldn-service.form.pattern.undo-offer.label": "التراجع عن العرض",
-  "ldn-service.form.pattern.undo-offer.description": "يُستخدم هذا النمط للتراجع عن (سحب) عرض تم تقديمه مسبقًا.",
-  "ldn-service.form.pattern.undo-offer.category": "الغاء التحميل",
-  "ldn-new-service.form.label.placeholder.selectedItemFilter": "لم يتم تحديد أي عنصر تصفية",
-  "ldn-new-service.form.label.ItemFilter": "عامل تصفية العنصر",
-  "ldn-new-service.form.label.automatic": "تلقائي",
-  "ldn-new-service.form.error.name": "مطلوب اسم",
-  "ldn-new-service.form.error.url": "عنوان URL مطلوب",
-  "ldn-new-service.form.error.ipRange": "الرجاء إدخال نطاق IP صالح",
-  "ldn-new-service.form.hint.ipRange": "الرجاء إدخال IPV4 صالح في كلا النطاقين (ملاحظة: بالنسبة لعنوان IP واحد، يرجى إدخال نفس القيمة في كلا الحقلين)",
-  "ldn-new-service.form.error.ldnurl": "عنوان URL لـ LDN مطلوب",
-  "ldn-new-service.form.error.patterns": "مطلوب نمط على الأقل",
-  "ldn-new-service.form.error.score": "الرجاء إدخال نتيجة صحيحة (بين 0 و1). ",
-  "ldn-new-service.form.label.inboundPattern": "النمط الوارد",
-  "ldn-new-service.form.label.addPattern": "+ أضف المزيد",
-  "ldn-new-service.form.label.removeItemFilter": "يزيل",
-  "ldn-register-new-service.breadcrumbs": "خدمة جديدة",
-  "service.overview.delete.body": "هل أنت متأكد أنك تريد حذف هذه الخدمة؟",
-  "service.overview.edit.body": "هل تؤكد التغييرات؟",
-  "service.overview.edit.modal": "تحرير الخدمة",
-  "service.detail.update": "يتأكد",
-  "service.detail.return": "يلغي",
-  "service.overview.reset-form.body": "هل أنت متأكد أنك تريد تجاهل التغييرات والمغادرة؟",
-  "service.overview.reset-form.modal": "تجاهل التغييرات",
-  "service.overview.reset-form.reset-confirm": "ينبذ",
-  "admin.registries.services-formats.modify.success.head": "تحرير ناجح",
-  "admin.registries.services-formats.modify.success.content": "تم تعديل الخدمة",
-  "admin.registries.services-formats.modify.failure.head": "فشل التحرير",
-  "admin.registries.services-formats.modify.failure.content": "لم يتم تحرير الخدمة",
-  "ldn-service-notification.created.success.title": "إنشاء ناجح",
-  "ldn-service-notification.created.success.body": "تم إنشاء الخدمة",
-  "ldn-service-notification.created.failure.title": "فشل الإنشاء",
-  "ldn-service-notification.created.failure.body": "لم يتم إنشاء الخدمة",
-  "ldn-service-notification.created.warning.title": "الرجاء تحديد نمط وارد واحد على الأقل",
-  "ldn-enable-service.notification.success.title": "تم تحديث الحالة بنجاح",
-  "ldn-enable-service.notification.success.content": "تم تحديث حالة الخدمة",
-  "ldn-service-delete.notification.success.title": "تم الحذف بنجاح",
-  "ldn-service-delete.notification.success.content": "تم حذف الخدمة",
-  "ldn-service-delete.notification.error.title": "فشل الحذف",
-  "ldn-service-delete.notification.error.content": "لم يتم حذف الخدمة",
-  "service.overview.reset-form.reset-return": "يلغي",
-  "service.overview.delete": "حذف الخدمة",
-  "ldn-edit-service.title": "تحرير الخدمة",
-  "ldn-edit-service.form.label.name": "اسم",
-  "ldn-edit-service.form.label.description": "وصف",
-  "ldn-edit-service.form.label.url": "عنوان URL للخدمة",
-  "ldn-edit-service.form.label.ldnUrl": "عنوان URL لصندوق بريد LDN",
-  "ldn-edit-service.form.label.inboundPattern": "النمط الوارد",
-  "ldn-edit-service.form.label.noInboundPatternSelected": "لا يوجد نمط وارد",
-  "ldn-edit-service.form.label.selectedItemFilter": "عامل تصفية العنصر المحدد",
-  "ldn-edit-service.form.label.selectItemFilter": "لا يوجد عامل تصفية للعناصر",
-  "ldn-edit-service.form.label.automatic": "تلقائي",
-  "ldn-edit-service.form.label.addInboundPattern": "+ أضف المزيد",
-  "ldn-edit-service.form.label.submit": "يحفظ",
-  "ldn-edit-service.breadcrumbs": "تحرير الخدمة",
-  "ldn-service.control-constaint-select-none": "لا تختر شيء",
-  "ldn-register-new-service.notification.error.title": "خطأ",
-  "ldn-register-new-service.notification.error.content": "حدث خطأ أثناء إنشاء هذه العملية",
-  "ldn-register-new-service.notification.success.title": "نجاح",
-  "ldn-register-new-service.notification.success.content": "تم إنشاء العملية بنجاح",
-  "submission.sections.notify.info": "الخدمة المحددة متوافقة مع العنصر وفقًا لحالته الحالية. {{ service.name }}: {{ service.description }}",
-  "item.page.endorsement": "تَأيِيد",
-  "item.page.review": "مراجعة",
-  "item.page.dataset": "مجموعة البيانات",
-  "menu.section.icon.ldn_services": "نظرة عامة على خدمات LDN",
-  "menu.section.services": "خدمات LDN",
-  "menu.section.services_new": "خدمة LDN",
-  "quality-assurance.topics.description-with-target": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}} فيما يتعلق ب",
-  "quality-assurance.events.description": "هناك أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع للبحث.",
-  "quality-assurance.events.description-with-topic-and-target": "أسفل القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد <b>{{topic}}</b>، متعلق ب <b>{{source}}</b> و ",
-  "quality-assurance.event.table.event.message.serviceUrl": "عنوان الخدمة:",
-  "quality-assurance.event.table.event.message.link": "وصلة:",
-  "service.detail.delete.cancel": "يلغي",
-  "service.detail.delete.button": "حذف الخدمة",
-  "service.detail.delete.header": "حذف الخدمة",
-  "service.detail.delete.body": "هل أنت متأكد أنك تريد حذف الخدمة الحالية؟",
-  "service.detail.delete.confirm": "حذف الخدمة",
-  "service.detail.delete.success": "تم حذف الخدمة بنجاح.",
-  "service.detail.delete.error": "حدث خطأ ما عند حذف الخدمة",
-  "service.overview.table.id": "معرف الخدمات",
-  "service.overview.table.name": "اسم",
-  "service.overview.table.start": "وقت البدء (التوقيت العالمي المنسق)",
-  "service.overview.table.status": "حالة",
-  "service.overview.table.user": "مستخدم",
-  "service.overview.title": "نظرة عامة للخدمات",
-  "service.overview.breadcrumbs": "نظرة عامة للخدمات",
-  "service.overview.table.actions": "أجراءات",
-  "service.overview.table.description": "وصف",
-  "submission.sections.submit.progressbar.coarnotify": "إخطار COAR",
-  "submission.section.section-coar-notify.control.request-review.label": "يمكنك طلب مراجعة لإحدى الخدمات التالية",
-  "submission.section.section-coar-notify.control.request-endorsement.label": "يمكنك طلب المصادقة على إحدى المجلات المتراكبة التالية",
-  "submission.section.section-coar-notify.control.request-ingest.label": "يمكنك طلب استيعاب نسخة من طلبك إلى إحدى الخدمات التالية",
-  "submission.section.section-coar-notify.dropdown.no-data": "لا تتوافر بيانات",
-  "submission.section.section-coar-notify.dropdown.select-none": "لا تختر شيء",
-  "submission.section.section-coar-notify.small.notification": "اختر خدمة ل {{ pattern }} من هذا البند",
-  "submission.section.section-coar-notify.selection.description": "وصف الخدمة المختارة:",
-  "submission.section.section-coar-notify.selection.no-description": "لا تتوفر المزيد من المعلومات",
-  "submission.section.section-coar-notify.notification.error": "الخدمة المحددة غير مناسبة للعنصر الحالي. ",
-  "submission.section.section-coar-notify.info.no-pattern": "لم يتم العثور على أنماط قابلة للتكوين.",
-  "error.validation.coarnotify.invalidfilter": "عامل التصفية غير صالح، حاول تحديد خدمة أخرى أو لا شيء.",
-  "request-status-alert-box.accepted": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> وقد تم توليه المسؤولية.",
-  "request-status-alert-box.rejected": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> وقد رفض.",
-  "request-status-alert-box.requested": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> معلق.",
-  "ldn-service-button-mark-inbound-deletion": "وضع علامة على النمط الوارد للحذف",
-  "ldn-service-button-unmark-inbound-deletion": "قم بإلغاء تحديد النمط الوارد للحذف",
-  "ldn-service-input-inbound-item-filter-dropdown": "حدد عامل تصفية العنصر للنمط الوارد",
-  "ldn-service-input-inbound-pattern-dropdown": "حدد النمط الوارد للخدمة",
-  "ldn-service-overview-select-delete": "اختر الخدمة للحذف",
-  "ldn-service-overview-select-edit": "تحرير خدمة LDN",
-  "ldn-service-overview-close-modal": "إغلاق مشروط",
-  "a-common-or_statement.label": "نوع العنصر هو مقالة يومية أو مجموعة بيانات",
-  "always_true_filter.label": "دائما صحيح او صادق",
-  "automatic_processing_collection_filter_16.label": "المعالجة التلقائية",
-  "dc-identifier-uri-contains-doi_condition.label": "يحتوي URI على DOI",
-  "doi-filter.label": "مرشح DOI",
-  "driver-document-type_condition.label": "نوع المستند يساوي السائق",
-  "has-at-least-one-bitstream_condition.label": "يحتوي على Bitstream واحد على الأقل",
-  "has-bitstream_filter.label": "لديه تيار البت",
-  "has-one-bitstream_condition.label": "لديه Bitstream واحد",
-  "is-archived_condition.label": "تمت أرشفته",
-  "is-withdrawn_condition.label": "تم سحبه",
-  "item-is-public_condition.label": "العنصر عام",
-  "journals_ingest_suggestion_collection_filter_18.label": "استيعاب المجلات",
-  "title-starts-with-pattern_condition.label": "يبدأ العنوان بالنمط",
-  "type-equals-dataset_condition.label": "النوع يساوي مجموعة البيانات",
-  "type-equals-journal-article_condition.label": "النوع يساوي مقالة يومية",
-  "search.filters.filter.subject.text": "موضوع",
-  "search.advanced.filters.head": "البحث المتقدم",
-  "filter.search.text.placeholder": "بحث في النص",
-  "advancesearch.form.submit": "يضيف",
-  "ldn.no-filter.label": "لا أحد",
-  "admin.notify.dashboard": "لوحة القيادة",
-  "menu.section.notify_dashboard": "لوحة القيادة",
-  "menu.section.coar_notify": "إخطار COAR",
-  "admin-notify-dashboard.title": "لوحة الإخطار",
-  "admin-notify-dashboard.description": "تراقب لوحة معلومات Notify الاستخدام العام لبروتوكول COAR Notify عبر المستودع. ",
-  "admin-notify-dashboard.metrics": "المقاييس",
-  "admin-notify-dashboard.received-ldn": "عدد LDN المستلم",
-  "admin-notify-dashboard.generated-ldn": "عدد LDN الذي تم إنشاؤه",
-  "admin-notify-dashboard.NOTIFY.incoming.accepted": "قبلت",
-  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "الإخطارات الواردة المقبولة",
-  "admin-notify-logs.NOTIFY.incoming.accepted": "يعرض حاليا: الإخطارات المقبولة",
-  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN المعالجة",
-  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "معالجة الإخطارات الواردة",
-  "admin-notify-logs.NOTIFY.incoming.processed": "المعروض حاليا: LDN المعالج",
-  "admin-notify-logs.NOTIFY.incoming.failure": "المعروض حاليًا: الإشعارات الفاشلة",
-  "admin-notify-dashboard.NOTIFY.incoming.failure": "فشل",
-  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "فشل الإخطارات الواردة",
-  "admin-notify-logs.NOTIFY.outgoing.failure": "المعروض حاليًا: الإشعارات الفاشلة",
-  "admin-notify-dashboard.NOTIFY.outgoing.failure": "فشل",
-  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "فشل الإخطارات الصادرة",
-  "admin-notify-logs.NOTIFY.incoming.untrusted": "المعروض حاليًا: إشعارات غير موثوقة",
-  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "غير موثوق به",
-  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "الإخطارات الواردة غير موثوق بها",
-  "admin-notify-logs.NOTIFY.incoming.delivered": "المعروض حاليًا: الإخطارات التي تم تسليمها",
-  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "تم تسليم الإشعارات الواردة بنجاح",
-  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "تم التوصيل",
-  "admin-notify-logs.NOTIFY.outgoing.delivered": "المعروض حاليًا: الإخطارات التي تم تسليمها",
-  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "تم تسليم الإخطارات الصادرة بنجاح",
-  "admin-notify-logs.NOTIFY.outgoing.queued": "المعروض حاليًا: الإشعارات في قائمة الانتظار",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "الإخطارات في قائمة الانتظار حاليا",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued": "في قائمة الانتظار",
-  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "يتم العرض حاليًا: في قائمة الانتظار لإعادة محاولة الإشعارات",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "في قائمة الانتظار لإعادة المحاولة",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "الإخطارات في قائمة الانتظار حاليا لإعادة المحاولة",
-  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "العناصر المعنية",
-  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "العناصر المتعلقة بالإخطارات الواردة",
-  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "العناصر المعنية",
-  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "العناصر المتعلقة بالإخطارات الصادرة",
-  "admin.notify.dashboard.breadcrumbs": "لوحة القيادة",
-  "admin.notify.dashboard.inbound": "الرسائل الواردة",
-  "admin.notify.dashboard.inbound-logs": "السجلات/الواردة",
-  "admin.notify.dashboard.filter": "منقي: ",
-  "search.filters.applied.f.relateditem": "الأصناف المتعلقة",
-  "search.filters.applied.f.ldn_service": "خدمة LDN",
-  "search.filters.applied.f.notifyReview": "إخطار المراجعة",
-  "search.filters.applied.f.notifyEndorsement": "إخطار المصادقة",
-  "search.filters.applied.f.notifyRelation": "إخطار العلاقة",
-  "search.filters.filter.queue_last_start_time.head": "آخر وقت للمعالجة ",
-  "search.filters.filter.queue_last_start_time.min.label": "نطاق الحد الأدنى",
-  "search.filters.filter.queue_last_start_time.max.label": "أقصى مدى",
-  "search.filters.applied.f.queue_last_start_time.min": "نطاق الحد الأدنى",
-  "search.filters.applied.f.queue_last_start_time.max": "أقصى مدى",
-  "admin.notify.dashboard.outbound": "الرسائل الصادرة",
-  "admin.notify.dashboard.outbound-logs": "السجلات/الصادرة",
-  "NOTIFY.incoming.search.results.head": "وارد",
-  "search.filters.filter.relateditem.head": "البند ذو الصلة",
-  "search.filters.filter.origin.head": "أصل",
-  "search.filters.filter.ldn_service.head": "خدمة LDN",
-  "search.filters.filter.target.head": "هدف",
-  "search.filters.filter.queue_status.head": "حالة قائمة الانتظار",
-  "search.filters.filter.activity_stream_type.head": "نوع تيار النشاط",
-  "search.filters.filter.coar_notify_type.head": "نوع الإخطار COAR",
-  "search.filters.filter.notification_type.head": "نوع إعلام",
-  "search.filters.filter.relateditem.label": "البحث عن العناصر ذات الصلة",
-  "search.filters.filter.queue_status.label": "حالة قائمة انتظار البحث",
-  "search.filters.filter.target.label": "هدف البحث",
-  "search.filters.filter.activity_stream_type.label": "نوع دفق نشاط البحث",
-  "search.filters.applied.f.queue_status": "حالة قائمة الانتظار",
-  "search.filters.queue_status.0,authority": "IP غير موثوق به",
-  "search.filters.queue_status.1,authority": "في قائمة الانتظار",
-  "search.filters.queue_status.2,authority": "يعالج",
-  "search.filters.queue_status.3,authority": "تمت معالجتها",
-  "search.filters.queue_status.4,authority": "فشل",
-  "search.filters.queue_status.5,authority": "غير موثوق به",
-  "search.filters.queue_status.6,authority": "عمل غير محدد",
-  "search.filters.queue_status.7,authority": "في قائمة الانتظار لإعادة المحاولة",
-  "search.filters.applied.f.activity_stream_type": "نوع تيار النشاط",
-  "search.filters.applied.f.coar_notify_type": "نوع الإخطار COAR",
-  "search.filters.applied.f.notification_type": "نوع إعلام",
-  "search.filters.filter.coar_notify_type.label": "بحث COAR نوع الإخطار",
-  "search.filters.filter.notification_type.label": "بحث نوع الإخطار",
-  "search.filters.filter.relateditem.placeholder": "الأصناف المتعلقة",
-  "search.filters.filter.target.placeholder": "هدف",
-  "search.filters.filter.origin.label": "مصدر البحث",
-  "search.filters.filter.origin.placeholder": "مصدر",
-  "search.filters.filter.ldn_service.label": "ابحث في خدمة LDN",
-  "search.filters.filter.ldn_service.placeholder": "خدمة LDN",
-  "search.filters.filter.queue_status.placeholder": "حالة قائمة الانتظار",
-  "search.filters.filter.activity_stream_type.placeholder": "نوع تيار النشاط",
-  "search.filters.filter.coar_notify_type.placeholder": "نوع الإخطار COAR",
-  "search.filters.filter.notification_type.placeholder": "إشعار",
-  "search.filters.filter.notifyRelation.head": "إخطار العلاقة",
-  "search.filters.filter.notifyRelation.label": "بحث إخطار العلاقة",
-  "search.filters.filter.notifyRelation.placeholder": "إخطار العلاقة",
-  "search.filters.filter.notifyReview.head": "إخطار المراجعة",
-  "search.filters.filter.notifyReview.label": "بحث إخطار المراجعة",
-  "search.filters.filter.notifyReview.placeholder": "إخطار المراجعة",
-  "search.filters.coar_notify_type.coar-notify:ReviewAction": "إجراء المراجعة",
-  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "إجراء المراجعة",
-  "notify-detail-modal.coar-notify:ReviewAction": "إجراء المراجعة",
-  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "إجراء الإقرار",
-  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "إجراء الإقرار",
-  "notify-detail-modal.coar-notify:EndorsementAction": "إجراء الإقرار",
-  "search.filters.coar_notify_type.coar-notify:IngestAction": "استيعاب العمل",
-  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "استيعاب العمل",
-  "notify-detail-modal.coar-notify:IngestAction": "استيعاب العمل",
-  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "عمل العلاقة",
-  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "عمل العلاقة",
-  "notify-detail-modal.coar-notify:RelationshipAction": "عمل العلاقة",
-  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "في قائمة الانتظار",
-  "notify-detail-modal.QUEUE_STATUS_QUEUED": "في قائمة الانتظار",
-  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "في قائمة الانتظار لإعادة المحاولة",
-  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "في قائمة الانتظار لإعادة المحاولة",
-  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "يعالج",
-  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "يعالج",
-  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "تمت معالجتها",
-  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "تمت معالجتها",
-  "search.filters.queue_status.QUEUE_STATUS_FAILED": "فشل",
-  "notify-detail-modal.QUEUE_STATUS_FAILED": "فشل",
-  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "غير موثوق به",
-  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP غير موثوق به",
-  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "غير موثوق به",
-  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP غير موثوق به",
-  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "عمل غير محدد",
-  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "عمل غير محدد",
-  "sorting.queue_last_start_time.DESC": "آخر قائمة انتظار بدأت تنازليًا",
-  "sorting.queue_last_start_time.ASC": "آخر قائمة انتظار بدأت تصاعديًا",
-  "sorting.queue_attempts.DESC": "حاولت قائمة الانتظار التنازلي",
-  "sorting.queue_attempts.ASC": "حاولت قائمة الانتظار التصاعدي",
-  "NOTIFY.incoming.involvedItems.search.results.head": "العناصر المشاركة في LDN الوارد",
-  "NOTIFY.outgoing.involvedItems.search.results.head": "العناصر المشاركة في LDN الصادرة",
-  "type.notify-detail-modal": "يكتب",
-  "id.notify-detail-modal": "بطاقة تعريف",
-  "coarNotifyType.notify-detail-modal": "نوع الإخطار COAR",
-  "activityStreamType.notify-detail-modal": "نوع تيار النشاط",
-  "inReplyTo.notify-detail-modal": "ردا على",
-  "object.notify-detail-modal": "عنصر المستودع",
-  "context.notify-detail-modal": "عنصر المستودع",
-  "queueAttempts.notify-detail-modal": "محاولات قائمة الانتظار",
-  "queueLastStartTime.notify-detail-modal": "بدأت قائمة الانتظار آخر مرة",
-  "origin.notify-detail-modal": "خدمة LDN",
-  "target.notify-detail-modal": "خدمة LDN",
-  "queueStatusLabel.notify-detail-modal": "حالة قائمة الانتظار",
-  "queueTimeout.notify-detail-modal": "مهلة قائمة الانتظار",
-  "notify-message-modal.title": "تفاصيل الرسالة",
-  "notify-message-modal.show-message": "اظهر الرسالة",
-  "notify-message-result.timestamp": "الطابع الزمني",
-  "notify-message-result.repositoryItem": "عنصر المستودع",
-  "notify-message-result.ldnService": "خدمة LDN",
-  "notify-message-result.type": "يكتب",
-  "notify-message-result.status": "حالة",
-  "notify-message-result.action": "فعل",
-  "notify-message-result.detail": "التفاصيل",
-  "notify-message-result.reprocess": "إعادة المعالجة",
-  "notify-queue-status.processed": "تمت معالجتها",
-  "notify-queue-status.failed": "فشل",
-  "notify-queue-status.queue_retry": "في قائمة الانتظار لإعادة المحاولة",
-  "notify-queue-status.unmapped_action": "عمل غير معين",
-  "notify-queue-status.processing": "يعالج",
-  "notify-queue-status.queued": "في قائمة الانتظار",
-  "notify-queue-status.untrusted": "غير موثوق به",
-  "ldnService.notify-detail-modal": "خدمة LDN",
-  "relatedItem.notify-detail-modal": "البند ذو الصلة",
-  "search.filters.filter.notifyEndorsement.head": "إخطار المصادقة",
-  "search.filters.filter.notifyEndorsement.placeholder": "إخطار المصادقة",
-  "search.filters.filter.notifyEndorsement.label": "بحث الإخطار بالمصادقة",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "filter.search.operator.placeholder": "Operator",
+  // TODO New key - Add a translation
+  "filter.search.operator.placeholder": "Operator",
+
+  // "search.filters.filter.entityType.text": "Item Type",
+  // TODO New key - Add a translation
+  "search.filters.filter.entityType.text": "Item Type",
+
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.filter.title.text": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.text": "Title",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
+
+  // "search.filters.filter.author.text": "Author",
+  // TODO New key - Add a translation
+  "search.filters.filter.author.text": "Author",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "توجد أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "search.filters.filter.subject.text": "Subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.subject.text": "Subject",
+
+  // "search.advanced.filters.head": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.advanced.filters.head": "Advanced Search",
+
+  // "filter.search.text.placeholder": "Search text",
+  // TODO New key - Add a translation
+  "filter.search.text.placeholder": "Search text",
+
+  // "advancesearch.form.submit": "Add",
+  // TODO New key - Add a translation
+  "advancesearch.form.submit": "Add",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+
 }

From e06b67fd73358ac52e2e71fa96d708520de33f3e Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 26 Jun 2024 08:29:32 -0300
Subject: [PATCH 0271/1286] Resolution of issue #1190 - Improving the
 accessibility of the status page using the item-operation component

---
 .../item-operation/item-operation.component.html         | 4 ++--
 .../item-operation/item-operation.component.scss         | 9 +++++++++
 .../item-operation/item-operation.component.ts           | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-operation/item-operation.component.scss

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 85c6a2cca1..e282017315 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
@@ -1,9 +1,9 @@
-<div class="col-3 float-left d-flex h-100 action-label">
+<div class="col-12 col-md-3 column-height float-left d-flex h-100 action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
-<div class="col-9 float-left action-button">
+<div class="col-12 col-md-9 float-left action-button">
   <span *ngIf="operation.authorized">
     <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}}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
new file mode 100644
index 0000000000..ff42005e34
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
@@ -0,0 +1,9 @@
+.column-height {
+  height: 100%;
+}
+
+@media screen and (max-width: map-get($grid-breakpoints, sm)) {
+  .column-height {
+    height: auto;
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 9cf4b30e6c..f6773bc043 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -11,6 +11,7 @@ import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
+  styleUrls: ['item-operation.component.scss'],
   templateUrl: './item-operation.component.html',
   imports: [
     TranslateModule,

From 5f6b6ef9849e27eaf87e5b8b0f94ccde271d8043 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 26 Jun 2024 14:46:13 +0200
Subject: [PATCH 0272/1286] added missing German translations (500 error)

---
 src/assets/i18n/de.json5 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7f2485ab29..960e1b14d5 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "unautorisiert",
 
-
-
   // "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": "Sie sind nicht berechtigt, auf diese Seite zuzugreifen. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -20,8 +18,6 @@
   // "403.forbidden": "forbidden",
   "403.forbidden": "verboten",
 
-
-
   // "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": "Die Seite konnte nicht gefunden werden. Eventuell wurde sie verschoben oder gelöscht. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -31,6 +27,16 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Seite nicht gefunden",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "Dienst nicht verfügbar",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Der Dienst steht momentan nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Zur Startseite",
+
+
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Personen suchen",
 

From e95d5bd73e9f8169bded22043adec8efe8d05aaf Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 26 Jun 2024 14:05:49 -0500
Subject: [PATCH 0273/1286] Update version tag for development of next major
 release

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

diff --git a/package.json b/package.json
index ada0525149..a8d505eff9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "8.1.0-next",
+  "version": "9.0.0-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From a0e23bd5d9b926e2685ecb916e365921db536184 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 26 Jun 2024 15:22:21 -0500
Subject: [PATCH 0274/1286] Update homepage to say DSpace 9

---
 src/app/home-page/home-news/home-news.component.html            | 2 +-
 .../dspace/app/home-page/home-news/home-news.component.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index c83d2103c8..9bb2e9857a 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
-        <h1 class="display-3">DSpace 8</h1>
+        <h1 class="display-3">DSpace 9</h1>
         <p class="lead">DSpace is the world leading open source repository platform that enables organisations to:</p>
       </div>
     </div>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index ca686a9933..ca053fc662 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -3,7 +3,7 @@
     <div class="jumbotron jumbotron-fluid">
       <div class="d-flex flex-wrap">
         <div>
-          <h1 class="display-3">DSpace 8</h1>
+          <h1 class="display-3">DSpace 9</h1>
           <p class="lead">DSpace is the world leading open source repository platform that enables
             organisations to:</p>
         </div>

From f7a2e76cadedf2cd2908ae773093aba9e02c9ab1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 27 Jun 2024 11:12:21 -0500
Subject: [PATCH 0275/1286] Update CONTRIBUTING.md

Minor updates and linking to developer meetings
---
 CONTRIBUTING.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4e732302f4..d8ebab1a45 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ DSpace is a community built and supported project. We do not have a centralized
 ## Contribute new code via a Pull Request
 
 We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
-Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC8x/Release+Notes).
 
 Code Contribution Checklist
 - [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
@@ -26,7 +26,7 @@ Additional details on the code contribution process can be found in our [Code Co
 
 ## Contribute documentation
 
-DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC
 
 If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
 Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
@@ -34,7 +34,7 @@ Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyra
 ## Help others on mailing lists or Slack
 
 DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
-Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via Lyrasis).
 
 ## Join a working or interest group
 
@@ -42,5 +42,5 @@ Most of the work in building/improving DSpace comes via [Working Groups](https:/
 
 All working/interest groups are open to anyone to join and participate.  A few key groups to be aware of include:
 
-* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
-* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
\ No newline at end of file
+* [DSpace Developer Team](https://wiki.lyrasis.org/display/DSPACE/Developer+Meetings) - This is the primary, volunteer development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs. This is also were discussions of the next release or major issues occur. Anyone is welcome to attend.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers. Anyone is welcome to attend.

From 9a5cbba8887d65f2288cda8f5f73f0ea19a36ab3 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 27 Jun 2024 14:36:15 -0500
Subject: [PATCH 0276/1286] Minor updates to contribution checklist / PR
 template. Add requirement that PRs need details on how to test them. Add
 requirement for accessibility & i18n.

---
 .github/pull_request_template.md | 20 ++++++++++++--------
 CONTRIBUTING.md                  |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e50105b879..b381944c98 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 ## References
 _Add references/links to any related issues or PRs. These may include:_
-* Fixes #`issue-number` (if this fixes an issue ticket)
-* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
+* Fixes #issue-number (if this fixes an issue ticket)
+* Requires DSpace/DSpace#pr-number (if a REST API PR is required to test this)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -16,13 +16,17 @@ List of changes in this PR:
 **Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
 
 ## Checklist
-_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome).
+However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
-- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
-- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
-- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
-- [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
-- [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
+- [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `yarn lint`
+- [ ] My PR **doesn't introduce circular dependencies** (verified via `yarn check-circ-deps`)
+- [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
+- [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)** if it makes changes to the user interface.
+- [ ] My PR **uses i18n (internationalization) keys** instead of hardcoded English text, to allow for translations.
+- [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
 - [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
 - [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8ebab1a45..6525750e4e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,6 +18,9 @@ Code Contribution Checklist
 - [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
 - [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
 - [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)
+- [ ] PRs **must** use i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
+- [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
 - [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] Basic technical documentation _should_ be provided for any new features or configuration, either in the PR itself or in the DSpace Wiki documentation.
 - [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).

From 9277908f7711df3ec2a412a08ab56575c494b7a3 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 27 Jun 2024 14:37:04 -0500
Subject: [PATCH 0277/1286] Minor updates to issue templates. Instead of bold
 text, use headers to make sections more readable.

---
 .github/ISSUE_TEMPLATE/bug_report.md      |  8 ++++----
 .github/ISSUE_TEMPLATE/feature_request.md | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8e4ed0811d..0cce2848a7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,16 +7,16 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
 A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public.
 
-**To Reproduce**
+## To Reproduce
 Steps to reproduce the behavior:
 1. Do this
 2. Then this...
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Related work**
+## Related work
 Link to any related tickets or PRs here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 34cc2c9e4f..9eaa4d9f3f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem or use case is. For example, I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives or workarounds you've considered**
+## Describe alternatives or workarounds you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional information
+Add any other information, related tickets or screenshots about the feature request here.

From 5b2966cf488f74bc2646c737fa7006afd38f979c Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 28 Jun 2024 07:58:15 +0300
Subject: [PATCH 0278/1286] src/app/core: forward client user-agent

Forward the client's user-agent instead of sending Node's.
---
 .../forward-client-ip/forward-client-ip.interceptor.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 2e2e59fa6b..edca5cc509 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -18,6 +18,14 @@ export class ForwardClientIpInterceptor implements HttpInterceptor {
    */
   intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
-    return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
+    const headers = { 'X-Forwarded-For': clientIp };
+
+    // if the request has a user-agent retain it
+    const userAgent = this.req.get('user-agent');
+    if (userAgent) {
+      headers['User-Agent'] = userAgent;
+    }
+
+    return next.handle(httpRequest.clone({ setHeaders: headers }));
   }
 }

From a3b6aef66a81e93f537bf35647be97d14f5b1472 Mon Sep 17 00:00:00 2001
From: Elvi Nemiz <eulereadgbe@users.noreply.github.com>
Date: Sat, 29 Jun 2024 08:14:10 +0800
Subject: [PATCH 0279/1286] Fix to Mobile navbar hamburger menu for base
 (custom) theme

https://github.com/DSpace/dspace-angular/pull/2444 only fixes the DSpace theme, not the base (and custom) theme.
---
 src/app/navbar/navbar.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index b74408f0f5..bbf5feec15 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -10,7 +10,7 @@
   /** Mobile menu styling **/
   @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-      width: 100%;
+      width: 100vw;
       background-color: var(--bs-white);
       position: absolute;
       overflow: hidden;

From 4e783e76d167e642c9205b440232211bfd4bc290 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 1 Jul 2024 15:00:07 -0300
Subject: [PATCH 0280/1286] Resolution of issue #1193 - Addition of the
 aria-label attribute to the add, save, discard and undo buttons on the
 metadata editing page

---
 .../dso-edit-metadata/dso-edit-metadata.component.html     | 7 +++++++
 1 file changed, 7 insertions(+)

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 d6c72abdb9..f8b193f4a0 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,21 +1,25 @@
 <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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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"
+            [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
@@ -74,16 +78,19 @@
   <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)"
+              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
       <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
         <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
               [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">

From c06cd98a2ed4426c258a76edc3d090c2ae8ac677 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 28 Jun 2024 07:58:15 +0300
Subject: [PATCH 0281/1286] src/app/core: forward client user-agent

Forward the client's user-agent instead of sending Node's.

(cherry picked from commit 5b2966cf488f74bc2646c737fa7006afd38f979c)
---
 .../forward-client-ip/forward-client-ip.interceptor.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 037f690057..7fe4263d46 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -27,6 +27,14 @@ export class ForwardClientIpInterceptor implements HttpInterceptor {
    */
   intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
-    return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
+    const headers = { 'X-Forwarded-For': clientIp };
+
+    // if the request has a user-agent retain it
+    const userAgent = this.req.get('user-agent');
+    if (userAgent) {
+      headers['User-Agent'] = userAgent;
+    }
+
+    return next.handle(httpRequest.clone({ setHeaders: headers }));
   }
 }

From e5e3d59b3e4161ad38e7031738b802285a1555c2 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 28 Jun 2024 07:58:15 +0300
Subject: [PATCH 0282/1286] src/app/core: forward client user-agent

Forward the client's user-agent instead of sending Node's.

(cherry picked from commit 5b2966cf488f74bc2646c737fa7006afd38f979c)
---
 .../forward-client-ip/forward-client-ip.interceptor.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 037f690057..7fe4263d46 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -27,6 +27,14 @@ export class ForwardClientIpInterceptor implements HttpInterceptor {
    */
   intercept(httpRequest: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     const clientIp = this.req.get('x-forwarded-for') || this.req.connection.remoteAddress;
-    return next.handle(httpRequest.clone({ setHeaders: { 'X-Forwarded-For': clientIp } }));
+    const headers = { 'X-Forwarded-For': clientIp };
+
+    // if the request has a user-agent retain it
+    const userAgent = this.req.get('user-agent');
+    if (userAgent) {
+      headers['User-Agent'] = userAgent;
+    }
+
+    return next.handle(httpRequest.clone({ setHeaders: headers }));
   }
 }

From 5e3d0fbdef64531d135177962a97bff04368714e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 3 Jul 2024 11:22:27 -0400
Subject: [PATCH 0283/1286] Update Docker Angular README.md

Change the docker-compose syntax to V2 syntax docker compose
---
 docker/README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 64d8ddc2c5..3dc5fd5055 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -59,19 +59,19 @@ A default/demo version of this image is built *automatically*.
 
 ## To refresh / pull DSpace images from Dockerhub
 ```
-docker-compose -f docker/docker-compose.yml pull
+docker compose -f docker/docker-compose.yml pull
 ```
 
 ## To build DSpace images using code in your branch
 ```
-docker-compose -f docker/docker-compose.yml build
+docker compose -f docker/docker-compose.yml build
 ```
 
 ## To start DSpace (REST and Angular) from your branch
 
 This command provides a quick way to start both the frontend & backend from this single codebase
 ```
-docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
 ```
 
 Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
@@ -86,14 +86,14 @@ _The system will be started in 2 steps. Each step shares the same docker network
 
 From 'DSpace/DSpace' clone (build first as needed):
 ```
-docker-compose -p d8 up -d
+docker compose -p d8 up -d
 ```
 
 NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
 
 From 'DSpace/dspace-angular' clone (build first as needed)
 ```
-docker-compose -p d8 -f docker/docker-compose.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml up -d
 ```
 
 At this point, you should be able to access the UI from http://localhost:4000,
@@ -105,21 +105,21 @@ This allows you to run the Angular UI in *production* mode, pointing it at the d
 (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
 
 ```
-docker-compose -f docker/docker-compose-dist.yml pull
-docker-compose -f docker/docker-compose-dist.yml build
-docker-compose -p d8 -f docker/docker-compose-dist.yml up -d
+docker compose -f docker/docker-compose-dist.yml pull
+docker compose -f docker/docker-compose-dist.yml build
+docker compose -p d8 -f docker/docker-compose-dist.yml up -d
 ```
 
 ## Ingest test data from AIPDIR
 
 Create an administrator
 ```
-docker-compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+docker compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
 ```
 
 Load content from AIP files
 ```
-docker-compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
+docker compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
 ```
 
 ## Alternative Ingest - Use Entities dataset
@@ -127,12 +127,12 @@ _Delete your docker volumes or use a unique project (-p) name_
 
 Start DSpace with Database Content from a database dump
 ```
-docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
 ```
 
 Load assetstore content and trigger a re-index of the repository
 ```
-docker-compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+docker compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
 ```
 
 ## End to end testing of the REST API (runs in GitHub Actions CI).
@@ -140,5 +140,5 @@ _In this instance, only the REST api runs in Docker using the Entities dataset.
 
 This command is only really useful for testing our Continuous Integration process.
 ```
-docker-compose -p d8ci -f docker/docker-compose-ci.yml up -d
+docker compose -p d8ci -f docker/docker-compose-ci.yml up -d
 ```

From da8a73ba0bd34dd96a23c48bc6c8301b377f7844 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 3 Jul 2024 11:26:22 -0400
Subject: [PATCH 0284/1286] Update docker command syntax
 docker-compose-rest.yml

---
 docker/docker-compose-rest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index c04948e4b2..09dfcf2a5f 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -101,7 +101,7 @@ services:
     # * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
     # * Second, copy configsets to this core:
     #   Updates to Solr configs require the container to be rebuilt/restarted:
-    #   `docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
+    #   `docker compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
     entrypoint:
     - /bin/bash
     - '-c'

From 1baa5cec26a034e332a767d05d322d8ed0566b6c Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 3 Jul 2024 11:22:27 -0400
Subject: [PATCH 0285/1286] Update Docker Angular README.md

Change the docker-compose syntax to V2 syntax docker compose

(cherry picked from commit 5e3d0fbdef64531d135177962a97bff04368714e)
---
 docker/README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 64d8ddc2c5..3dc5fd5055 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -59,19 +59,19 @@ A default/demo version of this image is built *automatically*.
 
 ## To refresh / pull DSpace images from Dockerhub
 ```
-docker-compose -f docker/docker-compose.yml pull
+docker compose -f docker/docker-compose.yml pull
 ```
 
 ## To build DSpace images using code in your branch
 ```
-docker-compose -f docker/docker-compose.yml build
+docker compose -f docker/docker-compose.yml build
 ```
 
 ## To start DSpace (REST and Angular) from your branch
 
 This command provides a quick way to start both the frontend & backend from this single codebase
 ```
-docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
 ```
 
 Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
@@ -86,14 +86,14 @@ _The system will be started in 2 steps. Each step shares the same docker network
 
 From 'DSpace/DSpace' clone (build first as needed):
 ```
-docker-compose -p d8 up -d
+docker compose -p d8 up -d
 ```
 
 NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
 
 From 'DSpace/dspace-angular' clone (build first as needed)
 ```
-docker-compose -p d8 -f docker/docker-compose.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml up -d
 ```
 
 At this point, you should be able to access the UI from http://localhost:4000,
@@ -105,21 +105,21 @@ This allows you to run the Angular UI in *production* mode, pointing it at the d
 (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
 
 ```
-docker-compose -f docker/docker-compose-dist.yml pull
-docker-compose -f docker/docker-compose-dist.yml build
-docker-compose -p d8 -f docker/docker-compose-dist.yml up -d
+docker compose -f docker/docker-compose-dist.yml pull
+docker compose -f docker/docker-compose-dist.yml build
+docker compose -p d8 -f docker/docker-compose-dist.yml up -d
 ```
 
 ## Ingest test data from AIPDIR
 
 Create an administrator
 ```
-docker-compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+docker compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
 ```
 
 Load content from AIP files
 ```
-docker-compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
+docker compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
 ```
 
 ## Alternative Ingest - Use Entities dataset
@@ -127,12 +127,12 @@ _Delete your docker volumes or use a unique project (-p) name_
 
 Start DSpace with Database Content from a database dump
 ```
-docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
+docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
 ```
 
 Load assetstore content and trigger a re-index of the repository
 ```
-docker-compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
+docker compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
 ```
 
 ## End to end testing of the REST API (runs in GitHub Actions CI).
@@ -140,5 +140,5 @@ _In this instance, only the REST api runs in Docker using the Entities dataset.
 
 This command is only really useful for testing our Continuous Integration process.
 ```
-docker-compose -p d8ci -f docker/docker-compose-ci.yml up -d
+docker compose -p d8ci -f docker/docker-compose-ci.yml up -d
 ```

From ca6bde3048a6a0993d09333544ca45fb607a8ead Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 3 Jul 2024 11:26:22 -0400
Subject: [PATCH 0286/1286] Update docker command syntax
 docker-compose-rest.yml

(cherry picked from commit da8a73ba0bd34dd96a23c48bc6c8301b377f7844)
---
 docker/docker-compose-rest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index c04948e4b2..09dfcf2a5f 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -101,7 +101,7 @@ services:
     # * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
     # * Second, copy configsets to this core:
     #   Updates to Solr configs require the container to be rebuilt/restarted:
-    #   `docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
+    #   `docker compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
     entrypoint:
     - /bin/bash
     - '-c'

From 7e600bef57b85f0ace327f19c543ee877c4b4dcd Mon Sep 17 00:00:00 2001
From: Bridget Almas <balmas@gmail.com>
Date: Fri, 5 Jul 2024 13:00:22 -0400
Subject: [PATCH 0287/1286] fixes error in image command for
 dspace-postgres-pgcrypto

---
 docker/db.entities.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index ae1ac77346..b3cf5bd86f 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto::${DSPACE_VER:-latest}-loadsql
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
@@ -34,4 +34,4 @@ services:
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored
-        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
\ No newline at end of file
+        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace

From ecacd14410b9ba2441c3b05caf26487d4a5c282b Mon Sep 17 00:00:00 2001
From: Emmanuel Pastor <pastor1212@gmail.com>
Date: Sun, 7 Jul 2024 16:04:14 +0200
Subject: [PATCH 0288/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8dc8c95a39..35179a459e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6389,7 +6389,7 @@
   "submission.workspace.generic.view": "Voir",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Sélectionner cette option pour voir les métadonnées de l'item.",
+  "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",

From eec1071f0652a3ad1056e6665da388b761361218 Mon Sep 17 00:00:00 2001
From: Emmanuel Pastor <pastor1212@gmail.com>
Date: Sun, 7 Jul 2024 16:05:44 +0200
Subject: [PATCH 0289/1286] Rephrase one instruction sentence to make it
 clearer

---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b381944c98..af2705ec61 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -16,7 +16,7 @@ List of changes in this PR:
 **Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
 
 ## Checklist
-_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome).
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You do not need to complete this checklist prior creating your PR (draft PRs are always welcome).
 However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
 - [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.

From e26ab86dd33981ea4a9969b6043449619948a2b8 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:42:49 +0200
Subject: [PATCH 0290/1286] minor change: added missing periods in German
 translations

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7f2485ab29..efe0de8380 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5560,10 +5560,10 @@
   "submission.sections.general.deposit_error_notice": "Beim Einreichen des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht",
+  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal",
+  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",

From 2af168bd5423e6917adc18990aeda8ee9f5da962 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:56:06 +0200
Subject: [PATCH 0291/1286] add missing German translations

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7f2485ab29..ef5c93f042 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5226,6 +5226,12 @@
   // "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": "Zeitschriftenband importieren",
 
+  // "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": "Item importieren",
+
+  // "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": "Metadaten der Publikation importieren",
+
   // "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": "Importiere Autor:innen-Metadaten",
 

From c5448fe252d819c8e74d98194f53d2c76dc7f4dc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 9 Jul 2024 14:28:46 -0500
Subject: [PATCH 0292/1286] Update version tag for release

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

diff --git a/package.json b/package.json
index e82386dff9..664bef37ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.2-next",
+  "version": "7.6.2",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 1d8d3b3c273fb7f39e2c26ad0bd620b865ce84c8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 9 Jul 2024 14:34:17 -0500
Subject: [PATCH 0293/1286] Update version tag for development of next release

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

diff --git a/package.json b/package.json
index 664bef37ea..ae3cf5ac51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.2",
+  "version": "7.6.3-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From bb770ba65b7941f936d8e657771a88cb11994aeb Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Wed, 10 Jul 2024 11:34:18 +0200
Subject: [PATCH 0294/1286] [CST-14903] Orcid Synchronization improvements

feat:
 - Introduces reactive states derived from item inside orcid-sync page
 - Removes unnecessary navigation
ref:
  - Introduces catchError operator and handles failures with error messages
---
 .../orcid-auth/orcid-auth.component.ts        |  15 +-
 .../orcid-page/orcid-page.component.ts        |  18 +-
 .../orcid-sync-settings.component.spec.ts     |  10 +-
 .../orcid-sync-settings.component.ts          | 165 ++++++++++++------
 4 files changed, 144 insertions(+), 64 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index ea970e7d31..73b4a7b4e1 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,8 +1,8 @@
 import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
 import { Item } from '../../../core/shared/item.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -10,6 +10,8 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils';
+import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
   selector: 'ds-orcid-auth',
@@ -170,14 +172,15 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   unlinkOrcid(): void {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
+      catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status)))
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
-      if (remoteData.isSuccess) {
+      if (remoteData.hasFailed) {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
+      } else {
         this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success'));
         this.unlink.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
       }
     });
   }
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index f3dbb569d9..1d62c9691c 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
 
 import { BehaviorSubject, combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { filter, map, take } from 'rxjs/operators';
 
 import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
@@ -147,7 +147,19 @@ export class OrcidPageComponent implements OnInit {
    */
   private clearRouteParams(): void {
     // update route removing the code from query params
-    const redirectUrl = this.router.url.split('?')[0];
-    this.router.navigate([redirectUrl]);
+    this.route.queryParamMap
+      .pipe(
+        filter((paramMap: ParamMap) => isNotEmpty(paramMap.keys)),
+        map(_ => Object.assign({})),
+        take(1),
+      ).subscribe(queryParams =>
+        this.router.navigate(
+          [],
+          {
+            relativeTo: this.route,
+            queryParams
+          }
+        )
+    );
   }
 }
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index f2fa9d2440..38a6df909e 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
 import { By } from '@angular/platform-browser';
 
@@ -24,8 +24,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
   let fixture: ComponentFixture<OrcidSyncSettingsComponent>;
   let scheduler: TestScheduler;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let notificationsService;
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let formGroup: UntypedFormGroup;
 
   const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -161,6 +161,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     scheduler = getTestScheduler();
     fixture = TestBed.createComponent(OrcidSyncSettingsComponent);
     comp = fixture.componentInstance;
+    researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
     comp.item = mockItemLinkedToOrcid;
     fixture.detectChanges();
   }));
@@ -197,7 +198,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should call updateByOrcidOperations properly', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       const expectedOps: Operation[] = [
         {
@@ -226,7 +226,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on success', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
@@ -238,6 +237,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
 
     it('should show notification on error', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$());
+      comp.item = mockItemLinkedToOrcid;
+      fixture.detectChanges();
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
@@ -247,7 +248,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on error', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$());
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 0bcbc295ac..422041d340 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,80 +1,97 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 
 import { TranslateService } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
-import { of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { catchError, filter, map, switchMap, take, takeUntil } from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { hasValue } from '../../../shared/empty.util';
+import { HttpErrorResponse } from '@angular/common/http';
+import { createFailedRemoteDataObject } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
   templateUrl: './orcid-sync-settings.component.html',
   styleUrls: ['./orcid-sync-settings.component.scss']
 })
-export class OrcidSyncSettingsComponent implements OnInit {
-
-  /**
-   * The item for which showing the orcid settings
-   */
-  @Input() item: Item;
+export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
 
   /**
    * The prefix used for i18n keys
    */
   messagePrefix = 'person.page.orcid';
-
   /**
    * The current synchronization mode
    */
   currentSyncMode: string;
-
   /**
    * The current synchronization mode for publications
    */
   currentSyncPublications: string;
-
   /**
    * The current synchronization mode for funding
    */
   currentSyncFunding: string;
-
   /**
    * The synchronization options
    */
   syncModes: { value: string, label: string }[];
-
   /**
    * The synchronization options for publications
    */
   syncPublicationOptions: { value: string, label: string }[];
-
   /**
    * The synchronization options for funding
    */
   syncFundingOptions: { value: string, label: string }[];
-
   /**
    * The profile synchronization options
    */
   syncProfileOptions: { value: string, label: string, checked: boolean }[];
-
   /**
    * An event emitted when settings are updated
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
+  /**
+   * Emitter that triggers onDestroy lifecycle
+   * @private
+   */
+  readonly #destroy$ = new EventEmitter<void>();
+  /**
+   * {@link BehaviorSubject} that reflects {@link item} input changes
+   * @private
+   */
+  readonly #item$ = new BehaviorSubject<Item>(null);
+  /**
+   * {@link Observable} that contains {@link ResearcherProfile} linked to the {@link #item$}
+   * @private
+   */
+  #researcherProfile$: Observable<ResearcherProfile>;
 
   constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }
 
+  /**
+   * The item for which showing the orcid settings
+   */
+  @Input()
+  set item(item: Item) {
+    this.#item$.next(item);
+  }
+
+  ngOnDestroy(): void {
+    this.#destroy$.next();
+  }
+
   /**
    * Init orcid settings form
    */
@@ -106,20 +123,21 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
-    const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile');
+    this.updateSyncProfileOptions(this.#item$.asObservable());
+    this.updateSyncPreferences(this.#item$.asObservable());
 
-    this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS']
-      .map((value) => {
-        return {
-          label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
-          value: value,
-          checked: syncProfilePreferences.includes(value)
-        };
-      });
-
-    this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
-    this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
-    this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
+    this.#researcherProfile$ =
+      this.#item$.pipe(
+        switchMap(item =>
+          this.researcherProfileService.findByRelatedItem(item)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject<ResearcherProfile>(err.message, err.status))),
+              getRemoteDataPayload(),
+            )
+        ),
+        takeUntil(this.#destroy$)
+      );
   }
 
   /**
@@ -144,37 +162,84 @@ export class OrcidSyncSettingsComponent implements OnInit {
       return;
     }
 
-    this.researcherProfileService.findByRelatedItem(this.item).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD: RemoteData<ResearcherProfile>) => {
-        if (profileRD.hasSucceeded) {
-          return this.researcherProfileService.patch(profileRD.payload, operations).pipe(
-            getFirstCompletedRemoteData(),
-          );
+    this.#researcherProfile$
+      .pipe(
+        switchMap(researcherProfile => this.researcherProfileService.patch(researcherProfile, operations)),
+        getFirstCompletedRemoteData(),
+        catchError((err: HttpErrorResponse) => of(createFailedRemoteDataObject(err.message, err.status))),
+        take(1)
+      )
+      .subscribe((remoteData: RemoteData<ResearcherProfile>) => {
+        if (remoteData.hasFailed) {
+          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
         } else {
-          return of(profileRD);
+          this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
+          this.settingsUpdated.emit();
         }
-      }),
-    ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
-      if (remoteData.isSuccess) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
-        this.settingsUpdated.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
-      }
-    });
+      });
+  }
+
+  /**
+   *
+   * Handles subscriptions to populate sync preferences
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncPreferences(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncMode = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncPublications = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$)
+    ).subscribe(val => this.currentSyncFunding = val);
+  }
+
+  /**
+   * Handles subscription to populate the {@link syncProfileOptions} field
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncProfileOptions(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => i.allMetadataValues('dspace.orcid.sync-profile')),
+      map(metadata =>
+        ['BIOGRAPHICAL', 'IDENTIFIERS']
+          .map((value) => {
+            return {
+              label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
+              value: value,
+              checked: metadata.includes(value)
+            };
+          })
+      ),
+      takeUntil(this.#destroy$)
+    )
+      .subscribe(value => this.syncProfileOptions = value);
   }
 
   /**
    * Retrieve setting saved in the item's metadata
    *
+   * @param item The item from which retrieve settings
    * @param metadataField The metadata name that contains setting
    * @param allowedValues The allowed values
    * @param defaultValue  The default value
    * @private
    */
-  private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string {
-    const currentPreference = this.item.firstMetadataValue(metadataField);
+  private getCurrentPreference(item: Item, metadataField: string, allowedValues: string[], defaultValue: string): string {
+    const currentPreference = item.firstMetadataValue(metadataField);
     return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue;
   }
 

From bdea9a6d716eefd6858787fd1bab69f5f8c2ad2a Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 1 Jul 2024 15:00:07 -0300
Subject: [PATCH 0295/1286] Resolution of issue #1193 - Addition of the
 aria-label attribute to the add, save, discard and undo buttons on the
 metadata editing page

(cherry picked from commit 4e783e76d167e642c9205b440232211bfd4bc290)
---
 .../dso-edit-metadata/dso-edit-metadata.component.html     | 7 +++++++
 1 file changed, 7 insertions(+)

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 8fb676a724..09868c6865 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,21 +1,25 @@
 <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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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"
+            [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
@@ -73,16 +77,19 @@
   <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)"
+              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
       <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
         <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
               [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">

From b0431f3abe86c2fa708d3cc86c8a48a1ccaf36a6 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 1 Jul 2024 15:00:07 -0300
Subject: [PATCH 0296/1286] Resolution of issue #1193 - Addition of the
 aria-label attribute to the add, save, discard and undo buttons on the
 metadata editing page

(cherry picked from commit 4e783e76d167e642c9205b440232211bfd4bc290)
---
 .../dso-edit-metadata/dso-edit-metadata.component.html     | 7 +++++++
 1 file changed, 7 insertions(+)

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 d6c72abdb9..f8b193f4a0 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,21 +1,25 @@
 <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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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)"
+            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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"
+            [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [disabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
@@ -74,16 +78,19 @@
   <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)"
+              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
       <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
         <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
+              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
               [disabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">

From 1bd8db517fa67803a2e93dbab7283fbb5b8829ff Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 25 Jun 2024 18:28:56 +0200
Subject: [PATCH 0297/1286] 116132: Fixed cookie issue

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

diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index da3125b7eb..c2fb7738a0 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -189,7 +189,6 @@ export const klaroConfiguration: any = {
       purposes: ['registration-password-recovery'],
       required: false,
       cookies: [
-        [/^klaro-.+$/],
         CAPTCHA_COOKIE,
       ],
       onAccept: `window.refreshCaptchaScript?.call()`,

From 4bb6012cc1bdf70e7640b71771f8ad3932488ad5 Mon Sep 17 00:00:00 2001
From: Bridget Almas <balmas@gmail.com>
Date: Fri, 5 Jul 2024 13:00:22 -0400
Subject: [PATCH 0298/1286] fixes error in image command for
 dspace-postgres-pgcrypto

(cherry picked from commit 7e600bef57b85f0ace327f19c543ee877c4b4dcd)
---
 docker/db.entities.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index ae1ac77346..b3cf5bd86f 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto::${DSPACE_VER:-latest}-loadsql
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
@@ -34,4 +34,4 @@ services:
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored
-        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
\ No newline at end of file
+        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace

From 4ff15ec9bbdc0e0fae6ccb61f63ede86a68a805b Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Thu, 11 Jul 2024 13:18:38 +0200
Subject: [PATCH 0299/1286] [CST-14903] Orcid Synchronization improvements

feat:
- Introduces reactive states derived from item inside orcid-sync page
- Removes unnecessary navigation
ref:
- Introduces catchError operator and handles failures with error messages
---
 .../orcid-auth/orcid-auth.component.ts        |   9 +-
 .../orcid-page/orcid-page.component.ts        |  17 +-
 .../orcid-sync-settings.component.spec.ts     |   6 +-
 .../orcid-sync-settings.component.ts          | 169 +++++++++++++-----
 src/app/shared/remote-data.utils.ts           |  25 +++
 5 files changed, 177 insertions(+), 49 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 5825ecc4e4..6a3b8af937 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -19,6 +19,7 @@ import {
 } from '@ngx-translate/core';
 import {
   BehaviorSubject,
+  catchError,
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -34,6 +35,7 @@ import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-auth',
@@ -203,13 +205,14 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
       getFirstCompletedRemoteData(),
+      catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
-      if (remoteData.isSuccess) {
+      if (remoteData.hasFailed) {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
+      } else {
         this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success'));
         this.unlink.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
       }
     });
   }
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index a3c31e791d..7e634fdeca 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -20,6 +20,7 @@ import {
   combineLatest,
 } from 'rxjs';
 import {
+  filter,
   map,
   take,
 } from 'rxjs/operators';
@@ -187,8 +188,20 @@ export class OrcidPageComponent implements OnInit {
    */
   private clearRouteParams(): void {
     // update route removing the code from query params
-    const redirectUrl = this.router.url.split('?')[0];
-    this.router.navigate([redirectUrl]);
+    this.route.queryParamMap
+      .pipe(
+        filter((paramMap: ParamMap) => isNotEmpty(paramMap.keys)),
+        map(_ => Object.assign({})),
+        take(1),
+      ).subscribe(queryParams =>
+        this.router.navigate(
+          [],
+          {
+            relativeTo: this.route,
+            queryParams,
+          },
+        ),
+      );
   }
 
 }
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index a64feb0ae1..bef1378209 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -180,6 +180,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     scheduler = getTestScheduler();
     fixture = TestBed.createComponent(OrcidSyncSettingsComponent);
     comp = fixture.componentInstance;
+    researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
     comp.item = mockItemLinkedToOrcid;
     fixture.detectChanges();
   }));
@@ -216,7 +217,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should call updateByOrcidOperations properly', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       const expectedOps: Operation[] = [
         {
@@ -245,7 +245,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on success', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
@@ -257,6 +256,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
 
     it('should show notification on error', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$());
+      comp.item = mockItemLinkedToOrcid;
+      fixture.detectChanges();
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
@@ -266,7 +267,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on error', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$());
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 424baf45fb..7c3f71785c 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -15,17 +16,32 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
-import { of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  switchMap,
+  take,
+  takeUntil,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
@@ -39,14 +55,9 @@ import { NotificationsService } from '../../../shared/notifications/notification
   ],
   standalone: true,
 })
-export class OrcidSyncSettingsComponent implements OnInit {
+export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
   protected readonly AlertType = AlertType;
 
-  /**
-   * The item for which showing the orcid settings
-   */
-  @Input() item: Item;
-
   /**
    * The prefix used for i18n keys
    */
@@ -91,12 +102,39 @@ export class OrcidSyncSettingsComponent implements OnInit {
    * An event emitted when settings are updated
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
+  /**
+   * Emitter that triggers onDestroy lifecycle
+   * @private
+   */
+  readonly #destroy$ = new EventEmitter<void>();
+  /**
+   * {@link BehaviorSubject} that reflects {@link item} input changes
+   * @private
+   */
+  readonly #item$ = new BehaviorSubject<Item>(null);
+  /**
+   * {@link Observable} that contains {@link ResearcherProfile} linked to the {@link #item$}
+   * @private
+   */
+  #researcherProfile$: Observable<ResearcherProfile>;
 
   constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }
 
+  /**
+   * The item for which showing the orcid settings
+   */
+  @Input()
+  set item(item: Item) {
+    this.#item$.next(item);
+  }
+
+  ngOnDestroy(): void {
+    this.#destroy$.next();
+  }
+
   /**
    * Init orcid settings form
    */
@@ -128,20 +166,21 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
-    const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile');
+    this.updateSyncProfileOptions(this.#item$.asObservable());
+    this.updateSyncPreferences(this.#item$.asObservable());
 
-    this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS']
-      .map((value) => {
-        return {
-          label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
-          value: value,
-          checked: syncProfilePreferences.includes(value),
-        };
-      });
-
-    this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
-    this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
-    this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
+    this.#researcherProfile$ =
+      this.#item$.pipe(
+        switchMap(item =>
+          this.researcherProfileService.findByRelatedItem(item)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
+              getRemoteDataPayload(),
+            ),
+        ),
+        takeUntil(this.#destroy$),
+      );
   }
 
   /**
@@ -166,37 +205,84 @@ export class OrcidSyncSettingsComponent implements OnInit {
       return;
     }
 
-    this.researcherProfileService.findByRelatedItem(this.item).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD: RemoteData<ResearcherProfile>) => {
-        if (profileRD.hasSucceeded) {
-          return this.researcherProfileService.patch(profileRD.payload, operations).pipe(
-            getFirstCompletedRemoteData(),
-          );
+    this.#researcherProfile$
+      .pipe(
+        switchMap(researcherProfile => this.researcherProfileService.patch(researcherProfile, operations)),
+        getFirstCompletedRemoteData(),
+        catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
+        take(1),
+      )
+      .subscribe((remoteData: RemoteData<ResearcherProfile>) => {
+        if (remoteData.hasFailed) {
+          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
         } else {
-          return of(profileRD);
+          this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
+          this.settingsUpdated.emit();
         }
-      }),
-    ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
-      if (remoteData.isSuccess) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
-        this.settingsUpdated.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
-      }
-    });
+      });
+  }
+
+  /**
+   *
+   * Handles subscriptions to populate sync preferences
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncPreferences(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncMode = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncPublications = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncFunding = val);
+  }
+
+  /**
+   * Handles subscription to populate the {@link syncProfileOptions} field
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncProfileOptions(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => i.allMetadataValues('dspace.orcid.sync-profile')),
+      map(metadata =>
+        ['BIOGRAPHICAL', 'IDENTIFIERS']
+          .map((value) => {
+            return {
+              label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
+              value: value,
+              checked: metadata.includes(value),
+            };
+          }),
+      ),
+      takeUntil(this.#destroy$),
+    )
+      .subscribe(value => this.syncProfileOptions = value);
   }
 
   /**
    * Retrieve setting saved in the item's metadata
    *
+   * @param item The item from which retrieve settings
    * @param metadataField The metadata name that contains setting
    * @param allowedValues The allowed values
    * @param defaultValue  The default value
    * @private
    */
-  private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string {
-    const currentPreference = this.item.firstMetadataValue(metadataField);
+  private getCurrentPreference(item: Item, metadataField: string, allowedValues: string[], defaultValue: string): string {
+    const currentPreference = item.firstMetadataValue(metadataField);
     return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue;
   }
 
@@ -216,3 +302,4 @@ export class OrcidSyncSettingsComponent implements OnInit {
   }
 
 }
+
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index 3ec7ace051..044e50b360 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import {
   Observable,
   of as observableOf,
@@ -107,3 +108,27 @@ export function createNoContentRemoteDataObject<T>(timeCompleted?: number): Remo
 export function createNoContentRemoteDataObject$<T>(timeCompleted?: number): Observable<RemoteData<T>> {
   return createSuccessfulRemoteDataObject$(undefined, timeCompleted);
 }
+
+/**
+ * Method to create a remote data object that has failed starting from a given error
+ *
+ * @param error
+ */
+export function createFailedRemoteDataObjectFromError<T>(error: unknown): RemoteData<T> {
+  const remoteData = createFailedRemoteDataObject<T>();
+  if (error instanceof Error) {
+    remoteData.errorMessage = error.message;
+  }
+  if (error instanceof HttpErrorResponse) {
+    remoteData.statusCode = error.status;
+  }
+  return remoteData;
+}
+
+/**
+ * Method to create a remote data object that has failed starting from a given error
+ * @param error
+ */
+export function createFailedRemoteDataObjectFromError$<T>(error: unknown): Observable<RemoteData<T>> {
+  return observableOf(createFailedRemoteDataObjectFromError<T>(error));
+}

From 5f4a049fddeceda0fdbb870410d3780b858bcca9 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 11 Jul 2024 15:51:33 -0300
Subject: [PATCH 0300/1286] Issue-1190/PR-3148 Improve the space between the
 text and the button

---
 .../edit-item-page/item-operation/item-operation.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e282017315..97e18cdaa6 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
@@ -1,4 +1,4 @@
-<div class="col-12 col-md-3 column-height float-left d-flex h-100 action-label">
+<div class="col-12 col-md-3 column-height float-left d-flex action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>

From f195484674efcff4a1ab27107ad0d2579645f85c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 11 Jul 2024 14:57:25 -0500
Subject: [PATCH 0301/1286] Update pull_request_template.md

Add note that PRs should be against main, if possible.
---
 .github/pull_request_template.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b381944c98..39d5b191d6 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,6 +19,7 @@ List of changes in this PR:
 _This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome).
 However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
+- [ ] My PR is **created against the `main` branch** of code (unless it is a backport or is fixing an issue specific to an older branch).
 - [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
 - [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `yarn lint`
 - [ ] My PR **doesn't introduce circular dependencies** (verified via `yarn check-circ-deps`)

From 8eec2cdccb15a6cb91532f4e97bd9dfd9ef17597 Mon Sep 17 00:00:00 2001
From: Emmanuel <pastor1212@gmail.com>
Date: Fri, 12 Jul 2024 19:37:47 +0200
Subject: [PATCH 0302/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 35179a459e..399363f017 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6386,7 +6386,7 @@
   "submission.workflow.tasks.pool.show-detail": "Afficher le détail",
 
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Voir",
+  "submission.workspace.generic.view": "Afficher",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",

From 3800021ed364a7994b454e1a75c59a3f7f7581d1 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 15 Jul 2024 09:30:20 -0300
Subject: [PATCH 0303/1286] Issue-1190/PR-3148 Removing 100% height from the
 column containing the button text and leaving it automatic

---
 .../item-operation/item-operation.component.html         | 2 +-
 .../item-operation/item-operation.component.scss         | 9 ---------
 .../item-operation/item-operation.component.ts           | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-operation/item-operation.component.scss

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 97e18cdaa6..deb8e15d29 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
@@ -1,4 +1,4 @@
-<div class="col-12 col-md-3 column-height float-left d-flex action-label">
+<div class="col-12 col-md-3 h-auto float-left d-flex action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
deleted file mode 100644
index ff42005e34..0000000000
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.column-height {
-  height: 100%;
-}
-
-@media screen and (max-width: map-get($grid-breakpoints, sm)) {
-  .column-height {
-    height: auto;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index f6773bc043..9cf4b30e6c 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -11,7 +11,6 @@ import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
-  styleUrls: ['item-operation.component.scss'],
   templateUrl: './item-operation.component.html',
   imports: [
     TranslateModule,

From f4fe2b8632ea277a86bc29f764aca13a4e921e1c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 17 Jul 2024 15:42:48 +0200
Subject: [PATCH 0304/1286] fix FromAsCasing warning

---
 Dockerfile.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.dist b/Dockerfile.dist
index e4b467ae26..4c47b0cb40 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
-FROM node:18-alpine as build
+FROM node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64

From b08b6cca8cbce8093f585ffb99d93ab570b99c59 Mon Sep 17 00:00:00 2001
From: Emmanuel Pastor <pastor1212@gmail.com>
Date: Sun, 7 Jul 2024 16:04:14 +0200
Subject: [PATCH 0305/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index a9b545fbce..4dd47cb766 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6069,7 +6069,7 @@
   "submission.workspace.generic.view": "Voir",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Sélectionner cette option pour voir les métadonnées de l'item.",
+  "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",

From 73b5d776da19b6b6c43957cc8eca5751377ff37c Mon Sep 17 00:00:00 2001
From: Emmanuel <pastor1212@gmail.com>
Date: Fri, 12 Jul 2024 19:37:47 +0200
Subject: [PATCH 0306/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 4dd47cb766..20d57f3b72 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6066,7 +6066,7 @@
   "submission.workflow.tasks.pool.show-detail": "Afficher le détail",
 
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Voir",
+  "submission.workspace.generic.view": "Afficher",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",

From 8af91b28ec9338bb67e7b080fc7a6f68729ae78f Mon Sep 17 00:00:00 2001
From: Emmanuel Pastor <pastor1212@gmail.com>
Date: Sun, 7 Jul 2024 16:04:14 +0200
Subject: [PATCH 0307/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8dc8c95a39..35179a459e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6389,7 +6389,7 @@
   "submission.workspace.generic.view": "Voir",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Sélectionner cette option pour voir les métadonnées de l'item.",
+  "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",

From 73279f43c20c9fd544e743af6da7eb4db71a4d67 Mon Sep 17 00:00:00 2001
From: Emmanuel <pastor1212@gmail.com>
Date: Fri, 12 Jul 2024 19:37:47 +0200
Subject: [PATCH 0308/1286] Fix a french translation for consistency

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 35179a459e..399363f017 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6386,7 +6386,7 @@
   "submission.workflow.tasks.pool.show-detail": "Afficher le détail",
 
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Voir",
+  "submission.workspace.generic.view": "Afficher",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",

From 65ce727157264ad608f63a3f6b1bb0ff723202e2 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 17 Jul 2024 12:46:35 -0300
Subject: [PATCH 0309/1286] Issue-2913 Keys that refer to the research
 translated into Spanish

---
 src/assets/i18n/es.json5 | 227 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 226 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 55962d25b5..b51fee526a 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8149,8 +8149,233 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  //"browse.search-form.placeholder": "Search the repository",
+  // "browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no es igual a",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " sin autoridad",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contiene",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no contiene",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Proyecto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicación",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validación",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Es igual a",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No es igual a",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridad",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Sin autoridad",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contiene",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No contiene",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descubrir",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Buscar por título",
+
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiación",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiación",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de procesamiento ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Alcance mínimo",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Alcance máximo",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionado",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servicio LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Destino",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipo de notificación",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Buscar ítems relacionados",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Estado de la fila de búsqueda",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Buscar por destino",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Buscar por tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Buscar por COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Buscar por tipo de notificación",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionados",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Destino",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Buscar fuente",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Fuente",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Buscar por servicio LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servicio LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificación",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificación de relación",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Buscar por notificación de relación",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificación de relación",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificación de revisión",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Buscar por notificación de Revisión",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificación de revisión",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
+
 
 }

From f7f279c5ed0a6bfaacbcc614ed59cebd9eeefeae Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 17 Jul 2024 15:42:48 +0200
Subject: [PATCH 0310/1286] fix FromAsCasing warning

(cherry picked from commit f4fe2b8632ea277a86bc29f764aca13a4e921e1c)
---
 Dockerfile.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.dist b/Dockerfile.dist
index 2a6a66fc06..641c765cf2 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
 
-FROM node:18-alpine as build
+FROM node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64

From c7489d123e166c5e181515f769f62431466414bf Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 17 Jul 2024 15:42:48 +0200
Subject: [PATCH 0311/1286] fix FromAsCasing warning

(cherry picked from commit f4fe2b8632ea277a86bc29f764aca13a4e921e1c)
---
 Dockerfile.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.dist b/Dockerfile.dist
index e4b467ae26..4c47b0cb40 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
-FROM node:18-alpine as build
+FROM node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64

From d252108f85b2dfeda6e036d062eb972c3cdd99e5 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 17 Jul 2024 16:07:33 -0300
Subject: [PATCH 0312/1286] Keys for the notifications menu section translated
 into Spanish

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

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index b51fee526a..38ca22944c 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8377,5 +8377,358 @@
   // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
   "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificaciones",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Control de calidad",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar sugerencias",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
+
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Cargando ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamo de publicación",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamo de publicación",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugerencias actuales",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nombre del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Acciones",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Ningún destino encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuación",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprobar e importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver pruebas",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar pruebas",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugerencias para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gráfico OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "del ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuación total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Control de calidad",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Control de calidad",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Control de calidad",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Solicitado por",
+
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Control de calidad",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temas actuales",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fuentes actuales",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fuente",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último acontecimiento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Acciones",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No se han encontrado temas.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No se han encontrado fuentes.",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Cargando ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confíe en",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicación",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalles",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalles del proyecto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razones",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Acciones",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceptar sugerencia",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Borrar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor del PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumen:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título del proyecto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Volver a los temas",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar más",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado al registro local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "¿Seguro?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicación:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Buscar proyectos",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Buscar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpiar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
+  
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Motivo",
 
 }

From 8c60a67e8ed08a32153891a209ba95808b3e752d Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 17 Jul 2024 17:09:58 -0300
Subject: [PATCH 0313/1286] Fixing trailing spaces error

---
 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 38ca22944c..65f5f75f28 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8724,7 +8724,7 @@
 
   // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
   "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
-  
+
   // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
   "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
 

From 84069055f5a4ae5da4822b320a1e850ca6d1f3c8 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 15 Jul 2024 17:36:48 +0200
Subject: [PATCH 0314/1286] [CST-15593] migrate from klaro to orejime

---
 cypress/support/e2e.ts                        |   4 +-
 package.json                                  |   2 +-
 .../google-recaptcha.service.spec.ts          |   2 +-
 .../google-recaptcha.service.ts               |   2 +-
 src/app/footer/footer.component.ts            |   4 +-
 .../register-email-form.component.html        |   2 +-
 .../register-email-form.component.ts          |   8 +-
 ...pec.ts => browser-orejime.service.spec.ts} |  40 ++--
 ....service.ts => browser-orejime.service.ts} | 124 ++++++-----
 src/app/shared/cookies/klaro-configuration.ts | 199 ------------------
 .../shared/cookies/orejime-configuration.ts   | 182 ++++++++++++++++
 .../{klaro.service.ts => orejime.service.ts}  |   6 +-
 .../google-analytics.service.spec.ts          |  48 ++---
 .../statistics/google-analytics.service.ts    |  10 +-
 src/assets/i18n/ar.json5                      |   6 -
 src/assets/i18n/ca.json5                      |  18 --
 src/assets/i18n/cs.json5                      |  20 +-
 src/assets/i18n/el.json5                      |   1 -
 src/assets/i18n/en.json5                      |  16 +-
 src/assets/i18n/es.json5                      |  18 --
 src/assets/i18n/fi.json5                      |  18 --
 src/assets/i18n/hi.json5                      |   2 -
 src/assets/i18n/hu.json5                      |  23 --
 src/assets/i18n/it.json5                      |  20 +-
 src/assets/i18n/kk.json5                      |   3 -
 src/assets/i18n/pl.json5                      |   6 -
 src/assets/i18n/pt-BR.json5                   |  18 --
 src/assets/i18n/pt-PT.json5                   |  18 --
 src/assets/i18n/sr-cyr.json5                  |   6 -
 src/assets/i18n/sr-lat.json5                  |   6 -
 src/assets/i18n/vi.json5                      |   8 +-
 src/modules/app/browser-app.config.ts         |   8 +-
 src/modules/app/browser-init.service.ts       |  12 +-
 src/styles/_custom_variables.scss             |   6 +-
 src/styles/_global-styles.scss                |  32 +--
 src/styles/_vendor.scss                       |   1 +
 yarn.lock                                     |  71 ++++---
 37 files changed, 399 insertions(+), 571 deletions(-)
 rename src/app/shared/cookies/{browser-klaro.service.spec.ts => browser-orejime.service.spec.ts} (91%)
 rename src/app/shared/cookies/{browser-klaro.service.ts => browser-orejime.service.ts} (69%)
 delete mode 100644 src/app/shared/cookies/klaro-configuration.ts
 create mode 100644 src/app/shared/cookies/orejime-configuration.ts
 rename src/app/shared/cookies/{klaro.service.ts => orejime.service.ts} (63%)

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 73d3c76a99..c1b6bc6d3f 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -54,9 +54,9 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
+  // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);
diff --git a/package.json b/package.json
index a8d505eff9..9b8bdb190c 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,6 @@
     "json5": "^2.2.3",
     "jsonschema": "1.4.1",
     "jwt-decode": "^3.1.2",
-    "klaro": "^0.7.18",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
@@ -127,6 +126,7 @@
     "ngx-pagination": "6.0.3",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
+    "orejime": "^2.3.0",
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
index 957cc649bf..94b03bba46 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
@@ -30,7 +30,7 @@ describe('GoogleRecaptchaService', () => {
       findByPropertyName: createSuccessfulRemoteDataObject$({ values: ['googleRecaptchaToken'] }),
     });
     cookieService = jasmine.createSpyObj('cookieService', {
-      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
+      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22orejime%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
       },
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index b4028f9835..c23223b678 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -105,7 +105,7 @@ export class GoogleRecaptchaService {
       tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
 
         if (
-          this.cookieService.get('klaro-anonymous') && this.cookieService.get('klaro-anonymous')[CAPTCHA_NAME] &&
+          this.cookieService.get('orejime-anonymous') && this.cookieService.get('orejime-anonymous')[CAPTCHA_NAME] &&
           recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
           isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
         ) {
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index 99e74ed4aa..6a6e5e94d7 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -23,7 +23,7 @@ import {
 import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { KlaroService } from '../shared/cookies/klaro.service';
+import { OrejimeService } from '../shared/cookies/orejime.service';
 import { hasValue } from '../shared/empty.util';
 
 @Component({
@@ -46,7 +46,7 @@ export class FooterComponent implements OnInit {
   coarLdnEnabled$: Observable<boolean>;
 
   constructor(
-    @Optional() public cookies: KlaroService,
+    @Optional() public cookies: OrejimeService,
     protected authorizationService: AuthorizationDataService,
     protected notifyInfoService: NotifyInfoService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a38c4a81c0..729edbb93f 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -38,7 +38,7 @@
 
     <ds-alert [type]="AlertTypeEnum.Warning" *ngIf="registrationVerification && !isRecaptchaCookieAccepted()">
       <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
-      <p class="m-0"><a href="javascript:void(0);" (click)="this.klaroService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
+      <p class="m-0"><a href="javascript:void(0);" (click)="this.orejimeService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
     </ds-alert>
 
     <div class="my-3" *ngIf="isRecaptchaCookieAccepted() && (googleRecaptchaService.captchaVersion() | async) === 'v2'">
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ac13abb865..90841f3088 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -54,7 +54,7 @@ import {
 import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
-import { KlaroService } from '../shared/cookies/klaro.service';
+import { OrejimeService } from '../shared/cookies/orejime.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -126,7 +126,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
     private configService: ConfigurationDataService,
     public googleRecaptchaService: GoogleRecaptchaService,
     public cookieService: CookieService,
-    @Optional() public klaroService: KlaroService,
+    @Optional() public orejimeService: OrejimeService,
     private changeDetectorRef: ChangeDetectorRef,
     private notificationsService: NotificationsService,
   ) {
@@ -247,8 +247,8 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * Return true if the user has accepted the required cookies for reCaptcha
    */
   isRecaptchaCookieAccepted(): boolean {
-    const klaroAnonymousCookie = this.cookieService.get('klaro-anonymous');
-    return isNotEmpty(klaroAnonymousCookie) ? klaroAnonymousCookie[CAPTCHA_NAME] : false;
+    const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
+    return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_NAME] : false;
   }
 
   /**
diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-orejime.service.spec.ts
similarity index 91%
rename from src/app/shared/cookies/browser-klaro.service.spec.ts
rename to src/app/shared/cookies/browser-orejime.service.spec.ts
index 953734d38c..d0fe608c3f 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-orejime.service.spec.ts
@@ -20,12 +20,12 @@ import {
   createSuccessfulRemoteDataObject$,
 } from '../remote-data.utils';
 import {
-  BrowserKlaroService,
+  BrowserOrejimeService,
   COOKIE_MDFIELD,
-} from './browser-klaro.service';
-import { ANONYMOUS_STORAGE_NAME_KLARO } from './klaro-configuration';
+} from './browser-orejime.service';
+import { ANONYMOUS_STORAGE_NAME_OREJIME } from './orejime-configuration';
 
-describe('BrowserKlaroService', () => {
+describe('BrowserOrejimeService', () => {
   const trackingIdProp = 'google.analytics.key';
   const trackingIdTestValue = 'mock-tracking-id';
   const googleAnalytics = 'google-analytics';
@@ -37,7 +37,7 @@ describe('BrowserKlaroService', () => {
   let cookieService;
 
   let user;
-  let service: BrowserKlaroService;
+  let service: BrowserOrejimeService;
   let configurationDataService: ConfigurationDataService;
   const createConfigSuccessSpy = (...values: string[]) => jasmine.createSpyObj('configurationDataService', {
     findByPropertyName: createSuccessfulRemoteDataObject$({
@@ -70,7 +70,7 @@ describe('BrowserKlaroService', () => {
     configurationDataService = createConfigSuccessSpy(recaptchaValue);
     findByPropertyName = configurationDataService.findByPropertyName;
     cookieService = jasmine.createSpyObj('cookieService', {
-      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
+      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22orejime%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
       },
@@ -78,7 +78,7 @@ describe('BrowserKlaroService', () => {
 
     TestBed.configureTestingModule({
       providers: [
-        BrowserKlaroService,
+        BrowserOrejimeService,
         {
           provide: TranslateService,
           useValue: translateService,
@@ -101,7 +101,7 @@ describe('BrowserKlaroService', () => {
         },
       ],
     });
-    service = TestBed.inject(BrowserKlaroService);
+    service = TestBed.inject(BrowserOrejimeService);
     appName = 'testName';
     purpose = 'test purpose';
     testKey = 'this.is.a.fake.message.key';
@@ -115,7 +115,7 @@ describe('BrowserKlaroService', () => {
           },
         },
       },
-      services: [{
+      apps: [{
         name: appName,
         purposes: [purpose],
       }, {
@@ -125,7 +125,7 @@ describe('BrowserKlaroService', () => {
 
     };
 
-    service.klaroConfig = mockConfig;
+    service.orejimeConfig = mockConfig;
   });
 
   it('should be created', () => {
@@ -248,7 +248,7 @@ describe('BrowserKlaroService', () => {
         scheduler.schedule(() => service.getSavedPreferences().subscribe());
         scheduler.flush();
 
-        expect(cookieService.get).toHaveBeenCalledWith(ANONYMOUS_STORAGE_NAME_KLARO);
+        expect(cookieService.get).toHaveBeenCalledWith(ANONYMOUS_STORAGE_NAME_OREJIME);
       });
     });
 
@@ -261,7 +261,7 @@ describe('BrowserKlaroService', () => {
         scheduler.schedule(() => service.getSavedPreferences().subscribe());
         scheduler.flush();
 
-        expect(cookieService.get).toHaveBeenCalledWith('klaro-' + user.uuid);
+        expect(cookieService.get).toHaveBeenCalledWith('orejime-' + user.uuid);
       });
     });
   });
@@ -320,12 +320,12 @@ describe('BrowserKlaroService', () => {
       configurationDataService.findByPropertyName = findByPropertyName;
     });
 
-    it('should not filter googleAnalytics when servicesToHide are empty', () => {
-      const filteredConfig = (service as any).filterConfigServices([]);
+    it('should not filter googleAnalytics when appsToHide is empty', () => {
+      const filteredConfig = (service as any).filterConfigApps([]);
       expect(filteredConfig).toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
-    it('should filter services using names passed as servicesToHide', () => {
-      const filteredConfig = (service as any).filterConfigServices([googleAnalytics]);
+    it('should filter apps using names passed as appsToHide', () => {
+      const filteredConfig = (service as any).filterConfigApps([googleAnalytics]);
       expect(filteredConfig).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
     it('should have been initialized with googleAnalytics', () => {
@@ -337,7 +337,7 @@ describe('BrowserKlaroService', () => {
         }),
       );
       service.initialize();
-      expect(service.klaroConfig.services).toContain(jasmine.objectContaining({ name: googleAnalytics }));
+      expect(service.orejimeConfig.apps).toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
     it('should filter googleAnalytics when empty configuration is retrieved', () => {
       configurationDataService.findByPropertyName =
@@ -363,7 +363,7 @@ describe('BrowserKlaroService', () => {
           );
 
       service.initialize();
-      expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
+      expect(service.orejimeConfig.apps).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
     it('should filter googleAnalytics when an error occurs', () => {
       configurationDataService.findByPropertyName =
@@ -381,7 +381,7 @@ describe('BrowserKlaroService', () => {
             }),
           );
       service.initialize();
-      expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
+      expect(service.orejimeConfig.apps).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
     it('should filter googleAnalytics when an invalid payload is retrieved', () => {
       configurationDataService.findByPropertyName =
@@ -399,7 +399,7 @@ describe('BrowserKlaroService', () => {
             }),
           );
       service.initialize();
-      expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
+      expect(service.orejimeConfig.apps).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
     });
   });
 });
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-orejime.service.ts
similarity index 69%
rename from src/app/shared/cookies/browser-klaro.service.ts
rename to src/app/shared/cookies/browser-orejime.service.ts
index f673a41736..e23b19c58b 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-orejime.service.ts
@@ -25,17 +25,21 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../../core/services/cookie.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../core/services/window.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import {
   hasValue,
   isEmpty,
   isNotEmpty,
 } from '../empty.util';
-import { KlaroService } from './klaro.service';
+import { OrejimeService } from './orejime.service';
 import {
-  ANONYMOUS_STORAGE_NAME_KLARO,
-  klaroConfiguration,
-} from './klaro-configuration';
+  ANONYMOUS_STORAGE_NAME_OREJIME,
+  getOrejimeConfiguration,
+} from './orejime-configuration';
 
 /**
  * Metadata field to store a user's cookie consent preferences in
@@ -63,21 +67,21 @@ const cookiePurposeMessagePrefix = 'cookies.consent.purpose.';
 const updateDebounce = 300;
 
 /**
- * By using this injection token instead of importing directly we can keep Klaro out of the main bundle
+ * By using this injection token instead of importing directly we can keep Orejime out of the main bundle
  */
-const LAZY_KLARO = new InjectionToken<Promise<any>>(
-  'Lazily loaded Klaro',
+const LAZY_OREJIME = new InjectionToken<Promise<any>>(
+  'Lazily loaded Orejime',
   {
     providedIn: 'root',
-    factory: async () => (await import('klaro/dist/klaro-no-translations')),
+    factory: async () => (await import('orejime/dist/orejime')),
   },
 );
 
 /**
- * Browser implementation for the KlaroService, representing a service for handling Klaro consent preferences and UI
+ * Browser implementation for the OrejimeService, representing a service for handling Orejime consent preferences and UI
  */
 @Injectable()
-export class BrowserKlaroService extends KlaroService {
+export class BrowserOrejimeService extends OrejimeService {
 
   private readonly GOOGLE_ANALYTICS_KEY = 'google.analytics.key';
 
@@ -85,18 +89,22 @@ export class BrowserKlaroService extends KlaroService {
 
   private readonly GOOGLE_ANALYTICS_SERVICE_NAME = 'google-analytics';
 
+
   /**
-   * Initial Klaro configuration
+   * Initial Orejime configuration
    */
-  klaroConfig = cloneDeep(klaroConfiguration);
+  orejimeConfig = cloneDeep(getOrejimeConfiguration(this._window));
+
+  private orejimeInstance: any;
 
   constructor(
+    @Inject(NativeWindowService) private _window: NativeWindowRef,
     private translateService: TranslateService,
     private authService: AuthService,
     private ePersonService: EPersonDataService,
     private configService: ConfigurationDataService,
     private cookieService: CookieService,
-    @Inject(LAZY_KLARO) private lazyKlaro: Promise<any>,
+    @Inject(LAZY_OREJIME) private lazyOrejime: Promise<any>,
   ) {
     super();
   }
@@ -106,13 +114,9 @@ export class BrowserKlaroService extends KlaroService {
    *  - Retrieves the current authenticated user
    *  - Checks if the translation service is ready
    *  - Initialize configuration for users
-   *  - Add and translate klaro configuration messages
+   *  - Add and translate orejime configuration messages
    */
   initialize() {
-    if (!environment.info.enablePrivacyStatement) {
-      delete this.klaroConfig.privacyPolicy;
-      this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
-    }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
       getFirstCompletedRemoteData(),
@@ -126,16 +130,16 @@ export class BrowserKlaroService extends KlaroService {
       ),
     );
 
-    const servicesToHide$: Observable<string[]> = observableCombineLatest([hideGoogleAnalytics$, hideRegistrationVerification$]).pipe(
+    const appsToHide$: Observable<string[]> = observableCombineLatest([hideGoogleAnalytics$, hideRegistrationVerification$]).pipe(
       map(([hideGoogleAnalytics, hideRegistrationVerification]) => {
-        const servicesToHideArray: string[] = [];
+        const appsToHideArray: string[] = [];
         if (hideGoogleAnalytics) {
-          servicesToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
+          appsToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
         if (hideRegistrationVerification) {
-          servicesToHideArray.push(CAPTCHA_NAME);
+          appsToHideArray.push(CAPTCHA_NAME);
         }
-        return servicesToHideArray;
+        return appsToHideArray;
       }),
     );
 
@@ -145,8 +149,8 @@ export class BrowserKlaroService extends KlaroService {
 
     const translationServiceReady$ = this.translateService.get('loading.default').pipe(take(1));
 
-    observableCombineLatest([user$, servicesToHide$, translationServiceReady$])
-      .subscribe(([user, servicesToHide, _]: [EPerson, string[], string]) => {
+    observableCombineLatest([user$, appsToHide$, translationServiceReady$])
+      .subscribe(([user, appsToHide, _]: [EPerson, string[], string]) => {
         user = cloneDeep(user);
 
         if (hasValue(user)) {
@@ -154,10 +158,15 @@ export class BrowserKlaroService extends KlaroService {
         }
 
         /**
-         * Add all message keys for services and purposes
+         * Add all message keys for apps and purposes
          */
         this.addAppMessages();
 
+        /**
+         * Create categories based on the purposes of the apps
+         */
+        this.createCategories();
+
         /**
          * Subscribe on a message to make sure the translation service is ready
          * Translate all keys in the translation section of the configuration
@@ -165,20 +174,22 @@ export class BrowserKlaroService extends KlaroService {
          */
         this.translateConfiguration();
 
-        this.klaroConfig.services = this.filterConfigServices(servicesToHide);
-        this.lazyKlaro.then(({ setup }) => setup(this.klaroConfig));
+        this.orejimeConfig.apps = this.filterConfigApps(appsToHide);
+        this.lazyOrejime.then(({ init }) => {
+          this.orejimeInstance = init(this.orejimeConfig);
+        });
       });
   }
 
   /**
-   * Return saved preferences stored in the klaro cookie
+   * Return saved preferences stored in the orejime cookie
    */
   getSavedPreferences(): Observable<any> {
     return this.getUser$().pipe(
       map((user: EPerson) => {
         let storageName;
         if (isEmpty(user)) {
-          storageName = ANONYMOUS_STORAGE_NAME_KLARO;
+          storageName = ANONYMOUS_STORAGE_NAME_OREJIME;
         } else {
           storageName = this.getStorageName(user.uuid);
         }
@@ -192,10 +203,10 @@ export class BrowserKlaroService extends KlaroService {
    * @param user The authenticated user
    */
   private initializeUser(user: EPerson) {
-    this.klaroConfig.callback = debounce((consent, app) => this.updateSettingsForUsers(user), updateDebounce);
-    this.klaroConfig.storageName = this.getStorageName(user.uuid);
+    this.orejimeConfig.callback = debounce((consent, app) => this.updateSettingsForUsers(user), updateDebounce);
+    this.orejimeConfig.storageName = this.getStorageName(user.uuid);
 
-    const anonCookie = this.cookieService.get(ANONYMOUS_STORAGE_NAME_KLARO);
+    const anonCookie = this.cookieService.get(ANONYMOUS_STORAGE_NAME_OREJIME);
     if (hasValue(this.getSettingsForUser(user))) {
       this.restoreSettingsForUsers(user);
     } else if (hasValue(anonCookie)) {
@@ -250,26 +261,26 @@ export class BrowserKlaroService extends KlaroService {
    * Show the cookie consent form
    */
   showSettings() {
-    this.lazyKlaro.then(({ show }) => show(this.klaroConfig));
+    this.orejimeInstance.show();
   }
 
   /**
-   * Add message keys for all services and purposes
+   * Add message keys for all apps and purposes
    */
   addAppMessages() {
-    this.klaroConfig.services.forEach((app) => {
-      this.klaroConfig.translations.zz[app.name] = {
+    this.orejimeConfig.apps.forEach((app) => {
+      this.orejimeConfig.translations.zz[app.name] = {
         title: this.getTitleTranslation(app.name),
         description: this.getDescriptionTranslation(app.name),
       };
       app.purposes.forEach((purpose) => {
-        this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
+        this.orejimeConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
       });
     });
   }
 
   /**
-   * Translate the translation section from the Klaro configuration
+   * Translate the translation section from the Orejime configuration
    */
   translateConfiguration() {
     /**
@@ -277,7 +288,26 @@ export class BrowserKlaroService extends KlaroService {
      */
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
-    this.translate(this.klaroConfig.translations.zz);
+    this.translate(this.orejimeConfig.translations.zz);
+  }
+
+  /**
+   * Create categories based on the purposes of the apps
+   */
+  createCategories() {
+    this.orejimeConfig.categories = this.orejimeConfig.apps.reduce((accumulator, current) => {
+      let category = accumulator.find((cat) => cat.name === current.purposes[0]);
+      if (!category) {
+        category = {
+          name: current.purposes[0],
+          title: this.translateService.instant(this.getPurposeTranslation(current.purposes[0])),
+          apps: [],
+        };
+        accumulator.push(category);
+      }
+      category.apps.push(current.name);
+      return accumulator;
+    }, []);
   }
 
   /**
@@ -295,7 +325,7 @@ export class BrowserKlaroService extends KlaroService {
   }
 
   /**
-   * Retrieves the stored Klaro consent settings for a user
+   * Retrieves the stored Orejime consent settings for a user
    * @param user The user to resolve the consent for
    */
   getSettingsForUser(user: EPerson) {
@@ -304,7 +334,7 @@ export class BrowserKlaroService extends KlaroService {
   }
 
   /**
-   * Stores the Klaro consent settings for a user in a metadata field
+   * Stores the Orejime consent settings for a user in a metadata field
    * @param user The user to save the settings for
    * @param config The consent settings for the user to save
    */
@@ -344,18 +374,18 @@ export class BrowserKlaroService extends KlaroService {
   }
 
   /**
-   * Create the storage name for klaro cookies based on the user's identifier
+   * Create the storage name for orejime cookies based on the user's identifier
    * @param identifier The user's uuid
    */
   getStorageName(identifier: string) {
-    return 'klaro-' + identifier;
+    return 'orejime-' + identifier;
   }
 
   /**
-   * remove the google analytics from the services
+   * remove the Google Analytics from the apps
    */
-  private filterConfigServices(servicesToHide: string[]): Pick<typeof klaroConfiguration, 'services'>[] {
-    return this.klaroConfig.services.filter(service => !servicesToHide.some(name => name === service.name));
+  private filterConfigApps(appsToHide: string[]) {
+    return this.orejimeConfig.apps.filter(service => !appsToHide.some(name => name === service.name));
   }
 
 }
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
deleted file mode 100644
index c2fb7738a0..0000000000
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import {
-  IMPERSONATING_COOKIE,
-  REDIRECT_COOKIE,
-} from '../../core/auth/auth.service';
-import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
-import {
-  CAPTCHA_COOKIE,
-  CAPTCHA_NAME,
-} from '../../core/google-recaptcha/google-recaptcha.service';
-import { LANG_COOKIE } from '../../core/locale/locale.service';
-
-/**
- * Cookie for has_agreed_end_user
- */
-export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
-
-/**
- * Storage name used to store klaro cookie
- */
-export const ANONYMOUS_STORAGE_NAME_KLARO = 'klaro-anonymous';
-
-export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
-
-/**
- * Klaro configuration
- * For more information see https://kiprotect.com/docs/klaro/annotated-config
- */
-export const klaroConfiguration: any = {
-  storageName: ANONYMOUS_STORAGE_NAME_KLARO,
-
-  privacyPolicy: './info/privacy',
-
-  /*
-  Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
-  the consent notice. We strongly advise against using this under most
-  circumstances, as it keeps the user from customizing their consent choices.
-  */
-  hideLearnMore: false,
-
-  /*
-  Setting 'acceptAll' to 'true' will show an "accept all" button in the notice and
-  modal, which will enable all third-party services if the user clicks on it. If set
-  to 'false', there will be an "accept" button that will only enable the services that
-  are enabled in the consent modal.
-  */
-  acceptAll: true,
-
-  /*
-  You can also set a custom expiration time for the Klaro cookie. By default, it
-  will expire after 30 days. Only relevant if 'storageMethod' is set to 'cookie'.
-  */
-  cookieExpiresAfterDays: 365,
-
-  htmlTexts: true,
-
-  /*
-  You can overwrite existing translations and add translations for your app
-  descriptions and purposes. See `src/translations/` for a full list of
-  translations that can be overwritten:
-  https://github.com/KIProtect/klaro/tree/master/src/translations
-  */
-  translations: {
-    /*
-      The `zz` key contains default translations that will be used as fallback values.
-      This can e.g. be useful for defining a fallback privacy policy URL.
-      FOR DSPACE: We use 'zz' to map to our own i18n translations for klaro, see
-      translateConfiguration() in browser-klaro.service.ts. All the below i18n keys are specified
-      in your /src/assets/i18n/*.json5 translation pack.
-    */
-    zz: {
-      acceptAll: 'cookies.consent.accept-all',
-      acceptSelected: 'cookies.consent.accept-selected',
-      close: 'cookies.consent.close',
-      consentModal: {
-        title: 'cookies.consent.content-modal.title',
-        description: 'cookies.consent.content-modal.description',
-      },
-      consentNotice: {
-        changeDescription: 'cookies.consent.update',
-        title: 'cookies.consent.content-notice.title',
-        description: 'cookies.consent.content-notice.description',
-        learnMore: 'cookies.consent.content-notice.learnMore',
-      },
-      decline: 'cookies.consent.decline',
-      ok: 'cookies.consent.ok',
-      poweredBy: 'Powered by Klaro!',
-      privacyPolicy: {
-        name: 'cookies.consent.content-modal.privacy-policy.name',
-        text: 'cookies.consent.content-modal.privacy-policy.text',
-      },
-      purposeItem: {
-        service: 'cookies.consent.content-modal.service',
-        services: 'cookies.consent.content-modal.services',
-      },
-      purposes: {
-      },
-      save: 'cookies.consent.save',
-      service: {
-        disableAll: {
-          description: 'cookies.consent.app.disable-all.description',
-          title: 'cookies.consent.app.disable-all.title',
-        },
-        optOut: {
-          description: 'cookies.consent.app.opt-out.description',
-          title: 'cookies.consent.app.opt-out.title',
-        },
-        purpose: 'cookies.consent.app.purpose',
-        purposes: 'cookies.consent.app.purposes',
-        required: {
-          title: 'cookies.consent.app.required.title',
-          description: 'cookies.consent.app.required.description',
-        },
-      },
-    },
-  },
-  services: [
-    {
-      name: 'authentication',
-      purposes: ['functional'],
-      required: true,
-      cookies: [
-        TOKENITEM,
-        IMPERSONATING_COOKIE,
-        REDIRECT_COOKIE,
-      ],
-    },
-    {
-      name: 'preferences',
-      purposes: ['functional'],
-      required: true,
-      cookies: [
-        LANG_COOKIE,
-      ],
-    },
-    {
-      name: 'acknowledgement',
-      purposes: ['functional'],
-      required: true,
-      cookies: [
-        [/^klaro-.+$/],
-        HAS_AGREED_END_USER,
-      ],
-    },
-    {
-      name: GOOGLE_ANALYTICS_KLARO_KEY,
-      purposes: ['statistical'],
-      required: false,
-      cookies: [
-        //     /*
-        //     you an either only provide a cookie name or regular expression (regex) or a list
-        //     consisting of a name or regex, a path and a cookie domain. Providing a path and
-        //     domain is necessary if you have services that set cookies for a path that is not
-        //     "/", or a domain that is not the current domain. If you do not set these values
-        //     properly, the cookie can't be deleted by Klaro, as there is no way to access the
-        //     path or domain of a cookie in JS. Notice that it is not possible to delete
-        //     cookies that were set on a third-party domain, or cookies that have the HTTPOnly
-        //     attribute: https://developer.mozilla.org/en-US/docs/Web/API/Document/cookie#new-
-        //     cookie_domain
-        //     */
-        //
-        //     /*
-        //     This rule will match cookies that contain the string '_pk_' and that are set on
-        //     the path '/' and the domain 'klaro.kiprotect.com'
-        //     */
-        [/^_ga.?$/],
-        [/^_gid$/],
-        //
-        //     /*
-        //     Same as above, only for the 'localhost' domain
-        //     */
-        //     [/^_pk_.*$/, '/', 'localhost'],
-        //
-        //     /*
-        //     This rule will match all cookies named 'piwik_ignore' that are set on the path
-        //     '/' on the current domain
-        //     */
-        //     'piwik_ignore',
-      ],
-      /*
-      If 'onlyOnce' is set to 'true', the app will only be executed once regardless
-      how often the user toggles it on and off. This is relevant e.g. for tracking
-      scripts that would generate new page view events every time Klaro disables and
-      re-enables them due to a consent change by the user.
-      */
-      onlyOnce: true,
-    },
-    {
-      name: CAPTCHA_NAME,
-      purposes: ['registration-password-recovery'],
-      required: false,
-      cookies: [
-        CAPTCHA_COOKIE,
-      ],
-      onAccept: `window.refreshCaptchaScript?.call()`,
-      onDecline: `window.refreshCaptchaScript?.call()`,
-      onlyOnce: true,
-    },
-  ],
-};
diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts
new file mode 100644
index 0000000000..fd275f7e77
--- /dev/null
+++ b/src/app/shared/cookies/orejime-configuration.ts
@@ -0,0 +1,182 @@
+import {
+  IMPERSONATING_COOKIE,
+  REDIRECT_COOKIE,
+} from '../../core/auth/auth.service';
+import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
+import {
+  CAPTCHA_COOKIE,
+  CAPTCHA_NAME,
+} from '../../core/google-recaptcha/google-recaptcha.service';
+import { LANG_COOKIE } from '../../core/locale/locale.service';
+import { NativeWindowRef } from '../../core/services/window.service';
+
+/**
+ * Cookie for has_agreed_end_user
+ */
+export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
+
+export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime-anonymous';
+
+export const GOOGLE_ANALYTICS_OREJIME_KEY = 'google-analytics';
+
+/**
+ * Orejime configuration
+ * For more information see https://github.com/empreinte-digitale/orejime
+ */
+
+export function getOrejimeConfiguration(_window: NativeWindowRef): any {
+  return {
+    storageName: ANONYMOUS_STORAGE_NAME_OREJIME,
+
+    privacyPolicy: './info/privacy',
+
+    // Optional. You can set a custom expiration time for the Orejime cookie, in days.
+    // defaults to 365.
+    cookieExpiresAfterDays: 365,
+
+    /*
+    We need to explicitly enable the 'zz' language, where all translations are set, because Orejime's default is 'en'.
+     */
+    lang: 'zz',
+
+    /*
+    The appElement selector is used by Orejime to determine where to insert the consent
+     */
+    appElement: 'ds-app',
+
+    /*
+    You can overwrite existing translations and add translations for your app
+    descriptions and purposes. See `src/translations/` for a full list of
+    translations that can be overwritten:
+    https://github.com/empreinte-digitale/orejime/blob/master/src/translations/en.yml
+    */
+    translations: {
+      /*
+        The `zz` key contains default translations that will be used as fallback values.
+        This can e.g. be useful for defining a fallback privacy policy URL.
+        FOR DSPACE: We use 'zz' to map to our own i18n translations for orejime, see
+        translateConfiguration() in browser-orejime.service.ts. All the below i18n keys are specified
+        in your /src/assets/i18n/*.json5 translation pack.
+      */
+      zz: {
+        acceptAll: 'cookies.consent.accept-all',
+        acceptSelected: 'cookies.consent.accept-selected',
+        close: 'cookies.consent.close',
+        consentModal: {
+          title: 'cookies.consent.content-modal.title',
+          description: 'cookies.consent.content-modal.description',
+          privacyPolicy: {
+            name: 'cookies.consent.content-modal.privacy-policy.name',
+            text: 'cookies.consent.content-modal.privacy-policy.text',
+          },
+        },
+        consentNotice: {
+          changeDescription: 'cookies.consent.update',
+          description: 'cookies.consent.content-notice.description',
+          learnMore: 'cookies.consent.content-notice.learnMore',
+        },
+        decline: 'cookies.consent.decline',
+        declineAll: 'cookies.consent.decline-all',
+        accept: 'cookies.consent.ok',
+        save: 'cookies.consent.save',
+        purposes: {},
+        app: {
+          optOut: {
+            description: 'cookies.consent.app.opt-out.description',
+            title: 'cookies.consent.app.opt-out.title',
+          },
+          purpose: 'cookies.consent.app.purpose',
+          purposes: 'cookies.consent.app.purposes',
+          required: {
+            title: 'cookies.consent.app.required.title',
+            description: 'cookies.consent.app.required.description',
+          },
+        },
+      },
+    },
+    apps: [
+      {
+        name: 'authentication',
+        purposes: ['functional'],
+        required: true,
+        cookies: [
+          TOKENITEM,
+          IMPERSONATING_COOKIE,
+          REDIRECT_COOKIE,
+        ],
+      },
+      {
+        name: 'preferences',
+        purposes: ['functional'],
+        required: true,
+        cookies: [
+          LANG_COOKIE,
+        ],
+      },
+      {
+        name: 'acknowledgement',
+        purposes: ['functional'],
+        required: true,
+        cookies: [
+          [/^orejime-.+$/],
+          HAS_AGREED_END_USER,
+        ],
+      },
+      {
+        name: GOOGLE_ANALYTICS_OREJIME_KEY,
+        purposes: ['statistical'],
+        required: false,
+        cookies: [
+          //     /*
+          //     you an either only provide a cookie name or regular expression (regex) or a list
+          //     consisting of a name or regex, a path and a cookie domain. Providing a path and
+          //     domain is necessary if you have services that set cookies for a path that is not
+          //     "/", or a domain that is not the current domain. If you do not set these values
+          //     properly, the cookie can't be deleted by Orejime, as there is no way to access the
+          //     path or domain of a cookie in JS. Notice that it is not possible to delete
+          //     cookies that were set on a third-party domain, or cookies that have the HTTPOnly
+          //     attribute: https://developer.mozilla.org/en-US/docs/Web/API/Document/cookie#new-
+          //     cookie_domain
+          //     */
+          //
+          //     /*
+          //     This rule will match cookies that contain the string '_pk_' and that are set on
+          //     the path '/' and the domain 'orejime.kiprotect.com'
+          //     */
+          [/^_ga.?$/],
+          [/^_gid$/],
+          //
+          //     /*
+          //     Same as above, only for the 'localhost' domain
+          //     */
+          //     [/^_pk_.*$/, '/', 'localhost'],
+          //
+          //     /*
+          //     This rule will match all cookies named 'piwik_ignore' that are set on the path
+          //     '/' on the current domain
+          //     */
+          //     'piwik_ignore',
+        ],
+        /*
+        If 'onlyOnce' is set to 'true', the app will only be executed once regardless
+        how often the user toggles it on and off. This is relevant e.g. for tracking
+        scripts that would generate new page view events every time Orejime disables and
+        re-enables them due to a consent change by the user.
+        */
+        onlyOnce: true,
+      },
+      {
+        name: CAPTCHA_NAME,
+        purposes: ['registration-password-recovery'],
+        required: false,
+        cookies: [
+          CAPTCHA_COOKIE,
+        ],
+        callback: (consent: boolean) => {
+          _window?.nativeWindow.refreshCaptchaScript?.call();
+        },
+        onlyOnce: true,
+      },
+    ],
+  };
+}
diff --git a/src/app/shared/cookies/klaro.service.ts b/src/app/shared/cookies/orejime.service.ts
similarity index 63%
rename from src/app/shared/cookies/klaro.service.ts
rename to src/app/shared/cookies/orejime.service.ts
index 9e28d6ead7..0640f8d6ff 100644
--- a/src/app/shared/cookies/klaro.service.ts
+++ b/src/app/shared/cookies/orejime.service.ts
@@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /**
- * Abstract class representing a service for handling Klaro consent preferences and UI
+ * Abstract class representing a service for handling Orejime consent preferences and UI
  */
 @Injectable()
-export abstract class KlaroService {
+export abstract class OrejimeService {
   /**
    * Initializes the service
    */
@@ -17,7 +17,7 @@ export abstract class KlaroService {
   abstract showSettings();
 
   /**
-   * Return saved preferences stored in the klaro cookie
+   * Return saved preferences stored in the Orejime cookie
    */
   abstract getSavedPreferences(): Observable<any>;
 }
diff --git a/src/app/statistics/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts
index eb35750c4c..1b8783f3bf 100644
--- a/src/app/statistics/google-analytics.service.spec.ts
+++ b/src/app/statistics/google-analytics.service.spec.ts
@@ -6,8 +6,8 @@ import { of } from 'rxjs';
 
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { KlaroService } from '../shared/cookies/klaro.service';
-import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import { OrejimeService } from '../shared/cookies/orejime.service';
+import { GOOGLE_ANALYTICS_OREJIME_KEY } from '../shared/cookies/orejime-configuration';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$,
@@ -24,7 +24,7 @@ describe('GoogleAnalyticsService', () => {
   let googleAnalyticsSpy: Angulartics2GoogleAnalytics;
   let googleTagManagerSpy: Angulartics2GoogleGlobalSiteTag;
   let configSpy: ConfigurationDataService;
-  let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
+  let orejimeServiceSpy: jasmine.SpyObj<OrejimeService>;
   let scriptElementMock: any;
   let srcSpy: any;
   let innerHTMLSpy: any;
@@ -47,7 +47,7 @@ describe('GoogleAnalyticsService', () => {
       'startTracking',
     ]);
 
-    klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
+    orejimeServiceSpy = jasmine.createSpyObj('OrejimeService', {
       'getSavedPreferences': jasmine.createSpy('getSavedPreferences'),
     });
 
@@ -73,11 +73,11 @@ describe('GoogleAnalyticsService', () => {
       body: bodyElementSpy,
     });
 
-    klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-      GOOGLE_ANALYTICS_KLARO_KEY: true,
+    orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+      GOOGLE_ANALYTICS_OREJIME_KEY: true,
     }));
 
-    service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy );
+    service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy );
   });
 
   it('should be created', () => {
@@ -97,11 +97,11 @@ describe('GoogleAnalyticsService', () => {
           findByPropertyName: createFailedRemoteDataObject$(),
         });
 
-        klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-          GOOGLE_ANALYTICS_KLARO_KEY: true,
+        orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+          GOOGLE_ANALYTICS_OREJIME_KEY: true,
         }));
 
-        service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+        service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
       });
 
       it('should NOT add a script to the body', () => {
@@ -120,10 +120,10 @@ describe('GoogleAnalyticsService', () => {
       describe('when the tracking id is empty', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy();
-          klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
+          orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+            [GOOGLE_ANALYTICS_OREJIME_KEY]: true,
           }));
-          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
         });
 
         it('should NOT add a script to the body', () => {
@@ -141,8 +141,8 @@ describe('GoogleAnalyticsService', () => {
       describe('when google-analytics cookie preferences are not existing', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
-          klaroServiceSpy.getSavedPreferences.and.returnValue(of({}));
-          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+          orejimeServiceSpy.getSavedPreferences.and.returnValue(of({}));
+          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
         });
 
         it('should NOT add a script to the body', () => {
@@ -161,10 +161,10 @@ describe('GoogleAnalyticsService', () => {
       describe('when google-analytics cookie preferences are set to false', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
-          klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: false,
+          orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+            [GOOGLE_ANALYTICS_OREJIME_KEY]: false,
           }));
-          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
         });
 
         it('should NOT add a script to the body', () => {
@@ -183,10 +183,10 @@ describe('GoogleAnalyticsService', () => {
 
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
-          klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
+          orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+            [GOOGLE_ANALYTICS_OREJIME_KEY]: true,
           }));
-          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
         });
 
         it('should create a script tag whose innerHTML contains the tracking id', () => {
@@ -220,10 +220,10 @@ describe('GoogleAnalyticsService', () => {
 
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV3TestValue);
-          klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
+          orejimeServiceSpy.getSavedPreferences.and.returnValue(of({
+            [GOOGLE_ANALYTICS_OREJIME_KEY]: true,
           }));
-          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
+          service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, orejimeServiceSpy, configSpy, documentSpy);
         });
 
         it('should create a script tag whose innerHTML contains the tracking id', () => {
diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts
index 508297c3b9..d638b0ce39 100644
--- a/src/app/statistics/google-analytics.service.ts
+++ b/src/app/statistics/google-analytics.service.ts
@@ -11,8 +11,8 @@ import { combineLatest } from 'rxjs';
 
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { KlaroService } from '../shared/cookies/klaro.service';
-import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import { OrejimeService } from '../shared/cookies/orejime.service';
+import { GOOGLE_ANALYTICS_OREJIME_KEY } from '../shared/cookies/orejime-configuration';
 import { isEmpty } from '../shared/empty.util';
 
 /**
@@ -25,7 +25,7 @@ export class GoogleAnalyticsService {
   constructor(
     private googleAnalytics: Angulartics2GoogleAnalytics,
     private googleGlobalSiteTag: Angulartics2GoogleGlobalSiteTag,
-    private klaroService: KlaroService,
+    private orejimeService: OrejimeService,
     private configService: ConfigurationDataService,
     @Inject(DOCUMENT) private document: any,
   ) {
@@ -41,12 +41,12 @@ export class GoogleAnalyticsService {
     const googleKey$ = this.configService.findByPropertyName('google.analytics.key').pipe(
       getFirstCompletedRemoteData(),
     );
-    const preferences$ = this.klaroService.getSavedPreferences();
+    const preferences$ = this.orejimeService.getSavedPreferences();
 
     combineLatest([preferences$, googleKey$])
       .subscribe(([preferences, remoteData]) => {
         // make sure user has accepted Google Analytics consents
-        if (isEmpty(preferences) || isEmpty(preferences[GOOGLE_ANALYTICS_KLARO_KEY]) || !preferences[GOOGLE_ANALYTICS_KLARO_KEY]) {
+        if (isEmpty(preferences) || isEmpty(preferences[GOOGLE_ANALYTICS_OREJIME_KEY]) || !preferences[GOOGLE_ANALYTICS_OREJIME_KEY]) {
           return;
         }
 
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 6d97effb4c..586ba9424f 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -783,23 +783,17 @@
   "cookies.consent.app.purpose": "اللحوم",
   "cookies.consent.app.required.description": "هذا التطبيق مطلوب تكرارا",
   "cookies.consent.app.required.title": "(مطلوب مرة أخرى)",
-  "cookies.consent.app.disable-all.description": "استخدم هذا الزر لتفعيل جميع الخدمات أو جونسونها.",
-  "cookies.consent.app.disable-all.title": "تفعيل أو تفعيل كل الخدمات",
   "cookies.consent.update": "لقد قمت بتغيير بعض التغييرات منذ الآن، يرجى تحديث موافقتك.",
   "cookies.consent.close": "إغلاق",
   "cookies.consent.decline": "الرفض",
   "cookies.consent.ok": "لا بأس",
   "cookies.consent.save": "حفظ",
-  "cookies.consent.content-notice.title": "الموافقة على ملفات تعريف الارتباط",
   "cookies.consent.content-notice.description": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>. <br/> لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
-  "cookies.consent.content-notice.description.no-privacy": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>.",
   "cookies.consent.content-notice.learnMore": "تخصيص",
   "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي تجمعها عنك.",
   "cookies.consent.content-modal.privacy-policy.name": "سياسة الخصوصية",
   "cookies.consent.content-modal.privacy-policy.text": "لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
   "cookies.consent.content-modal.title": "المعلومات التي بجمعها",
-  "cookies.consent.content-modal.services": "خدمات",
-  "cookies.consent.content-modal.service": "خدمة",
   "cookies.consent.app.title.authentication": "استيثاق",
   "cookies.consent.app.description.authentication": "مطلوب لتسجيل دخولك",
   "cookies.consent.app.title.preferences": "التفضيلات",
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index e257ebafc5..c382a90a81 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -2232,12 +2232,6 @@
   // "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.",
 
@@ -2253,15 +2247,9 @@
   // "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",
 
@@ -2277,12 +2265,6 @@
   // "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ó",
 
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0b4168cca9..d4ea21e110 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2517,12 +2517,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(vždy vyžadováno)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  "cookies.consent.app.disable-all.description": "Pomocí tohoto přepínače povolíte nebo zakážete všechny služby.",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  "cookies.consent.app.disable-all.title": "Povolit nebo zakázat všechny služby.",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Od vaší poslední návštěvy došlo ke změnám, aktualizujte prosím svůj souhlas.",
 
@@ -2538,15 +2532,9 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Uložit",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Souhlas se soubory Cookie",
-
   // "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": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <br/> Chcete-li se dozvědět více, přečtěte si prosím naše {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": "Vaše osobní údaje shromažďujeme a zpracováváme pro následující účely: <strong>Ověření, Preference, Potvrzení a Statistiky</strong>. <strong>Využíváme osobní údaje pro tyto účely:",
-
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Přizpůsobit",
 
@@ -2562,12 +2550,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informace, které shromažďujeme",
 
-  // "cookies.consent.content-modal.services": "services",
-  "cookies.consent.content-modal.services": "služby",
-
-  // "cookies.consent.content-modal.service": "service",
-  "cookies.consent.content-modal.service": "služba",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Ověřování",
 
@@ -11036,4 +11018,4 @@
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index a7e13009ff..3001273249 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -1004,7 +1004,6 @@
   "cookies.consent.content-modal.privacy-policy.text": "Για να μάθετε περισσότερα, διαβάστε την {Πολιτική απορρήτου} μας.",
   "cookies.consent.content-modal.title": "Πληροφορίες που συλλέγουμε",
   "cookies.consent.content-notice.description": "Συλλέγουμε και επεξεργαζόμαστε τα προσωπικά σας στοιχεία για τους ακόλουθους σκοπούς: <strong>Έλεγχος ταυτότητας, Προτιμήσεις, Αναγνώριση και Στατιστικά</strong>. <br/> Για να μάθετε περισσότερα, διαβάστε την {privacyPolicy} μας.",
-  "cookies.consent.content-notice.description.no-privacy": "Συλλέγουμε και επεξεργαζόμαστε τα προσωπικά σας στοιχεία για τους ακόλουθους σκοπούς: <strong>Έλεγχος ταυτότητας, Προτιμήσεις, Αναγνώριση και Στατιστικά</strong>.",
   "cookies.consent.content-notice.learnMore": "Προσαρμογή",
   "cookies.consent.decline": "Απόρριψη",
   "cookies.consent.purpose.functional": "Λειτουργικός",
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8f20c657f9..babc90d436 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1582,25 +1582,19 @@
 
   "cookies.consent.app.required.title": "(always required)",
 
-  "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-
-  "cookies.consent.app.disable-all.title": "Enable or disable all services",
-
   "cookies.consent.update": "There were changes since your last visit, please update your consent.",
 
   "cookies.consent.close": "Close",
 
   "cookies.consent.decline": "Decline",
 
+  "cookies.consent.decline-all": "Decline all",
+
   "cookies.consent.ok": "That's ok",
 
   "cookies.consent.save": "Save",
 
-  "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.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": "We collect and process your personal information for the following purposes: {purposes}",
 
   "cookies.consent.content-notice.learnMore": "Customize",
 
@@ -1612,10 +1606,6 @@
 
   "cookies.consent.content-modal.title": "Information that we collect",
 
-  "cookies.consent.content-modal.services": "services",
-
-  "cookies.consent.content-modal.service": "service",
-
   "cookies.consent.app.title.authentication": "Authentication",
 
   "cookies.consent.app.description.authentication": "Required for signing you in",
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 55962d25b5..62c3ade873 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -2277,12 +2277,6 @@
   // "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.",
 
@@ -2298,15 +2292,9 @@
   // "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.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",
 
@@ -2322,12 +2310,6 @@
   // "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",
 
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 227d3519e4..9fe02db4d9 100644
--- a/src/assets/i18n/fi.json5
+++ b/src/assets/i18n/fi.json5
@@ -2341,12 +2341,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(aina pakollinen)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  "cookies.consent.app.disable-all.description": "Tästä kytkimestä voit ottaa kaikki palvelut käyttöön tai poistaa ne käytöstä",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  "cookies.consent.app.disable-all.title": "Ota käyttöön tai poista käytöstä kaikki palvelut",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Viime käyntisi jälkeen on tehty muutoksia. Ole hyvä ja päivitä suostumuksesi.",
 
@@ -2362,15 +2356,9 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Tallenna",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Evästeiden hyväksyntä",
-
   // "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": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>. <br/> Lisätietoa saat lukemalla tämän: {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": "Keräämme ja käsittelemme tietojasi seuraaviin tarkoituksiin: <strong>todentaminen, asetukset, kuittaus ja tilastot</strong>.",
-
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Räätälöi",
 
@@ -2386,12 +2374,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Keräämämme tieto",
 
-  // "cookies.consent.content-modal.services": "services",
-  "cookies.consent.content-modal.services": "palvelut",
-
-  // "cookies.consent.content-modal.service": "service",
-  "cookies.consent.content-modal.service": "palvelu",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Todentaminen",
 
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index 0513f48965..3f1806bfb2 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -1616,8 +1616,6 @@
 
   "cookies.consent.content-notice.description": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>। <br/> अधिक जानने के लिए, कृपया हमारी {privacyPolicy} पढ़ें।",
 
-  "cookies.consent.content-notice.description.no-privacy": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>।",
-
   "cookies.consent.content-notice.learnMore": "अनुकूलित करें",
 
   "cookies.consent.decline": "अस्वीकार",
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 1b1702503f..1c79d894b3 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -2498,14 +2498,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(mindig szükséges)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  // TODO New key - Add a translation
-  "cookies.consent.app.disable-all.title": "Enable or disable all services",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Változások történtek az utolsó látogatása óta, frissítse a beleegyezését.",
 
@@ -2522,16 +2514,9 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Mentés",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Cookie elfogadása",
-
   // "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": "Mi gyűjtjük és feldolgozzuk a személyes adatait a következő célból: <strong>Hitelesítés, Beállítások, Elismerés és Statisztikák</strong>. <br/> Részletekért olvassa el: {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>.",
-  // TODO New key - Add a translation
-  "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.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Személyreszab",
 
@@ -2547,14 +2532,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Gyűjtött adatok",
 
-  // "cookies.consent.content-modal.services": "services",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.services": "services",
-
-  // "cookies.consent.content-modal.service": "service",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.service": "service",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Hitelesítés",
 
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
index 4a5d3a4881..098e9752bc 100644
--- a/src/assets/i18n/it.json5
+++ b/src/assets/i18n/it.json5
@@ -1958,12 +1958,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre obbligatorio)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  "cookies.consent.app.disable-all.description": "Utilizzare questo interruttore per abilitare o disabilitare tutti i servizi.",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  "cookies.consent.app.disable-all.title": "Abilitare o disabilitare tutti i servizi",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Ci sono stati dei cambiamenti dal tuo ultimo accesso, aggiorna il tuo consenso.",
 
@@ -1979,14 +1973,8 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Salvare",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Consenso ai cookie",
-
   // "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": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>. <br/> Per saperne di più, leggi 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": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: <strong>Autenticazione, Preferenze, Accettazione e Statistiche</strong>.",
+  "cookies.consent.content-notice.description": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: {purposes}",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizza",
@@ -2003,12 +1991,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informazioni che raccogliamo",
 
-  // "cookies.consent.content-modal.services": "services",
-  "cookies.consent.content-modal.services": "servizi",
-
-  // "cookies.consent.content-modal.service": "service",
-  "cookies.consent.content-modal.service": "servizio",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticazione",
 
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 09b31ff9ad..cb446a5838 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -2247,9 +2247,6 @@
   // "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": "Біз сіздің жеке ақпаратыңызды келесі мақсаттарда жинаймыз және өңдейміз: <strong>Аутентификация, Параметрлері, Растау және Статистикалар</strong>. <br/> Көбірек білу үшін, біздің  {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": "Біз сіздің жеке мәліметтеріңізді келесі мақсаттар үшін жинаймыз және өңдейміз: <strong>Аутентификация, Қалаулар, Растау және статистикасы</strong>.",
-
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Баптау",
 
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index f7fe80eabf..f90855f9a6 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -2689,13 +2689,7 @@
   "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
   "cookies.consent.app.description.google-recaptcha": "Podczas rejestracji i odzyskiwania hasła używamy narzędzia google reCAPTCHA",
-  "cookies.consent.app.disable-all.description": "Przełącz, aby zaakceptować lub odrzucić wszystkie",
-  "cookies.consent.app.disable-all.title": "Akceptowacja lub odrzucenie wszystkich",
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
-  "cookies.consent.content-modal.service": "usługa",
-  "cookies.consent.content-modal.services": "usługi",
-  "cookies.consent.content-notice.description.no-privacy": "Zbieramy i przetwarzamy Twoje dane w celu: <strong>autentykacji, ustawień preferencji i zgód oraz do celów statystycznych</strong>.",
-  "cookies.consent.content-notice.title": "Zgoda na ciasteczka",
   "cookies.consent.ok": "Zgadzam się",
   "cookies.consent.purpose.registration-password-recovery": "Rejestracja i odzyskiwanie hasła",
   "cookies.consent.save": "Zapisz",
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index c3b26a09d2..3a205a3b03 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -2369,12 +2369,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre requerido)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  "cookies.consent.app.disable-all.description": "Use esse comutador para ativar ou desativar todos os serviços.",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  "cookies.consent.app.disable-all.title": "Ativar ou desativar todos os serviços",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Houve alterações desde sua última visita, atualize seu consentimento.",
 
@@ -2390,15 +2384,9 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Salvar",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Consentimento de Cookies",
-
   // "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": "Coletamos e processamos suas informações pessoais para os seguintes propósitos: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>. <br/> Para aprender mais, por favor leia  nossa {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": "Coletamos e processamos suas informações pessoais para os seguintes propósitos: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>.",
-
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Customizar",
 
@@ -2414,12 +2402,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informações que coletamos",
 
-  // "cookies.consent.content-modal.services": "services",
-  "cookies.consent.content-modal.services": "Serviços",
-
-  // "cookies.consent.content-modal.service": "service",
-  "cookies.consent.content-modal.service": "serviço",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticação",
 
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 414b70448d..749bbda578 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -2412,12 +2412,6 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre necessária)",
 
-  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  "cookies.consent.app.disable-all.description": "Utilize este interruptor para ativar ou desativar todos os serviços.",
-
-  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  "cookies.consent.app.disable-all.title": "Ativar ou desativar todos os serviços",
-
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Existem alterações desde a sua última visita, atualize o seu consentimento.",
 
@@ -2433,15 +2427,9 @@
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Guardar",
 
-  // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Consentir cookies",
-
   // "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": "Recolhemos e processamos informação pessoal para os seguintes propósitos: <strong>Autenticação, Guardar Preferências, Termos de Uso e Estatísticas</strong>. <br/> Para saber mais, por favor leia a nossa {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": "Recolhemos e processamos as suas informações pessoais para os seguintes fins: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>.",
-
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Pesonalizar",
 
@@ -2457,12 +2445,6 @@
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informação que recolhemos",
 
-  // "cookies.consent.content-modal.services": "services",
-  "cookies.consent.content-modal.services": "serviços",
-
-  // "cookies.consent.content-modal.service": "service",
-  "cookies.consent.content-modal.service": "serviço",
-
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticação",
 
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
index 548343ed61..c114fa83de 100644
--- a/src/assets/i18n/sr-cyr.json5
+++ b/src/assets/i18n/sr-cyr.json5
@@ -658,23 +658,17 @@
   "cookies.consent.app.purpose": "Сврха",
   "cookies.consent.app.required.description": "Ова апликација је увек потребна",
   "cookies.consent.app.required.title": "(увек потребно)",
-  "cookies.consent.app.disable-all.description": "Користите овај прекидач да омогућите или онемогућите све услуге.",
-  "cookies.consent.app.disable-all.title": "Омогућите или онемогућите све услуге",
   "cookies.consent.update": "Било је промена од ваше последње посете, ажурирајте своју сагласност.",
   "cookies.consent.close": "Затворити",
   "cookies.consent.decline": "Одбити",
   "cookies.consent.ok": "То је у реду",
   "cookies.consent.save": "сачувати",
-  "cookies.consent.content-notice.title": "Сагласност за колачиће",
   "cookies.consent.content-notice.description": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>. <br/> Да бисте сазнали више, прочитајте нашу {privacyPolicy}.",
-  "cookies.consent.content-notice.description.no-privacy": "Прикупљамо и обрађујемо ваше личне податке у следеће сврхе: <strong>Провера аутентичности, подешавања, потврда и статистика</strong>.",
   "cookies.consent.content-notice.learnMore": "Прилагодити",
   "cookies.consent.content-modal.description": "Овде можете видети и прилагодити информације које прикупљамо о вама.",
   "cookies.consent.content-modal.privacy-policy.name": "Правила о приватности",
   "cookies.consent.content-modal.privacy-policy.text": "Да сазнате више, прочитајте нашу {privacyPolicy}.",
   "cookies.consent.content-modal.title": "Информације које прикупљамо",
-  "cookies.consent.content-modal.services": "Услуге",
-  "cookies.consent.content-modal.service": "Услуга",
   "cookies.consent.app.title.authentication": "Провера",
   "cookies.consent.app.description.authentication": "Потребно за пријављивање",
   "cookies.consent.app.title.preferences": "Подешавања",
diff --git a/src/assets/i18n/sr-lat.json5 b/src/assets/i18n/sr-lat.json5
index 38faa7aa18..a605acfdb1 100644
--- a/src/assets/i18n/sr-lat.json5
+++ b/src/assets/i18n/sr-lat.json5
@@ -658,23 +658,17 @@
   "cookies.consent.app.purpose": "Svrha",
   "cookies.consent.app.required.description": "Ova aplikacija je uvek potrebna",
   "cookies.consent.app.required.title": "(uvek potrebno)",
-  "cookies.consent.app.disable-all.description": "Koristite ovaj prekidač da omogućite ili onemogućite sve usluge.",
-  "cookies.consent.app.disable-all.title": "Omogućite ili onemogućite sve usluge",
   "cookies.consent.update": "Bilo je promena od vaše poslednje posete, ažurirajte svoju saglasnost.",
   "cookies.consent.close": "Zatvoriti",
   "cookies.consent.decline": "Odbiti",
   "cookies.consent.ok": "To je u redu",
   "cookies.consent.save": "sačuvati",
-  "cookies.consent.content-notice.title": "Saglasnost za kolačiće",
   "cookies.consent.content-notice.description": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>. <br/> Da biste saznali više, pročitajte našu {privacyPolicy}.",
-  "cookies.consent.content-notice.description.no-privacy": "Prikupljamo i obrađujemo vaše lične podatke u sledeće svrhe: <strong>Provera autentičnosti, podešavanja, potvrda i statistika</strong>.",
   "cookies.consent.content-notice.learnMore": "Prilagoditi",
   "cookies.consent.content-modal.description": "Ovde možete videti i prilagoditi informacije koje prikupljamo o vama.",
   "cookies.consent.content-modal.privacy-policy.name": "Pravila o privatnosti",
   "cookies.consent.content-modal.privacy-policy.text": "Da saznate više, pročitajte našu {privacyPolicy}.",
   "cookies.consent.content-modal.title": "Informacije koje prikupljamo",
-  "cookies.consent.content-modal.services": "Usluge",
-  "cookies.consent.content-modal.service": "Usluga",
   "cookies.consent.app.title.authentication": "Provera",
   "cookies.consent.app.description.authentication": "Potrebno za prijavljivanje",
   "cookies.consent.app.title.preferences": "Podešavanja",
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
index 4ebe2c05d1..01a71c3b97 100644
--- a/src/assets/i18n/vi.json5
+++ b/src/assets/i18n/vi.json5
@@ -638,8 +638,6 @@
   "cookies.consent.app.description.google-analytics": "Cho phép chúng tôi theo dõi dữ liệu thống kê",
   "cookies.consent.app.description.google-recaptcha": "Chúng tôi sử dụng dịch vụ google reCAPTCHA trong quá trình đăng ký và khôi phục mật khẩu",
   "cookies.consent.app.description.preferences": "Bắt buộc để lưu tùy chọn của bạn",
-  "cookies.consent.app.disable-all.description": "Sử dụng nút chuyển này để bật hoặc tắt tất cả dịch vụ.",
-  "cookies.consent.app.disable-all.title": "Bật hoặc tắt tất cả dịch vụ",
   "cookies.consent.app.opt-out.description": "Ứng dụng này đã được tải theo mặc định (nhưng bạn có thể chọn không tham gia)",
   "cookies.consent.app.purpose": "mục đích",
   "cookies.consent.app.required.description": "Ứng dụng này luôn được yêu cầu",
@@ -652,13 +650,9 @@
   "cookies.consent.content-modal.description": "Tại đây bạn có thể xem và tùy chỉnh thông tin mà chúng tôi thu thập được về bạn.",
   "cookies.consent.content-modal.privacy-policy.name": "chính sách bảo mật",
   "cookies.consent.content-modal.privacy-policy.text": "Để biết thêm vui lòng đọc {privacyPolicy} của chúng tôi.",
-  "cookies.consent.content-modal.service": "dịch vụ",
-  "cookies.consent.content-modal.services": "các dịch vụ",
   "cookies.consent.content-modal.title": "Thông tin mà chúng tôi thu thập",
   "cookies.consent.content-notice.description": "Chúng tôi thu thập và xử lý thông tin các nhân của bạn cho các mục đích sau: <strong>Xác thực các ưa thích xác nhận và thống kê</strong>. <br/>Để biết thêm vui lòng đọc {privacyPolicy} của chúng tôi.",
-  "cookies.consent.content-notice.description.no-privacy": "Chúng tôi thu thập và xử lý thông tin cá nhân của bạn cho các mục đích sau: <strong>Xác thực Cài đặt cá nhân Xác nhận và Thống kê</strong>.",
   "cookies.consent.content-notice.learnMore": "Tùy chỉnh",
-  "cookies.consent.content-notice.title": "Đồng ý sử dụng cookie",
   "cookies.consent.decline": "Từ chối",
   "cookies.consent.ok": "OK",
   "cookies.consent.purpose.functional": "Chức năng",
@@ -2541,4 +2535,4 @@
   "system-wide-alert.form.create.error": "Đã xảy ra lỗi trong quá trình tạo cảnh báo toàn hệ thống",
   "admin.system-wide-alert.breadcrumbs": "Cảnh báo toàn hệ thống",
   "admin.system-wide-alert.title": "Cảnh báo toàn hệ thống",
-}
\ No newline at end of file
+}
diff --git a/src/modules/app/browser-app.config.ts b/src/modules/app/browser-app.config.ts
index 6121cfc219..213b9de2f7 100644
--- a/src/modules/app/browser-app.config.ts
+++ b/src/modules/app/browser-app.config.ts
@@ -53,8 +53,8 @@ import { ClientMathService } from '../../app/core/shared/client-math.service';
 import { MathService } from '../../app/core/shared/math.service';
 import { BrowserXSRFService } from '../../app/core/xsrf/browser-xsrf.service';
 import { XSRFService } from '../../app/core/xsrf/xsrf.service';
-import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { BrowserOrejimeService } from '../../app/shared/cookies/browser-orejime.service';
+import { OrejimeService } from '../../app/shared/cookies/orejime.service';
 import { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper';
 import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
 import { SubmissionService } from '../../app/submission/submission.service';
@@ -118,8 +118,8 @@ export const browserAppConfig: ApplicationConfig = mergeApplicationConfig({
       useClass: ClientCookieService,
     },
     {
-      provide: KlaroService,
-      useClass: BrowserKlaroService,
+      provide: OrejimeService,
+      useClass: BrowserOrejimeService,
     },
     {
       provide: SubmissionService,
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 014a8f5daa..f07671afbe 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -37,7 +37,7 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { OrejimeService } from '../../app/shared/cookies/orejime.service';
 import { isNotEmpty } from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
@@ -75,7 +75,7 @@ export class BrowserInitService extends InitService {
     protected googleAnalyticsService: GoogleAnalyticsService,
     protected headTagService: HeadTagService,
     protected breadcrumbsService: BreadcrumbsService,
-    protected klaroService: KlaroService,
+    protected orejimeService: OrejimeService,
     protected authService: AuthService,
     protected themeService: ThemeService,
     protected menuService: MenuService,
@@ -123,7 +123,7 @@ export class BrowserInitService extends InitService {
       this.themeService.listenForThemeChanges(true);
       this.trackAuthTokenExpiration();
 
-      this.initKlaro();
+      this.initOrejime();
 
       await lastValueFrom(this.authenticationReady$());
 
@@ -155,12 +155,12 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * Initialize Klaro (once authentication is resolved)
+   * Initialize Orejime (once authentication is resolved)
    * @protected
    */
-  protected initKlaro() {
+  protected initOrejime() {
     this.authenticationReady$().subscribe(() => {
-      this.klaroService.initialize();
+      this.orejimeService.initialize();
     });
   }
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index f261f0f400..2117a6144d 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -146,7 +146,7 @@
   --ds-process-overview-table-user-column-width: 200px;
   --ds-process-overview-table-info-column-width: 250px;
   --ds-process-overview-table-actions-column-width: 80px;
-  
-  --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
-  --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
+
+  --green1: #1FB300;  // This variable represents the success color for the Orejime cookie banner
+  --button-text-color-cookie: #fff; // This variable represents the text color for buttons in the Orejime cookie banner
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 765b50ae86..cad91b24e9 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -37,23 +37,27 @@ body {
     z-index: 0;
 }
 
-.klaro
-.cookie-notice {
-  .cn-buttons {
-    .cm-btn.cm-btn-success {
-      color: var(--button-text-color-cookie);
-      background-color: var(--green1);
-    }
-    .cm-btn.cm-btn-success.cm-btn-accept-all {
-      color: var(--button-text-color-cookie);
-      background-color: var(--green1);
-    }
+.orejime-AppContainer .orejime-Notice-actionItem {
+  &.orejime-Notice-actionItem--save > button {
+    color: var(--button-text-color-cookie);
+    background-color: var(--green1);
   }
 }
 
-.klaro .cookie-modal a, .klaro .context-notice a, .klaro .cookie-notice a
-{
-  color: var(--green1);
+.orejime-ModalPortal {
+  .orejime-Button.orejime-AppToggles-enableAll,
+  .orejime-Modal-saveButton {
+    color: var(--button-text-color-cookie);
+    background-color: var(--green1);
+  }
+
+  .orejime-Modal-closeButton svg {
+    cursor: pointer;
+  }
+
+  a {
+    color: var(--green1);
+  }
 }
 
 .media-viewer
diff --git a/src/styles/_vendor.scss b/src/styles/_vendor.scss
index b2b94c2826..ef630cf098 100644
--- a/src/styles/_vendor.scss
+++ b/src/styles/_vendor.scss
@@ -3,3 +3,4 @@
 @import '~node_modules/bootstrap/scss/bootstrap.scss';
 @import '~node_modules/nouislider/dist/nouislider.min';
 @import '~node_modules/ngx-ui-switch/ui-switch.component.scss';
+@import '~node_modules/orejime/dist/orejime.scss';
diff --git a/yarn.lock b/yarn.lock
index 251232378c..ce6d57682a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5920,6 +5920,11 @@ executable@^4.1.1:
   dependencies:
     pify "^2.2.0"
 
+exenv@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
+  integrity sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==
+
 exponential-backoff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
@@ -7787,11 +7792,6 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaro@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.18.tgz#fef3a05fcd656451b941e11459f37d6c336e84c0"
-  integrity sha512-Q5nehkGeZuFerisW4oeeB1ax6dHDszWckR70EcxKvhFiJQ61CM0WBSo20yLbdvz8N9MFsOFu4RNCO9JsbkCxgQ==
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -8909,6 +8909,14 @@ ora@5.4.1, ora@^5.4.1:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
+orejime@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/orejime/-/orejime-2.3.0.tgz#1fc6f570c9bcb11538cc5d270997a526d8135af0"
+  integrity sha512-eDUgd5yEF5pCIUHPNXVDKmgH+4k4GEwxU7eexBFeVESba3ZYDHSDq4ULXiF2LnZwxg+H6Qi28o8rGfGxNeOriA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    react-modal "^3.13.1"
+
 os-tmpdir@^1.0.2, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -9902,6 +9910,21 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
+react-lifecycles-compat@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
+
+react-modal@^3.13.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.16.1.tgz#34018528fc206561b1a5467fc3beeaddafb39b2b"
+  integrity sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==
+  dependencies:
+    exenv "^1.2.0"
+    prop-types "^15.7.2"
+    react-lifecycles-compat "^3.0.0"
+    warning "^4.0.3"
+
 react-mosaic-component@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz#48a34e5e5c16654075212666c2aebeb488bab9f2"
@@ -11056,16 +11079,7 @@ streamroller@^3.1.5:
     debug "^4.3.4"
     fs-extra "^8.1.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11124,7 +11138,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11145,13 +11159,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -11857,6 +11864,13 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
+warning@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watchpack@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -12197,7 +12211,7 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -12215,15 +12229,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 2c20833410864509927a78d65dfdfff8269ac161 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:06:48 +0100
Subject: [PATCH 0315/1286] Update pt-PT.json5

Extensive revision of i18n pt-PT with the news translation strings introduced by DSpace v8.0 and other improvements > last updated 18th of july 2024.
---
 src/assets/i18n/pt-PT.json5 | 4245 +++++++++++++++++++++++++----------
 1 file changed, 3073 insertions(+), 1172 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 414b70448d..2a795ccb9b 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,6 +1,6 @@
 {
 
-  // Dspace v7.x > i18n pt-PT > last updated 14th of May 2024
+  // Dspace v8.x > i18n pt-PT > last updated 4th of july 2024
 
   // "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": "Não está autorizado a aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
@@ -8,7 +8,7 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Voltar à página de início",
 
-  // "401.unauthorized": "unauthorized",
+  // "401.unauthorized": "Unauthorized",
   "401.unauthorized": "Não 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.",
@@ -17,11 +17,11 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Voltar à página de início",
 
-  // "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
   "403.forbidden": "Proibido",
 
-  // "500.page-internal-server-error": "Service Unavailable",
-  "500.page-internal-server-error": "Serviço indisponível",
+  // "500.page-internal-server-error": "Service unavailable",
+ "500.page-internal-server-error": "Serviço indisponível",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
   "500.help": "O servidor encontra-se temporariamete indisponível para responder ao seu pedido, devido a processos de manutenção em curso ou capacidade de resposta. Por favor tente mais tarde.",
@@ -29,41 +29,41 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Voltar à página de início",
 
-  // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início. ",
+  // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Voltar à página de início",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "página não encontrada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Página não encontrada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "Não autorizado",
+  // "error-page.description.401": "Unauthorized",
+ "error-page.description.401": "Não autorizado",
 
-  // "error-page.description.403": "forbidden",
+  // "error-page.description.403": "Forbidden",
   "error-page.description.403": "Proibido",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Serviço indisponível",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "página não encontrada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Página não encontrada",
 
   // "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": "Ocorreu um erro com a sua autenticação via ORCID. Certifique-se que partilhou o seu endereço de email associado à sua conta ORCID com o repositório. Se o erro persistir, por favor contacte o administrador do sistema.",
 
   // "access-status.embargo.listelement.badge": "Embargo",
-  "access-status.embargo.listelement.badge": "Embargado",
+  "access-status.embargo.listelement.badge": "Acesso embargado",
 
   // "access-status.metadata.only.listelement.badge": "Metadata only",
-  "access-status.metadata.only.listelement.badge": "Apenas Metadados",
+  "access-status.metadata.only.listelement.badge": "Apenas metadados",
 
   // "access-status.open.access.listelement.badge": "Open Access",
-  "access-status.open.access.listelement.badge": "Acesso Aberto",
+  "access-status.open.access.listelement.badge": "Acesso aberto",
 
   // "access-status.restricted.listelement.badge": "Restricted",
-  "access-status.restricted.listelement.badge": "Acesso Restrito",
+  "access-status.restricted.listelement.badge": "Acesso restrito",
 
   // "access-status.unknown.listelement.badge": "Unknown",
   "access-status.unknown.listelement.badge": "Desconhecido",
@@ -89,7 +89,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Falha",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Criar formato de ficheiro",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -150,10 +150,10 @@
   "admin.registries.bitstream-formats.edit.internal.label": "Interno",
 
   // "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": "O MIME type associado a este formato não tem que ser único.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "O tipo MIME associado a este formato não tem que ser único.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
   "admin.registries.bitstream-formats.edit.shortDescription.hint": "Um nome único para este formato (exemplo. Microsoft Word XP ou Microsoft Word 2000)",
@@ -189,11 +189,14 @@
   "admin.registries.bitstream-formats.table.internal": "Interno",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
 
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formatos de ficheiros selecionados",
+
   // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
@@ -215,8 +218,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
 
-  // "admin.registries.bitstream-formats.select": "Select bitstream format",
-  "admin.registries.bitstream-formats.select": "Selecionar formato de ficheiro",
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Selecionar",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deselecionar",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registo de metadados",
@@ -242,9 +248,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Nenhum esquema de metadados para mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Selecionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deselecionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Apagar selecionado(s)",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemas selecionados",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -263,6 +278,12 @@
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Este é o esquema de metadados para \"{{namespace}}\".",
 
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Selecionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deselecionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Campos do esquema de metadados",
 
@@ -275,6 +296,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Campos de metadados selecionados",
+
   // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
@@ -300,7 +324,7 @@
   "admin.registries.schema.head": "Esquema de metadados",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.created": "Criou o esquema de metadados \"{{prefix}}\" com sucesso",
+  "admin.registries.schema.notification.created": "Criou o esquema de metadados \"{{prefix}}\"com sucesso",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Falhou ao apagar {{amount}} esquema(s) de metadados",
@@ -309,13 +333,13 @@
   "admin.registries.schema.notification.deleted.success": "Apagou {{amount}} esquema(s) de metadados com sucesso",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Editou o esquema de metadados \"{{prefix}}\" com sucesso",
+  "admin.registries.schema.notification.edited": "Editou o esquema de metadados \"{{prefix}}\"com sucesso",
 
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Erro",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.created": "Criou o campo de metadado \"{{field}}\" com sucesso",
+  "admin.registries.schema.notification.field.created": "Criou o campo de metadado \"{{field}}\"com sucesso",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "Falhou ao apagar {{amount}} campo(s) de metadados",
@@ -324,7 +348,7 @@
   "admin.registries.schema.notification.field.deleted.success": "Apagou {{amount}} campo(s) de metadados com sucesso",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Editou o campo de metadado \"{{field}}\" com sucesso",
+  "admin.registries.schema.notification.field.edited": "Editou o campo de metadado \"{{field}}\"com sucesso",
 
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Sucesso",
@@ -353,8 +377,8 @@
   // "admin.access-control.bulk-access-browse.search.header": "Search",
   "admin.access-control.bulk-access-browse.search.header": "Pesquisa",
 
-  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
-  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual({{number}})",
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection ({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual ({{number}})",
 
   // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
   "admin.access-control.bulk-access-settings.header": "Passo 2: Operação a realizar",
@@ -401,7 +425,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadados",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Email (exato)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -419,7 +443,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nome",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Email (exato)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -449,10 +473,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apelido",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Email",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Deve conter um email válido",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -470,11 +494,11 @@
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "Falha ao criar o Utilizador \"{{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": "Falha ao criar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
+  // "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": "Falha ao criar o Utilizador \"{{name}}\", o email \"{{email}}\"já está registado no repositório.",
 
-  // "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": "Falha ao editar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
+  // "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": "Falha ao editar o Utilizador \"{{name}}\", o email \"{{email}}\"já está registado no repositório.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "Utilizador editado com successo \"{{name}}\"",
@@ -506,8 +530,8 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Adicionar a grupos",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\" e mensagem: \"{{restResponse.errorMessage}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\"with code: \"{{statusCode}}\"and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\"e mensagem: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Utilizador removido com sucesso: \"{{name}}\"",
@@ -584,8 +608,8 @@
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Este grupo é permanente, não pode ser editado ou apagado. Pode adicionar ou remover membros deste grupo nesta 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 não pode ser editado ou apagado porque corresponde a um papel no 'workflow' de depósito em \"{{name}}\" {{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta 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 não pode ser editado ou apagado porque corresponde a um papel no 'workflow' de depósito em \"{{name}}\"{{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta página.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Criar grupo",
@@ -614,8 +638,8 @@
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "Falha ao editar 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": "Nome \"{{name}}\" já utilizado!",
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\"already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\"já utilizado!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "Grupo editado com sucesso \"{{name}}\"",
@@ -656,12 +680,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Membros atuais",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadados",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (completo)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Pesquisar",
 
@@ -746,9 +764,6 @@
   // "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": "Adicionar subgrupo com o nome \"{{name}}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo atual",
-
   // "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 adicionado com sucesso: \"{{name}}\"",
 
@@ -776,408 +791,20 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Controlo de qualidade",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugestões para controlo de qualidade",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugestões para controlo de qualidade",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Controlo de qualidade",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
-
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
-
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
-
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
-
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
-
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
-
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
-
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
-
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
-
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
-
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
-
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
-
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
-
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.exists": "exists",
-
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotExist": "does not exist",
-
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.equals": "equals",
-
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotEqual": "does not equal",
-
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.like": "like",
-
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.notLike": "not like",
-
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.contains": "contains",
-
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotContain": "does not contain",
-
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.matches": "matches",
-
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotMatch": "does not match",
-
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
-
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
-
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
-  "admin.reports.items.number": "No.",
-
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
-  "admin.reports.items.id": "UUID",
-
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
-
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
-  "admin.reports.items.handle": "URI",
-
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
-
-
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
-  "admin.reports.commons.additional-data": "Additional data to return",
-
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
-
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
-
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
-
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
-  "admin.reports.commons.of": "of",
-
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
-
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
-
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
-
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
-
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property": "Item Property Filters",
-
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
-
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Controlo de qualidade",
 
   // "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.editGroupPage": "Nesta página, pode modificar as propriedades e os membros de um grupo. Na secção superior, pode editar o nome e a descrição do grupo, a menos que se trate de um grupo administrativo para uma coleção ou comunidade, em que o nome e a descrição do grupo são auto-gerados e não podem ser editados. Nas seções seguintes, pode editar o nome e a descrição do grupo. Ver [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+ou+gerir+a+utilizador+grupo) para mais detalhes.",
@@ -1188,6 +815,309 @@
   // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
   "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar grupos. Depois clique no ícone 'mais' para cada grupo que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada grupo que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes.",
 
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Relatório de coleção filtrado",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Relatório de coleção filtrado",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Relatório de coleção filtrado",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar coleções",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Relatório de coleção",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultados de item",
+
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunidade",
+
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Coleção",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "N.º itens",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Correspondência com todos os filtros seleccionados",
+
+  // "admin.reports.items.title": "Metadata Query Report",
+  "admin.reports.items.title": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Executar consulta de item",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Seletor de coleção",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultas de campos de metadados",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultas predefinidas",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar consultas",
+
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Limitar/",
+
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desvio (Offset)",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Todo o repositório",
+
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Qualquer campo",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "não existe",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "igual a",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "não é igual",
+
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "como",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "não é como",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contém",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "não contém",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "corresponde",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "não corresponde",
+
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nova consulta",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Não tem título",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Não tem 'dc.identifier.uri'",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Tem composto 'subject'",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Tem composto 'dc.contributor.author'",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Tem composto 'dc.creator'",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Tem um URL em 'dc.description'",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "Tem 'texto integral' referido em 'dc.description.provenance'",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Não tem 'texto integral' referido em 'dc.description.provenance'",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Tem metadados vazios",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Tem metadados inquebrados na descrição",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Tem uma entidade XML nos metadados",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Tem caractere não-ascii nos metadados",
+
+  // "admin.reports.items.number": "No.",
+  "admin.reports.items.number": "N.º",
+
+  // "admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Coleção",
+
+  // "admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Título",
+
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtros",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Dados adicionais para devolver",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Página anterior",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Próxima página",
+
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Página",
+
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar para atualização de metadados",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Anular a seleção de todos os filtros",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Selecionar todos os filtros",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Corresponde a todos os filtros especificados",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtros de propriedades do item",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "É Item - sempre verdadeiro",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Itens retirados",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Itens disponíveis - Não retirados",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Itens detectáveis - Não privados",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Não detetável - Item privado",
+
+  // "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  "admin.reports.commons.filters.property.all_filters.tooltip": "Este filtro inclui todos os itens que correspondem a TODOS os filtros especificados",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtros básicos de ficheiros",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "O item tem vários ficheiros",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "O item não tem ficheiros originais",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "O item tem um ficheiro original",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtros de ficheiros por tipo MIME",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "O item tem um ficheiro 'documental' original (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "O item tem um ficheiro 'imagem' original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tem outros tipos de ficheiros (não 'documentais' ou 'imagem')",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "O item tem vários tipos de ficheiros originais (Documento, Imagem, Outros)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "O item tem um ficheiro PDF original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "O item tem um ficheiro JPG original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tem um PDF invulgarmente pequeno",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tem um PDF invulgarmente grande",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tem ficheiro 'documental' sem item 'TEXT'",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtros de tipos MIME suportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Itens com ficheiro 'imagem' são suportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "O item tem ficheiro de 'imagem' que não é suportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Itens com ficheiros 'documentais' são suportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "O item tem ficheiro 'documental' que não é suportado",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtros de pacotes de ficheiros",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tem ficheiro num pacote não suportado",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tem uma miniatura invulgarmente pequena",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tem ficheiro original sem miniatura",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tem miniatura com nome inválido (assume uma miniatura para cada original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tem uma miniatura não gerada",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "Não tem licença",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Tem documentação no pacote de licenças",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtros de permissões",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "O item tem um ficheiro original restrito",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "O item tem pelo menos um ficheiro original que não é acessível a utilizadores anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "O item tem uma miniatura restrita",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "O item tem pelo menos uma miniatura que não é acessível a utilizadores anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "O item tem metadados restritos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "O item tem metadados que não são acessíveis ao utilizadores anónimos",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa administrativa",
 
@@ -1299,10 +1229,10 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Selecione um ficheiro!",
 
-  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
   "admin.metadata-import.page.error.addFileUrl": "Insira primeiro o URL do ficheiro!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
   "admin.batch-import.page.error.addFile": "Selecione primeiro o ficheiro .zip!",
 
   // "admin.metadata-import.page.toggle.upload": "Upload",
@@ -1443,11 +1373,11 @@
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Voltar",
 
-  // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Ficheiros: ",
+  // "bitstream.edit.bitstream": "Bitstream:",
+  "bitstream.edit.bitstream": "Ficheiros:",
 
-  // "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, pode indicar uma breve descrição do ficheiro, por exemplo \"<i>Texto Principal</i>\" ou \"<i>Dados da experiência</i>\".",
+  // "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, pode indicar uma breve descrição do ficheiro, por exemplo \"<i>Texto Principal</i>\"ou \"<i>Dados da experiência</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Descrição",
@@ -1470,11 +1400,11 @@
   // "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": "A aplicação usada para criar o ficheiro e a respetiva versão (por exemplo, \"<i>ACMESoft SuperApp versão 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "bitstream.edit.form.primaryBitstream.label": "Ficheiro primário",
 
-  // "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": "Se o formato não se encontrar listado, selecione por favor a opção <b> \"Formato não está na lista\" </b> e faculte detalhes em \"Descreva o novo formato\".",
+  // "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": "Se o formato não se encontrar listado, selecione por favor a opção <b> \"Formato não está na lista\"</b> e faculte detalhes em \"Descreva o novo formato\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Formato selecionado",
@@ -1501,13 +1431,13 @@
   "bitstream.edit.form.iiifToc.hint": "Ao acrescentar texto aqui dá início a uma tabela de conteúdos.",
 
   // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
-  "bitstream.edit.form.iiifWidth.label": "Largura do canvas IIIF",
+  "bitstream.edit.form.iiifWidth.label": "Largura Canvas IIIF",
 
   // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
   "bitstream.edit.form.iiifWidth.hint": "A largura do canvas normalmente deve corresponder à largura da imagem.",
 
   // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
-  "bitstream.edit.form.iiifHeight.label": "Altura do canvas IIIF",
+  "bitstream.edit.form.iiifHeight.label": "Altura Canvas IIIF",
 
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "A altura do canvas normalmente deve corresponder à altura da imagem.",
@@ -1521,8 +1451,8 @@
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Editar ficheiro",
 
-  // "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": "Já tem acesso a este ficheiro. Se quiser descarregar o ficheiro, clique ",
+  // "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": "Já tem acesso a este ficheiro. Se quiser descarregar o ficheiro, clique",
 
   // "bitstream-request-a-copy.alert.canDownload2": "here",
   "bitstream-request-a-copy.alert.canDownload2": "aqui",
@@ -1530,14 +1460,14 @@
   // "bitstream-request-a-copy.header": "Request a copy of the file",
   "bitstream-request-a-copy.header": "Solicitar cópia ao autor",
 
-  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
-  "bitstream-request-a-copy.intro": "Preencha a seguinte informação para solicitar uma cópia do ficheiro: ",
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item:",
+  "bitstream-request-a-copy.intro": "Preencha a seguinte informação para solicitar uma cópia do ficheiro:",
 
-  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
-  "bitstream-request-a-copy.intro.bitstream.one": "Solicitar o seguinte ficheiro: ",
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Solicitar o seguinte ficheiro:",
 
-  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
-  "bitstream-request-a-copy.intro.bitstream.all": "Solicitar todos os ficheiros. ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files.",
+  "bitstream-request-a-copy.intro.bitstream.all": "Solicitar todos os ficheiros.",
 
   // "bitstream-request-a-copy.name.label": "Name *",
   "bitstream-request-a-copy.name.label": "O seu nome *",
@@ -1545,7 +1475,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "O preenchimento do nome é um elemento obrigatório!",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "O seu endereço de correio eletrónico *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1617,6 +1547,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "título",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "vocabulário controlado (SRSC)",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Percorrer por autor",
 
@@ -1629,9 +1562,15 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado",
 
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Selecionar um assunto para adicionar como filtro de pesquisa",
+
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
+  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.descrption": "Selecionar um índice para adicionar como filtro de pesquisa",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",
 
@@ -1722,11 +1661,11 @@
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Pesquisar",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Percorrer {{ collection }} por {{ field }}{{ startsWith }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Percorrer por {{ field }}{{ startsWith }} {{ value }}",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Percorrer {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Percorrer por {{ field }} {{ value }}",
 
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Voltar aos resultados",
@@ -1743,6 +1682,12 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, reenviado para a área de trabalho do gestor de revisão",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Criar coleção",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Procurar um logótipo de coleção",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Criar uma coleção",
 
@@ -2037,11 +1982,17 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Coleção",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logótipo coleção",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Pesquisa",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Entradas recentes",
 
   // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "Nenhum item a exibir",
+  "collection.page.browse.recent.empty": "Nenhum item para exibir",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta coleção",
@@ -2055,17 +2006,23 @@
   // "collection.page.news": "News",
   "collection.page.news": "Notícias",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultados da pesquisa",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleção",
 
   // "collection.select.empty": "No collections to show",
-  "collection.select.empty": "Nenhuma coleção a mostrar",
+  "collection.select.empty": "Nenhuma coleção para mostrar",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Coleções selecionadas",
 
   // "collection.select.table.select": "Select collection",
   "collection.select.table.select": "Selecionar coleção",
 
   // "collection.select.table.deselect": "Deselect collection",
-  "collection.select.table.deselect": "Desmarcar coleção",
+  "collection.select.table.deselect": "Desselecionar coleção",
 
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
@@ -2157,6 +2114,21 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Expandir",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Colapsar {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Procurar um logótipo de comunidade",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunidades e Coleções",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Criar comunidade",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Criar uma comunidade",
 
@@ -2176,22 +2148,22 @@
   "community.delete.confirm": "Confirmar",
 
   // "community.delete.processing": "Deleting...",
-  "community.delete.processing": "A apagar...",
+  "community.delete.processing": "A eliminar...",
 
   // "community.delete.head": "Delete Community",
-  "community.delete.head": "Apagar comunidade",
+  "community.delete.head": "Eliminar comunidade",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Não foi possível apagar a comunidade",
+  "community.delete.notification.fail": "Não foi possível eliminar a comunidade",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  "community.delete.notification.success": "Comunidade apagada com sucesso",
+  "community.delete.notification.success": "Comunidade eliminada com sucesso",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  "community.delete.text": "Você tem certeza que quer apagar a comunidade \"{{ dso }}\"?",
+  "community.delete.text": "Você tem certeza que quer eliminar a comunidade \"{{ dso }}\"?",
 
   // "community.edit.delete": "Delete this community",
-  "community.edit.delete": "Apagar esta comunidade",
+  "community.edit.delete": "Eliminar esta comunidade",
 
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Editar comunidade",
@@ -2200,18 +2172,24 @@
   "community.edit.breadcrumbs": "Editar Comunidade",
 
   // "community.edit.logo.delete.title": "Delete logo",
-  "community.edit.logo.delete.title": "Apagar logótipo",
+  "community.edit.logo.delete.title": "Eliminar logótipo",
+
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar a eliminação",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
-  "community.edit.logo.delete-undo.title": "Não apagar logótipo",
+  "community.edit.logo.delete-undo.title": "Não eliminar logótipo",
+
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Não eliminar logótipo",
 
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logótipo da comunidade",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Falha ao carregar o logótipo da comunidade. Verifique o conteúdo antes de tentar de novo.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
   "community.edit.logo.notifications.add.success": "Logótipo da comunindade carregado com sucesso.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
@@ -2223,7 +2201,7 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Erro ao apagar o logótipo",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Arraste um logótipo da comunidade para carregar",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
@@ -2232,7 +2210,7 @@
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Não tem os privilégios necessários para efetuar esta alteração",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occured while editing the community",
   "community.edit.notifications.error": "Ocorreu um erro ao editar a comunidade",
 
   // "community.edit.return": "Back",
@@ -2271,6 +2249,9 @@
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidade",
 
+  // "community.logo": "Community logo",
+  "community.logo": "Logótipo comunidade",
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Nenhum",
 
@@ -2385,6 +2366,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-comunidade e coleções",
 
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultados da pesquisa",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Coleções desta comunidade",
 
@@ -2574,6 +2558,12 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Pedido de cópia recusado com sucesso!",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Limpar seleção",
+
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Limpar a opção selecionada",
+
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sem título",
 
@@ -2634,6 +2624,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Pesquisar por um(a) {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidade",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "coleção",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "item",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Selecione uma coleção",
 
@@ -2650,7 +2649,7 @@
   "dso-selector.set-scope.community.input-header": "Pesquisar por uma comunidade ou coleção",
 
   // "dso-selector.claim.item.head": "Profile tips",
-  "dso-selector.claim.item.head": "Dicas de Perfil",
+  "dso-selector.claim.item.head": "Dicas 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": "Estes são os perfis existentes que poderão estar relacionados consigo. Se se identificar num destes perfis, selecione-o e na página de detalhes, entre as opções, pode reivindicá-lo. Caso contrário, pode criar um novo perfil de raiz, selecionando o botão em baixo.",
@@ -2739,6 +2738,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Apagar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Tem a certeza de que pretende apagar o logótipo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Apagar perfil",
 
@@ -2764,7 +2766,7 @@
   "confirmation-modal.delete-subscription.confirm": "Apagar",
 
   // "error.bitstream": "Error fetching bitstream",
-  "error.bitstream": "Erro ao aceder ao ficheiro!",
+  "error.bitstream": "Erro ao carregar ficheiro!",
 
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Erro ao carregar itens!",
@@ -2799,8 +2801,8 @@
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Erro ao carregar os resultados da pesquisa!",
 
-  // "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": "A query da pesquisa não é válida! Por favor verifique <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": "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": "A query da pesquisa não é válida! Por favor verifique <a href='https://solr.apache.org/guide/query-syntax-and-parsing.html' target=\'_blank\'>Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções!",
@@ -2826,10 +2828,10 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Este campo é de preenchimento obrigatório!",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Este endereço de correio electrónico não é válido!",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Este endereço de correio electrónico já se encontra atribuido!",
 
   // "error.validation.groupExists": "This group already exists",
@@ -2859,13 +2861,13 @@
   "feed.description": "Feed",
 
   // "file-download-link.restricted": "Restricted bitstream",
-  "file-download-link.restricted": "'Bitstream' restrito",
+  "file-download-link.restricted": "Ficheiro restrito",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  "file-section.error.header": "Erro na obteção de ficheiros para este item!",
+  "file-section.error.header": "Erro na obtenção de ficheiros para este item!",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  "footer.copyright": "Copyright © 2003-{{ year }}",
+  "footer.copyright": "Copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "Powered by DSpace",
@@ -2885,6 +2887,9 @@
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Contacte-nos",
 
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Esqueci a senha",
 
@@ -2933,8 +2938,8 @@
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Identificação",
 
-  // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "Endereço de correio eletrónico: ",
+  // "forgot-password.form.identification.email": "Email address:",
+  "forgot-password.form.identification.email": "Endereço de correio eletrónico:",
 
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Palavra-chave",
@@ -2942,8 +2947,8 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Insira a senha novamente para confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  "forgot-password.form.error.empty-password": "Indique uma senha na caixa abaixo.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "Indique uma senha nas caixas em cima.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "As palavras de acesso não coincidem.",
@@ -3027,7 +3032,7 @@
   "form.other-information.first-name": "Nome",
 
   // "form.other-information.insolr": "In Solr Index",
-  "form.other-information.insolr": "No índice SOLR",
+  "form.other-information.insolr": "No índice Solr",
 
   // "form.other-information.institution": "Institution",
   "form.other-information.institution": "Instituição",
@@ -3059,6 +3064,12 @@
   // "form.create": "Create",
   "form.create": "Criar",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrescer {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Largue o item na nova posição",
 
@@ -3159,7 +3170,7 @@
   "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   // "health-page.section-info.app.title": "Application Backend",
-  "health-page.section-info.app.title": "Aplicação Backend",
+  "health-page.section-info.app.title": "Aplicação de Backend",
 
   // "health-page.section-info.java.title": "Java",
   "health-page.section-info.java.title": "Java",
@@ -3188,7 +3199,7 @@
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Página inicial",
 
-  //"home.search-form.placeholder": "Search the repository...",
+  // "home.search-form.placeholder": "Search the repository...",
   "home.search-form.placeholder": "pesquisar no repositório...",
 
   // "home.title": "Home",
@@ -3224,7 +3235,7 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Termos de Uso",
 
-  //  "info.end-user-agreement.hosting-country": "the United States",
+  // "info.end-user-agreement.hosting-country": "the United States",
   "info.end-user-agreement.hosting-country": "Portugal",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
@@ -3275,12 +3286,24 @@
   // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "Esta é a página/URL que contextualiza o seu contacto.",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Suporte COAR Notify",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Suporte COAR Notify",
+
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este item é privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este item foi retirado",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Requer reposição",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Requerido por",
+
   // "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": "Com este editor pode ver e alterar as políticas de um item, bem como alterar políticas de componentes individuais do item: 'pacotes' (bundles) e 'ficheiros' (bitstreams). Em resumo, um item contém 'pacotes' e os pacotes contêm 'ficheiros'. Os pacotes usualmente possuem políticas de ADICIONAR/REMOVER/LER/ESCREVER, por outro lado, os ficheiros apenas possuem políticas de LER/ESCREVER.",
 
@@ -3311,8 +3334,8 @@
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Arraste um ficheiro para carregar",
 
-  // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Item: ",
+  // "item.bitstreams.upload.item": "Item:",
+  "item.bitstreams.upload.item": "Item:",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "O pacote foi criado com sucesso.",
@@ -3332,8 +3355,8 @@
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "Atualmente a mostrar {{ amount }} ficheiros de {{ total }}.",
 
-  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  "item.edit.bitstreams.bundle.load.all": "Carregar todos ({{ total }})",
+  // "item.edit.bitstreams.bundle.load.all": "Load all  ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Carregar todos  ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Carregar mais",
@@ -3543,7 +3566,7 @@
   "item.edit.item-mapper.notifications.add.success.content": "Mapeou o item em {{amount}} coleções com sucesso.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  "item.edit.item-mapper.notifications.add.success.head": "Mapeamento complesto",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapeamento completo",
 
   // "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": "Ocorreram erros ao remover mapeamento do item em {{amount}} coleções.",
@@ -3578,6 +3601,9 @@
   // "item.edit.metadata.edit.value": "Edit value",
   "item.edit.metadata.edit.value": "Editar valor",
 
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar valor de autoridade",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3596,7 +3622,7 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Parar edição",
 
-  // "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.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.edit.buttons.virtual": "Este é um valor de metadados virtual, ou seja, um valor herdado de uma entidade relacionada. Não pode ser modificado diretamente. Adicionar ou remover a relação correspondente no separador 'Relacionamentos'",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
@@ -3606,7 +3632,7 @@
   "item.edit.metadata.headers.edit": "Editar",
 
   // "item.edit.metadata.headers.field": "Field",
-  "item.edit.metadata.headers.field": "Campo (metadado)",
+  "item.edit.metadata.headers.field": "Campo",
 
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Idioma",
@@ -3614,11 +3640,14 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar campo",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "item.edit.metadata.metadatafield.error": "Ocorreu um erro ao validar o campo de metadados",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  "item.edit.metadata.metadatafield.invalid": "Por favor escolha um campo de metadados válido",
+  "item.edit.metadata.metadatafield.invalid": "Por favor, escolha um campo de metadados válido",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "As suas alterações foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
@@ -3656,6 +3685,15 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority:",
+  "item.edit.metadata.authority.label": "Autoridade:",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquear o valor da chave de autoridade para edição manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquear o valor da chave de autoridade para edição manual",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3684,13 +3722,13 @@
   "item.edit.move.head": "Mover item: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  "item.edit.move.inheritpolicies.checkbox": "Herdar politicas",
+  "item.edit.move.inheritpolicies.checkbox": "Herdar políticas",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Herdar as politicas padrões da coleção destino",
 
   // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
-  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando activada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
+  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando ativada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
 
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
@@ -3720,7 +3758,7 @@
   "item.edit.private.error": "Ocorreu um erro ao tornar o item privado",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  "item.edit.private.header": "Tornar privado o item: {{ id }}",
+  "item.edit.private.header": "Tornar o item privado: {{ id }}",
 
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "O item agora é privado",
@@ -3873,10 +3911,10 @@
   "item.edit.tabs.status.buttons.private.label": "Tornar o item privado",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
-  "item.edit.tabs.status.buttons.public.button": "Tornar público o item...",
+  "item.edit.tabs.status.buttons.public.button": "Tornar o item público...",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
-  "item.edit.tabs.status.buttons.public.label": "Tornar público o item",
+  "item.edit.tabs.status.buttons.public.label": "Tornar o item público",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Restabelecer...",
@@ -3965,8 +4003,8 @@
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Editora",
 
-  // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Item: ",
+  // "item.page.titleprefix": "Item:",
+  "item.page.titleprefix": "Item:",
 
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Título do volume",
@@ -3983,6 +4021,18 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Colapsar",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Existem {{num}} sugestões pendentes relacionadas com a sua conta",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Ver",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Existem {{num}} sugestões pendentes relacionadas com a sua conta",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Ver",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordem de supervisão",
 
@@ -4007,6 +4057,33 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remover grupo de supervisão",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Este valor de autoridade foi confirmado como exato por um utilizador interativo",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "O valor é singular e válido, mas não foi visto e aceite por um ser humano, pelo que ainda é incerto",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Existem vários valores de autoridade correspondentes com a mesma validade",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "Não há respostas correspondentes na autoridade",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "A autoridade deparou-se com uma falha interna",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "A autoridade recomenda que esta proposta seja rejeitada",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "Não foi devolvido qualquer valor de confiança razoável pela autoridade",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Nunca foi registada confiança para este valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confiança desconhecido",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumo",
 
@@ -4038,7 +4115,7 @@
   "item.page.filesection.description": "Descrição:",
 
   // "item.page.filesection.download": "Download",
-  "item.page.filesection.download": "Ver/Abrir",
+  "item.page.filesection.download": "Descarregar",
 
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Formato:",
@@ -4092,16 +4169,19 @@
   "item.page.uri": "URI",
 
   // "item.page.bitstreams.view-more": "Show more",
-  "item.page.bitstreams.view-more": "Ver mais",
+  "item.page.bitstreams.view-more": "Mostrar mais",
 
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
 
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Primário",
+
   // "item.page.filesection.original.bundle": "Original bundle",
-  "item.page.filesection.original.bundle": "Principais",
+  "item.page.filesection.original.bundle": "Pacote original",
 
   // "item.page.filesection.license.bundle": "License bundle",
-  "item.page.filesection.license.bundle": "Licença",
+  "item.page.filesection.license.bundle": "Licença do pacote",
 
   // "item.page.return": "Back",
   "item.page.return": "Voltar",
@@ -4109,6 +4189,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Solicitar a retirada deste item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Solicitar reintegração",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Um nova versão não pode ser criada porque já se encontra uma submisão em curso no histórico de versões.",
 
@@ -4118,6 +4204,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reivindicar este item como perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "Logótipo ROR",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -4146,7 +4235,7 @@
   "item.preview.dc.type": "Tipo:",
 
   // "item.preview.oaire.citation.issue": "Issue",
-  "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Número",
 
   // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volume",
@@ -4158,7 +4247,7 @@
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
-  "itemm.preview.dc.identifier": "Identificador:",
+  "item.preview.dc.identifier": "Identificador:",
 
   // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista ou Série",
@@ -4194,7 +4283,31 @@
   "item.preview.dc.coverage.spatial": "Jurisdição:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
-  "item.preview.oaire.fundingStream": "Linha de financiamento:",
+  "item.preview.oaire.fundingStream": "Programa de financiamento:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Data de fundação",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nome legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipo de entidade:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleção",
@@ -4202,6 +4315,9 @@
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nenhum item para mostrar.",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Itens selecionados",
+
   // "item.select.table.select": "Select item",
   "item.select.table.select": "Selecionar item",
 
@@ -4283,6 +4399,15 @@
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nova versão",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Solicitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Solicitar reintegração",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nova versão",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Criar uma nova versão para este item",
 
@@ -4295,21 +4420,63 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Criar uma nova versão",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar pedido",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancelar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "Não criar uma nova versão",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Não enviar pedido",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Sumário",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Está a solicitar a retirada deste item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Por favor indique a razão para a sua retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Está a solicitar reintegração deste item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Por favor indique o motivo para a sua reintegração",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
   "item.version.create.modal.form.summary.placeholder": "Inserir o sumário para a nova versão",
 
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Indique o motivo para a sua reintegração",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Criar uma nova versão...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "A enviar o pedido de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Pedido de reintegração enviado.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Pedido de retirada enviado.",
+
   // "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": "A nova versão está a ser criada. Isto pode demorar algum tempo se o item tiver muitas relações.",
 
@@ -4397,6 +4564,9 @@
   // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "Valor",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar campo",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "itemtemplate.edit.metadata.metadatafield.error": "ocorreu um erro ao validar o campo de metadados",
 
@@ -4457,8 +4627,8 @@
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Editora",
 
-  // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Revista: ",
+  // "journal.page.titleprefix": "Journal:",
+  "journal.page.titleprefix": "Revista:",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Resultado da pesquisa de revistas",
@@ -4493,11 +4663,14 @@
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Número de páginas",
 
-  // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Número de revista: ",
+  // "journalissue.page.titleprefix": "Journal Issue:",
+  "journalissue.page.titleprefix": "Número de revista:",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados da pesquisa de números da revista",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Volume de revista",
+  "journalvolume.listelement.badge": "Volume da revista",
 
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Descrição",
@@ -4508,26 +4681,29 @@
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Data de publicação",
 
-  // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume de revista: ",
+  // "journalvolume.page.titleprefix": "Journal Volume:",
+  "journalvolume.page.titleprefix": "Volume da revista:",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultados da pesquisa de volumes da revista",
+
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Media do documeo",
 
-  // "iiifsearchable.page.titleprefix": "Document: ",
-  "iiifsearchable.page.titleprefix": "Documento: ",
+  // "iiifsearchable.page.titleprefix": "Document:",
+  "iiifsearchable.page.titleprefix": "Documento:",
 
-  // "iiifsearchable.page.doi": "Permanent Link: ",
-  "iiifsearchable.page.doi": "URI permanete: ",
+  // "iiifsearchable.page.doi": "Permanent Link:",
+  "iiifsearchable.page.doi": "URI permanente:",
 
-  // "iiifsearchable.page.issue": "Issue: ",
-  "iiifsearchable.page.issue": "Núemero: ",
+  // "iiifsearchable.page.issue": "Issue:",
+  "iiifsearchable.page.issue": "Número:",
 
-  // "iiifsearchable.page.description": "Description: ",
-  "iiifsearchable.page.description": "Descrição: ",
+  // "iiifsearchable.page.description": "Description:",
+  "iiifsearchable.page.description": "Descrição:",
 
   // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
   "iiifviewer.fullscreen.notice": "Utilize o ecrã completo para melhor visualização .",
@@ -4535,17 +4711,17 @@
   // "iiif.listelement.badge": "Image Media",
   "iiif.listelement.badge": "Media da imagem",
 
-  // "iiif.page.titleprefix": "Image: ",
-  "iiif.page.titleprefix": "Imagem: ",
+  // "iiif.page.titleprefix": "Image:",
+  "iiif.page.titleprefix": "Imagem:",
 
-  // "iiif.page.doi": "Permanent Link: ",
-  "iiif.page.doi": "URI permanente: ",
+  // "iiif.page.doi": "Permanent Link:",
+  "iiif.page.doi": "URI permanente:",
 
-  // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Número: ",
+  // "iiif.page.issue": "Issue:",
+  "iiif.page.issue": "Número:",
 
-  // "iiif.page.description": "Description: ",
-  "iiif.page.description": "Description: ",
+  // "iiif.page.description": "Description:",
+  "iiif.page.description": "Description:",
 
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "A carregar ficheiro...",
@@ -4646,6 +4822,9 @@
   // "logout.title": "Logout",
   "logout.title": "Sair",
 
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegação de administração",
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "Administração",
 
@@ -4670,8 +4849,6 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
 
-
-
   // "menu.section.reports": "Reports",
   "menu.section.reports": "Relatórios",
 
@@ -4759,8 +4936,7 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secção do menu controle de acesso",
 
-  //"menu.section.icon.reports": "Reports menu section",
-  // TODO New key - Add a translation
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -4808,6 +4984,9 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Soltar barra lateral",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Secção do menu de notificações",
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4835,6 +5014,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processos",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificações",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Controlo de qualidade",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reivindicação de publicação",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Fixar barra lateral",
 
@@ -4862,16 +5050,12 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarefas de Estatísticas",
 
-
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
-  "menu.section.statistics_task": "Tarefa de estatísticas",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secção controle de acesso",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar secção painel de controle",
 
@@ -4989,16 +5173,16 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sem título",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sem URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Pesquisar na área pessoal...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Todas as tarefas",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Meus depósitos",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
@@ -5037,6 +5221,18 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Encontramos <b>{{count}} publicações</b> em {{source}} que parecem estar relacionadas com o perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "reveja as sugestões",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tudo no repositório",
 
@@ -5052,7 +5248,7 @@
   // "nav.login": "Log In",
   "nav.login": "Entrar",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "Menu perfil do utilizador e sair",
 
   // "nav.logout": "Log Out",
@@ -5091,6 +5287,216 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Item",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Controlo de Qualidade",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "Em Abaixo pode ver todos os tópicos recebidos das subscrições de {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "Em baixo pode ver todas as fontes da notificação.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Tópicos atuais",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fontes atuais",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tópico",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fonte",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último evento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Ações",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar tópicos para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugestões para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "Não foram encontrados tópicos.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "Não foram encontradas fontes.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugestões para controlo de qualidade",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Ocorreu um erro ao carregar os tópicos de controlo de qualidade",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Ocorreu um erro ao carregar a fonte de controlo de qualidade",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "A carregar...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tópico:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "Não foram encontradas sugestões.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confiança",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicação",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalhes",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalhes do projeto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razões",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Ações",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceitar sugestão",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugestão",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Apagar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rejeitar sugestão",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar projeto e aceitar sugestão",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor do PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor do assunto:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumo:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Dados do projeto sugeridos pelo OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título do projeto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiamento:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdição:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Voltar aos tópicos",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Voltar às fontes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar mais",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado ao registo local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "Não foi encontrado nenhum registo local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Tem a certeza?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operação não pode ser anulada. Ignorar esta sugestão?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "Esta operação não pode ser anulada!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operação não pode ser anulada. Rejeitar esta sugestão?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "Não foi selecionado nenhum projeto DSpace. Será criado um novo projeto com base nos dados da sugestão.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "A sua decisão foi guardada com sucesso.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Ocorreu um erro. A sua decisão não foi guardada.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Escolher um projeto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicação:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vincular ao registo local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Pesquisar project",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Pesquisar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Vincular projeto",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Remover",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduza um nome de projeto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "Nenhum projecto encontrado.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "O projeto foi ligado com êxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "O projeto foi desvinculado com êxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Ocorreu um erro. Não foi efectuada nenhuma operação.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Razão",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organização",
 
@@ -5115,8 +5521,14 @@
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
 
-  // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Organização: ",
+  // "orgunit.page.titleprefix": "Organizational Unit:",
+  "orgunit.page.titleprefix": "Organização:",
+
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados da pesquisa de organizações",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opções de paginação",
@@ -5127,8 +5539,8 @@
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
-  // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "A mostrar ",
+  // "pagination.showing.label": "Now showing",
+  "pagination.showing.label": "A mostrar",
 
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opções de ordenação",
@@ -5167,10 +5579,10 @@
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "ID",
+  "person.page.staffid": "ID interno",
 
-  // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Pessoa: ",
+  // "person.page.titleprefix": "Person:",
+  "person.page.titleprefix": "Pessoa:",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Resultados da pesquisa de pessoas",
@@ -5263,22 +5675,22 @@
   "process.detail.back": "Voltar",
 
   // "process.detail.output": "Process Output",
-  "process.detail.output": "Output do Processo",
+  "process.detail.output": "Saída do Processo",
 
   // "process.detail.logs.button": "Retrieve process output",
-  "process.detail.logs.button": "Recuperar output do processo",
+  "process.detail.logs.button": "Recuperar a saída do processo",
 
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "A recuperar",
 
   // "process.detail.logs.none": "This process has no output",
-  "process.detail.logs.none": "Este processo não tem output",
+  "process.detail.logs.none": "Este processo não tem saída",
 
   // "process.detail.output-files": "Output Files",
-  "process.detail.output-files": "Ficheiros do Output",
+  "process.detail.output-files": "Ficheiros de saída",
 
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
-  "process.detail.output-files.empty": "Este processo não possui nenhum ficheiro de output",
+  "process.detail.output-files.empty": "Este processo não possui nenhum ficheiro de saída",
 
   // "process.detail.script": "Script",
   "process.detail.script": "Script",
@@ -5322,6 +5734,24 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Ocorreu algum erro ao remover o processo",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Atualização automática…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de conclusão (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processos bem sucedidos",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "Não foram encontrados processos correspondentes.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de conclusão (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processos falhados",
+
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de término (UTC)",
 
@@ -5331,6 +5761,18 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nome",
 
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora de início (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processos em execução",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de criação (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processos agendados",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de início (UTC)",
 
@@ -5370,10 +5812,13 @@
   // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "Apagar processos",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconhecido",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Ocorreu um erro ao apagar os processos",
 
-  // "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": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted.",
   "process.bulk.delete.error.body": "O processo com  o ID {{{processId}} não pôde ser removido. Os restantes processos continuarão a ser removidos.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
@@ -5499,8 +5944,8 @@
   // "project.page.status": "Status",
   "project.page.status": "Estado",
 
-  // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Projeto de investigação: ",
+  // "project.page.titleprefix": "Research Project:",
+  "project.page.titleprefix": "Projeto de investigação:",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Resultados da pesquisa de projetos",
@@ -5526,8 +5971,8 @@
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Editora",
 
-  // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publicação: ",
+  // "publication.page.titleprefix": "Publication:",
+  "publication.page.titleprefix": "Publicação:",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Título do Volume",
@@ -5548,7 +5993,106 @@
   "media-viewer.previous": "Anterior",
 
   // "media-viewer.playlist": "Playlist",
-  "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Lista de reprodução",
+
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "A carregar...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reivindicar publicação",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reivindicar publicação",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions",
+  "suggestion.targets.description": "Em baixo pode ver todas as sugestões",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugestões atuais",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nome do investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Ações",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Rever {{ total }} sugestão(ões)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for",
+  "suggestion.button.review.title": "Rever {{ total }} sugestão(ões) para",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Nenhum alvo encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Ocorreu um erro ao carregar os alvos sugeridos",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Pontuação",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprovar & importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "A sugestão foi importada com sucesso. <a href='{{ url }}'>Ver</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprovar & importar selecionados",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} sugestões foram importadas com sucesso",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} sugestões não foram importadas devido a erros inesperados do servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugestão",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "A sugestão foi descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugestão selecionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugestões foram rejeitadas",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} sugestões não foram descartadas devido a erros inesperados do servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver evidências",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar evidências",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugestões para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugestões para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the",
+  "suggestion.from.source": "do",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Não tem mais reivindicações de publicações",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Pontuação total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Registo de novo utilizador",
@@ -5608,7 +6152,7 @@
   "register-page.create-profile.submit.error.head": "Falha no registo",
 
   // "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": "O registo foi criado com sucesso. Foi iniciada sessão com o Utilizador criado.",
+  "register-page.create-profile.submit.success.content": "O registo foi criado com sucesso. Foi iniciada sessão com o utilizador criado.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registo finalizado com sucesso",
@@ -5656,19 +6200,19 @@
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registar deve aceitar o <b>registo e a senha de recuperação</b> (Google reCaptcha) cookies.",
 
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
-  "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
+ "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
-  "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
+ "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
-  "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": "Ocorreu um erro na verificação do reCaptcha",
+ "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro na verificação do reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
-  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
+ "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
 
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "As contas podem ser registadas para os endereços de email os domínios",
@@ -5692,13 +6236,19 @@
   "relationships.isAuthorOf.OrgUnit": "Autores (Unidades organizacionais)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Fascículo",
+  "relationships.isIssueOf": "Fascículos da revista",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Fascículo da revista",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf": "Fascículo",
+  "relationships.isJournalIssueOf": "Fascículo da revista",
 
   // "relationships.isJournalOf": "Journals",
-  "relationships.isJournalOf": "Periódicos",
+  "relationships.isJournalOf": "Revistas",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volume da revista",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unidades organizacionais",
@@ -5724,11 +6274,14 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volumes da revista",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volume da revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Contribuidores",
 
-  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
-  "relationships.isContributorOf.OrgUnit": "Colaborador (Unidade organizacional)",
+  // "relationships.isContributorOf.OrgUnit": "Contributor(Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Colaborador(Unidade organizacional)",
 
   // "relationships.isContributorOf.Person": "Contributor",
   "relationships.isContributorOf.Person": "Contribuidor",
@@ -5740,206 +6293,205 @@
   "repository.image.logo": "Logótipo do repositório",
 
   // "repository.title": "DSpace Repository",
-  "repository.title": "Repositório :: ",
+  "repository.title": "Repositório::",
 
-  // "repository.title.prefix": "DSpace Repository :: ",
-  "repository.title.prefix": "Repositório :: ",
+  // "repository.title.prefix": "DSpace Repository::",
+  "repository.title.prefix": "Repositório::",
 
-  // "resource-policies.add.button": "Add",
-  "resource-policies.add.button": "Adicionar",
+  // "resource - policies.add.button": "Add",
+  "resource - policies.add.button": "Adicionar",
 
-  // "resource-policies.add.for.": "Add a new policy",
-  "resource-policies.add.for.": "Adicionar nova política",
+  // "resource - policies.add.for.": "Add a new policy",
+  "resource - policies.add.for.": "Adicionar nova política",
 
-  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  "resource-policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
+  // "resource - policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource - policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
 
-  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  "resource-policies.add.for.bundle": "Adicionar uma nova política de pacote",
+  // "resource - policies.add.for.bundle": "Add a new Bundle policy",
+  "resource - policies.add.for.bundle": "Adicionar uma nova política de pacote",
 
-  // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Adicionar uma nova política de Item",
+  // "resource - policies.add.for.item": "Add a new Item policy",
+  "resource - policies.add.for.item": "Adicionar uma nova política de Item",
 
-  // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Adicionar uma nova política de Comunidade",
+  // "resource - policies.add.for.community": "Add a new Community policy",
+  "resource - policies.add.for.community": "Adicionar uma nova política de Comunidade",
 
-  // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Adicionar uma nova política de Coleção",
+  // "resource - policies.add.for.collection": "Add a new Collection policy",
+  "resource - policies.add.for.collection": "Adicionar uma nova política de Coleção",
 
-  // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Criar uma nova política de recursos para ",
+  // "resource - policies.create.page.heading": "Create new resource policy for",
+  "resource - policies.create.page.heading": "Criar uma nova 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": "Ocorreu um erro ao criar uma política de recursos.",
+  // "resource - policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource - policies.create.page.failure.content": "Ocorreu um erro ao criar uma política de recursos.",
 
-  // "resource-policies.create.page.success.content": "Operation successful",
-  "resource-policies.create.page.success.content": "Operação bem sucedida",
+  // "resource - policies.create.page.success.content": "Operation successful",
+  "resource - policies.create.page.success.content": "Operação bem sucedida",
 
-  // "resource-policies.create.page.title": "Create new resource policy",
-  "resource-policies.create.page.title": "Criar uma nova política de recursos",
+  // "resource - policies.create.page.title": "Create new resource policy",
+  "resource - policies.create.page.title": "Criar uma nova política de recursos",
 
-  // "resource-policies.delete.btn": "Delete selected",
-  "resource-policies.delete.btn": "Apagar selecionado",
+  // "resource - policies.delete.btn": "Delete selected",
+  "resource - policies.delete.btn": "Apagar selecionado",
 
-  // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  "resource-policies.delete.btn.title": "Apagar política de recurso selecionada",
+  // "resource - policies.delete.btn.title": "Delete selected resource policies",
+  "resource - policies.delete.btn.title": "Apagar política de recurso selecionada",
 
-  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  "resource-policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
+  // "resource - policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource - policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
 
-  // "resource-policies.delete.success.content": "Operation successful",
-  "resource-policies.delete.success.content": "Operação bem sucedida",
+  // "resource - policies.delete.success.content": "Operation successful",
+  "resource - policies.delete.success.content": "Operação bem sucedida",
 
-  // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Editar política de recurso ",
+  // "resource - policies.edit.page.heading": "Edit resource policy",
+  "resource - policies.edit.page.heading": "Editar política de recurso",
 
-  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
+  // "resource - policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource - policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
 
-  // "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": "Ocorreu um erro durante a edição da (ePerson ou grupo) da 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": "Ocorreu um erro durante a edição da(ePerson ou grupo)da 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": "Ocorreu um erro durante a edição da política de recursos. A (ePerson ou grupo) foi actualizado com sucesso.",
+  // "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": "Ocorreu um erro durante a edição da política de recursos.A(ePerson ou grupo)foi actualizado com sucesso.",
 
-  // "resource-policies.edit.page.success.content": "Operation successful",
-  "resource-policies.edit.page.success.content": "Operação bem sucedida",
+  // "resource - policies.edit.page.success.content": "Operation successful",
+  "resource - policies.edit.page.success.content": "Operação bem sucedida",
 
-  // "resource-policies.edit.page.title": "Edit resource policy",
-  "resource-policies.edit.page.title": "Editar política de recurso",
+  // "resource - policies.edit.page.title": "Edit resource policy",
+  "resource - policies.edit.page.title": "Editar política de recurso",
 
-  // "resource-policies.form.action-type.label": "Select the action type",
-  "resource-policies.form.action-type.label": "Selecione o tipo de ação",
+  // "resource - policies.form.action - type.label": "Select the action type",
+  "resource - policies.form.action - type.label": "Selecione o tipo de ação",
 
-  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  "resource-policies.form.action-type.required": "Deve selecionar a ação da política de recurso.",
+  // "resource - policies.form.action - type.required": "You must select the resource policy action.",
+  "resource - policies.form.action - type.required": "Deve selecionar a ação da política de recurso.",
 
-  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  "resource-policies.form.eperson-group-list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
+  // "resource - policies.form.eperson - group - list.label": "The eperson or group that will be granted the permission",
+  "resource - policies.form.eperson - group - list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
 
-  // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
+  // "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": "Pesquisar um utilizador",
+  // "resource - policies.form.eperson - group - list.tab.eperson": "Search for a ePerson",
+  "resource - policies.form.eperson - group - list.tab.eperson": "Pesquisar um utilizador",
 
-  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  "resource-policies.form.eperson-group-list.tab.group": "Pesquisar um grupo",
+  // "resource - policies.form.eperson - group - list.tab.group": "Search for a group",
+  "resource - policies.form.eperson - group - list.tab.group": "Pesquisar um grupo",
 
-  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  "resource-policies.form.eperson-group-list.table.headers.action": "Ação",
+  // "resource - policies.form.eperson - group - list.table.headers.action": "Action",
+  "resource - policies.form.eperson - group - list.table.headers.action": "Ação",
 
-  // "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.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": "Nome",
+  // "resource - policies.form.eperson - group - list.table.headers.name": "Name",
+  "resource - policies.form.eperson - group - list.table.headers.name": "Nome",
 
-  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
-  "resource-policies.form.eperson-group-list.modal.header": "Não pode mudar de tipo",
+  // "resource - policies.form.eperson - group - list.modal.header": "Cannot change type",
+  "resource - policies.form.eperson - group - list.modal.header": "Não pode mudar de 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": "Não é possível substituir um utilizador por um grupo.",
+  // "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": "Não é possível substituir um utilizador por um 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": "Não é possível substituir um grupo por uma ePerson.",
+  // "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": "Não é possível substituir um grupo por uma ePerson.",
 
-  // "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": "Eliminar a  política actual de recursos e criar uma nova política com o tipo desejado.",
+  // "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": "Eliminar a política actual de recursos e criar uma nova política com o tipo desejado.",
 
-  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
-  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  // "resource - policies.form.eperson - group - list.modal.close": "Ok",
+  "resource - policies.form.eperson - group - list.modal.close": "Ok",
 
-  // "resource-policies.form.date.end.label": "End Date",
-  "resource-policies.form.date.end.label": "Data de fim",
+  // "resource - policies.form.date.end.label": "End Date",
+  "resource - policies.form.date.end.label": "Data de término",
 
-  // "resource-policies.form.date.start.label": "Start Date",
-  "resource-policies.form.date.start.label": "Data de início",
+  // "resource - policies.form.date.start.label": "Start Date",
+  "resource - policies.form.date.start.label": "Data de início",
 
-  // "resource-policies.form.description.label": "Description",
-  "resource-policies.form.description.label": "Descrição",
+  // "resource - policies.form.description.label": "Description",
+  "resource - policies.form.description.label": "Descrição",
 
-  // "resource-policies.form.name.label": "Name",
-  "resource-policies.form.name.label": "Nome",
+  // "resource - policies.form.name.label": "Name",
+  "resource - policies.form.name.label": "Nome",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.hint": "Max 30 characters",
+  // "resource - policies.form.name.hint": "Max 30 characters",
+  "resource - policies.form.name.hint": "Máximo 30 characters",
 
-  // "resource-policies.form.policy-type.label": "Select the policy type",
-  "resource-policies.form.policy-type.label": "Selecione o tipo de política",
+  // "resource - policies.form.policy - type.label": "Select the policy type",
+  "resource - policies.form.policy - type.label": "Selecione o tipo de política",
 
-  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  "resource-policies.form.policy-type.required": "Deve selecionar um tipo de política de recurso.",
+  // "resource - policies.form.policy - type.required": "You must select the resource policy type.",
+  "resource - policies.form.policy - type.required": "Deve selecionar um tipo de política de recurso.",
 
-  // "resource-policies.table.headers.action": "Action",
-  "resource-policies.table.headers.action": "Ação",
+  // "resource - policies.table.headers.action": "Action",
+  "resource - policies.table.headers.action": "Ação",
 
-  // "resource-policies.table.headers.date.end": "End Date",
-  "resource-policies.table.headers.date.end": "Data de término",
+  // "resource - policies.table.headers.date.end": "End Date",
+  "resource - policies.table.headers.date.end": "Data de término",
 
-  // "resource-policies.table.headers.date.start": "Start Date",
-  "resource-policies.table.headers.date.start": "Data de início",
+  // "resource - policies.table.headers.date.start": "Start Date",
+  "resource - policies.table.headers.date.start": "Data de início",
 
-  // "resource-policies.table.headers.edit": "Edit",
-  "resource-policies.table.headers.edit": "Editar",
+  // "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 grupo",
+  // "resource - policies.table.headers.edit.group": "Edit group",
+  "resource - policies.table.headers.edit.group": "Editar grupo",
 
-  // "resource-policies.table.headers.edit.policy": "Edit policy",
-  "resource-policies.table.headers.edit.policy": "Editar política",
+  // "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": "Utilizador",
+  // "resource - policies.table.headers.eperson": "EPerson",
+  "resource - policies.table.headers.eperson": "Utilizador",
 
-  // "resource-policies.table.headers.group": "Group",
-  "resource-policies.table.headers.group": "Grupo",
+  // "resource - policies.table.headers.group": "Group",
+  "resource - policies.table.headers.group": "Grupo",
 
-  // "resource-policies.table.headers.select-all": "Select all",
-  "resource-policies.table.headers.select-all": "Selecionar tudo",
+  // "resource - policies.table.headers.select - all": "Select all",
+  "resource - policies.table.headers.select - all": "Selecionar tudo",
 
-  // "resource-policies.table.headers.deselect-all": "Deselect all",
-  "resource-policies.table.headers.deselect-all": "Desmarcar tudo",
+  // "resource - policies.table.headers.deselect - all": "Deselect all",
+  "resource - policies.table.headers.deselect - all": "Desmarcar tudo",
 
-  // "resource-policies.table.headers.select": "Select",
-  "resource-policies.table.headers.select": "Selecionar",
+  // "resource - policies.table.headers.select": "Select",
+  "resource - policies.table.headers.select": "Selecionar",
 
-  // "resource-policies.table.headers.deselect": "Deselect",
-  "resource-policies.table.headers.deselect": "Desmarcar",
+  // "resource - policies.table.headers.deselect": "Deselect",
+  "resource - policies.table.headers.deselect": "Desmarcar",
 
-  // "resource-policies.table.headers.id": "ID",
-  "resource-policies.table.headers.id": "ID",
+  // "resource - policies.table.headers.id": "ID",
+  "resource - policies.table.headers.id": "ID",
 
-  // "resource-policies.table.headers.name": "Name",
-  "resource-policies.table.headers.name": "Nome",
+  // "resource - policies.table.headers.name": "Name",
+  "resource - policies.table.headers.name": "Nome",
 
-  // "resource-policies.table.headers.policyType": "type",
-  "resource-policies.table.headers.policyType": "tipo",
+  // "resource - policies.table.headers.policyType": "type",
+  "resource - policies.table.headers.policyType": "tipo",
 
-  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  "resource-policies.table.headers.title.for.bitstream": "Política de ficheiros",
+  // "resource - policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource - policies.table.headers.title.for.bitstream": "Política de ficheiros",
 
-  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  "resource-policies.table.headers.title.for.bundle": "Políticas para pacote",
+  // "resource - policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource - policies.table.headers.title.for.bundle": "Políticas para pacote",
 
-  // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  "resource-policies.table.headers.title.for.item": "Políticas para item",
+  // "resource - policies.table.headers.title.for.item": "Policies for Item",
+  "resource - policies.table.headers.title.for.item": "Políticas para item",
 
-  // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  "resource-policies.table.headers.title.for.community": "Políticas para comunidade",
+  // "resource - policies.table.headers.title.for.community": "Policies for Community",
+  "resource - policies.table.headers.title.for.community": "Políticas para comunidade",
 
-  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
+  // "resource - policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource - policies.table.headers.title.for.collection": "Políticas para coleção",
 
-  // "root.skip-to-content": "Skip to main content",
-  "root.skip-to-content": "Ir para o conteúdo principal",
+  // "root.skip - to - content": "Skip to main content",
+  "root.skip - to - content": "Ir para o conteúdo principal",
 
   // "search.description": "",
   "search.description": "",
 
-  // "search.switch-configuration.title": "Show",
-  "search.switch-configuration.title": "Mostrar",
+  // "search.switch - configuration.title": "Show",
+  "search.switch - configuration.title": "Mostrar",
 
   // "search.title": "Search",
   "search.title": "Pesquisa",
@@ -5947,12 +6499,15 @@
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Pesquisar",
 
-  // "search.search-form.placeholder": "Search the repository ...",
-  "search.search-form.placeholder": "Pesquisar no repositório...",
+  // "search.search - form.placeholder": "Search the repository...",
+  "search.search - form.placeholder": "Pesquisar no repositório...",
 
   // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
   "search.filters.remove": "Remover filtro de tipo {{ type }} com valor {{ value }}",
 
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5965,7 +6520,7 @@
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Data de depósito",
 
-  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  // "search.filters.applied.f.discoverable": "Non - discoverable",
   "search.filters.applied.f.discoverable": "Privado",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -5974,6 +6529,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tem ficheiros",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nome do ficheiro",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descrição do ficheiro",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
 
@@ -5990,10 +6551,10 @@
   "search.filters.applied.f.jobTitle": "Cargo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Fim data de nascimento",
+  "search.filters.applied.f.birthDate.max": "Data de nascimento final",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  "search.filters.applied.f.birthDate.min": "Início data de nascimento",
+  "search.filters.applied.f.birthDate.min": "Data de nascimento inicial",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
   "search.filters.applied.f.supervisedBy": "Supervisionado por",
@@ -6001,6 +6562,36 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": "not equals",
+  "search.filters.applied.operator.notequals": "não é igual",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": "not authority",
+  "search.filters.applied.operator.notauthority": "não autoridade",
+
+  // "search.filters.applied.operator.contains": "contains",
+  "search.filters.applied.operator.contains": "contém",
+
+  // "search.filters.applied.operator.notcontains": "not contains",
+  "search.filters.applied.operator.notcontains": "não comtém",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Pesquisar título",
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -6082,7 +6673,7 @@
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
   "search.filters.filter.dateSubmitted.label": "Procurar data de depósito",
 
-  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  // "search.filters.filter.discoverable.head": "Non - discoverable",
   "search.filters.filter.discoverable.head": "Privado",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -6103,6 +6694,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Tem ficheiros",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Pesquisar nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descrição do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descrição do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Pesquisar descrição do ficheiro",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo de item depositado",
 
@@ -6184,11 +6793,11 @@
   // "search.filters.filter.scope.label": "Search scope filter",
   "search.filters.filter.scope.label": "Filtro do âmbito da pesquisa",
 
-  // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Colapsar",
+  // "search.filters.filter.show - less": "Collapse",
+  "search.filters.filter.show - less": "Colapsar",
 
-  // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Expandir",
+  // "search.filters.filter.show - more": "Show more",
+  "search.filters.filter.show - more": "Expandir",
 
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Assunto",
@@ -6208,8 +6817,14 @@
   // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "Procurar depositante",
 
-  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
-  "search.filters.filter.show-tree": "Percorrer por hierarquia de {{ name }}",
+  // "search.filters.filter.show - tree": "Browse {{ name }} tree",
+  "search.filters.filter.show - tree": "Percorrer por hierarquia de {{ name }}",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiamento",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiamento",
 
   // "search.filters.filter.supervisedBy.head": "Supervised By",
   "search.filters.filter.supervisedBy.head": "Supervisionado por",
@@ -6229,6 +6844,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Organização",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Pessoa",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projeto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicação",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sim",
 
@@ -6247,7 +6871,7 @@
   // "search.filters.namedresourcetype.Validation": "Validation",
   "search.filters.namedresourcetype.Validation": "Em validação",
 
-  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
+  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for reviewer",
   "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
 
   // "search.filters.namedresourcetype.Workflow": "Workflow",
@@ -6271,20 +6895,41 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Igual",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "Não igual",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridade",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Não autoridade",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contém",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "Não contém",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
   // "search.form.search": "Search",
   "search.form.search": "Pesquisar",
 
   // "search.form.search_dspace": "All repository",
-  "search.form.search_dspace": "Pesquisar tudo",
+  "search.form.search_dspace": "Pesquisar todo o repositório",
 
   // "search.form.scope.all": "All of DSpace",
-  "search.form.scope.all": "Pesquisar tudo",
+  "search.form.scope.all": "Pesquisar todo o repositório",
 
   // "search.results.head": "Search Results",
   "search.results.head": "Resultados da pesquisa",
 
-  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Sua pesquisa não retornou resultados. Tem dificuldade em encontrar o que procura? Tente incluir ",
+  // "search.results.no - results": "Your search returned no results.Having trouble finding what you 're looking for? Try putting",
+  "search.results.no-results": "Sua pesquisa não retornou resultados. Tem dificuldade em encontrar o que procura? Tente incluir",
 
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "os termos entre aspas",
@@ -6322,6 +6967,21 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Pesquisa avançada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Adicionar",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configurações",
 
@@ -6376,6 +7036,24 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última alteração descendente",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Apelido ascendente",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Apelido descendente",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nome ascendente",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nome descendente",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Data nascimento ascendente",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Data nascimento descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estatísticas",
 
@@ -6421,7 +7099,7 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  // "submission.general.cannot_submit": "You don' t have permission to make a new submission.",
   "submission.general.cannot_submit": "Não possui permissões para fazer um novo depósito.",
 
   // "submission.general.deposit": "Deposit",
@@ -6430,10 +7108,10 @@
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Cancelar",
 
-  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  // "submission.general.discard.confirm.info": "This operation can 't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Esta operação não pode ser desfeita. Tem certeza?",
 
-  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  // "submission.general.discard.confirm.submit": "Yes, I' m sure",
   "submission.general.discard.confirm.submit": "Sim, tenho certeza",
 
   // "submission.general.discard.confirm.title": "Discard submission",
@@ -6442,569 +7120,650 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Cancelar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Voltar",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Informação guardada",
 
-  // "submission.general.info.pending-changes": "Unsaved changes",
-  "submission.general.info.pending-changes": "Alterações não guardadas",
+  // "submission.general.info.pending - changes": "Unsaved changes",
+  "submission.general.info.pending - changes": "Alterações não guardadas",
 
   // "submission.general.save": "Save",
   "submission.general.save": "Guardar",
 
-  // "submission.general.save-later": "Save for later",
-  "submission.general.save-later": "Guardar e fechar",
+  // "submission.general.save - later": "Save for later",
+  "submission.general.save - later": "Guardar e fechar",
 
-  // "submission.import-external.page.title": "Import metadata from an external source",
-  "submission.import-external.page.title": "Importar metadados de uma fonte externa",
+  // "submission.import - external.page.title": "Import metadata from an external source",
+  "submission.import - external.page.title": "Importar metadados de uma fonte externa",
 
-  // "submission.import-external.title": "Import metadata from an external source",
-  "submission.import-external.title": "Importar metadados de uma fonte externa",
+  // "submission.import - external.title": "Import metadata from an external source",
+  "submission.import - external.title": "Importar metadados de uma fonte externa",
 
-  // "submission.import-external.title.Journal": "Import a journal from an external source",
-  "submission.import-external.title.Journal": "Importar revista de uma fonte externa",
+  // "submission.import - external.title.Journal": "Import a journal from an external source",
+  "submission.import - external.title.Journal": "Importar revista de uma fonte externa",
 
-  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-  "submission.import-external.title.JournalIssue": "Importar o número de um revista de um fonte externa",
+  // "submission.import - external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import - external.title.JournalIssue": "Importar o número de um revista de um fonte externa",
 
-  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
-  "submission.import-external.title.JournalVolume": "Importar o volume de uma revista de fonte externa",
+  // "submission.import - external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import - external.title.JournalVolume": "Importar o volume de uma revista de fonte externa",
 
-  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
-  "submission.import-external.title.OrgUnit": "Importar editora de uma fonte externa",
+  // "submission.import - external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import - external.title.OrgUnit": "Importar editora de uma fonte externa",
 
-  // "submission.import-external.title.Person": "Import a person from an external source",
-  "submission.import-external.title.Person": "Importar pessoa de uma fonte externa",
+  // "submission.import - external.title.Person": "Import a person from an external source",
+  "submission.import - external.title.Person": "Importar pessoa de uma fonte externa",
 
-  // "submission.import-external.title.Project": "Import a project from an external source",
-  "submission.import-external.title.Project": "Importar projeto de uma fonte externa",
+  // "submission.import - external.title.Project": "Import a project from an external source",
+  "submission.import - external.title.Project": "Importar projeto de uma fonte externa",
 
-  // "submission.import-external.title.Publication": "Import a publication from an external source",
-  "submission.import-external.title.Publication": "Importar uma publicação de uma fonte externa",
+  // "submission.import - external.title.Publication": "Import a publication from an external source",
+  "submission.import - external.title.Publication": "Importar uma publicação de uma fonte externa",
 
-  // "submission.import-external.title.none": "Import metadata from an external source",
-  "submission.import-external.title.none": "Importar metadados de uma fonte externa",
+  // "submission.import - external.title.none": "Import metadata from an external source",
+  "submission.import - external.title.none": "Importar metadados de uma fonte 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": "Pesquise itens abaixo disponíveis na internet para que sejam importados para o repositório.",
+  // "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": "Pesquise itens abaixo disponíveis na internet para que sejam importados para o repositório.",
 
-  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  "submission.import-external.back-to-my-dspace": "Voltar à Minha Área",
+  // "submission.import - external.back - to - my - dspace": "Back to MyDSpace",
+  "submission.import - external.back - to - my - dspace": "Voltar à 'Minha área pessoal'",
 
-  // "submission.import-external.search.placeholder": "Search the external source",
-  "submission.import-external.search.placeholder": "Pesquisar em fonte externa",
+  // "submission.import - external.search.placeholder": "Search the external source",
+  "submission.import - external.search.placeholder": "Pesquisar em fonte externa",
 
-  // "submission.import-external.search.button": "Search",
-  "submission.import-external.search.button": "Pesquisar",
+  // "submission.import - external.search.button": "Search",
+  "submission.import - external.search.button": "Pesquisar",
 
-  // "submission.import-external.search.button.hint": "Write some words to search",
-  "submission.import-external.search.button.hint": "Escreva algumas palavras para pesquisar",
+  // "submission.import - external.search.button.hint": "Write some words to search",
+  "submission.import - external.search.button.hint": "Escreva algumas palavras para pesquisar",
 
-  // "submission.import-external.search.source.hint": "Pick an external source",
-  "submission.import-external.search.source.hint": "Selecione uma fonte externa",
+  // "submission.import - external.search.source.hint": "Pick an external source",
+  "submission.import - external.search.source.hint": "Selecione uma fonte externa",
 
-  // "submission.import-external.source.arxiv": "arXiv",
-  "submission.import-external.source.arxiv": "arXiv",
+  // "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.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.cinii": "CiNii",
+  "submission.import - external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "Crossref",
-  "submission.import-external.source.crossref": "Crossref",
+  // "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.datacite": "DataCite",
+  "submission.import - external.source.datacite": "DataCite",
 
-  // "submission.import-external.source.scielo": "SciELO",
-  "submission.import-external.source.scielo": "SciELO",
+  // "submission.import - external.source.doi": "DOI",
+  "submission.import - external.source.doi": "DOI",
 
-  // "submission.import-external.source.scopus": "Scopus",
-  "submission.import-external.source.scopus": "Scopus",
+  // "submission.import - external.source.scielo": "SciELO",
+  "submission.import - external.source.scielo": "SciELO",
 
-  // "submission.import-external.source.vufind": "VuFind",
-  "submission.import-external.source.vufind": "VuFind",
+  // "submission.import - external.source.scopus": "Scopus",
+  "submission.import - external.source.scopus": "Scopus",
 
-  // "submission.import-external.source.wos": "Web of Science",
-  "submission.import-external.source.wos": "Web of Science",
+  // "submission.import - external.source.vufind": "VuFind",
+  "submission.import - external.source.vufind": "VuFind",
 
-  // "submission.import-external.source.orcidWorks": "ORCID",
-  "submission.import-external.source.orcidWorks": "ORCID",
+  // "submission.import - external.source.wos": "Web of Science",
+  "submission.import - external.source.wos": "Web of Science",
 
-  // "submission.import-external.source.epo": "European Patent Office (EPO)",
-  "submission.import-external.source.epo": "European Patent Office (EPO)",
+  // "submission.import - external.source.orcidWorks": "ORCID",
+  "submission.import - external.source.orcidWorks": "ORCID",
 
-  // "submission.import-external.source.loading": "Loading ...",
-  "submission.import-external.source.loading": "A carregar ...",
+  // "submission.import - external.source.epo": "European Patent Office(EPO)",
+  "submission.import - external.source.epo": "European Patent Office(EPO)",
 
-  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "Revistas Sherpa Romeo por nome",
+  // "submission.import - external.source.loading": "Loading...",
+  "submission.import - external.source.loading": "A carregar...",
 
-  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
-  "submission.import-external.source.sherpaJournalIssn": "Revistas Sherpa Romeo por ISSN",
+  // "submission.import - external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import - external.source.sherpaJournal": "Revistas SHERPA",
 
-  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  "submission.import-external.source.sherpaPublisher": "Editoras Sherpa Romeo",
+  // "submission.import - external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import - external.source.sherpaJournalIssn": "Revistas SHERPA por ISSN",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "Financiamento via API OpenAIRE",
+  // "submission.import - external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import - external.source.sherpaPublisher": "Editoras SHERPA",
 
-  // "submission.import-external.source.orcid": "ORCID",
-  "submission.import-external.source.orcid": "ORCID",
+  // "submission.import - external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import - external.source.openaire": "OpenAIRE pesquisar por autores",
 
-  // "submission.import-external.source.pubmed": "PubMed",
-  "submission.import-external.source.pubmed": "PubMed",
+  // "submission.import - external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import - external.source.openaireTitle": "OpenAIRE pesquisar por título",
 
-  // "submission.import-external.source.pubmedeu": "PubMed Europe",
-  "submission.import-external.source.pubmedeu": "PubMed Europa",
+  // "submission.import - external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import - external.source.openaireFunding": "OpenAIRE pesquisar por financiador",
 
-  // "submission.import-external.source.lcname": "Library of Congress Names",
-  "submission.import-external.source.lcname": "Nomes da Library of Congress",
+  // "submission.import - external.source.orcid": "ORCID",
+  "submission.import - external.source.orcid": "ORCID",
 
-  // "submission.import-external.preview.title": "Item Preview",
-  "submission.import-external.preview.title": "Pré-visualização do item",
+  // "submission.import - external.source.pubmed": "PubMed",
+  "submission.import - external.source.pubmed": "PubMed",
 
-  // "submission.import-external.preview.title.Publication": "Publication Preview",
-  "submission.import-external.preview.title.Publication": "Pré-visualização da publicação",
+  // "submission.import - external.source.pubmedeu": "PubMed Europe",
+  "submission.import - external.source.pubmedeu": "PubMed Europa",
 
-  // "submission.import-external.preview.title.none": "Item Preview",
-  "submission.import-external.preview.title.none": "Pré-visualização do item",
+  // "submission.import - external.source.lcname": "Library of Congress Names",
+  "submission.import - external.source.lcname": "Nomes da Library of Congress",
 
-  // "submission.import-external.preview.title.Journal": "Journal Preview",
-  "submission.import-external.preview.title.Journal": "Pré-visualização da revista",
+  // "submission.import - external.source.ror": "Research Organization Registry(ROR)",
+  "submission.import - external.source.ror": "Research Organization Registry(ROR)",
 
-  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  "submission.import-external.preview.title.OrgUnit": "Pré-visualização da organização",
+  // "submission.import - external.preview.title": "Item Preview",
+  "submission.import - external.preview.title": "Pré-visualização do item",
 
-  // "submission.import-external.preview.title.Person": "Person Preview",
-  "submission.import-external.preview.title.Person": "Pré-visualização dos dados pessoais a importar",
+  // "submission.import - external.preview.title.Publication": "Publication Preview",
+  "submission.import - external.preview.title.Publication": "Pré-visualização da publicação",
 
-  // "submission.import-external.preview.title.Project": "Project Preview",
-  "submission.import-external.preview.title.Project": "Pré-visualização do dados do projeto a importar",
+  // "submission.import - external.preview.title.none": "Item Preview",
+  "submission.import - external.preview.title.none": "Pré-visualização do item",
 
-  // "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": "Os seguintes metadados foram importados de uma fonte externa. Serão  pré-preenchidos quando iniciar o depósito.",
+  // "submission.import - external.preview.title.Journal": "Journal Preview",
+  "submission.import - external.preview.title.Journal": "Pré-visualização da revista",
 
-  // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Iniciar depósito",
+  // "submission.import - external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import - external.preview.title.OrgUnit": "Pré-visualização da organização",
 
-  // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Erro no depósito",
+  // "submission.import - external.preview.title.Person": "Person Preview",
+  "submission.import - external.preview.title.Person": "Pré-visualização dos dados pessoais a importar",
 
-  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  "submission.import-external.preview.error.import.body": "Ocorreu um erro durante o processo de importação de metadados de uma fonte externa.",
+  // "submission.import - external.preview.title.Project": "Project Preview",
+  "submission.import - external.preview.title.Project": "Pré-visualização do dados do projeto a importar",
 
-  // "submission.sections.describe.relationship-lookup.close": "Close",
-  "submission.sections.describe.relationship-lookup.close": "Fechar",
+  // "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": "Os seguintes metadados foram importados de uma fonte externa.Serão pré-preenchidos quando iniciar o depósito.",
 
-  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.added": "Adicionada com sucesso uma entrada local à seleção",
+  // "submission.import - external.preview.button.import": "Start submission",
+  "submission.import - external.preview.button.import": "Iniciar depósito",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importar autor remoto",
+  // "submission.import - external.preview.error.import.title": "Submission error",
+  "submission.import - external.preview.error.import.title": "Erro no depósito",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar revista remota",
+  // "submission.import - external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import - external.preview.error.import.body": "Ocorreu um erro durante o processo de importação de metadados de uma fonte externa.",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar número de revista remoto",
+  // "submission.sections.describe.relationship - lookup.close": "Close",
+  "submission.sections.describe.relationship - lookup.close": "Fechar",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volume de revista remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.added": "Adicionada com sucesso uma entrada local à seleção",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.isAuthorOfPublication": "Importar autor remoto",
 
-  // "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": "Importar item remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal": "Importar revista remota",
 
-  // "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": "Importar evento remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Issue": "Importar número de revista remoto",
 
-  // "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": "Importar produto remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Volume": "Importar volume de revista remoto",
 
-  // "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": "Importar equipamento remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.isProjectOfPublication": "Projeto",
 
-  // "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": "Importar organização remota",
+  // "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": "Importar item remoto",
 
-  // "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": "Importar financiamento remoto",
+  // "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": "Importar evento remoto",
 
-  // "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": "Import remote person",
+  // "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": "Importar produto remoto",
 
-  // "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": "Import remote patent",
+  // "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": "Importar equipamento remoto",
 
-  // "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": "Importar projeto remoto",
+  // "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": "Importar organização remota",
 
-  // "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": "Importar publicação remota",
+  // "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": "Importar financiamento remoto",
 
-  // "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 entidade adicionada!",
+  // "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": "Import remote person",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projeto",
+  // "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": "Import remote patent",
 
-  // "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": "Financiamento API OpenAIRE",
+  // "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": "Importar projeto remoto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar autor remoto",
+  // "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": "Importar publicação remota",
 
-  // "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": "Adicionado com sucesso um autor local à seleção",
+  // "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 entidade adicionada!",
 
-  // "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": "Importado com sucesso e adicionado autor à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isProjectOfPublication.title": "Projeto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridade",
+  // "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": "Financiamento API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como nova autoridade local",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.title": "Importar autor remoto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.added.local - entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.added.local - entity": "Adicionado com sucesso um autor local à seleção",
 
-  // "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": "Selecione a coleção para onde pretende importar as novas entradas",
+  // "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": "Importado com sucesso e adicionado autor à seleção",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.authority": "Authority",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.authority": "Autoridade",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como nova entidade local",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.authority.new": "Importar como nova autoridade 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": "A importar de LC Name",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.cancel": "Cancel",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.cancel": "Cancelar",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "A importar do ORCID",
+  // "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": "Selecione a coleção para onde pretende importar as novas entradas",
 
-  // "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": "A importar revista do Sherpa",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.entities": "Entities",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.entities": "Entidades",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "A importar editora do Sherpa",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.entities.new": "Importar como nova entidade local",
 
-  // "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": "A importar da PubMed",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.lcname": "Importar de LC Name",
 
-  // "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": "A importar do arXiv",
+  // "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": "Importar do ORCID",
 
-  // "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.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaire": "Importar do OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar revista remota",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireTitle": "Importar do OpenAIRE",
 
-  // "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 adicionada com sucesso à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireFunding": "Importar do OpenAIRE",
 
-  // "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": "Importada e adicionada com sucesso uma revista externa à seleção",
+  // "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": "A importar revista do Sherpa",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar número de revista remota",
+  // "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": "A importar editora do Sherpa",
 
-  // "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": "Número de revista local adicionado com sucesso à seleção",
+  // "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": "A importar da PubMed",
 
-  // "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": "Importado e adicionado um número de revista externa com sucesso à seleção",
+  // "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": "A importar do arXiv",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar volume de revista remota",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.ror": "Importar do ROR",
 
-  // "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": "Volume de revista local adicionado com sucesso à seleção",
+  // "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 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": "Importado e adicionado um volume de revista externa com sucesso à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal.title": "Importar revista remota",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Selecione uma correspondência local:",
+  // "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 adicionada com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselecionar todos",
+  // "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": "Importada e adicionada com sucesso uma revista externa à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselecionar página",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Issue.title": "Importar número de revista remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "A carregar...",
+  // "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": "Número de revista local adicionado com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Termos da pesquisa",
+  // "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": "Importado e adicionado um número de revista externa com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Pesquisar",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Volume.title": "Importar volume de revista remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pesquisar...",
+  // "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": "Volume de revista local adicionado com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Selecionar todos",
+  // "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": "Importado e adicionado um volume de revista externa com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Selecionar página",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.select": "Select a local match:",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.select": "Selecione uma correspondência local:",
 
-  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  "submission.sections.describe.relationship-lookup.selected": "Selecionados {{ size }} itens",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.title": "Importar organização remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.local - entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.local - entity": "Organização local adicionada com êxito à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.new - entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.new - entity": "Organização externa importada e adicionada com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.deselect - all": "Deselect all",
+  "submission.sections.describe.relationship - lookup.search - tab.deselect - all": "Deselecionar todos",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicações locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.deselect - page": "Deselect page",
+  "submission.sections.describe.relationship - lookup.search - tab.deselect - page": "Deselecionar página",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.loading": "Loading...",
+  "submission.sections.describe.relationship - lookup.search - tab.loading": "A carregar...",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizacionais locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.placeholder": "Search query",
+  "submission.sections.describe.relationship - lookup.search - tab.placeholder": "Termos da pesquisa",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacotes de dados locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.search": "Go",
+  "submission.sections.describe.relationship - lookup.search - tab.search": "Pesquisar",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Ficheiros de dados locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.search - form.placeholder": "Search...",
+  "submission.sections.describe.relationship - lookup.search - tab.search - form.placeholder": "Pesquisar...",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.select - all": "Select all",
+  "submission.sections.describe.relationship - lookup.search - tab.select - all": "Selecionar todos",
 
-  // "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 revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.select - page": "Select page",
+  "submission.sections.describe.relationship - lookup.search - tab.select - page": "Selecionar página",
 
-  // "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 locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship - lookup.selected": "Selecionados {{ size }} itens",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isAuthorOfPublication": "Local Authors  ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isAuthorOfPublication": "Autores locais  ({{ 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": "Volumes de revistas locais ({{ 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 locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas do Sherpa ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Project": "Projetos locais  ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editoras do Sherpa ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Publication": "Publicações locais ({{ 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.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Person": "Autores locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nomes LC ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.OrgUnit": "Unidades organizacionais locais ({{ 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.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.DataPackage": "Pacotes de dados locais ({{ 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.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.DataFile": "Ficheiros de dados locais ({{ 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": "Pesquisar por agências de financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Journal": "Revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Pesquisar por financiamento",
+  // "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 revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Pesquisar por unidades organizacionais",
+  // "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 locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Via API OpenAIRE",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isJournalVolumeOfPublication": "Volumes de revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projetos",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.JournalVolume": "Volumes de revistas locais ({{ count }})",
 
-  // "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 do projeto",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournal": "Revistas do Sherpa ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicação do author",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaPublisher": "Editoras do Sherpa ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento API OpenAIRE",
+  // "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.selection-tab.title.isProjectOfPublication": "Project",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.lcname": "Nomes LC ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projetos",
+  // "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.title.isFundingAgencyOfProject": "Funder of the Project",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
+  // "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.selection-tab.search-form.placeholder": "Search...",
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pesquisar...",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.ror": "ROR ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Seleção atual ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.orcidWorks": "ORCID ({{ 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.search - tab.tab - title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.crossref": "Crossref ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Pesquisar números de revista",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.scopus": "Scopus ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaire": "OpenAIRE pesquisa por autores ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireTitle": "OpenAIRE pesquisa por títulos ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireFunding": "OpenAIRE pesquisa por financiador ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournalIssn": "Revistas Sherpa por ISSN ({{ count }  })",
 
-  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agência de financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Pesquisar por agências de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  "submission.sections.describe.relationship-lookup.title.Project": "Pesquisar projetos",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Pesquisar por financiamento",
 
-  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publicações",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isChildOrgUnitOf": "Pesquisar por unidades organizacionais",
 
-  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  "submission.sections.describe.relationship-lookup.title.Person": "Pesquisar autores",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openAIREFunding": "Via API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Pesquisar unidades organizacionais",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isProjectOfPublication": "Projetos",
 
-  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacote de dados",
+  // "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 do projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Ficheiros de dados",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isPublicationOfAuthor": "Publicação do author",
 
-  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agência de financiamento",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openAIREFunding": "Financiamento API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit do projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Organização principal",
+   // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
+   "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
-  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicação",
+   // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
+   "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu dropdown",
+   // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+   "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Configurações",
+  // "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Search...",
+  "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Pesquisar...",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Não selecionou nenhum item.",
+  // "submission.sections.describe.relationship - lookup.selection - tab.tab - title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship - lookup.selection - tab.tab - title": "Seleção atual ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores selecionados",
+  // "submission.sections.describe.relationship - lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship - lookup.title.Journal": "Revista",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas selecionadas",
+  // "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.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume de revistas selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship - lookup.title.JournalIssue": "Pesquisar números de revista",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship - lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicações selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship - lookup.title.JournalVolume": "Volumes de revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship - lookup.title.isJournalOfPublication": "Revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizacionais selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship - lookup.title.isAuthorOfPublication": "Autores",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pacotes de dados selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfPublication": "Agência de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Ficheiros de dados selecionados",
+  // "submission.sections.describe.relationship - lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship - lookup.title.Project": "Pesquisar projetos",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship - lookup.title.Publication": "Publicações",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número selecionado",
+  // "submission.sections.describe.relationship - lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship - lookup.title.Person": "Pesquisar autores",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de revista selecionado",
+  // "submission.sections.describe.relationship - lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship - lookup.title.OrgUnit": "Pesquisar unidades organizacionais",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agência de financiamento selecionada",
+  // "submission.sections.describe.relationship - lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship - lookup.title.DataPackage": "Pacote de dados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamento selecionado",
+  // "submission.sections.describe.relationship - lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship - lookup.title.DataFile": "Ficheiros de dados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número selecionado",
+  // "submission.sections.describe.relationship - lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship - lookup.title.Funding Agency": "Agência de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Organização selecionada",
+  // "submission.sections.describe.relationship - lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship - lookup.title.isFundingOfPublication": "Financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship - lookup.title.isChildOrgUnitOf": "Organização principal",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship - lookup.title.isPublicationOfAuthor": "Publicação",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship - lookup.title.isOrgUnitOfProject": "OrgUnit",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.search - tab.toggle - dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship - lookup.search - tab.toggle - dropdown": "Alternar menu dropdown",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.settings": "Settings",
+  "submission.sections.describe.relationship - lookup.selection - tab.settings": "Configurações",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.no - selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship - lookup.selection - tab.no - selection": "Não selecionou nenhum item.",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isAuthorOfPublication": "Autores selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalOfPublication": "Revistas selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalVolumeOfPublication": "Volume de revistas selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Project": "Projetos selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Publication": "Publicações selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Person": "Autores selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.OrgUnit": "Unidades organizacionais selecionadas",
 
-  // "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": "Pretende guardar \"{{ value }}\" como um nome alternativo para esta pessoa permitindo a sua reutilização por si e outros em futuros depósitos? Se não, pode usar apenas neste depósito.",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.DataPackage": "Pacotes de dados selecionados",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.DataFile": "Ficheiros de dados selecionados",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Journal": "Revistas selecionadas",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalIssueOfPublication": "Número selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.JournalVolume": "Volume de revista selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingAgencyOfPublication": "Agência de financiamento selecionada",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingOfPublication": "Financiamento selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.JournalIssue": "Número selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isChildOrgUnitOf": "Organização selecionada",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaJournal": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaPublisher": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.orcid": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.orcidv2": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaire": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaireTitle": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaireFundin": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.lcname": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.pubmed": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.arxiv": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.crossref": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.epo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.scopus": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.scielo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.wos": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.ror": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title": "Resultados da pesquisa",
+
+  // "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": "Pretende guardar \"{{ value }}\"como um nome alternativo para esta pessoa permitindo a sua reutilização por si e outros em futuros depósitos? Se não, pode usar apenas neste depósito.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar um Nome alternativo",
@@ -7063,6 +7822,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Não foi encontrada nenhuma coleção",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "Não foram encontrados tipos de entidades",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Sem opções disponíveis",
 
@@ -7087,14 +7849,14 @@
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
   "submission.sections.identifiers.no_doi": "Não foram gerados DOIs para este item.",
 
-  // "submission.sections.identifiers.handle_label": "Handle: ",
-  "submission.sections.identifiers.handle_label": "Handle: ",
+  // "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.handle_label": "Handle:",
 
-  // "submission.sections.identifiers.doi_label": "DOI: ",
-  "submission.sections.identifiers.doi_label": "DOI: ",
+  // "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.doi_label": "DOI:",
 
-  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
-  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores: ",
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores:",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condições de acesso do item",
@@ -7114,8 +7876,8 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Descrever",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Potenciais duplicados",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potenciais duplicados",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "Identificadores",
@@ -7160,10 +7922,10 @@
   "submission.sections.status.info.aria": "Informação adicional",
 
   // "submission.sections.toggle.open": "Open section",
-  "submission.sections.toggle.open": "Seção aberta",
+  "submission.sections.toggle.open": "Abrir secção",
 
   // "submission.sections.toggle.close": "Close section",
-  "submission.sections.toggle.close": "Seção fechada",
+  "submission.sections.toggle.close": "Fechar secção",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
   "submission.sections.toggle.aria.open": "Expandir seção {{sectionHeader}}",
@@ -7171,6 +7933,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Fechar seção {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Tornar {{fileName}} o ficheiro principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Remover {{fileName}} como ficheiro principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
@@ -7265,13 +8033,13 @@
   "submission.sections.accesses.form.discoverable-description": "Quando selecionado, este item será pesquisável na pesquisa/navegação. Se não estiver selecionado, o item apenas estará disponível através uma ligação direta (link) e não aparecerá na pesquisa/navegação.",
 
   // "submission.sections.accesses.form.discoverable-label": "Discoverable",
-  "submission.sections.accesses.form.discoverable-label": "Recuperável",
+  "submission.sections.accesses.form.discoverable-label": "Público",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "Tipo de  acesso",
 
   // "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": "Selecione um tipo de acesso para aplicar ao item no momento do seu depósito ",
+  "submission.sections.accesses.form.access-condition-hint": "Selecione um tipo de acesso para aplicar ao item no momento do seu depósito",
 
   // "submission.sections.accesses.form.date-required": "Date is required.",
   "submission.sections.accesses.form.date-required": "O preenchimento da data é obrigatório.",
@@ -7306,6 +8074,18 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Até",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "Não foram detectados duplicados.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Foram detectadas potenciais duplicações. Por favor, reveja a lista em baixo.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Este item está na área de trabalho",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Este item está no fluxo de trabalho",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo a licença",
 
@@ -7448,7 +8228,7 @@
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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": "Informe em seguida o motivo da rejeição do depósito, indicando se o depositante pode corrigir algum problema e reenviar o depósito.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Por favor, informe o motivo da rejeição do depósito, indicando se o depositante pode corrigir algum problema e reenviar o depósito.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descreva o motivo da rejeição",
@@ -7472,7 +8252,7 @@
   "submission.workflow.tasks.claimed.return_help": "Libertar esta tarefa para que outra pessoa a possa executar.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  "submission.workflow.tasks.generic.error": "ocorreu um erro durante a operação...",
+  "submission.workflow.tasks.generic.error": "Ocorreu um erro durante a operação...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "A processar...",
@@ -7495,14 +8275,17 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalhes",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "Foram detectados potenciais duplicados para este item. Assuma e edite este item para ver os detalhes.",
+
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Ver",
+  "submission.workspace.generic.view": "Visualizar",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Selecione esta opção para ver os metadados do item.",
+  "submission.workspace.generic.view-help": "Selecione esta opção para visualizar os metadados do item.",
 
   // "submitter.empty": "N/A",
-  "submitter.empty": "N/E",
+  "submitter.empty": "N/D",
 
   // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "Subscrições de alertas",
@@ -7543,7 +8326,7 @@
   // "subscriptions.modal.close": "Close",
   "subscriptions.modal.close": "Fechar",
 
-  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\"page under your user profile",
   "subscriptions.modal.delete-info": "Para remover esta subscrição, por favor aceda à página de 'subscrições' debaixo do seu perfil de utilizador",
 
   // "subscriptions.modal.new-subscription-form.type.content": "Content",
@@ -7565,13 +8348,13 @@
   "subscriptions.modal.new-subscription-form.processing": "A processar...",
 
   // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
-  "subscriptions.modal.create.success": "Subscrição para '{{ type }}' realizada com sucessso.",
+  "subscriptions.modal.create.success": "Subscrição para {{ type }} realizada com sucessso.",
 
   // "subscriptions.modal.delete.success": "Subscription deleted successfully",
   "subscriptions.modal.delete.success": "Subscrição removida com sucesso",
 
   // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
-  "subscriptions.modal.update.success": "Subscrição para '{{ type }}' atualizada com suceso",
+  "subscriptions.modal.update.success": "Subscrição para {{ type }} atualizada com suceso",
 
   // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
   "subscriptions.modal.create.error": "Ocorre um erro durante a criação da subscrição",
@@ -7646,7 +8429,7 @@
   "vocabulary-treeview.search.form.reset": "Redefinir",
 
   // "vocabulary-treeview.search.form.search": "Search",
-  "vocabulary-treeview.search.form.search": "pesquisar",
+  "vocabulary-treeview.search.form.search": "Pesquisar",
 
   // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
   "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados inserindo as primeiras letras",
@@ -7672,8 +8455,8 @@
   // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "Apagar",
 
-  // "uploader.or": ", or ",
-  "uploader.or": " ou",
+  // "uploader.or": ", or",
+  "uploader.or": "ou",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   "uploader.processing": "A processar o(s) ficheiro(s) carregado(s)... (agora é seguro fechar esta página)",
@@ -7705,6 +8488,9 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Depósitos e tarefas em áreas de trabalho",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados da pesquisa de unidades organizacionais",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar item em fluxo de trabalho",
 
@@ -7880,7 +8666,7 @@
   "researcher.profile.expose": "Expor",
 
   // "researcher.profile.hide": "Hide",
-  "researcher.profile.hide": "Esconder",
+  "researcher.profile.hide": "Ocultar",
 
   // "researcher.profile.not.associated": "Researcher profile not yet associated",
   "researcher.profile.not.associated": "Perfil do investigador ainda não associado",
@@ -7930,8 +8716,8 @@
   // "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": "Ocorreu algum problema ao ligar o perfil ao ORCID. Se o problema persistir, contacte o 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": "O ORCID iD deste perfil ({{{ orcid }}) ainda não foi ligado a uma conta no registo do ORCID ou a ligação está expirada.",
+  // "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": "O ORCID iD deste perfil  ({{{ orcid }}) ainda não foi ligado a uma conta no registo do ORCID ou a ligação está expirada.",
 
   // "person.page.orcid.unlink": "Disconnect from ORCID",
   "person.page.orcid.unlink": "Desligar do ORCID",
@@ -8042,7 +8828,7 @@
   "person.page.orcid.sync-queue.description.qualification": "Qualificações",
 
   // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
-  "person.page.orcid.sync-queue.description.researcher_urls": "URLS dos investigadores",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs do investigador",
 
   // "person.page.orcid.sync-queue.description.keywords": "Keywords",
   "person.page.orcid.sync-queue.description.keywords": "Palavras-chave",
@@ -8051,7 +8837,7 @@
   "person.page.orcid.sync-queue.tooltip.insert": "Acrescentar uma nova entrada no registo ORCID",
 
   // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
-  "person.page.orcid.sync-queue.tooltip.update": "Actualizar esta entrada no registo do ORCID",
+  "person.page.orcid.sync-queue.tooltip.update": "Atualizar esta entrada no registo do ORCID",
 
   // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.delete": "Remover esta entrada do registo do ORCID",
@@ -8069,7 +8855,7 @@
   "person.page.orcid.sync-queue.tooltip.education": "Educação",
 
   // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
-  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificação",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificações",
 
   // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
   "person.page.orcid.sync-queue.tooltip.other_names": "Outro nome",
@@ -8258,10 +9044,10 @@
   "system-wide-alert.form.save": "Guardar",
 
   // "system-wide-alert.form.label.active": "ACTIVE",
-  "system-wide-alert.form.label.active": "ACTIVO",
+  "system-wide-alert.form.label.active": "ATIVO",
 
   // "system-wide-alert.form.label.inactive": "INACTIVE",
-  "system-wide-alert.form.label.inactive": "INACTIVO",
+  "system-wide-alert.form.label.inactive": "INATIVO",
 
   // "system-wide-alert.form.error.message": "The system wide alert must have a message",
   "system-wide-alert.form.error.message": "O alerta geral do sistema deve conter uma mensagem",
@@ -8299,6 +9085,9 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas gerais do sistema",
 
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descobrir",
+
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
   "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus ficheiros.",
 
@@ -8395,13 +9184,1140 @@
   // "vocabulary-treeview.search.form.add": "Add",
   "vocabulary-treeview.search.form.add": "Adicionar",
 
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reivindicação de publicação",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reivindicação de publicação",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocolo COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\"rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aqui, suportamos totalmente o protocolo COAR Notify, que foi concebido para melhorar a comunicação entre repositórios. Para saber mais sobre o protocolo COAR Notify, visite a página <a href=\"https://notify.coar-repositories.org/\"rel=\"noopener noreferrer\">COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Caixa de entrada LDN",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Para sua conveniência, a nossa caixa de entrada LDN (Linked Data Notifications) está facilmente acessível em {{ ldnInboxUrl }}. A caixa de entrada LDN permite uma comunicação e troca de dados fluída, assegurando uma colaboração eficiente e eficaz.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderação de mensagens",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Para garantir um ambiente seguro e produtivo, todas as mensagens LDN recebidas são moderadas. Se pretende trocar informações connosco, contacte-nos através do nosso",
+
+  // "coar-notify-support.message-moderation.feedback-form": "Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": "Formulário de comentários.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Exluir serviço",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Serviços registados",
+
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nome",
+
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descrição",
+
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estado",
+
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Ação",
+
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOVO",
+
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Serviços registados",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Ativo",
+
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Inativo",
+
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Clique para ativar",
+
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Clique para inativar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar serviço",
+
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Criar serviço",
+
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Criar serviço",
+
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Por favor confirme a criação deste serviço.",
+
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estado",
+
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Criar",
+
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancelar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registar um novo serviço",
+
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nome",
+
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descrição",
+
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL do serviço",
+
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Gama de IP do serviço",
+
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nível de confiança",
+
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL da caixa de entrada LDN",
+
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Por favor, forneça o nome do serviço",
+
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Por favor, forneça uma descrição do seu serviço",
+
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Por favor, introduza o URL para que os utilizadores possam obter mais informações sobre o serviço",
+
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Limite inferior do intervalo IPv4",
+
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Limite superior do intervalo IPv4",
+
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Por favor, especifique o URL da caixa de entrada LDN",
+
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Por favor, introduza um valor entre 0 e 1. Utilize o “.” como separador decimal",
+
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Selecione um padrão",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconhecer e aceitar",
+
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Este padrão é utilizado para reconhecer e aceitar um pedido (oferta). Implica uma intenção de atuar sobre o pedido.",
+
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconhecer e rejeitar",
+
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Este padrão é utilizado para reconhecer e rejeitar um pedido (oferta). Significa que não há mais nenhuma ação relativamente ao pedido.",
+
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconhecer e aceitar provisoriamente",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Este padrão é utilizado para reconhecer e aceitar provisoriamente um pedido (oferta). Implica uma intenção de atuar, que pode mudar.",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconhecer e rejeitar provisoriamente",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Este padrão é utilizado para reconhecer e rejeitar provisoriamente um pedido (oferta). Significa que não há mais nenhuma ação, sujeita a alterações.",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar o avaliação",
+
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Este padrão é utilizado para anunciar a existência de uma avaliação, referenciando o recurso avaliado.",
+
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar a integração",
+
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Este padrão é utilizado para anunciar que um recurso foi integrado.",
+
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar relacionamento",
+
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Este padrão é utilizado para anunciar um relacionamento entre dois recursos.",
+
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar revisão",
+
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Este padrão é utilizado para anunciar a existência de uma revisão, referenciando o recurso revisto.",
+
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar o resultado do serviço",
+
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Este padrão é utilizado para anunciar a existência de um 'resultado de serviço', referenciando o recurso relevante.",
+
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anúncios",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Solicitar avaliação",
+
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Este padrão é utilizado para solicitar o endosso de um recurso pertencente ao sistema de origem.",
+
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Solicitações",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Solicitar integração",
+
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Este padrão é utilizado para solicitar que o sistema de destino integre um recurso.",
+
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Solicitações",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Solicitar revisão",
+
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Este padrão é utilizado para solicitar uma revisão de um recurso pertencente ao sistema de origem.",
+
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Solicitações",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Anular oferta",
+
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Este padrão é utilizado para anular (retirar) uma oferta feita anteriormente.",
+
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Anular",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "Nenhum filtro de item selecionado",
+
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtro de item",
+
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automático",
+
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "O nome é obrigatório",
+
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "O URL é obrigatório",
+
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Por favor, introduza uma gama de IPs válida",
+
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Introduza um IpV4 válido em ambos os limites do intervalo (nota: para um IP único, introduza o mesmo valor em ambos os campos)",
+
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "O URL do LDN é obrigatório",
+
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Pelo menos um padrão é obrigatório",
+
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Introduza uma pontuação válida (entre 0 e 1). Utilize o “.” como separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Padrão suportado",
+
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Adicionar mais",
+
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Remover",
+
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Novo serviço",
+
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Tem certeza de que pretende apagar este serviço?",
+
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirma as alterações?",
+
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar serviço",
+
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancelar",
+
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Tem a certeza de que pretende descartar as alterações e deixar?",
+
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar as alterações",
+
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edição bem-sucedida",
+
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "O serviço foi editado",
+
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edição falhou",
+
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "O serviço não foi editado",
+
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Criação bem-sucedida",
+
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "O serviço foi criado",
+
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Criação falhou",
+
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "O serviço não foi criado",
+
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Por favor, selecionar pelo menos um padrão de entrada",
+
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estado atualizado com êxito",
+
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "O estado do serviço foi atualizado",
+
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Excluído com sucesso",
+
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "O serviço foi excluído",
+
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Falha na exclusão",
+
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "O serviço não foi excluído",
+
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancelar",
+
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Excluir serviço",
+
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar serviço",
+
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nome",
+
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descrição",
+
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL do serviço",
+
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL da caixa de entrada LDN",
+
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Padrão de entrada",
+
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Nenhum padrão de entrada",
+
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtro de item selecionado",
+
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sem filtro de itens",
+
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automático",
+
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Adicionar mais",
+
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar Serviço",
+
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Não selecionar nenhum",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Erro",
+
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Ocorreu um erro na criação deste processo",
+
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Sucesso",
+
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "O processo foi criado com êxito",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "O serviço selecionado é compatível com o item de acordo com o seu estado atual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Avaliação",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisão",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciado por",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementado por",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visão geral dos serviços LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Serviços LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Serviço LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "Em baixo pode ver todos os tópicos recebidos das subscrições de {{source}} relativamente ao",
+
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "Em baixo encontra-se a lista de todas as sugestões para o tópico selecionado <b>{{topic}}</b>, relacionado com <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and",
+  "quality-assurance.events.description-with-topic-and-target": "Em baixo, a lista de todas as sugestões para o tópico selecionado <b>{{topic}}</b>, relacionado com <b>{{source}}</b> e",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL do serviço:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Hiperligação:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancelar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Excluir serviço",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Excluir serviço",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Tem certeza que pretende excluir o serviço atual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Excluir serviço",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "O serviço foi excluído com êxito.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Algo correu mal ao excluir o serviço",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID serviços",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nome",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora de início (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estado",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Utilizador",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visão geral dos serviços",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visão geral dos serviços",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Ações",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descrição",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Pode solicitar uma revisão para um dos seguintes serviços",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Pode solicitar aprovação para um dos seguintes 'overlay journals'",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Pode solicitar a integração de uma cópia da sua apresentação a um dos seguintes serviços",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "Sem dados disponíveis",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Não selecionar nenhum",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Selecionar um serviço para {{pattern }} deste artigo",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descrição do serviço selecionado:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "Não existem mais informações disponíveis",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "O serviço selecionado não é adequado para o item atual. Consulte a descrição para obter mais informações sobre os registos que podem ser geridos por este serviço.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "Não foram encontrados padrões configuráveis.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtro inválido, tente selecionar outro serviço ou nenhum.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> foi assumido como responsável.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> foi rejeitado.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> está a aguardar.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar padrão suportado para exclusão",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar padrão suportado para exclusão",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Selecionar o filtro item para o padrão",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Selecionar um padrão para o serviço",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Selecionar serviço para exclusão",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar serviço LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Fechar 'modal'",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "O tipo de item é um 'Artigo científico' ou 'Conjunto de dados'",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Sempre verdadeiro",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Processamento automático",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contém DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtro DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "Tipo de documento é igual a 'Driver'",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Tem pelo menos um ficheiro",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Tem ficheiro",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Tem um ficheiro",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Está depositado",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Está retirado",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "O item é público",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Integração de revistas",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "O título começa com padrão",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "Tipo é igual a 'Conjunto de dados'",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "Tipo é igual a 'Artigo Científico'",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Nenhum",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Painel de controlo",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Painel de controlo",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Painel de notificações",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "O painel de notificações monitoriza a utilização geral do protocolo COAR Notify em todo o repositório. No separador 'Métricas' encontram-se estatísticas sobre a utilização do protocolo COAR Notify. Nos separadores 'Registos/Entrada' (Logs/Inbound) e 'Registos/Saída' (Logs/Outbound) é possível pesquisar e verificar o estado individual de cada mensagem LDN, recebida ou enviada.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Métricas",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Número de LDN recebidas",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Número de LDN geradas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Aceite",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificações de entrada aceites",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Em exibição: Notificações aceites",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN processado",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificações de entrada processadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Em exibição: LDN processado",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Em exibição: Notificações falhadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Falha",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificações de entrada falhadas",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Em exibição: Notificações falhadas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Falha",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificações de saída falhadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Em exibição: Notificações não confiáveis",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Não confiável",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificações de entrada não confiáveis",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Em exibição: Notificações entregues",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificações de entrada entregues com sucesso",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Entregue",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Em exibição: Notificações entregues",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificações de saída entregues com sucesso",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Em exibição: Notificações em fila de espera",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificações em fila de espera",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Em fila de espera",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Em exibição: Notificações em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificações em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Itens envolvidos",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Itens relacionados com as notificações de entrada",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Itens envolvidos",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Itens relacionados com as notificações de saída",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Painel de controlo",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Mensagens de entrada",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Registos/Entrada",
+
+  // "admin.notify.dashboard.filter": "Filter:",
+  "admin.notify.dashboard.filter": "Filtro:",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Itens relacionados",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Serviço LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificar revisão",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificar avaliação",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificar relação",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de processamento",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Intervalo mínimo",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Intervalo máximo",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Intervalo mínimo",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Intervalo máximo",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Mensagens de saída",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Registos/Saída",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "A receber",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Item relacionado",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origem",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Serviço LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Destino",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estado da fila de espera",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipo de fluxo de atividade",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Tipo de COAR Notify",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipo de notificação",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Pesquisar itens relacionados",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Pesquisar estado da fila de espera",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Pesquisar destino",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Pesquisar tipo de fluxo de atividade",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estado da fila de espera",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "IP não confiável",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "Em fila de espera",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "A processar",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processado",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Falhou",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "Não confiável",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Ação não mapeada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "Em fila de espera para nova tentativa",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipo de fluxo de atividade",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipo de notificação COAR",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipo de notificação",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Pesquisar tipo de notificação COAR",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Pesquisar tipo de notificação",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Itens relacionados",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Destino",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Pesquisar fonte",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Fonte",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Pesquisar Serviço LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Serviço LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estado da fila de espera",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipo de fluxo de atividade",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Tipo de notificação COAR",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificação",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificar relação",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Pesquisar notificação de relação",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificar relação",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificar revisão",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Pesquisar notificação de revisão",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificar revisão",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Rever ação",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Rever ação",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Rever ação",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Ação de avaliação",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Ação de aprovação",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Ação de avaliação",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ação de integração",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ação de integração",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Ação de integração",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Ação de relacionamento",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Ação de relacionamento",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Ação de relacionamento",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Em fila de espera",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Em fila de espera",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Em fila de espera para nova tentativa",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Em fila de espera para nova tentativa",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "A processar",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "A processar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processado",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processado",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Falhou",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Falhou",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Não confiável",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP não confiável",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Não confiável",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP não confiável",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Ação não mapeada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Ação não mapeada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última fila de espera iniciada descendente",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última fila de espera iniciada ascendente",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Tentativas em fila de espera descendente",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Tentativas em fila de espera ascendente",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Itens envolvidos na entrada LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Itens envolvidos na saída LDN",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipo",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipo de notificação COAR",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipo de fluxo de atividade",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "Em resposta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Item do repositório",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Item do repositório",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Tentativas em fila de espera",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última inicialização da fila de espera",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Serviço LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Serviço LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estado da fila",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Expirou o tempo limite da fila de espera",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detalhe da mensagem",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar mensagem",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Registo de data e hora",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Item do repositório",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Serviço LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipo",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estado",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Ação",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detalhe",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocessar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processado",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Falhou",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "Em fila de espera para nova tentativa",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Ação não mapeada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "A processar",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "Em fila de espera",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "Não confiável",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Serviço LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Item relacionado",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificar avaliação",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificar avaliação",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Pesquisar notificação de avaliação",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licença Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Salvo indicação em contrário, a licença deste artigo é descrita como",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Pesquisar o repositório",
+
   // Other strings...
   // Missing, Duplicate or Redundant ???
 
-  // NOT FOUND 08-12-2023
-
-  // "browse.metadata.srsc": "Subject Category",
-  "browse.metadata.srsc": "Vocabulário controlado (SRSC)",
+  // NOT FOUND ORIGINAL 'en.json5' 02-07-2024
 
   // "datafile.listelement.badge": "Data file",
   "datafile.listelement.badge": "Ficheiro de dados",
@@ -8433,15 +10349,6 @@
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "A senha deve ter pelo menos 6 caracteres.",
 
-  // "search.filters.entityType.Publication": "Publication",
-  "search.filters.entityType.Publication": "Publicação",
-
-  // "search.filters.entityType.Person": "Person",
-  "search.filters.entityType.Person": "Pessoa",
-
-  // "search.filters.entityType.Project": "Project",
-  "search.filters.entityType.Project": "Projeto",
-
   // "search.filters.entityType.Journal": "Journal",
   "search.filters.entityType.Journal": "Revista",
 
@@ -8455,17 +10362,11 @@
   "forgot-email.form.google-recaptcha.open-cookie-settings": "Configurar cookies",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Successfully imported and added external project to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Importado com sucesso e adicionado autor à seleção",
-
-  // "orgunit.search.results.head": "Organizational Unit Search Results",
-  "orgunit.search.results.head": "Resultados da pesquisa de organizações",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Importado com sucesso e projeto externo adicionado à seleção",
 
   // "orgunit-relationships.search.results.head": "Organizational Unit Search Results",
   "orgunit-relationships.search.results.head": "Resultados da pesquisa de organizações",
 
-  // "journalissue.search.results.head": "Journal Issue Search Results",
-  "journalissue.search.results.head": "Resultados da pesquisa de números",
-
   // "journalissue-relationships.search.results.head": "Journal Issue Search Results",
   "journalissue-relationships.search.results.head": "Resultados da pesquisa de números",
 

From 43071da3ebd1940d2b2979bd94a9b412e2b89623 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:20:55 +0100
Subject: [PATCH 0316/1286] Update pt-PT.json5

Lint errors review.
---
 src/assets/i18n/pt-PT.json5 | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 2a795ccb9b..0683f242e9 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -21,7 +21,7 @@
   "403.forbidden": "Proibido",
 
   // "500.page-internal-server-error": "Service unavailable",
- "500.page-internal-server-error": "Serviço indisponível",
+  "500.page-internal-server-error": "Serviço indisponível",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
   "500.help": "O servidor encontra-se temporariamete indisponível para responder ao seu pedido, devido a processos de manutenção em curso ou capacidade de resposta. Por favor tente mais tarde.",
@@ -30,7 +30,7 @@
   "500.link.home-page": "Voltar à página de início",
 
   // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
+  "404.help": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Voltar à página de início",
@@ -39,7 +39,7 @@
   "404.page-not-found": "Página não encontrada",
 
   // "error-page.description.401": "Unauthorized",
- "error-page.description.401": "Não autorizado",
+  "error-page.description.401": "Não autorizado",
 
   // "error-page.description.403": "Forbidden",
   "error-page.description.403": "Proibido",
@@ -2802,7 +2802,7 @@
   "error.search-results": "Erro ao carregar os resultados da pesquisa!",
 
   // "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": "A query da pesquisa não é válida! Por favor verifique <a href='https://solr.apache.org/guide/query-syntax-and-parsing.html' target=\'_blank\'>Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
+  "error.invalid-search-query": "A query da pesquisa não é válida! Por favor verifique <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\"target=\"_blank\">Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções!",
@@ -6200,19 +6200,19 @@
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registar deve aceitar o <b>registo e a senha de recuperação</b> (Google reCaptcha) cookies.",
 
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
- "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
+  "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
- "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
- "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": "Ocorreu um erro na verificação do reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro na verificação do reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
- "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
 
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "As contas podem ser registadas para os endereços de email os domínios",
@@ -7582,14 +7582,14 @@
   // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit of the Project",
   "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit do projeto",
 
-   // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
-   "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
 
-   // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
-   "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
+  // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
 
-   // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-   "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
+  // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
 
   // "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Search...",
   "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Pesquisar...",

From 703945c804820de8d5b64ec02340d8a44ca8b801 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 19 Jul 2024 14:54:39 +0200
Subject: [PATCH 0317/1286] [CST-15591] Fixed headings by their rank

---
 .../create-collection-page.component.html          |  4 ++--
 .../create-community-page.component.html           |  6 +++---
 .../events/quality-assurance-events.component.html | 14 +++++++-------
 .../source/quality-assurance-source.component.html |  4 ++--
 .../topics/quality-assurance-topics.component.html |  4 ++--
 .../workspaceitem-actions.component.html           |  2 +-
 .../item-list-preview.component.html               |  2 +-
 .../scope-selector-modal.component.html            |  6 +++---
 .../search-results/search-results.component.html   |  2 +-
 .../sections/upload/section-upload.component.html  |  2 +-
 .../workspaceitems-delete-page.component.html      |  4 ++--
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index 6ca5533924..5c1b7b32a5 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,8 +1,8 @@
 <div class="container" *ngIf="(isLoading$ | async) === false">
   <div class="row">
     <div class="col-12 pb-4">
-      <h2 id="sub-header"
-          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
+      <h1 id="sub-header"
+          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
     </div>
   </div>
   <ds-collection-form (submitForm)="onSubmit($event)"
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 219f6470b0..1d3d6eb871 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -2,9 +2,9 @@
   <div class="row">
     <div class="col-12 pb-4">
       <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h2 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h2>
-        <h2 *ngIf="parent" id="sub-header"
-            class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
+        <h1 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
+        <h1 *ngIf="parent" id="sub-header"
+            class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
       </ng-container>
     </div>
   </div>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 4341764d1c..8a9f40e2b2 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -1,11 +1,11 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h2 class="border-bottom pb-2">
+      <h1 class="border-bottom pb-2">
         <div class="d-flex justify-content-between">
           {{'notifications.events.title'| translate}}
         </div>
-      </h2>
+      </h1>
       <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
         <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
       </ds-alert>
@@ -17,9 +17,9 @@
   </div>
   <div class="row">
     <div class="col-12">
-      <h4 class="border-bottom pb-2">
+      <h2 class="border-bottom pb-2">
         {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
-      </h4>
+      </h2>
 
       <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
 
@@ -247,7 +247,7 @@
 
 <ng-template #ignoreModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
@@ -264,7 +264,7 @@
 
 <ng-template #rejectModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
@@ -281,7 +281,7 @@
 
 <ng-template #undoModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.undo.description' | translate}}</p>
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index bf461873a1..07e0a27a96 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -1,13 +1,13 @@
 <div class="container">
     <div class="row">
       <div class="col-12">
-        <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+        <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
         <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
       </div>
     </div>
     <div class="row">
       <div class="col-12">
-        <h4 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h4>
+        <h2 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
 
         <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
         <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index 6825bdd080..c2882f94ef 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+      <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
       <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
       <ds-alert *ngIf="targetId" [type]="'alert-info'">
         {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
@@ -11,7 +11,7 @@
   </div>
   <div class="row">
     <div class="col-12">
-      <h4 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h4>
+      <h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>
 
       <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
       <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index c3515b4d72..daefc75fd3 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -30,7 +30,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
+    <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index a0ded30d29..035a7ff9f5 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -9,7 +9,7 @@
         <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
       </div>
       <ds-truncatable [id]="item.id">
-        <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
+        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
         <div>
           <span class="text-muted">
             <ds-truncatable-part [id]="item.id" [minLines]="1">
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 013274320b..74c71b1d12 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="position-relative py-1 my-3 font-weight-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
+        <h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 0c7e560238..871b2b2ca8 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex justify-content-between">
-    <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
 </div>
 <div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index a9061e40f2..9d916a4f98 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -51,7 +51,7 @@
 <ng-template #noFileUploaded>
   <div class="row">
     <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+      <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
 </ng-template>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index f33a4a6706..75c265b420 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2>{{ 'workspace-item.delete.header' | translate }}</h2>
+  <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
   <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
@@ -7,7 +7,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{ 'workspace-item.delete.header' | translate }}</h4>
+    <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>

From fa0ec0bf0c375b2d55a72c0792eb7f2666dbd8da Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 19 Jul 2024 16:43:39 +0200
Subject: [PATCH 0318/1286] [CST-15590] Close user profile menu after menu
 entry is selected

---
 .../auth-nav-menu/auth-nav-menu.component.html     |  4 ++--
 .../user-menu/themed-user-menu.component.ts        |  9 ++++++++-
 .../user-menu/user-menu.component.html             |  6 +++---
 .../user-menu/user-menu.component.spec.ts          | 11 +++++++++++
 .../auth-nav-menu/user-menu/user-menu.component.ts | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 74ae821634..70d7a382f6 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -19,7 +19,7 @@
     </div>
   </div>
   <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+    <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
       <a href="javascript:void(0);"
          role="menuitem"
          [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
@@ -30,7 +30,7 @@
          ngbDropdownToggle>
         <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
       <div id="logoutDropdownMenu" ngbDropdownMenu>
-        <ds-user-menu [inExpandableNavbar]="false"></ds-user-menu>
+        <ds-user-menu [inExpandableNavbar]="false" (changedRoute)="loggedInDrop.close()"></ds-user-menu>
       </div>
     </div>
   </div>
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
index 38112cfa7c..6b5e509393 100644
--- a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -1,6 +1,8 @@
 import {
   Component,
+  EventEmitter,
   Input,
+  Output,
 } from '@angular/core';
 
 import { ThemedComponent } from '../../theme-support/themed.component';
@@ -23,7 +25,12 @@ export class ThemedUserMenuComponent extends ThemedComponent<UserMenuComponent>{
    */
   @Input() inExpandableNavbar: boolean;
 
-  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
+  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar', 'changedRoute'];
 
   protected getComponentName(): string {
     return 'UserMenuComponent';
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 4c36cc2f24..130c01c049 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -6,17 +6,17 @@
     {{dsoNameService.getName(user$ | async)}}<br>
     <span class="text-muted">{{(user$ | async)?.email}}</span>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[profileRoute]"
        routerLinkActive="active">{{'nav.profile' | translate}}</a>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[mydspaceRoute]"
        routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[subscriptionsRoute]"
        routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index c7ddf2ac34..f0758ce1c2 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -203,6 +203,17 @@ describe('UserMenuComponent', () => {
       expect(components).toBeFalsy();
     });
 
+    it('should call onMenuItemClick when li is clicked', () => {
+      spyOn(component, 'onMenuItemClick');
+      const lis = fixture.debugElement.queryAll(By.css('.ds-menu-item-wrapper'));
+      const secondLi = lis[1];
+      secondLi.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        },
+      });
+      expect(component.onMenuItemClick).toHaveBeenCalled();
+    });
+
   });
 
 });
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 51590e8c8a..6a601bd9a3 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -5,8 +5,10 @@ import {
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Input,
   OnInit,
+  Output,
 } from '@angular/core';
 import {
   RouterLink,
@@ -49,6 +51,11 @@ export class UserMenuComponent implements OnInit {
    */
   @Input() inExpandableNavbar = false;
 
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * True if the authentication is loading.
    * @type {Observable<boolean>}
@@ -96,4 +103,11 @@ export class UserMenuComponent implements OnInit {
     this.user$ = this.authService.getAuthenticatedUserFromStore();
 
   }
+
+  /**
+   * Emits an event when the menu item is clicked
+   */
+  onMenuItemClick() {
+    this.changedRoute.emit();
+  }
 }

From 6cb4faa8d34cbb18eb0516506c2c6da6b5e15df9 Mon Sep 17 00:00:00 2001
From: autavares-dev <autavares.dev@gmail.com>
Date: Mon, 22 Jul 2024 21:20:05 -0300
Subject: [PATCH 0319/1286] Fix truncatable-part keyboard accessibility

---
 .../truncatable-part.component.html            | 18 +++++++++++-------
 .../truncatable-part.component.spec.ts         | 13 +++++++++++++
 .../truncatable-part.component.ts              |  7 +++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 32a2a21349..55ebe2d957 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -2,12 +2,16 @@
   <div #content class="content dont-break-out preserve-line-breaks">
     <ng-content></ng-content>
   </div>
-  <button class="btn btn-link p-0 expandButton" dsDragClick (actualClick)="toggle()">
-    <i class="fas fa-angle-down"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-more' | translate }}</span>
-  </button>
-  <button class="btn btn-link p-0 collapseButton" dsDragClick (actualClick)="toggle()" *ngIf="expand && expandable">
-    <i class="fas fa-angle-up"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-less' | translate }}</span>
+  <button
+    class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
+    dsDragClick
+    (actualClick)="toggle()"
+    (keyup.Enter)="toggle()"
+    (keyup.Space)="toggle()"
+    role="button"
+    [attr.aria-expanded]="isExpanded"
+  >
+    <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
+    <span class="ml-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 7e528650d9..7b3ac2242b 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -87,6 +87,11 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).toBeNull();
     });
+
+    it('expandButton aria-expanded should be false', () => {
+      const btn = fixture.debugElement.query(By.css('.expandButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('false');
+    });
   });
 
   describe('When the item is expanded', () => {
@@ -115,6 +120,14 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).not.toBeNull();
     });
+
+    it('collapseButton aria-expanded should be true', () => {
+      (comp as any).setLines();
+      (comp as any).expandable = true;
+      fixture.detectChanges();
+      const btn = fixture.debugElement.query(By.css('.collapseButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('true');
+    });
   });
 });
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 54220d7f10..0c49a56405 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -150,6 +150,13 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
     }
   }
 
+  /**
+   * Indicates if the content is expanded, button state is 'Collapse'
+   */
+  public get isExpanded() {
+    return this.expand && this.expandable;
+  }
+
   /**
    * Unsubscribe from the subscription
    */

From 1a498f8104f4fb077ae3cb8aada6fd928aa6fdc8 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Thu, 11 Jul 2024 13:18:38 +0200
Subject: [PATCH 0320/1286] [CST-14903] Orcid Synchronization improvements

feat:
- Introduces reactive states derived from item inside orcid-sync page
- Removes unnecessary navigation
ref:
- Introduces catchError operator and handles failures with error messages
---
 .../orcid-auth/orcid-auth.component.ts        |   9 +-
 .../orcid-page/orcid-page.component.ts        |  17 +-
 .../orcid-sync-settings.component.spec.ts     |   6 +-
 .../orcid-sync-settings.component.ts          | 169 +++++++++++++-----
 src/app/shared/remote-data.utils.ts           |  25 +++
 5 files changed, 177 insertions(+), 49 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 5825ecc4e4..6a3b8af937 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -19,6 +19,7 @@ import {
 } from '@ngx-translate/core';
 import {
   BehaviorSubject,
+  catchError,
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -34,6 +35,7 @@ import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-auth',
@@ -203,13 +205,14 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
       getFirstCompletedRemoteData(),
+      catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
-      if (remoteData.isSuccess) {
+      if (remoteData.hasFailed) {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
+      } else {
         this.notificationsService.success(this.translateService.get('person.page.orcid.unlink.success'));
         this.unlink.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get('person.page.orcid.unlink.error'));
       }
     });
   }
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index a3c31e791d..7e634fdeca 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -20,6 +20,7 @@ import {
   combineLatest,
 } from 'rxjs';
 import {
+  filter,
   map,
   take,
 } from 'rxjs/operators';
@@ -187,8 +188,20 @@ export class OrcidPageComponent implements OnInit {
    */
   private clearRouteParams(): void {
     // update route removing the code from query params
-    const redirectUrl = this.router.url.split('?')[0];
-    this.router.navigate([redirectUrl]);
+    this.route.queryParamMap
+      .pipe(
+        filter((paramMap: ParamMap) => isNotEmpty(paramMap.keys)),
+        map(_ => Object.assign({})),
+        take(1),
+      ).subscribe(queryParams =>
+        this.router.navigate(
+          [],
+          {
+            relativeTo: this.route,
+            queryParams,
+          },
+        ),
+      );
   }
 
 }
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
index a64feb0ae1..bef1378209 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.spec.ts
@@ -180,6 +180,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     scheduler = getTestScheduler();
     fixture = TestBed.createComponent(OrcidSyncSettingsComponent);
     comp = fixture.componentInstance;
+    researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
     comp.item = mockItemLinkedToOrcid;
     fixture.detectChanges();
   }));
@@ -216,7 +217,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should call updateByOrcidOperations properly', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       const expectedOps: Operation[] = [
         {
@@ -245,7 +245,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on success', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
@@ -257,6 +256,8 @@ describe('OrcidSyncSettingsComponent test suite', () => {
 
     it('should show notification on error', () => {
       researcherProfileService.findByRelatedItem.and.returnValue(createFailedRemoteDataObject$());
+      comp.item = mockItemLinkedToOrcid;
+      fixture.detectChanges();
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
       scheduler.flush();
@@ -266,7 +267,6 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     });
 
     it('should show notification on error', () => {
-      researcherProfileService.findByRelatedItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
       researcherProfileService.patch.and.returnValue(createFailedRemoteDataObject$());
 
       scheduler.schedule(() => comp.onSubmit(formGroup));
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 424baf45fb..7c3f71785c 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -15,17 +16,32 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
-import { of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  switchMap,
+  take,
+  takeUntil,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-data.utils';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
@@ -39,14 +55,9 @@ import { NotificationsService } from '../../../shared/notifications/notification
   ],
   standalone: true,
 })
-export class OrcidSyncSettingsComponent implements OnInit {
+export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
   protected readonly AlertType = AlertType;
 
-  /**
-   * The item for which showing the orcid settings
-   */
-  @Input() item: Item;
-
   /**
    * The prefix used for i18n keys
    */
@@ -91,12 +102,39 @@ export class OrcidSyncSettingsComponent implements OnInit {
    * An event emitted when settings are updated
    */
   @Output() settingsUpdated: EventEmitter<void> = new EventEmitter<void>();
+  /**
+   * Emitter that triggers onDestroy lifecycle
+   * @private
+   */
+  readonly #destroy$ = new EventEmitter<void>();
+  /**
+   * {@link BehaviorSubject} that reflects {@link item} input changes
+   * @private
+   */
+  readonly #item$ = new BehaviorSubject<Item>(null);
+  /**
+   * {@link Observable} that contains {@link ResearcherProfile} linked to the {@link #item$}
+   * @private
+   */
+  #researcherProfile$: Observable<ResearcherProfile>;
 
   constructor(private researcherProfileService: ResearcherProfileDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService) {
   }
 
+  /**
+   * The item for which showing the orcid settings
+   */
+  @Input()
+  set item(item: Item) {
+    this.#item$.next(item);
+  }
+
+  ngOnDestroy(): void {
+    this.#destroy$.next();
+  }
+
   /**
    * Init orcid settings form
    */
@@ -128,20 +166,21 @@ export class OrcidSyncSettingsComponent implements OnInit {
         };
       });
 
-    const syncProfilePreferences = this.item.allMetadataValues('dspace.orcid.sync-profile');
+    this.updateSyncProfileOptions(this.#item$.asObservable());
+    this.updateSyncPreferences(this.#item$.asObservable());
 
-    this.syncProfileOptions = ['BIOGRAPHICAL', 'IDENTIFIERS']
-      .map((value) => {
-        return {
-          label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
-          value: value,
-          checked: syncProfilePreferences.includes(value),
-        };
-      });
-
-    this.currentSyncMode = this.getCurrentPreference('dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL');
-    this.currentSyncPublications = this.getCurrentPreference('dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED');
-    this.currentSyncFunding = this.getCurrentPreference('dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED');
+    this.#researcherProfile$ =
+      this.#item$.pipe(
+        switchMap(item =>
+          this.researcherProfileService.findByRelatedItem(item)
+            .pipe(
+              getFirstCompletedRemoteData(),
+              catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
+              getRemoteDataPayload(),
+            ),
+        ),
+        takeUntil(this.#destroy$),
+      );
   }
 
   /**
@@ -166,37 +205,84 @@ export class OrcidSyncSettingsComponent implements OnInit {
       return;
     }
 
-    this.researcherProfileService.findByRelatedItem(this.item).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD: RemoteData<ResearcherProfile>) => {
-        if (profileRD.hasSucceeded) {
-          return this.researcherProfileService.patch(profileRD.payload, operations).pipe(
-            getFirstCompletedRemoteData(),
-          );
+    this.#researcherProfile$
+      .pipe(
+        switchMap(researcherProfile => this.researcherProfileService.patch(researcherProfile, operations)),
+        getFirstCompletedRemoteData(),
+        catchError(createFailedRemoteDataObjectFromError$<ResearcherProfile>),
+        take(1),
+      )
+      .subscribe((remoteData: RemoteData<ResearcherProfile>) => {
+        if (remoteData.hasFailed) {
+          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
         } else {
-          return of(profileRD);
+          this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
+          this.settingsUpdated.emit();
         }
-      }),
-    ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
-      if (remoteData.isSuccess) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.success'));
-        this.settingsUpdated.emit();
-      } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.synchronization-settings-update.error'));
-      }
-    });
+      });
+  }
+
+  /**
+   *
+   * Handles subscriptions to populate sync preferences
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncPreferences(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-mode', ['BATCH', 'MANUAL'], 'MANUAL')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncMode = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-publications', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncPublications = val);
+    item.pipe(
+      filter(hasValue),
+      map(i => this.getCurrentPreference(i, 'dspace.orcid.sync-fundings', ['DISABLED', 'ALL'], 'DISABLED')),
+      takeUntil(this.#destroy$),
+    ).subscribe(val => this.currentSyncFunding = val);
+  }
+
+  /**
+   * Handles subscription to populate the {@link syncProfileOptions} field
+   *
+   * @param item observable that emits update on item changes
+   * @private
+   */
+  private updateSyncProfileOptions(item: Observable<Item>) {
+    item.pipe(
+      filter(hasValue),
+      map(i => i.allMetadataValues('dspace.orcid.sync-profile')),
+      map(metadata =>
+        ['BIOGRAPHICAL', 'IDENTIFIERS']
+          .map((value) => {
+            return {
+              label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
+              value: value,
+              checked: metadata.includes(value),
+            };
+          }),
+      ),
+      takeUntil(this.#destroy$),
+    )
+      .subscribe(value => this.syncProfileOptions = value);
   }
 
   /**
    * Retrieve setting saved in the item's metadata
    *
+   * @param item The item from which retrieve settings
    * @param metadataField The metadata name that contains setting
    * @param allowedValues The allowed values
    * @param defaultValue  The default value
    * @private
    */
-  private getCurrentPreference(metadataField: string, allowedValues: string[], defaultValue: string): string {
-    const currentPreference = this.item.firstMetadataValue(metadataField);
+  private getCurrentPreference(item: Item, metadataField: string, allowedValues: string[], defaultValue: string): string {
+    const currentPreference = item.firstMetadataValue(metadataField);
     return (currentPreference && allowedValues.includes(currentPreference)) ? currentPreference : defaultValue;
   }
 
@@ -216,3 +302,4 @@ export class OrcidSyncSettingsComponent implements OnInit {
   }
 
 }
+
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index 3ec7ace051..044e50b360 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import {
   Observable,
   of as observableOf,
@@ -107,3 +108,27 @@ export function createNoContentRemoteDataObject<T>(timeCompleted?: number): Remo
 export function createNoContentRemoteDataObject$<T>(timeCompleted?: number): Observable<RemoteData<T>> {
   return createSuccessfulRemoteDataObject$(undefined, timeCompleted);
 }
+
+/**
+ * Method to create a remote data object that has failed starting from a given error
+ *
+ * @param error
+ */
+export function createFailedRemoteDataObjectFromError<T>(error: unknown): RemoteData<T> {
+  const remoteData = createFailedRemoteDataObject<T>();
+  if (error instanceof Error) {
+    remoteData.errorMessage = error.message;
+  }
+  if (error instanceof HttpErrorResponse) {
+    remoteData.statusCode = error.status;
+  }
+  return remoteData;
+}
+
+/**
+ * Method to create a remote data object that has failed starting from a given error
+ * @param error
+ */
+export function createFailedRemoteDataObjectFromError$<T>(error: unknown): Observable<RemoteData<T>> {
+  return observableOf(createFailedRemoteDataObjectFromError<T>(error));
+}

From 3c665a736d861f46d72f51b77384a2496c73be52 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Fri, 7 Jun 2024 14:58:50 +0200
Subject: [PATCH 0321/1286] [DURACOM-273] fix markdown rendering applying
 before mathjax rendering

(cherry picked from commit 66e1a2488b14c84b41486fabc77350f17d722b0d)
---
 src/app/core/shared/client-math.service.ts |  4 +--
 src/app/core/shared/math.service.spec.ts   |  4 +--
 src/app/core/shared/math.service.ts        |  2 +-
 src/app/core/shared/server-math.service.ts |  2 +-
 src/app/shared/utils/markdown.directive.ts | 42 +++++++++++++---------
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/app/core/shared/client-math.service.ts b/src/app/core/shared/client-math.service.ts
index 2fde521ba9..0630ec3246 100644
--- a/src/app/core/shared/client-math.service.ts
+++ b/src/app/core/shared/client-math.service.ts
@@ -31,7 +31,7 @@ export class ClientMathService extends MathService {
 
   protected mathJaxOptions = {
     tex: {
-      inlineMath: [['$', '$'], ['\\(', '\\)']],
+      inlineMath: [['$', '$'], ['$$', '$$'], ['\\(', '\\)']],
     },
     svg: {
       fontCache: 'global',
@@ -108,7 +108,7 @@ export class ClientMathService extends MathService {
    */
   render(element: HTMLElement) {
     if (environment.markdown.mathjax) {
-      this._window.nativeWindow.MathJax.typesetPromise([element]);
+      return (window as any).MathJax.typesetPromise([element]) as Promise<any>;
     }
   }
 }
diff --git a/src/app/core/shared/math.service.spec.ts b/src/app/core/shared/math.service.spec.ts
index cc0b2814f2..75d8bf1024 100644
--- a/src/app/core/shared/math.service.spec.ts
+++ b/src/app/core/shared/math.service.spec.ts
@@ -22,8 +22,8 @@ export class MockMathService extends MathService {
     return of(true);
   }
 
-  render(element: HTMLElement): void {
-    return;
+  render(element: HTMLElement): Promise<any> {
+    return Promise.resolve();
   }
 }
 
diff --git a/src/app/core/shared/math.service.ts b/src/app/core/shared/math.service.ts
index c06ce06220..909e039564 100644
--- a/src/app/core/shared/math.service.ts
+++ b/src/app/core/shared/math.service.ts
@@ -15,5 +15,5 @@ export abstract class MathService {
 
   protected abstract registerMathJaxAsync(config: MathJaxConfig): Promise<any>;
   abstract ready(): Observable<boolean>;
-  abstract render(element: HTMLElement): void;
+  abstract render(element: HTMLElement): Promise<any>;
 }
diff --git a/src/app/core/shared/server-math.service.ts b/src/app/core/shared/server-math.service.ts
index 75fa775fee..62070dbafc 100644
--- a/src/app/core/shared/server-math.service.ts
+++ b/src/app/core/shared/server-math.service.ts
@@ -47,6 +47,6 @@ export class ServerMathService extends MathService {
   }
 
   render(element: HTMLElement) {
-    return;
+    return Promise.resolve();
   }
 }
diff --git a/src/app/shared/utils/markdown.directive.ts b/src/app/shared/utils/markdown.directive.ts
index a38b079ffd..0540e25cc5 100644
--- a/src/app/shared/utils/markdown.directive.ts
+++ b/src/app/shared/utils/markdown.directive.ts
@@ -55,30 +55,40 @@ export class MarkdownDirective implements OnInit, OnDestroy {
 
   async render(value: string, forcePreview = false): Promise<SafeHtml> {
     if (isEmpty(value) || (!environment.markdown.enabled && !forcePreview)) {
-      return value;
+      this.el.innerHTML = value;
+      return;
+    } else {
+      if (environment.markdown.mathjax) {
+        this.renderMathjaxThenMarkdown(value);
+      } else {
+        this.renderMarkdown(value);
+      }
     }
+  }
+
+  private renderMathjaxThenMarkdown(value: string) {
+    const sanitized = this.sanitizer.sanitize(SecurityContext.HTML, value);
+    this.el.innerHTML = sanitized;
+    this.mathService.ready().pipe(
+      filter((ready) => ready),
+      take(1),
+      takeUntil(this.alive$),
+    ).subscribe(() => {
+      this.mathService.render(this.el)?.then(_ => {
+        this.renderMarkdown(this.el.innerHTML, true);
+      });
+    });
+  }
+
+  private async renderMarkdown(value: string, alreadySanitized = false) {
     const MarkdownIt = await this.markdownIt;
     const md = new MarkdownIt({
       html: true,
       linkify: true,
     });
 
-    const html = this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
+    const html = alreadySanitized ? md.render(value) : this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
     this.el.innerHTML = html;
-
-    if (environment.markdown.mathjax) {
-      this.renderMathjax();
-    }
-  }
-
-  private renderMathjax() {
-    this.mathService.ready().pipe(
-      filter((ready) => ready),
-      take(1),
-      takeUntil(this.alive$),
-    ).subscribe(() => {
-      this.mathService.render(this.el);
-    });
   }
 
   ngOnDestroy() {

From 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 25 Jul 2024 10:44:00 -0300
Subject: [PATCH 0322/1286] Removing position-fixed bootstrap class so that
 navbar links are available again

---
 .../file-dropzone-no-uploader.component.html                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index babfa91f0b..dcd1fdfef7 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,12 +1,12 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone position-fixed h-100 w-100"
+     class="ds-document-drop-zone h-100 w-100"
      [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
      [uploader]="uploader"
      (onFileDrop)="setFile($event)"
      (fileOver)="fileOverDocument($event)">
 </div>
 <div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+     class="ds-document-drop-zone-inner h-100 w-100 p-2">
   <div
     class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
     <p class="text-primary">{{ dropMessageLabel | translate}}</p>

From d31e17894ce3f8f6be82f426de879816d76acd97 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 26 Jul 2024 13:57:47 +0200
Subject: [PATCH 0323/1286] 116728: Removed unnecessary *ngVars from the
 ThumbnailComponent

---
 src/app/thumbnail/thumbnail.component.html    | 20 ++++++-------
 src/app/thumbnail/thumbnail.component.spec.ts | 28 +++++++++----------
 src/app/thumbnail/thumbnail.component.ts      | 14 +++++-----
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 6a0516b0d4..049a47e1b0 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
-<div class="thumbnail" [class.limit-width]="limitWidth" *ngVar="(isLoading$ | async) as isLoading">
+<div class="thumbnail" [class.limit-width]="limitWidth">
   <div *ngIf="isLoading" class="thumbnail-content outer">
     <div class="inner">
       <div class="centered">
@@ -6,16 +6,14 @@
       </div>
     </div>
   </div>
-  <ng-container *ngVar="(src$ | async) as src">
-    <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-    <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-         [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-    <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-      <div class="inner">
-        <div class="thumbnail-placeholder centered lead">
-          {{ placeholder | translate }}
-        </div>
+  <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
+  <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
+       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
+    <div class="inner">
+      <div class="thumbnail-placeholder centered lead">
+        {{ placeholder | translate }}
       </div>
     </div>
-  </ng-container>
+  </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index ebecb5e075..2a25c9a318 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -67,31 +67,31 @@ describe('ThumbnailComponent', () => {
 
   describe('loading', () => {
     it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading$.getValue()).toBeTrue();
+      expect(comp.isLoading).toBeTrue();
     });
 
     it('should set isLoading$ to false once an image is successfully loaded', () => {
       comp.setSrc('http://bit.stream');
       fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should set isLoading$ to false once the src is set to null', () => {
       comp.setSrc(null);
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should show a loading animation while isLoading$ is true', () => {
       expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
 
-      comp.isLoading$.next(false);
+      comp.isLoading = false;
       fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeFalsy();
     });
 
     describe('with a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next('https://bit.stream');
+        comp.src = 'https://bit.stream';
         fixture.detectChanges();
       });
 
@@ -100,7 +100,7 @@ describe('ThumbnailComponent', () => {
         expect(img).toBeTruthy();
         expect(img.classes['d-none']).toBeTrue();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         img = fixture.debugElement.query(By.css('img.thumbnail-content'));
         expect(img).toBeTruthy();
@@ -111,14 +111,14 @@ describe('ThumbnailComponent', () => {
 
     describe('without a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next(null);
+        comp.src = null;
         fixture.detectChanges();
       });
 
       it('should only show the HTML placeholder once done loading', () => {
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
       });
@@ -214,14 +214,14 @@ describe('ThumbnailComponent', () => {
   describe('fallback', () => {
     describe('if there is a default image', () => {
       it('should display the default image', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(comp.defaultImage);
+        expect(comp.src).toBe(comp.defaultImage);
       });
 
       it('should include the alt text', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
 
@@ -233,10 +233,10 @@ describe('ThumbnailComponent', () => {
 
     describe('if there is no default image', () => {
       it('should display the HTML placeholder', () => {
-        comp.src$.next('http://default.img');
+        comp.src = 'http://default.img';
         comp.defaultImage = null;
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(null);
+        expect(comp.src).toBe(null);
 
         fixture.detectChanges();
         const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
@@ -328,7 +328,7 @@ describe('ThumbnailComponent', () => {
       it('should show the default image', () => {
         comp.defaultImage = 'default/image.jpg';
         comp.ngOnChanges({});
-        expect(comp.src$.getValue()).toBe('default/image.jpg');
+        expect(comp.src).toBe('default/image.jpg');
       });
     });
   });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 7f6531cc5e..0827a33e77 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasNoValue, hasValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
@@ -34,7 +34,7 @@ export class ThumbnailComponent implements OnChanges {
   /**
    * The src attribute used in the template to render the image.
    */
-  src$ = new BehaviorSubject<string>(undefined);
+  src: string = undefined;
 
   retriedWithToken = false;
 
@@ -57,7 +57,7 @@ export class ThumbnailComponent implements OnChanges {
    * Whether the thumbnail is currently loading
    * Start out as true to avoid flashing the alt text while a thumbnail is being loaded.
    */
-  isLoading$ = new BehaviorSubject(true);
+  isLoading = true;
 
   constructor(
     protected auth: AuthService,
@@ -110,7 +110,7 @@ export class ThumbnailComponent implements OnChanges {
    * Otherwise, fall back to the default image or a HTML placeholder
    */
   errorHandler() {
-    const src = this.src$.getValue();
+    const src = this.src;
     const thumbnail = this.bitstream;
     const thumbnailSrc = thumbnail?._links?.content?.href;
 
@@ -162,9 +162,9 @@ export class ThumbnailComponent implements OnChanges {
    * @param src
    */
   setSrc(src: string): void {
-    this.src$.next(src);
+    this.src = src;
     if (src === null) {
-      this.isLoading$.next(false);
+      this.isLoading = false;
     }
   }
 
@@ -172,6 +172,6 @@ export class ThumbnailComponent implements OnChanges {
    * Stop the loading animation once the thumbnail is successfully loaded
    */
   successHandler() {
-    this.isLoading$.next(false);
+    this.isLoading = false;
   }
 }

From b10563ea5388e8c398ec8927dc562d6f841473db Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:32:57 +0200
Subject: [PATCH 0324/1286] Updated some messages following the lindat v5 and
 clarin-dspace v7 instance.

---
 src/assets/i18n/cs.json5 | 101 +++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0b4168cca9..3824e9741a 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1477,8 +1477,8 @@
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
 
-  // "bitstream.download.page.back": "Back",
-  "bitstream.download.page.back": "Zpět" ,
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Upravit politiky souboru",
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-  // "collection.create.breadcrumbs": "Create collection",
+    // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 
@@ -2210,8 +2210,7 @@
   "collection.source.controls.harvest.last": "Naposledy harvestováno:",
 
   // "collection.source.controls.harvest.message": "Harvest info:",
-  "collection.source.controls.harvest.message": "Informace o harevstu:",
-
+  "collection.source.controls.harvest.message": "Informace o harvestu:",
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
@@ -2703,7 +2702,7 @@
   "dso-selector.create.community.head": "Nová komunita",
 
   // "dso-selector.create.community.or-divider": "or",
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "nebo",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Vytvořit novou komunitu v",
@@ -2940,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "eslání. Pokud tuto licenci v tuto chvíli nemůžete udělit, můžete svou práci uložit a vrátit se k ní později nebo podání odstranit.",
+  "error.validation.license.notgranted": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -3252,7 +3251,7 @@
   "grant-deny-request-copy.intro2": "Po výběru možnosti se zobrazí návrh e-mailové odpovědi, který můžete upravit.",
 
   // "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": " Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
+  "grant-deny-request-copy.processed": "Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
 
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Žádost o kopii dokumentu",
@@ -3432,8 +3431,7 @@
   "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
 
   // "item.alerts.private": "This item is non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.alerts.private": "Tento záznam je nezobrazitelný",
+  "item.alerts.private": "Tento záznam je nevyhledatelný",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Tento záznam byl stažen",
@@ -4168,7 +4166,7 @@
   "item.page.journal-title": "Název časopisu",
 
   // "item.page.publisher": "Publisher",
-  "item.page.publisher": "Vydavatel",
+  "item.page.publisher": "Nakladatel",
 
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Záznam: ",
@@ -4268,7 +4266,7 @@
   "item.page.abstract": "Abstrakt",
 
   // "item.page.author": "Authors",
-  "item.page.author": "Autor",
+  "item.page.author": "Autoři",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Citace",
@@ -4310,10 +4308,10 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Úplný záznam",
+  "item.page.link.full": "Zobrazit celý záznam",
 
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Jednoduchý záznam",
+  "item.page.link.simple": "Zobrazit minimální záznam",
 
   // "item.page.orcid.title": "ORCID",
   "item.page.orcid.title": "ORCID",
@@ -4346,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "URI",
+  "item.page.uri": "Identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4461,10 +4459,10 @@
   "item.preview.oaire.awardNumber": "Identifikátor zdroje financování:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  "item.preview.dc.title.alternative": "Akronym:",
+  "item.preview.dc.title.alternative": "Zkratka:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-  "item.preview.dc.coverage.spatial": "Jurisdikce:",
+  "item.preview.dc.coverage.spatial": "Příslušnost:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Tok finančních prostředků:",
@@ -4841,7 +4839,7 @@
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  "journal.page.publisher": "Vydavatel",
+  "journal.page.publisher": "Nakladatel",
 
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Časopis: ",
@@ -4936,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo: ",
+  "iiif.page.issue": "Problém:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5042,8 +5040,7 @@
   "menu.header.nav.description": "Admin navigation bar",
 
   // "menu.header.admin": "Management",
-  // TODO Source message changed - Revise the translation
-  "menu.header.admin": "Management",
+  "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo úložiště",
@@ -5378,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Váš příspěvek",
+  "mydspace.results.head": "Vaše zázmany",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5390,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádné datum",
+  "mydspace.results.no-date": "Žádny datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -5412,9 +5409,9 @@
   // TODO Source message changed - Revise the translation
   "mydspace.show.workflow": "Úlohy workflow",
 
-  // "mydspace.show.workspace": "Your submissions",
+  // "mydspace.show.workspace": "Your Submissions",
   // TODO Source message changed - Revise the translation
-  "mydspace.show.workspace": "Váš příspěvek",
+  "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
@@ -5488,7 +5485,7 @@
   "nav.user-profile-menu-and-logout": "Menu uživatelského profilu a odhlášení",
 
   // "nav.logout": "Log Out",
-  "nav.logout": "Menu uživatelského profilu a odhlášení",
+  "nav.logout": "Odhlásit se",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Hlavní navigační panel",
@@ -6289,7 +6286,7 @@
   "publication.page.journal-title": "Název časopisu",
 
   // "publication.page.publisher": "Publisher",
-  "publication.page.publisher": "Vydavatel",
+  "publication.page.publisher": "Nakladatel",
 
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publikace: ",
@@ -6913,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Vkladatel",
+  "search.filters.applied.f.submitter": "Předkladatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7019,10 +7016,10 @@
   "search.filters.filter.creativeWorkKeywords.label": "Předmět hledání",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.head": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.head": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "Hledat vydavatele",
@@ -7058,7 +7055,7 @@
   "search.filters.filter.discoverable.head": "Nedohledatelné",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  "search.filters.filter.withdrawn.head": "Zrušeno",
+  "search.filters.filter.withdrawn.head": "Vyřazeno",
 
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Typ záznamu",
@@ -7142,7 +7139,7 @@
   "search.filters.filter.objectpeople.placeholder": "Lidé",
 
   // "search.filters.filter.objectpeople.label": "Search people",
-  "search.filters.filter.objectpeople.label": "Hledat lidi",
+  "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Stát",
@@ -7178,7 +7175,7 @@
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
 
   // "search.filters.filter.scope.label": "Search scope filter",
-  "search.filters.filter.scope.label": "Hledat filtr rozsahu",
+  "search.filters.filter.scope.label": "Filtr rozsahu hledání",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
@@ -7196,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Vkladatel",
+  "search.filters.filter.submitter.head": "Předkladatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Vkladatel",
+  "search.filters.filter.submitter.placeholder": "Předkladatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat vkladatele",
+  "search.filters.filter.submitter.label": "Hledat předkladatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -7286,8 +7283,8 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Ne",
 
-  // "search.filters.head": "Filters",
-  "search.filters.head": "Filtry",
+  // "search.filters.head": "Limit your search",
+  "search.filters.head": "Zúžit hledání",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Resetovat filtry",
@@ -7526,7 +7523,7 @@
   "submission.general.cannot_submit": "Nemáte oprávnění k vytvoření nového příspěvku.",
 
   // "submission.general.deposit": "Deposit",
-  "submission.general.deposit": "Vložit do repozitáře",
+  "submission.general.deposit": "Nahrát",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Zrušit",
@@ -7554,7 +7551,7 @@
   "submission.general.info.pending-changes": "Neuložené změny",
 
   // "submission.general.save": "Save",
-  "submission.general.save": "Průběžně uložit záznam",
+  "submission.general.save": "Uložit",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Uložit na později",
@@ -7709,10 +7706,10 @@
   "submission.import-external.preview.subtitle": "Níže uvedená metadata byla importována z externího zdroje. Budou předvyplněna při zahájení odesílání..",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Zahájit odesílání",
+  "submission.import-external.preview.button.import": "Začít nový příspěvek",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Chyba při odesílání",
+  "submission.import-external.preview.error.import.title": "Chyba při vytváření nového příspěvku",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Během procesu importu externí zdrojového záznamu došlo k chybě.",
@@ -7893,7 +7890,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Vyhledávací dotaz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Hledání",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Přejít na",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Hledání...",
@@ -8080,7 +8077,7 @@
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Financující agentura",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Projekt, ke kterému publikace náleží",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financování",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadřazená organizační jednotka",
@@ -8311,7 +8308,7 @@
   "submission.sections.submit.progressbar.describe.recycle": "Opětovně použít",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  "submission.sections.submit.progressbar.describe.stepcustom": "Popsat",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Popis",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Základní informace o dokumentu",
@@ -8627,8 +8624,8 @@
   "submission.submit.breadcrumbs": "Nově podaný záznam",
 
   // "submission.submit.title": "New submission",
-  // TODO Source message changed - Revise the translation
-  "submission.submit.title": "Nově podaný záznam",
+  "submission.submit.title": "Nový příspěvek",
+
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
@@ -8710,7 +8707,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Zadavatel",
+  "submission.workflow.tasks.generic.submitter": "Předkladatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
@@ -9074,10 +9071,10 @@
   "workflow-item.scorereviewaction.notification.error.content": "Nebylo možné zkontrolovat tento záznam",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  "workflow-item.scorereviewaction.title": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.title": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  "workflow-item.scorereviewaction.header": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.header": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
   "workflow-item.scorereviewaction.button.cancel": "Zrušit",
@@ -11034,6 +11031,4 @@
   // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
   // TODO New key - Add a translation
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
-
-
-}
\ No newline at end of file
+}

From 7e864d27b45c58ef566d31c5d0e2a478a540ecdd Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:49:37 +0200
Subject: [PATCH 0325/1286] Fixed linting error.

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

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 3824e9741a..a957232a89 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-    // "collection.create.breadcrumbs": "Create collection",
+  // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 

From 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Tue, 30 Jul 2024 17:20:47 -0300
Subject: [PATCH 0326/1286] A new approach so that the elements of the
 ds-file-dropzone-no-uploader component don't overlap the navbar and make it
 inaccessible

---
 .../file-dropzone-no-uploader.component.html                | 4 ++--
 .../file-dropzone-no-uploader.scss                          | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index dcd1fdfef7..babfa91f0b 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,12 +1,12 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone h-100 w-100"
+     class="ds-document-drop-zone position-fixed h-100 w-100"
      [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
      [uploader]="uploader"
      (onFileDrop)="setFile($event)"
      (fileOver)="fileOverDocument($event)">
 </div>
 <div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner h-100 w-100 p-2">
+     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
   <div
     class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
     <p class="text-primary">{{ dropMessageLabel | translate}}</p>
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
index 5d06cd5718..91eb2ae868 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
@@ -6,10 +6,16 @@
   top: 0;
   left: 0;
   z-index: -1;
+  display: block;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 0.3s ease, visibility 0.3s ease;
 }
 
 .ds-document-drop-zone-active {
   z-index: var(--ds-drop-zone-area-z-index) !important;
+  opacity: 1;
+  visibility: visible;
 }
 
 .ds-document-drop-zone-inner {

From 54abc3d5d508f9f34ed193fd8cb68478dac9dda0 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 25 Jul 2024 10:44:00 -0300
Subject: [PATCH 0327/1286] Removing position-fixed bootstrap class so that
 navbar links are available again

(cherry picked from commit 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9)
---
 .../file-dropzone-no-uploader.component.html                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index babfa91f0b..dcd1fdfef7 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,12 +1,12 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone position-fixed h-100 w-100"
+     class="ds-document-drop-zone h-100 w-100"
      [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
      [uploader]="uploader"
      (onFileDrop)="setFile($event)"
      (fileOver)="fileOverDocument($event)">
 </div>
 <div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+     class="ds-document-drop-zone-inner h-100 w-100 p-2">
   <div
     class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
     <p class="text-primary">{{ dropMessageLabel | translate}}</p>

From 30584c8bee1ad8f3f97a26f9b38ae2bf023ec199 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Tue, 30 Jul 2024 17:20:47 -0300
Subject: [PATCH 0328/1286] A new approach so that the elements of the
 ds-file-dropzone-no-uploader component don't overlap the navbar and make it
 inaccessible

(cherry picked from commit 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d)
---
 .../file-dropzone-no-uploader.component.html                | 4 ++--
 .../file-dropzone-no-uploader.scss                          | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index dcd1fdfef7..babfa91f0b 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,12 +1,12 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone h-100 w-100"
+     class="ds-document-drop-zone position-fixed h-100 w-100"
      [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
      [uploader]="uploader"
      (onFileDrop)="setFile($event)"
      (fileOver)="fileOverDocument($event)">
 </div>
 <div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner h-100 w-100 p-2">
+     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
   <div
     class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
     <p class="text-primary">{{ dropMessageLabel | translate}}</p>
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
index 5d06cd5718..91eb2ae868 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
@@ -6,10 +6,16 @@
   top: 0;
   left: 0;
   z-index: -1;
+  display: block;
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 0.3s ease, visibility 0.3s ease;
 }
 
 .ds-document-drop-zone-active {
   z-index: var(--ds-drop-zone-area-z-index) !important;
+  opacity: 1;
+  visibility: visible;
 }
 
 .ds-document-drop-zone-inner {

From ce2abfe584b3cabb71730882025c6baf8bd7bd4b Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 1 Aug 2024 13:04:17 -0300
Subject: [PATCH 0329/1286] Improving the file browser for importing metadata

---
 .../file-dropzone-no-uploader.component.html  |  4 ++--
 .../file-dropzone-no-uploader.component.ts    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index babfa91f0b..38c2af97fc 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -19,9 +19,9 @@
       <span><i class="fas fa-cloud-upload"
                aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ml-1">
-      <input class="form-control-file d-none" requireFile #file="ngModel" type="file" name="file-upload"
+      <input class="form-control-file d-none" type="file" name="file-upload"
              id="file-upload"
-             [ngModel]="fileObject" (ngModelChange)="setFile($event)">
+             (change)="handleFileInput($event)">
       {{'uploader.browse' | translate}}
     </label>
   </p>
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
index 8c04bd264b..e937b1ea0f 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
@@ -54,7 +54,7 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
   /**
    * The function to call when file is added
    */
-  @Output() onFileAdded: EventEmitter<any> = new EventEmitter<any>();
+  @Output() onFileAdded: EventEmitter<File> = new EventEmitter<File>();
 
   /**
    * The uploader configuration options
@@ -83,15 +83,17 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
   }
 
   @HostListener('window:drop', ['$event'])
-  onDrop(event: any) {
+  onDrop(event: DragEvent) {
     event.preventDefault();
+    event.stopPropagation();
   }
 
   @HostListener('window:dragover', ['$event'])
-  onDragOver(event: any) {
+  onDragOver(event: DragEvent) {
     // Show drop area on the page
     event.preventDefault();
-    if ((event.target as any).tagName !== 'HTML') {
+    event.stopPropagation();
+    if ((event.target as HTMLElement).tagName !== 'HTML') {
       this.isOverDocumentDropZone = observableOf(true);
     }
   }
@@ -105,11 +107,18 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
     }
   }
 
+  public handleFileInput(event: Event) {
+    const input = event.target as HTMLInputElement;
+    if (input.files && input.files.length > 0) {
+      this.setFile(input.files);
+    }
+  }
+
   /**
    * Set file
    * @param files
    */
-  setFile(files) {
+  public setFile(files: FileList) {
     this.fileObject = files.length > 0 ? files[0] : undefined;
     this.onFileAdded.emit(this.fileObject);
   }

From e7db991c7ab2209ade035b24b295ca32d8ee5294 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 1 Aug 2024 13:04:17 -0300
Subject: [PATCH 0330/1286] Improving the file browser for importing metadata

(cherry picked from commit ce2abfe584b3cabb71730882025c6baf8bd7bd4b)
---
 .../file-dropzone-no-uploader.component.html  |  4 ++--
 .../file-dropzone-no-uploader.component.ts    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index babfa91f0b..38c2af97fc 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -19,9 +19,9 @@
       <span><i class="fas fa-cloud-upload"
                aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ml-1">
-      <input class="form-control-file d-none" requireFile #file="ngModel" type="file" name="file-upload"
+      <input class="form-control-file d-none" type="file" name="file-upload"
              id="file-upload"
-             [ngModel]="fileObject" (ngModelChange)="setFile($event)">
+             (change)="handleFileInput($event)">
       {{'uploader.browse' | translate}}
     </label>
   </p>
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
index 8c04bd264b..e937b1ea0f 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
@@ -54,7 +54,7 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
   /**
    * The function to call when file is added
    */
-  @Output() onFileAdded: EventEmitter<any> = new EventEmitter<any>();
+  @Output() onFileAdded: EventEmitter<File> = new EventEmitter<File>();
 
   /**
    * The uploader configuration options
@@ -83,15 +83,17 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
   }
 
   @HostListener('window:drop', ['$event'])
-  onDrop(event: any) {
+  onDrop(event: DragEvent) {
     event.preventDefault();
+    event.stopPropagation();
   }
 
   @HostListener('window:dragover', ['$event'])
-  onDragOver(event: any) {
+  onDragOver(event: DragEvent) {
     // Show drop area on the page
     event.preventDefault();
-    if ((event.target as any).tagName !== 'HTML') {
+    event.stopPropagation();
+    if ((event.target as HTMLElement).tagName !== 'HTML') {
       this.isOverDocumentDropZone = observableOf(true);
     }
   }
@@ -105,11 +107,18 @@ export class FileDropzoneNoUploaderComponent implements OnInit {
     }
   }
 
+  public handleFileInput(event: Event) {
+    const input = event.target as HTMLInputElement;
+    if (input.files && input.files.length > 0) {
+      this.setFile(input.files);
+    }
+  }
+
   /**
    * Set file
    * @param files
    */
-  setFile(files) {
+  public setFile(files: FileList) {
     this.fileObject = files.length > 0 ? files[0] : undefined;
     this.onFileAdded.emit(this.fileObject);
   }

From bfd61b2f19ceb4f078bead11b5daed9bd22acba3 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 6 Aug 2024 15:40:16 +0200
Subject: [PATCH 0331/1286] Fix typos discovered by codespell

---
 README.md                                            |  2 +-
 config/config.example.yml                            |  2 +-
 cypress/e2e/homepage-statistics.cy.ts                |  2 +-
 cypress/e2e/login-modal.cy.ts                        |  2 +-
 cypress/e2e/pagenotfound.cy.ts                       |  2 +-
 cypress/e2e/submission.cy.ts                         |  4 ++--
 docs/Configuration.md                                |  2 +-
 scripts/merge-i18n-files.ts                          |  2 +-
 server.ts                                            |  4 ++--
 .../ldn-services-model/ldn-service-status.model.ts   |  2 +-
 .../bitstream-formats.component.spec.ts              |  4 ++--
 .../bitstream-formats/bitstream-formats.component.ts |  2 +-
 .../format-form/format-form.component.ts             |  8 ++++----
 .../browse-by-taxonomy.component.ts                  |  2 +-
 .../collection-metadata.component.ts                 |  2 +-
 src/app/core/cache/object-cache.reducer.ts           |  2 +-
 src/app/core/data/access-status-data.service.spec.ts |  8 ++++----
 src/app/core/data/bitstream-data.service.spec.ts     | 12 ++++++------
 src/app/core/data/bitstream-data.service.ts          |  2 +-
 src/app/core/data/collection-data.service.spec.ts    | 12 ++++++------
 src/app/core/services/link-head.service.ts           |  2 +-
 src/app/core/services/server-xhr.service.ts          |  2 +-
 src/app/core/shared/metadata-config.model.ts         |  2 +-
 src/app/core/shared/search/search.service.ts         |  2 +-
 .../submission/submission-object-data.service.ts     |  2 +-
 .../dso-edit-metadata/dso-edit-metadata.component.ts |  2 +-
 .../item-pages/org-unit/org-unit.component.html      |  2 +-
 .../item-pages/org-unit/org-unit.component.spec.ts   |  2 +-
 src/app/init.service.ts                              |  4 ++--
 .../bitstream-request-a-copy-page.component.ts       |  2 +-
 .../edit-relationship-list.component.spec.ts         |  2 +-
 .../metadata-uri-values.component.ts                 |  2 +-
 .../metadata-values/metadata-values.component.ts     |  2 +-
 .../media-viewer-image.component.ts                  |  2 +-
 .../item-page-cc-license-field.component.ts          |  4 ++--
 .../my-dspace-new-submission-dropdown.component.ts   |  2 +-
 .../my-dspace-new-submission.component.ts            |  2 +-
 .../qa/events/quality-assurance-events.component.ts  |  4 ++--
 .../project-entry-import-modal.component.ts          |  2 +-
 .../qa/source/quality-assurance-source.component.ts  |  2 +-
 .../qa/topics/quality-assurance-topics.component.ts  |  6 +++---
 .../publication-claim/publication-claim.component.ts |  2 +-
 src/app/search-navbar/search-navbar.component.ts     |  2 +-
 .../dso-edit-menu-section.component.ts               |  2 +-
 .../dso-withdrawn-reinstate-modal.service.ts         |  2 +-
 .../entity-dropdown/entity-dropdown.component.ts     |  2 +-
 .../vocabulary-treeview-modal.component.spec.ts      |  2 +-
 src/app/shared/menu/menu-id.model.ts                 |  2 +-
 .../dspace-rest/endpoint-mocking-rest.service.ts     |  2 +-
 .../object-list/duplicate-data/duplicate.model.ts    |  2 +-
 ...owse-link-metadata-list-element.component.spec.ts |  2 +-
 .../collection-select/collection-select.component.ts |  2 +-
 .../item-select/item-select.component.ts             |  2 +-
 src/app/shared/rss-feed/rss.component.ts             |  2 +-
 src/app/shared/search/models/search-options.model.ts |  2 +-
 .../search-facet-range-option.component.spec.ts      |  2 +-
 .../search-range-filter.component.ts                 |  2 +-
 .../subscription-view.component.spec.ts              |  2 +-
 .../section-coar-notify.component.ts                 |  2 +-
 src/app/submission/sections/sections.service.ts      |  2 +-
 .../metadata-information.component.ts                |  2 +-
 .../publisher-policy/publisher-policy.component.ts   |  2 +-
 .../section-sherpa-policies.component.ts             |  2 +-
 .../system-wide-alert-form.component.spec.ts         |  8 ++++----
 src/modules/app/server-init.service.ts               |  2 +-
 src/typings.d.ts                                     |  2 +-
 66 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/README.md b/README.md
index ebc24f8b91..39ad9d7dde 100644
--- a/README.md
+++ b/README.md
@@ -527,7 +527,7 @@ Frequently asked questions
 -	What are the naming conventions for Angular?
 	-	See [the official angular style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?
-	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
+	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the interest of build speed.
 -	node-pre-gyp ERR in yarn install (Windows)
 	-	install Python x86 version between 2.5 and 3.0 on windows. See [this issue](https://github.com/AngularClass/angular2-webpack-starter/issues/626)
 -	How do I handle merge conflicts in yarn.lock?
diff --git a/config/config.example.yml b/config/config.example.yml
index 93386274e6..86f608e5a3 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -59,7 +59,7 @@ cache:
     # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
     debug: false
     # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
-    # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
+    # (Keep in mind, bot detection cannot be guaranteed. It is possible some bots will bypass this cache.)
     botCache:
       # Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
       # Default is 1000, which means the 1000 most recently accessed public pages will be cached.
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index f9642c0c83..0e0fca3c5b 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -17,7 +17,7 @@ describe('Site Statistics Page', () => {
 
     cy.visit('/statistics');
 
-    // <ds-site-statistics-page> tag must be visable
+    // <ds-site-statistics-page> tag must be visible
     cy.get('ds-site-statistics-page').should('be.visible');
 
     // Verify / wait until "Total Visits" table's *last* label is non-empty
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 3d978dfaca..ec218e80af 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -142,7 +142,7 @@ describe('Login Modal', () => {
     page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
     cy.get('ds-log-in').should('not.exist');
 
-    // Open user menu, verify user menu accesibility
+    // Open user menu, verify user menu accessibility
     page.openUserMenu();
     cy.get('ds-user-menu').should('be.visible');
     testA11y('ds-user-menu');
diff --git a/cypress/e2e/pagenotfound.cy.ts b/cypress/e2e/pagenotfound.cy.ts
index 968ae2747b..5f84a22df9 100644
--- a/cypress/e2e/pagenotfound.cy.ts
+++ b/cypress/e2e/pagenotfound.cy.ts
@@ -1,7 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('PageNotFound', () => {
-  it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
+  it('should contain element ds-pagenotfound when navigating to page that does not exist', () => {
     // request an invalid page (UUIDs at root path aren't valid)
     cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
     cy.get('ds-pagenotfound').should('be.visible');
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index 0ac7003a8b..ebdabbde2e 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -34,7 +34,7 @@ describe('New Submission page', () => {
                 // Author & Subject fields have invalid "aria-multiline" attrs.
                 // See https://github.com/DSpace/dspace-angular/issues/1272
                 'aria-allowed-attr': { enabled: false },
-                // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                // All panels are accordions & fail "aria-required-children" and "nested-interactive".
                 // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                 'aria-required-children': { enabled: false },
                 'nested-interactive': { enabled: false },
@@ -192,7 +192,7 @@ describe('New Submission page', () => {
     testA11y('ds-submission-edit',
             {
               rules: {
-                // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+                // All panels are accordions & fail "aria-required-children" and "nested-interactive".
                 // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
                 'aria-required-children': { enabled: false },
                 'nested-interactive': { enabled: false },
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 01fd83c94d..aa6be0f682 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -15,7 +15,7 @@ DSPACE_APP_CONFIG_PATH=/usr/local/dspace/config/config.yml
 Configuration options can be overridden by setting environment variables.
 
 ## Nodejs server
-When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itsself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
+When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
 
 To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
 
diff --git a/scripts/merge-i18n-files.ts b/scripts/merge-i18n-files.ts
index e790828c0d..64442f5788 100644
--- a/scripts/merge-i18n-files.ts
+++ b/scripts/merge-i18n-files.ts
@@ -38,7 +38,7 @@ parseCliInput();
 function parseCliInput() {
   program
     .option('-d, --output-dir <output-dir>', 'output dir when running script on all language files', projectRoot(LANGUAGE_FILES_LOCATION))
-    .option('-s, --source-dir <source-dir>', 'source dir of transalations to be merged')
+    .option('-s, --source-dir <source-dir>', 'source dir of translations to be merged')
     .usage('(-s <source-dir> [-d <output-dir>])')
     .parse(process.argv);
 
diff --git a/server.ts b/server.ts
index 22f3423287..d0c17166ad 100644
--- a/server.ts
+++ b/server.ts
@@ -99,7 +99,7 @@ export function app() {
    * If production mode is enabled in the environment file:
    * - Enable Angular's production mode
    * - Initialize caching of SSR rendered pages (if enabled in config.yml)
-   * - Enable compression for SSR reponses. See [compression](https://github.com/expressjs/compression)
+   * - Enable compression for SSR responses. See [compression](https://github.com/expressjs/compression)
    */
   if (environment.production) {
     enableProdMode();
@@ -428,7 +428,7 @@ function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, r
       if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); }
       // Update cached copy by rerendering server-side
       // NOTE: In this scenario the currently cached copy will be returned to the current user.
-      // This re-render is peformed behind the scenes to update cached copy for next user.
+      // This re-render is performed behind the scenes to update cached copy for next user.
       serverSideRender(req, res, next, false);
     }
   } else {
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
index 040e4d37b8..e872bf9a0b 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
@@ -2,7 +2,7 @@
  * List of services statuses
  */
 export enum LdnServiceStatus {
-  UNKOWN,
+  UNKNOWN,
   DISABLED,
   ENABLED,
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 248e60ca4b..8f692ecad6 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -190,12 +190,12 @@ describe('BitstreamFormatsComponent', () => {
   describe('isSelected', () => {
     beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
-    it('should return an observable of true if the provided bistream is in the list returned by the service', () => {
+    it('should return an observable of true if the provided bitstream is in the list returned by the service', () => {
       const result = comp.isSelected(bitstreamFormat1);
 
       expect(result).toBeObservable(cold('b', { b: true }));
     });
-    it('should return an observable of false if the provided bistream is not in the list returned by the service', () => {
+    it('should return an observable of false if the provided bitstream is not in the list returned by the service', () => {
       const format = new BitstreamFormat();
       format.uuid = 'new';
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 72da2fadfd..deff75262e 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -118,7 +118,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Deselects all selecetd bitstream formats
+   * Deselects all selected bitstream formats
    */
   deselectAll() {
     this.bitstreamFormatService.deselectAllBitstreamFormats();
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 08889ce28b..37ae0d1dc0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -154,12 +154,12 @@ export class FormatFormComponent implements OnInit {
       (fieldModel: DynamicFormControlModel) => {
         if (fieldModel.name === 'extensions') {
           if (hasValue(this.bitstreamFormat.extensions)) {
-            const extenstions = this.bitstreamFormat.extensions;
+            const extensions = this.bitstreamFormat.extensions;
             const formArray = (fieldModel as DynamicFormArrayModel);
-            for (let i = 0; i < extenstions.length; i++) {
+            for (let i = 0; i < extensions.length; i++) {
               formArray.insertGroup(i).group[0] = new DynamicInputModel({
                 id: `extension-${i}`,
-                value: extenstions[i],
+                value: extensions[i],
               }, this.arrayInputElementLayout);
             }
           }
@@ -172,7 +172,7 @@ export class FormatFormComponent implements OnInit {
   }
 
   /**
-   * Creates an updated bistream format based on the current values in the form
+   * Creates an updated bitstream format based on the current values in the form
    * Emits the updated bitstream format trouhg the updatedFormat emitter
    */
   onSubmit() {
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index ca6efa16b9..2372c7d0c7 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -154,7 +154,7 @@ export class BrowseByTaxonomyComponent implements OnInit, OnChanges, OnDestroy {
       this.facetType = browseDefinition.facetType;
       this.vocabularyName = browseDefinition.vocabulary;
       this.vocabularyOptions = { name: this.vocabularyName, closed: true };
-      this.description = this.translate.instant(`browse.metadata.${this.vocabularyName}.tree.descrption`);
+      this.description = this.translate.instant(`browse.metadata.${this.vocabularyName}.tree.description`);
     }));
     this.subs.push(this.scope$.subscribe(() => {
       this.updateQueryParams();
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index 98127d891c..df35199755 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -84,7 +84,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
   }
 
   /**
-   * Cheking if the navigation is done and if so, initialize the collection's item template,
+   * Checking if the navigation is done and if so, initialize the collection's item template,
    * to ensure that the item template is always up to date.
    * Check when a NavigationEnd event (URL change) or a Scroll event followed by a NavigationEnd event (refresh event), occurs
    */
diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index 631ecd2209..ce1dd47f43 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -304,7 +304,7 @@ function addDependentsObjectCacheState(state: ObjectCacheState, action: AddDepen
 
 
 /**
- * Remove all dependent request UUIDs from a cached object, used to clear out-of-date depedencies
+ * Remove all dependent request UUIDs from a cached object, used to clear out-of-date dependencies
  *
  * @param state   the current state
  * @param action  an AddDependentsObjectCacheAction
diff --git a/src/app/core/data/access-status-data.service.spec.ts b/src/app/core/data/access-status-data.service.spec.ts
index 1240585027..ed587c26d2 100644
--- a/src/app/core/data/access-status-data.service.spec.ts
+++ b/src/app/core/data/access-status-data.service.spec.ts
@@ -63,12 +63,12 @@ describe('AccessStatusDataService', () => {
 
   /**
    * Create an AccessStatusDataService used for testing
-   * @param reponse$   Supply a RemoteData to be returned by the REST API (optional)
+   * @param response$   Supply a RemoteData to be returned by the REST API (optional)
    */
-  function createService(reponse$?: Observable<RemoteData<any>>) {
+  function createService(response$?: Observable<RemoteData<any>>) {
     requestService = getMockRequestService();
-    let buildResponse$ = reponse$;
-    if (hasNoValue(reponse$)) {
+    let buildResponse$ = response$;
+    if (hasNoValue(response$)) {
       buildResponse$ = createSuccessfulRemoteDataObject$({});
     }
     rdbService = jasmine.createSpyObj('rdbService', {
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 95fe5f593f..91b5132ce0 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -138,27 +138,27 @@ describe('BitstreamDataService', () => {
 
     describe('findPrimaryBitstreamByItemAndName', () => {
       it('should return primary bitstream', () => {
-        const exprected$ = cold('(a|)', { a: bitstream1 } );
+        const expected$ = cold('(a|)', { a: bitstream1 } );
         const bundle = Object.assign(new Bundle(), {
           primaryBitstream: observableOf(createSuccessfulRemoteDataObject(bitstream1)),
         });
         spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
-        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(expected$);
       });
 
       it('should return null if primary bitstream has not be succeeded ', () => {
-        const exprected$ = cold('(a|)', { a: null } );
+        const expected$ = cold('(a|)', { a: null } );
         const bundle = Object.assign(new Bundle(), {
           primaryBitstream: observableOf(createFailedRemoteDataObject()),
         });
         spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
-        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(expected$);
       });
 
       it('should return EMPTY if nothing where found', () => {
-        const exprected$ = cold('(|)', {} );
+        const expected$ = cold('(|)', {} );
         spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createFailedRemoteDataObject<Bundle>()));
-        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(expected$);
       });
     });
 
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 81d1d74535..b8776d2530 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -242,7 +242,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
    * @param reRequestOnStale            Whether or not the request should automatically be re-
    *                                    requested after the response becomes stale
    * @return {Observable<Bitstream | null>}
-   *    Return an observable that constains primary bitstream information or null
+   *    Return an observable that contains primary bitstream information or null
    */
   public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
     return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index 431fe941bb..f27695c326 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -151,7 +151,7 @@ describe('CollectionDataService', () => {
         expect(service.getAuthorizedCollection).toHaveBeenCalledWith(queryString);
       });
 
-      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollection', () => {
+      it('should return a RemoteData<PaginatedList<Collection>> for the getAuthorizedCollection', () => {
         const result = service.getAuthorizedCollection(queryString);
         const expected = cold('a|', {
           a: paginatedListRD,
@@ -166,7 +166,7 @@ describe('CollectionDataService', () => {
         expect(service.getAuthorizedCollectionByCommunity).toHaveBeenCalledWith(communityId, queryString);
       });
 
-      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollectionByCommunity', () => {
+      it('should return a RemoteData<PaginatedList<Collection>> for the getAuthorizedCollectionByCommunity', () => {
         const result = service.getAuthorizedCollectionByCommunity(communityId, queryString);
         const expected = cold('a|', {
           a: paginatedListRD,
@@ -206,12 +206,12 @@ describe('CollectionDataService', () => {
 
   /**
    * Create a CollectionDataService used for testing
-   * @param reponse$   Supply a RemoteData to be returned by the REST API (optional)
+   * @param response$   Supply a RemoteData to be returned by the REST API (optional)
    */
-  function createService(reponse$?: Observable<RemoteData<any>>) {
+  function createService(response$?: Observable<RemoteData<any>>) {
     requestService = getMockRequestService();
-    let buildResponse$ = reponse$;
-    if (hasNoValue(reponse$)) {
+    let buildResponse$ = response$;
+    if (hasNoValue(response$)) {
       buildResponse$ = createSuccessfulRemoteDataObject$({});
     }
     rdbService = jasmine.createSpyObj('rdbService', {
diff --git a/src/app/core/services/link-head.service.ts b/src/app/core/services/link-head.service.ts
index 78eddf31c5..723f647108 100644
--- a/src/app/core/services/link-head.service.ts
+++ b/src/app/core/services/link-head.service.ts
@@ -20,7 +20,7 @@ export class LinkHeadService {
 
   /**
    * Method to create a Link tag in the HEAD of the html.
-   * @param tag LinkDefition is the paramaters to define a link tag.
+   * @param tag LinkDefition is the parameters to define a link tag.
    * @returns Link tag that was created
    */
   addTag(tag: LinkDefinition) {
diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts
index e4c50c24ea..4b58c6b127 100644
--- a/src/app/core/services/server-xhr.service.ts
+++ b/src/app/core/services/server-xhr.service.ts
@@ -33,7 +33,7 @@ const httpAgent = new HttpAgent(agentOptions);
 const httpsAgent = new HttpsAgent(agentOptions);
 
 /**
- * Contructs the XMLHttpRequest instances used for all HttpClient requests.
+ * Constructs the XMLHttpRequest instances used for all HttpClient requests.
  * Emulated by https://github.com/pwnall/node-xhr2 on the server.
  * This class overrides the built-in Angular implementation to set additional configuration.
  *
diff --git a/src/app/core/shared/metadata-config.model.ts b/src/app/core/shared/metadata-config.model.ts
index 861d04586e..645d9c1dc8 100644
--- a/src/app/core/shared/metadata-config.model.ts
+++ b/src/app/core/shared/metadata-config.model.ts
@@ -3,7 +3,7 @@
  */
 export class MetadataConfig {
   /**
-   * A unique indentifier
+   * A unique identifier
    */
   id: string;
 
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index fc23be1a22..60a2da6af1 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -57,7 +57,7 @@ import { SearchConfigurationService } from './search-configuration.service';
  * - Overrides {@link BaseDataService.addEmbedParams} in order to make it public
  *
  * Doesn't use any of the service's dependencies, they are initialized as undefined
- * Therefore, equest/response handling methods won't work even though they're defined
+ * Therefore, request/response handling methods won't work even though they're defined
  */
 class SearchDataService extends BaseDataService<any> {
   constructor() {
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 4cf45fa84b..c044cb8129 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -68,7 +68,7 @@ export class SubmissionObjectDataService {
           environment.cache.msToLive.default,
           now,
           RequestEntryState.Error,
-          'The request couldn\'t be sent. Unable to determine the type of submission object',
+          'The request could not be sent. Unable to determine the type of submission object',
           undefined,
           400,
         ));
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 677a601b9d..234a8539c4 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
@@ -244,7 +244,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
   /**
    * 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
+   * Display notifications and reset the form afterwards if successful
    */
   submit(): void {
     this.saving$.next(true);
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 126845e36f..21acce9f09 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
@@ -23,7 +23,7 @@
       [label]="'orgunit.page.city'">
     </ds-generic-item-page-field>
     <ds-generic-item-page-field [item]="object"
-      [fields]="['organization.adress.addressCountry']"
+      [fields]="['organization.address.addressCountry']"
       [label]="'orgunit.page.country'">
     </ds-generic-item-page-field>
     <ds-generic-item-page-field [item]="object"
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
index e40335a4db..da38e57dd0 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
@@ -23,7 +23,7 @@ const mockItem: Item = Object.assign(new Item(), {
         value: 'New York',
       },
     ],
-    'organization.adress.addressCountry': [
+    'organization.address.addressCountry': [
       {
         language: 'en_US',
         value: 'USA',
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index d99d2d4c6b..789aa2e03d 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -50,7 +50,7 @@ import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
  * Performs the initialization of the app.
  *
  * Should be extended to implement server- & browser-specific functionality.
- * Initialization steps shared between the server and brower implementations
+ * Initialization steps shared between the server and browser implementations
  * can be included in this class.
  *
  * Note that the service cannot (indirectly) depend on injection tokens that are only available _after_ APP_INITIALIZER.
@@ -134,7 +134,7 @@ export abstract class InitService {
   protected static resolveAppConfig(
     transferState: TransferState,
   ): void {
-    // overriden in subclasses if applicable
+    // overridden in subclasses if applicable
   }
 
   /**
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index e32239a577..bd12d3675e 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -253,7 +253,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Retrieves the link to the bistream download page
+   * Retrieves the link to the bitstream download page
    */
   getBitstreamLink() {
     return [getBitstreamDownloadRoute(this.bitstream)];
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 48415000be..ae81da538e 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -375,7 +375,7 @@ describe('EditRelationshipListComponent', () => {
 
 
 
-      describe('changes managment for add buttons', () => {
+      describe('changes management for add buttons', () => {
 
         it('should show enabled add buttons', () => {
           const element = de.query(By.css('.btn-success'));
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index 76c7defe35..944c70f49a 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -45,7 +45,7 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
   @Input() mdValues: MetadataValue[];
 
   /**
-   * The seperator used to split the metadata values (can contain HTML)
+   * The separator used to split the metadata values (can contain HTML)
    */
   @Input() separator: string;
 
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 1a73d692eb..c6ff454737 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -51,7 +51,7 @@ export class MetadataValuesComponent implements OnChanges {
   @Input() mdValues: MetadataValue[];
 
   /**
-   * The seperator used to split the metadata values (can contain HTML)
+   * The separator used to split the metadata values (can contain HTML)
    */
   @Input() separator: string;
 
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
index f2191f074d..3acb14d3ee 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -17,7 +17,7 @@ import { AuthService } from '../../../core/auth/auth.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 
 /**
- * This componenet render an image gallery for the image viewer
+ * This component render an image gallery for the image viewer
  */
 @Component({
   selector: 'ds-base-media-viewer-image',
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
index 5d19fe4b4e..e06d0c25b5 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -34,13 +34,13 @@ export class ItemPageCcLicenseFieldComponent implements OnInit {
   @Input() variant?: 'small' | 'full' = 'small';
 
   /**
-   * Filed name containing the CC license URI, as configured in the back-end, in the 'dspace.cfg' file, propertie
+   * Filed name containing the CC license URI, as configured in the back-end, in the 'dspace.cfg' file, property
    * 'cc.license.uri'
    */
   @Input() ccLicenseUriField? = 'dc.rights.uri';
 
   /**
-   * Filed name containing the CC license name, as configured in the back-end, in the 'dspace.cfg' file, propertie
+   * Filed name containing the CC license name, as configured in the back-end, in the 'dspace.cfg' file, property
    * 'cc.license.name'
    */
   @Input() ccLicenseNameField? = 'dc.rights';
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 8604c3322c..02c714b4fb 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -120,7 +120,7 @@ export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy
   }
 
   /**
-   * Method called on clicking the button "New Submition", It opens a dialog for
+   * Method called on clicking the button "New Submission", It opens a dialog for
    * select a collection.
    */
   openDialog(entity: ItemType) {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index 8b4ddf10f6..cf7cb7ab72 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -140,7 +140,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
     } else {
       const modalRef = this.modalService.open(CollectionSelectorComponent);
       // When the dialog are closes its takes the collection selected and
-      // uploads choosed file after adds owningCollection parameter
+      // uploads chosen file after adds owningCollection parameter
       modalRef.result.then( (result) => {
         uploader.onBuildItemForm = (fileItem: any, form: any) => {
           form.append('owningCollection', result.uuid);
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 6276226c69..df6d36d226 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -335,7 +335,7 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Performs the choosen action calling the REST service.
+   * Performs the chosen action calling the REST service.
    *
    * @param {string} action
    *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
@@ -454,7 +454,7 @@ export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Dispatch the Quality Assurance events retrival.
+   * Dispatch the Quality Assurance events retrieval.
    */
   public getQualityAssuranceEvents(): Observable<QualityAssuranceEventData[]> {
     return this.paginationService.getFindListOptions(this.paginationConfig.id, this.defaultConfig).pipe(
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4b31e2316a..0be7b783a2 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -200,7 +200,7 @@ export class ProjectEntryImportModalComponent implements OnInit {
               private selectService: SelectableListService) { }
 
   /**
-   * Component intitialization.
+   * Component initialization.
    */
   public ngOnInit(): void {
     this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'notifications-project-bound', pageSize: this.pageSize });
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index a918b8c3b6..5ee32434be 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -123,7 +123,7 @@ export class QualityAssuranceSourceComponent implements OnInit {
   }
 
   /**
-   * Dispatch the Quality Assurance source retrival.
+   * Dispatch the Quality Assurance source retrieval.
    */
   public getQualityAssuranceSource(): void {
     this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 0fcaa93805..176dba95ac 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -86,13 +86,13 @@ export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, After
   protected subs: Subscription[] = [];
 
   /**
-   * This property represents a sourceId which is used to retrive a topic
+   * This property represents a sourceId which is used to retrieve a topic
    * @type {string}
    */
   public sourceId: string;
 
   /**
-   * This property represents a targetId (item-id) which is used to retrive a topic
+   * This property represents a targetId (item-id) which is used to retrieve a topic
    * @type {string}
    */
   public targetId: string;
@@ -171,7 +171,7 @@ export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, After
   }
 
   /**
-   * Dispatch the Quality Assurance topics retrival.
+   * Dispatch the Quality Assurance topics retrieval.
    */
   public getQualityAssuranceTopics(source: string, target?: string): void {
     this.subs.push(this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index d03bf9d653..ede5c398f9 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -157,7 +157,7 @@ export class PublicationClaimComponent implements OnInit {
   }
 
   /**
-   * Dispatch the Suggestion Targets retrival.
+   * Dispatch the Suggestion Targets retrieval.
    */
   public getSuggestionTargets(): void {
     this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
index 28971a2644..3aca706ade 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -31,7 +31,7 @@ export class SearchNavbarComponent {
 
   // The search form
   searchForm;
-  // Whether or not the search bar is expanded, boolean for html ngIf, string fo AngularAnimation state change
+  // Whether or not the search bar is expanded, boolean for html ngIf, string for AngularAnimation state change
   searchExpanded = false;
   isExpanded = 'collapsed';
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 2e2397f860..5c8a1b65d6 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -48,7 +48,7 @@ export class DsoEditMenuSectionComponent extends MenuSectionComponent implements
   }
 
   /**
-   * Activate the section's model funtion
+   * Activate the section's model function
    */
   public activate(event: any) {
     event.preventDefault();
diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
index bc2cfba481..70dc48c68d 100644
--- a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
+++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
@@ -61,7 +61,7 @@ export class DsoWithdrawnReinstateModalService {
    * @param correctionType - The type of correction.
    * @param reason - The reason for the request.
    * Reloads the current page in order to update the withdrawn/reinstate button.
-   * and desplay a notification box.
+   * and display a notification box.
    */
   sendQARequest(target: string, correctionType: 'request-reinstate' | 'request-withdrawn', reason: string): void {
     this.qaEventDataService.postData(target, correctionType, '', reason)
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index a02c6d8221..61bfd853ca 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -146,7 +146,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Method used from infitity scroll for retrive more data on scroll down
+   * Method used from infitity scroll for retrieve more data on scroll down
    */
   public onScrollDown() {
     if ( this.hasNextPage ) {
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
index fea81d1d9a..99ec27dd7d 100644
--- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
@@ -43,7 +43,7 @@ describe('VocabularyTreeviewModalComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should init descrption message', () => {
+  it('should init description message', () => {
     expect((component as any).setDescription).toHaveBeenCalled();
   });
 });
diff --git a/src/app/shared/menu/menu-id.model.ts b/src/app/shared/menu/menu-id.model.ts
index 4e7d31f467..547071aa04 100644
--- a/src/app/shared/menu/menu-id.model.ts
+++ b/src/app/shared/menu/menu-id.model.ts
@@ -1,5 +1,5 @@
 /**
- * Availavle Menu IDs
+ * Available Menu IDs
  */
 export enum MenuID {
   ADMIN = 'admin-sidebar',
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index ad867e0cf0..bfdbe4d6d7 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -106,7 +106,7 @@ export class EndpointMockingRestService extends DspaceRestService {
    * Get the mock response associated with this URL from this.mockResponseMap
    *
    * @param urlStr
-   *    the URL to fetch a mock reponse for
+   *    the URL to fetch a mock response for
    * @return any
    *    the mock response if there is one, undefined otherwise
    */
diff --git a/src/app/shared/object-list/duplicate-data/duplicate.model.ts b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
index 646adc00ff..4524418343 100644
--- a/src/app/shared/object-list/duplicate-data/duplicate.model.ts
+++ b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
@@ -28,7 +28,7 @@ export class Duplicate implements CacheableObject {
   @autoserialize
   uuid: string;
   /**
-   * The workfow item ID, if any
+   * The workflow item ID, if any
    */
   @autoserialize
   workflowItemId: number;
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
index 60f3a1566e..89048db936 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
@@ -68,7 +68,7 @@ describe('BrowseLinkMetadataListElementComponent', () => {
     });
   });
 
-  describe('with metadata wit an url', () => {
+  describe('with metadata with an url', () => {
     beforeEach(() => {
       comp.mdRepresentation = mockMetadataRepresentationWithUrl;
       spyOnProperty(comp.mdRepresentation, 'representationType', 'get').and.returnValue(MetadataRepresentationType.BrowseLink);
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 267d8a2a60..a4fa227e6b 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -46,7 +46,7 @@ export class CollectionSelectComponent extends ObjectSelectComponent<Collection>
 
   /**
    * Collection of all the data that is used to display the {@link Collection} in the HTML.
-   * By collecting this data here it doesn't need to be recalculated on evey change detection.
+   * By collecting this data here it doesn't need to be recalculated on every change detection.
    */
   selectCollections$: Observable<DSpaceObjectSelect<Collection>[]>;
 
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 973b4aff87..285a790c2a 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -50,7 +50,7 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> implements
 
   /**
    * Collection of all the data that is used to display the {@link Item} in the HTML.
-   * By collecting this data here it doesn't need to be recalculated on evey change detection.
+   * By collecting this data here it doesn't need to be recalculated on every change detection.
    */
   selectItems$: Observable<DSpaceObjectSelect<Item>[]>;
 
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index 9865c1dd06..e089525a72 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -33,7 +33,7 @@ import { PaginatedSearchOptions } from '../search/models/paginated-search-option
 
 
 /**
- * The Rss feed button componenet.
+ * The Rss feed button component.
  */
 @Component({
   exportAs: 'rssComponent',
diff --git a/src/app/shared/search/models/search-options.model.ts b/src/app/shared/search/models/search-options.model.ts
index 88866e7ef2..531d525493 100644
--- a/src/app/shared/search/models/search-options.model.ts
+++ b/src/app/shared/search/models/search-options.model.ts
@@ -73,7 +73,7 @@ export class SearchOptions {
 
   get encodedFixedFilter(): string {
     // expected format: 'arg=value'
-    //  -> split the query agument into (arg=)(value) and only encode 'value'
+    //  -> split the query argument into (arg=)(value) and only encode 'value'
     const match = this.fixedFilter.match(/^([^=]+=)(.+)$/);
 
     if (hasValue(match)) {
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index 9c1ef496c9..3797aaf2eb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -118,7 +118,7 @@ describe('SearchFacetRangeOptionComponent', () => {
     fixture.detectChanges();
   });
 
-  describe('when the updateChangeParams method is called wih a value', () => {
+  describe('when the updateChangeParams method is called with a value', () => {
     it('should update the changeQueryParams with the new parameter values', () => {
       comp.changeQueryParams = {};
       comp.filterValue = {
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 1ddac22dd3..4c184aec83 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -93,7 +93,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
 
   /**
    * Whether the sider is being controlled by the keyboard.
-   * Supresses any changes until the key is released.
+   * Suppresses any changes until the key is released.
    */
   keyboardControl: boolean;
 
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
index f922d39784..ddd81830a4 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
@@ -115,7 +115,7 @@ describe('SubscriptionViewComponent', () => {
     expect(de.query(By.css('.subscription-type'))).toBeTruthy();
   });
 
-  it('should have subscription paramenter info', () => {
+  it('should have subscription parameter info', () => {
     expect(de.query(By.css('.subscription-parameters > span'))).toBeTruthy();
   });
 
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
index fc501c3cd9..c47e4c644d 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -135,7 +135,7 @@ export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent
 
   /**
    * Method called when section is initialized
-   * Retriev available NotifyConfigs
+   * Retrieve available NotifyConfigs
    */
   setCoarNotifyConfig() {
     this.subs.push(
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 8d86ee84b5..6cc064283e 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -124,7 +124,7 @@ export class SectionsService {
         });
       });
 
-      // Itereate over the previous error list
+      // Iterate over the previous error list
       prevErrors.forEach((error: SubmissionSectionError) => {
         const errorPaths: SectionErrorPath[] = parseSectionErrorPaths(error.path);
 
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 3c30038a9a..4eb9567abb 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -11,7 +11,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model';
 
 /**
- * This component represents a section that contains the matadata informations.
+ * This component represents a section that contains the metadata information.
  */
 @Component({
   selector: 'ds-metadata-information',
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index 6852a32473..8cbe2f6904 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -14,7 +14,7 @@ import { AlertType } from '../../../../shared/alert/alert-type';
 import { ContentAccordionComponent } from '../content-accordion/content-accordion.component';
 
 /**
- * This component represents a section that contains the publisher policy informations.
+ * This component represents a section that contains the publisher policy information.
  */
 @Component({
   selector: 'ds-publisher-policy',
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index dd614abef6..86d55ce8d0 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -35,7 +35,7 @@ import { PublicationInformationComponent } from './publication-information/publi
 import { PublisherPolicyComponent } from './publisher-policy/publisher-policy.component';
 
 /**
- * This component represents a section for the sherpa policy informations structure.
+ * This component represents a section for the sherpa policy information structure.
  */
 @Component({
   selector: 'ds-section-sherpa-policies',
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 2616b2accf..8e0462d084 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -170,7 +170,7 @@ describe('SystemWideAlertFormComponent', () => {
   });
 
   describe('save', () => {
-    it('should update the exising alert with the form values and show a success notification on success and navigate back', () => {
+    it('should update the existing alert with the form values and show a success notification on success and navigate back', () => {
       spyOn(comp, 'back');
       comp.currentAlert = systemWideAlert;
 
@@ -193,7 +193,7 @@ describe('SystemWideAlertFormComponent', () => {
       expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
       expect(comp.back).toHaveBeenCalled();
     });
-    it('should update the exising alert with the form values and show a success notification on success and not navigate back when false is provided to the save method', () => {
+    it('should update the existing alert with the form values and show a success notification on success and not navigate back when false is provided to the save method', () => {
       spyOn(comp, 'back');
       comp.currentAlert = systemWideAlert;
 
@@ -216,7 +216,7 @@ describe('SystemWideAlertFormComponent', () => {
       expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
       expect(comp.back).not.toHaveBeenCalled();
     });
-    it('should update the exising alert with the form values but add an empty countdown date when disabled and show a success notification on success', () => {
+    it('should update the existing alert with the form values but add an empty countdown date when disabled and show a success notification on success', () => {
       spyOn(comp, 'back');
       comp.currentAlert = systemWideAlert;
 
@@ -239,7 +239,7 @@ describe('SystemWideAlertFormComponent', () => {
       expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
       expect(comp.back).toHaveBeenCalled();
     });
-    it('should update the exising alert with the form values and show a error notification on error', () => {
+    it('should update the existing alert with the form values and show a error notification on error', () => {
       spyOn(comp, 'back');
       (systemWideAlertDataService.put as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
       comp.currentAlert = systemWideAlert;
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index e22feec09a..c4aa4ffba3 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -85,7 +85,7 @@ export class ServerInitService extends InitService {
   // Server-only initialization steps
 
   /**
-   * Set the {@link NGRX_STATE} key when state is serialized to be transfered
+   * Set the {@link NGRX_STATE} key when state is serialized to be transferred
    * @private
    */
   private saveAppState() {
diff --git a/src/typings.d.ts b/src/typings.d.ts
index c1c86511f8..9615cf5f67 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -9,7 +9,7 @@ declare module "my-module" {
   export function doesSomething(value: string): string;
 }
  *
- * If you're prototying and you will fix the types later you can also declare it as type any
+ * If you're prototyping and you will fix the types later you can also declare it as type any
  *
 declare var assert: any;
  *

From 6c2d541b89ef99cdfe07ad66b7c1040a11cae575 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Wed, 7 Aug 2024 14:30:24 +0200
Subject: [PATCH 0332/1286] [CST-15589] Updated slider implementation in
 SearchRangeFilterComponent

---
 .../search-range-filter.component.ts              | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 1ddac22dd3..ac524739d4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -91,6 +91,11 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   range: [number | undefined, number | undefined];
 
+  /**
+   * The range currently selected by the slider
+   */
+  sliderRange: [number | undefined, number | undefined];
+
   /**
    * Whether the sider is being controlled by the keyboard.
    * Supresses any changes until the key is released.
@@ -145,6 +150,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     };
   }
 
+  /**
+   * Updates the sliderRange property with the current slider range.
+   * This method is called whenever the slider value changes, but it does not immediately apply the changes.
+   * @param range - The current range selected by the slider
+   */
+  onSliderChange(range: [number | undefined, number | undefined]): void {
+    this.sliderRange = range;
+  }
+
   /**
    * Submits new custom range values to the range filter from the widget
    */
@@ -182,5 +196,4 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
   shouldShowSlider(): boolean {
     return isPlatformBrowser(this.platformId);
   }
-
 }

From 56ba23fc3d6b51ed078ffa587f25503b457c97e5 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Wed, 7 Aug 2024 14:30:44 +0200
Subject: [PATCH 0333/1286] [CST-15589] Updated slider implementation in
 template

---
 .../search-range-filter.component.html                 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 672bd0be4e..6f1f95738c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -8,7 +8,7 @@
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control" (blur)="onSubmit()"
+                         class="form-control"
                          [attr.aria-label]="minLabel"
                          [placeholder]="minLabel"
                   />
@@ -20,7 +20,7 @@
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control" (blur)="onSubmit()"
+                           class="form-control"
                            [attr.aria-label]="maxLabel"
                            [placeholder]="maxLabel"
                     />
@@ -33,7 +33,8 @@
 
         <ng-container *ngIf="shouldShowSlider()">
             <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250" (onDebounce)="onSubmit()"
+                        [dsDebounce]="250"
+                        (change)="onSliderChange($event)"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
             </nouislider>
@@ -43,5 +44,8 @@
           <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
           </div>
         </ng-container>
+        <button (click)="onSubmit()" class="btn btn-primary">
+          {{'search.filters.search.submit' | translate}}
+        </button>
     </div>
 </div>

From cddceadea145069b62d306a2d4150e61877b86a2 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:05:17 +0200
Subject: [PATCH 0334/1286] remove duplicated delete route

---
 .../workspaceitems-edit-page-routes.ts                 | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
index 8f07c24edc..35cf2521c7 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
@@ -50,16 +50,6 @@ export const ROUTES: Route[] = [
         },
         data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
       },
-      {
-        canActivate: [authenticatedGuard],
-        path: 'delete',
-        component: ThemedWorkspaceItemsDeletePageComponent,
-        resolve: {
-          dso: itemFromWorkspaceResolver,
-          breadcrumb: i18nBreadcrumbResolver,
-        },
-        data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
-      },
     ],
   },
 ];

From 45c018f5f62fd85aae296e22fd4c0c606eaf3d96 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:50:17 +0200
Subject: [PATCH 0335/1286] added missing translations in de.json5 (prefix
 workspace-item)

---
 src/assets/i18n/de.json5 | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7f2485ab29..0749271ab0 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5881,7 +5881,7 @@
   "workflow-item.delete.notification.success.title": "Gelöscht",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde gelöscht.",
+  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde erfolgreich gelöscht.",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
@@ -5926,4 +5926,37 @@
   // "workflow-item.send-back.button.confirm": "Send back"
   "workflow-item.send-back.button.confirm": "Zurücksenden",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Workflow-Ansicht",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Workspace-Ansicht",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Workspace-Ansicht",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Workspace-Item löschen",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Workspace-Item löschen",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Löschen",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Abbrechen",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+   "workspace-item.delete.notification.success.title": "Gelöscht",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
 }

From 92dcffcba1c9c58250f467d6d8812326b51bb919 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:57:02 +0200
Subject: [PATCH 0336/1286] fix space issue

---
 src/assets/i18n/de.json5 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 0749271ab0..285bbfa43d 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5948,7 +5948,7 @@
   "workspace-item.delete.button.cancel": "Abbrechen",
 
   // "workspace-item.delete.notification.success.title": "Deleted",
-   "workspace-item.delete.notification.success.title": "Gelöscht",
+  "workspace-item.delete.notification.success.title": "Gelöscht",
 
   // "workspace-item.delete.title": "This workspace item was successfully deleted",
   "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
@@ -5958,5 +5958,4 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
-
 }

From d7270de2b9bae65aab22b0165d0f56912f2f5b1c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:05:17 +0200
Subject: [PATCH 0337/1286] remove duplicated delete route

(cherry picked from commit cddceadea145069b62d306a2d4150e61877b86a2)
---
 .../workspaceitems-edit-page-routes.ts                 | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
index 8f07c24edc..35cf2521c7 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts
@@ -50,16 +50,6 @@ export const ROUTES: Route[] = [
         },
         data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
       },
-      {
-        canActivate: [authenticatedGuard],
-        path: 'delete',
-        component: ThemedWorkspaceItemsDeletePageComponent,
-        resolve: {
-          dso: itemFromWorkspaceResolver,
-          breadcrumb: i18nBreadcrumbResolver,
-        },
-        data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
-      },
     ],
   },
 ];

From 2e532048200ea9ea645416f8f8f545c8bbda3fe7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:50:17 +0200
Subject: [PATCH 0338/1286] added missing translations in de.json5 (prefix
 workspace-item)

---
 src/assets/i18n/de.json5 | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 7f2485ab29..0749271ab0 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5881,7 +5881,7 @@
   "workflow-item.delete.notification.success.title": "Gelöscht",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde gelöscht.",
+  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde erfolgreich gelöscht.",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
@@ -5926,4 +5926,37 @@
   // "workflow-item.send-back.button.confirm": "Send back"
   "workflow-item.send-back.button.confirm": "Zurücksenden",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Workflow-Ansicht",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Workspace-Ansicht",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Workspace-Ansicht",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Workspace-Item löschen",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Workspace-Item löschen",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Löschen",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Abbrechen",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+   "workspace-item.delete.notification.success.title": "Gelöscht",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
 }

From e630f85f261d5ed641fa66e1e6df17afa2e868c9 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:57:02 +0200
Subject: [PATCH 0339/1286] fix space issue

---
 src/assets/i18n/de.json5 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 0749271ab0..285bbfa43d 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5948,7 +5948,7 @@
   "workspace-item.delete.button.cancel": "Abbrechen",
 
   // "workspace-item.delete.notification.success.title": "Deleted",
-   "workspace-item.delete.notification.success.title": "Gelöscht",
+  "workspace-item.delete.notification.success.title": "Gelöscht",
 
   // "workspace-item.delete.title": "This workspace item was successfully deleted",
   "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
@@ -5958,5 +5958,4 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
-
 }

From 9135c6318dfa6e2a57d502d754ca806c48642cb5 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:50:17 +0200
Subject: [PATCH 0340/1286] added missing translations in de.json5 (prefix
 workspace-item)

---
 src/assets/i18n/de.json5 | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 523d98f6df..0a9069eb13 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5464,7 +5464,7 @@
   "workflow-item.delete.notification.success.title": "Gelöscht",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde gelöscht.",
+  "workflow-item.delete.notification.success.content": "Dieses Workflow-Item wurde erfolgreich gelöscht.",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
@@ -5509,4 +5509,37 @@
   // "workflow-item.send-back.button.confirm": "Send back"
   "workflow-item.send-back.button.confirm": "Zurücksenden",
 
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Workflow-Ansicht",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Workspace-Ansicht",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Workspace-Ansicht",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Workspace-Item löschen",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Workspace-Item löschen",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Löschen",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Abbrechen",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+   "workspace-item.delete.notification.success.title": "Gelöscht",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
 }

From 5101677d9a1d471317bdf49be590d5403ece7951 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 7 Aug 2024 16:57:02 +0200
Subject: [PATCH 0341/1286] fix space issue

---
 src/assets/i18n/de.json5 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 0a9069eb13..325a35437d 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5531,7 +5531,7 @@
   "workspace-item.delete.button.cancel": "Abbrechen",
 
   // "workspace-item.delete.notification.success.title": "Deleted",
-   "workspace-item.delete.notification.success.title": "Gelöscht",
+  "workspace-item.delete.notification.success.title": "Gelöscht",
 
   // "workspace-item.delete.title": "This workspace item was successfully deleted",
   "workspace-item.delete.title": "Dieses Workspace-Item wurde erfolgreich gelöscht.",
@@ -5541,5 +5541,4 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
-
 }

From 85a3578458ee625b5292fbb79fb744585ac9cbfe Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@hsu-hh.de>
Date: Wed, 20 Mar 2024 11:39:17 +0100
Subject: [PATCH 0342/1286] added missing interfaces

(cherry picked from commit 96748b9bacd8540af53bf7cf6e067b066c43128c)
---
 ...lection-admin-search-result-grid-element.component.ts | 9 ++++++---
 ...mmunity-admin-search-result-grid-element.component.ts | 9 ++++++---
 ...lection-admin-search-result-list-element.component.ts | 9 ++++++---
 ...mmunity-admin-search-result-list-element.component.ts | 9 ++++++---
 .../collection-curate/collection-curate.component.ts     | 7 +++++--
 .../collection-source-controls.component.ts              | 2 +-
 .../forgot-password-form.component.ts                    | 7 +++++--
 .../item-register-doi/item-register-doi.component.ts     | 7 +++++--
 .../item-version-history.component.ts                    | 7 +++++--
 .../simple/related-items/related-items-component.ts      | 3 ++-
 .../date-value-input/date-value-input.component.ts       | 5 +++--
 .../string-value-input/string-value-input.component.ts   | 5 +++--
 .../process-parameters/process-parameters.component.ts   | 5 +++--
 .../dso-edit-menu-expandable-section.component.ts        | 3 ++-
 src/app/shared/error/error.component.ts                  | 8 +++++---
 .../dynamic-lookup-relation-selection-tab.component.ts   | 5 +++--
 .../access-status-badge/access-status-badge.component.ts | 4 +++-
 ...rkflow-item-search-result-detail-element.component.ts | 9 ++++++---
 ...kspace-item-search-result-detail-element.component.ts | 9 ++++++---
 .../item/item-search-result-grid-element.component.ts    | 7 +++++--
 .../identifier-data/identifier-data.component.ts         | 3 ++-
 ...imed-approved-search-result-list-element.component.ts | 5 +++--
 ...imed-declined-search-result-list-element.component.ts | 5 +++--
 ...workflow-item-search-result-list-element.component.ts | 5 +++--
 ...orkspace-item-search-result-list-element.component.ts | 5 +++--
 .../collection-search-result-list-element.component.ts   | 7 +++++--
 .../community-search-result-list-element.component.ts    | 8 +++++---
 .../sidebar-search-list-element.component.ts             | 7 +++++--
 .../abstract-paginated-drag-and-drop-list.component.ts   | 5 +++--
 src/app/shared/upload/uploader/uploader.component.ts     | 8 +++++---
 .../identifiers/section-identifiers.component.ts         | 6 +++---
 31 files changed, 126 insertions(+), 67 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 172226dd07..38352e7816 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
@@ -21,10 +24,10 @@ import { SearchResultGridElementComponent } from '../../../../../shared/object-g
 /**
  * The component for displaying a list element for a collection search result on the admin search page
  */
-export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> {
+export class CollectionAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CollectionSearchResult, Collection> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index 50be35229d..509c1e9266 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
@@ -21,10 +24,10 @@ import { SearchResultGridElementComponent } from '../../../../../shared/object-g
 /**
  * The component for displaying a list element for a community search result on the admin search page
  */
-export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> {
+export class CommunityAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<CommunitySearchResult, Community> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 37afbf14fe..0924379ea5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,10 +25,10 @@ import { SearchResultListElementComponent } from '../../../../../shared/object-l
 /**
  * The component for displaying a list element for a collection search result on the admin search page
  */
-export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+export class CollectionAdminSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 5861f15c1f..c4146dbd60 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,10 +25,10 @@ import { SearchResultListElementComponent } from '../../../../../shared/object-l
 /**
  * The component for displaying a list element for a community search result on the admin search page
  */
-export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+export class CommunityAdminSearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> implements OnInit {
   editPath: string;
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.editPath = getCommunityEditRoute(this.dso.uuid);
   }
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
index 14ba01421b..370506e473 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -1,5 +1,8 @@
 import { AsyncPipe } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -28,7 +31,7 @@ import { hasValue } from '../../../shared/empty.util';
   ],
   standalone: true,
 })
-export class CollectionCurateComponent {
+export class CollectionCurateComponent implements OnInit {
   dsoRD$: Observable<RemoteData<Collection>>;
   collectionName$: Observable<string>;
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 3b51a8e9d9..fdd65a43c7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -95,7 +95,7 @@ export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
   ) {
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     // ensure the contentSource gets updated after being set to stale
     this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe(
       getAllSucceededRemoteDataPayload(),
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 442e4bf9fa..7b2b1beedd 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -2,7 +2,10 @@ import {
   AsyncPipe,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import {
   ActivatedRoute,
   Router,
@@ -45,7 +48,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 /**
  * Component for a user to enter a new password for a forgot token.
  */
-export class ForgotPasswordFormComponent {
+export class ForgotPasswordFormComponent implements OnInit {
 
   registration$: Observable<Registration>;
 
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index 9acc12e95d..d9e0283267 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -3,7 +3,10 @@ import {
   NgForOf,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import {
   ActivatedRoute,
   Router,
@@ -47,7 +50,7 @@ import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstrac
 /**
  * Component responsible for rendering the Item Register DOI page
  */
-export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent {
+export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent implements OnInit {
 
   protected messageKey = 'register-doi';
   doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update';
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index 9c61231164..a414af0ce4 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -2,7 +2,10 @@ import {
   AsyncPipe,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -28,7 +31,7 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
 /**
  * Component for listing and managing an item's version history
  */
-export class ItemVersionHistoryComponent {
+export class ItemVersionHistoryComponent implements OnInit {
   /**
    * The item to display the version history for
    */
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index b65f903a5d..434093ba2a 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -10,6 +10,7 @@ import {
   ElementRef,
   Inject,
   Input,
+  OnInit,
   PLATFORM_ID,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -43,7 +44,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
  * This component is used for displaying relations between items
  * It expects a parent item and relationship type, as well as a label to display on top
  */
-export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> {
+export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> implements OnInit {
 
   /**
    * The parent of the list of related items to display
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index 29b2a85d57..74ee21471c 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -2,6 +2,7 @@ import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
+  OnInit,
   Optional,
 } from '@angular/core';
 import {
@@ -27,7 +28,7 @@ import { ValueInputComponent } from '../value-input.component';
   standalone: true,
   imports: [FormsModule, NgIf, TranslateModule],
 })
-export class DateValueInputComponent extends ValueInputComponent<string> {
+export class DateValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
    * The current value of the date string
    */
@@ -38,7 +39,7 @@ export class DateValueInputComponent extends ValueInputComponent<string> {
    */
   @Input() initialValue;
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.value = this.initialValue;
   }
 
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index d19e149311..d7fa528544 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -2,6 +2,7 @@ import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
+  OnInit,
   Optional,
 } from '@angular/core';
 import {
@@ -27,7 +28,7 @@ import { ValueInputComponent } from '../value-input.component';
   standalone: true,
   imports: [FormsModule, NgIf, TranslateModule],
 })
-export class StringValueInputComponent extends ValueInputComponent<string> {
+export class StringValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
    * The current value of the string
    */
@@ -38,7 +39,7 @@ export class StringValueInputComponent extends ValueInputComponent<string> {
    */
   @Input() initialValue;
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.value = this.initialValue;
   }
 
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index 0b72b086c1..ac174e338b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -7,6 +7,7 @@ import {
   EventEmitter,
   Input,
   OnChanges,
+  OnInit,
   Optional,
   Output,
   SimpleChanges,
@@ -39,7 +40,7 @@ import { ParameterSelectComponent } from './parameter-select/parameter-select.co
   standalone: true,
   imports: [NgIf, NgFor, ParameterSelectComponent, TranslateModule],
 })
-export class ProcessParametersComponent implements OnChanges {
+export class ProcessParametersComponent implements OnChanges, OnInit {
   /**
    * The currently selected script
    */
@@ -59,7 +60,7 @@ export class ProcessParametersComponent implements OnChanges {
    */
   parameterValues: ProcessParameter[];
 
-  ngOnInit() {
+  ngOnInit(): void {
     if (hasValue(this.initialParams)) {
       this.parameterValues = this.initialParams;
     }
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8f458d4e56..94d0ddd260 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -8,6 +8,7 @@ import {
   Component,
   Inject,
   Injector,
+  OnInit,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -34,7 +35,7 @@ import { MenuService } from '../../../menu/menu.service';
   standalone: true,
   imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe],
 })
-export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
+export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
   menuID: MenuID = MenuID.DSO_EDIT;
   itemModel;
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index 900ea67887..168415c0b1 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -1,6 +1,8 @@
 import {
   Component,
   Input,
+  OnDestroy,
+  OnInit,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
@@ -15,7 +17,7 @@ import { AlertType } from '../alert/alert-type';
   standalone: true,
   imports: [AlertComponent],
 })
-export class ErrorComponent {
+export class ErrorComponent implements OnDestroy, OnInit {
 
   @Input() message = 'Error...';
 
@@ -31,7 +33,7 @@ export class ErrorComponent {
 
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     if (this.message === undefined) {
       this.subscription = this.translate.get('error.default').subscribe((message: string) => {
         this.message = message;
@@ -39,7 +41,7 @@ export class ErrorComponent {
     }
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     if (this.subscription !== undefined) {
       this.subscription.unsubscribe();
     }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index 01cf844e06..ace5e9bdc7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -6,6 +6,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnInit,
   Output,
 } from '@angular/core';
 import { Router } from '@angular/router';
@@ -59,7 +60,7 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
 /**
  * Tab for inside the lookup model that represents the currently selected relationships
  */
-export class DsDynamicLookupRelationSelectionTabComponent {
+export class DsDynamicLookupRelationSelectionTabComponent implements OnInit {
   /**
    * A string that describes the type of relationship
    */
@@ -122,7 +123,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   /**
    * Set up the selection and pagination on load
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.resetRoute();
     this.selectionRD$ = this.searchConfigService.paginatedSearchOptions
       .pipe(
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 5b69a7e72a..0b86b782f6 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -5,6 +5,8 @@ import {
 import {
   Component,
   Input,
+  OnDestroy,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -35,7 +37,7 @@ import { AccessStatusObject } from './access-status.model';
 /**
  * Component rendering the access status of an item as a badge
  */
-export class AccessStatusBadgeComponent {
+export class AccessStatusBadgeComponent implements OnDestroy, OnInit {
 
   @Input() object: DSpaceObject;
   accessStatus$: Observable<string>;
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
index cd28223013..1453d9246e 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 import { Context } from 'src/app/core/shared/context.model';
@@ -29,7 +32,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.DetailedListElement)
-export class WorkflowItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnInit {
 
   /**
    * The item object that belonging to the result object
@@ -51,7 +54,7 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
index 5c51e3464f..b88cef64b5 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 
@@ -29,7 +32,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.DetailedListElement)
-export class WorkspaceItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkspaceItemSearchResult, WorkspaceItem> {
+export class WorkspaceItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
 
   /**
    * The item object that belonging to the result object
@@ -51,7 +54,7 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLink(this.dso, followLink('item'));
     this.initItem(this.dso.item as Observable<RemoteData<Item>>);
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 c9c56daff1..a0c8ec84ce 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
@@ -3,7 +3,10 @@ import {
   NgFor,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -35,7 +38,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
 /**
  * The component for displaying a grid element for an item search result of the type Publication
  */
-export class ItemSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnInit {
   /**
    * Route to the item's page
    */
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index ecc0bd1ca3..af658c6cf2 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Input,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -28,7 +29,7 @@ import { IdentifierData } from './identifier-data.model';
 /**
  * Component rendering an identifier, eg. DOI or handle
  */
-export class IdentifierDataComponent {
+export class IdentifierDataComponent implements OnInit {
 
   @Input() item: Item;
   identifiers$: Observable<IdentifierData>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index fc024944e8..f94effe2a4 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -40,7 +41,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
-export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
+export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
 
   /**
    * A boolean representing if to show submitter information
@@ -69,7 +70,7 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index fa5f7a3a04..d69b9ecda0 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -5,6 +5,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -40,7 +41,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
-export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
+export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
 
   /**
    * A boolean representing if to show submitter information
@@ -69,7 +70,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 7c88dcc36d..d7f735e1ad 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -43,7 +44,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement)
-export class WorkflowItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkflowItemSearchResult, WorkflowItem> {
+export class WorkflowItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnInit {
   LinkTypes = CollectionElementLinkType;
 
   ViewModes = ViewMode;
@@ -75,7 +76,7 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.deriveSearchResult();
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 8938064da6..4a8863d22f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -43,7 +44,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement)
-export class  WorkspaceItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkspaceItemSearchResult, WorkspaceItem> {
+export class  WorkspaceItemSearchResultListElementComponent extends SearchResultListElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
   LinkTypes = CollectionElementLinkType;
 
   ViewModes = ViewMode;
@@ -75,7 +76,7 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
   /**
    * Initialize all instance variables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
     this.deriveSearchResult();
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 58cd875ce2..2641792b02 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -2,7 +2,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Collection } from '../../../../core/shared/collection.model';
@@ -23,7 +26,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
  * Component representing a collection search result in list view
  */
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement)
-export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> {
+export class CollectionSearchResultListElementComponent extends SearchResultListElementComponent<CollectionSearchResult, Collection> implements OnInit {
 
   /**
    * Display thumbnails if required by configuration
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index 52d7ad6e6b..e8e3c57959 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -2,7 +2,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Community } from '../../../../core/shared/community.model';
@@ -23,13 +26,12 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
  * Component representing a community search result in list view
  */
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement)
-export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> {
+export class CommunitySearchResultListElementComponent extends SearchResultListElementComponent<CommunitySearchResult, Community> implements OnInit {
   /**
    * Display thumbnails if required by configuration
    */
   showThumbnails: boolean;
 
-
   ngOnInit(): void {
     super.ngOnInit();
     this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index c262dee259..e65883cd3e 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -3,7 +3,10 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   Observable,
@@ -41,7 +44,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
  * It displays the name of the parent, title and description of the object. All of which are customizable in the child
  * component by overriding the relevant methods of this component
  */
-export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> {
+export class SidebarSearchListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends SearchResultListElementComponent<T, K> implements OnInit {
   /**
    * Observable for the title of the parent object (displayed above the object's title)
    */
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
index 1ebf626484..444e7bc14c 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
@@ -7,6 +7,7 @@ import {
   ElementRef,
   EventEmitter,
   OnDestroy,
+  OnInit,
   Output,
   ViewChild,
 } from '@angular/core';
@@ -65,7 +66,7 @@ export const compareArraysUsingFieldUuids = () =>
   selector: 'ds-paginated-drag-drop-abstract',
   template: '',
 })
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
+export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnInit, OnDestroy {
   /**
    * A view on the child pagination component
    */
@@ -142,7 +143,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   /**
    * Initialize the observables
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.initializeObjectsRD();
     this.initializeURL();
     this.initializeUpdates();
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index f4b2c35314..fbab09be3e 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -1,12 +1,14 @@
 import { CommonModule } from '@angular/common';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   EventEmitter,
   HostListener,
   Input,
+  OnInit,
   Output,
   ViewEncapsulation,
 } from '@angular/core';
@@ -42,7 +44,7 @@ import { UploaderProperties } from './uploader-properties.model';
   standalone: true,
   imports: [TranslateModule, FileUploadModule, CommonModule],
 })
-export class UploaderComponent {
+export class UploaderComponent implements OnInit, AfterViewInit {
 
   /**
    * The message to show when drag files on the drop zone
@@ -122,7 +124,7 @@ export class UploaderComponent {
   /**
    * Method provided by Angular. Invoked after the constructor.
    */
-  ngOnInit() {
+  ngOnInit(): void {
     this.uploaderId = 'ds-drag-and-drop-uploader' + uniqueId();
     this.checkConfig(this.uploadFilesOptions);
     this.uploader = new FileUploader({
@@ -147,7 +149,7 @@ export class UploaderComponent {
     }
   }
 
-  ngAfterViewInit() {
+  ngAfterViewInit(): void {
     this.uploader.onAfterAddingAll = ((items) => {
       this.onFileSelected.emit(items);
     });
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index 1483ea47b7..e297c795df 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import {
   TranslateModule,
@@ -47,7 +48,7 @@ import { SectionsService } from '../sections.service';
   standalone: true,
 })
 
-export class SubmissionSectionIdentifiersComponent extends SectionModelComponent {
+export class SubmissionSectionIdentifiersComponent extends SectionModelComponent implements OnInit {
   /**
    * The Alert categories.
    * @type {AlertType}
@@ -76,7 +77,6 @@ export class SubmissionSectionIdentifiersComponent extends SectionModelComponent
   /**
    * Initialize instance variables.
    *
-   * @param {PaginationService} paginationService
    * @param {TranslateService} translate
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
@@ -93,7 +93,7 @@ export class SubmissionSectionIdentifiersComponent extends SectionModelComponent
     super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     super.ngOnInit();
   }
 

From 06556df0a91cc0880fcececb33b65fdfacf433d7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 13 Jun 2024 13:07:51 +0200
Subject: [PATCH 0343/1286] add lint rule (use-lifecycle-interface)

(cherry picked from commit cc975bb0b517cd73adcc7a4eb5cd362ece936903)
---
 .eslintrc.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.json b/.eslintrc.json
index 4cc8c6dbc5..dc76a7dea3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -165,6 +165,7 @@
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
         "@angular-eslint/no-conflicting-lifecycle": "warn",
+        "@angular-eslint/use-lifecycle-interface": "error"
 
         "@typescript-eslint/no-inferrable-types":[
           "error",

From 8075734744828f57311061d5298c804d9b4b69e7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 13 Jun 2024 13:12:35 +0200
Subject: [PATCH 0344/1286] add missing comma

(cherry picked from commit 3cedeffec93b41fce27ea432552b335b37a30894)
---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index dc76a7dea3..5fb4c12171 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -165,7 +165,7 @@
         "@angular-eslint/no-output-native": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",
         "@angular-eslint/no-conflicting-lifecycle": "warn",
-        "@angular-eslint/use-lifecycle-interface": "error"
+        "@angular-eslint/use-lifecycle-interface": "error",
 
         "@typescript-eslint/no-inferrable-types":[
           "error",

From 93d10aaf2f7e7a05c777dee75446a4637bd331db Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@hsu-hh.de>
Date: Thu, 13 Jun 2024 13:46:57 +0200
Subject: [PATCH 0345/1286] add missing imports of Angular lifecycle interfaces

(cherry picked from commit 2d9ad8e5cf6f04805dc27e147708ae9367864935)
---
 .../metadata-registry/metadata-registry.component.ts      | 7 +++++--
 .../filtered-collections.component.ts                     | 3 ++-
 .../filtered-items/filtered-items.component.ts            | 5 +++--
 .../core/submission/submission-duplicate-data.service.ts  | 8 ++++++--
 .../person/person-search-result-list-element.component.ts | 3 ++-
 .../recent-item-list/recent-item-list.component.ts        | 3 ++-
 .../edit-item-page/item-status/item-status.component.ts   | 3 ++-
 .../orcid-page/orcid-queue/orcid-queue.component.ts       | 3 ++-
 .../project-entry-import-modal.component.ts               | 3 ++-
 .../qa/source/quality-assurance-source.component.ts       | 4 +++-
 .../publication-claim/publication-claim.component.ts      | 3 ++-
 .../profile-page-security-form.component.ts               | 3 ++-
 .../ds-dynamic-form-control-container.component.ts        | 5 ++++-
 .../models/onebox/dynamic-onebox.component.ts             | 3 ++-
 .../shared/form/number-picker/number-picker.component.ts  | 3 ++-
 .../item/item-search-result-list-element.component.ts     | 7 +++++--
 .../collection/submission-form-collection.component.ts    | 3 ++-
 .../submission-upload-files.component.ts                  | 3 ++-
 .../sections/duplicates/section-duplicates.component.ts   | 3 ++-
 19 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index a148559bd2..be989d49e2 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -4,7 +4,10 @@ import {
   NgForOf,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+} from '@angular/core';
 import {
   Router,
   RouterLink,
@@ -60,7 +63,7 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
  * A component used for managing all existing metadata schemas within the repository.
  * The admin can create, edit or delete metadata schemas here.
  */
-export class MetadataRegistryComponent {
+export class MetadataRegistryComponent implements OnDestroy {
 
   /**
    * A list of all the current metadata schemas within the repository
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index b4bebfc924..e1f54bd8d3 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -4,6 +4,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  OnInit,
   ViewChild,
 } from '@angular/core';
 import {
@@ -40,7 +41,7 @@ import { FilteredCollections } from './filtered-collections.model';
   ],
   standalone: true,
 })
-export class FilteredCollectionsComponent {
+export class FilteredCollectionsComponent implements OnInit {
 
   queryForm: FormGroup;
   results: FilteredCollections = new FilteredCollections();
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 9fd4643573..4cb93aa9be 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -5,6 +5,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  OnInit,
   ViewChild,
 } from '@angular/core';
 import {
@@ -66,7 +67,7 @@ import { QueryPredicate } from './query-predicate.model';
   ],
   standalone: true,
 })
-export class FilteredItemsComponent {
+export class FilteredItemsComponent implements OnInit {
 
   collections: OptionVO[];
   presetQueries: PresetQuery[];
@@ -90,7 +91,7 @@ export class FilteredItemsComponent {
     private formBuilder: FormBuilder,
     private restService: DspaceRestService) {}
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.loadCollections();
     this.loadPresetQueries();
     this.loadMetadataFields();
diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts
index 755fec05c2..b327342469 100644
--- a/src/app/core/submission/submission-duplicate-data.service.ts
+++ b/src/app/core/submission/submission-duplicate-data.service.ts
@@ -1,5 +1,8 @@
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model';
@@ -33,7 +36,8 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
  *
  */
 @Injectable({ providedIn: 'root' })
-export class SubmissionDuplicateDataService extends BaseDataService<Duplicate> implements SearchData<Duplicate> {
+export class SubmissionDuplicateDataService extends BaseDataService<Duplicate>
+  implements SearchData<Duplicate>, OnDestroy {
 
   /**
    * The ResponseParsingService constructor name
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index ac8bac2f13..86ead8b825 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -7,6 +7,7 @@ import {
 import {
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -36,7 +37,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
 /**
  * The component for displaying a list element for an item search result of the type Person
  */
-export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent {
+export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent implements OnInit {
 
   public constructor(
     protected truncatableService: TruncatableService,
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 351677fce4..65c1998b7a 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -10,6 +10,7 @@ import {
   Component,
   ElementRef,
   Inject,
+  OnDestroy,
   OnInit,
   PLATFORM_ID,
 } from '@angular/core';
@@ -62,7 +63,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   standalone: true,
   imports: [VarDirective, NgIf, NgClass, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
-export class RecentItemListComponent implements OnInit {
+export class RecentItemListComponent implements OnInit, OnDestroy {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
   paginationConfig: PaginationComponentOptions;
   sortConfig: SortOptions;
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index bbd7b99a97..1bb17dc77c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -7,6 +7,7 @@ import {
 import {
   ChangeDetectionStrategy,
   Component,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -79,7 +80,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 /**
  * Component for displaying an item's status
  */
-export class ItemStatusComponent implements OnInit {
+export class ItemStatusComponent implements OnInit, OnDestroy {
 
   /**
    * The item to display the status for
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 0f02d7083c..dfc7fac526 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import {
   Component,
   Input,
+  OnChanges,
   OnDestroy,
   OnInit,
   SimpleChanges,
@@ -56,7 +57,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
   ],
   standalone: true,
 })
-export class OrcidQueueComponent implements OnInit, OnDestroy {
+export class OrcidQueueComponent implements OnInit, OnDestroy, OnChanges {
 
   /**
    * The item for which showing the orcid settings
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4b31e2316a..b2d45916d2 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -6,6 +6,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
@@ -110,7 +111,7 @@ export interface QualityAssuranceEventData {
  * Component to display a modal window for linking a project to an Quality Assurance event
  * Shows information about the selected project and a selectable list.
  */
-export class ProjectEntryImportModalComponent implements OnInit {
+export class ProjectEntryImportModalComponent implements OnInit, OnDestroy {
   /**
    * The external source entry
    */
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index a918b8c3b6..c7457c5d2b 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -5,7 +5,9 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewInit,
   Component,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -40,7 +42,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   standalone: true,
   imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
-export class QualityAssuranceSourceComponent implements OnInit {
+export class QualityAssuranceSourceComponent implements OnDestroy, OnInit, AfterViewInit {
 
   /**
    * The pagination system configuration for HTML listing.
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index d03bf9d653..5128c88468 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -6,6 +6,7 @@ import {
 import {
   Component,
   Input,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import {
@@ -50,7 +51,7 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
   ],
   standalone: true,
 })
-export class PublicationClaimComponent implements OnInit {
+export class PublicationClaimComponent implements OnDestroy, OnInit {
 
   /**
    * The source for which to list targets
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 7c0bf9ea2d..0fdee2080b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -44,7 +45,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
  * Component for a user to edit their security information
  * Displays a form containing a password field and a confirmation of the password
  */
-export class ProfilePageSecurityFormComponent implements OnInit {
+export class ProfilePageSecurityFormComponent implements OnDestroy, OnInit {
 
   /**
    * Emits the validity of the password
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 595a1304a0..a373c53984 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -6,11 +6,13 @@ import {
   NgTemplateOutlet,
 } from '@angular/common';
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   ComponentFactoryResolver,
   ContentChildren,
+  DoCheck,
   EventEmitter,
   Inject,
   Input,
@@ -143,7 +145,8 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
   ],
   standalone: true,
 })
-export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
+export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent
+  implements OnInit, OnChanges, OnDestroy, AfterViewInit, DoCheck {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
   // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 23cec6b502..22f8dce244 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -9,6 +9,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
   ViewChild,
@@ -92,7 +93,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
   ],
   standalone: true,
 })
-export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnInit {
+export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
 
   @Input() group: UntypedFormGroup;
   @Input() model: DynamicOneboxModel;
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index e268919101..b097236659 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -4,6 +4,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnChanges,
   OnInit,
   Output,
   SimpleChanges,
@@ -36,7 +37,7 @@ import { isEmpty } from '../../empty.util';
   standalone: true,
 })
 
-export class NumberPickerComponent implements OnInit, ControlValueAccessor {
+export class NumberPickerComponent implements OnChanges, OnInit, ControlValueAccessor {
   @Input() id: string;
   @Input() step: number;
   @Input() min: number;
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 8afafa2b86..26a1d7e655 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -4,7 +4,10 @@ import {
   NgFor,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
 
 import { Item } from '../../../../../../core/shared/item.model';
@@ -30,7 +33,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
 /**
  * The component for displaying a list element for an item search result of the type Publication
  */
-export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> {
+export class ItemSearchResultListElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> implements OnInit {
   /**
    * Route to the item's page
    */
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index dcbcfd9cb3..2aec1c9e30 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -5,6 +5,7 @@ import {
   EventEmitter,
   Input,
   OnChanges,
+  OnDestroy,
   OnInit,
   Output,
   SimpleChanges,
@@ -58,7 +59,7 @@ import { SubmissionService } from '../../submission.service';
     ThemedCollectionDropdownComponent,
   ],
 })
-export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
+export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges, OnInit {
 
   /**
    * The current collection id this submission belonging to
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index e694a868ca..3632ec6760 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -3,6 +3,7 @@ import {
   Component,
   Input,
   OnChanges,
+  OnDestroy,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -43,7 +44,7 @@ import parseSectionErrors from '../../utils/parseSectionErrors';
   ],
   standalone: true,
 })
-export class SubmissionUploadFilesComponent implements OnChanges {
+export class SubmissionUploadFilesComponent implements OnChanges, OnDestroy {
 
   /**
    * The collection id this submission belonging to
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
index d90a0ca85a..885511ca52 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  OnInit,
 } from '@angular/core';
 import {
   TranslateModule,
@@ -48,7 +49,7 @@ import { SectionsService } from '../sections.service';
   standalone: true,
 })
 
-export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
+export class SubmissionSectionDuplicatesComponent extends SectionModelComponent implements OnInit {
   protected readonly Metadata = Metadata;
   /**
    * The Alert categories.

From ad6a9438de13f861a9096768e6efdacccbfdeaf4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 8 Aug 2024 16:49:20 -0500
Subject: [PATCH 0346/1286] Fix lint error regarding missing interface

---
 .../publication-claim/publication-claim.component.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 5128c88468..a111fcd704 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -4,6 +4,7 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewInit,
   Component,
   Input,
   OnDestroy,
@@ -51,7 +52,7 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
   ],
   standalone: true,
 })
-export class PublicationClaimComponent implements OnDestroy, OnInit {
+export class PublicationClaimComponent implements AfterViewInit, OnDestroy, OnInit {
 
   /**
    * The source for which to list targets

From 690b934e186a0f24a5705dc0d6333cb5b8b292a7 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Wed, 7 Aug 2024 14:30:24 +0200
Subject: [PATCH 0347/1286] [CST-15589] Updated slider implementation in
 SearchRangeFilterComponent

(cherry picked from commit 6c2d541b89ef99cdfe07ad66b7c1040a11cae575)
---
 .../search-range-filter.component.ts              | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 1ddac22dd3..ac524739d4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -91,6 +91,11 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   range: [number | undefined, number | undefined];
 
+  /**
+   * The range currently selected by the slider
+   */
+  sliderRange: [number | undefined, number | undefined];
+
   /**
    * Whether the sider is being controlled by the keyboard.
    * Supresses any changes until the key is released.
@@ -145,6 +150,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     };
   }
 
+  /**
+   * Updates the sliderRange property with the current slider range.
+   * This method is called whenever the slider value changes, but it does not immediately apply the changes.
+   * @param range - The current range selected by the slider
+   */
+  onSliderChange(range: [number | undefined, number | undefined]): void {
+    this.sliderRange = range;
+  }
+
   /**
    * Submits new custom range values to the range filter from the widget
    */
@@ -182,5 +196,4 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
   shouldShowSlider(): boolean {
     return isPlatformBrowser(this.platformId);
   }
-
 }

From 174aa0e50fbfea98172bab23c5c2db8166c45954 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Wed, 7 Aug 2024 14:30:44 +0200
Subject: [PATCH 0348/1286] [CST-15589] Updated slider implementation in
 template

(cherry picked from commit 56ba23fc3d6b51ed078ffa587f25503b457c97e5)
---
 .../search-range-filter.component.html                 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 672bd0be4e..6f1f95738c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -8,7 +8,7 @@
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control" (blur)="onSubmit()"
+                         class="form-control"
                          [attr.aria-label]="minLabel"
                          [placeholder]="minLabel"
                   />
@@ -20,7 +20,7 @@
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control" (blur)="onSubmit()"
+                           class="form-control"
                            [attr.aria-label]="maxLabel"
                            [placeholder]="maxLabel"
                     />
@@ -33,7 +33,8 @@
 
         <ng-container *ngIf="shouldShowSlider()">
             <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250" (onDebounce)="onSubmit()"
+                        [dsDebounce]="250"
+                        (change)="onSliderChange($event)"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
             </nouislider>
@@ -43,5 +44,8 @@
           <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
           </div>
         </ng-container>
+        <button (click)="onSubmit()" class="btn btn-primary">
+          {{'search.filters.search.submit' | translate}}
+        </button>
     </div>
 </div>

From 288c75851eb0cb901ea3e80566fcf36f6128c870 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 8 Aug 2024 23:17:22 -0700
Subject: [PATCH 0349/1286] src/app/shared/search: date slider accessibility

Update date slider to prevent automatic page reloads.
---
 .../search-range-filter.component.html             | 10 +++++++---
 .../search-range-filter.component.ts               | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 6d4ba44920..dcb2b04c9f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -8,7 +8,7 @@
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control" (blur)="onSubmit()"
+                         class="form-control"
                          [attr.aria-label]="minLabel"
                          [placeholder]="minLabel"
                   />
@@ -20,7 +20,7 @@
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control" (blur)="onSubmit()"
+                           class="form-control"
                            [attr.aria-label]="maxLabel"
                            [placeholder]="maxLabel"
                     />
@@ -33,7 +33,8 @@
 
         <ng-container *ngIf="shouldShowSlider()">
             <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250" (onDebounce)="onSubmit()"
+                        [dsDebounce]="250"
+                        (change)="onSliderChange($event)"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
             </nouislider>
@@ -43,5 +44,8 @@
           <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
           </div>
         </ng-container>
+        <button (click)="onSubmit()" class="btn btn-primary">
+          {{'search.filters.search.submit' | translate}}
+        </button>
     </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index a6eaf436c9..1528acc0c6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -81,6 +81,11 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   range;
 
+  /**
+   * The range currently selected by the slider
+   */
+  sliderRange: [number | undefined, number | undefined];
+
   /**
    * Subscription to unsubscribe from
    */
@@ -138,6 +143,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     };
   }
 
+  /**
+   * Updates the sliderRange property with the current slider range.
+   * This method is called whenever the slider value changes, but it does not immediately apply the changes.
+   * @param range - The current range selected by the slider
+   */
+  onSliderChange(range: [number | undefined, number | undefined]): void {
+    this.sliderRange = range;
+  }
+
   /**
    * Submits new custom range values to the range filter from the widget
    */

From 9d7aa07c1df73cee754fad38f7938149ad11985d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 8 Aug 2024 16:49:20 -0500
Subject: [PATCH 0350/1286] Fix lint error regarding missing interface

(cherry picked from commit ad6a9438de13f861a9096768e6efdacccbfdeaf4)
---
 .../publication-claim/publication-claim.component.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 5128c88468..a111fcd704 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -4,6 +4,7 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewInit,
   Component,
   Input,
   OnDestroy,
@@ -51,7 +52,7 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
   ],
   standalone: true,
 })
-export class PublicationClaimComponent implements OnDestroy, OnInit {
+export class PublicationClaimComponent implements AfterViewInit, OnDestroy, OnInit {
 
   /**
    * The source for which to list targets

From a0515c412140184c23cface4febb5d48f0d430eb Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 13 Aug 2024 11:43:36 +0200
Subject: [PATCH 0351/1286] 110615: Fixed related entities ay11 tab issue &
 removed potential duplicate ID issue by removing the unused #browseDropdown
 ID

---
 .../tabbed-related-entities-search.component.html         | 8 +++++---
 .../expandable-navbar-section.component.html              | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 223d4a6ed0..3ce96b2ce3 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,7 +1,9 @@
 <ng-container *ngIf="relationTypes.length > 1">
-  <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter">
-      <a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
+  <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
+    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
+      <a ngbNavLink role="tab">
+        {{'item.page.relationships.' + relationType.label | translate}}
+      </a>
       <ng-template ngbNavContent>
         <div class="mt-4">
           <ds-related-entities-search [item]="item"
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index d8a517dc55..39564906fd 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -6,7 +6,7 @@
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
     <a href="javascript:void(0);" class="nav-link dropdown-toggle" routerLinkActive="active"
-       id="browseDropdown" (click)="toggleSection($event)"
+       (click)="toggleSection($event)"
        data-toggle="dropdown">
         <ng-container
                 *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>

From 54d99a84c9eb59335f9e62b3b043f86ccd1f80d3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 13 Aug 2024 12:05:16 +0200
Subject: [PATCH 0352/1286] 110615: Added missing vocabulary search input label

---
 .../vocabulary-treeview/vocabulary-treeview.component.html    | 4 +++-
 src/assets/i18n/en.json5                                      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index fb7d162008..824f722050 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -2,7 +2,9 @@
 <div class="treeview-header row">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
+      <input type="text" class="form-control" [(ngModel)]="searchText"
+             [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
+             (keyup.enter)="search()">
       <div class="input-group-append" id="button-addon4">
         <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..bbe211c42f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4736,6 +4736,8 @@
 
   "vocabulary-treeview.search.form.search": "Search",
 
+  "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+
   "vocabulary-treeview.search.no-result": "There were no items to show",
 
   "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",

From 3351615140e2e2c0023b61fbe3c867efda6c0222 Mon Sep 17 00:00:00 2001
From: pcg-kk <krzysztof.kubiak@pcgacademia.pl>
Date: Mon, 22 Apr 2024 21:08:10 +0200
Subject: [PATCH 0353/1286] fix: linkName from decorator assign value to the
 correct property

---
 src/app/core/cache/builders/link.service.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index 6265e89d53..df3ccf1c87 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -112,7 +112,16 @@ export class LinkService {
    * @param linkToFollow the {@link FollowLinkConfig} to resolve
    */
   public resolveLink<T extends HALResource>(model, linkToFollow: FollowLinkConfig<T>): T {
-    model[linkToFollow.name] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    const linkDefinitions = this.getLinkDefinitions(model.constructor as GenericConstructor<T>);
+    const linkDef = linkDefinitions.get(linkToFollow.name);
+
+    if (isNotEmpty(linkDef)) {
+      // If link exist in definition we can resolve it and  use a real property name
+      model[linkDef.propertyName] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    } else {
+      // For some links we don't have a definition, so we use the link name as property name
+      model[linkToFollow.name] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    }
     return model;
   }
 

From 973fd339da24b0d96ef4484e20f4a2a93224bd04 Mon Sep 17 00:00:00 2001
From: pcg-kk <krzysztof.kubiak@pcgacademia.pl>
Date: Mon, 22 Apr 2024 22:16:42 +0200
Subject: [PATCH 0354/1286] fix: add unit test for rename property case

---
 .../core/cache/builders/link.service.spec.ts  | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index d987891388..122945ab6a 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -31,10 +31,12 @@ class TestModel implements HALResource {
     self: HALLink;
     predecessor: HALLink;
     successor: HALLink;
+    standardLinkName: HALLink;
   };
 
   predecessor?: TestModel;
   successor?: TestModel;
+  renamedProperty?: TestModel;
 }
 
 const mockDataServiceMap: any = new Map([
@@ -66,6 +68,24 @@ describe('LinkService', () => {
     testDataService = new TestDataService();
     spyOn(testDataService, 'findListByHref').and.callThrough();
     spyOn(testDataService, 'findByHref').and.callThrough();
+
+    const linksDefinitions = new Map();
+    linksDefinitions.set('predecessor', {
+      resourceType: TEST_MODEL,
+      linkName: 'predecessor',
+      propertyName: 'predecessor',
+    });
+    linksDefinitions.set('successor', {
+      resourceType: TEST_MODEL,
+      linkName: 'successor',
+      propertyName: 'successor',
+    });
+    linksDefinitions.set('standardLinkName', {
+      resourceType: TEST_MODEL,
+      linkName: 'standardLinkName',
+      propertyName: 'renamedProperty',
+    });
+
     TestBed.configureTestingModule({
       providers: [
         LinkService,
@@ -87,18 +107,7 @@ describe('LinkService', () => {
         },
         {
           provide: LINK_DEFINITION_MAP_FACTORY,
-          useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue([
-            {
-              resourceType: TEST_MODEL,
-              linkName: 'predecessor',
-              propertyName: 'predecessor',
-            },
-            {
-              resourceType: TEST_MODEL,
-              linkName: 'successor',
-              propertyName: 'successor',
-            },
-          ]),
+          useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue(linksDefinitions),
         },
       ],
     });
@@ -117,6 +126,15 @@ describe('LinkService', () => {
         });
       });
     });
+    describe(`when the propertyName is different than linkName`, () => {
+      beforeEach(() => {
+        result = service.resolveLink(testModel, followLink('standardLinkName', {}));
+      });
+      it('link should be assign to custom property', () => {
+        expect(result.renamedProperty).toBeDefined();
+        expect(result.standardLinkName).toBeUndefined();
+      });
+    });
     describe(`when the linkdefinition concerns a list`, () => {
       beforeEach(() => {
         ((service as any).getLinkDefinition as jasmine.Spy).and.returnValue({

From a862d84738a573c559d18bf523b4cc346000dde2 Mon Sep 17 00:00:00 2001
From: pcg-kk <krzysztof.kubiak@pcgacademia.pl>
Date: Mon, 12 Aug 2024 21:27:01 +0200
Subject: [PATCH 0355/1286] fix: use the correct link name for find by href

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

diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index d09ee21ee0..56f0c2fc26 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -28,6 +28,7 @@ import {
   isNotEmptyOperator,
 } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { getLinkDefinition } from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RequestParam } from '../../cache/models/request-param.model';
@@ -301,8 +302,9 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       tap((remoteDataObject: RemoteData<T>) => {
         if (hasValue(remoteDataObject?.payload?._links)) {
           for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
-            // only add the followLinks if they are embedded
-            if (hasValue(remoteDataObject.payload[followLinkName]) && followLinkName !== 'self') {
+            // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
+            const linkDefinition = getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+            if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
               // followLink can be either an individual HALLink or a HALLink[]
               const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
               for (const individualFollowLink of followLinksList) {

From d9d39b0cb5f1aed5ff7ec9c51c60fb354232a01c Mon Sep 17 00:00:00 2001
From: pcg-kk <krzysztof.kubiak@pcgacademia.pl>
Date: Tue, 13 Aug 2024 19:36:02 +0200
Subject: [PATCH 0356/1286] fix: use the correct link name for find by href for
 findListByHref

---
 src/app/core/data/base/base-data.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 56f0c2fc26..b47deb339c 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -358,8 +358,9 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
           for (const object of remoteDataObject.payload.page) {
             if (hasValue(object?._links)) {
               for (const followLinkName of Object.keys(object._links)) {
-                // only add the followLinks if they are embedded
-                if (hasValue(object[followLinkName]) && followLinkName !== 'self') {
+                // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
+                const linkDefinition = getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+                if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
                   // followLink can be either an individual HALLink or a HALLink[]
                   const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
                   for (const individualFollowLink of followLinksList) {

From d09f5297a1f4e36071494bd89dc462b7538b3474 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 14 Aug 2024 22:46:14 +0200
Subject: [PATCH 0357/1286] 117287: Removed method calls returning observables
 from the item versions overview

---
 .../versions/item-versions.component.html     | 257 +++++++++---------
 .../versions/item-versions.component.ts       |  44 +--
 2 files changed, 158 insertions(+), 143 deletions(-)

diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..93e65e2629 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,145 +1,148 @@
-<div *ngVar="(versionsRD$ | async)?.payload as versions">
-  <div *ngVar="(versionRD$ | async)?.payload as itemVersion">
-    <div class="mb-2" *ngIf="versions?.page?.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle">{{"item.version.history.head" | translate}}</h2>
-      <ds-alert [type]="AlertTypeEnum.Info" *ngIf="itemVersion">
-        {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
-      </ds-alert>
-      <ds-pagination *ngIf="versions?.page?.length > 0"
-                     (paginationChange)="onPageChange()"
-                     [hideGear]="true"
-                     [hidePagerWhenSinglePage]="true"
-                     [paginationOptions]="options"
-                     [pageInfoState]="versions"
-                     [collectionSize]="versions?.totalElements"
-                     [retainScrollPosition]="true">
-        <table class="table table-striped table-bordered align-middle my-2">
-          <thead>
-          <tr>
-            <th scope="col">{{"item.version.history.table.version" | translate}}</th>
-            <th scope="col" *ngIf="(showSubmitter() | async)">{{"item.version.history.table.editor" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.date" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let version of versions?.page" [id]="'version-row-' + version.id">
-            <td class="version-row-element-version">
-              <!-- Get the ID of the workspace/workflow item (`undefined` if they don't exist).
-              Conditionals inside *ngVar are needed in order to avoid useless calls. -->
-              <ng-container *ngVar="((hasDraftVersion$ | async) ? getWorkspaceId(version?.item) : undefined) as workspaceId$">
-                <ng-container *ngVar=" ((workspaceId$ | async) ? undefined : getWorkflowId(version?.item)) as workflowId$">
+<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion" class="mb-2">
+  <div *ngIf="(versionRD$ | async)?.payload as itemVersion">
+    <h2 *ngIf="displayTitle">{{ "item.version.history.head" | translate }}</h2>
+    <ds-alert [type]="AlertTypeEnum.Info">
+      {{ "item.version.history.selected.alert" | translate : { version: itemVersion.version } }}
+    </ds-alert>
+    <ds-pagination *ngIf="versionsDTO.versionDTOs.length > 0"
+                   (paginationChange)="onPageChange()"
+                   [hideGear]="true"
+                   [hidePagerWhenSinglePage]="true"
+                   [paginationOptions]="options"
+                   [collectionSize]="versionsDTO.totalElements"
+                   [retainScrollPosition]="true">
+      <table class="table table-striped table-bordered align-middle my-2">
+        <thead>
+        <tr>
+          <th scope="col">{{ "item.version.history.table.version" | translate }}</th>
+          <th scope="col" *ngIf="(showSubmitter() | async)">{{ "item.version.history.table.editor" | translate }}</th>
+          <th scope="col">{{ "item.version.history.table.date" | translate }}</th>
+          <th scope="col">{{ "item.version.history.table.summary" | translate }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let versionDTO of versionsDTO.versionDTOs" [id]="'version-row-' + versionDTO.version.id">
+          <td class="version-row-element-version">
+            <!-- Get the ID of the workspace/workflow item (`undefined` if they don't exist).
+            Conditionals inside *ngVar are needed in order to avoid useless calls. -->
+            <ng-container
+              *ngVar="((hasDraftVersion$ | async) ? getWorkspaceId(versionDTO.version.item) : undefined) as workspaceId$">
+              <ng-container
+                *ngVar=" ((workspaceId$ | async) ? undefined : getWorkflowId(versionDTO.version.item)) as workflowId$">
 
-                  <div class="left-column">
+                <div class="left-column">
 
-                    <span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
-                    <ng-template #versionNumberWithLink>
-                      <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
-                    </ng-template>
-                    <ng-template #versionNumberWithoutLink>
-                      {{version.version}}
-                    </ng-template>
-                    <span *ngIf="version?.id === itemVersion?.id">*</span>
+                  <span
+                    *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
+                  <ng-template #versionNumberWithLink>
+                    <a [routerLink]="getVersionRoute(versionDTO.version.id)">{{ versionDTO.version.version }}</a>
+                  </ng-template>
+                  <ng-template #versionNumberWithoutLink>
+                    {{ versionDTO.version.version }}
+                  </ng-template>
+                  <span *ngIf="versionDTO.version.id === itemVersion?.id">*</span>
 
-                    <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
+                  <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
                       {{ "item.version.history.table.workspaceItem" | translate }}
                     </span>
 
-                    <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
+                  <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
                       {{ "item.version.history.table.workflowItem" | translate }}
                     </span>
 
-                  </div>
+                </div>
 
-                  <div class="right-column">
+                <div class="right-column">
 
-                    <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
-                      <!--EDIT WORKSPACE ITEM-->
-                      <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                              *ngIf="workspaceId$ | async"
-                              (click)="editWorkspaceItem(workspaceId$)"
-                              title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
-                        <i class="fas fa-pencil-alt fa-fw"></i>
+                  <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
+                    <!--EDIT WORKSPACE ITEM-->
+                    <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                            *ngIf="workspaceId$ | async"
+                            (click)="editWorkspaceItem(workspaceId$)"
+                            title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
+                      <i class="fas fa-pencil-alt fa-fw"></i>
+                    </button>
+                    <!--CREATE-->
+                    <ng-container *ngIf="canCreateVersion$ | async">
+                      <button class="btn btn-outline-primary btn-sm version-row-element-create"
+                              [disabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
+                              (click)="createNewVersion(versionDTO.version)"
+                              title="{{createVersionTitle$ | async | translate }}">
+                        <i class="fas fa-code-branch fa-fw"></i>
                       </button>
-                      <!--CREATE-->
-                      <ng-container *ngIf="canCreateVersion$ | async">
-                        <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                                [disabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
-                                (click)="createNewVersion(version)"
-                                title="{{createVersionTitle$ | async | translate }}">
-                          <i class="fas fa-code-branch fa-fw"></i>
-                        </button>
-                      </ng-container>
-                      <!--DELETE-->
-                      <ng-container *ngIf="canDeleteVersion$(version) | async">
-                        <button class="btn btn-sm version-row-element-delete"
-                                [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                                [disabled]="isAnyBeingEdited()"
-                                (click)="deleteVersion(version, version.id==itemVersion.id)"
-                                title="{{'item.version.history.table.action.deleteVersion' | translate}}">
-                          <i class="fas fa-trash fa-fw"></i>
-                        </button>
-                      </ng-container>
-                    </div>
-
+                    </ng-container>
+                    <!--DELETE-->
+                    <ng-container *ngIf="versionDTO.canDeleteVersion">
+                      <button class="btn btn-sm version-row-element-delete"
+                              [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
+                              [disabled]="isAnyBeingEdited()"
+                              (click)="deleteVersion(versionDTO.version, versionDTO.version.id==itemVersion.id)"
+                              title="{{'item.version.history.table.action.deleteVersion' | translate}}">
+                        <i class="fas fa-trash fa-fw"></i>
+                      </button>
+                    </ng-container>
                   </div>
 
-                </ng-container>
+                </div>
+
               </ng-container>
-            </td>
-            <td class="version-row-element-editor" *ngIf="(showSubmitter() | async)">
-              {{version?.submitterName}}
-            </td>
-            <td class="version-row-element-date">
-              {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}}
-            </td>
-            <td class="version-row-element-summary">
-              <div class="float-left">
-                <ng-container *ngIf="isThisBeingEdited(version); then editSummary else showSummary"></ng-container>
-                <ng-template #showSummary>{{version?.summary}}</ng-template>
-                <ng-template #editSummary>
-                  <input class="form-control" type="text" [(ngModel)]="versionBeingEditedSummary"
-                         (keyup.enter)="onSummarySubmit()"/>
-                </ng-template>
-              </div>
+            </ng-container>
+          </td>
+          <td class="version-row-element-editor" *ngIf="(showSubmitter() | async)">
+            {{ versionDTO.version.submitterName }}
+          </td>
+          <td class="version-row-element-date">
+            {{ versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss' }}
+          </td>
+          <td class="version-row-element-summary">
+            <div class="float-left">
+              <ng-container
+                *ngIf="isThisBeingEdited(versionDTO.version); then editSummary else showSummary"></ng-container>
+              <ng-template #showSummary>{{ versionDTO.version.summary }}</ng-template>
+              <ng-template #editSummary>
+                <input class="form-control" type="text" [(ngModel)]="versionBeingEditedSummary"
+                       (keyup.enter)="onSummarySubmit()"/>
+              </ng-template>
+            </div>
 
-              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
-                <!--DISCARD EDIT -->
-                <ng-container *ngIf="(canEditVersion$(version) | async) && isThisBeingEdited(version)">
-                  <button class="btn btn-sm"
-                          [ngClass]="isThisBeingEdited(version) ? 'btn-outline-warning' : 'btn-outline-primary'"
-                          (click)="disableVersionEditing()"
-                          title="{{'item.version.history.table.action.discardSummary' | translate}}">
-                    <i class="fas fa-undo-alt fa-fw"></i>
-                  </button>
-                </ng-container>
-                <!--EDIT / SAVE-->
-                <ng-container *ngIf="canEditVersion$(version) | async">
-                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          *ngIf="!isThisBeingEdited(version)"
-                          [disabled]="isAnyBeingEdited()"
-                          (click)="enableVersionEditing(version)"
-                          title="{{'item.version.history.table.action.editSummary' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button class="btn btn-outline-success btn-sm"
-                          *ngIf="isThisBeingEdited(version)"
-                          (click)="onSummarySubmit()"
-                          title="{{'item.version.history.table.action.saveSummary' | translate}}">
-                    <i class="fas fa-check fa-fw"></i>
-                  </button>
-                </ng-container>
-              </div>
-
-
-            </td>
-          </tr>
-          </tbody>
-        </table>
-        <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
-      </ds-pagination>
-      <ds-alert *ngIf="!itemVersion || versions?.page?.length === 0" [content]="'item.version.history.empty'"
-                [type]="AlertTypeEnum.Info"></ds-alert>
-    </div>
+            <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
+              <!--DISCARD EDIT -->
+              <ng-container *ngIf="(versionDTO.canEditVersion | async) && isThisBeingEdited(versionDTO.version)">
+                <button class="btn btn-sm"
+                        [ngClass]="isThisBeingEdited(versionDTO.version) ? 'btn-outline-warning' : 'btn-outline-primary'"
+                        (click)="disableVersionEditing()"
+                        title="{{'item.version.history.table.action.discardSummary' | translate}}">
+                  <i class="fas fa-undo-alt fa-fw"></i>
+                </button>
+              </ng-container>
+              <!--EDIT / SAVE-->
+              <ng-container *ngIf="versionDTO.canEditVersion | async">
+                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                        *ngIf="!isThisBeingEdited(versionDTO.version)"
+                        [disabled]="isAnyBeingEdited()"
+                        (click)="enableVersionEditing(versionDTO.version)"
+                        title="{{'item.version.history.table.action.editSummary' | translate}}">
+                  <i class="fas fa-edit fa-fw"></i>
+                </button>
+                <button class="btn btn-outline-success btn-sm"
+                        *ngIf="isThisBeingEdited(versionDTO.version)"
+                        (click)="onSummarySubmit()"
+                        title="{{'item.version.history.table.action.saveSummary' | translate}}">
+                  <i class="fas fa-check fa-fw"></i>
+                </button>
+              </ng-container>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+      <div>*&nbsp;{{ "item.version.history.selected" | translate }}</div>
+    </ds-pagination>
   </div>
 </div>
+<ng-template #noItemVersion>
+  <ds-alert *ngIf="displayWhenEmpty"
+            [content]="'item.version.history.empty'"
+            [type]="AlertTypeEnum.Info">
+  </ds-alert>
+</ng-template>
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 700a35552c..df42dc9bb7 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -3,7 +3,6 @@ import { Item } from '../../core/shared/item.model';
 import { Version } from '../../core/shared/version.model';
 import { RemoteData } from '../../core/data/remote-data';
 import {
-  BehaviorSubject,
   combineLatest,
   Observable,
   of,
@@ -49,6 +48,17 @@ import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-da
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 
+interface VersionsDTO {
+  totalElements: number;
+  versionDTOs: VersionDTO[];
+}
+
+interface VersionDTO {
+  version: Version;
+  canEditVersion: Observable<boolean>;
+  canDeleteVersion: Observable<boolean>;
+}
+
 @Component({
   selector: 'ds-item-versions',
   templateUrl: './item-versions.component.html',
@@ -109,16 +119,15 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
   versionHistory$: Observable<VersionHistory>;
 
   /**
-   * The version history's list of versions
+   * The version history information that is used to render the HTML
    */
-  versionsRD$: BehaviorSubject<RemoteData<PaginatedList<Version>>> = new BehaviorSubject<RemoteData<PaginatedList<Version>>>(null);
+  versionsDTO$: Observable<VersionsDTO>;
 
   /**
    * Verify if the list of versions has at least one e-person to display
    * Used to hide the "Editor" column when no e-persons are present to display
    */
   hasEpersons$: Observable<boolean>;
-
   /**
    * Verify if there is an inprogress submission in the version history
    * Used to disable the "Create version" button
@@ -421,16 +430,23 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
    */
   getAllVersions(versionHistory$: Observable<VersionHistory>): void {
     const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options);
-    combineLatest([versionHistory$, currentPagination]).pipe(
+    this.versionsDTO$ = combineLatest([versionHistory$, currentPagination]).pipe(
       switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => {
         return this.versionHistoryService.getVersions(versionHistory.id,
           new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}),
           false, true, followLink('item'), followLink('eperson'));
       }),
       getFirstCompletedRemoteData(),
-    ).subscribe((res: RemoteData<PaginatedList<Version>>) => {
-      this.versionsRD$.next(res);
-    });
+      getRemoteDataPayload(),
+      map((versions: PaginatedList<Version>) => ({
+        totalElements: versions.totalElements,
+        versionDTOs: (versions?.page ?? []).map((version: Version) => ({
+          version: version,
+          canEditVersion: this.canEditVersion$(version),
+          canDeleteVersion: this.canDeleteVersion$(version),
+        })),
+      })),
+    );
   }
 
   /**
@@ -509,16 +525,12 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
       );
 
       this.getAllVersions(this.versionHistory$);
-      this.hasEpersons$ = this.versionsRD$.pipe(
-        getAllSucceededRemoteData(),
-        getRemoteDataPayload(),
-        hasValueOperator(),
-        map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
+      this.hasEpersons$ = this.versionsDTO$.pipe(
+        map((versionsDTO: VersionsDTO) => versionsDTO.versionDTOs.filter((versionDTO: VersionDTO) => versionDTO.version.eperson !== undefined).length > 0),
         startWith(false)
       );
-      this.itemPageRoutes$ = this.versionsRD$.pipe(
-        getAllSucceededRemoteDataPayload(),
-        switchMap((versions) => combineLatest(versions.page.map((version) => version.item.pipe(getAllSucceededRemoteDataPayload())))),
+      this.itemPageRoutes$ = this.versionsDTO$.pipe(
+        switchMap((versionsDTO: VersionsDTO) => combineLatest(versionsDTO.versionDTOs.map((versionDTO: VersionDTO) => versionDTO.version.item.pipe(getAllSucceededRemoteDataPayload())))),
         map((versions) => {
           const itemPageRoutes = {};
           versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));

From 04bbaf9cb930cc823668076e858b0ab4703f4568 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 14 Aug 2024 23:43:44 +0200
Subject: [PATCH 0358/1286] 117287: Simplified the if conditions on the
 edit/save/discard buttons on item versions

---
 .../versions/item-versions.component.html     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index e35acff55f..ce5107aaa2 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -49,35 +49,31 @@
                 </ng-template>
               </div>
 
-              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
-                <!--DISCARD EDIT -->
-                <ng-container *ngIf="versionDTO.canEditVersion && isThisBeingEdited(versionDTO.version)">
-                  <button class="btn btn-sm"
-                          [ngClass]="isThisBeingEdited(versionDTO.version) ? 'btn-outline-warning' : 'btn-outline-primary'"
+              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
+                <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
+                  <!--DISCARD EDIT-->
+                  <button class="btn btn-sm btn-outline-warning"
                           (click)="disableVersionEditing()"
                           title="{{'item.version.history.table.action.discardSummary' | translate}}">
                     <i class="fas fa-undo-alt fa-fw"></i>
                   </button>
-                </ng-container>
-                <!--EDIT / SAVE-->
-                <ng-container *ngIf="versionDTO.canEditVersion">
-                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          *ngIf="!isThisBeingEdited(versionDTO.version)"
-                          [disabled]="isAnyBeingEdited()"
-                          (click)="enableVersionEditing(versionDTO.version)"
-                          title="{{'item.version.history.table.action.editSummary' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
+                  <!--SAVE-->
                   <button class="btn btn-outline-success btn-sm"
-                          *ngIf="isThisBeingEdited(versionDTO.version)"
                           (click)="onSummarySubmit()"
                           title="{{'item.version.history.table.action.saveSummary' | translate}}">
                     <i class="fas fa-check fa-fw"></i>
                   </button>
                 </ng-container>
+                <ng-template #notThisBeingEdited>
+                  <!--EDIT-->
+                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                          [disabled]="isAnyBeingEdited()"
+                          (click)="enableVersionEditing(versionDTO.version)"
+                          title="{{'item.version.history.table.action.editSummary' | translate}}">
+                    <i class="fas fa-edit fa-fw"></i>
+                  </button>
+                </ng-template>
               </div>
-
-
             </td>
           </tr>
           </tbody>

From 63c76644c148cde3b4848126764bd1632319b7bf Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 23 Aug 2024 14:10:58 +0200
Subject: [PATCH 0359/1286] 117544: First implementation of an aria friendly
 disabled state

---
 src/app/shared/disabled-directive.ts | 31 ++++++++++++++++++++++++++++
 src/app/shared/shared.module.ts      |  2 ++
 src/styles/_global-styles.scss       | 11 ++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 src/app/shared/disabled-directive.ts

diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
new file mode 100644
index 0000000000..8d1380917f
--- /dev/null
+++ b/src/app/shared/disabled-directive.ts
@@ -0,0 +1,31 @@
+import { Directive, Input, HostBinding, HostListener } from '@angular/core';
+
+@Directive({
+    selector: '[dsDisabled]'
+})
+export class DisabledDirective {
+
+    @Input() set dsDisabled(value: boolean) {
+        this.isDisabled = value;
+    }
+
+    @HostBinding('attr.aria-disabled') isDisabled = false;
+    @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
+
+    @HostListener('click', ['$event'])
+    handleClick(event: Event) {
+        if (this.isDisabled) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+        }
+    }
+
+    @HostListener('keydown', ['$event'])
+    handleKeydown(event: KeyboardEvent) {
+        if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+        }
+    }
+}
+
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0f7871f7f9..c9a6f9b6d0 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -284,6 +284,7 @@ import {
 } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
 import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
 import { NgxPaginationModule } from 'ngx-pagination';
+import {DisabledDirective} from './disabled-directive';
 
 const MODULES = [
   CommonModule,
@@ -491,6 +492,7 @@ const DIRECTIVES = [
   MetadataFieldValidator,
   HoverClassDirective,
   ContextHelpDirective,
+  DisabledDirective,
 ];
 
 @NgModule({
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b714d399a0..56b7fa464d 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -267,3 +267,14 @@ ul.dso-edit-menu-dropdown > li .nav-item.nav-link {
 .table td {
   vertical-align: middle;
 }
+
+// An element that is disabled should not have focus styles to avoid confusion
+// It however is still focusable for screen readers and keyboard navigation
+.disabled {
+    pointer-events: none;
+}
+
+.disabled:focus {
+    outline: none;
+    box-shadow: none;
+}

From 43745d830b0ba6d13805eab073261474578b5507 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 23 Aug 2024 14:52:16 +0200
Subject: [PATCH 0360/1286] 117544: replace all disabled states with our
 dsDisabled directive

---
 .../bulk-access/bulk-access.component.html       |  2 +-
 .../epeople-registry.component.html              |  2 +-
 .../eperson-form/eperson-form.component.html     |  4 ++--
 .../group-form/group-form.component.html         |  2 +-
 .../members-list/members-list.component.html     |  8 ++++----
 .../groups-registry.component.html               |  2 +-
 .../delete-collection-page.component.html        |  4 ++--
 .../collection-source-controls.component.html    | 12 ++++++------
 .../collection-source.component.html             |  8 ++++----
 .../delete-community-page.component.html         |  4 ++--
 .../dso-edit-metadata-value.component.html       | 10 +++++-----
 .../dso-edit-metadata.component.html             | 14 +++++++-------
 .../forgot-password-form.component.html          |  2 +-
 .../end-user-agreement.component.html            |  2 +-
 .../feedback-form/feedback-form.component.html   |  2 +-
 .../bitstream-request-a-copy-page.component.html |  2 +-
 .../item-bitstreams.component.html               |  8 ++++----
 .../item-edit-bitstream.component.html           |  4 ++--
 .../item-move/item-move.component.html           |  4 ++--
 .../item-operation/item-operation.component.html |  4 ++--
 .../edit-relationship-list.component.html        |  2 +-
 .../edit-relationship.component.html             |  4 ++--
 .../item-relationships.component.html            |  8 ++++----
 .../media-viewer-video.component.html            |  4 ++--
 .../orcid-auth/orcid-auth.component.html         |  2 +-
 .../versions/item-versions.component.html        |  6 +++---
 ...y-dspace-new-external-dropdown.component.html |  4 ++--
 ...dspace-new-submission-dropdown.component.html |  4 ++--
 .../overview/process-overview.component.html     |  4 ++--
 .../profile-claim-item-modal.component.html      |  2 +-
 .../profile-page-researcher-form.component.html  |  6 +++---
 .../register-email-form.component.html           |  4 ++--
 .../create-profile/create-profile.component.html |  2 +-
 .../email-request-copy.component.html            |  2 +-
 .../access-control-array-form.component.html     | 10 +++++-----
 .../access-control-form-container.component.html | 16 ++++++++--------
 .../shared/ds-select/ds-select.component.html    |  2 +-
 ...o-edit-menu-expandable-section.component.html |  2 +-
 .../dso-edit-menu-section.component.html         |  6 +++---
 src/app/shared/dso-page/dso-page.module.ts       |  2 ++
 ...dynamic-form-control-container.component.html |  2 +-
 .../dynamic-date-picker-inline.component.html    |  2 +-
 .../date-picker/date-picker.component.html       |  6 +++---
 .../disabled/dynamic-disabled.component.html     |  2 +-
 .../models/lookup/dynamic-lookup.component.html  | 12 ++++++------
 .../models/onebox/dynamic-onebox.component.html  |  4 ++--
 .../dynamic-relation-group.component.html        |  6 +++---
 .../dynamic-scrollable-dropdown.component.html   |  2 +-
 .../dynamic-lookup-relation-modal.component.html |  8 ++++----
 ...rnal-source-entry-import-modal.component.html |  2 +-
 src/app/shared/form/form.component.html          |  4 ++--
 .../number-picker/number-picker.component.html   |  6 +++---
 .../vocabulary-treeview.component.html           | 10 +++++-----
 .../password/log-in-password.component.html      |  2 +-
 .../claimed-task-actions-approve.component.html  |  2 +-
 ...imed-task-actions-decline-task.component.html |  2 +-
 .../claimed-task-actions-reject.component.html   |  4 ++--
 ...ed-task-actions-return-to-pool.component.html |  2 +-
 .../pool-task/pool-task-actions.component.html   |  2 +-
 .../collection-select.component.html             |  2 +-
 .../item-select/item-select.component.html       |  4 ++--
 .../shared/pagination/pagination.component.html  |  6 +++---
 .../form/resource-policy-form.component.html     |  4 ++--
 .../resource-policies.component.html             |  4 ++--
 .../subscription-modal.component.html            |  2 +-
 .../subscription-view.component.html             |  2 +-
 .../upload/uploader/uploader.component.html      |  2 +-
 .../submission-form-collection.component.html    |  2 +-
 .../footer/submission-form-footer.component.html |  8 ++++----
 .../submission-form-section-add.component.html   |  2 +-
 ...sion-import-external-searchbar.component.html |  2 +-
 ...submission-section-cc-licenses.component.html |  4 ++--
 .../edit/section-upload-file-edit.component.html |  2 +-
 .../file/section-upload-file.component.html      |  2 +-
 .../system-wide-alert-form.component.html        |  2 +-
 75 files changed, 162 insertions(+), 160 deletions(-)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 382caf85f4..9993bf470e 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -9,7 +9,7 @@
     <button class="btn btn-outline-primary mr-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index e3a8e2c590..ac8bafec50 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -77,7 +77,7 @@
                             title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
-                    <button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
+                    <button [dsDisabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
                             class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
                             title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                       <i class="fas fa-trash-alt fa-fw"></i>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 228449a8a5..1ece844894 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -20,7 +20,7 @@
             class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
   </div>
   <div *ngIf="displayResetPassword" between class="btn-group">
-    <button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()">
+    <button class="btn btn-primary" [dsDisabled]="!(canReset$ | async)" (click)="resetPassword()">
       <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
     </button>
   </div>
@@ -32,7 +32,7 @@
       <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
     </button>
   </div>
-  <button after class="btn btn-danger delete-button" [disabled]="!(canDelete$ | async)" (click)="delete()">
+  <button after class="btn btn-danger delete-button" [dsDisabled]="!(canDelete$ | async)" (click)="delete()">
     <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
   </button>
 </ds-form>
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 77a81a8daa..54022bfa7b 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
@@ -40,7 +40,7 @@
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
         <div after *ngIf="groupBeingEdited != null" class="btn-group">
-          <button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
+          <button class="btn btn-danger delete-button" [dsDisabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
                   (click)="delete()">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
           </button>
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 cc9bf34d64..4465be09c4 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
@@ -71,7 +71,7 @@
             <div class="btn-group edit-field">
               <button *ngIf="ePerson.memberOfGroup"
                       (click)="deleteMemberFromGroup(ePerson)"
-                      [disabled]="actionConfig.remove.disabled"
+                      [dsDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
@@ -79,7 +79,7 @@
 
               <button *ngIf="!ePerson.memberOfGroup"
                       (click)="addMemberToGroup(ePerson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
@@ -135,14 +135,14 @@
             <div class="btn-group edit-field">
               <button *ngIf="ePerson.memberOfGroup"
                       (click)="deleteMemberFromGroup(ePerson)"
-                      [disabled]="actionConfig.remove.disabled"
+                      [dsDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
               <button *ngIf="!ePerson.memberOfGroup"
                       (click)="addMemberToGroup(ePerson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(ePerson.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 828aadc95a..d9953746b7 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -70,7 +70,7 @@
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
-                      [disabled]="true"
+                      [dsDisabled]="true"
                       class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ba54bbabd5..ef64d0e3f0 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                       <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 4d7b3e657e..4e522e3b51 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="!(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="!(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="!(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index d7b0d0c475..3553edf707 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+                [dsDisabled]="!(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>
@@ -12,7 +12,7 @@
             <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() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsDisabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                        [disabled]="!(hasChanges() | async)"
+                        [dsDisabled]="!(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>
@@ -56,7 +56,7 @@
                     <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() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsDisabled]="!(hasChanges() | async) || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 6bb8460bc9..0a1df5e2e7 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
                             <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
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 525b42610b..fc8589e9b0 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
@@ -22,31 +22,31 @@
           <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()">
+                  [dsDisabled]="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)">
+                  [dsDisabled]="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()">
+                  [dsDisabled]="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()">
+                  [dsDisabled]="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}" [disabled]="disabled"
+              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="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>
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 24c3dc5cd7..2fb050a307 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,23 +1,23 @@
 <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)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsDisabled]="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)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsDisabled]="(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)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsDisabled]="!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)"
+            [dsDisabled]="!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>
@@ -72,17 +72,17 @@
   </div>
   <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)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsDisabled]="(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)"
+      <button class="btn btn-primary" [dsDisabled]="!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)"
+              [dsDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()"><i class="fas fa-times"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
     </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 5fb0006279..785b5c13ec 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -28,7 +28,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [disabled]="isInValid"
+                    [dsDisabled]="isInValid"
                     class="btn btn-default btn-primary"
                     (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
         </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 2ab0005c69..4b93d631b7 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -7,7 +7,7 @@
 
     <div class="d-flex mt-4">
       <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [disabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 02745f2580..1b74b398f8 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -36,7 +36,7 @@
         </div>
         <div class="row py-2">
           <div class="control-group col-sm-12 text-right">
-            <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+            <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
           </div>
         </div>
       </fieldset>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 1fae737fdb..de30495ce1 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -79,7 +79,7 @@
             </a>
 
             <button
-                    [disabled]="requestCopyForm.invalid"
+                    [dsDisabled]="requestCopyForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
         </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..c921acd27f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -10,13 +10,13 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+    <button class="btn btn-primary" [dsDisabled]="!(hasChanges() | async) || submitting"
             (click)="submit()"><i
             class="fas fa-save"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
     </button>
     <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-            [disabled]="!(hasChanges() | async) || submitting"
+            [dsDisabled]="!(hasChanges() | async) || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -53,13 +53,13 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async) || submitting"
+      <button class="btn btn-primary" [dsDisabled]="!(hasChanges() | async) || submitting"
               (click)="submit()"><i
         class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
       </button>
       <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async) || submitting"
+              [dsDisabled]="!(hasChanges() | async) || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 0f0fad2199..07b7451fd3 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -35,12 +35,12 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
+        <button [dsDisabled]="!canRemove()" (click)="remove()"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
+        <button [dsDisabled]="!canUndo()" (click)="undo()"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
           <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 589aac655f..bcc5057d7d 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -36,7 +36,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary" [disabled]="!canMove" (click)="moveToCollection()">
+              <button class="btn btn-primary" [dsDisabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
@@ -44,7 +44,7 @@
                 <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
               </span>
               </button>
-              <button class="btn btn-danger" [disabled]="!canSubmit" (click)="discard()">
+              <button class="btn btn-danger" [dsDisabled]="!canSubmit" (click)="discard()">
                 <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
               </button>
             </div>
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 85c6a2cca1..88acec3171 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" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsDisabled]="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" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsDisabled]="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/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 7cdc903f24..f78f22fd68 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h5>
     {{getRelationshipMessageKey() | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index e65cd237a3..169a171d3f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -9,12 +9,12 @@
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
-      <button [disabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+      <button [dsDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               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()" (click)="undo()"
+      <button [dsDisabled]="!canUndo()" (click)="undo()"
               class="btn btn-outline-warning btn-sm"
               title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
         <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index c1505deb58..d7834cd55a 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -3,7 +3,7 @@
     <ng-container *ngIf="entityType">
       <div class="button-row top d-flex space-children-mr">
         <button class="btn btn-danger ml-auto" *ngIf="!(isReinstatable() | async)"
-                [disabled]="!(hasChanges() | async)"
+                [dsDisabled]="!(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>
@@ -13,7 +13,7 @@
           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)"
+        <button class="btn btn-primary" [dsDisabled]="!(hasChanges() | async)"
                 (click)="submit()"><i
           class="fas fa-save"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -37,7 +37,7 @@
       <div class="button-row bottom">
         <div class="float-right space-children-mr ml-gap">
           <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-                  [disabled]="!(hasChanges() | async)"
+                  [dsDisabled]="!(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>
@@ -47,7 +47,7 @@
             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)"
+          <button class="btn btn-primary" [dsDisabled]="!(hasChanges() | async)"
                   (click)="submit()"><i
             class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
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 3217680815..46c6947868 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
@@ -19,7 +19,7 @@
 <div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
-    [disabled]="currentIndex === 0"
+    [dsDisabled]="currentIndex === 0"
     (click)="prevMedia()"
   >
     {{ "media-viewer.previous" | translate }}
@@ -27,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [disabled]="currentIndex === medias.length - 1"
+    [dsDisabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index e57ce33008..01f5d8f35c 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [disabled]="(unlinkProcessing | async)">
+                [dsDisabled]="(unlinkProcessing | async)">
           <span *ngIf="!(unlinkProcessing | async)"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..b1291f5b71 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -64,7 +64,7 @@
                       <!--CREATE-->
                       <ng-container *ngIf="canCreateVersion$ | async">
                         <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                                [disabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
+                                [dsDisabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
                                 (click)="createNewVersion(version)"
                                 title="{{createVersionTitle$ | async | translate }}">
                           <i class="fas fa-code-branch fa-fw"></i>
@@ -74,7 +74,7 @@
                       <ng-container *ngIf="canDeleteVersion$(version) | async">
                         <button class="btn btn-sm version-row-element-delete"
                                 [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                                [disabled]="isAnyBeingEdited()"
+                                [dsDisabled]="isAnyBeingEdited()"
                                 (click)="deleteVersion(version, version.id==itemVersion.id)"
                                 title="{{'item.version.history.table.action.deleteVersion' | translate}}">
                           <i class="fas fa-trash fa-fw"></i>
@@ -117,7 +117,7 @@
                 <ng-container *ngIf="canEditVersion$(version) | async">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
-                          [disabled]="isAnyBeingEdited()"
+                          [dsDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7db6db9a8d..5ccf91e33d 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,5 +1,5 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" [disabled]="!(initialized$|async)"
+    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" [dsDisabled]="!(initialized$|async)"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -9,7 +9,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="!(initialized$|async)"
+            type="button" [dsDisabled]="!(initialized$|async)"
             attr.aria-label="{{'mydspace.new-submission-external' | translate}}"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 84d0649277..4c28c4fa10 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,5 +1,5 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" [dsDisabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -7,7 +7,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="!(initialized$|async)"
+            type="button"  [dsDisabled]="!(initialized$|async)"
             attr.aria-label="{{'mydspace.new-submission' | translate}}"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 5bf5fee79f..fa06952eff 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -76,10 +76,10 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [disabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary mr-2" [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
-                        [disabled]="processBulkDeleteService.isProcessing$() |async"
+                        [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
                 </button>
             </div>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a5bbb38d02..a118cd680d 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -29,7 +29,7 @@
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [disabled]="!checked">
+    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 2d959c1dfe..aa2b81f057 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -13,7 +13,7 @@
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
   <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [disabled]="(isProcessingCreate() | async)"
+          [dsDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
@@ -23,10 +23,10 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [disabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary mr-2" [dsDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [disabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+    <button class="btn btn-danger" [dsDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index ed79b1d2d1..5ee3588a45 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="!((googleRecaptchaService.captchaVersion() | async) === 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
-      <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [disabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..dbdb006785 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -81,7 +81,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [disabled]="isInValidPassword || userInfoForm.invalid"
+                    [dsDisabled]="isInValidPassword || userInfoForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 70146ab52c..7abfda5472 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
+            [dsDisabled]="!message || message.length === 0 || !subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index cd56904bd7..bbb656e916 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [disabled]="ngForm.disabled"
+            [dsDisabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -92,7 +92,7 @@
         <div class="input-group">
 
           <button type="button" class="btn btn-outline-danger"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -102,7 +102,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
+          [dsDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index a5173d10d7..7bd15573d6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -29,7 +29,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -38,7 +38,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -82,7 +82,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -91,7 +91,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -99,7 +99,7 @@
 
                   <button
                     *ngIf="itemRD"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -119,7 +119,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -128,7 +128,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
@@ -157,7 +157,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 5a15155d4f..f5e8c9a334 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -13,7 +13,7 @@
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
-            [disabled]="disabled"
+            [dsDisabled]="disabled"
             ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index cb725e7d70..458e1a76fc 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 16fda1caa8..823abfa92a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -4,12 +4,12 @@
     <a *ngIf="!section.model.disabled" class="d-flex flex-row flex-nowrap"
        [routerLink]="itemModel.link"
        href="javascript:void(0);">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
     </a>
     <div *ngIf="section.model.disabled" class="d-flex flex-row flex-nowrap">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
     </div>
@@ -18,7 +18,7 @@
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [title]="itemModel.text | translate"
      [ngbTooltip]="itemModel.text | translate">
-    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw"></i>
     </button>
diff --git a/src/app/shared/dso-page/dso-page.module.ts b/src/app/shared/dso-page/dso-page.module.ts
index d700b34e77..568de5beae 100644
--- a/src/app/shared/dso-page/dso-page.module.ts
+++ b/src/app/shared/dso-page/dso-page.module.ts
@@ -10,6 +10,7 @@ import {
   DsoEditMenuExpandableSectionComponent
 } from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
 import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {SharedModule} from '../shared.module';
 
 const COMPONENTS = [
   DsoEditMenuComponent,
@@ -26,6 +27,7 @@ const MODULES = [
   CommonModule,
   NgbTooltipModule,
   NgbDropdownModule,
+  SharedModule
 ];
 const PROVIDERS = [
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 9e1f1d48aa..14409fb592 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -31,7 +31,7 @@
     <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
       <select
         #language="ngModel"
-        [disabled]="model.readOnly"
+        [dsDisabled]="model.readOnly"
         [(ngModel)]="model.language"
         class="form-control"
         (blur)="onBlur($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 656c350dbb..088cd6efbb 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -29,7 +29,7 @@
                 type="button"
                 [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
-                [disabled]="model.disabled"
+                [dsDisabled]="model.disabled"
                 (click)="datepicker.toggle()">
 
             <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 1046dd6b2d..b1b3ef46da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -6,7 +6,7 @@
     <ds-number-picker
       tabindex="1"
       [id]="model.id + '_year'"
-      [disabled]="model.disabled"
+      [dsDisabled]="model.disabled"
       [min]="minYear"
       [max]="maxYear"
       [name]="'year'"
@@ -30,7 +30,7 @@
       [(ngModel)]="initialMonth"
       [value]="month"
       [placeholder]="monthPlaceholder"
-      [disabled]="!year || model.disabled"
+      [dsDisabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -46,7 +46,7 @@
       [(ngModel)]="initialDay"
       [value]="day"
       [placeholder]="dayPlaceholder"
-      [disabled]="!month || model.disabled"
+      [dsDisabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index 5b58352214..c7b9441da8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -6,7 +6,7 @@
                  [id]="id"
                  [name]="model.name"
                  [value]="modelValuesString"
-                 [disabled]="model.disabled"
+                 [dsDisabled]="model.disabled"
                  [type]="model.inputType"
                  [placeholder]="model.placeholder | translate"
                  [readonly]="model.readOnly">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c624c46d2d..bb990b36f0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -18,7 +18,7 @@
              [name]="model.name"
              [type]="model.inputType"
              [(ngModel)]="firstInputValue"
-             [disabled]="isInputDisabled()"
+             [dsDisabled]="isInputDisabled()"
              [placeholder]="model.placeholder | translate"
              [readonly]="model.readOnly"
              (change)="onChange($event)"
@@ -38,7 +38,7 @@
               [name]="model.name + '_2'"
               [type]="model.inputType"
               [(ngModel)]="secondInputValue"
-              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
+              [dsDisabled]="firstInputValue.length === 0 || isInputDisabled()"
               [placeholder]="model.secondPlaceholder | translate"
               [readonly]="model.readOnly"
               (change)="onChange($event)"
@@ -52,7 +52,7 @@
               type="button"
               ngbTooltip="{{'form.search-help' | translate}}"
               placement="top"
-              [disabled]="model.readOnly || isSearchDisabled()"
+              [dsDisabled]="model.readOnly || isSearchDisabled()"
               [hidden]="isInputDisabled()"
               (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
@@ -60,7 +60,7 @@
               type="button"
               ngbTooltip="{{'form.clear-help' | translate}}"
               placement="top"
-              [disabled]="model.readOnly"
+              [dsDisabled]="model.readOnly"
               (click)="remove()">{{'form.clear' | translate}}
       </button>
     </div>
@@ -69,14 +69,14 @@
               type="button"
               ngbTooltip="{{'form.edit-help' | translate}}"
               placement="top"
-              [disabled]="isEditDisabled()"
+              [dsDisabled]="isEditDisabled()"
               (click)="switchEditMode()">{{'form.edit' | translate}}
       </button>
       <button *ngIf="editMode" class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.save-help' | translate}}"
               placement="top"
-              [disabled]="!hasEmptyValue()"
+              [dsDisabled]="!hasEmptyValue()"
               (click)="saveChanges()">{{'form.save' | translate}}
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 3c19ecda13..0c36c777ed 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -39,7 +39,7 @@
          [ngbTypeahead]="search"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
-         [disabled]="model.readOnly"
+         [dsDisabled]="model.readOnly"
          [resultTemplate]="rt"
          [type]="model.inputType"
          [(ngModel)]="currentValue"
@@ -64,7 +64,7 @@
          [name]="model.name"
          [placeholder]="model.placeholder"
          [readonly]="true"
-         [disabled]="model.readOnly"
+         [dsDisabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
          (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 05f443aad5..92c68fd9b9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -32,21 +32,21 @@
 
         <button type="button"
                 class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
+                [dsDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
           <i class="fas fa-save text-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [disabled]="!editMode"
+                [dsDisabled]="!editMode"
                 (click)="delete()">
           <i class="fas fa-trash text-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
+                [dsDisabled]="isMandatoryFieldEmpty()"
                 (click)="clear()">
           <i class="fas fa-undo fa-2x"
              aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 6e2d29b789..b2ead4a4b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -17,7 +17,7 @@
            [id]="id"
            [name]="model.name"
            [readonly]="true"
-           [disabled]="model.readOnly"
+           [dsDisabled]="model.readOnly"
            [type]="model.inputType"
            [value]="(currentValue | async)"
            (blur)="onBlur($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index b72a8722ae..ca8bda8782 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [disabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -71,18 +71,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [disabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+              [dsDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+            [dsDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
                               aria-hidden="true"></span>
diff --git a/src/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.html b/src/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.html
index 44f21fb4b4..6a39c49c67 100644
--- a/src/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.html
+++ b/src/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.html
@@ -49,6 +49,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 1b27c9d308..21a0dfcebb 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="!(isValid() | async)"><i class="fas fa-save"></i> {{submitLabel | translate}}
+                    [dsDisabled]="!(isValid() | async)"><i class="fas fa-save"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
         </div>
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 9b2ef98925..6c571e8fb3 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -3,7 +3,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
       <span class="sr-only">Increment</span>
@@ -21,7 +21,7 @@
       (change)="update($event); $event.stopPropagation();"
       (focus)="onFocus($event); $event.stopPropagation();"
       [readonly]="disabled"
-      [disabled]="disabled"
+      [dsDisabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
     >
@@ -29,7 +29,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
       <span class="sr-only">Decrement</span>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index fb7d162008..2e65458852 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -4,7 +4,7 @@
     <div class="input-group">
       <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsDisabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
@@ -32,7 +32,7 @@
                  container="body"
           >
             <input class="mr-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
+                   [dsDisabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
@@ -41,7 +41,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
+                  [dsDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
@@ -65,7 +65,7 @@
                 [openDelay]="500"
                 container="body">
             <input class="mr-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
+                   [dsDisabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
@@ -74,7 +74,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
+                  [dsDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index c1f1016cb8..4ce75aeeaf 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -26,5 +26,5 @@
        @fadeOut>{{ (message | async) | translate }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [disabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+          [dsDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index 7944d24d96..e4f52cf361 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-success'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [disabled]="processing$ | async"
+        [dsDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 38ed36c0f1..77532a28f2 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,5 +1,5 @@
 <button (click)="submitTask()"
-        [disabled]="processing$ | async"
+        [dsDisabled]="processing$ | async"
         class="declineTaskAction btn btn-warning"
         ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
         type="button">
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 0cb2871bf5..435fa119c3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,7 +1,7 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
         [ngbTooltip]="rejectTipContent"
-        [disabled]="processing$ | async"
+        [dsDisabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
@@ -28,7 +28,7 @@
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
               class="btn btn-danger btn-lg btn-block mt-3"
-              [disabled]="!rejectForm.valid || (processing$ | async)"
+              [dsDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
         <span *ngIf="!(processing$ | async)">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 66f8e2a058..a6da62a294 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-secondary'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [disabled]="processing$ | async"
+        [dsDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 9d63a42d03..fdad9cb243 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,5 +1,5 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [disabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsDisabled]="(processing$ | async)"
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9b87f69c04..d28b4458b8 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -35,7 +35,7 @@
     </button>
     <button class="btn collection-confirm"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 7f8ff943a3..e92b6f88ed 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -19,7 +19,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let item of itemsRD?.payload?.page">
-          <td><input [disabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+          <td><input [dsDisabled]="!(canSelect(item) | async)" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(item.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
@@ -43,7 +43,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 7d90c6a439..6d760be10f 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -25,7 +25,7 @@
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
       <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
-                      [disabled]="paginationOptions.disabled"
+                      [dsDisabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
                       [maxSize]="(isXs)?5:paginationOptions.maxSize"
                       [page]="(currentPage$|async)"
@@ -39,12 +39,12 @@
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
-                [disabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+                [dsDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
-              [disabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              [dsDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 66c1fc400e..14d7c776dd 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [disabled]="(isProcessing | async)"
+                  [dsDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  [dsDisabled]="!(isFormValid() | async) || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 277f6e4998..d948c22485 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [dsDisabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [disabled]="(isProcessingDelete() | async)"
+                      [dsDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus'></i>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 287175bfa1..8b1b74891a 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -34,7 +34,7 @@
             (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
+    <button type="submit" class="btn btn-success" [dsDisabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 155304154b..10c91e06de 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -21,7 +21,7 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [disabled]="!dso"
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsDisabled]="!dso"
             [title]="'subscriptions.table.edit' | translate"
             class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 88dc5926e4..8c88f98dec 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -35,7 +35,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index a78d737640..d57416f37f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
+            [dsDisabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index e898e1c220..f7e8bae792 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              [dsDisabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 939f23209a..5c7d11695a 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -5,7 +5,7 @@
      [ngClass]="{'w-100': windowService.isXs()}">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [disabled]="!(hasSections$ | async)"
+          [dsDisabled]="!(hasSections$ | async)"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 535395e534..6e2dff5104 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -20,6 +20,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </div>
     </div>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):('submission.import-external.search.button' | translate)" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0796da5a64..2ebc519fba 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,6 +1,6 @@
 <div class="mb-4 ccLicense-select">
   <ds-select
-    [disabled]="!submissionCcLicenses">
+    [dsDisabled]="!submissionCcLicenses">
 
     <ng-container class="selection">
       <span *ngIf="!submissionCcLicenses">
@@ -81,7 +81,7 @@
 
     </ng-template>
 
-    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+    <ds-select *ngIf="field.enums?.length > 5" [dsDisabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
       <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
         <span *ngIf="option">
           {{ option.label }}
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 2baa6c1555..1ce811ce66 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,7 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsDisabled]="isSaving">
       <span aria-hidden="true">×</span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 8999853d72..f6f7c753da 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -22,7 +22,7 @@
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [disabled]="(processingDelete$ | async)"
+                  [dsDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
             <i *ngIf="!(processingDelete$ | async)" class="fa fa-trash fa-2x text-danger"></i>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 169081e277..10434b9472 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -105,7 +105,7 @@
         <button (click)="back()"
                 class="btn btn-outline-secondary"><i
                 class="fas fa-arrow-left"></i> {{'system-wide-alert.form.cancel' | translate}}</button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid"
+        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid"
                 (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate}}
         </button>

From 4527349dcf85d4d0211a4064efd55350ffcc502b Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 23 Aug 2024 16:24:30 +0200
Subject: [PATCH 0361/1286] 117544: alter specs to match new logic

---
 .../epeople-registry.component.spec.ts        |  6 ++-
 .../eperson-form.component.spec.ts            | 12 ++++--
 .../groups-registry.component.spec.ts         | 12 ++++--
 ...llection-source-controls.component.spec.ts | 18 +++++----
 .../dso-edit-metadata-value.component.spec.ts | 12 +++++-
 .../dso-edit-metadata.component.spec.ts       | 11 ++++-
 .../end-user-agreement.component.spec.ts      |  6 ++-
 .../feedback-form.component.spec.ts           |  9 +++--
 .../item-operation.component.spec.ts          |  6 ++-
 .../edit-relationship-list.component.spec.ts  |  3 +-
 .../versions/item-versions.component.spec.ts  | 12 ++++--
 src/app/shared/disabled-directive.ts          |  2 +-
 .../dynamic-disabled.component.spec.ts        |  2 +-
 .../lookup/dynamic-lookup.component.spec.ts   | 40 +++++++++++++------
 ...ic-lookup-relation-modal.component.spec.ts | 18 ++++++---
 .../item-select/item-select.component.spec.ts |  6 ++-
 .../resource-policy-form.component.spec.ts    | 10 +++--
 ...bmission-form-collection.component.spec.ts |  7 +++-
 .../submission-form-footer.component.spec.ts  | 14 +++++--
 19 files changed, 141 insertions(+), 65 deletions(-)

diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 4a09913862..7eadea9256 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -27,6 +27,7 @@ import { RequestService } from '../../core/data/request.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -131,7 +132,7 @@ describe('EPeopleRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [EPeopleRegistryComponent],
+      declarations: [EPeopleRegistryComponent, DisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
@@ -269,7 +270,8 @@ describe('EPeopleRegistryComponent', () => {
     it('should be disabled', () => {
       ePeopleDeleteButton = fixture.debugElement.queryAll(By.css('#epeople tr td div button.delete-button'));
       ePeopleDeleteButton.forEach((deleteButton: DebugElement) => {
-        expect(deleteButton.nativeElement.disabled).toBe(true);
+        expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(deleteButton.nativeElement.classList.contains('disabled')).toBeTrue();
       });
     });
   });
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index fb911e709c..8b0077bb46 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -31,6 +31,7 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -191,7 +192,7 @@ describe('EPersonFormComponent', () => {
           }
         }),
       ],
-      declarations: [EPersonFormComponent],
+      declarations: [EPersonFormComponent, DisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
@@ -493,14 +494,16 @@ describe('EPersonFormComponent', () => {
 
     it('the delete button should be active if the eperson can be deleted', () => {
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('the delete button should be disabled if the eperson cannot be deleted', () => {
       component.canDelete$ = observableOf(false);
       fixture.detectChanges();
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(true);
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(deleteButton.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
     it('should call the epersonFormComponent delete when clicked on the button', () => {
@@ -515,7 +518,8 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
       expect(component.epersonService.deleteEPerson).toHaveBeenCalledWith(eperson);
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 635ba727c2..f9fd91d6cc 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -34,6 +34,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
+import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -171,7 +172,7 @@ describe('GroupsRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [GroupsRegistryComponent],
+      declarations: [GroupsRegistryComponent, DisabledDirective],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
@@ -231,7 +232,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
 
@@ -265,7 +267,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
     });
@@ -284,7 +287,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeTrue();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBe('true');
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeTrue();
         });
       });
     });
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 3eb83ebe8a..245fbe4d58 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,6 +22,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import {DisabledDirective} from '../../../../shared/disabled-directive';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
@@ -100,7 +101,7 @@ describe('CollectionSourceControlsComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
-      declarations: [CollectionSourceControlsComponent, VarDirective],
+      declarations: [CollectionSourceControlsComponent, VarDirective, DisabledDirective],
       providers: [
         {provide: ScriptDataService, useValue: scriptDataService},
         {provide: ProcessDataService, useValue: processDataService},
@@ -189,9 +190,11 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeTrue();
-      expect(buttons[1].nativeElement.disabled).toBeTrue();
-      expect(buttons[2].nativeElement.disabled).toBeTrue();
+      buttons.forEach(button => {
+        console.log(button.nativeElement);
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+      });
     });
     it('should be enabled when isEnabled is true', () => {
       comp.shouldShow = true;
@@ -201,9 +204,10 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeFalse();
-      expect(buttons[1].nativeElement.disabled).toBeFalse();
-      expect(buttons[2].nativeElement.disabled).toBeFalse();
+      buttons.forEach(button => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+      });
     });
     it('should call the corresponding button when clicked', () => {
       spyOn(comp, 'testConfiguration');
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 67a6f98ac0..12adbaa13c 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
@@ -11,6 +11,7 @@ import { ItemMetadataRepresentation } from '../../../core/shared/metadata-repres
 import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
 import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { By } from '@angular/platform-browser';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -49,7 +50,7 @@ describe('DsoEditMetadataValueComponent', () => {
     initServices();
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataValueComponent, VarDirective],
+      declarations: [DsoEditMetadataValueComponent, VarDirective, DisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
@@ -158,7 +159,14 @@ describe('DsoEditMetadataValueComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            // Can be null or false, depending on if button was ever disabled so just check not true
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
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 7067c44fbb..3a431705c3 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
@@ -16,6 +16,7 @@ import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorato
 import { Operation } from 'fast-json-patch';
 import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/internal/Observable';
+import {DisabledDirective} from '../../shared/disabled-directive';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -71,7 +72,7 @@ describe('DsoEditMetadataComponent', () => {
     notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataComponent, VarDirective],
+      declarations: [DsoEditMetadataComponent, VarDirective, DisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         TestDataService,
@@ -180,7 +181,13 @@ describe('DsoEditMetadataComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index dc4f4cf412..153fe4a51f 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -11,6 +11,7 @@ import { Store } from '@ngrx/store';
 import { By } from '@angular/platform-browser';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
@@ -49,7 +50,7 @@ describe('EndUserAgreementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [EndUserAgreementComponent],
+      declarations: [EndUserAgreementComponent, DisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
@@ -81,7 +82,8 @@ describe('EndUserAgreementComponent', () => {
 
     it('should disable the save button', () => {
       const button = fixture.debugElement.query(By.css('#button-save')).nativeElement;
-      expect(button.disabled).toBeTruthy();
+      expect(button.getAttribute('aria-disabled')).toBe('true');
+      expect(button.classList.contains('disabled')).toBeTrue();
     });
   });
 
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index c3d38a2876..0507b7173b 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,6 +18,7 @@ import { Router } from '@angular/router';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NativeWindowService } from '../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 
 describe('FeedbackFormComponent', () => {
@@ -38,7 +39,7 @@ describe('FeedbackFormComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [FeedbackFormComponent],
+      declarations: [FeedbackFormComponent, DisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
@@ -72,7 +73,8 @@ describe('FeedbackFormComponent', () => {
   });
 
   it('should have disabled button', () => {
-    expect(de.query(By.css('button')).nativeElement.disabled).toBeTrue();
+    expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeTrue();
   });
 
   describe('when message is inserted', () => {
@@ -83,7 +85,8 @@ describe('FeedbackFormComponent', () => {
     });
 
     it('should not have disabled button', () => {
-      expect(de.query(By.css('button')).nativeElement.disabled).toBeFalse();
+      expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('on submit should call createFeedback of feedbackDataServiceStub service', () => {
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 7570119b3a..8c2774ad6c 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -4,6 +4,7 @@ import { ItemOperationComponent } from './item-operation.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
@@ -14,7 +15,7 @@ describe('ItemOperationComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
-      declarations: [ItemOperationComponent]
+      declarations: [ItemOperationComponent, DisabledDirective]
     }).compileComponents();
   }));
 
@@ -40,7 +41,8 @@ describe('ItemOperationComponent', () => {
     const span = fixture.debugElement.query(By.css('.action-label span')).nativeElement;
     expect(span.textContent).toContain('item.edit.tabs.status.buttons.key1.label');
     const button = fixture.debugElement.query(By.css('button')).nativeElement;
-    expect(button.disabled).toBeTrue();
+    expect(button.getAttribute('aria-disabled')).toBe('true');
+    expect(button.classList.contains('disabled')).toBeTrue();
     expect(button.textContent).toContain('item.edit.tabs.status.buttons.key1.button');
   });
 });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 4cd663f0fb..6e44dd1a58 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -335,7 +335,8 @@ describe('EditRelationshipListComponent', () => {
         comp.hasChanges = observableOf(true);
         fixture.detectChanges();
         const element = de.query(By.css('.btn-success'));
-        expect(element.nativeElement?.disabled).toBeTrue();
+        expect(element.nativeElement?.getAttribute('aria-disabled')).toBe('true');
+        expect(element.nativeElement?.classList.contains('disabled')).toBeTrue();
       });
     });
 
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index e46f1585d7..0d04ea12db 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -29,6 +29,7 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser
 import { Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ItemSharedModule } from '../item-shared.module';
+import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -136,7 +137,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      declarations: [ItemVersionsComponent, VarDirective],
+      declarations: [ItemVersionsComponent, VarDirective, DisabledDirective],
       imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
         {provide: PaginationService, useValue: new PaginationServiceStub()},
@@ -222,17 +223,20 @@ describe('ItemVersionsComponent', () => {
     it('should not disable the delete button', () => {
       const deleteButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-delete`));
       deleteButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(false);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
       });
     });
     it('should disable other buttons', () => {
       const createButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
       createButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
       });
       const editButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
       editButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
       });
     });
   });
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 8d1380917f..38f92cd1d7 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -6,7 +6,7 @@ import { Directive, Input, HostBinding, HostListener } from '@angular/core';
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
-        this.isDisabled = value;
+        this.isDisabled = !!value;
     }
 
     @HostBinding('attr.aria-disabled') isDisabled = false;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index a25ad4d231..e0ea6af31f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -63,7 +63,7 @@ describe('DsDynamicDisabledComponent', () => {
     expect(comp).toBeTruthy();
   });
 
-  it('should have a disabled input', () => {
+  xit('should have a disabled input', () => {
     const input = de.query(By.css('input'));
     expect(input.nativeElement.getAttribute('disabled')).toEqual('');
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2fea4fc985..2fb6488e93 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -26,6 +26,7 @@ import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService
 } from '../../../../../testing/dynamic-form-mock-services';
+import {DisabledDirective} from '../../../../../disabled-directive';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
@@ -153,7 +154,8 @@ describe('Dynamic Lookup component', () => {
         DsDynamicLookupComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
-        ObjNgFor
+        ObjNgFor,
+        DisabledDirective
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
@@ -235,8 +237,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const editBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -334,8 +338,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -375,8 +381,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -407,8 +415,10 @@ describe('Dynamic Lookup component', () => {
           const editBtnEl = deBtn[1].nativeElement;
 
           expect(de.length).toBe(2);
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -504,8 +514,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -547,8 +559,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 9d57296f82..0cfde15c6f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -24,6 +24,7 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
+import {DisabledDirective} from '../../../../disabled-directive';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -103,7 +104,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      declarations: [DsDynamicLookupRelationModalComponent],
+      declarations: [DsDynamicLookupRelationModalComponent, DisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
       providers: [
         {
@@ -202,10 +203,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
   describe('when initialized and is relationship show the list of buttons', () => {
     it('submit button should be disabled', () => {
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
     it('discard button should be disabled', () => {
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
   });
 
@@ -243,9 +246,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
     it('there should show 1 spinner and disable all 3 buttons', () => {
       expect(debugElement.queryAll(By.css('.spinner-border')).length).toEqual(1);
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.close')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.close')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.close')).nativeElement?.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 5131060cb2..fd09860a1e 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -24,6 +24,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import {DisabledDirective} from '../../disabled-directive';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -98,7 +99,7 @@ describe('ItemSelectComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])],
-      declarations: [],
+      declarations: [DisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
@@ -191,7 +192,8 @@ describe('ItemSelectComponent', () => {
       fixture.whenStable().then(() => {
         const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
         expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-        expect(checkbox.disabled).toBeTrue();
+        expect(checkbox.getAttribute('aria-disabled')).toBe('true');
+        expect(checkbox.classList.contains('disabled')).toBe(true);
       });
     }));
   });
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 1cc908cc6d..5a0e08a496 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -39,6 +39,7 @@ import { PaginationServiceStub } from '../../testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreMock } from '../../testing/store.mock';
+import {DisabledDirective} from '../../disabled-directive';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -189,7 +190,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
         FormComponent,
         EpersonGroupListComponent,
         ResourcePolicyFormComponent,
-        TestComponent
+        TestComponent,
+        DisabledDirective
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -389,7 +391,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should emit submit event', () => {
@@ -443,7 +446,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeTruthy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index c76de83b83..4cb40e2293 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -25,6 +25,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -135,7 +136,8 @@ describe('SubmissionFormCollectionComponent Component', () => {
       ],
       declarations: [
         SubmissionFormCollectionComponent,
-        TestComponent
+        TestComponent,
+        DisabledDirective
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
@@ -255,7 +257,8 @@ describe('SubmissionFormCollectionComponent Component', () => {
       it('the dropdown button should be disabled when isReadonly is true', () => {
         comp.isReadonly = true;
         fixture.detectChanges();
-        expect(dropdowBtn.nativeNode.attributes.disabled).toBeDefined();
+        expect(dropdowBtn.nativeNode.getAttribute('aria-disabled')).toBe('true');
+        expect(dropdowBtn.nativeNode.classList.contains('disabled')).toBeTrue();
       });
 
       it('should be simulated when the drop-down menu is closed', () => {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index dd28f9a10a..9071805514 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -16,6 +16,7 @@ import { SubmissionFormFooterComponent } from './submission-form-footer.componen
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -39,6 +40,7 @@ describe('SubmissionFormFooterComponent', () => {
         SubmissionFormFooterComponent,
         TestComponent,
         BrowserOnlyMockPipe,
+        DisabledDirective
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
@@ -215,7 +217,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should not have deposit button disabled when submission is valid', () => {
@@ -224,7 +227,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should disable save button when all modifications had been saved', () => {
@@ -232,7 +236,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeTruthy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
     it('should enable save button when there are not saved modifications', () => {
@@ -240,7 +245,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeFalsy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
   });

From 2d48cc0f6946f8310f5db28739224576b643f11d Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 26 Aug 2024 10:35:19 +0200
Subject: [PATCH 0362/1286] 117544: add spec for directive

---
 src/app/shared/disabled-directive.spec.ts | 89 +++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 src/app/shared/disabled-directive.spec.ts

diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
new file mode 100644
index 0000000000..c4ca4f0599
--- /dev/null
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -0,0 +1,89 @@
+import { Component, DebugElement } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DisabledDirective } from './disabled-directive';
+
+@Component({
+    template: `
+    <button [dsDisabled]="isDisabled">Test Button</button>
+  `
+})
+class TestComponent {
+    isDisabled = false;
+}
+
+describe('DisabledDirective', () => {
+    let component: TestComponent;
+    let fixture: ComponentFixture<TestComponent>;
+    let button: DebugElement;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [TestComponent, DisabledDirective]
+        });
+        fixture = TestBed.createComponent(TestComponent);
+        component = fixture.componentInstance;
+        button = fixture.debugElement.query(By.css('button'));
+        fixture.detectChanges();
+    });
+
+    it('should bind aria-disabled to false initially', () => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+    });
+
+    it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+    });
+
+    it('should prevent click events when disabled', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        let clickHandled = false;
+        button.nativeElement.addEventListener('click', () => clickHandled = true);
+
+        button.nativeElement.click();
+
+        expect(clickHandled).toBeFalse();
+    });
+
+    it('should prevent Enter or Space keydown events when disabled', () => {
+        component.isDisabled = true;
+        fixture.detectChanges();
+
+        let keydownHandled = false;
+        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+        button.nativeElement.dispatchEvent(enterEvent);
+        button.nativeElement.dispatchEvent(spaceEvent);
+
+        expect(keydownHandled).toBeFalse();
+    });
+
+    it('should allow click and keydown events when not disabled', () => {
+        let clickHandled = false;
+        let keydownHandled = false;
+
+        button.nativeElement.addEventListener('click', () => clickHandled = true);
+        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+        button.nativeElement.click();
+
+        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+        button.nativeElement.dispatchEvent(enterEvent);
+        button.nativeElement.dispatchEvent(spaceEvent);
+
+        expect(clickHandled).toBeTrue();
+        expect(keydownHandled).toBeTrue();
+    });
+});

From b6df0c9a5cdfbacf0a72636844bc926fac6fc371 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 26 Aug 2024 14:08:22 +0200
Subject: [PATCH 0363/1286] 117544: port to 8.0 standard after merge

---
 .../bulk-access/bulk-access.component.ts      |   2 +
 .../epeople-registry.component.spec.ts        |   2 +-
 .../eperson-form/eperson-form.component.html  |   2 +-
 .../eperson-form.component.spec.ts            |   4 +-
 .../eperson-form/eperson-form.component.ts    |   2 +
 .../members-list/members-list.component.html  |   6 +-
 .../members-list/members-list.component.ts    |   2 +
 .../groups-registry.component.spec.ts         |   4 +-
 .../groups-registry.component.ts              |   2 +
 .../filtered-items.component.html             |   8 +-
 .../filtered-items.component.ts               |   2 +
 .../delete-collection-page.component.ts       |   2 +
 .../collection-source-controls.component.html |  12 +-
 ...llection-source-controls.component.spec.ts |   2 +-
 .../collection-source-controls.component.ts   |   2 +
 .../collection-source.component.html          |   8 +-
 .../collection-source.component.ts            |   2 +
 .../delete-community-page.component.html      |   4 +-
 .../delete-community-page.component.ts        |   2 +
 .../dso-edit-metadata-value.component.html    |  12 +-
 .../dso-edit-metadata-value.component.spec.ts |   7 +-
 .../dso-edit-metadata-value.component.ts      |   3 +-
 .../dso-edit-metadata.component.html          |  14 +-
 .../dso-edit-metadata.component.spec.ts       |   4 +-
 .../dso-edit-metadata.component.ts            |   3 +-
 .../forgot-password-form.component.ts         |   2 +
 .../end-user-agreement.component.spec.ts      |   2 +-
 .../end-user-agreement.component.ts           |   3 +-
 .../feedback-form.component.html              |   2 +-
 .../feedback-form.component.spec.ts           |   2 +-
 .../feedback-form/feedback-form.component.ts  |   3 +-
 ...bitstream-request-a-copy-page.component.ts |   2 +
 .../item-bitstreams.component.html            |   8 +-
 .../item-bitstreams.component.ts              |   2 +
 .../item-edit-bitstream.component.html        |   4 +-
 .../item-edit-bitstream.component.ts          |   2 +
 .../item-delete/item-delete.component.html    |   6 +-
 .../item-delete/item-delete.component.ts      |   2 +
 .../item-move/item-move.component.ts          |   2 +
 .../item-operation.component.spec.ts          |   2 +-
 .../item-operation.component.ts               |   2 +
 .../edit-relationship-list.component.html     |   2 +-
 .../edit-relationship-list.component.ts       |   2 +
 .../edit-relationship.component.ts            |   2 +
 .../item-relationships.component.html         |   4 +-
 .../item-relationships.component.ts           |   2 +
 .../media-viewer-video.component.ts           |   2 +
 .../orcid-auth/orcid-auth.component.html      |   2 +-
 .../orcid-auth/orcid-auth.component.ts        |   2 +
 ...ersions-row-element-version.component.html |   4 +-
 ...-versions-row-element-version.component.ts |   2 +
 .../versions/item-versions.component.html     |   2 +-
 .../versions/item-versions.component.spec.ts  |   2 +-
 .../versions/item-versions.component.ts       |   3 +-
 ...space-new-external-dropdown.component.html |   4 +-
 ...-dspace-new-external-dropdown.component.ts |   2 +
 ...ace-new-submission-dropdown.component.html |   4 +-
 ...space-new-submission-dropdown.component.ts |   2 +
 .../quality-assurance-events.component.html   |  16 +--
 .../quality-assurance-events.component.ts     |   3 +-
 .../project-entry-import-modal.component.html |   6 +-
 .../project-entry-import-modal.component.ts   |   3 +-
 .../suggestion-actions.component.html         |   2 +-
 .../suggestion-actions.component.ts           |   2 +
 .../overview/process-overview.component.ts    |   3 +-
 .../profile-claim-item-modal.component.ts     |   2 +
 .../profile-page-researcher-form.component.ts |   2 +
 .../register-email-form.component.html        |   4 +-
 .../register-email-form.component.ts          |   3 +-
 .../create-profile.component.ts               |   2 +
 .../email-request-copy.component.html         |   2 +-
 .../email-request-copy.component.ts           |   3 +-
 .../access-control-array-form.component.html  |  10 +-
 .../access-control-array-form.component.ts    |   3 +-
 ...cess-control-form-container.component.html |  16 +--
 ...access-control-form-container.component.ts |   3 +-
 src/app/shared/disabled-directive.spec.ts     | 124 ++++++++++--------
 src/app/shared/disabled-directive.ts          |  30 +++--
 .../shared/ds-select/ds-select.component.ts   |   4 +-
 ...dit-menu-expandable-section.component.html |   2 +-
 ...-edit-menu-expandable-section.component.ts |   3 +-
 .../dso-edit-menu-section.component.html      |   4 +-
 .../dso-edit-menu-section.component.ts        |   3 +-
 ...ynamic-form-control-container.component.ts |   2 +
 .../dynamic-date-picker-inline.component.ts   |   3 +
 .../date-picker/date-picker.component.ts      |   2 +
 .../disabled/dynamic-disabled.component.ts    |   2 +
 .../lookup/dynamic-lookup.component.spec.ts   |   2 +-
 .../models/lookup/dynamic-lookup.component.ts |   2 +
 .../models/onebox/dynamic-onebox.component.ts |   2 +
 .../dynamic-relation-group.components.ts      |   2 +
 .../dynamic-scrollable-dropdown.component.ts  |   2 +
 ...namic-lookup-relation-modal.component.html |   8 +-
 ...ic-lookup-relation-modal.component.spec.ts |   2 +-
 ...dynamic-lookup-relation-modal.component.ts |   2 +
 ...nal-source-entry-import-modal.component.ts |   2 +
 src/app/shared/form/form.component.html       |   4 +-
 src/app/shared/form/form.component.ts         |   2 +
 .../number-picker/number-picker.component.ts  |   2 +
 .../vocabulary-treeview.component.html        |   2 +-
 .../vocabulary-treeview.component.ts          |   2 +
 .../password/log-in-password.component.ts     |   3 +-
 .../claimed-task-actions-approve.component.ts |   3 +-
 ...med-task-actions-decline-task.component.ts |   3 +-
 .../claimed-task-actions-reject.component.ts  |   3 +-
 ...d-task-actions-return-to-pool.component.ts |   3 +-
 .../pool-task/pool-task-actions.component.ts  |   3 +-
 .../collection-select.component.html          |   2 +-
 .../collection-select.component.ts            |   3 +-
 .../item-select/item-select.component.html    |   4 +-
 .../item-select/item-select.component.spec.ts |   7 +-
 .../item-select/item-select.component.ts      |   3 +-
 .../shared/pagination/pagination.component.ts |   3 +-
 .../form/resource-policy-form.component.html  |   4 +-
 .../resource-policy-form.component.spec.ts    |   4 +-
 .../form/resource-policy-form.component.ts    |   2 +
 .../resource-policies.component.html          |   4 +-
 .../resource-policies.component.ts            |   2 +
 .../advanced-search.component.html            |   2 +-
 .../advanced-search.component.ts              |   2 +
 .../subscription-modal.component.ts           |   3 +-
 .../subscription-view.component.ts            |   3 +-
 .../upload/uploader/uploader.component.ts     |   3 +-
 .../submission-form-collection.component.html |   2 +-
 ...bmission-form-collection.component.spec.ts |   4 +-
 .../submission-form-collection.component.ts   |   2 +
 .../submission-form-footer.component.html     |   8 +-
 .../submission-form-footer.component.spec.ts  |   4 +-
 .../submission-form-footer.component.ts       |   3 +-
 ...submission-form-section-add.component.html |   2 +-
 .../submission-form-section-add.component.ts  |   3 +-
 ...n-import-external-searchbar.component.html |   2 +-
 ...ion-import-external-searchbar.component.ts |   2 +
 ...ubmission-section-cc-licenses.component.ts |   2 +
 .../section-upload-file-edit.component.ts     |   2 +
 .../file/section-upload-file.component.html   |   2 +-
 .../file/section-upload-file.component.ts     |   2 +
 .../system-wide-alert-form.component.html     |   4 +-
 .../system-wide-alert-form.component.ts       |   3 +-
 .../reviewers-list.component.ts               |   2 +
 .../dso-edit-metadata.component.ts            |   3 +-
 .../forgot-password-form.component.ts         |   2 +
 .../end-user-agreement.component.ts           |   3 +-
 .../feedback-form/feedback-form.component.ts  |   3 +-
 .../media-viewer-video.component.ts           |   2 +
 .../register-email-form.component.ts          |   3 +-
 .../create-profile.component.ts               |   2 +
 .../email-request-copy.component.ts           |   4 +-
 ...nal-source-entry-import-modal.component.ts |   2 +
 .../file/section-upload-file.component.ts     |   2 +
 150 files changed, 404 insertions(+), 242 deletions(-)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index bd8e893b59..10be65f24a 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -14,6 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
@@ -27,6 +28,7 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
     TranslateModule,
     BulkAccessSettingsComponent,
     BulkAccessBrowseComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 933224a6e9..9ce1674e23 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -42,6 +42,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
@@ -57,7 +58,6 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form/eperson-form.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index b4c0781ac7..694fe9d7c5 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [disabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 415ab4955c..0b5a6ec752 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -45,6 +45,7 @@ import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -68,7 +69,6 @@ import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -547,7 +547,7 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBeNull();
       expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 05efde7cf7..40f920f8d8 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -66,6 +66,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
@@ -92,6 +93,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
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 591d80bdd5..e531b35f9e 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
@@ -35,14 +35,14 @@
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
                       *ngIf="epersonDTO.ableToDelete"
-                      [disabled]="actionConfig.remove.disabled"
+                      [dsDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
               <button *ngIf="!epersonDTO.ableToDelete"
                       (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
@@ -122,7 +122,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 9b123ae447..9e6087be35 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -55,6 +55,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
@@ -113,6 +114,7 @@ export interface EPersonListActionConfig {
     RouterLink,
     NgClass,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 4dd380b62b..22bf2c35db 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -50,6 +50,7 @@ import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   DSONameServiceMock,
   UNDEFINED_NAME,
@@ -71,7 +72,6 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { GroupsRegistryComponent } from './groups-registry.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -209,7 +209,7 @@ describe('GroupsRegistryComponent', () => {
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot(),
         GroupsRegistryComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index dec3dc955d..73cfea2718 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -62,6 +62,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -84,6 +85,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     NgSwitchCase,
     NgbTooltipModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 4b6679bdbc..38591b0fcd 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -12,7 +12,7 @@
                         </ng-template>
                         <ng-template ngbPanelContent>
                             <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                                <option *ngFor="let item of collections" [value]="item.id" [dsDisabled]="item.disabled">{{item.name$ | async}}</option>
                             </select>
                             <div class="row">
                                 <span class="col-3"></span>
@@ -54,7 +54,7 @@
                                             <div class="col-auto">
                                                 <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
                                                 &nbsp;
-                                                <button class="btn btn-light" [disabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                                <button class="btn btn-light" [dsDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
                                             </div>
                                         </div>
                                     </div>
@@ -158,8 +158,8 @@
                                 {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
                             </div>
                             <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [disabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [disabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
 <!--
                                 <button id="export">{{'admin.reports.commons.export' | translate}}</button>
 -->
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 9fd4643573..52454f2e8e 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -42,6 +42,7 @@ import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operator
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
 import { FilteredItems } from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
@@ -63,6 +64,7 @@ import { QueryPredicate } from './query-predicate.model';
     NgIf,
     NgForOf,
     FiltersComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index dbb5f8846f..1fab715aa4 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -16,6 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -31,6 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 7edaadb0a1..cc01848290 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 83683382b9..22012263e0 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,12 +22,12 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import { Process } from '../../../../process-page/processes/process.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { CollectionSourceControlsComponent } from './collection-source-controls.component';
-import {DisabledDirective} from '../../../../shared/disabled-directive';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 3b51a8e9d9..fef7868561 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -40,6 +40,7 @@ import {
 } from '../../../../core/shared/operators';
 import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { VarDirective } from '../../../../shared/utils/var.directive';
@@ -56,6 +57,7 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 8f807c1aee..5b13401d22 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [disabled]="(hasChanges$ | async) !== true"
+                [dsDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [disabled]="(hasChanges$ | async) !== true"
+                        [dsDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 43614e43a6..96861c47a5 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -56,6 +56,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -81,6 +82,7 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index b241a7027c..49058b0ebd 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index f35e2d6bd2..59fb75fa97 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -16,6 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -31,6 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     VarDirective,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
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 25b82b9b43..450dfae98c 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
@@ -36,7 +36,7 @@
           [authorityValue]="mdValue.newValue.confidence"
           [iconMode]="true"
       ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [dsDisabled]="!editingAuthority"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
               (change)="onChangeAuthorityKey()" />
         <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
@@ -71,29 +71,29 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="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()">
+                  [dsDisabled]="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" data-test="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)">
+                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="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()">
+                  [dsDisabled]="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" data-test="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()">
+                  [dsDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="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>
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 50834126ff..dee03772f8 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
@@ -34,6 +34,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -44,7 +45,6 @@ import {
   DsoEditMetadataValue,
 } from '../dso-edit-metadata-form';
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -189,7 +189,7 @@ describe('DsoEditMetadataValueComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataValueComponent,
         VarDirective,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
@@ -462,7 +462,8 @@ describe('DsoEditMetadataValueComponent', () => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
           const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
-          expect(inputElement.disabled).toBeTruthy();
+          expect(inputElement.getAttribute('aria-disabled')).toBe('true');
+          expect(inputElement.classList.contains('disabled')).toBeTrue();
           done();
         });
       });
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 11bbcfd9d5..1076be8431 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
@@ -67,6 +67,7 @@ import {
 import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import {
@@ -94,7 +95,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective],
+  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, DisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
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 d6c72abdb9..f288b39d6e 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,23 +1,23 @@
 <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)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsDisabled]="!hasChanges || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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)"
+            [dsDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -73,19 +73,19 @@
   </div>
   <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)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
         <i class="fas fa-save" aria-hidden="true"></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)"
+              [dsDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
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 5009960fed..7f54c6eeeb 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
@@ -22,6 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TestDataService } from '../../shared/testing/test-data-service.mock';
@@ -32,7 +33,6 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers/dso
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -88,7 +88,6 @@ describe('DsoEditMetadataComponent', () => {
     ]);
 
     TestBed.configureTestingModule({
-      declarations: [DisabledDirective]
       imports: [
         CommonModule,
         BrowserModule,
@@ -96,6 +95,7 @@ describe('DsoEditMetadataComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataComponent,
         VarDirective,
+        DisabledDirective,
       ],
       providers: [
         { provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
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 677a601b9d..12d77ab24f 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
@@ -47,6 +47,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -66,7 +67,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 442e4bf9fa..ada7e66f9e 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -26,6 +26,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
@@ -39,6 +40,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index 725ff8322a..8195ce75eb 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -16,11 +16,11 @@ import { of as observableOf } from 'rxjs';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index 5c10c02432..7a02f10039 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -23,6 +23,7 @@ import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
@@ -32,7 +33,7 @@ import { EndUserAgreementContentComponent } from './end-user-agreement-content/e
   templateUrl: './end-user-agreement.component.html',
   styleUrls: ['./end-user-agreement.component.scss'],
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index a3437d1f0e..3fdc66820a 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,7 +41,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 61ef939c2d..0b1f3439f4 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,6 +18,7 @@ import { FeedbackDataService } from '../../../core/feedback/feedback-data.servic
 import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -26,7 +27,6 @@ import { EPersonMock } from '../../../shared/testing/eperson.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { FeedbackFormComponent } from './feedback-form.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 
 describe('FeedbackFormComponent', () => {
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index 59be526f17..f33ef35352 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -30,6 +30,7 @@ import {
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
@@ -38,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index e32239a577..35fd357da2 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -55,6 +55,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -71,6 +72,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     AsyncPipe,
     ReactiveFormsModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 88d984c19f..f068864b45 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [disabled]="(hasChanges$ | async) !== true || submitting"
+            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [disabled]="(hasChanges$ | async) !== true || submitting"
+              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 685ad006e0..6c734ad7c0 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -50,6 +50,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -79,6 +80,7 @@ import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag
     ItemEditBitstreamDragHandleComponent,
     NgForOf,
     ThemedLoadingComponent,
+    DisabledDirective,
   ],
   providers: [ObjectValuesPipe],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 7d52ab220f..d9a679a654 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
+        <button [dsDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
+        <button [dsDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index 81950d3321..e0b819b873 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -29,6 +29,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
 
@@ -43,6 +44,7 @@ import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
     NgbTooltipModule,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index ed6ba3eabc..eadec9babf 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [disabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [disabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 1655856a3e..4e09a0b9ea 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -56,6 +56,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -109,6 +110,7 @@ class RelationshipDTO {
     VarDirective,
     NgForOf,
     RouterLink,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 1115260901..5e2d355bba 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -37,6 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -56,6 +57,7 @@ import {
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 43287fa8d8..42765f4d74 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -6,9 +6,9 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ItemOperationComponent } from './item-operation.component';
 import { ItemOperation } from './itemOperation.model';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 9cf4b30e6c..b82fb154bf 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -7,6 +7,7 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ItemOperation } from './itemOperation.model';
 
 @Component({
@@ -17,6 +18,7 @@ import { ItemOperation } from './itemOperation.model';
     RouterLink,
     NgbTooltipModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index e32938590f..b0157cb989 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
     {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 656d608935..1bc95291c7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -65,6 +65,7 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -100,6 +101,7 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index f79d0ee0d1..95aa87a28b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -37,6 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -54,6 +55,7 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
     NgIf,
     TranslateModule,
     VirtualMetadataComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 4c8ea49f99..cced89db93 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [disabled]="(hasChanges$ | async) !== true"
+            [dsDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [disabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 7b0cc46647..359177c253 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -42,6 +42,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -67,6 +68,7 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
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 700431ff3f..bf1b58b467 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
@@ -12,6 +12,7 @@ import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { CaptionInfo } from './caption-info';
 import { languageHelper } from './language-helper';
 
@@ -27,6 +28,7 @@ import { languageHelper } from './language-helper';
     NgbDropdownModule,
     TranslateModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index b53c400385..d5aa0e2789 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [disabled]="(unlinkProcessing | async)">
+                [dsDisabled]="(unlinkProcessing | async)">
           <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 5825ecc4e4..6870d7e63e 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -33,6 +33,7 @@ import {
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
@@ -45,6 +46,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
     NgIf,
     NgForOf,
     AlertComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index a664245668..845a785168 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -31,7 +31,7 @@
         <!--CREATE-->
         <ng-container *ngIf="canCreateVersion$ | async">
           <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [disabled]="isAnyBeingEdited() || hasDraftVersion"
+                  [dsDisabled]="isAnyBeingEdited() || hasDraftVersion"
                   (click)="createNewVersion(version)"
                   title="{{createVersionTitle | translate }}">
             <i class="fas fa-code-branch fa-fw"></i>
@@ -41,7 +41,7 @@
         <ng-container *ngIf="canDeleteVersion$ | async">
           <button class="btn btn-sm version-row-element-delete"
                   [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [disabled]="isAnyBeingEdited()"
+                  [dsDisabled]="isAnyBeingEdited()"
                   (click)="deleteVersion(version, version.id === itemVersion.id)"
                   title="{{'item.version.history.table.action.deleteVersion' | translate}}">
             <i class="fas fa-trash fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 3d017c38a4..2e41819c22 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -49,6 +49,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   getItemEditVersionhistoryRoute,
@@ -67,6 +68,7 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     TranslateModule,
     NgClass,
     NgIf,
+    DisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index e9ea3bb0f9..d26b59bde3 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -63,7 +63,7 @@
                 <ng-container *ngIf="canEditVersion$(version) | async">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
-                          [disabled]="isAnyBeingEdited()"
+                          [dsDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index 836fffe7fd..030c5a898a 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -42,6 +42,7 @@ import { VersionHistory } from '../../core/shared/version-history.model';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -51,7 +52,6 @@ import { PaginationServiceStub } from '../../shared/testing/pagination-service.s
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { ItemVersionsComponent } from './item-versions.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index a4f9d9328b..34598266a5 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -51,6 +51,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasValue,
   hasValueOperator,
@@ -69,7 +70,7 @@ import { ItemVersionsRowElementVersionComponent } from './item-versions-row-elem
   templateUrl: './item-versions.component.html',
   styleUrls: ['./item-versions.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent],
+  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent, DisabledDirective],
 })
 
 /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 0157110035..7dbc440436 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="(initialized$ | async) !== true"
+            type="button" [dsDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 86960725a5..3af2f74bfe 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -27,6 +27,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
@@ -45,6 +46,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 730b1db1c7..f40041f8a6 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [disabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+            [dsDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="(initialized$ | async) !== true"
+            type="button"  [dsDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 8604c3322c..f893ac0525 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -28,6 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
@@ -47,6 +48,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 4341764d1c..fa4fc5d3da 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -138,7 +138,7 @@
                       <div class="btn-group">
                         <button *ngIf="!eventElement.hasProject"
                                 class="btn btn-outline-primary btn-sm"
-                                [disabled]="eventElement.isRunning"
+                                [dsDisabled]="eventElement.isRunning"
                                 (click)="openModalLookup(eventElement); $event.stopPropagation();"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
                         >
@@ -146,7 +146,7 @@
                         </button>
                         <button *ngIf="eventElement.hasProject"
                                 class="btn btn-outline-danger btn-sm"
-                                [disabled]="eventElement.isRunning"
+                                [dsDisabled]="eventElement.isRunning"
                                 (click)="removeProject(eventElement)"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
                         >
@@ -161,7 +161,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
                               [attr.aria-label]="'quality-assurance.event.action.import' | translate"
                       >
@@ -171,7 +171,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="executeAction('ACCEPTED', eventElement)"
                               [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
                       >
@@ -180,7 +180,7 @@
                       <button class="btn btn-outline-dark btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="openModal('DISCARDED', eventElement, ignoreModal)"
                               [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
                       >
@@ -190,7 +190,7 @@
                               *ngIf="(isAdmin$ | async)"
                               ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="openModal('REJECTED', eventElement, rejectModal)"
                               [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
                       >
@@ -200,7 +200,7 @@
                               *ngIf="(isAdmin$ | async) === false"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
@@ -210,7 +210,7 @@
                       <button class="btn btn-outline-danger btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 6276226c69..2c1e850ce4 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -65,6 +65,7 @@ import {
 } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -86,7 +87,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent],
+  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, DisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 026f863412..f6375c2e02 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -32,8 +32,8 @@
     <div id="project-search" class="input-group mb-3">
       <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
       <div class="input-group-append">
-        <button type="button" class="btn btn-outline-secondary" [disabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
-        <button type="button" class="btn btn-primary" [disabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+        <button type="button" class="btn btn-outline-secondary" [dsDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [dsDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
       </div>
     </div>
 
@@ -66,6 +66,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4b31e2316a..845a773769 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -29,6 +29,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -104,7 +105,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index 2a46191dee..e83d0a4123 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -21,7 +21,7 @@
   </div>
   <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
     {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsDisabled]="!hasEvidence" class="btn btn-info ml-2">
     <i class="fa fa-eye"></i>
     <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
     <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 36d58acbbf..1cb03bb8d2 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -15,6 +15,7 @@ import { take } from 'rxjs/operators';
 import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
 import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
@@ -31,6 +32,7 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
     TranslateModule,
     NgIf,
     NgbDropdownModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 1d10a87b64..09bc00d6f1 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -16,6 +16,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { hasValue } from '../../shared/empty.util';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -31,7 +32,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent],
+  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, DisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 4ff9b637f6..53a013e7d3 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -25,6 +25,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -42,6 +43,7 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     AsyncPipe,
     TranslateModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index cfbbacac12..c31184e3d3 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -37,6 +37,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
@@ -53,6 +54,7 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
     TranslateModule,
     UiSwitchModule,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a38c4a81c0..18cd7b9de2 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
-      <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [disabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ac13abb865..302c6bc9c5 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -55,6 +55,7 @@ import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
 import { KlaroService } from '../shared/cookies/klaro.service';
+import { DisabledDirective } from '../shared/disabled-directive';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -66,7 +67,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 7e88c5a1c0..1ec95c8f52 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -43,6 +43,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 
@@ -60,6 +61,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 286e87554b..815a9a9691 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!subject || subject.length === 0"
+            [dsDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index 66a9e0b17f..eb39ada853 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -12,6 +12,7 @@ import {
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 
@@ -20,7 +21,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 2ec3b51219..630812c345 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [disabled]="ngForm.disabled"
+            [dsDisabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
+          [dsDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index dc6fe4d297..9c308ce1a2 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -17,6 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 import { dateToISOFormat } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
@@ -25,7 +26,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe],
+  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, DisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index ce0f5845c6..b01c3a30a6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 56a6e92323..11313dfc99 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -31,6 +31,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AlertComponent } from '../alert/alert.component';
 import { AlertType } from '../alert/alert-type';
+import { DisabledDirective } from '../disabled-directive';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
 import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
@@ -46,7 +47,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index c4ca4f0599..7099e62d52 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -1,89 +1,97 @@
-import { Component, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
 import { DisabledDirective } from './disabled-directive';
 
 @Component({
-    template: `
+  template: `
     <button [dsDisabled]="isDisabled">Test Button</button>
-  `
+  `,
 })
 class TestComponent {
-    isDisabled = false;
+  isDisabled = false;
 }
 
 describe('DisabledDirective', () => {
-    let component: TestComponent;
-    let fixture: ComponentFixture<TestComponent>;
-    let button: DebugElement;
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  let button: DebugElement;
 
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            declarations: [TestComponent, DisabledDirective]
-        });
-        fixture = TestBed.createComponent(TestComponent);
-        component = fixture.componentInstance;
-        button = fixture.debugElement.query(By.css('button'));
-        fixture.detectChanges();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [DisabledDirective],
+      declarations: [TestComponent],
     });
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    button = fixture.debugElement.query(By.css('button'));
+    fixture.detectChanges();
+  });
 
-    it('should bind aria-disabled to false initially', () => {
-        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
-        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
-    });
+  it('should bind aria-disabled to false initially', () => {
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
 
-    it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
-        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
-    });
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+  });
 
-    it('should prevent click events when disabled', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should prevent click events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        let clickHandled = false;
-        button.nativeElement.addEventListener('click', () => clickHandled = true);
+    let clickHandled = false;
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
 
-        button.nativeElement.click();
+    button.nativeElement.click();
 
-        expect(clickHandled).toBeFalse();
-    });
+    expect(clickHandled).toBeFalse();
+  });
 
-    it('should prevent Enter or Space keydown events when disabled', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should prevent Enter or Space keydown events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        let keydownHandled = false;
-        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+    let keydownHandled = false;
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
 
-        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
-        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
 
-        button.nativeElement.dispatchEvent(enterEvent);
-        button.nativeElement.dispatchEvent(spaceEvent);
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
 
-        expect(keydownHandled).toBeFalse();
-    });
+    expect(keydownHandled).toBeFalse();
+  });
 
-    it('should allow click and keydown events when not disabled', () => {
-        let clickHandled = false;
-        let keydownHandled = false;
+  it('should allow click and keydown events when not disabled', () => {
+    let clickHandled = false;
+    let keydownHandled = false;
 
-        button.nativeElement.addEventListener('click', () => clickHandled = true);
-        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
 
-        button.nativeElement.click();
+    button.nativeElement.click();
 
-        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
-        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
 
-        button.nativeElement.dispatchEvent(enterEvent);
-        button.nativeElement.dispatchEvent(spaceEvent);
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
 
-        expect(clickHandled).toBeTrue();
-        expect(keydownHandled).toBeTrue();
-    });
+    expect(clickHandled).toBeTrue();
+    expect(keydownHandled).toBeTrue();
+  });
 });
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 38f92cd1d7..8939c744ad 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -1,31 +1,37 @@
-import { Directive, Input, HostBinding, HostListener } from '@angular/core';
+import {
+  Directive,
+  HostBinding,
+  HostListener,
+  Input,
+} from '@angular/core';
 
 @Directive({
-    selector: '[dsDisabled]'
+  selector: '[dsDisabled]',
+  standalone: true,
 })
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
-        this.isDisabled = !!value;
-    }
+    this.isDisabled = !!value;
+  }
 
     @HostBinding('attr.aria-disabled') isDisabled = false;
     @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
 
     @HostListener('click', ['$event'])
     handleClick(event: Event) {
-        if (this.isDisabled) {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-        }
+      if (this.isDisabled) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
     }
 
     @HostListener('keydown', ['$event'])
     handleKeydown(event: KeyboardEvent) {
-        if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-        }
+      if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
     }
 }
 
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index d82378d4e5..c7a8fafa72 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -8,6 +8,8 @@ import {
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../disabled-directive';
+
 /**
  * Component which represent a DSpace dropdown selector.
  */
@@ -16,7 +18,7 @@ import { TranslateModule } from '@ngx-translate/core';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule],
+  imports: [NgbDropdownModule, NgIf, TranslateModule, DisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 6e427400ee..747d14cac6 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8f458d4e56..de4457935a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -21,6 +21,7 @@ import { MenuID } from 'src/app/shared/menu/menu-id.model';
 import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { DisabledDirective } from '../../../disabled-directive';
 import { hasValue } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 
@@ -32,7 +33,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, DisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index bbc388a601..9f796c35ce 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 2e2397f860..2f68c6a23e 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -10,6 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { DisabledDirective } from '../../../disabled-directive';
 import { isNotEmpty } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
@@ -23,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule],
+  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, DisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 595a1304a0..0ea0910a66 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -99,6 +99,7 @@ import { SubmissionObject } from '../../../../core/submission/models/submission-
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { SubmissionService } from '../../../../submission/submission.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -140,6 +141,7 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 62c86f1bad..7130bfaf1a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -26,6 +26,8 @@ import {
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
+
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
   templateUrl: './dynamic-date-picker-inline.component.html',
@@ -34,6 +36,7 @@ import {
     NgbDatepickerModule,
     ReactiveFormsModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 62a6b8044f..a43286dda8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -24,6 +24,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import isEqual from 'lodash/isEqual';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { hasValue } from '../../../../../empty.util';
 import { NumberPickerComponent } from '../../../../number-picker/number-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
@@ -41,6 +42,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 1d8a152df5..6d4d39d67f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -12,6 +12,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 /**
@@ -22,6 +23,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
   templateUrl: './dynamic-disabled.component.html',
   imports: [
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2f4576b729..77de7953f1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -33,6 +33,7 @@ import { of as observableOf } from 'rxjs';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
@@ -48,7 +49,6 @@ import {
   DynamicLookupModelConfig,
 } from './dynamic-lookup.model';
 import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import {DisabledDirective} from '../../../../../disabled-directive';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 7e4bc3a002..b16ec0e537 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -46,6 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -76,6 +77,7 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 23cec6b502..4cd5d39ebd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -58,6 +58,7 @@ import { Vocabulary } from '../../../../../../core/submission/vocabularies/model
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -89,6 +90,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
     ObjNgFor,
     NgForOf,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index e6f5e41888..d9c5fbd9e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -46,6 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { shrinkInOut } from '../../../../../animations/shrink';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -81,6 +82,7 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 051bb3f225..1dfa624d61 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -43,6 +43,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
@@ -62,6 +63,7 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
     InfiniteScrollModule,
     NgForOf,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index cef8516b84..cd5979f779 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [disabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -73,18 +73,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [disabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+              [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+            [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 7b0ec3ccfe..c1a795d5c3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -33,6 +33,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
+import { DisabledDirective } from '../../../../disabled-directive';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
@@ -44,7 +45,6 @@ import {
   AddRelationshipAction,
   RemoveRelationshipAction,
 } from './relationship.actions';
-import {DisabledDirective} from '../../../../disabled-directive';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 6033fa1b61..c81ea8eccd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -50,6 +50,7 @@ import {
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
+import { DisabledDirective } from '../../../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -91,6 +92,7 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     AsyncPipe,
     NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/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.ts b/src/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.ts
index c2516ca9a8..89504ccdfc 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -38,6 +38,7 @@ import {
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
+import { DisabledDirective } from '../../../../../../disabled-directive';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
@@ -69,6 +70,7 @@ export enum ImportType {
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index ef75f34b9b..92b0e05552 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="(isValid() | async) !== true">
+                    [dsDisabled]="(isValid() | async) !== true">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index e1d47da7bd..d96f16044a 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -39,6 +39,7 @@ import {
   map,
 } from 'rxjs/operators';
 
+import { DisabledDirective } from '../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -69,6 +70,7 @@ import { FormService } from './form.service';
     DynamicFormsCoreModule,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index e268919101..773a1367f9 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -19,6 +19,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../disabled-directive';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -32,6 +33,7 @@ import { isEmpty } from '../../empty.util';
     NgClass,
     FormsModule,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index cb66544e04..d9f5738cc7 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -14,7 +14,7 @@
         <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
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 cd836a4a47..9d2a8e12ab 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -30,6 +30,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { AlertComponent } from '../../alert/alert.component';
 import { AlertType } from '../../alert/alert-type';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -65,6 +66,7 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index bcc2048dee..84d618cb79 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -49,6 +49,7 @@ import { AuthorizationDataService } from '../../../../core/data/feature-authoriz
 import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { fadeOut } from '../../../animations/fade';
+import { DisabledDirective } from '../../../disabled-directive';
 import { isNotEmpty } from '../../../empty.util';
 import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
 
@@ -62,7 +63,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, DisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 6de3df6e09..a03a1eb00c 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -22,6 +22,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -33,7 +34,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 74df54e9e0..5bc0ccb946 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -21,6 +21,7 @@ import { RemoteData } from 'src/app/core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -32,7 +33,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 9a8c98c66e..433bfa8fc3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -33,6 +33,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -44,7 +45,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index ea93769b9d..313a6efe6b 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -20,6 +20,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 
@@ -30,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 35b75b3aa1..2f1cb1b95e 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -34,6 +34,7 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { DisabledDirective } from '../../disabled-directive';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
@@ -45,7 +46,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9bfe3e1156..bc07b6b049 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 267d8a2a60..f11fc45c13 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -20,6 +20,7 @@ import { getCollectionPageRoute } from '../../../collection-page/collection-page
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -36,7 +37,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index e0e71fb939..9159b7e617 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 6bd27a4ece..259b134a99 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -18,6 +18,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { DisabledDirective } from '../../disabled-directive';
 import { HostWindowService } from '../../host-window.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
@@ -28,7 +29,6 @@ import { SearchConfigurationServiceStub } from '../../testing/search-configurati
 import { createPaginatedList } from '../../testing/utils.test';
 import { ObjectSelectService } from '../object-select.service';
 import { ItemSelectComponent } from './item-select.component';
-import {DisabledDirective} from '../../disabled-directive';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -197,9 +197,8 @@ describe('ItemSelectComponent', () => {
 
       const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
       expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-        expect(checkbox.getAttribute('aria-disabled')).toBe('true');
-        expect(checkbox.classList.contains('disabled')).toBe(true);
-      });
+      expect(checkbox.getAttribute('aria-disabled')).toBe('true');
+      expect(checkbox.classList.contains('disabled')).toBe(true);
     }));
   });
 });
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 973b4aff87..64d6a9b2ba 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -19,6 +19,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -34,7 +35,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 40f51fe70b..93fe8036ec 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -40,6 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { DisabledDirective } from '../disabled-directive';
 import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
@@ -58,7 +59,7 @@ import { PaginationComponentOptions } from './pagination-component-options.model
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe],
+  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, DisabledDirective],
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 3d5465f0e6..64f97696ed 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [disabled]="(isProcessing | async)"
+                  [dsDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+                  [dsDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 3ae04a9e94..64836aeb8c 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -49,6 +49,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
@@ -68,7 +69,6 @@ import {
   ResourcePolicyEvent,
   ResourcePolicyFormComponent,
 } from './resource-policy-form.component';
-import {DisabledDirective} from '../../disabled-directive';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -217,7 +217,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         ResourcePolicyFormComponent,
         TestComponent,
         NgxMaskModule.forRoot(),
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 534e88bcef..e61940dad4 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -51,6 +51,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   hasValueOperator,
@@ -95,6 +96,7 @@ export interface ResourcePolicyEvent {
     AsyncPipe,
     NgIf,
     NgFor,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index bb6073df85..3de68cfa63 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                      [dsDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [disabled]="(isProcessingDelete() | async)"
+                      [dsDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 1d098f554d..971f3a747b 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -41,6 +41,7 @@ import { GroupDataService } from '../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import { DisabledDirective } from '../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -63,6 +64,7 @@ import {
     NgIf,
     AsyncPipe,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index bd8ad0dfc9..1465d73645 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -30,7 +30,7 @@
                                (findSuggestions)="findSuggestions($event)"
                                ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [disabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button (click)="applyFilter()" [dsDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index f8ebb51dad..dfc934ad9c 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -31,6 +31,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -55,6 +56,7 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     KeyValuePipe,
     NgForOf,
     TranslateModule,
+    DisabledDirective,
   ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 452d890a55..23fba5f502 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -50,6 +50,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../alert/alert.component';
+import { DisabledDirective } from '../../disabled-directive';
 import { isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -61,7 +62,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, DisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 001a2ed687..15239fd506 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -20,6 +20,7 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../disabled-directive';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
@@ -32,7 +33,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule],
+  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, DisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index f4b2c35314..fe8fb6d038 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -25,6 +25,7 @@ import {
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
 } from '../../../core/xsrf/xsrf.constants';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -40,7 +41,7 @@ import { UploaderProperties } from './uploader-properties.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [TranslateModule, FileUploadModule, CommonModule],
+  imports: [TranslateModule, FileUploadModule, CommonModule, DisabledDirective],
 })
 export class UploaderComponent {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 16370a5873..2af47497b2 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+            [dsDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index a1ff8acce3..9ff048a626 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -31,6 +31,7 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
@@ -43,7 +44,6 @@ import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormCollectionComponent } from './submission-form-collection.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -153,7 +153,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         TranslateModule.forRoot(),
         SubmissionFormCollectionComponent,
         TestComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index dcbcfd9cb3..1749e9165a 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -35,6 +35,7 @@ import { SubmissionObject } from '../../../core/submission/models/submission-obj
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -56,6 +57,7 @@ import { SubmissionService } from '../../submission.service';
     TranslateModule,
     NgbDropdownModule,
     ThemedCollectionDropdownComponent,
+    DisabledDirective,
   ],
 })
 export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index f1162cea4d..4d3e76ff51 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+              [dsDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index a430ec81fa..3b36d56aca 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -25,13 +25,13 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormFooterComponent } from './submission-form-footer.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -52,7 +52,7 @@ describe('SubmissionFormFooterComponent', () => {
         TranslateModule.forRoot(),
         SubmissionFormFooterComponent,
         TestComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 712a944a84..adaf5c85ef 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -15,6 +15,7 @@ import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { SubmissionService } from '../../submission.service';
@@ -27,7 +28,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-footer.component.scss'],
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
-  imports: [CommonModule, BrowserOnlyPipe, TranslateModule],
+  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, DisabledDirective],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 0c7035c7f8..c5f8d25fc2 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -6,7 +6,7 @@
   <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [disabled]="(hasSections$ | async) !== true"
+          [dsDisabled]="(hasSections$ | async) !== true"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index 4cf10e55d8..c97afc9d83 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
 import { SectionsService } from '../../sections/sections.service';
@@ -22,7 +23,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-section-add.component.scss'],
   templateUrl: './submission-form-section-add.component.html',
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgbDropdownModule],
+  imports: [CommonModule, TranslateModule, NgbDropdownModule, DisabledDirective],
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 7b5a2004d7..96e7e2e172 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index aace4de79a..7572d3ac8b 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -36,6 +36,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -70,6 +71,7 @@ export interface ExternalSourceData {
     InfiniteScrollModule,
     NgbDropdownModule,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index d286a830e2..62546e1835 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -40,6 +40,7 @@ import {
 import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -64,6 +65,7 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 24488d1adb..c7ba64e4b9 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -39,6 +39,7 @@ import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/build
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
 import { dateToISOFormat } from '../../../../../shared/date.util';
+import { DisabledDirective } from '../../../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -80,6 +81,7 @@ import {
     FormComponent,
     NgIf,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index f8d6b9ca93..20e2e80a56 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -7,7 +7,7 @@
         type="checkbox"
         class="custom-control-input"
         id="primaryBitstream{{fileIndex}}"
-        [disabled]="processingSaveStatus$ | async"
+        [dsDisabled]="processingSaveStatus$ | async"
         [checked]="isPrimary"
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index a0519f6c85..9e9c15bb2f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -28,6 +28,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasValue,
   isNotUndefined,
@@ -54,6 +55,7 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 770f465a4b..0f20e0e927 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,8 +87,8 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index b30e864fa1..b695bb47ed 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -43,6 +43,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -59,7 +60,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 5ae3a13f31..e87a292c0c 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -45,6 +45,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -76,6 +77,7 @@ enum SubKey {
     RouterLink,
     NgClass,
     NgForOf,
+    DisabledDirective,
   ],
 })
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
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
index a7437c0408..40a6264e4e 100644
--- 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
@@ -13,6 +13,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso
 import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 
 @Component({
@@ -22,7 +23,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 9656e7b85c..ff64b09664 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 @Component({
@@ -22,6 +23,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
 })
 /**
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index 05f2252216..e557fc466c 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-end-user-agreement',
@@ -12,7 +13,7 @@ import { EndUserAgreementContentComponent } from '../../../../../app/info/end-us
   // templateUrl: './end-user-agreement.component.html'
   templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index b3cd90e73e..b86fecae7a 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -7,6 +7,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
 
 @Component({
@@ -16,7 +17,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 5c6c7f3507..020293214e 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -7,6 +7,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-media-viewer-video',
@@ -20,6 +21,7 @@ import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../ap
     NgbDropdownModule,
     TranslateModule,
     NgIf,
+    DisabledDirective,
   ],
 })
 export class MediaViewerVideoComponent extends BaseComponent {
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index 44426c527f..d9be35f39d 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -12,13 +12,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component';
 import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component';
 
 import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
+import { DisabledDirective } from '../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-register-email-form',
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index ac2491cc4e..659e260b1c 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -27,6 +28,7 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
+    DisabledDirective,
   ],
 })
 export class CreateProfileComponent extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index 1876b134a2..a299e47a27 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -7,6 +7,8 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+
 @Component({
   selector: 'ds-themed-email-request-copy',
   // styleUrls: ['./email-request-copy.component.scss'],
@@ -14,7 +16,7 @@ import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/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.ts b/src/themes/custom/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.ts
index 424adb7942..7936deb406 100644
--- a/src/themes/custom/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.ts
+++ b/src/themes/custom/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.ts
@@ -5,6 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../../../../../../../../app/shared/disabled-directive';
 import { ExternalSourceEntryImportModalComponent as BaseComponent } 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 { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component';
 
@@ -19,6 +20,7 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
 })
 export class ExternalSourceEntryImportModalComponent extends BaseComponent {
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 13f5f97650..17bc5d9136 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -6,6 +6,7 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
+import { DisabledDirective } from '../../../../../../../app/shared/disabled-directive';
 import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
 import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
 import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component';
@@ -27,6 +28,7 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    DisabledDirective,
   ],
 })
 export class SubmissionSectionUploadFileComponent

From 094502137887f8370428ea76d8bb81c2d750ff9b Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Tue, 27 Aug 2024 12:29:44 +0200
Subject: [PATCH 0364/1286] 117544: resolve conflicts after merging in latest
 7.x branch

---
 .../eperson-form/eperson-form.component.html     |  2 +-
 .../eperson-form/eperson-form.component.spec.ts  |  2 +-
 .../members-list/members-list.component.html     |  4 ++--
 .../collection-source.component.html             |  8 ++++----
 .../delete-community-page.component.html         |  4 ++--
 .../dso-edit-metadata-value.component.html       | 10 +++++-----
 .../dso-edit-metadata.component.html             | 14 +++++++-------
 .../feedback-form/feedback-form.component.html   |  4 ++--
 .../item-bitstreams.component.html               |  8 ++++----
 .../item-edit-bitstream.component.html           |  4 ++--
 .../item-delete/item-delete.component.html       |  6 +++---
 .../edit-relationship-list.component.html        |  2 +-
 .../item-relationships.component.html            |  4 ++--
 ...y-dspace-new-external-dropdown.component.html |  4 ++--
 ...dspace-new-submission-dropdown.component.html |  4 ++--
 .../email-request-copy.component.html            |  2 +-
 .../access-control-array-form.component.html     | 10 +++++-----
 .../access-control-form-container.component.html | 16 ++++++++--------
 ...o-edit-menu-expandable-section.component.html |  2 +-
 .../dso-edit-menu-section.component.html         |  4 ++--
 src/app/shared/form/form.component.html          |  4 ++--
 .../number-picker.component.spec.ts              |  2 +-
 .../vocabulary-treeview.component.html           |  2 +-
 .../collection-select.component.html             |  2 +-
 .../item-select/item-select.component.html       |  4 ++--
 ...sion-import-external-searchbar.component.html |  2 +-
 .../system-wide-alert-form.component.html        |  4 ++--
 27 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 6c75b52077..d21c1cfa85 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [disabled]="!(canReset$ | async)" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsDisabled]="!(canReset$ | async)" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index ccf276856a..b698d43651 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -509,7 +509,7 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBeNull();
       expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
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 e1fc69026b..1d0e6b9abd 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
@@ -34,7 +34,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(eperson)"
-                      [disabled]="actionConfig.remove.disabled"
+                      [dsDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
@@ -114,7 +114,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 1fe121e898..506877c42c 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [disabled]="(hasChanges$ | async) !== true"
+                [dsDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [disabled]="(hasChanges$ | async) !== true"
+                        [dsDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 1e71fb7f49..0b439ec0c1 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="!(processing$ | async)"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
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 47449bda5c..f3d92ace2d 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
@@ -24,31 +24,31 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="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()">
+                  [dsDisabled]="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" data-test="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)">
+                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="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()">
+                  [dsDisabled]="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" data-test="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()">
+                  [dsDisabled]="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" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="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>
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 09868c6865..507ce23cc1 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" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsDisabled]="!hasChanges || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
@@ -21,7 +21,7 @@
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [disabled]="!hasChanges || (saving$ | async)"
+            [dsDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -76,13 +76,13 @@
   </div>
   <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)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
@@ -91,7 +91,7 @@
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [disabled]="!hasChanges || (saving$ | async)"
+              [dsDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 6ca584c82e..3fdc66820a 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,9 +41,9 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 834ad25c7f..c52d99b439 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [disabled]="(hasChanges$ | async) !== true || submitting"
+            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [disabled]="(hasChanges$ | async) !== true || submitting"
+              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index f0671d3d30..8386c07194 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
+        <button [dsDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
+        <button [dsDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index ed6ba3eabc..eadec9babf 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [disabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [disabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index a4cc100377..b9a01c6b38 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
    {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 85f41a25d9..6ba593e1f2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [disabled]="(hasChanges$ | async) !== true"
+            [dsDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [disabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 23438c205f..955122301f 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="!(initialized$|async)"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="!(initialized$|async)"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="!(initialized$|async)"
+            type="button" [dsDisabled]="!(initialized$|async)"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 566e40d98a..8bc3f174b6 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [disabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+            [dsDisabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="!(initialized$|async)"
+            type="button"  [dsDisabled]="!(initialized$|async)"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 286e87554b..815a9a9691 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!subject || subject.length === 0"
+            [dsDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 2ec3b51219..630812c345 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [disabled]="ngForm.disabled"
+            [dsDisabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
+          [dsDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index ce0f5845c6..b01c3a30a6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 6e427400ee..747d14cac6 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index bbc388a601..9f796c35ce 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 5b39068ae2..4099cdb915 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="!(isValid() | async)">
+                    [dsDisabled]="!(isValid() | async)">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index b6d623d70b..5857d9e4a5 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -44,7 +44,7 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        [disabled]="disabled"
+        [dsDisabled]="disabled"
         [min]="min"
         [max]="max"
         [id]="'ds_test_field'"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index d44d78fb9b..e6eb168d4c 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -11,7 +11,7 @@
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 1534f88895..551edd446c 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 8271633bcf..a6cb7738d7 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 040987d37b..28fa4695fb 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 770f465a4b..0f20e0e927 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,8 +87,8 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>

From 0eb2d5ce587ece5d3573cad7534bcbb8df5c6ed4 Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Tue, 27 Aug 2024 17:02:12 -0300
Subject: [PATCH 0365/1286] Improving accessibility on the new user
 registration page

---
 .../register-email-form.component.html                   | 9 ++++++---
 src/assets/i18n/en.json5                                 | 2 ++
 src/assets/i18n/es.json5                                 | 3 +++
 src/assets/i18n/pt-BR.json5                              | 3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a38c4a81c0..740018392c 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -14,13 +14,16 @@
                     <label class="font-weight-bold"
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"/>
+                           type="text" id="email" formControlName="email"
+                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-invalid]="form.get('email')?.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required">
+                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
                         {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
                         <ng-container *ngIf="validMailDomains.length > 0">
                           {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8f20c657f9..020b4d7616 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6739,4 +6739,6 @@
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 
   "browse.search-form.placeholder": "Search the repository",
+
+  "register-email.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 55962d25b5..0306c5a9bb 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8152,5 +8152,8 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index c3b26a09d2..6f4f94d464 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10249,4 +10249,7 @@
 
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
+
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Digite seu e-mail",
 }

From b22ba6f3ef5cfeab8d834fe2495113690a9a2535 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:56:56 +0000
Subject: [PATCH 0366/1286] Bump axios from 1.6.7 to 1.7.4

Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.6.7...v1.7.4)

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

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

diff --git a/package.json b/package.json
index a8d505eff9..9dba94a096 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index 251232378c..bd5a524f7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3895,12 +3895,12 @@ axe-core@^4.7.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.4.tgz#90db39a2b316f963f00196434d964e6e23648643"
   integrity sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==
 
-axios@^1.5.1, axios@^1.6.0:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
-  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
+axios@^1.5.1, axios@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
+  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
   dependencies:
-    follow-redirects "^1.15.4"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -5647,11 +5647,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -6210,7 +6208,7 @@ flatted@^3.2.7, flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+follow-redirects@^1.0.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

From 3b4e0d51cd3e6772314bc965eb19d87e426011fc Mon Sep 17 00:00:00 2001
From: Vlad Novski <novskijvlad@gmail.com>
Date: Thu, 29 Aug 2024 18:56:28 +0200
Subject: [PATCH 0367/1286] fix[i18n]: typo in German translation

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 285bbfa43d..dac2eb4a52 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -3450,7 +3450,7 @@
   "journalissue.listelement.badge": "Zeitschriftenheft",
 
   // "journalissue.page.description": "Description",
-  "journalissue.page.description": "Beschreibeung",
+  "journalissue.page.description": "Beschreibung",
 
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Dieses Item bearbeiten",

From d697d0f7a75148d130126ee7f29e6ef8c1fc077c Mon Sep 17 00:00:00 2001
From: Vlad Novski <novskijvlad@gmail.com>
Date: Thu, 29 Aug 2024 18:56:28 +0200
Subject: [PATCH 0368/1286] fix[i18n]: typo in German translation

(cherry picked from commit 3b4e0d51cd3e6772314bc965eb19d87e426011fc)
---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 325a35437d..8efda0390e 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -3049,7 +3049,7 @@
   "journalissue.listelement.badge": "Zeitschriftenheft",
 
   // "journalissue.page.description": "Description",
-  "journalissue.page.description": "Beschreibeung",
+  "journalissue.page.description": "Beschreibung",
 
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Dieses Item bearbeiten",

From 5e4b78f4bbbf38fc9f786950fd2e2f066c6b4145 Mon Sep 17 00:00:00 2001
From: Vlad Novski <novskijvlad@gmail.com>
Date: Thu, 29 Aug 2024 18:56:28 +0200
Subject: [PATCH 0369/1286] fix[i18n]: typo in German translation

(cherry picked from commit 3b4e0d51cd3e6772314bc965eb19d87e426011fc)
---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 285bbfa43d..dac2eb4a52 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -3450,7 +3450,7 @@
   "journalissue.listelement.badge": "Zeitschriftenheft",
 
   // "journalissue.page.description": "Description",
-  "journalissue.page.description": "Beschreibeung",
+  "journalissue.page.description": "Beschreibung",
 
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Dieses Item bearbeiten",

From 3a5e309d38125cdadd8ac73df97def193514bdf0 Mon Sep 17 00:00:00 2001
From: Victor Hugo Duran Santiago <victorhugodurans@gmail.com>
Date: Thu, 9 May 2024 20:50:51 -0600
Subject: [PATCH 0370/1286] Set color black on filter section for mobile

(cherry picked from commit 36c95db7bf19b83453691ef4e0dbc52608c08ee5)
---
 .../search-filters/search-filter/search-filter.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index b850b0f27d..f20a256063 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -6,7 +6,7 @@
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
-    <span class="h4 d-inline-block text-left mt-auto mb-auto">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
     </span>
     <i class="filter-toggle flex-grow-1 fas p-auto"

From 078dcbb707c012ab54e64de730e5579135d1a560 Mon Sep 17 00:00:00 2001
From: Victor Hugo Duran Santiago <victorhugodurans@gmail.com>
Date: Thu, 9 May 2024 20:50:51 -0600
Subject: [PATCH 0371/1286] Set color black on filter section for mobile

(cherry picked from commit 36c95db7bf19b83453691ef4e0dbc52608c08ee5)
---
 .../search-filters/search-filter/search-filter.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index b850b0f27d..f20a256063 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -6,7 +6,7 @@
           [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
-    <span class="h4 d-inline-block text-left mt-auto mb-auto">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
     </span>
     <i class="filter-toggle flex-grow-1 fas p-auto"

From 4c05c0ca645ae61fb8bdb3772ebd8207ebe6e645 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:56:56 +0000
Subject: [PATCH 0372/1286] Bump axios from 1.6.7 to 1.7.4

Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.7.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.6.7...v1.7.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b22ba6f3ef5cfeab8d834fe2495113690a9a2535)
---
 package.json |  2 +-
 yarn.lock    | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index ada0525149..516e2eb6c5 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index 251232378c..bd5a524f7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3895,12 +3895,12 @@ axe-core@^4.7.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.4.tgz#90db39a2b316f963f00196434d964e6e23648643"
   integrity sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==
 
-axios@^1.5.1, axios@^1.6.0:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
-  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
+axios@^1.5.1, axios@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
+  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
   dependencies:
-    follow-redirects "^1.15.4"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -5647,11 +5647,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -6210,7 +6208,7 @@ flatted@^3.2.7, flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+follow-redirects@^1.0.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

From 81b89f5d0c3ae65b0a56e03fba35d8be2a2ff075 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:00:42 +0000
Subject: [PATCH 0373/1286] Bump webpack from 5.90.3 to 5.94.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.90.3 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.90.3...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

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

diff --git a/package.json b/package.json
index 9dba94a096..3c73bfe72d 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.3.3",
-    "webpack": "5.90.3",
+    "webpack": "5.94.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
diff --git a/yarn.lock b/yarn.lock
index bd5a524f7f..c39b2ee7be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3307,7 +3307,7 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
   integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5":
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
   integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
@@ -3373,7 +3373,7 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5":
+"@webassemblyjs/wasm-edit@^1.11.5", "@webassemblyjs/wasm-edit@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
   integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
@@ -3408,7 +3408,7 @@
     "@webassemblyjs/wasm-gen" "1.12.1"
     "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5":
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
   integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
@@ -3496,6 +3496,11 @@ acorn-import-assertions@^1.9.0:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -5348,10 +5353,10 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.15.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
-  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
+enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6545,7 +6550,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -11863,10 +11868,10 @@ watchpack@2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-watchpack@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
-  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
+watchpack@^2.4.0, watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -12125,6 +12130,35 @@ webpack@5.90.3:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
+  dependencies:
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
+    webpack-sources "^3.2.3"
+
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"

From aca752a01e3c6f3dc57bf7ac67db1ec31d88dac1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:02:42 +0000
Subject: [PATCH 0374/1286] Bump micromatch from 4.0.5 to 4.0.8

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index bd5a524f7f..4a79fb1671 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4087,7 +4087,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -8151,11 +8151,11 @@ methods@~1.1.2:
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":

From dc3bf375219626e970503ac7c6ea69eb63702357 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 30 Aug 2024 12:05:04 -0500
Subject: [PATCH 0375/1286] Bump axios from 1.6.7 to 1.7.4

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ae3cf5ac51..1d7bb0ee20 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index 8b3e3f6f13..0a0d2b3913 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3516,10 +3516,10 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.6.0:
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
-  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+axios@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1"
+  integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

From 7dea5f7d98afc6a6ab2ac8438eea4b00dd00175d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 30 Aug 2024 20:49:38 +0200
Subject: [PATCH 0376/1286] Temporarily ignore type errors from
 EnvironmentPlugin since type matching is currently too strict

---
 webpack/webpack.common.ts |  1 +
 webpack/webpack.prod.ts   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 8d433edf39..d8155288cb 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -79,6 +79,7 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
+    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
     }),
diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts
index 559b7f1dc7..fce321d152 100644
--- a/webpack/webpack.prod.ts
+++ b/webpack/webpack.prod.ts
@@ -1,16 +1,17 @@
-import { commonExports } from './webpack.common';
-import { projectRoot } from './helpers';
+import { EnvironmentPlugin } from 'webpack';
 
-const webpack = require('webpack');
+import { projectRoot } from './helpers';
+import { commonExports } from './webpack.common';
 
 module.exports = Object.assign({}, commonExports, {
   plugins: [
     ...commonExports.plugins,
-    new webpack.EnvironmentPlugin({
+    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
+    new EnvironmentPlugin({
       'process.env': {
-        NODE_ENV: JSON.stringify('production'),
-        AOT: true
-      }
+        NODE_ENV: 'production',
+        AOT: true,
+      },
     }),
   ],
   mode: 'production',

From 5f922c06e038c2909446b4ad36b47171f7d6baf3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 30 Aug 2024 22:05:32 +0200
Subject: [PATCH 0377/1286] Remove webpack@5.90.3 since it causes issues with
 the tests

This automatically removed some old eslint dependencies, which caused some conflicts in the custom linting plugin
---
 .../src/rules/html/themed-component-usages.ts |  8 +-
 lint/src/rules/ts/themed-component-classes.ts |  4 +-
 .../rules/ts/themed-component-selectors.ts    |  4 +-
 lint/src/rules/ts/themed-component-usages.ts  |  4 +-
 lint/src/util/structure.ts                    | 16 ++--
 lint/src/util/typescript.ts                   | 11 +--
 lint/test/testing.ts                          |  2 +-
 yarn.lock                                     | 73 +++----------------
 8 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/lint/src/rules/html/themed-component-usages.ts b/lint/src/rules/html/themed-component-usages.ts
index 0b9a13456a..e907285dbc 100644
--- a/lint/src/rules/html/themed-component-usages.ts
+++ b/lint/src/rules/html/themed-component-usages.ts
@@ -7,10 +7,8 @@
  */
 import { TmplAstElement } from '@angular-eslint/bundled-angular-compiler';
 import { TemplateParserServices } from '@angular-eslint/utils';
-import {
-  ESLintUtils,
-  TSESLint,
-} from '@typescript-eslint/utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -52,7 +50,7 @@ The only exception to this rule are unit tests, where we may want to use the bas
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     if (getFilename(context).includes('.spec.ts')) {
       // skip inline templates in unit tests
       return {};
diff --git a/lint/src/rules/ts/themed-component-classes.ts b/lint/src/rules/ts/themed-component-classes.ts
index 66c37395b4..527655adfa 100644
--- a/lint/src/rules/ts/themed-component-classes.ts
+++ b/lint/src/rules/ts/themed-component-classes.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -57,7 +57,7 @@ export const info = {
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     if (filename.endsWith('.spec.ts')) {
diff --git a/lint/src/rules/ts/themed-component-selectors.ts b/lint/src/rules/ts/themed-component-selectors.ts
index e06f5ababf..c27fd66d66 100644
--- a/lint/src/rules/ts/themed-component-selectors.ts
+++ b/lint/src/rules/ts/themed-component-selectors.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import { getComponentSelectorNode } from '../../util/angular';
@@ -58,7 +58,7 @@ Unit tests are exempt from this rule, because they may redefine components using
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     if (filename.endsWith('.spec.ts')) {
diff --git a/lint/src/rules/ts/themed-component-usages.ts b/lint/src/rules/ts/themed-component-usages.ts
index 96e9962ccf..83fe6f8ea8 100644
--- a/lint/src/rules/ts/themed-component-usages.ts
+++ b/lint/src/rules/ts/themed-component-usages.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -68,7 +68,7 @@ There are a few exceptions where the base class can still be used:
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     function handleUnthemedUsagesInTypescript(node: TSESTree.Identifier) {
diff --git a/lint/src/util/structure.ts b/lint/src/util/structure.ts
index bfbf7ec7f2..13b2ef322b 100644
--- a/lint/src/util/structure.ts
+++ b/lint/src/util/structure.ts
@@ -5,13 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-import { TSESLint } from '@typescript-eslint/utils';
-import { RuleTester } from 'eslint';
+import {
+  InvalidTestCase,
+  RuleMetaData,
+  RuleModule,
+  ValidTestCase,
+} from '@typescript-eslint/utils/ts-eslint';
 import { EnumType } from 'typescript';
 
-export type Meta = TSESLint.RuleMetaData<string>;
-export type Valid = TSESLint.ValidTestCase<unknown[]> | RuleTester.ValidTestCase;
-export type Invalid = TSESLint.InvalidTestCase<string, unknown[]> | RuleTester.InvalidTestCase;
+export type Meta = RuleMetaData<string>;
+export type Valid = ValidTestCase<unknown[]>;
+export type Invalid = InvalidTestCase<string, unknown[]>;
 
 export interface DSpaceESLintRuleInfo {
   name: string;
@@ -28,7 +32,7 @@ export interface NamedTests {
 export interface RuleExports {
   Message: EnumType,
   info: DSpaceESLintRuleInfo,
-  rule: TSESLint.RuleModule<string>,
+  rule: RuleModule<string>,
   tests: NamedTests,
   default: unknown,
 }
diff --git a/lint/src/util/typescript.ts b/lint/src/util/typescript.ts
index 3fecad270e..0d04ef1a3d 100644
--- a/lint/src/util/typescript.ts
+++ b/lint/src/util/typescript.ts
@@ -5,17 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
+import { TSESTree } from '@typescript-eslint/utils';
 import {
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+  RuleContext,
+  SourceCode,
+} from '@typescript-eslint/utils/ts-eslint';
 
 import {
   match,
   toUnixStylePath,
 } from './misc';
 
-export type AnyRuleContext = TSESLint.RuleContext<string, unknown[]>;
+export type AnyRuleContext = RuleContext<string, unknown[]>;
 
 /**
  * Return the current filename based on the ESLint rule context as a Unix-style path.
@@ -27,7 +28,7 @@ export function getFilename(context: AnyRuleContext): string {
   return toUnixStylePath(context.getFilename());
 }
 
-export function getSourceCode(context: AnyRuleContext): TSESLint.SourceCode {
+export function getSourceCode(context: AnyRuleContext): SourceCode {
   // TSESLint claims this is deprecated, but the suggested alternative is undefined (could be a version mismatch between ESLint and TSESlint?)
   // eslint-disable-next-line deprecation/deprecation
   return context.getSourceCode();
diff --git a/lint/test/testing.ts b/lint/test/testing.ts
index cfa54c5b85..53faf32069 100644
--- a/lint/test/testing.ts
+++ b/lint/test/testing.ts
@@ -7,7 +7,7 @@
  */
 
 import { RuleTester as TypeScriptRuleTester } from '@typescript-eslint/rule-tester';
-import { RuleTester } from 'eslint';
+import { RuleTester } from '@typescript-eslint/utils/ts-eslint';
 
 import { themeableComponents } from '../src/util/theme-support';
 import {
diff --git a/yarn.lock b/yarn.lock
index c39b2ee7be..a6a2854c67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -123,7 +123,7 @@
     undici "6.7.1"
     vite "5.1.5"
     watchpack "2.4.0"
-    webpack "5.90.3"
+    webpack "5.94.0"
     webpack-dev-middleware "6.1.1"
     webpack-dev-server "4.15.1"
     webpack-merge "5.10.0"
@@ -194,7 +194,7 @@
     undici "6.11.1"
     vite "5.1.7"
     watchpack "2.4.0"
-    webpack "5.90.3"
+    webpack "5.94.0"
     webpack-dev-middleware "6.1.2"
     webpack-dev-server "4.15.1"
     webpack-merge "5.10.0"
@@ -2726,23 +2726,7 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
   integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02"
-  integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@1.0.5", "@types/estree@^1.0.5":
+"@types/estree@1.0.5", "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -2802,7 +2786,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3307,7 +3291,7 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
   integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@^1.12.1":
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
   integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
@@ -3373,7 +3357,7 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5", "@webassemblyjs/wasm-edit@^1.12.1":
+"@webassemblyjs/wasm-edit@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
   integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
@@ -3408,7 +3392,7 @@
     "@webassemblyjs/wasm-gen" "1.12.1"
     "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@^1.12.1":
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
   integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
@@ -3491,11 +3475,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
 acorn-import-attributes@^1.9.5:
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
@@ -5353,7 +5332,7 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -5652,9 +5631,11 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -6550,7 +6531,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -11868,7 +11849,7 @@ watchpack@2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-watchpack@^2.4.0, watchpack@^2.4.1:
+watchpack@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
   integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
@@ -12100,36 +12081,6 @@ webpack-subresource-integrity@5.1.0:
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.90.3:
-  version "5.90.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
-  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
 webpack@5.94.0:
   version "5.94.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"

From 70f0af66117722e4d12d2b828ee85537946e69de Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 3 Sep 2024 11:36:04 +0200
Subject: [PATCH 0378/1286] 117287: Removed method calls returning observables
 from the EPerson form

---
 .../epeople-registry.component.html           |   2 +-
 .../epeople-registry.component.ts             |  22 +-
 .../eperson-form/eperson-form.component.html  |   4 +-
 .../eperson-form.component.spec.ts            |  69 ++---
 .../eperson-form/eperson-form.component.ts    | 244 +++++++++---------
 5 files changed, 147 insertions(+), 194 deletions(-)

diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index e3a8e2c590..bd47124856 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -66,7 +66,7 @@
               </thead>
               <tbody>
               <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
-                  [ngClass]="{'table-primary' : isActive(epersonDto.eperson) | async}">
+                  [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
                 <td>{{epersonDto.eperson.id}}</td>
                 <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
                 <td>{{epersonDto.eperson.email}}</td>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index fb045ebb88..f180534587 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -45,6 +45,8 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   ePeopleDto$: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>({} as any);
 
+  activeEPerson$: Observable<EPerson>;
+
   /**
    * An observable for the pageInfo, needed to pass to the pagination component
    */
@@ -121,6 +123,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
         this.isEPersonFormShown = true;
       }
     }));
+    this.activeEPerson$ = this.epersonService.getActiveEPerson();
     this.subs.push(this.ePeople$.pipe(
       switchMap((epeople: PaginatedList<EPerson>) => {
         if (epeople.pageInfo.totalElements > 0) {
@@ -188,29 +191,12 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     );
   }
 
-  /**
-   * Checks whether the given EPerson is active (being edited)
-   * @param eperson
-   */
-  isActive(eperson: EPerson): Observable<boolean> {
-    return this.getActiveEPerson().pipe(
-      map((activeEPerson) => eperson === activeEPerson)
-    );
-  }
-
-  /**
-   * Gets the active eperson (being edited)
-   */
-  getActiveEPerson(): Observable<EPerson> {
-    return this.epersonService.getActiveEPerson();
-  }
-
   /**
    * Start editing the selected EPerson
    * @param ePerson
    */
   toggleEditEPerson(ePerson: EPerson) {
-    this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
+    this.activeEPerson$.pipe(take(1)).subscribe((activeEPerson: EPerson) => {
       if (ePerson === activeEPerson) {
         this.epersonService.cancelEditEPerson();
         this.isEPersonFormShown = false;
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 228449a8a5..3c5b2d13b4 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="epersonService.getActiveEPerson() | async; then editheader; else createHeader"></div>
+<div *ngIf="activeEPerson$ | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
   <h4>{{messagePrefix + '.create' | translate}}</h4>
@@ -39,7 +39,7 @@
 
 <ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
 
-<div *ngIf="epersonService.getActiveEPerson() | async">
+<div *ngIf="activeEPerson$ | async">
   <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
 
   <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index fb911e709c..dc2e380c33 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -1,11 +1,11 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
@@ -19,7 +19,6 @@ import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { AuthService } from '../../../core/auth/auth.service';
 import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
@@ -31,6 +30,7 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -53,9 +53,6 @@ describe('EPersonFormComponent', () => {
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
-      getEPeople(): Observable<RemoteData<PaginatedList<EPerson>>> {
-        return createSuccessfulRemoteDataObject$(buildPaginatedList(null, this.allEpeople));
-      },
       getActiveEPerson(): Observable<EPerson> {
         return observableOf(this.activeEPerson);
       },
@@ -184,12 +181,8 @@ describe('EPersonFormComponent', () => {
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        RouterTestingModule,
+        TranslateModule.forRoot(),
       ],
       declarations: [EPersonFormComponent],
       providers: [
@@ -204,7 +197,7 @@ describe('EPersonFormComponent', () => {
         { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
         EPeopleRegistryComponent
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -223,37 +216,13 @@ describe('EPersonFormComponent', () => {
   });
 
   describe('check form validation', () => {
-    let firstName;
-    let lastName;
-    let email;
-    let canLogIn;
-    let requireCertificate;
+    let canLogIn: boolean;
+    let requireCertificate: boolean;
 
-    let expected;
     beforeEach(() => {
-      firstName = 'testName';
-      lastName = 'testLastName';
-      email = 'testEmail@test.com';
       canLogIn = false;
       requireCertificate = false;
 
-      expected = Object.assign(new EPerson(), {
-        metadata: {
-          'eperson.firstname': [
-            {
-              value: firstName
-            }
-          ],
-          'eperson.lastname': [
-            {
-              value: lastName
-            },
-          ],
-        },
-        email: email,
-        canLogIn: canLogIn,
-        requireCertificate: requireCertificate,
-      });
       spyOn(component.submitForm, 'emit');
       component.canLogIn.value = canLogIn;
       component.requireCertificate.value = requireCertificate;
@@ -343,15 +312,13 @@ describe('EPersonFormComponent', () => {
         });
       }));
     });
-
-
-
   });
+
   describe('when submitting the form', () => {
     let firstName;
     let lastName;
     let email;
-    let canLogIn;
+    let canLogIn: boolean;
     let requireCertificate;
 
     let expected;
@@ -380,6 +347,7 @@ describe('EPersonFormComponent', () => {
         requireCertificate: requireCertificate,
       });
       spyOn(component.submitForm, 'emit');
+      component.ngOnInit();
       component.firstName.value = firstName;
       component.lastName.value = lastName;
       component.email.value = email;
@@ -421,9 +389,17 @@ describe('EPersonFormComponent', () => {
           email: email,
           canLogIn: canLogIn,
           requireCertificate: requireCertificate,
-          _links: undefined
+          _links: {
+            groups: {
+              href: '',
+            },
+            self: {
+              href: '',
+            },
+          },
         });
         spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
+        component.ngOnInit();
         component.onSubmit();
         fixture.detectChanges();
       });
@@ -473,22 +449,19 @@ describe('EPersonFormComponent', () => {
   });
 
   describe('delete', () => {
-
-    let ePersonId;
     let eperson: EPerson;
     let modalService;
 
     beforeEach(() => {
       spyOn(authService, 'impersonate').and.callThrough();
-      ePersonId = 'testEPersonId';
       eperson = EPersonMock;
       component.epersonInitial = eperson;
       component.canDelete$ = observableOf(true);
       spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(observableOf(eperson));
       modalService = (component as any).modalService;
       spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+      component.ngOnInit();
       fixture.detectChanges();
-
     });
 
     it('the delete button should be active if the eperson can be deleted', () => {
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index d009d56058..296038ca2b 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -137,6 +137,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   canImpersonate$: Observable<boolean>;
 
+  /**
+   * The current {@link EPerson}
+   */
+  activeEPerson$: Observable<EPerson>;
+
   /**
    * List of subscriptions
    */
@@ -195,7 +200,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     private epersonRegistrationService: EpersonRegistrationService,
     public dsoNameService: DSONameService,
   ) {
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+  }
+
+  ngOnInit() {
+    this.activeEPerson$ = this.epersonService.getActiveEPerson();
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;
       if (hasValue(eperson)) {
         this.isImpersonated = this.authService.isImpersonatingUser(eperson.id);
@@ -203,9 +212,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         this.submitLabel = 'form.submit';
       }
     }));
-  }
-
-  ngOnInit() {
     this.initialisePage();
   }
 
@@ -213,124 +219,112 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-
-    observableCombineLatest([
-      this.translateService.get(`${this.messagePrefix}.firstName`),
-      this.translateService.get(`${this.messagePrefix}.lastName`),
-      this.translateService.get(`${this.messagePrefix}.email`),
-      this.translateService.get(`${this.messagePrefix}.canLogIn`),
-      this.translateService.get(`${this.messagePrefix}.requireCertificate`),
-      this.translateService.get(`${this.messagePrefix}.emailHint`),
-    ]).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
-      this.firstName = new DynamicInputModel({
-        id: 'firstName',
-        label: firstName,
-        name: 'firstName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.lastName = new DynamicInputModel({
-        id: 'lastName',
-        label: lastName,
-        name: 'lastName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.email = new DynamicInputModel({
-        id: 'email',
-        label: email,
-        name: 'email',
-        validators: {
-          required: null,
-          pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
-        },
-        required: true,
-        errorMessages: {
-          emailTaken: 'error.validation.emailTaken',
-          pattern: 'error.validation.NotValidEmail'
-        },
-        hint: emailHint
-      });
-      this.canLogIn = new DynamicCheckboxModel(
-        {
-          id: 'canLogIn',
-          label: canLogIn,
-          name: 'canLogIn',
-          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
-        });
-      this.requireCertificate = new DynamicCheckboxModel(
-        {
-          id: 'requireCertificate',
-          label: requireCertificate,
-          name: 'requireCertificate',
-          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
-        });
-      this.formModel = [
-        this.firstName,
-        this.lastName,
-        this.email,
-        this.canLogIn,
-        this.requireCertificate,
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-        if (eperson != null) {
-          this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
-            currentPage: 1,
-            elementsPerPage: this.config.pageSize
-          });
-        }
-        this.formGroup.patchValue({
-          firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
-          lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
-          email: eperson != null ? eperson.email : '',
-          canLogIn: eperson != null ? eperson.canLogIn : true,
-          requireCertificate: eperson != null ? eperson.requireCertificate : false
-        });
-
-        if (eperson === null && !!this.formGroup.controls.email) {
-          this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService));
-          this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => {
-            this.changeDetectorRef.detectChanges();
-          });
-        }
-      }));
-
-      const activeEPerson$ = this.epersonService.getActiveEPerson();
-
-      this.groups = activeEPerson$.pipe(
-        switchMap((eperson) => {
-          return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
-            currentPage: 1,
-            elementsPerPage: this.config.pageSize
-          })]);
-        }),
-        switchMap(([eperson, findListOptions]) => {
-          if (eperson != null) {
-            return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
-          }
-          return observableOf(undefined);
-        })
-      );
-
-      this.canImpersonate$ = activeEPerson$.pipe(
-        switchMap((eperson) => {
-          if (hasValue(eperson)) {
-            return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
-          } else {
-            return observableOf(false);
-          }
-        })
-      );
-      this.canDelete$ = activeEPerson$.pipe(
-        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
-      );
-      this.canReset$ = observableOf(true);
+    this.firstName = new DynamicInputModel({
+      id: 'firstName',
+      label: this.translateService.instant(`${this.messagePrefix}.firstName`),
+      name: 'firstName',
+      validators: {
+        required: null,
+      },
+      required: true,
     });
+    this.lastName = new DynamicInputModel({
+      id: 'lastName',
+      label: this.translateService.instant(`${this.messagePrefix}.lastName`),
+      name: 'lastName',
+      validators: {
+        required: null,
+      },
+      required: true,
+    });
+    this.email = new DynamicInputModel({
+      id: 'email',
+      label: this.translateService.instant(`${this.messagePrefix}.email`),
+      name: 'email',
+      validators: {
+        required: null,
+        pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
+      },
+      required: true,
+      errorMessages: {
+        emailTaken: 'error.validation.emailTaken',
+        pattern: 'error.validation.NotValidEmail'
+      },
+      hint: this.translateService.instant(`${this.messagePrefix}.emailHint`),
+    });
+    this.canLogIn = new DynamicCheckboxModel(
+      {
+        id: 'canLogIn',
+        label: this.translateService.instant(`${this.messagePrefix}.canLogIn`),
+        name: 'canLogIn',
+        value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
+      });
+    this.requireCertificate = new DynamicCheckboxModel(
+      {
+        id: 'requireCertificate',
+        label: this.translateService.instant(`${this.messagePrefix}.requireCertificate`),
+        name: 'requireCertificate',
+        value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false)
+      });
+    this.formModel = [
+      this.firstName,
+      this.lastName,
+      this.email,
+      this.canLogIn,
+      this.requireCertificate,
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
+      if (eperson != null) {
+        this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
+          currentPage: 1,
+          elementsPerPage: this.config.pageSize
+        });
+      }
+      this.formGroup.patchValue({
+        firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
+        lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
+        email: eperson != null ? eperson.email : '',
+        canLogIn: eperson != null ? eperson.canLogIn : true,
+        requireCertificate: eperson != null ? eperson.requireCertificate : false
+      });
+
+      if (eperson === null && !!this.formGroup.controls.email) {
+        this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService));
+        this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => {
+          this.changeDetectorRef.detectChanges();
+        });
+      }
+    }));
+
+    this.groups = this.activeEPerson$.pipe(
+      switchMap((eperson) => {
+        return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
+          currentPage: 1,
+          elementsPerPage: this.config.pageSize
+        })]);
+      }),
+      switchMap(([eperson, findListOptions]) => {
+        if (eperson != null) {
+          return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
+        }
+        return observableOf(undefined);
+      })
+    );
+
+    this.canImpersonate$ = this.activeEPerson$.pipe(
+      switchMap((eperson) => {
+        if (hasValue(eperson)) {
+          return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self);
+        } else {
+          return observableOf(false);
+        }
+      })
+    );
+    this.canDelete$ = this.activeEPerson$.pipe(
+      switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
+    );
+    this.canReset$ = observableOf(true);
   }
 
   /**
@@ -348,7 +342,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created eperson using the EventEmitter submitForm
    */
   onSubmit() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe(
+    this.activeEPerson$.pipe(take(1)).subscribe(
       (ePerson: EPerson) => {
         const values = {
           metadata: {
@@ -464,7 +458,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * It'll either show a success or error message depending on whether the delete was successful or not.
    */
   delete(): void {
-    this.epersonService.getActiveEPerson().pipe(
+    this.activeEPerson$.pipe(
       take(1),
       switchMap((eperson: EPerson) => {
         const modalRef = this.modalService.open(ConfirmationModalComponent);
@@ -545,7 +539,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will ensure that the page gets reset and that the cache is cleared
    */
   reset() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
+    this.activeEPerson$.pipe(take(1)).subscribe((eperson: EPerson) => {
       this.requestService.removeByHrefSubstring(eperson.self);
     });
     this.initialisePage();
@@ -577,7 +571,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Update the list of groups by fetching it from the rest api or cache
    */
   private updateGroups(options) {
-    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+    this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
       this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }

From b17cc5d3c370b7f470a57005296dd55456c6d511 Mon Sep 17 00:00:00 2001
From: Mattia Vianelli <mattia.vianelli@4science.com>
Date: Wed, 5 Jun 2024 17:03:52 +0200
Subject: [PATCH 0379/1286] DSC-1709 provided label for cclicense required
 error

---
 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 8f20c657f9..bf866950bc 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1864,6 +1864,8 @@
 
   "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.cclicense.required": "You must grant this cclicense to complete your submission. If you are unable to grant the cclicense at this time, you may save your work and return later or remove the submission.",
+
   "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
 
   "error.validation.filerequired": "The file upload is mandatory",

From 8152d39ad0002a06dcfdc39861c94c78d0b7d2bc Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 3 Sep 2024 14:52:10 +0200
Subject: [PATCH 0380/1286] Ignore some paths from file watcher

Watching all these directories can cause systems to exceed
maximum watched files / inotify limits, especially in dev
mode with IDEs etc also watching files.
---
 webpack/webpack.browser.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webpack/webpack.browser.ts b/webpack/webpack.browser.ts
index 5a3b4910ae..168185ef24 100644
--- a/webpack/webpack.browser.ts
+++ b/webpack/webpack.browser.ts
@@ -35,5 +35,12 @@ module.exports = Object.assign({}, commonExports, {
       buildAppConfig(join(process.cwd(), 'src/assets/config.json'));
       return middlewares;
     }
-  }
+  },
+  watchOptions: {
+    // Ignore directories that should not be watched for recompiling angular
+    ignored: [
+      '**/node_modules', '**/_build', '**/.git', '**/docker',
+      '**/.angular', '**/.idea', '**/.vscode', '**/.history', '**/.vsix'
+    ]
+  },
 });

From d3019e4006aaa72f1dd8561a8d83050e48a9cebb Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 3 Sep 2024 18:44:49 +0200
Subject: [PATCH 0381/1286] 117287: Removed method calls returning observables
 from the Registry Formats page

---
 .../bitstream-formats.component.html          | 16 +++----
 .../bitstream-formats.component.spec.ts       | 22 ++++------
 .../bitstream-formats.component.ts            | 42 +++++++++----------
 3 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index 0a2e9f0f92..97740d5ea1 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -9,10 +9,10 @@
 
 
       <ds-pagination
-        *ngIf="(bitstreamFormats | async)?.payload?.totalElements > 0"
+        *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements > 0"
         [paginationOptions]="pageConfig"
-        [pageInfoState]="(bitstreamFormats | async)?.payload"
-        [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
+        [pageInfoState]="(bitstreamFormats$ | async)?.payload"
+        [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
         [hideGear]="false"
         [hidePagerWhenSinglePage]="true">
         <div class="table-responsive">
@@ -27,11 +27,11 @@
             </tr>
             </thead>
             <tbody>
-            <tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
+            <tr *ngFor="let bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page">
               <td>
                 <label class="mb-0">
                   <input type="checkbox"
-                         [checked]="isSelected(bitstreamFormat) | async"
+                         [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
                   >
                 </label>
@@ -45,13 +45,13 @@
           </table>
         </div>
       </ds-pagination>
-      <div *ngIf="(bitstreamFormats | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
+      <div *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
         {{'admin.registries.bitstream-formats.no-items' | translate}}
       </div>
 
       <div>
-        <button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
-        <button *ngIf="(bitstreamFormats | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
+        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index 8a44240b7e..ec59f57c80 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -15,8 +15,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../core/shared/bitstream-format-support-level';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import { hot } from 'jasmine-marbles';
 import {
   createNoContentRemoteDataObject$,
   createSuccessfulRemoteDataObject,
@@ -31,7 +30,6 @@ describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
   let fixture: ComponentFixture<BitstreamFormatsComponent>;
   let bitstreamFormatService;
-  let scheduler: TestScheduler;
   let notificationsServiceStub;
   let paginationService;
 
@@ -86,8 +84,6 @@ describe('BitstreamFormatsComponent', () => {
   const initAsync = () => {
     notificationsServiceStub = new NotificationsServiceStub();
 
-    scheduler = getTestScheduler();
-
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: observableOf(mockFormatsRD),
       find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
@@ -178,17 +174,17 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(initAsync));
     beforeEach(initBeforeEach);
     it('should return an observable of true if the provided bistream is in the list returned by the service', () => {
-      const result = comp.isSelected(bitstreamFormat1);
-
-      expect(result).toBeObservable(cold('b', { b: true }));
+      comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => {
+        expect(selectedBitstreamFormatIDs).toContain(bitstreamFormat1.id);
+      });
     });
     it('should return an observable of false if the provided bistream is not in the list returned by the service', () => {
       const format = new BitstreamFormat();
       format.uuid = 'new';
 
-      const result = comp.isSelected(format);
-
-      expect(result).toBeObservable(cold('b', { b: false }));
+      comp.selectedBitstreamFormatIDs().subscribe((selectedBitstreamFormatIDs: string[]) => {
+        expect(selectedBitstreamFormatIDs).not.toContain(format.id);
+      });
     });
   });
 
@@ -214,8 +210,6 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
-
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
           find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
@@ -263,8 +257,6 @@ describe('BitstreamFormatsComponent', () => {
     beforeEach(waitForAsync(() => {
         notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
-
         bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
           findAll: observableOf(mockFormatsRD),
           find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 162bf2bdb2..263c1aede2 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable} from 'rxjs';
+import { Observable} from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -7,7 +7,6 @@ import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { map, mergeMap, switchMap, take, toArray } from 'rxjs/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -26,7 +25,12 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   /**
    * A paginated list of bitstream formats to be shown on the page
    */
-  bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
+  bitstreamFormats$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
+
+  /**
+   * The currently selected {@link BitstreamFormat} IDs
+   */
+  selectedBitstreamFormatIDs$: Observable<string[]>;
 
   /**
    * The current pagination configuration for the page
@@ -39,7 +43,6 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   });
 
   constructor(private notificationsService: NotificationsService,
-              private router: Router,
               private translateService: TranslateService,
               private bitstreamFormatService: BitstreamFormatDataService,
               private paginationService: PaginationService,
@@ -94,14 +97,11 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Checks whether a given bitstream format is selected in the list (checkbox)
-   * @param bitstreamFormat
+   * Returns the list of all the bitstream formats that are selected in the list (checkbox)
    */
-  isSelected(bitstreamFormat: BitstreamFormat): Observable<boolean> {
+  selectedBitstreamFormatIDs(): Observable<string[]> {
     return this.bitstreamFormatService.getSelectedBitstreamFormats().pipe(
-      map((bitstreamFormats: BitstreamFormat[]) => {
-        return bitstreamFormats.find((selectedFormat) => selectedFormat.id === bitstreamFormat.id) != null;
-      })
+      map((bitstreamFormats: BitstreamFormat[]) => bitstreamFormats.map((selectedFormat) => selectedFormat.id)),
     );
   }
 
@@ -125,27 +125,23 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
     const prefix = 'admin.registries.bitstream-formats.delete';
     const suffix = success ? 'success' : 'failure';
 
-    const messages = observableCombineLatest(
-      this.translateService.get(`${prefix}.${suffix}.head`),
-      this.translateService.get(`${prefix}.${suffix}.amount`, {amount: amount})
-    );
-    messages.subscribe(([head, content]) => {
+    const head: string = this.translateService.instant(`${prefix}.${suffix}.head`);
+    const content: string = this.translateService.instant(`${prefix}.${suffix}.amount`, { amount: amount });
 
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
 
   ngOnInit(): void {
-
-    this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
+    this.bitstreamFormats$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
       switchMap((findListOptions: FindListOptions) => {
         return this.bitstreamFormatService.findAll(findListOptions);
       })
     );
+    this.selectedBitstreamFormatIDs$ = this.selectedBitstreamFormatIDs();
   }
 
 

From ea3970cfb5cdfcdfdebd5175d39c6b5237a95289 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:00:42 +0000
Subject: [PATCH 0382/1286] Bump webpack from 5.90.3 to 5.94.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.90.3 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.90.3...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 81b89f5d0c3ae65b0a56e03fba35d8be2a2ff075)
---
 package.json |  2 +-
 yarn.lock    | 58 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 516e2eb6c5..28845e606c 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.3.3",
-    "webpack": "5.90.3",
+    "webpack": "5.94.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
diff --git a/yarn.lock b/yarn.lock
index bd5a524f7f..c39b2ee7be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3307,7 +3307,7 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
   integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5":
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
   integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
@@ -3373,7 +3373,7 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5":
+"@webassemblyjs/wasm-edit@^1.11.5", "@webassemblyjs/wasm-edit@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
   integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
@@ -3408,7 +3408,7 @@
     "@webassemblyjs/wasm-gen" "1.12.1"
     "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5":
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
   integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
@@ -3496,6 +3496,11 @@ acorn-import-assertions@^1.9.0:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -5348,10 +5353,10 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.15.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
-  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
+enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6545,7 +6550,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -11863,10 +11868,10 @@ watchpack@2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-watchpack@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
-  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
+watchpack@^2.4.0, watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -12125,6 +12130,35 @@ webpack@5.90.3:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
+  dependencies:
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
+    webpack-sources "^3.2.3"
+
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"

From 4e05a5c3103a9208bb0f50cdc2314657f2c9c91a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 30 Aug 2024 20:49:38 +0200
Subject: [PATCH 0383/1286] Temporarily ignore type errors from
 EnvironmentPlugin since type matching is currently too strict

(cherry picked from commit 7dea5f7d98afc6a6ab2ac8438eea4b00dd00175d)
---
 webpack/webpack.common.ts |  1 +
 webpack/webpack.prod.ts   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 8d433edf39..d8155288cb 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -79,6 +79,7 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
+    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
     }),
diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts
index 559b7f1dc7..fce321d152 100644
--- a/webpack/webpack.prod.ts
+++ b/webpack/webpack.prod.ts
@@ -1,16 +1,17 @@
-import { commonExports } from './webpack.common';
-import { projectRoot } from './helpers';
+import { EnvironmentPlugin } from 'webpack';
 
-const webpack = require('webpack');
+import { projectRoot } from './helpers';
+import { commonExports } from './webpack.common';
 
 module.exports = Object.assign({}, commonExports, {
   plugins: [
     ...commonExports.plugins,
-    new webpack.EnvironmentPlugin({
+    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
+    new EnvironmentPlugin({
       'process.env': {
-        NODE_ENV: JSON.stringify('production'),
-        AOT: true
-      }
+        NODE_ENV: 'production',
+        AOT: true,
+      },
     }),
   ],
   mode: 'production',

From e561d1a4695f11018c83fedd8122c3d238d7c8f9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 30 Aug 2024 22:05:32 +0200
Subject: [PATCH 0384/1286] Remove webpack@5.90.3 since it causes issues with
 the tests

This automatically removed some old eslint dependencies, which caused some conflicts in the custom linting plugin

(cherry picked from commit 5f922c06e038c2909446b4ad36b47171f7d6baf3)
---
 .../src/rules/html/themed-component-usages.ts |  8 +-
 lint/src/rules/ts/themed-component-classes.ts |  4 +-
 .../rules/ts/themed-component-selectors.ts    |  4 +-
 lint/src/rules/ts/themed-component-usages.ts  |  4 +-
 lint/src/util/structure.ts                    | 16 ++--
 lint/src/util/typescript.ts                   | 11 +--
 lint/test/testing.ts                          |  2 +-
 yarn.lock                                     | 73 +++----------------
 8 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/lint/src/rules/html/themed-component-usages.ts b/lint/src/rules/html/themed-component-usages.ts
index 0b9a13456a..e907285dbc 100644
--- a/lint/src/rules/html/themed-component-usages.ts
+++ b/lint/src/rules/html/themed-component-usages.ts
@@ -7,10 +7,8 @@
  */
 import { TmplAstElement } from '@angular-eslint/bundled-angular-compiler';
 import { TemplateParserServices } from '@angular-eslint/utils';
-import {
-  ESLintUtils,
-  TSESLint,
-} from '@typescript-eslint/utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -52,7 +50,7 @@ The only exception to this rule are unit tests, where we may want to use the bas
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     if (getFilename(context).includes('.spec.ts')) {
       // skip inline templates in unit tests
       return {};
diff --git a/lint/src/rules/ts/themed-component-classes.ts b/lint/src/rules/ts/themed-component-classes.ts
index 66c37395b4..527655adfa 100644
--- a/lint/src/rules/ts/themed-component-classes.ts
+++ b/lint/src/rules/ts/themed-component-classes.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -57,7 +57,7 @@ export const info = {
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     if (filename.endsWith('.spec.ts')) {
diff --git a/lint/src/rules/ts/themed-component-selectors.ts b/lint/src/rules/ts/themed-component-selectors.ts
index e06f5ababf..c27fd66d66 100644
--- a/lint/src/rules/ts/themed-component-selectors.ts
+++ b/lint/src/rules/ts/themed-component-selectors.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import { getComponentSelectorNode } from '../../util/angular';
@@ -58,7 +58,7 @@ Unit tests are exempt from this rule, because they may redefine components using
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     if (filename.endsWith('.spec.ts')) {
diff --git a/lint/src/rules/ts/themed-component-usages.ts b/lint/src/rules/ts/themed-component-usages.ts
index 96e9962ccf..83fe6f8ea8 100644
--- a/lint/src/rules/ts/themed-component-usages.ts
+++ b/lint/src/rules/ts/themed-component-usages.ts
@@ -7,9 +7,9 @@
  */
 import {
   ESLintUtils,
-  TSESLint,
   TSESTree,
 } from '@typescript-eslint/utils';
+import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 
 import { fixture } from '../../../test/fixture';
 import {
@@ -68,7 +68,7 @@ There are a few exceptions where the base class can still be used:
 
 export const rule = ESLintUtils.RuleCreator.withoutDocs({
   ...info,
-  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+  create(context: RuleContext<Message, unknown[]>) {
     const filename = getFilename(context);
 
     function handleUnthemedUsagesInTypescript(node: TSESTree.Identifier) {
diff --git a/lint/src/util/structure.ts b/lint/src/util/structure.ts
index bfbf7ec7f2..13b2ef322b 100644
--- a/lint/src/util/structure.ts
+++ b/lint/src/util/structure.ts
@@ -5,13 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-import { TSESLint } from '@typescript-eslint/utils';
-import { RuleTester } from 'eslint';
+import {
+  InvalidTestCase,
+  RuleMetaData,
+  RuleModule,
+  ValidTestCase,
+} from '@typescript-eslint/utils/ts-eslint';
 import { EnumType } from 'typescript';
 
-export type Meta = TSESLint.RuleMetaData<string>;
-export type Valid = TSESLint.ValidTestCase<unknown[]> | RuleTester.ValidTestCase;
-export type Invalid = TSESLint.InvalidTestCase<string, unknown[]> | RuleTester.InvalidTestCase;
+export type Meta = RuleMetaData<string>;
+export type Valid = ValidTestCase<unknown[]>;
+export type Invalid = InvalidTestCase<string, unknown[]>;
 
 export interface DSpaceESLintRuleInfo {
   name: string;
@@ -28,7 +32,7 @@ export interface NamedTests {
 export interface RuleExports {
   Message: EnumType,
   info: DSpaceESLintRuleInfo,
-  rule: TSESLint.RuleModule<string>,
+  rule: RuleModule<string>,
   tests: NamedTests,
   default: unknown,
 }
diff --git a/lint/src/util/typescript.ts b/lint/src/util/typescript.ts
index 3fecad270e..0d04ef1a3d 100644
--- a/lint/src/util/typescript.ts
+++ b/lint/src/util/typescript.ts
@@ -5,17 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
+import { TSESTree } from '@typescript-eslint/utils';
 import {
-  TSESLint,
-  TSESTree,
-} from '@typescript-eslint/utils';
+  RuleContext,
+  SourceCode,
+} from '@typescript-eslint/utils/ts-eslint';
 
 import {
   match,
   toUnixStylePath,
 } from './misc';
 
-export type AnyRuleContext = TSESLint.RuleContext<string, unknown[]>;
+export type AnyRuleContext = RuleContext<string, unknown[]>;
 
 /**
  * Return the current filename based on the ESLint rule context as a Unix-style path.
@@ -27,7 +28,7 @@ export function getFilename(context: AnyRuleContext): string {
   return toUnixStylePath(context.getFilename());
 }
 
-export function getSourceCode(context: AnyRuleContext): TSESLint.SourceCode {
+export function getSourceCode(context: AnyRuleContext): SourceCode {
   // TSESLint claims this is deprecated, but the suggested alternative is undefined (could be a version mismatch between ESLint and TSESlint?)
   // eslint-disable-next-line deprecation/deprecation
   return context.getSourceCode();
diff --git a/lint/test/testing.ts b/lint/test/testing.ts
index cfa54c5b85..53faf32069 100644
--- a/lint/test/testing.ts
+++ b/lint/test/testing.ts
@@ -7,7 +7,7 @@
  */
 
 import { RuleTester as TypeScriptRuleTester } from '@typescript-eslint/rule-tester';
-import { RuleTester } from 'eslint';
+import { RuleTester } from '@typescript-eslint/utils/ts-eslint';
 
 import { themeableComponents } from '../src/util/theme-support';
 import {
diff --git a/yarn.lock b/yarn.lock
index c39b2ee7be..a6a2854c67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -123,7 +123,7 @@
     undici "6.7.1"
     vite "5.1.5"
     watchpack "2.4.0"
-    webpack "5.90.3"
+    webpack "5.94.0"
     webpack-dev-middleware "6.1.1"
     webpack-dev-server "4.15.1"
     webpack-merge "5.10.0"
@@ -194,7 +194,7 @@
     undici "6.11.1"
     vite "5.1.7"
     watchpack "2.4.0"
-    webpack "5.90.3"
+    webpack "5.94.0"
     webpack-dev-middleware "6.1.2"
     webpack-dev-server "4.15.1"
     webpack-merge "5.10.0"
@@ -2726,23 +2726,7 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
   integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02"
-  integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@1.0.5", "@types/estree@^1.0.5":
+"@types/estree@1.0.5", "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -2802,7 +2786,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3307,7 +3291,7 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
   integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@^1.12.1":
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
   integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
@@ -3373,7 +3357,7 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5", "@webassemblyjs/wasm-edit@^1.12.1":
+"@webassemblyjs/wasm-edit@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
   integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
@@ -3408,7 +3392,7 @@
     "@webassemblyjs/wasm-gen" "1.12.1"
     "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@^1.12.1":
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
   integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
@@ -3491,11 +3475,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
 acorn-import-attributes@^1.9.5:
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
@@ -5353,7 +5332,7 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -5652,9 +5631,11 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -6550,7 +6531,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -11868,7 +11849,7 @@ watchpack@2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-watchpack@^2.4.0, watchpack@^2.4.1:
+watchpack@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
   integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
@@ -12100,36 +12081,6 @@ webpack-subresource-integrity@5.1.0:
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.90.3:
-  version "5.90.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
-  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
 webpack@5.94.0:
   version "5.94.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"

From fa95f56be0f67c200f0b8d2b982894b5750e151c Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 3 Sep 2024 14:52:10 +0200
Subject: [PATCH 0385/1286] Ignore some paths from file watcher

Watching all these directories can cause systems to exceed
maximum watched files / inotify limits, especially in dev
mode with IDEs etc also watching files.

(cherry picked from commit 8152d39ad0002a06dcfdc39861c94c78d0b7d2bc)
---
 webpack/webpack.browser.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webpack/webpack.browser.ts b/webpack/webpack.browser.ts
index 5a3b4910ae..168185ef24 100644
--- a/webpack/webpack.browser.ts
+++ b/webpack/webpack.browser.ts
@@ -35,5 +35,12 @@ module.exports = Object.assign({}, commonExports, {
       buildAppConfig(join(process.cwd(), 'src/assets/config.json'));
       return middlewares;
     }
-  }
+  },
+  watchOptions: {
+    // Ignore directories that should not be watched for recompiling angular
+    ignored: [
+      '**/node_modules', '**/_build', '**/.git', '**/docker',
+      '**/.angular', '**/.idea', '**/.vscode', '**/.history', '**/.vsix'
+    ]
+  },
 });

From 91b8829ee4cddfc9f50117d63ba7c2edd630a896 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 3 Sep 2024 14:52:10 +0200
Subject: [PATCH 0386/1286] Ignore some paths from file watcher

Watching all these directories can cause systems to exceed
maximum watched files / inotify limits, especially in dev
mode with IDEs etc also watching files.

(cherry picked from commit 8152d39ad0002a06dcfdc39861c94c78d0b7d2bc)
---
 webpack/webpack.browser.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webpack/webpack.browser.ts b/webpack/webpack.browser.ts
index 5a3b4910ae..168185ef24 100644
--- a/webpack/webpack.browser.ts
+++ b/webpack/webpack.browser.ts
@@ -35,5 +35,12 @@ module.exports = Object.assign({}, commonExports, {
       buildAppConfig(join(process.cwd(), 'src/assets/config.json'));
       return middlewares;
     }
-  }
+  },
+  watchOptions: {
+    // Ignore directories that should not be watched for recompiling angular
+    ignored: [
+      '**/node_modules', '**/_build', '**/.git', '**/docker',
+      '**/.angular', '**/.idea', '**/.vscode', '**/.history', '**/.vsix'
+    ]
+  },
 });

From 5ddfca71a151534a8353b9b9f2aa41fde4d8b5ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:02:42 +0000
Subject: [PATCH 0387/1286] Bump micromatch from 4.0.5 to 4.0.8

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit aca752a01e3c6f3dc57bf7ac67db1ec31d88dac1)
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a6a2854c67..088a58c101 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4071,7 +4071,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -8137,11 +8137,11 @@ methods@~1.1.2:
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":

From 4ee1c8307311d072ff3e7d0fea997fbaeba80ad7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 4 Sep 2024 17:02:50 -0500
Subject: [PATCH 0388/1286] Bump micromatch to 4.0.8

---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0a0d2b3913..c6f4d25211 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3728,7 +3728,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -8092,11 +8092,11 @@ mhchemparser@^4.1.0:
   integrity sha512-R75CUN6O6e1t8bgailrF1qPq+HhVeFTM3XQ0uzI+mXTybmphy3b6h4NbLOYhemViQ3lUs+6CKRkC3Ws1TlYREA==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":

From 680ed3bccf38732ada602a7f01487c60035067ac Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 3 Sep 2024 22:08:38 +0200
Subject: [PATCH 0389/1286] 117287: Removed method calls returning observables
 from the Group form

---
 .../group-form/group-form.component.html      |  35 +-
 .../group-form/group-form.component.spec.ts   | 140 +++++---
 .../group-form/group-form.component.ts        | 337 ++++++++----------
 3 files changed, 259 insertions(+), 253 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 77a81a8daa..546d4598df 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
@@ -2,7 +2,7 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
+      <div *ngIf="activeGroup$ | async; then editheader; else createHeader"></div>
 
       <ng-template #createHeader>
         <h2 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h2>
@@ -23,11 +23,15 @@
         </h2>
       </ng-template>
 
-      <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertTypeEnum.Warning"
-                [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-      <ds-alert *ngIf="!(canEdit$ | async) && (groupDataService.getActiveGroup() | async)" [type]="AlertTypeEnum.Warning"
-                [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName((getLinkedDSO(groupBeingEdited) | async)?.payload), comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
-      </ds-alert>
+      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
+        <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
+                  [content]="messagePrefix + '.alert.permanent'"></ds-alert>
+        <ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
+          <ds-alert *ngIf="!(canEdit$ | async)" [type]="AlertType.Warning"
+                    [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
+          </ds-alert>
+        </ng-container>
+      </ng-container>
 
       <ds-form [formId]="formId"
                [formModel]="formModel"
@@ -39,7 +43,7 @@
           <button (click)="onCancel()"
                   class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
         </div>
-        <div after *ngIf="groupBeingEdited != null" class="btn-group">
+        <div after *ngIf="(activeGroup$ | async) as groupBeingEdited" class="btn-group">
           <button class="btn btn-danger delete-button" [disabled]="!(canEdit$ | async) || groupBeingEdited.permanent"
                   (click)="delete()">
             <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
@@ -47,15 +51,14 @@
         </div>
       </ds-form>
 
-      <div class="mb-5">
-        <ds-members-list *ngIf="groupBeingEdited != null"
-                         [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-      </div>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"
-                         [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-
-
-
+      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
+        <div class="mb-5">
+          <ds-members-list *ngIf="groupBeingEdited != null"
+                           [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+        </div>
+        <ds-subgroups-list *ngIf="groupBeingEdited != null"
+                           [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
+      </ng-container>
     </div>
   </div>
 </div>
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 f8c5f3cd87..8d148b66fb 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
@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
@@ -29,8 +29,6 @@ import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
 import { GroupFormComponent } from './group-form.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { Operation } from 'fast-json-patch';
@@ -38,23 +36,24 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
   let fixture: ComponentFixture<GroupFormComponent>;
-  let translateService: TranslateService;
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
   let dsoDataServiceStub: any;
   let authorizationService: AuthorizationDataService;
   let notificationService: NotificationsServiceStub;
-  let router;
+  let router: RouterMock;
+  let route: ActivatedRouteStub;
 
-  let groups;
-  let groupName;
-  let groupDescription;
-  let expected;
+  let groups: Group[];
+  let groupName: string;
+  let groupDescription: string;
+  let expected: Group;
 
   beforeEach(waitForAsync(() => {
     groups = [GroupMock, GroupMock2];
@@ -69,6 +68,15 @@ describe('GroupFormComponent', () => {
           }
         ],
       },
+      object: createSuccessfulRemoteDataObject$(undefined),
+      _links: {
+        self: {
+          href: 'group-selflink',
+        },
+        object: {
+          href: 'group-objectlink',
+        }
+      },
     });
     ePersonDataServiceStub = {};
     groupsDataServiceStub = {
@@ -105,7 +113,14 @@ describe('GroupFormComponent', () => {
       create(group: Group): Observable<RemoteData<Group>> {
         this.allGroups = [...this.allGroups, group];
         this.createdGroup = Object.assign({}, group, {
-          _links: { self: { href: 'group-selflink' } }
+          _links: {
+            self: {
+              href: 'group-selflink',
+            },
+            object: {
+              href: 'group-objectlink',
+            },
+          },
         });
         return createSuccessfulRemoteDataObject$(this.createdGroup);
       },
@@ -187,17 +202,13 @@ describe('GroupFormComponent', () => {
         return typeof value === 'object' && value !== null;
       }
     });
-    translateService = getMockTranslateService();
     router = new RouterMock();
+    route = new ActivatedRouteStub();
     notificationService = new NotificationsServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        TranslateModule.forRoot(),
       ],
       declarations: [GroupFormComponent],
       providers: [
@@ -214,14 +225,11 @@ describe('GroupFormComponent', () => {
         { provide: Store, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
         { provide: HALEndpointService, useValue: {} },
-        {
-          provide: ActivatedRoute,
-          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) }
-        },
+        { provide: ActivatedRoute, useValue: route },
         { provide: Router, useValue: router },
         { provide: AuthorizationDataService, useValue: authorizationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -234,8 +242,8 @@ describe('GroupFormComponent', () => {
   describe('when submitting the form', () => {
     beforeEach(() => {
       spyOn(component.submitForm, 'emit');
-      component.groupName.value = groupName;
-      component.groupDescription.value = groupDescription;
+      component.groupName.setValue(groupName);
+      component.groupDescription.setValue(groupDescription);
     });
     describe('without active Group', () => {
       beforeEach(() => {
@@ -243,14 +251,22 @@ describe('GroupFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new group using the correct values', (async () => {
-        await fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
+      it('should emit a new group using the correct values', (() => {
+        expect(component.submitForm.emit).toHaveBeenCalledWith(jasmine.objectContaining({
+          name: groupName,
+          metadata: {
+            'dc.description': [
+              {
+                value: groupDescription,
+              },
+            ],
+          },
+        }));
       }));
     });
+
     describe('with active Group', () => {
-      let expected2;
+      let expected2: Group;
       beforeEach(() => {
         expected2 = Object.assign(new Group(), {
           name: 'newGroupName',
@@ -261,15 +277,24 @@ describe('GroupFormComponent', () => {
               }
             ],
           },
+          object: createSuccessfulRemoteDataObject$(undefined),
+          _links: {
+            self: {
+              href: 'group-selflink',
+            },
+            object: {
+              href: 'group-objectlink',
+            },
+          },
         });
         spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf(expected));
         spyOn(groupsDataServiceStub, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(expected2));
-        component.groupName.value = 'newGroupName';
-        component.onSubmit();
-        fixture.detectChanges();
+        component.ngOnInit();
       });
 
       it('should edit with name and description operations', () => {
+        component.groupName.setValue('newGroupName');
+        component.onSubmit();
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
@@ -283,9 +308,8 @@ describe('GroupFormComponent', () => {
       });
 
       it('should edit with description operations', () => {
-        component.groupName.value = null;
+        component.groupName.setValue(null);
         component.onSubmit();
-        fixture.detectChanges();
         const operations = [{
           op: 'add',
           path: '/metadata/dc.description',
@@ -295,9 +319,9 @@ describe('GroupFormComponent', () => {
       });
 
       it('should edit with name operations', () => {
-        component.groupDescription.value = null;
+        component.groupName.setValue('newGroupName');
+        component.groupDescription.setValue(null);
         component.onSubmit();
-        fixture.detectChanges();
         const operations = [{
           op: 'replace',
           path: '/name',
@@ -306,12 +330,13 @@ describe('GroupFormComponent', () => {
         expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
       });
 
-      it('should emit the existing group using the correct new values', (async () => {
-        await fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
-        });
-      }));
+      it('should emit the existing group using the correct new values', () => {
+        component.onSubmit();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
+      });
+
       it('should emit success notification', () => {
+        component.onSubmit();
         expect(notificationService.success).toHaveBeenCalled();
       });
     });
@@ -326,11 +351,8 @@ describe('GroupFormComponent', () => {
 
 
   describe('check form validation', () => {
-    let groupCommunity;
-
     beforeEach(() => {
       groupName = 'testName';
-      groupCommunity = 'testgroupCommunity';
       groupDescription = 'testgroupDescription';
 
       expected = Object.assign(new Group(), {
@@ -342,8 +364,17 @@ describe('GroupFormComponent', () => {
             }
           ],
         },
+        _links: {
+          self: {
+            href: 'group-selflink',
+          },
+          object: {
+            href: 'group-objectlink',
+          },
+        },
       });
       spyOn(component.submitForm, 'emit');
+      spyOn(dsoDataServiceStub, 'findByHref').and.returnValue(observableOf(expected));
 
       fixture.detectChanges();
       component.initialisePage();
@@ -393,21 +424,20 @@ describe('GroupFormComponent', () => {
   });
 
   describe('delete', () => {
-    let deleteButton;
-
-    beforeEach(() => {
-      component.initialisePage();
+    let deleteButton: HTMLButtonElement;
 
+    beforeEach(async () => {
+      spyOn(groupsDataServiceStub, 'delete').and.callThrough();
+      component.activeGroup$ = observableOf({
+        id: 'active-group',
+        permanent: false,
+      } as Group);
       component.canEdit$ = observableOf(true);
-      component.groupBeingEdited = {
-        permanent: false
-      } as Group;
+
+      component.initialisePage();
 
       fixture.detectChanges();
       deleteButton = fixture.debugElement.query(By.css('.delete-button')).nativeElement;
-
-      spyOn(groupsDataServiceStub, 'delete').and.callThrough();
-      spyOn(groupsDataServiceStub, 'getActiveGroup').and.returnValue(observableOf({ id: 'active-group' }));
     });
 
     describe('if confirmed via modal', () => {
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 3c0547cca5..37ce30473f 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
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output, ChangeDetectorRef } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
+import { UntypedFormGroup, AbstractControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
@@ -10,13 +10,10 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  ObservedValueOf,
-  combineLatest as observableCombineLatest,
   Observable,
-  of as observableOf,
-  Subscription,
+  Subscription, combineLatest,
 } from 'rxjs';
-import { catchError, map, switchMap, take, filter, debounceTime } from 'rxjs/operators';
+import { map, switchMap, take, debounceTime, startWith, filter } from 'rxjs/operators';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
@@ -25,21 +22,20 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { Group } from '../../../core/eperson/models/group.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Community } from '../../../core/shared/community.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import {
+  getAllCompletedRemoteData,
   getRemoteDataPayload,
   getFirstSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
 } from '../../../core/shared/operators';
 import { AlertType } from '../../../shared/alert/aletr-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, hasValueOperator, hasNoValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -68,9 +64,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   /**
    * Dynamic models for the inputs of form
    */
-  groupName: DynamicInputModel;
-  groupCommunity: DynamicInputModel;
-  groupDescription: DynamicTextAreaModel;
+  groupName: AbstractControl;
+  groupCommunity: AbstractControl;
+  groupDescription: AbstractControl;
 
   /**
    * A list of all dynamic input models
@@ -113,21 +109,30 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   subs: Subscription[] = [];
 
-  /**
-   * Group currently being edited
-   */
-  groupBeingEdited: Group;
-
   /**
    * Observable whether or not the logged in user is allowed to delete the Group & doesn't have a linked object (community / collection linked to workspace group
    */
   canEdit$: Observable<boolean>;
 
   /**
-   * The AlertType enumeration
-   * @type {AlertType}
+   * The current {@link Group}
    */
-  public AlertTypeEnum = AlertType;
+  activeGroup$: Observable<Group>;
+
+  /**
+   * The current {@link Group}'s linked {@link Community}/{@link Collection}
+   */
+  activeGroupLinkedDSO$: Observable<DSpaceObject>;
+
+  /**
+   * Link to the current {@link Group}'s {@link Community}/{@link Collection} edit role tab
+   */
+  linkedEditRolesRoute$: Observable<string>;
+
+  /**
+   * The AlertType enumeration
+   */
+  public readonly AlertType = AlertType;
 
   /**
    * Subscription to email field value change
@@ -137,124 +142,110 @@ export class GroupFormComponent implements OnInit, OnDestroy {
 
   constructor(
     public groupDataService: GroupDataService,
-    private ePersonDataService: EPersonDataService,
-    private dSpaceObjectDataService: DSpaceObjectDataService,
-    private formBuilderService: FormBuilderService,
-    private translateService: TranslateService,
-    private notificationsService: NotificationsService,
-    private route: ActivatedRoute,
+    protected dSpaceObjectDataService: DSpaceObjectDataService,
+    protected formBuilderService: FormBuilderService,
+    protected translateService: TranslateService,
+    protected notificationsService: NotificationsService,
+    protected route: ActivatedRoute,
     protected router: Router,
-    private authorizationService: AuthorizationDataService,
-    private modalService: NgbModal,
+    protected authorizationService: AuthorizationDataService,
+    protected modalService: NgbModal,
     public requestService: RequestService,
     protected changeDetectorRef: ChangeDetectorRef,
     public dsoNameService: DSONameService,
   ) {
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
+    if (this.route.snapshot.params.groupId !== 'newGroup') {
+      this.setActiveGroup(this.route.snapshot.params.groupId);
+    }
+    this.activeGroup$ = this.groupDataService.getActiveGroup();
+    this.activeGroupLinkedDSO$ = this.getActiveGroupLinkedDSO();
+    this.linkedEditRolesRoute$ = this.getLinkedEditRolesRoute();
+    this.canEdit$ = this.activeGroupLinkedDSO$.pipe(
+      filter((dso: DSpaceObject) => hasNoValue(dso)),
+      switchMap(() => this.activeGroup$),
+      hasValueOperator(),
+      switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
+      startWith(false),
+    );
     this.initialisePage();
   }
 
   initialisePage() {
-    this.subs.push(this.route.params.subscribe((params) => {
-      if (params.groupId !== 'newGroup') {
-        this.setActiveGroup(params.groupId);
-      }
-    }));
-    this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
-      hasValueOperator(),
-      switchMap((group: Group) => {
-        return observableCombineLatest(
-          this.authorizationService.isAuthorized(FeatureID.CanDelete, isNotEmpty(group) ? group.self : undefined),
-          this.hasLinkedDSO(group),
-          (isAuthorized: ObservedValueOf<Observable<boolean>>, hasLinkedDSO: ObservedValueOf<Observable<boolean>>) => {
-            return isAuthorized && !hasLinkedDSO;
-          });
+    const groupNameModel = new DynamicInputModel({
+      id: 'groupName',
+      label: this.translateService.instant(`${this.messagePrefix}.groupName`),
+      name: 'groupName',
+      validators: {
+        required: null,
+      },
+      required: true,
+    });
+    const groupCommunityModel = new DynamicInputModel({
+      id: 'groupCommunity',
+      label: this.translateService.instant(`${this.messagePrefix}.groupCommunity`),
+      name: 'groupCommunity',
+      required: false,
+      readOnly: true,
+    });
+    const groupDescriptionModel = new DynamicTextAreaModel({
+      id: 'groupDescription',
+      label: this.translateService.instant(`${this.messagePrefix}.groupDescription`),
+      name: 'groupDescription',
+      required: false,
+      spellCheck: environment.form.spellCheck,
+    });
+    this.formModel = [
+      groupNameModel,
+      groupDescriptionModel,
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.groupName = this.formGroup.get('groupName');
+    this.groupDescription = this.formGroup.get('groupDescription');
+
+    if (hasValue(this.groupName)) {
+      this.groupName.setAsyncValidators(ValidateGroupExists.createValidator(this.groupDataService));
+      this.groupNameValueChangeSubscribe = this.groupName.valueChanges.pipe(debounceTime(300)).subscribe(() => {
+        this.changeDetectorRef.detectChanges();
+      });
+    }
+
+    this.subs.push(
+      combineLatest([
+        this.activeGroup$,
+        this.canEdit$,
+        this.activeGroupLinkedDSO$.pipe(take(1)),
+      ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
+
+        if (activeGroup != null) {
+
+          // Disable group name exists validator
+          this.formGroup.controls.groupName.clearAsyncValidators();
+
+          if (linkedObject?.name) {
+            this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, groupCommunityModel);
+            this.groupDescription = this.formGroup.get('groupCommunity');
+            this.formGroup.patchValue({
+              groupName: activeGroup.name,
+              groupCommunity: linkedObject?.name ?? '',
+              groupDescription: activeGroup.firstMetadataValue('dc.description'),
+            });
+          } else {
+            this.formGroup.patchValue({
+              groupName: activeGroup.name,
+              groupDescription: activeGroup.firstMetadataValue('dc.description'),
+            });
+          }
+          setTimeout(() => {
+            if (!canEdit || activeGroup.permanent) {
+              this.formGroup.disable();
+            }
+          }, 200);
+        }
       })
     );
-    observableCombineLatest(
-      this.translateService.get(`${this.messagePrefix}.groupName`),
-      this.translateService.get(`${this.messagePrefix}.groupCommunity`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`)
-    ).subscribe(([groupName, groupCommunity, groupDescription]) => {
-      this.groupName = new DynamicInputModel({
-        id: 'groupName',
-        label: groupName,
-        name: 'groupName',
-        validators: {
-          required: null,
-        },
-        required: true,
-      });
-      this.groupCommunity = new DynamicInputModel({
-        id: 'groupCommunity',
-        label: groupCommunity,
-        name: 'groupCommunity',
-        required: false,
-        readOnly: true,
-      });
-      this.groupDescription = new DynamicTextAreaModel({
-        id: 'groupDescription',
-        label: groupDescription,
-        name: 'groupDescription',
-        required: false,
-        spellCheck: environment.form.spellCheck,
-      });
-      this.formModel = [
-        this.groupName,
-        this.groupDescription,
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-
-      if (!!this.formGroup.controls.groupName) {
-        this.formGroup.controls.groupName.setAsyncValidators(ValidateGroupExists.createValidator(this.groupDataService));
-        this.groupNameValueChangeSubscribe = this.groupName.valueChanges.pipe(debounceTime(300)).subscribe(() => {
-          this.changeDetectorRef.detectChanges();
-        });
-      }
-
-      this.subs.push(
-        observableCombineLatest(
-          this.groupDataService.getActiveGroup(),
-          this.canEdit$,
-          this.groupDataService.getActiveGroup()
-            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload())))
-        ).subscribe(([activeGroup, canEdit, linkedObject]) => {
-
-          if (activeGroup != null) {
-
-            // Disable group name exists validator
-            this.formGroup.controls.groupName.clearAsyncValidators();
-
-            this.groupBeingEdited = activeGroup;
-
-            if (linkedObject?.name) {
-              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
-              this.formGroup.patchValue({
-                groupName: activeGroup.name,
-                groupCommunity: linkedObject?.name ?? '',
-                groupDescription: activeGroup.firstMetadataValue('dc.description'),
-              });
-            } else {
-              this.formModel = [
-                this.groupName,
-                this.groupDescription,
-              ];
-              this.formGroup.patchValue({
-                groupName: activeGroup.name,
-                groupDescription: activeGroup.firstMetadataValue('dc.description'),
-              });
-            }
-            setTimeout(() => {
-              if (!canEdit || activeGroup.permanent) {
-                this.formGroup.disable();
-              }
-            }, 200);
-          }
-        })
-      );
-    });
   }
 
   /**
@@ -273,25 +264,22 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created eperson using the EventEmitter submitForm
    */
   onSubmit() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe(
-      (group: Group) => {
-        const values = {
+    this.activeGroup$.pipe(take(1)).subscribe((group: Group) => {
+      if (group === null) {
+        this.createNewGroup({
           name: this.groupName.value,
           metadata: {
             'dc.description': [
               {
-                value: this.groupDescription.value
-              }
-            ]
+                value: this.groupDescription.value,
+              },
+            ],
           },
-        };
-        if (group === null) {
-          this.createNewGroup(values);
-        } else {
-          this.editGroup(group);
-        }
+        });
+      } else {
+        this.editGroup(group);
       }
-    );
+    });
   }
 
   /**
@@ -397,7 +385,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * @param groupSelfLink   SelfLink of group to set as active
    */
   setActiveGroupWithLink(groupSelfLink: string) {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
+    this.activeGroup$.pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup === null) {
         this.groupDataService.cancelEditGroup();
         this.groupDataService.findByHref(groupSelfLink, false, false, followLink('subgroups'), followLink('epersons'), followLink('object'))
@@ -416,7 +404,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    * It'll either show a success or error message depending on whether the delete was successful or not.
    */
   delete() {
-    this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
+    this.activeGroup$.pipe(take(1)).subscribe((group: Group) => {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
       modalRef.componentInstance.dso = group;
       modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-group.modal.header';
@@ -460,52 +448,37 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * Check if group has a linked object (community or collection linked to a workflow group)
-   * @param group
+   * Get the active {@link Group}'s linked object if it has one ({@link Community} or {@link Collection} linked to a
+   * workflow group)
    */
-  hasLinkedDSO(group: Group): Observable<boolean> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      return this.getLinkedDSO(group).pipe(
-        map((rd: RemoteData<DSpaceObject>) => {
-          return hasValue(rd) && hasValue(rd.payload);
-        }),
-        catchError(() => observableOf(false)),
-      );
-    }
+  getActiveGroupLinkedDSO(): Observable<DSpaceObject> {
+    return this.activeGroup$.pipe(
+      hasValueOperator(),
+      switchMap((group: Group) => {
+        if (group.object === undefined) {
+          return this.dSpaceObjectDataService.findByHref(group._links.object.href);
+        }
+        return group.object;
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+    );
   }
 
   /**
-   * Get group's linked object if it has one (community or collection linked to a workflow group)
-   * @param group
+   * Get the route to the edit roles tab of the active {@link Group}'s linked object (community or collection linked
+   * to a workflow group) if it has one
    */
-  getLinkedDSO(group: Group): Observable<RemoteData<DSpaceObject>> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      if (group.object === undefined) {
-        return this.dSpaceObjectDataService.findByHref(group._links.object.href);
-      }
-      return group.object;
-    }
-  }
-
-  /**
-   * Get the route to the edit roles tab of the group's linked object (community or collection linked to a workflow group) if it has one
-   * @param group
-   */
-  getLinkedEditRolesRoute(group: Group): Observable<string> {
-    if (hasValue(group) && hasValue(group._links.object.href)) {
-      return this.getLinkedDSO(group).pipe(
-        map((rd: RemoteData<DSpaceObject>) => {
-          if (hasValue(rd) && hasValue(rd.payload)) {
-            const dso = rd.payload;
-            switch ((dso as any).type) {
-              case Community.type.value:
-                return getCommunityEditRolesRoute(rd.payload.id);
-              case Collection.type.value:
-                return getCollectionEditRolesRoute(rd.payload.id);
-            }
-          }
-        })
-      );
-    }
+  getLinkedEditRolesRoute(): Observable<string> {
+    return this.activeGroupLinkedDSO$.pipe(
+      map((dso: DSpaceObject) => {
+        switch ((dso as any).type) {
+          case Community.type.value:
+            return getCommunityEditRolesRoute(dso.id);
+          case Collection.type.value:
+            return getCollectionEditRolesRoute(dso.id);
+        }
+      })
+    );
   }
 }

From b55686e1870cfb5083832239b5b2dbe18160c419 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 3 Sep 2024 22:32:32 +0200
Subject: [PATCH 0390/1286] 117287: Removed method calls returning observables
 from the pagination component

---
 .../pagination/pagination.component.html      |   2 +-
 .../shared/pagination/pagination.component.ts | 104 +++++++++---------
 2 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 7d90c6a439..d1a820b1da 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -3,7 +3,7 @@
     <div class="row">
       <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
           <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
-          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(getShowingDetails(collectionSize)|async)}}</span>
+          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
       </div>
       <div class="col">
         <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 6da813cbc7..0e39345595 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -4,27 +4,33 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnChanges,
   OnDestroy,
   OnInit,
   Output,
-  ViewEncapsulation
+  SimpleChanges,
+  ViewEncapsulation,
 } from '@angular/core';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { Observable, of as observableOf, Subscription, switchMap } from 'rxjs';
 
 import { HostWindowService } from '../host-window.service';
-import { HostWindowState } from '../search/host-window.reducer';
 import { PaginationComponentOptions } from './pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { hasValue } from '../empty.util';
+import { hasValue, hasValueOperator } from '../empty.util';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } from 'rxjs/operators';
+import { map, take, startWith } from 'rxjs/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { ViewMode } from '../../core/shared/view-mode.model';
 
+interface PaginationDetails {
+  range: string;
+  total: number;
+}
+
 /**
  * The default pagination controls component.
  */
@@ -36,7 +42,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated
 })
-export class PaginationComponent implements OnDestroy, OnInit {
+export class PaginationComponent implements OnChanges, OnDestroy, OnInit {
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
    */
@@ -143,11 +149,6 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   public currentPageState: number = undefined;
 
-  /**
-   * An observable of HostWindowState type
-   */
-  public hostWindow: Observable<HostWindowState>;
-
   /**
    * ID for the pagination instance. This ID is used in the routing to retrieve the pagination options.
    * This ID needs to be unique between different pagination components when more than one will be displayed on the same page.
@@ -186,6 +187,9 @@ export class PaginationComponent implements OnDestroy, OnInit {
   public sortField$;
   public defaultSortField = 'name';
 
+
+  public showingDetails$: Observable<PaginationDetails>;
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -214,6 +218,12 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.initializeConfig();
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.collectionSize.currentValue !== changes.collectionSize.previousValue) {
+      this.showingDetails$ = this.getShowingDetails(this.collectionSize);
+    }
+  }
+
   /**
    * Method provided by Angular. Invoked when the instance is destroyed.
    */
@@ -251,19 +261,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
       );
   }
 
-  /**
-   * @param cdRef
-   *    ChangeDetectorRef is a singleton service provided by Angular.
-   * @param route
-   *    Route is a singleton service provided by Angular.
-   * @param router
-   *    Router is a singleton service provided by Angular.
-   * @param hostWindowService
-   *    the HostWindowService singleton.
-   */
-  constructor(private cdRef: ChangeDetectorRef,
-              private paginationService: PaginationService,
-              public hostWindowService: HostWindowService) {
+  constructor(
+    protected cdRef: ChangeDetectorRef,
+    protected paginationService: PaginationService,
+    public hostWindowService: HostWindowService,
+  ) {
   }
 
   /**
@@ -299,17 +301,6 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.emitPaginationChange();
   }
 
-  /**
-   * Method to change the route to the given sort field
-   *
-   * @param sortField
-   *    The sort field being navigated to.
-   */
-  public doSortFieldChange(field: string) {
-    this.updateParams({ pageId: this.id, page: 1, sortField: field });
-    this.emitPaginationChange();
-  }
-
   /**
    * Method to emit a general pagination change event
    */
@@ -328,26 +319,31 @@ export class PaginationComponent implements OnDestroy, OnInit {
   /**
    * Method to get pagination details of the current viewed page.
    */
-  public getShowingDetails(collectionSize: number): Observable<any> {
-    let showingDetails = observableOf({ range: null + ' - ' + null, total: null });
-    if (collectionSize) {
-      showingDetails = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-        map((currentPaginationOptions) => {
-          let firstItem;
-          let lastItem;
-          const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
+  public getShowingDetails(collectionSize: number): Observable<PaginationDetails> {
+    return observableOf(collectionSize).pipe(
+      hasValueOperator(),
+      switchMap(() => this.paginationService.getCurrentPagination(this.id, this.paginationOptions)),
+      map((currentPaginationOptions) => {
+        let firstItem: number;
+        let lastItem: number;
+        const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
 
-          firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
-          if (collectionSize > pageMax) {
-            lastItem = pageMax;
-          } else {
-            lastItem = collectionSize;
-          }
-          return {range: firstItem + ' - ' + lastItem, total: collectionSize};
-        })
-      );
-    }
-    return showingDetails;
+        firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
+        if (collectionSize > pageMax) {
+          lastItem = pageMax;
+        } else {
+          lastItem = collectionSize;
+        }
+        return {
+          range: `${firstItem} - ${lastItem}`,
+          total: collectionSize,
+        };
+      }),
+      startWith({
+        range: `${null} - ${null}`,
+        total: null,
+      }),
+    );
   }
 
   /**

From 7fc54ec6f717f993166deef4697e43eb81797691 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Mon, 8 Jul 2024 14:44:39 +0300
Subject: [PATCH 0391/1286] Remove yarn.lock

---
 yarn.lock | 12346 ----------------------------------------------------
 1 file changed, 12346 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 088a58c101..0000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,12346 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
-"@ampproject/remapping@2.3.0", "@ampproject/remapping@^2.2.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
-  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@angular-builders/common@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@angular-builders/common/-/common-1.0.2.tgz#84fbfa7713e71beb6d0f52ef76b266c949e67892"
-  integrity sha512-lUusRq6jN1It5LcUTLS6Q+AYAYGTo/EEN8hV0M6Ek9qXzweAouJaSEnwv7p04/pD7yJTl0YOCbN79u+wGm3x4g==
-  dependencies:
-    "@angular-devkit/core" "^17.1.0"
-    ts-node "^10.0.0"
-    tsconfig-paths "^4.1.0"
-
-"@angular-builders/custom-webpack@~17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-17.0.2.tgz#3a746580433dd4c0a4cf0fbcc8bbc76c2c95c76c"
-  integrity sha512-K0jqdW5UdVIeKiZXO4nLiiiVt0g6PKJELdxgjsBGMtyRk+RLEY+pIp1061oy/Yf09nGYseZ7Mdx3XASYHQjNwA==
-  dependencies:
-    "@angular-builders/common" "1.0.2"
-    "@angular-devkit/architect" ">=0.1700.0 < 0.1800.0"
-    "@angular-devkit/build-angular" "^17.0.0"
-    "@angular-devkit/core" "^17.0.0"
-    lodash "^4.17.15"
-    webpack-merge "^5.7.3"
-
-"@angular-devkit/architect@0.1703.0", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
-  version "0.1703.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.0.tgz#103b613b6ce2dcfdd76bea344e67a2a296a94b37"
-  integrity sha512-2X2cswI4TIwtQxCe5U9f4jeiDjAb8r89XLpU0QwEHyZyWx02uhYHO3FDMJq/NxCS95IUAQOBGBhbD4ey4Hl9cQ==
-  dependencies:
-    "@angular-devkit/core" "17.3.0"
-    rxjs "7.8.1"
-
-"@angular-devkit/architect@0.1703.8":
-  version "0.1703.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.8.tgz#2b4f26d9e32ac013931631876b4a7a6926657ad3"
-  integrity sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==
-  dependencies:
-    "@angular-devkit/core" "17.3.8"
-    rxjs "7.8.1"
-
-"@angular-devkit/architect@^0.1202.10":
-  version "0.1202.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1202.18.tgz#64feaf5015efb688ee9d3876bd630eca340cdf14"
-  integrity sha512-C4ASKe+xBjl91MJyHDLt3z7ICPF9FU6B0CeJ1phwrlSHK9lmFG99WGxEj/Tc82+vHyPhajqS5XJ38KyVAPBGzA==
-  dependencies:
-    "@angular-devkit/core" "12.2.18"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-angular@^17.0.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.0.tgz#3a0d064d1afc5d786a3dfad1b99a0b756fc85e7a"
-  integrity sha512-mC70mZK/liITM4VlGL6hmYPkVsZwAb+X3TxwodBl/g8p/sYijDhK/4QJHzmcHTxLYQQS6nS5CUcr9ARQFkGN2w==
-  dependencies:
-    "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.0"
-    "@angular-devkit/build-webpack" "0.1703.0"
-    "@angular-devkit/core" "17.3.0"
-    "@babel/core" "7.24.0"
-    "@babel/generator" "7.23.6"
-    "@babel/helper-annotate-as-pure" "7.22.5"
-    "@babel/helper-split-export-declaration" "7.22.6"
-    "@babel/plugin-transform-async-generator-functions" "7.23.9"
-    "@babel/plugin-transform-async-to-generator" "7.23.3"
-    "@babel/plugin-transform-runtime" "7.24.0"
-    "@babel/preset-env" "7.24.0"
-    "@babel/runtime" "7.24.0"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.0"
-    "@vitejs/plugin-basic-ssl" "1.1.0"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.18"
-    babel-loader "9.1.3"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "^4.21.5"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.22"
-    css-loader "6.10.0"
-    esbuild-wasm "0.20.1"
-    fast-glob "3.3.2"
-    http-proxy-middleware "2.0.6"
-    https-proxy-agent "7.0.4"
-    inquirer "9.2.15"
-    jsonc-parser "3.2.1"
-    karma-source-map-support "1.4.0"
-    less "4.2.0"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.30.8"
-    mini-css-extract-plugin "2.8.1"
-    mrmime "2.0.0"
-    open "8.4.2"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    picomatch "4.0.1"
-    piscina "4.4.0"
-    postcss "8.4.35"
-    postcss-loader "8.1.1"
-    resolve-url-loader "5.0.0"
-    rxjs "7.8.1"
-    sass "1.71.1"
-    sass-loader "14.1.1"
-    semver "7.6.0"
-    source-map-loader "5.0.0"
-    source-map-support "0.5.21"
-    terser "5.29.1"
-    tree-kill "1.2.2"
-    tslib "2.6.2"
-    undici "6.7.1"
-    vite "5.1.5"
-    watchpack "2.4.0"
-    webpack "5.94.0"
-    webpack-dev-middleware "6.1.1"
-    webpack-dev-server "4.15.1"
-    webpack-merge "5.10.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.20.1"
-
-"@angular-devkit/build-angular@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.8.tgz#a19f05909551f79b95711235b1141f83f96fd558"
-  integrity sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==
-  dependencies:
-    "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.8"
-    "@angular-devkit/build-webpack" "0.1703.8"
-    "@angular-devkit/core" "17.3.8"
-    "@babel/core" "7.24.0"
-    "@babel/generator" "7.23.6"
-    "@babel/helper-annotate-as-pure" "7.22.5"
-    "@babel/helper-split-export-declaration" "7.22.6"
-    "@babel/plugin-transform-async-generator-functions" "7.23.9"
-    "@babel/plugin-transform-async-to-generator" "7.23.3"
-    "@babel/plugin-transform-runtime" "7.24.0"
-    "@babel/preset-env" "7.24.0"
-    "@babel/runtime" "7.24.0"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.8"
-    "@vitejs/plugin-basic-ssl" "1.1.0"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.18"
-    babel-loader "9.1.3"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "^4.21.5"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.22"
-    css-loader "6.10.0"
-    esbuild-wasm "0.20.1"
-    fast-glob "3.3.2"
-    http-proxy-middleware "2.0.6"
-    https-proxy-agent "7.0.4"
-    inquirer "9.2.15"
-    jsonc-parser "3.2.1"
-    karma-source-map-support "1.4.0"
-    less "4.2.0"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.30.8"
-    mini-css-extract-plugin "2.8.1"
-    mrmime "2.0.0"
-    open "8.4.2"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    picomatch "4.0.1"
-    piscina "4.4.0"
-    postcss "8.4.35"
-    postcss-loader "8.1.1"
-    resolve-url-loader "5.0.0"
-    rxjs "7.8.1"
-    sass "1.71.1"
-    sass-loader "14.1.1"
-    semver "7.6.0"
-    source-map-loader "5.0.0"
-    source-map-support "0.5.21"
-    terser "5.29.1"
-    tree-kill "1.2.2"
-    tslib "2.6.2"
-    undici "6.11.1"
-    vite "5.1.7"
-    watchpack "2.4.0"
-    webpack "5.94.0"
-    webpack-dev-middleware "6.1.2"
-    webpack-dev-server "4.15.1"
-    webpack-merge "5.10.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.20.1"
-
-"@angular-devkit/build-webpack@0.1703.0":
-  version "0.1703.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.0.tgz#1576a42e915cf22a664fff10361c96a0f9900319"
-  integrity sha512-IEaLzV5lolURJhMKM4naW6pYTDjI5E8I+97o/kbSa0yakvGOBwg7yRmfc54T1M0Z4nmifPsj4OVRGhBaa6dgXA==
-  dependencies:
-    "@angular-devkit/architect" "0.1703.0"
-    rxjs "7.8.1"
-
-"@angular-devkit/build-webpack@0.1703.8":
-  version "0.1703.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.8.tgz#d157a5790d5045dd9c312936c3907bd3a184bbfc"
-  integrity sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==
-  dependencies:
-    "@angular-devkit/architect" "0.1703.8"
-    rxjs "7.8.1"
-
-"@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
-  version "12.2.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-12.2.18.tgz#6c530658b59f625388986fc73e4c4f966269725a"
-  integrity sha512-GDLHGe9HEY5SRS+NrKr14C8aHsRCiBFkBFSSbeohgLgcgSXzZHFoU84nDWrl3KZNP8oqcUSv5lHu6dLcf2fnww==
-  dependencies:
-    ajv "8.6.2"
-    ajv-formats "2.1.0"
-    fast-json-stable-stringify "2.1.0"
-    magic-string "0.25.7"
-    rxjs "6.6.7"
-    source-map "0.7.3"
-
-"@angular-devkit/core@17.3.0", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.0.tgz#88f8a513dbf23d3248d4cc1ffadfb6324b3aa859"
-  integrity sha512-ldErhMYq8rcFOhWQ0syQdLy6IYb/LL0erigj7gCMOf59oJgM7B13o/ZTOCvyJttUZ9IP0HB98Gi3epEuJ30VLg==
-  dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.1"
-    picomatch "4.0.1"
-    rxjs "7.8.1"
-    source-map "0.7.4"
-
-"@angular-devkit/core@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.8.tgz#8679cacf84cf79764f027811020e235ab32016d2"
-  integrity sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==
-  dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.1"
-    picomatch "4.0.1"
-    rxjs "7.8.1"
-    source-map "0.7.4"
-
-"@angular-devkit/schematics@12.2.18", "@angular-devkit/schematics@^12.2.17":
-  version "12.2.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-12.2.18.tgz#22de79ff820ed484e6edccfac30a9f6b0562842e"
-  integrity sha512-bZ9NS5PgoVfetRC6WeQBHCY5FqPZ9y2TKHUo12sOB2YSL3tgWgh1oXyP8PtX34gasqsLjNULxEQsAQYEsiX/qQ==
-  dependencies:
-    "@angular-devkit/core" "12.2.18"
-    ora "5.4.1"
-    rxjs "6.6.7"
-
-"@angular-devkit/schematics@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.8.tgz#f853eb21682aadfb6667e090b5b509fc95ce8442"
-  integrity sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==
-  dependencies:
-    "@angular-devkit/core" "17.3.8"
-    jsonc-parser "3.2.1"
-    magic-string "0.30.8"
-    ora "5.4.1"
-    rxjs "7.8.1"
-
-"@angular-eslint/builder@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-17.2.1.tgz#c7ba17e3a9de3a65d010f101b0c6cd3d5e9c26a8"
-  integrity sha512-O30eaR0wCPiP+zKWvXj2JM8hVq30Wok2rp7zJMFm3PurjF9nWIIyexXkE5fa538DYZYxu8N3gQRqhpv5jvTXCg==
-  dependencies:
-    "@nx/devkit" "17.2.8"
-    nx "17.2.8"
-
-"@angular-eslint/bundled-angular-compiler@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.2.1.tgz#d849b0845371b41856b9f598af81ce5bf799bca0"
-  integrity sha512-puC0itsZv2QlrDOCcWtq1KZH+DvfrpV+mV78HHhi6+h25R5iIhr8ARKcl3EQxFjvrFq34jhG8pSupxKvFbHVfA==
-
-"@angular-eslint/eslint-plugin-template@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.2.1.tgz#226a623219375a2344112c1c896fefef0dae4df6"
-  integrity sha512-hl1hcHtcm90wyVL1OQGTz16oA0KHon+FFb3Qg0fLXObaXxA495Ecefd9ub5Xxg4JEOPRDi29bF1Y3YKpwflgeg==
-  dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
-    "@angular-eslint/utils" "17.2.1"
-    "@typescript-eslint/type-utils" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
-    aria-query "5.3.0"
-    axobject-query "4.0.0"
-
-"@angular-eslint/eslint-plugin@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-17.2.1.tgz#2be51ead1785950feb8351001e0683eae42f4c29"
-  integrity sha512-9yA81BHpsaCUKRBtHGN3ieAy8HpIoffzPQMu34lYqZFT4yGHGhYmhQjNSQGBRbV2LD9dVv2U35rMHNmUcozXpw==
-  dependencies:
-    "@angular-eslint/utils" "17.2.1"
-    "@typescript-eslint/utils" "6.19.0"
-
-"@angular-eslint/schematics@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-17.2.1.tgz#8c0c15f106afe9fc9f89dd6573e6325afd2bf1e1"
-  integrity sha512-7ldtIePI4ZTp/TBpeOZkzfv30HSAn//4TgtFuqvojudI8n8batV5FqQ0VNm1e0zitl75t8Zwtr0KYT4I6vh59g==
-  dependencies:
-    "@angular-eslint/eslint-plugin" "17.2.1"
-    "@angular-eslint/eslint-plugin-template" "17.2.1"
-    "@nx/devkit" "17.2.8"
-    ignore "5.3.0"
-    nx "17.2.8"
-    strip-json-comments "3.1.1"
-    tmp "0.2.1"
-
-"@angular-eslint/template-parser@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-17.2.1.tgz#005f997346eb17c6dbca5fffc41da51b7e755013"
-  integrity sha512-WPQYFvRju0tCDXQ/pwrzC911pE07JvpeDgcN2elhzV6lxDHJEZpA5O9pnW9qgNA6J6XM9Q7dBkJ22ztAzC4WFw==
-  dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
-    eslint-scope "^8.0.0"
-
-"@angular-eslint/utils@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-17.2.1.tgz#3d4217775d86479348fdd0e1ad83014c9d8339f2"
-  integrity sha512-qQYTBXy90dWM7fhhpa5i9lTtqqhJisvRa+naCrQx9kBgR458JScLdkVIdcZ9D/rPiDCmKiVUfgcDISnjUeqTqg==
-  dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
-    "@typescript-eslint/utils" "6.19.0"
-
-"@angular/animations@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.11.tgz#86e5c6a1fbf9b7e2bf5441e334db5b8b2132be2d"
-  integrity sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/cdk@^17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-17.3.10.tgz#4a3bab529cd65bb19cb89c89b3548dcc534d1a44"
-  integrity sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==
-  dependencies:
-    tslib "^2.3.0"
-  optionalDependencies:
-    parse5 "^7.1.2"
-
-"@angular/cli@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.8.tgz#3673fd5dd4fbc96a6ed57c4e871ac5a92d5702c7"
-  integrity sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1703.8"
-    "@angular-devkit/core" "17.3.8"
-    "@angular-devkit/schematics" "17.3.8"
-    "@schematics/angular" "17.3.8"
-    "@yarnpkg/lockfile" "1.1.0"
-    ansi-colors "4.1.3"
-    ini "4.1.2"
-    inquirer "9.2.15"
-    jsonc-parser "3.2.1"
-    npm-package-arg "11.0.1"
-    npm-pick-manifest "9.0.0"
-    open "8.4.2"
-    ora "5.4.1"
-    pacote "17.0.6"
-    resolve "1.22.8"
-    semver "7.6.0"
-    symbol-observable "4.0.0"
-    yargs "17.7.2"
-
-"@angular/common@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.11.tgz#1698a0a93d3dab6e52da9d6600e8fba3a63a4e68"
-  integrity sha512-WG+HQjUaQziYLGdbcv2aW+G73uroN5VF9yk4qWYcolW+VB8SV/DOAol8uFVgCF21cIOl5+wfJZvA4r5oG3dYaw==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/compiler-cli@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz#b2616d88111254790c12900d2cf424e2ac58f37e"
-  integrity sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g==
-  dependencies:
-    "@babel/core" "7.23.9"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-    chokidar "^3.0.0"
-    convert-source-map "^1.5.1"
-    reflect-metadata "^0.2.0"
-    semver "^7.0.0"
-    tslib "^2.3.0"
-    yargs "^17.2.1"
-
-"@angular/compiler@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.11.tgz#ecf1138bbb69be4cb7a7bf88a71f4ad93128b466"
-  integrity sha512-ingRoREDPkeZGSa13DlztSjZgGArNcmsAWjj+f+vQgQekTjkfQD/N+Bix/LSt5ZdbSjHMtrkDMyRPwbNyk5Keg==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/core@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.11.tgz#8de94fbb986ceec7e96356a60c9edf98131ae97b"
-  integrity sha512-2wPZwXFei3kVxK2ylIH6CdGebrC4kvooFx7qoX+250OITAEFMODJGdh/e3x0DpFUjlRvQtIFQ+YpQlfC5JnL4g==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/forms@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.11.tgz#5e37ff81964e184fbb98b1f016fe3062dd5d2571"
-  integrity sha512-719flo/1L64YOAxL3pzszTK+7bczVVOQDXT1khnjb48GVZdBUBwW2D+cFbqSW1VMuWWr2Amwy1lL4YM5S7qPJQ==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/language-service@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.3.11.tgz#0e9ee1614b443fd2ff3b4f3e99ed4b7e84cb1422"
-  integrity sha512-C93TH34vG6Un8G0C75TU0aeTppJWUUbRcnR/3I6/ZmTirjIspXEAcmUr2LssFnULTYqA0npNn8cfDtsoLeoGog==
-
-"@angular/localize@17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.11.tgz#2eaec8c8126caaa7bad7cc7433ea91882fbe4885"
-  integrity sha512-uc38JfGpIEb13rDZu7wZfEvLxBpWbhfsOR+yI21M4zIiKYQxI7RGgtH9GbCKZDEZmeTUSz/idA4zwRiiX8wNvQ==
-  dependencies:
-    "@babel/core" "7.23.9"
-    "@types/babel__core" "7.20.5"
-    fast-glob "3.3.2"
-    yargs "^17.2.1"
-
-"@angular/platform-browser-dynamic@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.11.tgz#d578cefbba24800e94756338a7789dbe8014b63b"
-  integrity sha512-JPA0enJyJQ5H340WQ2wfXbCCHzjBiAljEDMr/Siw/CzSe0XI8aQYDqKMLUMtRyCdYhNCEYjnBWgXBi9Za9blZg==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/platform-browser@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.11.tgz#44c4814b76c3de43496159d76e19913f8d331744"
-  integrity sha512-sWjMy8qKH6AOt5YV4OMoPhExCbGdRIPjNSwUrxCm8a8Zz5DamoX3Sib9yRk1etjBuRj+oJySSxISJim2OYXJQQ==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/platform-server@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.11.tgz#b92c3cd6764292085d9300b85db1ac8bdde60697"
-  integrity sha512-xytV4+5gTCECUORniXBTE1lvJ3qf3IWlawmm3eZylvJMqH2W3ApZrrwLM7umL8BOU9ISEhjolbwfGXornKL+5A==
-  dependencies:
-    tslib "^2.3.0"
-    xhr2 "^0.2.0"
-
-"@angular/router@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.11.tgz#fd28e6b7f836683c571f2ed50eae6b97e6383038"
-  integrity sha512-A3aU6uHAeJfsfCw1dgNXHn2Kjw/UieRMnFwENkzz96YFCvFPCEZjy/mODuE3zHludMuqVsJhM/uUxWu8ATRTcA==
-  dependencies:
-    tslib "^2.3.0"
-
-"@angular/ssr@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.8.tgz#f51b6b6ae999b0dd862bcec1d041ddd9e71a3197"
-  integrity sha512-qsCMMR7wEOlbPbqTOrcr/1hEoQjIQOGqq6stbK9J52IebTyzC+rZNzDjJcL9e39nSmvbIeCUaN1XquebQ12/pw==
-  dependencies:
-    critters "0.0.22"
-    tslib "^2.3.0"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
-  dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
-
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
-
-"@babel/core@7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
-  integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.9"
-    "@babel/parser" "^7.23.9"
-    "@babel/template" "^7.23.9"
-    "@babel/traverse" "^7.23.9"
-    "@babel/types" "^7.23.9"
-    convert-source-map "^2.0.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.3"
-    semver "^6.3.1"
-
-"@babel/core@7.24.0", "@babel/core@^7.12.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
-  integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.0"
-    "@babel/parser" "^7.24.0"
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
-    convert-source-map "^2.0.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.3"
-    semver "^6.3.1"
-
-"@babel/generator@7.23.6", "@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
-  dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@7.22.5", "@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
-    lru-cache "^5.1.1"
-    semver "^6.3.1"
-
-"@babel/helper-create-class-features-plugin@^7.22.15":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz#fc7554141bdbfa2d17f7b4b80153b9b090e5d158"
-  integrity sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    semver "^6.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-define-polyfill-provider@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
-  integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-define-polyfill-provider@^0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd"
-  integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
-  dependencies:
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
-
-"@babel/helper-remap-async-to-generator@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
-
-"@babel/helper-replace-supers@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
-  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
-
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
-"@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
-
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
-  dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
-
-"@babel/helpers@^7.23.9", "@babel/helpers@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
-  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
-  dependencies:
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
-
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
-  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
-  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
-  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.23.3"
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
-  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  version "7.21.0-placeholder-for-preset-env.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
-  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-import-assertions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
-  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-syntax-import-attributes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
-  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-syntax-import-meta@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
-  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-arrow-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
-  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-async-generator-functions@7.23.9", "@babel/plugin-transform-async-generator-functions@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce"
-  integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-transform-async-to-generator@7.23.3", "@babel/plugin-transform-async-to-generator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
-  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-
-"@babel/plugin-transform-block-scoped-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
-  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-block-scoping@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
-  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-class-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
-  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-class-static-block@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
-  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.23.8":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
-  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
-  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.15"
-
-"@babel/plugin-transform-destructuring@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
-  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-dotall-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
-  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-duplicate-keys@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
-  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-dynamic-import@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
-  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-transform-exponentiation-operator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
-  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-export-namespace-from@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
-  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-transform-for-of@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
-  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-
-"@babel/plugin-transform-function-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
-  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-json-strings@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
-  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-transform-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
-  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
-  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-transform-member-expression-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
-  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-modules-amd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
-  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-modules-commonjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
-  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-systemjs@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
-  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/plugin-transform-modules-umd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
-  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-new-target@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
-  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
-  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-transform-numeric-separator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
-  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-transform-object-rest-spread@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz#7b836ad0088fdded2420ce96d4e1d3ed78b71df1"
-  integrity sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.23.3"
-
-"@babel/plugin-transform-object-super@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
-  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-
-"@babel/plugin-transform-optional-catch-binding@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
-  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
-  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-transform-parameters@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
-  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-private-methods@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
-  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-private-property-in-object@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
-  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-transform-property-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
-  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-regenerator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
-  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    regenerator-transform "^0.15.2"
-
-"@babel/plugin-transform-reserved-words@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
-  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-runtime@7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz#e308fe27d08b74027d42547081eefaf4f2ffbcc9"
-  integrity sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    babel-plugin-polyfill-corejs2 "^0.4.8"
-    babel-plugin-polyfill-corejs3 "^0.9.0"
-    babel-plugin-polyfill-regenerator "^0.5.5"
-    semver "^6.3.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
-  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-spread@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
-  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-
-"@babel/plugin-transform-sticky-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
-  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-template-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
-  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-typeof-symbol@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
-  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-escapes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
-  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-property-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
-  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
-  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
-  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/preset-env@7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.0.tgz#11536a7f4b977294f0bdfad780f01a8ac8e183fc"
-  integrity sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7"
-    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.23.3"
-    "@babel/plugin-syntax-import-attributes" "^7.23.3"
-    "@babel/plugin-syntax-import-meta" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.23.3"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.9"
-    "@babel/plugin-transform-async-to-generator" "^7.23.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
-    "@babel/plugin-transform-block-scoping" "^7.23.4"
-    "@babel/plugin-transform-class-properties" "^7.23.3"
-    "@babel/plugin-transform-class-static-block" "^7.23.4"
-    "@babel/plugin-transform-classes" "^7.23.8"
-    "@babel/plugin-transform-computed-properties" "^7.23.3"
-    "@babel/plugin-transform-destructuring" "^7.23.3"
-    "@babel/plugin-transform-dotall-regex" "^7.23.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
-    "@babel/plugin-transform-dynamic-import" "^7.23.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
-    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
-    "@babel/plugin-transform-for-of" "^7.23.6"
-    "@babel/plugin-transform-function-name" "^7.23.3"
-    "@babel/plugin-transform-json-strings" "^7.23.4"
-    "@babel/plugin-transform-literals" "^7.23.3"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
-    "@babel/plugin-transform-modules-amd" "^7.23.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.9"
-    "@babel/plugin-transform-modules-umd" "^7.23.3"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.23.3"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
-    "@babel/plugin-transform-numeric-separator" "^7.23.4"
-    "@babel/plugin-transform-object-rest-spread" "^7.24.0"
-    "@babel/plugin-transform-object-super" "^7.23.3"
-    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
-    "@babel/plugin-transform-optional-chaining" "^7.23.4"
-    "@babel/plugin-transform-parameters" "^7.23.3"
-    "@babel/plugin-transform-private-methods" "^7.23.3"
-    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
-    "@babel/plugin-transform-property-literals" "^7.23.3"
-    "@babel/plugin-transform-regenerator" "^7.23.3"
-    "@babel/plugin-transform-reserved-words" "^7.23.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
-    "@babel/plugin-transform-spread" "^7.23.3"
-    "@babel/plugin-transform-sticky-regex" "^7.23.3"
-    "@babel/plugin-transform-template-literals" "^7.23.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
-    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
-    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
-    "@babel/preset-modules" "0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2 "^0.4.8"
-    babel-plugin-polyfill-corejs3 "^0.9.0"
-    babel-plugin-polyfill-regenerator "^0.5.5"
-    core-js-compat "^3.31.0"
-    semver "^6.3.1"
-
-"@babel/preset-modules@0.1.6-no-external-plugins":
-  version "0.1.6-no-external-plugins"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
-  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
-"@babel/runtime@7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@7.24.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
-  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
-  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
-
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.23.9", "@babel/traverse@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
-  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.0", "@babel/types@^7.4.4":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@colors/colors@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
-  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
-
-"@cspotcode/source-map-consumer@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
-  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
-
-"@cspotcode/source-map-support@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz#118511f316e2e87ee4294761868e254d3da47960"
-  integrity sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==
-  dependencies:
-    "@cspotcode/source-map-consumer" "0.8.0"
-
-"@csstools/postcss-cascade-layers@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz#8a997edf97d34071dd2e37ea6022447dd9e795ad"
-  integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
-  dependencies:
-    "@csstools/selector-specificity" "^2.0.2"
-    postcss-selector-parser "^6.0.10"
-
-"@csstools/postcss-color-function@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b"
-  integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-font-format-keywords@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a"
-  integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-hwb-function@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b"
-  integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-ic-unit@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58"
-  integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-is-pseudo-class@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1"
-  integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
-  dependencies:
-    "@csstools/selector-specificity" "^2.0.0"
-    postcss-selector-parser "^6.0.10"
-
-"@csstools/postcss-nested-calc@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz#d7e9d1d0d3d15cf5ac891b16028af2a1044d0c26"
-  integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-normalize-display-values@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3"
-  integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-oklab-function@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844"
-  integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa"
-  integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-stepped-value-functions@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4"
-  integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-text-decoration-shorthand@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz#ea96cfbc87d921eca914d3ad29340d9bcc4c953f"
-  integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-trigonometric-functions@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756"
-  integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-unset-value@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77"
-  integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
-
-"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
-  integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
-
-"@cypress/request@2.88.12":
-  version "2.88.12"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
-  integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    performance-now "^2.1.0"
-    qs "~6.10.3"
-    safe-buffer "^5.1.2"
-    tough-cookie "^4.1.3"
-    tunnel-agent "^0.6.0"
-    uuid "^8.3.2"
-
-"@cypress/schematic@^1.5.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@cypress/schematic/-/schematic-1.7.0.tgz#66343138f7f94843fa24f0c492a5a83408a7a047"
-  integrity sha512-CouQrVlZ+uHVVBQtmNoMYU9LyoSAmQTOLDpVjrdTdMPpJH1mWnHCL5OCMt+FZLR+43KRiWEvDUjNqSza11oGsQ==
-  dependencies:
-    "@angular-devkit/architect" "^0.1202.10"
-    "@angular-devkit/core" "^12.2.17"
-    "@angular-devkit/schematics" "^12.2.17"
-    "@schematics/angular" "^12.2.17"
-    jsonc-parser "^3.0.0"
-    rxjs "~6.6.0"
-
-"@cypress/xvfb@^1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
-  integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
-  dependencies:
-    debug "^3.1.0"
-    lodash.once "^4.1.1"
-
-"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0":
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
-  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
-
-"@edsilv/http-status-codes@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz#a1b767c552ac43f2983ab2b9ee20e9c73b79960b"
-  integrity sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==
-
-"@emotion/hash@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
-
-"@es-joy/jsdoccomment@~0.39.4":
-  version "0.39.4"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
-  integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
-  dependencies:
-    comment-parser "1.3.1"
-    esquery "^1.5.0"
-    jsdoc-type-pratt-parser "~4.0.0"
-
-"@esbuild/aix-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
-  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
-
-"@esbuild/aix-ppc64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5"
-  integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==
-
-"@esbuild/android-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
-  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
-
-"@esbuild/android-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6"
-  integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==
-
-"@esbuild/android-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
-  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
-
-"@esbuild/android-arm@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a"
-  integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==
-
-"@esbuild/android-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
-  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
-
-"@esbuild/android-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22"
-  integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==
-
-"@esbuild/darwin-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
-  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
-
-"@esbuild/darwin-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46"
-  integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==
-
-"@esbuild/darwin-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
-  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
-
-"@esbuild/darwin-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2"
-  integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==
-
-"@esbuild/freebsd-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
-  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
-
-"@esbuild/freebsd-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774"
-  integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==
-
-"@esbuild/freebsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
-  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
-
-"@esbuild/freebsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951"
-  integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==
-
-"@esbuild/linux-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
-  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
-
-"@esbuild/linux-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156"
-  integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==
-
-"@esbuild/linux-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
-  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
-
-"@esbuild/linux-arm@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21"
-  integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==
-
-"@esbuild/linux-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
-  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
-
-"@esbuild/linux-ia32@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48"
-  integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==
-
-"@esbuild/linux-loong64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
-  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
-
-"@esbuild/linux-loong64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33"
-  integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==
-
-"@esbuild/linux-mips64el@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
-  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
-
-"@esbuild/linux-mips64el@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea"
-  integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==
-
-"@esbuild/linux-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
-  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
-
-"@esbuild/linux-ppc64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d"
-  integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==
-
-"@esbuild/linux-riscv64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
-  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
-
-"@esbuild/linux-riscv64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e"
-  integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==
-
-"@esbuild/linux-s390x@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
-  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
-
-"@esbuild/linux-s390x@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7"
-  integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==
-
-"@esbuild/linux-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
-  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
-
-"@esbuild/linux-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f"
-  integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==
-
-"@esbuild/netbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
-  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
-
-"@esbuild/netbsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407"
-  integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==
-
-"@esbuild/openbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
-  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
-
-"@esbuild/openbsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76"
-  integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==
-
-"@esbuild/sunos-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
-  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
-
-"@esbuild/sunos-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5"
-  integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==
-
-"@esbuild/win32-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
-  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
-
-"@esbuild/win32-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b"
-  integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==
-
-"@esbuild/win32-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
-  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
-
-"@esbuild/win32-ia32@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe"
-  integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==
-
-"@esbuild/win32-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
-  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
-
-"@esbuild/win32-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba"
-  integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==
-
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
-  dependencies:
-    eslint-visitor-keys "^3.3.0"
-
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
-
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
-
-"@fortawesome/fontawesome-free@^6.4.0":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
-  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
-
-"@gar/promisify@^1.0.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
-
-"@iiif/vocabulary@^1.0.26":
-  version "1.0.26"
-  resolved "https://registry.yarnpkg.com/@iiif/vocabulary/-/vocabulary-1.0.26.tgz#557fab623100ca860daeddf6e4de46a8f94aaf86"
-  integrity sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==
-
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
-  dependencies:
-    "@sinclair/typebox" "^0.27.8"
-
-"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
-  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
-  dependencies:
-    "@jridgewell/set-array" "^1.2.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/set-array@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
-  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
-
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
-  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
-  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@kolkov/ngx-gallery@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz#6c7903b4fc4719b093ef8a782aff731fe38ea320"
-  integrity sha512-mTigRy9Ha7bqCF/+GNKeW2Oe8ZILuM5GGMw+ZbvTQWq3X5hngeFFgv8GFG49Py3biX67kb0NhqCP+msLe4wbXQ==
-  dependencies:
-    tslib "^2.3.0"
-
-"@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
-  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
-
-"@ljharb/through@^2.3.12":
-  version "2.3.13"
-  resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.13.tgz#b7e4766e0b65aa82e529be945ab078de79874edc"
-  integrity sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==
-  dependencies:
-    call-bind "^1.0.7"
-
-"@material-ui/core@^4.11.0":
-  version "4.12.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
-  integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.5"
-    "@material-ui/system" "^4.12.2"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    "@types/react-transition-group" "^4.2.0"
-    clsx "^1.0.4"
-    hoist-non-react-statics "^3.3.2"
-    popper.js "1.16.1-lts"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-    react-transition-group "^4.4.0"
-
-"@material-ui/icons@^4.11.3", "@material-ui/icons@^4.9.1":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1"
-  integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-
-"@material-ui/lab@^4.0.0-alpha.53":
-  version "4.0.0-alpha.61"
-  resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz#9bf8eb389c0c26c15e40933cc114d4ad85e3d978"
-  integrity sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.3"
-    clsx "^1.0.4"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-
-"@material-ui/styles@^4.11.5":
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb"
-  integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    clsx "^1.0.4"
-    csstype "^2.5.2"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.5.1"
-    jss-plugin-camel-case "^10.5.1"
-    jss-plugin-default-unit "^10.5.1"
-    jss-plugin-global "^10.5.1"
-    jss-plugin-nested "^10.5.1"
-    jss-plugin-props-sort "^10.5.1"
-    jss-plugin-rule-value-function "^10.5.1"
-    jss-plugin-vendor-prefixer "^10.5.1"
-    prop-types "^15.7.2"
-
-"@material-ui/system@^4.12.2":
-  version "4.12.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b"
-  integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.3"
-    csstype "^2.5.2"
-    prop-types "^15.7.2"
-
-"@material-ui/types@5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
-  integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
-
-"@material-ui/utils@^4.11.3":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942"
-  integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-
-"@ng-bootstrap/ng-bootstrap@^11.0.0":
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz#6113b09bfb9b722f7ebf4b97d17e6addd0fd9e2f"
-  integrity sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==
-  dependencies:
-    tslib "^2.3.0"
-
-"@ng-dynamic-forms/core@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-16.0.0.tgz#3b5b21bd4e93f4ce6f11f840cca2298bc17537b0"
-  integrity sha512-fH0OIgFs/bWkVnnOtDoAAXHXb3K2UOQXm7qEgO9hg86keE2x3Tu/G/Ma6tRVi5+RfKRgvI2Q6JlMLHIQHYFAgA==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ng-dynamic-forms/ui-ng-bootstrap@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-16.0.0.tgz#3bc18a4ae7a1b265399438f1c8e3b81038102afa"
-  integrity sha512-qopjC+j1wfOaB6a/xSUKEpl5vohEospvhLqPl33BgNH557DQg3x3oI/oPo3caLRhIo2vpKGIeuEN5Itok0B3vg==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ngrx/effects@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-17.1.1.tgz#308942c131eae21da529c112476b0b212313c1a3"
-  integrity sha512-VDNVI70wfEwqoNliffAiMhsPry0CWKkifCLmfzr+SZEEdAaPEBr4FtRrrdcdq/ovmkcgoWukkH2MBljbCyHwtA==
-  dependencies:
-    "@ngrx/operators" "17.0.0-beta.0"
-    tslib "^2.0.0"
-
-"@ngrx/operators@17.0.0-beta.0":
-  version "17.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/operators/-/operators-17.0.0-beta.0.tgz#030486f3a610fa919d2b155aad3bc7b4c708550d"
-  integrity sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A==
-  dependencies:
-    tslib "^2.3.0"
-
-"@ngrx/router-store@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-17.1.1.tgz#b6911082e4a8b08359b1f5f645badcfff1039dd4"
-  integrity sha512-DcCIgtaryYdSREcO9Mgc2Xup9fb9gyB98jB2hAQX2oWVSpwA/4hU6/WGU1mtHyQF0JqmiE2517JBLeqA3owSwQ==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ngrx/store-devtools@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-17.1.1.tgz#dcbb221da64282f79df696edfe1518e8b6659291"
-  integrity sha512-MCzM44wHzc0eY6FSvPQwuXn1HFst8Y4Ckq7jvlPA202nJYwMZQQJReI5KQNHfGiqe0RpZKov0FUmy6sIyOOt2A==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ngrx/store@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-17.1.1.tgz#5e38aa2372331c0bbb6a6a73550d77c4e3cf9e1f"
-  integrity sha512-MGbKLTcl4uq2Uzx+qbMYNy6xW+JnkpRiznaGFX2/NFflq/zNZsjbxZrvn4/Z6ClVYIjj3uadjM1fupwMYMJxVA==
-  dependencies:
-    tslib "^2.0.0"
-
-"@ngtools/webpack@17.3.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.0.tgz#91e6168304739350fb6f3b9877d29e4a382cadb2"
-  integrity sha512-wNTCDPPEtjP4mxYerLVLCMwOCTEOD2HqZMVXD8pJbarrGPMuoyglUZuqNSIS5KVqR+fFez6JEUnMvC3QSqf58w==
-
-"@ngtools/webpack@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.8.tgz#96c0f99055910dd21438d7697d625fdeb7261015"
-  integrity sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==
-
-"@ngtools/webpack@^16.2.12":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.2.12.tgz#478db8cca94a69f1708c38ad80b62d824c73f543"
-  integrity sha512-f9R9Qsk8v+ffDxryl6PQ7Wnf2JCNd4dDXOH+d/AuF06VFiwcwGDRDZpmqkAXbFxQfcWTbT1FFvfoJ+SFcJgXLA==
-
-"@ngx-translate/core@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-14.0.0.tgz#af421d0e1a28376843f0fed375cd2fae7630a5ff"
-  integrity sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==
-  dependencies:
-    tslib "^2.3.0"
-
-"@nicky-lenaers/ngx-scroll-to@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@nicky-lenaers/ngx-scroll-to/-/ngx-scroll-to-14.0.0.tgz#178cb2c1781dd565841d940e1a678d6eda0796fc"
-  integrity sha512-nORagPmAQYDjB5jyQ3awGhbnKTKVARZUCK8FJIe46XjPQX2CI9+WBYvsdqq0CsNWVzCjhnC0Om6krzjOTrTHYQ==
-  dependencies:
-    tslib "^2.3.0"
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@npmcli/agent@^2.0.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.1.tgz#8aa677d0a4136d57524336a35d5679aedf2d56f7"
-  integrity sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ==
-  dependencies:
-    agent-base "^7.1.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.1"
-    lru-cache "^10.0.1"
-    socks-proxy-agent "^8.0.1"
-
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
-  dependencies:
-    semver "^7.3.5"
-
-"@npmcli/git@^5.0.0":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.4.tgz#d18c50f99649e6e89e8b427318134f582498700c"
-  integrity sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==
-  dependencies:
-    "@npmcli/promise-spawn" "^7.0.0"
-    lru-cache "^10.0.1"
-    npm-pick-manifest "^9.0.0"
-    proc-log "^3.0.0"
-    promise-inflight "^1.0.1"
-    promise-retry "^2.0.1"
-    semver "^7.3.5"
-    which "^4.0.0"
-
-"@npmcli/installed-package-contents@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
-  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
-  dependencies:
-    npm-bundled "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@npmcli/node-gyp@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
-  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
-
-"@npmcli/package-json@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.0.0.tgz#77d0f8b17096763ccbd8af03b7117ba6e34d6e91"
-  integrity sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==
-  dependencies:
-    "@npmcli/git" "^5.0.0"
-    glob "^10.2.2"
-    hosted-git-info "^7.0.0"
-    json-parse-even-better-errors "^3.0.0"
-    normalize-package-data "^6.0.0"
-    proc-log "^3.0.0"
-    semver "^7.5.3"
-
-"@npmcli/promise-spawn@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.1.tgz#a836de2f42a2245d629cf6fbb8dd6c74c74c55af"
-  integrity sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==
-  dependencies:
-    which "^4.0.0"
-
-"@npmcli/run-script@^7.0.0":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.4.tgz#9f29aaf4bfcf57f7de2a9e28d1ef091d14b2e6eb"
-  integrity sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==
-  dependencies:
-    "@npmcli/node-gyp" "^3.0.0"
-    "@npmcli/package-json" "^5.0.0"
-    "@npmcli/promise-spawn" "^7.0.0"
-    node-gyp "^10.0.0"
-    which "^4.0.0"
-
-"@nrwl/devkit@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-17.2.8.tgz#dd3467b484c4611454a45541ffb29e4de5b2ebe7"
-  integrity sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==
-  dependencies:
-    "@nx/devkit" "17.2.8"
-
-"@nrwl/tao@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-17.2.8.tgz#41ff3d715a0763e95cf5c35e7f79cd3be358dc5f"
-  integrity sha512-Qpk5YKeJ+LppPL/wtoDyNGbJs2MsTi6qyX/RdRrEc8lc4bk6Cw3Oul1qTXCI6jT0KzTz+dZtd0zYD/G7okkzvg==
-  dependencies:
-    nx "17.2.8"
-    tslib "^2.3.0"
-
-"@nx/devkit@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.2.8.tgz#49b6c94a3c12fba63eae6514fb37a468d0570e2e"
-  integrity sha512-6LtiQihtZwqz4hSrtT5cCG5XMCWppG6/B8c1kNksg97JuomELlWyUyVF+sxmeERkcLYFaKPTZytP0L3dmCFXaw==
-  dependencies:
-    "@nrwl/devkit" "17.2.8"
-    ejs "^3.1.7"
-    enquirer "~2.3.6"
-    ignore "^5.0.4"
-    semver "7.5.3"
-    tmp "~0.2.1"
-    tslib "^2.3.0"
-
-"@nx/nx-darwin-arm64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.8.tgz#26645c9548d5e387b43c06fccfa18e2c1f08055e"
-  integrity sha512-dMb0uxug4hM7tusISAU1TfkDK3ixYmzc1zhHSZwpR7yKJIyKLtUpBTbryt8nyso37AS1yH+dmfh2Fj2WxfBHTg==
-
-"@nx/nx-darwin-x64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.8.tgz#5143d6d01d24e338cb3d39076fe2af95146cb538"
-  integrity sha512-0cXzp1tGr7/6lJel102QiLA4NkaLCkQJj6VzwbwuvmuCDxPbpmbz7HC1tUteijKBtOcdXit1/MEoEU007To8Bw==
-
-"@nx/nx-freebsd-x64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.8.tgz#82a018a1855170e0243b8fe7b0032af279c3fb83"
-  integrity sha512-YFMgx5Qpp2btCgvaniDGdu7Ctj56bfFvbbaHQWmOeBPK1krNDp2mqp8HK6ZKOfEuDJGOYAp7HDtCLvdZKvJxzA==
-
-"@nx/nx-linux-arm-gnueabihf@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.8.tgz#18b9c324221ff6a30589f3fc272a843aca57b70f"
-  integrity sha512-iN2my6MrhLRkVDtdivQHugK8YmR7URo1wU9UDuHQ55z3tEcny7LV3W9NSsY9UYPK/FrxdDfevj0r2hgSSdhnzA==
-
-"@nx/nx-linux-arm64-gnu@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.8.tgz#54a08640a2babe78bcf3283565b00eb487db595e"
-  integrity sha512-Iy8BjoW6mOKrSMiTGujUcNdv+xSM1DALTH6y3iLvNDkGbjGK1Re6QNnJAzqcXyDpv32Q4Fc57PmuexyysZxIGg==
-
-"@nx/nx-linux-arm64-musl@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.8.tgz#cd7b673bb9f45fec7aa1b6c880a0d23d658e927f"
-  integrity sha512-9wkAxWzknjpzdofL1xjtU6qPFF1PHlvKCZI3hgEYJDo4mQiatGI+7Ttko+lx/ZMP6v4+Umjtgq7+qWrApeKamQ==
-
-"@nx/nx-linux-x64-gnu@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.8.tgz#009eb75c77bf075bc9c13ec4f9caf77821eee639"
-  integrity sha512-sjG1bwGsjLxToasZ3lShildFsF0eyeGu+pOQZIp9+gjFbeIkd19cTlCnHrOV9hoF364GuKSXQyUlwtFYFR4VTQ==
-
-"@nx/nx-linux-x64-musl@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.8.tgz#8ee2324068732a135ca4b01081942d5956885167"
-  integrity sha512-QiakXZ1xBCIptmkGEouLHQbcM4klQkcr+kEaz2PlNwy/sW3gH1b/1c0Ed5J1AN9xgQxWspriAONpScYBRgxdhA==
-
-"@nx/nx-win32-arm64-msvc@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.8.tgz#9bdce5b4d1f9cec7ef326eaf43b99e68576398b0"
-  integrity sha512-XBWUY/F/GU3vKN9CAxeI15gM4kr3GOBqnzFZzoZC4qJt2hKSSUEWsMgeZtsMgeqEClbi4ZyCCkY7YJgU32WUGA==
-
-"@nx/nx-win32-x64-msvc@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.8.tgz#8a86ff250021ad47686b58f1840b348a209b1158"
-  integrity sha512-HTqDv+JThlLzbcEm/3f+LbS5/wYQWzb5YDXbP1wi7nlCTihNZOLNqGOkEmwlrR5tAdNHPRpHSmkYg4305W0CtA==
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@polka/url@^1.0.0-next.24":
-  version "1.0.0-next.25"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
-  integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
-
-"@react-dnd/asap@^4.0.0":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab"
-  integrity sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==
-
-"@react-dnd/invariant@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-2.0.0.tgz#09d2e81cd39e0e767d7da62df9325860f24e517e"
-  integrity sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw==
-
-"@react-dnd/shallowequal@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
-  integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
-
-"@redux-saga/core@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.3.0.tgz#2ce08b73d407fc6ea9e7f7d83d2e97d981a3a8b8"
-  integrity sha512-L+i+qIGuyWn7CIg7k1MteHGfttKPmxwZR5E7OsGikCL2LzYA0RERlaUY00Y3P3ZV2EYgrsYlBrGs6cJP5OKKqA==
-  dependencies:
-    "@babel/runtime" "^7.6.3"
-    "@redux-saga/deferred" "^1.2.1"
-    "@redux-saga/delay-p" "^1.2.1"
-    "@redux-saga/is" "^1.1.3"
-    "@redux-saga/symbols" "^1.1.3"
-    "@redux-saga/types" "^1.2.1"
-    typescript-tuple "^2.2.1"
-
-"@redux-saga/deferred@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.2.1.tgz#aca373a08ccafd6f3481037f2f7ee97f2c87c3ec"
-  integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g==
-
-"@redux-saga/delay-p@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.2.1.tgz#e72ac4731c5080a21f75b61bedc31cb639d9e446"
-  integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w==
-  dependencies:
-    "@redux-saga/symbols" "^1.1.3"
-
-"@redux-saga/is@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.3.tgz#b333f31967e87e32b4e6b02c75b78d609dd4ad73"
-  integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q==
-  dependencies:
-    "@redux-saga/symbols" "^1.1.3"
-    "@redux-saga/types" "^1.2.1"
-
-"@redux-saga/symbols@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.3.tgz#b731d56201719e96dc887dc3ae9016e761654367"
-  integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg==
-
-"@redux-saga/types@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8"
-  integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==
-
-"@researchgate/react-intersection-observer@^1.0.0":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz#0321d2dd609aaacdb9bace8004d99c72824fb142"
-  integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
-
-"@rollup/rollup-android-arm-eabi@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz#b98786c1304b4ff8db3a873180b778649b5dff2b"
-  integrity sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==
-
-"@rollup/rollup-android-arm64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz#8833679af11172b1bf1ab7cb3bad84df4caf0c9e"
-  integrity sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==
-
-"@rollup/rollup-darwin-arm64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz#ef02d73e0a95d406e0eb4fd61a53d5d17775659b"
-  integrity sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==
-
-"@rollup/rollup-darwin-x64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz#3ce5b9bcf92b3341a5c1c58a3e6bcce0ea9e7455"
-  integrity sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz#3d3d2c018bdd8e037c6bfedd52acfff1c97e4be4"
-  integrity sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==
-
-"@rollup/rollup-linux-arm64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz#5fc8cc978ff396eaa136d7bfe05b5b9138064143"
-  integrity sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==
-
-"@rollup/rollup-linux-arm64-musl@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz#f2ae7d7bed416ffa26d6b948ac5772b520700eef"
-  integrity sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==
-
-"@rollup/rollup-linux-riscv64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz#303d57a328ee9a50c85385936f31cf62306d30b6"
-  integrity sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==
-
-"@rollup/rollup-linux-x64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz#f672f6508f090fc73f08ba40ff76c20b57424778"
-  integrity sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==
-
-"@rollup/rollup-linux-x64-musl@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz#d2f34b1b157f3e7f13925bca3288192a66755a89"
-  integrity sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==
-
-"@rollup/rollup-win32-arm64-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz#8ffecc980ae4d9899eb2f9c4ae471a8d58d2da6b"
-  integrity sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==
-
-"@rollup/rollup-win32-ia32-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz#a7505884f415662e088365b9218b2b03a88fc6f2"
-  integrity sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==
-
-"@rollup/rollup-win32-x64-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz#6abd79db7ff8d01a58865ba20a63cfd23d9e2a10"
-  integrity sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==
-
-"@schematics/angular@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.8.tgz#0b4adf9d05b22176b99ad8e311a274c102d74822"
-  integrity sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==
-  dependencies:
-    "@angular-devkit/core" "17.3.8"
-    "@angular-devkit/schematics" "17.3.8"
-    jsonc-parser "3.2.1"
-
-"@schematics/angular@^12.2.17":
-  version "12.2.18"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-12.2.18.tgz#dc6f8f572eaf6e562ec564bb7a52c5c9e38f43cb"
-  integrity sha512-niRS9Ly9y8uI0YmTSbo8KpdqCCiZ/ATMZWeS2id5M8JZvfXbngwiqJvojdSol0SWU+n1W4iA+lJBdt4gSKlD5w==
-  dependencies:
-    "@angular-devkit/core" "12.2.18"
-    "@angular-devkit/schematics" "12.2.18"
-    jsonc-parser "3.0.0"
-
-"@sigstore/bundle@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.2.0.tgz#e3f555a5c503fe176d8d1e0e829b00f842502e46"
-  integrity sha512-5VI58qgNs76RDrwXNhpmyN/jKpq9evV/7f1XrcqcAfvxDl5SeVY/I5Rmfe96ULAV7/FK5dge9RBKGBJPhL1WsQ==
-  dependencies:
-    "@sigstore/protobuf-specs" "^0.3.0"
-
-"@sigstore/core@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-1.0.0.tgz#0fcdb32d191d4145a70cb837061185353b3b08e3"
-  integrity sha512-dW2qjbWLRKGu6MIDUTBuJwXCnR8zivcSpf5inUzk7y84zqy/dji0/uahppoIgMoKeR+6pUZucrwHfkQQtiG9Rw==
-
-"@sigstore/protobuf-specs@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz#bdcc773671f625bb81591bca86ec5314d57297f3"
-  integrity sha512-zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA==
-
-"@sigstore/sign@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.2.3.tgz#f07bcd2cfee654fade867db44ae260f1a0142ba4"
-  integrity sha512-LqlA+ffyN02yC7RKszCdMTS6bldZnIodiox+IkT8B2f8oRYXCB3LQ9roXeiEL21m64CVH1wyveYAORfD65WoSw==
-  dependencies:
-    "@sigstore/bundle" "^2.2.0"
-    "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
-    make-fetch-happen "^13.0.0"
-
-"@sigstore/tuf@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.3.1.tgz#86ff3c3c907e271696c88de0108d9063a8cbcc45"
-  integrity sha512-9Iv40z652td/QbV0o5n/x25H9w6IYRt2pIGbTX55yFDYlApDQn/6YZomjz6+KBx69rXHLzHcbtTS586mDdFD+Q==
-  dependencies:
-    "@sigstore/protobuf-specs" "^0.3.0"
-    tuf-js "^2.2.0"
-
-"@sigstore/verify@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-1.1.0.tgz#ab617c5dc0bc09ead7f101a848f4870af2d84374"
-  integrity sha512-1fTqnqyTBWvV7cftUUFtDcHPdSox0N3Ub7C0lRyReYx4zZUlNTZjCV+HPy4Lre+r45dV7Qx5JLKvqqsgxuyYfg==
-  dependencies:
-    "@sigstore/bundle" "^2.2.0"
-    "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
-
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
-
-"@socket.io/component-emitter@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
-  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
-"@tufjs/canonical-json@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz#a52f61a3d7374833fca945b2549bc30a2dd40d0a"
-  integrity sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==
-
-"@tufjs/models@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.0.tgz#c7ab241cf11dd29deb213d6817dabb8c99ce0863"
-  integrity sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==
-  dependencies:
-    "@tufjs/canonical-json" "2.0.0"
-    minimatch "^9.0.3"
-
-"@types/babel__core@7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
-  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
-  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
-  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd"
-  integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==
-  dependencies:
-    "@babel/types" "^7.20.7"
-
-"@types/body-parser@*":
-  version "1.19.5"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
-  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/bonjour@^3.5.9":
-  version "3.5.13"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
-  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/circular-json@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/circular-json/-/circular-json-0.4.0.tgz#7401f7e218cfe87ad4c43690da5658b9acaf51be"
-  integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
-
-"@types/connect-history-api-fallback@^1.3.5":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
-  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
-  dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
-  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
-  dependencies:
-    "@types/node" "*"
-
-"@types/cookie@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
-  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
-
-"@types/cors@^2.8.12":
-  version "2.8.17"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b"
-  integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==
-  dependencies:
-    "@types/node" "*"
-
-"@types/deep-freeze@0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.2.tgz#68e5379291910e82c2f0d1629732163c2aa662cc"
-  integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
-
-"@types/ejs@^3.1.2":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
-  integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
-
-"@types/estree@1.0.5", "@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  version "4.17.43"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54"
-  integrity sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.17":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/grecaptcha@^3.0.4":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.8.tgz#a9ac1532c2d9ce0d5f287307f8184c9028cd4c7d"
-  integrity sha512-Yc1cIiHXRPHtbrfiTdpmBB1rakc5OntAUQkpaPtQb8UQ641j2DcQiGsn5GkgR8ztCGdTJeK3ibT5GnwdKGzvAA==
-
-"@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
-  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
-"@types/http-errors@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
-  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
-
-"@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
-  version "1.17.14"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
-  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
-  dependencies:
-    "@types/node" "*"
-
-"@types/jasmine@~3.6.0":
-  version "3.6.11"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.11.tgz#4b1d77aa9dfc757407cb9e277216d8e83553f09d"
-  integrity sha512-S6pvzQDvMZHrkBz2Mcn/8Du7cpr76PlRJBAoHnSDNbulULsH5dp0Gns+WRyNX5LHejz/ljxK4/vIHK/caHt6SQ==
-
-"@types/js-cookie@2.2.6":
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
-  integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
-
-"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
-
-"@types/lodash@^4.14.194":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
-
-"@types/mime@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
-  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
-
-"@types/mime@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
-  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-
-"@types/node-forge@^1.3.0":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
-  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*", "@types/node@>=10.0.0":
-  version "20.11.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.28.tgz#4fd5b2daff2e580c12316e457473d68f15ee6f66"
-  integrity sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/node@^14.14.9":
-  version "14.18.63"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
-  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
-
-"@types/node@^16.18.39":
-  version "16.18.89"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.89.tgz#264d1b6358c458f89f4e374f2210b58cf130fbab"
-  integrity sha512-QlrE8QI5z62nfnkiUZysUsAaxWaTMoGqFVcB3PvK1WxJ0c699bacErV4Fabe9Hki6ZnaHalgzihLbTl2d34XfQ==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
-  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
-
-"@types/prop-types@*":
-  version "15.7.11"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
-  integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
-
-"@types/qs@*":
-  version "6.9.12"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.12.tgz#afa96b383a3a6fdc859453a1892d41b607fc7756"
-  integrity sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==
-
-"@types/range-parser@*":
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
-  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
-
-"@types/react-redux@^7.1.20":
-  version "7.1.33"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15"
-  integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.0"
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-    redux "^4.0.0"
-
-"@types/react-transition-group@^4.2.0":
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac"
-  integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*":
-  version "18.2.66"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.66.tgz#d2eafc8c4e70939c5432221adb23d32d76bfe451"
-  integrity sha512-OYTmMI4UigXeFMF/j4uv0lBBEbongSgptPrHBxqME44h9+yNov+oL6Z3ocJKo0WyXR84sQUNeyIp9MRfckvZpg==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-
-"@types/sanitize-html@^2.9.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.11.0.tgz#582d8c72215c0228e3af2be136e40e0b531addf2"
-  integrity sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==
-  dependencies:
-    htmlparser2 "^8.0.0"
-
-"@types/scheduler@*":
-  version "0.16.8"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
-  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
-
-"@types/semver@^7.3.12", "@types/semver@^7.5.0", "@types/semver@^7.5.8":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
-"@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-index@^1.9.1":
-  version "1.9.4"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
-  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
-  dependencies:
-    "@types/express" "*"
-
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
-  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
-  dependencies:
-    "@types/http-errors" "*"
-    "@types/mime" "*"
-    "@types/node" "*"
-
-"@types/sinonjs__fake-timers@8.1.1":
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
-  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
-
-"@types/sizzle@^2.3.2":
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627"
-  integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==
-
-"@types/sockjs@^0.3.33":
-  version "0.3.36"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
-  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/stacktrace-js@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz#9b027370ca161b89798f308af77438802546cb39"
-  integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
-
-"@types/ws@^8.5.5":
-  version "8.5.10"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
-  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
-  dependencies:
-    "@types/node" "*"
-
-"@types/yargs-parser@*":
-  version "21.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
-  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
-
-"@types/yargs@^17.0.0":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
-  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@types/yauzl@^2.9.1":
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
-  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
-  dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/eslint-plugin@^7.2.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz#bf34a02f221811505b8bf2f31060c8560c1bb0a3"
-  integrity sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==
-  dependencies:
-    "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/type-utils" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
-    debug "^4.3.4"
-    graphemer "^1.4.0"
-    ignore "^5.3.1"
-    natural-compare "^1.4.0"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741"
-  integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==
-  dependencies:
-    "@typescript-eslint/utils" "5.62.0"
-
-"@typescript-eslint/parser@^7.2.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.0.tgz#6b1b3ce76c5de002c43af8ae933613b0f2b4bcc6"
-  integrity sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/rule-tester@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/rule-tester/-/rule-tester-7.2.0.tgz#ca72af90fc4d46f1c53a4fc1c28d95fe7a96e879"
-  integrity sha512-V/jxkkx+buBn9uM2QvdHzi1XzxBm2M+QpEORNZCRkq3vKhnZO2Sto1X0xaZ6vVbmHvOE+Zlkv7GO98PXvgGKVg==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "7.2.0"
-    "@typescript-eslint/utils" "7.2.0"
-    ajv "^6.10.0"
-    lodash.merge "4.6.2"
-    semver "^7.5.4"
-
-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
-"@typescript-eslint/scope-manager@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
-  integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-
-"@typescript-eslint/scope-manager@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da"
-  integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==
-  dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
-
-"@typescript-eslint/scope-manager@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz#3f0db079b275bb8b0cb5be7613fb3130cfb5de77"
-  integrity sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
-
-"@typescript-eslint/type-utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
-  integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/type-utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz#36792ff4209a781b058de61631a48df17bdefbc5"
-  integrity sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/types@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
-  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
-
-"@typescript-eslint/types@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
-  integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
-
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
-
-"@typescript-eslint/types@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f"
-  integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==
-
-"@typescript-eslint/types@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.0.tgz#23af4d24bf9ce15d8d301236e3e3014143604f27"
-  integrity sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==
-
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
-  integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/typescript-estree@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556"
-  integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==
-  dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/typescript-estree@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz#b5dd6383b4c6a852d7b256a37af971e8982be97f"
-  integrity sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "^9.0.4"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
-  integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.19.0"
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/utils@7.2.0", "@typescript-eslint/utils@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.2.0.tgz#fc8164be2f2a7068debb4556881acddbf0b7ce2a"
-  integrity sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "7.2.0"
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/typescript-estree" "7.2.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.0.tgz#3d2b6606a60ac34f3c625facfb3b3ab7e126f58d"
-  integrity sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.15"
-    "@types/semver" "^7.5.8"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    semver "^7.6.0"
-
-"@typescript-eslint/utils@^6.0.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/visitor-keys@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
-  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@typescript-eslint/visitor-keys@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
-  integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e"
-  integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==
-  dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz#950148cf1ac11562a2d903fdf7acf76714a2dc9e"
-  integrity sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    eslint-visitor-keys "^3.4.3"
-
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
-"@vitejs/plugin-basic-ssl@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
-  integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
-
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
-
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
-
-"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
-
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
-
-"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.12.1"
-
-"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-cli/configtest@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
-  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
-
-"@webpack-cli/info@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
-  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
-
-"@webpack-cli/serve@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
-  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-"@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
-"@yarnpkg/parsers@3.0.0-rc.46":
-  version "3.0.0-rc.46"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01"
-  integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==
-  dependencies:
-    js-yaml "^3.10.0"
-    tslib "^2.4.0"
-
-"@zkochan/js-yaml@0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
-  integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
-  dependencies:
-    argparse "^2.0.1"
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-abbrev@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
-  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
-
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
-  dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
-
-acorn-import-attributes@^1.9.5:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn-walk@^8.0.0, acorn-walk@^8.1.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
-  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
-
-acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
-
-adjust-sourcemap-loader@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
-  integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==
-  dependencies:
-    loader-utils "^2.0.0"
-    regex-parser "^2.2.11"
-
-adm-zip@^0.5.2:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.12.tgz#87786328e91d54b37358d8a50f954c4cd73ba60b"
-  integrity sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==
-
-agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
-  dependencies:
-    debug "^4.3.4"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-formats@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.0.tgz#96eaf83e38d32108b66d82a9cb0cfa24886cdfeb"
-  integrity sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-formats@2.1.1, ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv-keywords@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
-ajv@8.12.0, ajv@^8.0.0, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@8.6.2:
-  version "8.6.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
-  integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-angular-idle-preload@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
-  integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
-
-angulartics2@^12.2.0:
-  version "12.2.1"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.1.tgz#9a5727aaacafe77b6b912ff5a94532d41377ce51"
-  integrity sha512-+uDXkGGJJzzIITE59z1s3rL5okNyGXZN5mP7m2Ro9gouJF88COeRkhYlXZwIXkdQjBzIyOvUv6UamzgL9NiXLg==
-  dependencies:
-    tslib "^2.3.0"
-
-ansi-colors@4.1.3, ansi-colors@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
-ansi-escapes@^4.3.0, ansi-escapes@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-html-community@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
-  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
-ansi-regex@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
-  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-arch@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
-  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
-
-are-docs-informative@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
-  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-aria-query@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
-  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
-  dependencies:
-    dequal "^2.0.3"
-
-array-buffer-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
-  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
-  dependencies:
-    call-bind "^1.0.5"
-    is-array-buffer "^3.0.4"
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
-array-includes@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
-  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    is-string "^1.0.7"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
-
-array.prototype.filter@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e"
-  integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
-array.prototype.findlastindex@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f"
-  integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==
-  dependencies:
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.3.0"
-    es-shim-unscopables "^1.0.2"
-
-array.prototype.flat@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
-  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.flatmap@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
-  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
-arraybuffer.prototype.slice@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
-  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.2.1"
-    get-intrinsic "^1.2.3"
-    is-array-buffer "^3.0.4"
-    is-shared-array-buffer "^1.0.2"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
-
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-async-each-series@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
-  integrity sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==
-
-async@^2.6.0:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
-async@^3.2.0, async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
-autoprefixer@10.4.18, autoprefixer@^10.4.13:
-  version "10.4.18"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163"
-  integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==
-  dependencies:
-    browserslist "^4.23.0"
-    caniuse-lite "^1.0.30001591"
-    fraction.js "^4.3.7"
-    normalize-range "^0.1.2"
-    picocolors "^1.0.0"
-    postcss-value-parser "^4.2.0"
-
-available-typed-arrays@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
-  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
-  dependencies:
-    possible-typed-array-names "^1.0.0"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
-  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
-
-axe-core@^4.7.2:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.4.tgz#90db39a2b316f963f00196434d964e6e23648643"
-  integrity sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==
-
-axios@^1.5.1, axios@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
-  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
-axobject-query@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.0.0.tgz#04a4c90dce33cc5d606c76d6216e3b250ff70dab"
-  integrity sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==
-  dependencies:
-    dequal "^2.0.3"
-
-babel-loader@9.1.3:
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
-  integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==
-  dependencies:
-    find-cache-dir "^4.0.0"
-    schema-utils "^4.0.0"
-
-babel-plugin-istanbul@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
-    test-exclude "^6.0.0"
-
-babel-plugin-polyfill-corejs2@^0.4.8:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1"
-  integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==
-  dependencies:
-    "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.1"
-    semver "^6.3.1"
-
-babel-plugin-polyfill-corejs3@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81"
-  integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
-    core-js-compat "^3.34.0"
-
-babel-plugin-polyfill-regenerator@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
-  integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base64id@2.0.0, base64id@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
-  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
-
-basic-auth@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
-  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
-  dependencies:
-    safe-buffer "5.1.2"
-
-batch-processor@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
-  integrity sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
-bent@~7.3.6:
-  version "7.3.12"
-  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
-  integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
-  dependencies:
-    bytesish "^0.4.1"
-    caseless "~0.12.0"
-    is-stream "^2.0.0"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
-  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
-
-bl@^4.0.3, bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-blob-util@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
-  integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
-
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-body-parser@1.20.2, body-parser@^1.19.0:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
-bonjour-service@^1.0.11:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
-  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    multicast-dns "^7.2.5"
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
-boolean@^3.1.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
-  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
-
-bootstrap@^4.6.1:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
-  integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    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@^3.0.2, braces@^3.0.3, braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
-browser-sync-client@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-3.0.2.tgz#6fbe9a7aada25cf14c824683e089ec9ace91cfe1"
-  integrity sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==
-  dependencies:
-    etag "1.8.1"
-    fresh "0.5.2"
-    mitt "^1.1.3"
-
-browser-sync-ui@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz#8136efcff4ec8cc55084b32b91be02094194f0c4"
-  integrity sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==
-  dependencies:
-    async-each-series "0.1.1"
-    chalk "4.1.2"
-    connect-history-api-fallback "^1"
-    immutable "^3"
-    server-destroy "1.0.1"
-    socket.io-client "^4.4.1"
-    stream-throttle "^0.1.3"
-
-browser-sync@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-3.0.2.tgz#cc763cdbf4180193978fe16ebfc506b910225ae4"
-  integrity sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==
-  dependencies:
-    browser-sync-client "^3.0.2"
-    browser-sync-ui "^3.0.2"
-    bs-recipes "1.3.4"
-    chalk "4.1.2"
-    chokidar "^3.5.1"
-    connect "3.6.6"
-    connect-history-api-fallback "^1"
-    dev-ip "^1.0.1"
-    easy-extender "^2.3.4"
-    eazy-logger "^4.0.1"
-    etag "^1.8.1"
-    fresh "^0.5.2"
-    fs-extra "3.0.1"
-    http-proxy "^1.18.1"
-    immutable "^3"
-    micromatch "^4.0.2"
-    opn "5.3.0"
-    portscanner "2.2.0"
-    raw-body "^2.3.2"
-    resp-modifier "6.0.2"
-    rx "4.1.0"
-    send "0.16.2"
-    serve-index "1.9.1"
-    serve-static "1.13.2"
-    server-destroy "1.0.1"
-    socket.io "^4.4.1"
-    ua-parser-js "^1.0.33"
-    yargs "^17.3.1"
-
-browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.22.2, browserslist@^4.22.3, browserslist@^4.23.0:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
-  dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-bs-recipes@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
-  integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.5.0, buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
-bytesish@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
-  integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
-
-cacache@^15.0.5:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cacache@^18.0.0:
-  version "18.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.2.tgz#fd527ea0f03a603be5c0da5805635f8eef00c60c"
-  integrity sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==
-  dependencies:
-    "@npmcli/fs" "^3.1.0"
-    fs-minipass "^3.0.0"
-    glob "^10.2.2"
-    lru-cache "^10.0.1"
-    minipass "^7.0.3"
-    minipass-collect "^2.0.1"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    p-map "^4.0.0"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-    unique-filename "^3.0.0"
-
-cachedir@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.4.0.tgz#7fef9cf7367233d7c88068fe6e34ed0d355a610d"
-  integrity sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==
-
-call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591:
-  version "1.0.30001597"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz#8be94a8c1d679de23b22fbd944232aa1321639e6"
-  integrity sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
-
-cerialize@0.1.18:
-  version "0.1.18"
-  resolved "https://registry.yarnpkg.com/cerialize/-/cerialize-0.1.18.tgz#d0f4f1b61cec7e4ed16a3eda0cac2bc99787414d"
-  integrity sha512-C/hp4UoPrMK060251Pt/21axF9aL4ceJlg3+pThB68VghhRjOzBzy4f8R9AirXdNB4gpqgaV2deU3UaexInL5w==
-  dependencies:
-    typescript "^2.5.0"
-
-chalk@4.1.2, 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==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
-  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
-
-check-more-types@^2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-  integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
-
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-ci-info@^3.2.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
-  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
-
-circular-json@^0.5.0:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
-classnames@^2.2.6:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
-  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@3.1.0, cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-progress@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942"
-  integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==
-  dependencies:
-    string-width "^4.2.3"
-
-cli-spinners@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
-  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
-
-cli-spinners@^2.5.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
-  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
-
-cli-table3@~0.6.1:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
-  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
-  dependencies:
-    string-width "^4.2.0"
-  optionalDependencies:
-    "@colors/colors" "1.5.0"
-
-cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
-cli-width@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5"
-  integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==
-
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
-clsx@^1.0.4, clsx@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
-  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
-colors@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
-  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
-
-commander@^2.2.0, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-comment-parser@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
-  integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
-
-common-path-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
-  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
-
-common-tags@^1.8.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression-webpack-plugin@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz#57fd539d17c5907eebdeb4e83dcfe2d7eceb9ef6"
-  integrity sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==
-  dependencies:
-    schema-utils "^4.0.0"
-    serialize-javascript "^6.0.0"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-connect-history-api-fallback@^1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
-connect-history-api-fallback@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
-  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
-
-connect@3.6.6:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.0"
-    parseurl "~1.3.2"
-    utils-merge "1.0.1"
-
-connect@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
-content-disposition@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@~1.0.4, content-type@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-
-convert-source-map@^1.5.1, convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
-cookie-parser@1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
-  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
-  dependencies:
-    cookie "0.4.1"
-    cookie-signature "1.0.6"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
-  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
-
-cookie@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
-
-copy-anything@^2.0.1:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
-  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
-  dependencies:
-    is-what "^3.14.1"
-
-copy-to-clipboard@^3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
-  integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
-  dependencies:
-    toggle-selection "^1.0.6"
-
-copy-webpack-plugin@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
-  integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==
-  dependencies:
-    fast-glob "^3.2.11"
-    glob-parent "^6.0.1"
-    globby "^13.1.1"
-    normalize-path "^3.0.0"
-    schema-utils "^4.0.0"
-    serialize-javascript "^6.0.0"
-
-copy-webpack-plugin@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
-  integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
-  dependencies:
-    cacache "^15.0.5"
-    fast-glob "^3.2.4"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^3.0.2"
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-    webpack-sources "^1.4.3"
-
-core-js-compat@^3.31.0, core-js-compat@^3.34.0:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.0.tgz#087679119bc2fdbdefad0d45d8e5d307d45ba190"
-  integrity sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==
-  dependencies:
-    browserslist "^4.22.3"
-
-core-js@^3.30.1:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
-  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cors@~2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
-  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
-  dependencies:
-    object-assign "^4"
-    vary "^1"
-
-cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-cosmiconfig@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
-  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
-  dependencies:
-    env-paths "^2.2.1"
-    import-fresh "^3.3.0"
-    js-yaml "^4.1.0"
-    parse-json "^5.2.0"
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-critters@0.0.22:
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.22.tgz#ce76b1cbc70078c89d23725646357e3850236dae"
-  integrity sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==
-  dependencies:
-    chalk "^4.1.0"
-    css-select "^5.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.2"
-    htmlparser2 "^8.0.2"
-    postcss "^8.4.23"
-    postcss-media-query-parser "^0.2.3"
-
-cross-env@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
-  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
-  dependencies:
-    cross-spawn "^7.0.1"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
-
-css-blank-pseudo@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561"
-  integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-
-css-box-model@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
-  integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
-  dependencies:
-    tiny-invariant "^1.0.6"
-
-css-has-pseudo@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73"
-  integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-
-css-loader@6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.10.0.tgz#7c172b270ec7b833951b52c348861206b184a4b7"
-  integrity sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.4.33"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.4"
-    postcss-modules-scope "^3.1.1"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.2.0"
-    semver "^7.5.4"
-
-css-prefers-color-scheme@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349"
-  integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==
-
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
-css-vendor@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
-  integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
-  dependencies:
-    "@babel/runtime" "^7.8.3"
-    is-in-browser "^1.0.2"
-
-css-what@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-cssdb@^7.1.0:
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.11.2.tgz#127a2f5b946ee653361a5af5333ea85a39df5ae5"
-  integrity sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-csstype@^2.5.2:
-  version "2.6.21"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
-  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
-
-csstype@^3.0.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
-
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
-
-cypress-axe@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
-  integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
-
-cypress@12.17.4:
-  version "12.17.4"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c"
-  integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==
-  dependencies:
-    "@cypress/request" "2.88.12"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^16.18.39"
-    "@types/sinonjs__fake-timers" "8.1.1"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.2.0"
-    blob-util "^2.0.2"
-    bluebird "^3.7.2"
-    buffer "^5.6.0"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-cursor "^3.1.0"
-    cli-table3 "~0.6.1"
-    commander "^6.2.1"
-    common-tags "^1.8.0"
-    dayjs "^1.10.4"
-    debug "^4.3.4"
-    enquirer "^2.3.6"
-    eventemitter2 "6.4.7"
-    execa "4.1.0"
-    executable "^4.1.1"
-    extract-zip "2.0.1"
-    figures "^3.2.0"
-    fs-extra "^9.1.0"
-    getos "^3.2.1"
-    is-ci "^3.0.0"
-    is-installed-globally "~0.4.0"
-    lazy-ass "^1.6.0"
-    listr2 "^3.8.3"
-    lodash "^4.17.21"
-    log-symbols "^4.0.0"
-    minimist "^1.2.8"
-    ospath "^1.2.2"
-    pretty-bytes "^5.6.0"
-    process "^0.11.10"
-    proxy-from-env "1.0.0"
-    request-progress "^3.0.0"
-    semver "^7.5.3"
-    supports-color "^8.1.1"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    yauzl "^2.10.0"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-fns-tz@^1.3.7:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
-  integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
-
-date-fns@^2.29.3:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
-  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
-  dependencies:
-    "@babel/runtime" "^7.21.0"
-
-date-format@^4.0.14:
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
-  integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
-
-dayjs@^1.10.4:
-  version "1.11.10"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
-  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
-
-debounce@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
-debug@2.6.9, debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^3.1.0, debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
-  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
-
-deep-freeze@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
-  integrity sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-deepmerge@^4.2.2, deepmerge@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
-default-gateway@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
-  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
-  dependencies:
-    execa "^5.0.0"
-
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
-define-data-property@^1.0.1, define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
-define-lazy-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
-  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
-
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
-  dependencies:
-    define-data-property "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-delay@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
-  integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-depd@2.0.0, depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
-dequal@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
-
-detect-node@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
-  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-
-dev-ip@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
-  integrity sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==
-
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
-
-diff-sequences@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
-  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dnd-core@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-10.0.2.tgz#051dc119682ea1185622f954667670d3d5f6a574"
-  integrity sha512-PrxEjxF0+6Y1n1n1Z9hSWZ1tvnDXv9syL+BccV1r1RC08uWNsyetf8AnWmUF3NgYPwy0HKQJwTqGkZK+1NlaFA==
-  dependencies:
-    "@react-dnd/asap" "^4.0.0"
-    "@react-dnd/invariant" "^2.0.0"
-    redux "^4.0.4"
-
-dnd-multi-backend@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/dnd-multi-backend/-/dnd-multi-backend-5.1.1.tgz#0032761795c3df6a479989f002d8a7d92ad58094"
-  integrity sha512-+bdMsGAC1wlne4+AwTvr6eQ6Bp3St6hn0wp0BcpUMOMVTNM0S+n0Ha8S/qbpYK7XY+i0j439v+yaKO9g9aFvQg==
-
-dns-packet@^5.2.2:
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
-  integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==
-  dependencies:
-    "@leichtgewicht/ip-codec" "^2.0.1"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-helpers@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
-  integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
-  dependencies:
-    "@babel/runtime" "^7.8.7"
-    csstype "^3.0.2"
-
-dom-serialize@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-dompurify@^2.0.11:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc"
-  integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==
-
-domutils@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
-  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
-dotenv-expand@~10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-10.0.0.tgz#12605d00fb0af6d0a592e6558585784032e4ef37"
-  integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==
-
-dotenv@~16.3.1:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.2.tgz#3cb611ce5a63002dbabf7c281bc331f69d28f03f"
-  integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==
-
-duplexer@^0.1.1, duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-easy-extender@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
-  integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
-  dependencies:
-    lodash "^4.17.10"
-
-eazy-logger@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-4.0.1.tgz#2e9fe487fb14ed6ac20d5f01d90dff377d403041"
-  integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==
-  dependencies:
-    chalk "4.1.2"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-
-ejs@^3.1.10, ejs@^3.1.7:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
-  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
-  dependencies:
-    jake "^10.8.5"
-
-electron-to-chromium@^1.4.668:
-  version "1.4.707"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.707.tgz#77904f87432b8b50b8b8b654ba3940d2bef48d63"
-  integrity sha512-qRq74Mo7ChePOU6GHdfAJ0NREXU8vQTlVlfWz3wNygFay6xrd/fY2J7oGHwrhFeU30OVctGLdTh/FcnokTWpng==
-
-element-resize-detector@^1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz#3e6c5982dd77508b5fa7e6d5c02170e26325c9b1"
-  integrity sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==
-  dependencies:
-    batch-processor "1.0.0"
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.1, encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-engine.io-client@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.3.tgz#4cf6fa24845029b238f83c628916d9149c399bc5"
-  integrity sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-    engine.io-parser "~5.2.1"
-    ws "~8.11.0"
-    xmlhttprequest-ssl "~2.0.0"
-
-engine.io-parser@~5.2.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.2.tgz#37b48e2d23116919a3453738c5720455e64e1c49"
-  integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==
-
-engine.io@~6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc"
-  integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==
-  dependencies:
-    "@types/cookie" "^0.4.1"
-    "@types/cors" "^2.8.12"
-    "@types/node" ">=10.0.0"
-    accepts "~1.3.4"
-    base64id "2.0.0"
-    cookie "~0.4.1"
-    cors "~2.8.5"
-    debug "~4.3.1"
-    engine.io-parser "~5.2.1"
-    ws "~8.11.0"
-
-enhanced-resolve@^5.17.1:
-  version "5.17.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
-  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-enquirer@^2.3.6:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
-  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
-  dependencies:
-    ansi-colors "^4.1.1"
-    strip-ansi "^6.0.1"
-
-enquirer@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
-
-entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-entities@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
-  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
-
-env-paths@^2.2.0, env-paths@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-envinfo@^7.7.3:
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1"
-  integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
-errno@^0.1.1:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-stack-parser@^2.0.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
-  dependencies:
-    stackframe "^1.3.4"
-
-es-abstract@^1.22.1, es-abstract@^1.22.3:
-  version "1.22.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.5.tgz#1417df4e97cc55f09bf7e58d1e614bc61cb8df46"
-  integrity sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    arraybuffer.prototype.slice "^1.0.3"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    es-set-tostringtag "^2.0.3"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.4"
-    get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
-    hasown "^2.0.1"
-    internal-slot "^1.0.7"
-    is-array-buffer "^3.0.4"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.3"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.13"
-    is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
-    object-keys "^1.1.1"
-    object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
-    safe-array-concat "^1.1.0"
-    safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.8"
-    string.prototype.trimend "^1.0.7"
-    string.prototype.trimstart "^1.0.7"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.5"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.14"
-
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-
-es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
-es-module-lexer@^1.2.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
-  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
-
-es-set-tostringtag@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
-  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.1"
-
-es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
-  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
-  dependencies:
-    hasown "^2.0.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-promisify@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-7.0.0.tgz#9a710008dd6a4ab75a89e280bad787bfb749927b"
-  integrity sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==
-
-esbuild-wasm@0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz#fdc14b95e3e16ec8e082dd641edb96140c1723f7"
-  integrity sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==
-
-esbuild@0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e"
-  integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.1"
-    "@esbuild/android-arm" "0.20.1"
-    "@esbuild/android-arm64" "0.20.1"
-    "@esbuild/android-x64" "0.20.1"
-    "@esbuild/darwin-arm64" "0.20.1"
-    "@esbuild/darwin-x64" "0.20.1"
-    "@esbuild/freebsd-arm64" "0.20.1"
-    "@esbuild/freebsd-x64" "0.20.1"
-    "@esbuild/linux-arm" "0.20.1"
-    "@esbuild/linux-arm64" "0.20.1"
-    "@esbuild/linux-ia32" "0.20.1"
-    "@esbuild/linux-loong64" "0.20.1"
-    "@esbuild/linux-mips64el" "0.20.1"
-    "@esbuild/linux-ppc64" "0.20.1"
-    "@esbuild/linux-riscv64" "0.20.1"
-    "@esbuild/linux-s390x" "0.20.1"
-    "@esbuild/linux-x64" "0.20.1"
-    "@esbuild/netbsd-x64" "0.20.1"
-    "@esbuild/openbsd-x64" "0.20.1"
-    "@esbuild/sunos-x64" "0.20.1"
-    "@esbuild/win32-arm64" "0.20.1"
-    "@esbuild/win32-ia32" "0.20.1"
-    "@esbuild/win32-x64" "0.20.1"
-
-esbuild@^0.19.3:
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
-  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.19.12"
-    "@esbuild/android-arm" "0.19.12"
-    "@esbuild/android-arm64" "0.19.12"
-    "@esbuild/android-x64" "0.19.12"
-    "@esbuild/darwin-arm64" "0.19.12"
-    "@esbuild/darwin-x64" "0.19.12"
-    "@esbuild/freebsd-arm64" "0.19.12"
-    "@esbuild/freebsd-x64" "0.19.12"
-    "@esbuild/linux-arm" "0.19.12"
-    "@esbuild/linux-arm64" "0.19.12"
-    "@esbuild/linux-ia32" "0.19.12"
-    "@esbuild/linux-loong64" "0.19.12"
-    "@esbuild/linux-mips64el" "0.19.12"
-    "@esbuild/linux-ppc64" "0.19.12"
-    "@esbuild/linux-riscv64" "0.19.12"
-    "@esbuild/linux-s390x" "0.19.12"
-    "@esbuild/linux-x64" "0.19.12"
-    "@esbuild/netbsd-x64" "0.19.12"
-    "@esbuild/openbsd-x64" "0.19.12"
-    "@esbuild/sunos-x64" "0.19.12"
-    "@esbuild/win32-arm64" "0.19.12"
-    "@esbuild/win32-ia32" "0.19.12"
-    "@esbuild/win32-x64" "0.19.12"
-
-escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-compat-utils@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.4.1.tgz#498d9dad03961174a283f7741838a3fbe4a34e89"
-  integrity sha512-5N7ZaJG5pZxUeNNJfUchurLVrunD1xJvyg5kYOIVF8kg1f3ajTikmAu/5fZ9w100omNPOoMjngRszh/Q/uFGMg==
-  dependencies:
-    semver "^7.5.4"
-
-eslint-etc@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-etc/-/eslint-etc-5.2.1.tgz#43e2554a347677ebb6386c915f374918f2efcb87"
-  integrity sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "^5.0.0"
-    tsutils "^3.17.1"
-    tsutils-etc "^1.4.1"
-
-eslint-import-resolver-node@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
-  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
-  dependencies:
-    debug "^3.2.7"
-    is-core-module "^2.13.0"
-    resolve "^1.22.4"
-
-eslint-module-utils@^2.8.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
-  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
-  dependencies:
-    debug "^3.2.7"
-
-eslint-plugin-deprecation@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.6.0.tgz#b12d0c5a9baf3bcde0752ff6337703c059a4ae23"
-  integrity sha512-rld+Vrneh/NXRtDB0vQifOvgUy0HJYoejaxWlVnsk/LK7iij2tCWQIFcCKG4uzQb+Ef86bDke39w1lh4wnon4Q==
-  dependencies:
-    "@typescript-eslint/utils" "^6.0.0"
-    tslib "^2.3.1"
-    tsutils "^3.21.0"
-
-"eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
-  version "0.0.0"
-  uid ""
-
-"eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
-  version "0.0.0"
-  uid ""
-
-eslint-plugin-import-newlines@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.4.0.tgz#469cf3ebb5a8691ba827bdceb00e751bf2f084d1"
-  integrity sha512-+Cz1x2xBLtI9gJbmuYEpvY7F8K75wskBmJ7rk4VRObIJo+jklUJaejFJgtnWeL0dCFWabGEkhausrikXaNbtoQ==
-
-eslint-plugin-import@^2.27.5:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
-  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
-  dependencies:
-    array-includes "^3.1.7"
-    array.prototype.findlastindex "^1.2.3"
-    array.prototype.flat "^1.3.2"
-    array.prototype.flatmap "^1.3.2"
-    debug "^3.2.7"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.8.0"
-    hasown "^2.0.0"
-    is-core-module "^2.13.1"
-    is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.fromentries "^2.0.7"
-    object.groupby "^1.0.1"
-    object.values "^1.1.7"
-    semver "^6.3.1"
-    tsconfig-paths "^3.15.0"
-
-eslint-plugin-jsdoc@^45.0.0:
-  version "45.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
-  integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
-  dependencies:
-    "@es-joy/jsdoccomment" "~0.39.4"
-    are-docs-informative "^0.0.2"
-    comment-parser "1.3.1"
-    debug "^4.3.4"
-    escape-string-regexp "^4.0.0"
-    esquery "^1.5.0"
-    semver "^7.5.1"
-    spdx-expression-parse "^3.0.1"
-
-eslint-plugin-jsonc@^2.6.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.13.0.tgz#e05f88d3671c08ca96e87b5be6a4cfe8d66e6746"
-  integrity sha512-2wWdJfpO/UbZzPDABuUVvlUQjfMJa2p2iQfYt/oWxOMpXCcjuiMUSaA02gtY/Dbu82vpaSqc+O7Xq6ECHwtIxA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.4.0"
-    espree "^9.6.1"
-    graphemer "^1.4.0"
-    jsonc-eslint-parser "^2.0.4"
-    natural-compare "^1.4.0"
-    synckit "^0.6.0"
-
-eslint-plugin-lodash@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz#14a761547f126c92ff56789662a20a44f8bb6290"
-  integrity sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==
-  dependencies:
-    lodash "^4.17.21"
-
-eslint-plugin-rxjs@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-rxjs/-/eslint-plugin-rxjs-5.0.3.tgz#a7ec16549f0dd23051bb744fea5bc0cdf096131a"
-  integrity sha512-fcVkqLmYLRfRp+ShafjpUKuaZ+cw/sXAvM5dfSxiEr7M28QZ/NY7vaOr09FB4rSaZsQyLBnNPh5SL+4EgKjh8Q==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "^5.0.0"
-    common-tags "^1.8.0"
-    decamelize "^5.0.0"
-    eslint-etc "^5.1.0"
-    requireindex "~1.2.0"
-    rxjs-report-usage "^1.0.4"
-    tslib "^2.0.0"
-    tsutils "^3.0.0"
-    tsutils-etc "^1.4.1"
-
-eslint-plugin-simple-import-sort@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
-  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
-
-eslint-plugin-unused-imports@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz#d8db8c4d0cfa0637a8b51ce3fd7d1b6bc3f08520"
-  integrity sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==
-  dependencies:
-    eslint-rule-composer "^0.3.0"
-
-eslint-rule-composer@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
-  integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
-
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-scope@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.0.tgz#7b6b067599c436404ce856cd2c47331464603a4a"
-  integrity sha512-zj3Byw6jX4TcFCJmxOzLt6iol5FAr9xQyZZSQjEzW2UiCJXLwXdRIKCYVFftnpZckaC9Ps9xlC7jB8tSeWWOaw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
-  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-
-eslint@^8.39.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
-    ajv "^6.12.4"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
-    ignore "^5.2.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
-espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
-  dependencies:
-    acorn "^8.9.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.4.2, esquery@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
-eventemitter2@6.4.7:
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
-  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-execa@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-executable@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
-  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
-  dependencies:
-    pify "^2.2.0"
-
-exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
-express-rate-limit@^5.1.3:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
-  integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
-
-express-static-gzip@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.7.tgz#5904824a07950ba741ec3a23a21839dd04c63506"
-  integrity sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==
-  dependencies:
-    serve-static "^1.14.1"
-
-express@^4.17.3, express@^4.19.2:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
-  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.2"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.6.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.2.0"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend@^3.0.0, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extract-zip@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@3.3.2, fast-glob@^3.2.11, fast-glob@^3.2.4, fast-glob@^3.2.9, fast-glob@^3.3.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-patch@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
-  integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
-
-fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fast-memoize@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
-  integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
-
-fast-printf@^1.6.9:
-  version "1.6.9"
-  resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
-  integrity sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==
-  dependencies:
-    boolean "^3.1.4"
-
-fastest-levenshtein@^1.0.12:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
-  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
-
-fastq@^1.6.0:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
-  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
-  dependencies:
-    reusify "^1.0.4"
-
-faye-websocket@^0.11.3:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
-  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
-  dependencies:
-    pend "~1.2.0"
-
-figures@3.2.0, figures@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-filelist@^1.0.4:
-  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"
-  integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==
-
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
-finalhandler@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
-find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-cache-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2"
-  integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==
-  dependencies:
-    common-path-prefix "^3.0.0"
-    pkg-dir "^7.0.0"
-
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-up@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
-  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
-  dependencies:
-    locate-path "^7.1.0"
-    path-exists "^5.0.0"
-
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
-  dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
-
-flat@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
-flatted@^3.2.7, flatted@^3.2.9:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
-  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
-
-follow-redirects@^1.0.0, follow-redirects@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
-
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
-foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^4.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
-fraction.js@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
-  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
-
-fresh@0.5.2, fresh@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^3.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-minipass@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
-  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
-  dependencies:
-    minipass "^7.0.3"
-
-fs-monkey@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
-  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fscreen@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fscreen/-/fscreen-1.2.0.tgz#1a8c88e06bc16a07b473ad96196fb06d6657f59e"
-  integrity sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==
-
-fsevents@~2.3.2, fsevents@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-function.prototype.name@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
-  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    functions-have-names "^1.2.3"
-
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
-
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
-get-stream@^5.0.0, get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
-get-symbol-description@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
-  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
-  dependencies:
-    call-bind "^1.0.5"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-
-getos@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
-  integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
-  dependencies:
-    async "^3.2.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.1, glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^10.2.2, glob@^10.3.10:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
-
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-dirs@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
-  integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==
-  dependencies:
-    ini "2.0.0"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
-
-globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
-  dependencies:
-    define-properties "^1.1.3"
-
-globby@^11.0.1, globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-globby@^13.1.1:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
-  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
-  dependencies:
-    dir-glob "^3.0.1"
-    fast-glob "^3.3.0"
-    ignore "^5.2.4"
-    merge2 "^1.4.1"
-    slash "^4.0.0"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-graphemer@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
-  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
-has-proto@^1.0.1, has-proto@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
-  dependencies:
-    has-symbols "^1.0.3"
-
-hasown@^2.0.0, hasown@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-  dependencies:
-    function-bind "^1.1.2"
-
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
-hosted-git-info@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
-  integrity sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==
-  dependencies:
-    lru-cache "^10.0.1"
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^2.3.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
-  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
-
-html-escaper@^2.0.0, html-escaper@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-html-parse-stringify@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
-  integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
-  dependencies:
-    void-elements "3.1.0"
-
-htmlparser2@^8.0.0, htmlparser2@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
-  integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    entities "^4.4.0"
-
-http-cache-semantics@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
-
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.5.1:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
-  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
-
-http-proxy-agent@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
-  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
-http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
-  dependencies:
-    "@types/http-proxy" "^1.17.8"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy-middleware@^1.0.5:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
-  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
-  dependencies:
-    "@types/http-proxy" "^1.17.5"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^2.0.2"
-    sshpk "^1.14.1"
-
-http-terminator@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/http-terminator/-/http-terminator-3.2.0.tgz#bc158d2694b733ca4fbf22a35065a81a609fb3e9"
-  integrity sha512-JLjck1EzPaWjsmIf8bziM3p9fgR1Y3JoUKAkyYEbZmFrIvJM6I8vVJfBGWlEtV9IWOvzNnaTtjuwZeBY2kwB4g==
-  dependencies:
-    delay "^5.0.0"
-    p-wait-for "^3.2.0"
-    roarr "^7.0.4"
-    type-fest "^2.3.3"
-
-https-proxy-agent@7.0.4, https-proxy-agent@^7.0.1:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
-  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
-hyphenate-style-name@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
-  integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
-
-i18next@^19.5.0:
-  version "19.9.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397"
-  integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==
-  dependencies:
-    "@babel/runtime" "^7.12.0"
-
-icomcom-react@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/icomcom-react/-/icomcom-react-1.0.1.tgz#6c513655bc576621930e31d19ddb718c3b7439f4"
-  integrity sha512-Xbz81qZ+er8RYZ6DFMmXxCl9YjxNWngNfPANTSOvzYNrQDieYvBZi+nv1MspI/ze+PAzfHUrmDcUii5RGCUifg==
-  dependencies:
-    prop-types "^15.6.0"
-
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.6.2, iconv-lite@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore-by-default@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
-  integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
-
-ignore-walk@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
-  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
-  dependencies:
-    minimatch "^9.0.0"
-
-ignore@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
-  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
-
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
-  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
-
-immutability-helper@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz#2b86b2286ed3b1241c9e23b7b21e0444f52f77b7"
-  integrity sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ==
-
-immutable@^3:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
-
-immutable@^4.0.0:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
-  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
-
-import-fresh@^3.2.1, import-fresh@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
-
-ini@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
-
-ini@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.2.tgz#7f646dbd9caea595e61f88ef60bfff8b01f8130a"
-  integrity sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==
-
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-inquirer@9.2.15:
-  version "9.2.15"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.15.tgz#2135a36190a6e5c92f5d205e0af1fea36b9d3492"
-  integrity sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==
-  dependencies:
-    "@ljharb/through" "^2.3.12"
-    ansi-escapes "^4.3.2"
-    chalk "^5.3.0"
-    cli-cursor "^3.1.0"
-    cli-width "^4.1.0"
-    external-editor "^3.1.0"
-    figures "^3.2.0"
-    lodash "^4.17.21"
-    mute-stream "1.0.0"
-    ora "^5.4.1"
-    run-async "^3.0.0"
-    rxjs "^7.8.1"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^6.2.0"
-
-internal-slot@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
-  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
-  dependencies:
-    es-errors "^1.3.0"
-    hasown "^2.0.0"
-    side-channel "^1.0.4"
-
-interpret@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
-  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
-
-intersection-observer@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.10.0.tgz#4d11d63c1ff67e21e62987be24d55218da1a1a69"
-  integrity sha512-fn4bQ0Xq8FTej09YC/jqKZwtijpvARlRp6wxL5WTA6yPe2YWSJ5RJh7Nm79rK2qB0wr6iDQzH60XGq5V/7u8YQ==
-
-invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-ip-address@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
-  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
-  dependencies:
-    jsbn "1.1.0"
-    sprintf-js "^1.1.3"
-
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
-
-is-array-buffer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
-  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-ci@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
-  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
-  dependencies:
-    ci-info "^3.2.0"
-
-is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.8.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
-  dependencies:
-    hasown "^2.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-docker@^2.0.0, is-docker@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-in-browser@^1.0.2, is-in-browser@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==
-
-is-installed-globally@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
-  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
-  dependencies:
-    global-dirs "^3.0.0"
-    is-path-inside "^3.0.2"
-
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
-is-number-like@^1.0.3:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
-  integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
-  dependencies:
-    lodash.isfinite "^3.3.2"
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-path-inside@^3.0.2, is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-plain-obj@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
-  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
-  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
-  dependencies:
-    call-bind "^1.0.7"
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typed-array@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
-  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
-  dependencies:
-    which-typed-array "^1.1.14"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-what@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
-
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
-isbinaryfile@^4.0.8:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
-  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
-
-isbot@^3.6.10:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.8.0.tgz#b1f8e3d19aca0961b5ed27b62bb8bb0a275781e4"
-  integrity sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isexe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
-  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
-isomorphic-unfetch@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
-  integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
-  dependencies:
-    node-fetch "^2.6.1"
-    unfetch "^4.2.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
-  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
-
-istanbul-lib-instrument@^5.0.4:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
-  dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.2.0"
-    semver "^6.3.0"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
-  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^4.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.0.2:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
-  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
-jake@^10.8.5:
-  version "10.8.7"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
-  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
-  dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
-    filelist "^1.0.4"
-    minimatch "^3.1.2"
-
-jasmine-core@^3.6.0, jasmine-core@^3.8.0, jasmine-core@~3.99.0:
-  version "3.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.99.1.tgz#5bfa4b2d76618868bfac4c8ff08bb26fffa4120d"
-  integrity sha512-Hu1dmuoGcZ7AfyynN3LsfruwMbxMALMka+YtZeGoLuDEySVmVAPaonkNoBRIw/ectu8b9tVQCJNgp4a4knp+tg==
-
-jasmine-marbles@0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz#5adfee5f72c7f24270687fa64a6e8a8613ffa841"
-  integrity sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==
-  dependencies:
-    lodash "^4.17.20"
-
-jasmine@^3.8.0:
-  version "3.99.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.99.0.tgz#7cc7aeda7ade2d57694fc818a374f778cbb4ea62"
-  integrity sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==
-  dependencies:
-    glob "^7.1.6"
-    jasmine-core "~3.99.0"
-
-jest-diff@^29.4.1:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
-jest-get-type@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
-  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
-
-jest-worker@^27.4.5:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jiti@^1.20.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
-
-js-cookie@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
-  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@4.1.0, js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-js-yaml@^3.10.0, js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
-jsdoc-type-pratt-parser@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
-  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-parse-even-better-errors@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
-  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
-json5@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-jsonc-eslint-parser@^2.0.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.4.0.tgz#74ded53f9d716e8d0671bd167bf5391f452d5461"
-  integrity sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==
-  dependencies:
-    acorn "^8.5.0"
-    eslint-visitor-keys "^3.0.0"
-    espree "^9.0.0"
-    semver "^7.3.5"
-
-jsonc-parser@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
-  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
-
-jsonc-parser@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
-jsonc-parser@3.2.1, jsonc-parser@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
-  integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==
-
-jsonfile@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonparse@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
-
-jsonschema@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
-  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
-
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-jsprim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
-  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-jss-plugin-camel-case@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c"
-  integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    hyphenate-style-name "^1.0.3"
-    jss "10.10.0"
-
-jss-plugin-default-unit@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293"
-  integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-global@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd"
-  integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-nested@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219"
-  integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-props-sort@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7"
-  integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-
-jss-plugin-rule-value-function@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b"
-  integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.10.0"
-    tiny-warning "^1.0.2"
-
-jss-plugin-vendor-prefixer@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7"
-  integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    css-vendor "^2.0.8"
-    jss "10.10.0"
-
-jss-rtl@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/jss-rtl/-/jss-rtl-0.3.0.tgz#386961615956f9655bd5e9ec7e9d08bef223e4af"
-  integrity sha512-rg9jJmP1bAyhNOAp+BDZgOP/lMm4+oQ76qGueupDQ68Wq+G+6SGvCZvhIEg8OHSONRWOwFT6skCI+APGi8DgmA==
-  dependencies:
-    rtl-css-js "^1.13.1"
-
-jss@10.10.0, jss@^10.3.0, jss@^10.5.1:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc"
-  integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    csstype "^3.0.2"
-    is-in-browser "^1.1.3"
-    tiny-warning "^1.0.2"
-
-jwt-decode@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
-  integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
-
-karma-chrome-launcher@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz#eb9c95024f2d6dfbb3748d3415ac9b381906b9a9"
-  integrity sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==
-  dependencies:
-    which "^1.2.1"
-
-karma-coverage-istanbul-reporter@~3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz#f3b5303553aadc8e681d40d360dfdc19bc7e9fe9"
-  integrity sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^3.0.2"
-    minimatch "^3.0.4"
-
-karma-jasmine-html-reporter@^1.5.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz#52c489a74d760934a1089bfa5ea4a8fcb84cc28b"
-  integrity sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==
-
-karma-jasmine@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.2.tgz#386db2a3e1acc0af5265c711f673f78f1e4938de"
-  integrity sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==
-  dependencies:
-    jasmine-core "^3.6.0"
-
-karma-mocha-reporter@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560"
-  integrity sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==
-  dependencies:
-    chalk "^2.1.0"
-    log-symbols "^2.1.0"
-    strip-ansi "^4.0.0"
-
-karma-source-map-support@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
-  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
-  dependencies:
-    source-map-support "^0.5.5"
-
-karma@^6.4.2:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
-  integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
-  dependencies:
-    "@colors/colors" "1.5.0"
-    body-parser "^1.19.0"
-    braces "^3.0.2"
-    chokidar "^3.5.1"
-    connect "^3.7.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.1"
-    glob "^7.1.7"
-    graceful-fs "^4.2.6"
-    http-proxy "^1.18.1"
-    isbinaryfile "^4.0.8"
-    lodash "^4.17.21"
-    log4js "^6.4.1"
-    mime "^2.5.2"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.5"
-    qjobs "^1.2.0"
-    range-parser "^1.2.1"
-    rimraf "^3.0.2"
-    socket.io "^4.7.2"
-    source-map "^0.6.1"
-    tmp "^0.2.1"
-    ua-parser-js "^0.7.30"
-    yargs "^16.1.1"
-
-keyv@^4.5.3:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
-  dependencies:
-    json-buffer "3.0.1"
-
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-klaro@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.18.tgz#fef3a05fcd656451b941e11459f37d6c336e84c0"
-  integrity sha512-Q5nehkGeZuFerisW4oeeB1ax6dHDszWckR70EcxKvhFiJQ61CM0WBSo20yLbdvz8N9MFsOFu4RNCO9JsbkCxgQ==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-klona@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
-  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
-
-launch-editor@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
-  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
-  dependencies:
-    picocolors "^1.0.0"
-    shell-quote "^1.8.1"
-
-lazy-ass@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-  integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
-
-less-loader@11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82"
-  integrity sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==
-  dependencies:
-    klona "^2.0.4"
-
-less@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/less/-/less-4.2.0.tgz#cbefbfaa14a4cd388e2099b2b51f956e1465c450"
-  integrity sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==
-  dependencies:
-    copy-anything "^2.0.1"
-    parse-node-version "^1.0.1"
-    tslib "^2.3.0"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
-    mime "^1.4.1"
-    needle "^3.1.0"
-    source-map "~0.6.0"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-license-webpack-plugin@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz#1e18442ed20b754b82f1adeff42249b81d11aec6"
-  integrity sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==
-  dependencies:
-    webpack-sources "^3.0.0"
-
-limiter@^1.0.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
-  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
-lines-and-columns@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
-  integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
-
-linkify-it@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
-  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
-  dependencies:
-    uc.micro "^1.0.1"
-
-listr2@^3.8.3:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
-  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
-  dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.1"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
-
-loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
-
-loader-utils@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
-  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
-
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-locate-path@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
-  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
-  dependencies:
-    p-locate "^6.0.0"
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
-lodash.isfinite@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
-  integrity sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==
-
-lodash.merge@4.6.2, lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
-
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-log-symbols@^4.0.0, log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
-  dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
-
-log4js@^6.4.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6"
-  integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
-  dependencies:
-    date-format "^4.0.14"
-    debug "^4.3.4"
-    flatted "^3.2.7"
-    rfdc "^1.3.0"
-    streamroller "^3.1.5"
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
-  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-lru-cache@^7.14.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
-magic-string@0.25.7:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-magic-string@0.30.8:
-  version "0.30.8"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613"
-  integrity sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.15"
-
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-make-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
-  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
-  dependencies:
-    semver "^7.5.3"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-fetch-happen@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
-  integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
-  dependencies:
-    "@npmcli/agent" "^2.0.0"
-    cacache "^18.0.0"
-    http-cache-semantics "^4.1.1"
-    is-lambda "^1.0.1"
-    minipass "^7.0.2"
-    minipass-fetch "^3.0.0"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    ssri "^10.0.0"
-
-manifesto.js@^4.2.0:
-  version "4.2.17"
-  resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.17.tgz#9d06dd50f5442a80897ccf7d88dfe861afb6a343"
-  integrity sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==
-  dependencies:
-    "@edsilv/http-status-codes" "^1.0.3"
-    "@iiif/vocabulary" "^1.0.26"
-    isomorphic-unfetch "^3.0.0"
-    lodash "^4.17.21"
-
-markdown-it@^13.0.1:
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
-  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
-  dependencies:
-    argparse "^2.0.1"
-    entities "~3.0.1"
-    linkify-it "^4.0.1"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
-md5@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
-mdurl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-
-memfs@^3.4.12, memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
-  dependencies:
-    fs-monkey "^1.0.4"
-
-"memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
-  integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@1.6.0, mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.5.2:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mini-css-extract-plugin@2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz#75245f3f30ce3a56dbdd478084df6fe475f02dc7"
-  integrity sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==
-  dependencies:
-    schema-utils "^4.0.0"
-    tapable "^2.2.1"
-
-minimalistic-assert@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimatch@3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
-  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^5.0.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^9.0.4:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-collect@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
-  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
-  dependencies:
-    minipass "^7.0.3"
-
-minipass-fetch@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
-  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
-  dependencies:
-    minipass "^7.0.3"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-json-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
-  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
-  dependencies:
-    jsonparse "^1.3.1"
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
-
-minizlib@^2.1.1, minizlib@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mirador-dl-plugin@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz#9a6cb0fa3c566a2a1ebe1ad9caa1ff590ff22689"
-  integrity sha512-I/6etIvpTtO1zgjxx2uEUFoyB9NxQ43JWg8CMkKmZqblW7AAeFqRn1/zUlQH7N8KFZft9Rah6D8qxtuNAo9jmA==
-
-mirador-share-plugin@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz#13e2f654e38839044382acad42d9329e91a8cd5e"
-  integrity sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==
-
-mirador@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.3.0.tgz#7a957a1db1a5388b2b8cafab00db4eb9f97557b9"
-  integrity sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==
-  dependencies:
-    "@material-ui/core" "^4.11.0"
-    "@material-ui/icons" "^4.9.1"
-    "@material-ui/lab" "^4.0.0-alpha.53"
-    "@researchgate/react-intersection-observer" "^1.0.0"
-    classnames "^2.2.6"
-    clsx "^1.0.4"
-    deepmerge "^4.2.2"
-    dompurify "^2.0.11"
-    i18next "^19.5.0"
-    icomcom-react "^1.0.1"
-    intersection-observer "^0.10.0"
-    isomorphic-unfetch "^3.0.0"
-    jss "^10.3.0"
-    jss-rtl "^0.3.0"
-    lodash "^4.17.11"
-    manifesto.js "^4.2.0"
-    normalize-url "^4.5.0"
-    openseadragon "^2.4.2"
-    prop-types "^15.6.2"
-    re-reselect "^4.0.0"
-    react-aria-live "^2.0.5"
-    react-beautiful-dnd "^13.0.0"
-    react-copy-to-clipboard "^5.0.1"
-    react-dnd "^10.0.2"
-    react-dnd-html5-backend "^10.0.2"
-    react-dnd-multi-backend "^5.0.0"
-    react-dnd-touch-backend "^10.0.2"
-    react-full-screen "^0.2.4"
-    react-i18next "^11.7.0"
-    react-image "^4.0.1"
-    react-mosaic-component "^4.0.1"
-    react-redux "^7.1.0"
-    react-resize-observer "^1.1.1"
-    react-rnd "^10.1"
-    react-sizeme "^2.6.7"
-    react-virtualized-auto-sizer "^1.0.2"
-    react-window "^1.8.5"
-    redux "^4.0.5"
-    redux-devtools-extension "^2.13.2"
-    redux-saga "^1.1.3"
-    redux-thunk "^2.3.0"
-    reselect "^4.0.0"
-    uuid "^8.1.0"
-
-mitt@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
-  integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
-
-mkdirp@^0.5.5:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-morgan@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
-  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
-  dependencies:
-    basic-auth "~2.0.1"
-    debug "2.6.9"
-    depd "~2.0.0"
-    on-finished "~2.3.0"
-    on-headers "~1.0.2"
-
-mrmime@2.0.0, mrmime@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
-  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multicast-dns@^7.2.5:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
-  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
-  dependencies:
-    dns-packet "^5.2.2"
-    thunky "^1.0.2"
-
-mute-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
-  integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
-
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-needle@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"
-  integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==
-  dependencies:
-    iconv-lite "^0.6.3"
-    sax "^1.2.4"
-
-negotiator@0.6.3, negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-ng-mocks@^14.10.0:
-  version "14.12.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.12.1.tgz#a2d698c872616e0ceeefa08ecb4bd357ae85a7dd"
-  integrity sha512-5OdTYYOva7IkCCi6kTtgnII1hSfw+qYOM1ScrKhyo7iaI/ViV8xI4MGa89Ts7XnH6XqISSez2Un3zFSomkFpmg==
-
-ng2-file-upload@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-5.0.0.tgz#8d52062bca192e4fb2774c230c4fb051ae176403"
-  integrity sha512-M2JaX0unB/30GmQUScfXko2vseaPlU1R5jnhL5cfvOLNw8BBSVJAdOSmcavJzicgTZWCYz7y7Fvpr939bd4eCA==
-  dependencies:
-    tslib "^2.3.0"
-
-ng2-nouislider@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-2.0.0.tgz#a62fd6cf3f1561be19a2691c2f68d21a46dc6006"
-  integrity sha512-NGbF/0w0+bZqclpSPFOlWIeVJaVwRRYFJzD1x8PClbw9GIeo7fCHoBzZ81y7K7FTJg6to+cgjSTFETPZG/Dizg==
-  dependencies:
-    tslib "^2.3.0"
-
-ngx-infinite-scroll@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz#287b48898bc291a0e7c5b3344cf337d7ac82e2dd"
-  integrity sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==
-  dependencies:
-    tslib "^2.3.0"
-
-ngx-mask@14.2.4:
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-14.2.4.tgz#da7ba480d7c7f5be9ff34c35a288838c58d65bbd"
-  integrity sha512-158nAe2tyiZa2T8COoI6SvJCQHqpJ4+JW0amGcvVEYUBF6FIoYK66BlnOJURAOy5qry0d0N45w7J/LGsCBgZcg==
-  dependencies:
-    tslib "^2.3.0"
-
-ngx-pagination@6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-6.0.3.tgz#083f77a5c9c3ebf5800fb57a280da71aacc10a18"
-  integrity sha512-lONjTQ7hFPh1SyhwDrRd5ZwM4NMGQ7bNR6vLrs6mrU0Z8Q1zCcWbf/pvyp4DOlGyd9uyZxRy2wUsSZLeIPjbAw==
-  dependencies:
-    tslib "^2.3.0"
-
-ngx-ui-switch@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"
-  integrity sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==
-  dependencies:
-    tslib "^2.3.0"
-
-nice-napi@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b"
-  integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==
-  dependencies:
-    node-addon-api "^3.0.0"
-    node-gyp-build "^4.2.2"
-
-node-addon-api@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
-node-fetch@^2.6.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
-node-gyp-build@^4.2.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
-  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
-
-node-gyp@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966"
-  integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^10.3.10"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^13.0.0"
-    nopt "^7.0.0"
-    proc-log "^3.0.0"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^4.0.0"
-
-node-machine-id@1.1.12:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
-  integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
-
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
-
-nodemon@^2.0.22:
-  version "2.0.22"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
-  integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
-  dependencies:
-    chokidar "^3.5.2"
-    debug "^3.2.7"
-    ignore-by-default "^1.0.1"
-    minimatch "^3.1.2"
-    pstree.remy "^1.1.8"
-    semver "^5.7.1"
-    simple-update-notifier "^1.0.7"
-    supports-color "^5.5.0"
-    touch "^3.1.0"
-    undefsafe "^2.0.5"
-
-nopt@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
-  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
-  dependencies:
-    abbrev "^2.0.0"
-
-nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
-  integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
-  dependencies:
-    hosted-git-info "^7.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
-
-normalize-url@^4.5.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
-nouislider@^15.7.1:
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.7.1.tgz#77d55e47d9b4cd771728515713df43b489db9705"
-  integrity sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w==
-
-npm-bundled@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
-  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
-  dependencies:
-    npm-normalize-package-bin "^3.0.0"
-
-npm-install-checks@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
-  integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
-  dependencies:
-    semver "^7.1.1"
-
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
-  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
-
-npm-package-arg@11.0.1, npm-package-arg@^11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.1.tgz#f208b0022c29240a1c532a449bdde3f0a4708ebc"
-  integrity sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==
-  dependencies:
-    hosted-git-info "^7.0.0"
-    proc-log "^3.0.0"
-    semver "^7.3.5"
-    validate-npm-package-name "^5.0.0"
-
-npm-packlist@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-8.0.2.tgz#5b8d1d906d96d21c85ebbeed2cf54147477c8478"
-  integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==
-  dependencies:
-    ignore-walk "^6.0.4"
-
-npm-pick-manifest@9.0.0, npm-pick-manifest@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz#f87a4c134504a2c7931f2bb8733126e3c3bb7e8f"
-  integrity sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==
-  dependencies:
-    npm-install-checks "^6.0.0"
-    npm-normalize-package-bin "^3.0.0"
-    npm-package-arg "^11.0.0"
-    semver "^7.3.5"
-
-npm-registry-fetch@^16.0.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz#10227b7b36c97bc1cf2902a24e4f710cfe62803c"
-  integrity sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==
-  dependencies:
-    make-fetch-happen "^13.0.0"
-    minipass "^7.0.2"
-    minipass-fetch "^3.0.0"
-    minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^11.0.0"
-    proc-log "^3.0.0"
-
-npm-run-path@^4.0.0, npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-nx@17.2.8:
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-17.2.8.tgz#09482acd5d9b64c115d5ccf12417f1af2787d4d1"
-  integrity sha512-rM5zXbuXLEuqQqcjVjClyvHwRJwt+NVImR2A6KFNG40Z60HP6X12wAxxeLHF5kXXTDRU0PFhf/yACibrpbPrAw==
-  dependencies:
-    "@nrwl/tao" "17.2.8"
-    "@yarnpkg/lockfile" "^1.1.0"
-    "@yarnpkg/parsers" "3.0.0-rc.46"
-    "@zkochan/js-yaml" "0.0.6"
-    axios "^1.5.1"
-    chalk "^4.1.0"
-    cli-cursor "3.1.0"
-    cli-spinners "2.6.1"
-    cliui "^8.0.1"
-    dotenv "~16.3.1"
-    dotenv-expand "~10.0.0"
-    enquirer "~2.3.6"
-    figures "3.2.0"
-    flat "^5.0.2"
-    fs-extra "^11.1.0"
-    glob "7.1.4"
-    ignore "^5.0.4"
-    jest-diff "^29.4.1"
-    js-yaml "4.1.0"
-    jsonc-parser "3.2.0"
-    lines-and-columns "~2.0.3"
-    minimatch "3.0.5"
-    node-machine-id "1.1.12"
-    npm-run-path "^4.0.1"
-    open "^8.4.0"
-    semver "7.5.3"
-    string-width "^4.2.3"
-    strong-log-transformer "^2.1.0"
-    tar-stream "~2.2.0"
-    tmp "~0.2.1"
-    tsconfig-paths "^4.1.2"
-    tslib "^2.3.0"
-    yargs "^17.6.2"
-    yargs-parser "21.1.1"
-  optionalDependencies:
-    "@nx/nx-darwin-arm64" "17.2.8"
-    "@nx/nx-darwin-x64" "17.2.8"
-    "@nx/nx-freebsd-x64" "17.2.8"
-    "@nx/nx-linux-arm-gnueabihf" "17.2.8"
-    "@nx/nx-linux-arm64-gnu" "17.2.8"
-    "@nx/nx-linux-arm64-musl" "17.2.8"
-    "@nx/nx-linux-x64-gnu" "17.2.8"
-    "@nx/nx-linux-x64-musl" "17.2.8"
-    "@nx/nx-win32-arm64-msvc" "17.2.8"
-    "@nx/nx-win32-x64-msvc" "17.2.8"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
-  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
-  dependencies:
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
-object.fromentries@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
-  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-object.groupby@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec"
-  integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==
-  dependencies:
-    array.prototype.filter "^1.0.3"
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.0.0"
-
-object.values@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
-  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0, onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@8.4.2, open@^8.0.9, open@^8.4.0:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
-  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
-openseadragon@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c"
-  integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
-
-opn@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
-  dependencies:
-    is-wsl "^1.1.0"
-
-optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
-  dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-
-ora@5.4.1, ora@^5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
-os-tmpdir@^1.0.2, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-ospath@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-  integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
-
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-limit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
-  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
-  dependencies:
-    yocto-queue "^1.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-locate@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
-  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
-  dependencies:
-    p-limit "^4.0.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-retry@^4.5.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
-  dependencies:
-    "@types/retry" "0.12.0"
-    retry "^0.13.1"
-
-p-timeout@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
-  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
-  dependencies:
-    p-finally "^1.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-p-wait-for@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-3.2.0.tgz#640429bcabf3b0dd9f492c31539c5718cb6a3f1f"
-  integrity sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==
-  dependencies:
-    p-timeout "^3.0.0"
-
-pacote@17.0.6:
-  version "17.0.6"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.6.tgz#874bb59cda5d44ab784d0b6530fcb4a7d9b76a60"
-  integrity sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==
-  dependencies:
-    "@npmcli/git" "^5.0.0"
-    "@npmcli/installed-package-contents" "^2.0.1"
-    "@npmcli/promise-spawn" "^7.0.0"
-    "@npmcli/run-script" "^7.0.0"
-    cacache "^18.0.0"
-    fs-minipass "^3.0.0"
-    minipass "^7.0.2"
-    npm-package-arg "^11.0.0"
-    npm-packlist "^8.0.0"
-    npm-pick-manifest "^9.0.0"
-    npm-registry-fetch "^16.0.0"
-    proc-log "^3.0.0"
-    promise-retry "^2.0.1"
-    read-package-json "^7.0.0"
-    read-package-json-fast "^3.0.0"
-    sigstore "^2.2.0"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-json@^5.0.0, parse-json@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse-node-version@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
-parse-srcset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
-  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
-
-parse5-html-rewriting-stream@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz#e376d3e762d2950ccbb6bb59823fc1d7e9fdac36"
-  integrity sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==
-  dependencies:
-    entities "^4.3.0"
-    parse5 "^7.0.0"
-    parse5-sax-parser "^7.0.0"
-
-parse5-sax-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz#4c05064254f0488676aca75fb39ca069ec96dee5"
-  integrity sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==
-  dependencies:
-    parse5 "^7.0.0"
-
-parse5@^7.0.0, parse5@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
-  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
-  dependencies:
-    entities "^4.4.0"
-
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-exists@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
-  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
-  dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pem@1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.7.tgz#dae9831ee5fa7c88547327fb7738898cd76412c6"
-  integrity sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==
-  dependencies:
-    es6-promisify "^7.0.0"
-    md5 "^2.3.0"
-    os-tmpdir "^1.0.2"
-    which "^2.0.2"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.1.tgz#68c26c8837399e5819edce48590412ea07f17a07"
-  integrity sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
-
-piscina@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.4.0.tgz#e3af8e5721d8fad08c6ccaf8a64f9f42279efbb5"
-  integrity sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==
-  optionalDependencies:
-    nice-napi "^1.0.2"
-
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-pkg-dir@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
-  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
-  dependencies:
-    find-up "^6.3.0"
-
-popper.js@1.16.1-lts:
-  version "1.16.1-lts"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
-  integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
-
-portscanner@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.2.0.tgz#6059189b3efa0965c9d96a56b958eb9508411cf1"
-  integrity sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==
-  dependencies:
-    async "^2.6.0"
-    is-number-like "^1.0.3"
-
-possible-typed-array-names@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
-  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
-
-postcss-apply@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/postcss-apply/-/postcss-apply-0.12.0.tgz#11a47b271b14d81db97ed7f51a6c409d025a9c34"
-  integrity sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.14"
-
-postcss-attribute-case-insensitive@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
-  integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
-  dependencies:
-    postcss-selector-parser "^6.0.10"
-
-postcss-clamp@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363"
-  integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-color-functional-notation@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec"
-  integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-color-hex-alpha@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5"
-  integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-color-rebeccapurple@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0"
-  integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-custom-media@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
-  integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-custom-properties@^12.1.10:
-  version "12.1.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz#d14bb9b3989ac4d40aaa0e110b43be67ac7845cf"
-  integrity sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-custom-selectors@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
-  integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-dir-pseudo-class@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c"
-  integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
-  dependencies:
-    postcss-selector-parser "^6.0.10"
-
-postcss-double-position-gradients@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91"
-  integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-env-function@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz#7b2d24c812f540ed6eda4c81f6090416722a8e7a"
-  integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-focus-visible@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e"
-  integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-
-postcss-focus-within@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20"
-  integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-
-postcss-font-variant@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
-  integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
-
-postcss-gap-properties@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff"
-  integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
-
-postcss-image-set-function@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f"
-  integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-import@^14.0.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0"
-  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
-  dependencies:
-    postcss-value-parser "^4.0.0"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-initial@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
-  integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
-
-postcss-lab-function@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98"
-  integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-loader@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-8.1.1.tgz#2822589e7522927344954acb55bbf26e8b195dfe"
-  integrity sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==
-  dependencies:
-    cosmiconfig "^9.0.0"
-    jiti "^1.20.0"
-    semver "^7.5.4"
-
-postcss-loader@^4.0.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
-  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.4"
-
-postcss-logical@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73"
-  integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==
-
-postcss-media-minmax@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
-  integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
-
-postcss-media-query-parser@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
-  integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
-  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
-  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-nesting@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.2.0.tgz#0b12ce0db8edfd2d8ae0aaf86427370b898890be"
-  integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
-  dependencies:
-    "@csstools/selector-specificity" "^2.0.0"
-    postcss-selector-parser "^6.0.10"
-
-postcss-opacity-percentage@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz#5b89b35551a556e20c5d23eb5260fbfcf5245da6"
-  integrity sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==
-
-postcss-overflow-shorthand@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e"
-  integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-page-break@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
-  integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
-
-postcss-place@^7.0.5:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4"
-  integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-preset-env@^7.4.2:
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz#2a50f5e612c3149cc7af75634e202a5b2ad4f1e2"
-  integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
-  dependencies:
-    "@csstools/postcss-cascade-layers" "^1.1.1"
-    "@csstools/postcss-color-function" "^1.1.1"
-    "@csstools/postcss-font-format-keywords" "^1.0.1"
-    "@csstools/postcss-hwb-function" "^1.0.2"
-    "@csstools/postcss-ic-unit" "^1.0.1"
-    "@csstools/postcss-is-pseudo-class" "^2.0.7"
-    "@csstools/postcss-nested-calc" "^1.0.0"
-    "@csstools/postcss-normalize-display-values" "^1.0.1"
-    "@csstools/postcss-oklab-function" "^1.1.1"
-    "@csstools/postcss-progressive-custom-properties" "^1.3.0"
-    "@csstools/postcss-stepped-value-functions" "^1.0.1"
-    "@csstools/postcss-text-decoration-shorthand" "^1.0.0"
-    "@csstools/postcss-trigonometric-functions" "^1.0.2"
-    "@csstools/postcss-unset-value" "^1.0.2"
-    autoprefixer "^10.4.13"
-    browserslist "^4.21.4"
-    css-blank-pseudo "^3.0.3"
-    css-has-pseudo "^3.0.4"
-    css-prefers-color-scheme "^6.0.3"
-    cssdb "^7.1.0"
-    postcss-attribute-case-insensitive "^5.0.2"
-    postcss-clamp "^4.1.0"
-    postcss-color-functional-notation "^4.2.4"
-    postcss-color-hex-alpha "^8.0.4"
-    postcss-color-rebeccapurple "^7.1.1"
-    postcss-custom-media "^8.0.2"
-    postcss-custom-properties "^12.1.10"
-    postcss-custom-selectors "^6.0.3"
-    postcss-dir-pseudo-class "^6.0.5"
-    postcss-double-position-gradients "^3.1.2"
-    postcss-env-function "^4.0.6"
-    postcss-focus-visible "^6.0.4"
-    postcss-focus-within "^5.0.4"
-    postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^3.0.5"
-    postcss-image-set-function "^4.0.7"
-    postcss-initial "^4.0.1"
-    postcss-lab-function "^4.2.1"
-    postcss-logical "^5.0.4"
-    postcss-media-minmax "^5.0.0"
-    postcss-nesting "^10.2.0"
-    postcss-opacity-percentage "^1.1.2"
-    postcss-overflow-shorthand "^3.0.4"
-    postcss-page-break "^3.0.4"
-    postcss-place "^7.0.5"
-    postcss-pseudo-class-any-link "^7.1.6"
-    postcss-replace-overflow-wrap "^4.0.0"
-    postcss-selector-not "^6.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-pseudo-class-any-link@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab"
-  integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
-  dependencies:
-    postcss-selector-parser "^6.0.10"
-
-postcss-replace-overflow-wrap@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
-  integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
-
-postcss-responsive-type@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz#bb2d57d830beb9586ec4fda7994f07e37953aad8"
-  integrity sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==
-  dependencies:
-    postcss "^6.0.6"
-
-postcss-selector-not@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
-  integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
-  dependencies:
-    postcss-selector-parser "^6.0.10"
-
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
-  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@8.4.35:
-  version "8.4.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
-  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^6.0.6:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.14:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.2.14, postcss@^8.3.11, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.2.0"
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-pretty-bytes@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
-pretty-format@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
-  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
-proc-log@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
-  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
-prompts@~2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
-  dependencies:
-    forwarded "0.2.0"
-    ipaddr.js "1.9.1"
-
-proxy-from-env@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
-
-psl@^1.1.28, psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
-pstree.remy@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
-  integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
-  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
-
-qjobs@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
-qs@~6.10.3:
-  version "6.10.5"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
-  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
-  dependencies:
-    side-channel "^1.0.4"
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-raf-schd@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
-  integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.5.2, raw-body@^2.3.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-re-reselect@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-4.0.1.tgz#21a2306d11bbf377ac78687aa46e1a8848974194"
-  integrity sha512-xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==
-
-re-resizable@6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.6.tgz#b95d37e3821481b56ddfb1e12862940a791e827d"
-  integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ==
-  dependencies:
-    fast-memoize "^2.5.1"
-
-react-aria-live@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/react-aria-live/-/react-aria-live-2.0.5.tgz#333480cb898d6963421bd86fe3cbd0ce54e37f08"
-  integrity sha512-rXiH1HNKJrr/UfVeGwA2aKY43r5WbjLs+AYB6/kJF1qny2hwxzQc1qewQmUpdQ5h8HAOTD8O/XlGcEHjqlCl0g==
-  dependencies:
-    uuid "^3.2.1"
-
-react-beautiful-dnd@^13.0.0:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
-  integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    css-box-model "^1.2.0"
-    memoize-one "^5.1.1"
-    raf-schd "^4.0.2"
-    react-redux "^7.2.0"
-    redux "^4.0.4"
-    use-memo-one "^1.1.1"
-
-react-copy-to-clipboard@^5.0.1, react-copy-to-clipboard@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz#09aae5ec4c62750ccb2e6421a58725eabc41255c"
-  integrity sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==
-  dependencies:
-    copy-to-clipboard "^3.3.1"
-    prop-types "^15.8.1"
-
-react-dnd-html5-backend@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz#15cb9d2b923f43576a136df854e288cb5969784c"
-  integrity sha512-ny17gUdInZ6PIGXdzfwPhoztRdNVVvjoJMdG80hkDBamJBeUPuNF2Wv4D3uoQJLjXssX1+i9PhBqc7EpogClwQ==
-  dependencies:
-    dnd-core "^10.0.2"
-
-react-dnd-multi-backend@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-multi-backend/-/react-dnd-multi-backend-5.1.1.tgz#1ddb243cea74e41efa3932e6403bb84d0a8cd11b"
-  integrity sha512-u085U6tIAfkFzaBhe0AhZZIhs9Ta1sRcp+S/A7JR81B1TjtPVLYIoTyqCO91wG1Iz5+MEVL88aYuRPayMY4HXQ==
-  dependencies:
-    dnd-multi-backend "^5.1.1"
-    prop-types "^15.7.2"
-    react-dnd-preview "^5.1.1"
-
-react-dnd-preview@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-preview/-/react-dnd-preview-5.1.1.tgz#90c4ad49e90d9abe39728b762d72132b8589b784"
-  integrity sha512-RryrwRRfF22kL8CQcYqDHt4WLbytRbVNXYnjPkyZKfGsXfQnY0j8OtxokTee4Ba3OkcSiSYQbLhDRFw9wiJj5g==
-  dependencies:
-    prop-types "^15.7.2"
-
-react-dnd-touch-backend@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz#90cb916655539b838d49b8895e1813f8b874b3b4"
-  integrity sha512-+lW/Ern0dKyHToD0oP+Wc/ZD6l7qJazosLqbjzL7OnPlig6WxdlrHkJylOLkeAdZj41fIJJ551Lb57pIL0CcPw==
-  dependencies:
-    "@react-dnd/invariant" "^2.0.0"
-    dnd-core "^10.0.2"
-
-react-dnd@^10.0.2:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-10.0.2.tgz#a6ad8eb3d9f2c573031f7ce05012e5c767a0b1fc"
-  integrity sha512-SC2Ymvntynhoqtf5zaFhZscm9xenCoMofilxPdlwUlaelAzmbl9fw82C4ZJ//+lNm3kWAKXjGDZg2/aWjKEAtg==
-  dependencies:
-    "@react-dnd/shallowequal" "^2.0.0"
-    "@types/hoist-non-react-statics" "^3.3.1"
-    dnd-core "^10.0.2"
-    hoist-non-react-statics "^3.3.0"
-
-react-dom@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
-  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
-
-react-draggable@4.4.5:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c"
-  integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==
-  dependencies:
-    clsx "^1.1.1"
-    prop-types "^15.8.1"
-
-react-full-screen@^0.2.4:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/react-full-screen/-/react-full-screen-0.2.5.tgz#bc79a5cdb9640d8b9b09e11a17fa54f6e6fa5789"
-  integrity sha512-LNkxjLWmiR+AwemSVdn/miUcBy8tHA6mDVS1qz1AM/DHNEtQbzkh5ok9A6g99502OqutQq1zBvCBGLV8rsB2tw==
-  dependencies:
-    "@types/react" "*"
-    fscreen "^1.0.1"
-
-react-i18next@^11.7.0:
-  version "11.18.6"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
-  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
-  dependencies:
-    "@babel/runtime" "^7.14.5"
-    html-parse-stringify "^3.0.1"
-
-react-image@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/react-image/-/react-image-4.1.0.tgz#92f2d4a809a178b3bf69acd7bad7da7aa5e7364c"
-  integrity sha512-qwPNlelQe9Zy14K2pGWSwoL+vHsAwmJKS6gkotekDgRpcnRuzXNap00GfibD3eEPYu3WCPlyIUUNzcyHOrLHjw==
-
-react-is@^16.13.1, react-is@^16.7.0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
-react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
-
-react-mosaic-component@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz#48a34e5e5c16654075212666c2aebeb488bab9f2"
-  integrity sha512-HVlLvfYQ/AKmoKvw95Orx3Qyc7SNuS/QlAy+SkAVit1g9ipzXBGYoBg7RMXP5sF5w47CgYxA+1gT+fYRVf73jA==
-  dependencies:
-    classnames "^2.2.6"
-    immutability-helper "^3.0.1"
-    lodash "^4.17.11"
-    prop-types "^15.7.2"
-    react-dnd "^10.0.2"
-    react-dnd-html5-backend "^10.0.2"
-    react-dnd-multi-backend "^5.0.0"
-    react-dnd-touch-backend "^10.0.2"
-    uuid "^3.3.2"
-
-react-redux@^7.1.0, react-redux@^7.2.0:
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
-  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
-  dependencies:
-    "@babel/runtime" "^7.15.4"
-    "@types/react-redux" "^7.1.20"
-    hoist-non-react-statics "^3.3.2"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-
-react-resize-observer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/react-resize-observer/-/react-resize-observer-1.1.1.tgz#641dfa2e0f4bd2549a8ab4bbbaf43b68f3dcaf76"
-  integrity sha512-3R+90Hou90Mr3wJYc+unsySC8Pn91V4nmjO32NKvUvjphRUbq9HisyLg7bDyGBE7xlMrrM6Fax7iNQaFdc/FYA==
-
-react-rnd@^10.1:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.4.1.tgz#9e1c3f244895d7862ef03be98b2a620848c3fba1"
-  integrity sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q==
-  dependencies:
-    re-resizable "6.9.6"
-    react-draggable "4.4.5"
-    tslib "2.3.1"
-
-react-sizeme@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
-  integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
-  dependencies:
-    element-resize-detector "^1.2.1"
-    invariant "^2.2.4"
-    shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
-
-react-transition-group@^4.4.0:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
-  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
-react-virtualized-auto-sizer@^1.0.2:
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz#3ebdc92f4b05ad65693b3cc8e7d8dd54924c0227"
-  integrity sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg==
-
-react-window@^1.8.5:
-  version "1.8.10"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.10.tgz#9e6b08548316814b443f7002b1cf8fd3a1bdde03"
-  integrity sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    memoize-one ">=3.1.1 <6"
-
-react@^16.14.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
-  dependencies:
-    pify "^2.3.0"
-
-read-package-json-fast@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
-  dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
-read-package-json@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.0.tgz#d605c9dcf6bc5856da24204aa4e9518ee9714be0"
-  integrity sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==
-  dependencies:
-    glob "^10.2.2"
-    json-parse-even-better-errors "^3.0.0"
-    normalize-package-data "^6.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
-readable-stream@^2.0.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-rechoir@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
-  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
-  dependencies:
-    resolve "^1.20.0"
-
-redux-devtools-extension@^2.13.2:
-  version "2.13.9"
-  resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz#6b764e8028b507adcb75a1cae790f71e6be08ae7"
-  integrity sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==
-
-redux-saga@^1.1.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.3.0.tgz#a59ada7c28010189355356b99738c9fcb7ade30e"
-  integrity sha512-J9RvCeAZXSTAibFY0kGw6Iy4EdyDNW7k6Q+liwX+bsck7QVsU78zz8vpBRweEfANxnnlG/xGGeOvf6r8UXzNJQ==
-  dependencies:
-    "@redux-saga/core" "^1.3.0"
-
-redux-thunk@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
-  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
-
-redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
-  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
-reflect-metadata@^0.1.13:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
-  integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
-
-reflect-metadata@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.1.tgz#8d5513c0f5ef2b4b9c3865287f3c0940c1f67f74"
-  integrity sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==
-
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
-  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-regenerator-transform@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
-  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regex-parser@^2.2.11:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.3.0.tgz#4bb61461b1a19b8b913f3960364bb57887f920ee"
-  integrity sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==
-
-regexp.prototype.flags@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
-  dependencies:
-    call-bind "^1.0.6"
-    define-properties "^1.2.1"
-    es-errors "^1.3.0"
-    set-function-name "^2.0.1"
-
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
-request-progress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
-  integrity sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==
-  dependencies:
-    throttleit "^1.0.0"
-
-request@^2.87.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-requireindex@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
-  integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
-reselect@^4.0.0:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
-  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-url-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz#ee3142fb1f1e0d9db9524d539cfa166e9314f795"
-  integrity sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==
-  dependencies:
-    adjust-sourcemap-loader "^4.0.0"
-    convert-source-map "^1.7.0"
-    loader-utils "^2.0.0"
-    postcss "^8.2.14"
-    source-map "0.6.1"
-
-resolve@1.22.8, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resp-modifier@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
-  integrity sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==
-  dependencies:
-    debug "^2.2.0"
-    minimatch "^3.0.2"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rfdc@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
-  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
-
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-roarr@^7.0.4:
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/roarr/-/roarr-7.21.1.tgz#fd6452ca822a65f736c35e5372f04ee9f2ca3851"
-  integrity sha512-3niqt5bXFY1InKU8HKWqqYTYjtrBaxBMnXELXCXUYgtNYGUtZM5rB46HIC430AyacL95iEniGf7RgqsesykLmQ==
-  dependencies:
-    fast-printf "^1.6.9"
-    safe-stable-stringify "^2.4.3"
-    semver-compare "^1.0.0"
-
-rollup@^4.2.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.13.0.tgz#dd2ae144b4cdc2ea25420477f68d4937a721237a"
-  integrity sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==
-  dependencies:
-    "@types/estree" "1.0.5"
-  optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.13.0"
-    "@rollup/rollup-android-arm64" "4.13.0"
-    "@rollup/rollup-darwin-arm64" "4.13.0"
-    "@rollup/rollup-darwin-x64" "4.13.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.13.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.13.0"
-    "@rollup/rollup-linux-arm64-musl" "4.13.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.13.0"
-    "@rollup/rollup-linux-x64-gnu" "4.13.0"
-    "@rollup/rollup-linux-x64-musl" "4.13.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.13.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.13.0"
-    "@rollup/rollup-win32-x64-msvc" "4.13.0"
-    fsevents "~2.3.2"
-
-rtl-css-js@^1.13.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80"
-  integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
-run-async@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad"
-  integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-rx@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
-
-rxjs-report-usage@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz#6e06034d9e1592e8a45bee877631638e4bac2576"
-  integrity sha512-omv1DIv5z1kV+zDAEjaDjWSkx8w5TbFp5NZoPwUipwzYVcor/4So9ZU3bUyQ1c8lxY5Q0Es/ztWW7PGjY7to0Q==
-  dependencies:
-    "@babel/parser" "^7.10.3"
-    "@babel/traverse" "^7.10.3"
-    "@babel/types" "^7.10.3"
-    bent "~7.3.6"
-    chalk "~4.1.0"
-    glob "~7.2.0"
-    prompts "~2.4.2"
-
-rxjs-spy@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
-  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
-  dependencies:
-    "@types/circular-json" "^0.4.0"
-    "@types/stacktrace-js" "^0.0.33"
-    circular-json "^0.5.0"
-    error-stack-parser "^2.0.1"
-    rxjs-report-usage "^1.0.4"
-    stacktrace-gps "^3.0.2"
-
-rxjs@6.6.7, rxjs@~6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.8.0, rxjs@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-array-concat@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
-  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
-  dependencies:
-    call-bind "^1.0.7"
-    get-intrinsic "^1.2.4"
-    has-symbols "^1.0.3"
-    isarray "^2.0.5"
-
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-regex-test@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
-  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
-  dependencies:
-    call-bind "^1.0.6"
-    es-errors "^1.3.0"
-    is-regex "^1.1.4"
-
-safe-stable-stringify@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
-  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
-
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sanitize-html@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
-  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
-  dependencies:
-    deepmerge "^4.2.2"
-    escape-string-regexp "^4.0.0"
-    htmlparser2 "^8.0.0"
-    is-plain-object "^5.0.0"
-    parse-srcset "^1.0.2"
-    postcss "^8.3.11"
-
-sass-loader@14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.1.tgz#2c9d2277c5b1c5fe789cd0570c046d8ad23cb7ca"
-  integrity sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==
-  dependencies:
-    neo-async "^2.6.2"
-
-sass-loader@^12.6.0:
-  version "12.6.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb"
-  integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==
-  dependencies:
-    klona "^2.0.4"
-    neo-async "^2.6.2"
-
-sass-resources-loader@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz#75131cdb26bae51fcffc007d8155d57b5e825ca7"
-  integrity sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==
-  dependencies:
-    async "^3.2.3"
-    chalk "^4.1.0"
-    glob "^7.1.6"
-    loader-utils "^2.0.0"
-
-sass@1.71.1:
-  version "1.71.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
-  integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
-sass@~1.62.0:
-  version "1.62.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029"
-  integrity sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
-sax@>=0.6.0, sax@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
-  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
-
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
-schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
-  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.9.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.1.0"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
-
-selfsigned@^2.1.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
-  dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
-
-semver@7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
-  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@7.6.0, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@~7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
-  dependencies:
-    randombytes "^2.1.0"
-
-serve-index@1.9.1, serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
-serve-static@1.15.0, serve-static@^1.14.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
-
-server-destroy@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
-  integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
-
-set-function-length@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
-set-function-name@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
-  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.2"
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shallowequal@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
-  integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
-side-channel@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    object-inspect "^1.13.1"
-
-signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-sigstore@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.2.2.tgz#5e4ff39febeae9e0679bafa22180cb0f445a7e35"
-  integrity sha512-2A3WvXkQurhuMgORgT60r6pOWiCOO5LlEqY2ADxGBDGVYLSo5HN0uLtb68YpVpuL/Vi8mLTe7+0Dx2Fq8lLqEg==
-  dependencies:
-    "@sigstore/bundle" "^2.2.0"
-    "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
-    "@sigstore/sign" "^2.2.3"
-    "@sigstore/tuf" "^2.3.1"
-    "@sigstore/verify" "^1.1.0"
-
-simple-update-notifier@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
-  integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
-  dependencies:
-    semver "~7.0.0"
-
-sirv@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
-  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.24"
-    mrmime "^2.0.0"
-    totalist "^3.0.0"
-
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socket.io-adapter@~2.5.2:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz#4fdb1358667f6d68f25343353bd99bd11ee41006"
-  integrity sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==
-  dependencies:
-    debug "~4.3.4"
-    ws "~8.11.0"
-
-socket.io-client@^4.4.1:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.5.tgz#919be76916989758bdc20eec63f7ee0ae45c05b7"
-  integrity sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.2"
-    engine.io-client "~6.5.2"
-    socket.io-parser "~4.2.4"
-
-socket.io-parser@~4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
-  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-
-socket.io@^4.4.1, socket.io@^4.7.2:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
-  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "~2.0.0"
-    cors "~2.8.5"
-    debug "~4.3.2"
-    engine.io "~6.5.2"
-    socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.4"
-
-sockjs@^0.3.24:
-  version "0.3.24"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
-  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
-  dependencies:
-    faye-websocket "^0.11.3"
-    uuid "^8.3.2"
-    websocket-driver "^0.7.4"
-
-socks-proxy-agent@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
-  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "^4.3.4"
-    socks "^2.7.1"
-
-socks@^2.7.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af"
-  integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==
-  dependencies:
-    ip-address "^9.0.5"
-    smart-buffer "^4.2.0"
-
-sortablejs@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
-  integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
-
-source-map-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-5.0.0.tgz#f593a916e1cc54471cfc8851b905c8a845fc7e38"
-  integrity sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==
-  dependencies:
-    iconv-lite "^0.6.3"
-    source-map-js "^1.0.2"
-
-source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.5, source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
-
-source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-spdx-correct@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
-  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
-
-spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
-  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-sprintf-js@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
-  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-sshpk@^1.14.1, sshpk@^1.7.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
-  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^10.0.0:
-  version "10.0.5"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
-  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
-  dependencies:
-    minipass "^7.0.3"
-
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-gps@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
-  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
-  dependencies:
-    source-map "0.5.6"
-    stackframe "^1.3.4"
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stream-throttle@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
-  integrity sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==
-  dependencies:
-    commander "^2.2.0"
-    limiter "^1.0.5"
-
-streamroller@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
-  integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
-  dependencies:
-    date-format "^4.0.14"
-    debug "^4.3.4"
-    fs-extra "^8.1.0"
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string.prototype.trim@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
-  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string.prototype.trimend@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string.prototype.trimstart@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
-  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-strong-log-transformer@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
-  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
-  dependencies:
-    duplexer "^0.1.1"
-    minimist "^1.2.0"
-    through "^2.3.4"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-color@^8.0.0, supports-color@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-symbol-observable@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
-  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
-
-synckit@^0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.6.2.tgz#e1540b97825f2855f7170b98276e8463167f33eb"
-  integrity sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==
-  dependencies:
-    tslib "^2.3.1"
-
-tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
-tar-stream@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
-  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-terser-webpack-plugin@^5.3.10:
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.20"
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.26.0"
-
-terser@5.29.1:
-  version "5.29.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.1.tgz#44e58045b70c09792ba14bfb7b4e14ca8755b9fa"
-  integrity sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-terser@^5.26.0:
-  version "5.29.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.2.tgz#c17d573ce1da1b30f21a877bffd5655dd86fdb35"
-  integrity sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-throttle-debounce@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2"
-  integrity sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==
-
-throttleit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5"
-  integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==
-
-through@^2.3.4, through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
-tiny-invariant@^1.0.6:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
-  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
-
-tiny-warning@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
-tmp@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-tmp@^0.2.1, tmp@~0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-toggle-selection@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
-  integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
-
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
-totalist@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
-  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
-
-touch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
-  integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
-  dependencies:
-    nopt "~1.0.10"
-
-tough-cookie@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-tree-kill@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
-
-ts-node@10.2.1, ts-node@^10.0.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
-  integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
-  dependencies:
-    "@cspotcode/source-map-support" "0.6.1"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    yn "3.1.1"
-
-ts-node@^8.10.2:
-  version "8.10.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
-  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
-  dependencies:
-    arg "^4.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.17"
-    yn "3.1.1"
-
-tsconfig-paths@^3.15.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
-  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
-tsconfig-paths@^4.1.0, tsconfig-paths@^4.1.2:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
-  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
-  dependencies:
-    json5 "^2.2.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
-tslib@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tslib@^1.8.1, tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tsutils-etc@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.4.2.tgz#6d6a9f33aa61867d832e4a455b2cebb6b104ebfa"
-  integrity sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==
-  dependencies:
-    "@types/yargs" "^17.0.0"
-    yargs "^17.0.0"
-
-tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-tuf-js@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.0.tgz#4daaa8620ba7545501d04dfa933c98abbcc959b9"
-  integrity sha512-ZSDngmP1z6zw+FIkIBjvOp/II/mIub/O7Pp12j1WNsiCpg5R5wAc//i555bBQsE44O94btLt0xM/Zr2LQjwdCg==
-  dependencies:
-    "@tufjs/models" "2.0.0"
-    debug "^4.3.4"
-    make-fetch-happen "^13.0.0"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^2.3.3:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
-  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
-
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-typed-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
-  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    is-typed-array "^1.1.13"
-
-typed-array-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
-  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-
-typed-array-byte-offset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
-  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-
-typed-array-length@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5"
-  integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-    possible-typed-array-names "^1.0.0"
-
-typed-assert@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
-  integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==
-
-typescript-compare@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
-  integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
-  dependencies:
-    typescript-logic "^0.0.0"
-
-typescript-logic@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
-  integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
-
-typescript-tuple@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
-  integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
-  dependencies:
-    typescript-compare "^0.0.2"
-
-typescript@^2.5.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
-  integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
-
-typescript@~5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
-
-ua-parser-js@^0.7.30:
-  version "0.7.37"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"
-  integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
-
-ua-parser-js@^1.0.33:
-  version "1.0.37"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f"
-  integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==
-
-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
-  dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
-undefsafe@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
-  integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-undici@6.11.1:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.11.1.tgz#75ab573677885b421ca2e6f5f17ff1185b24c68d"
-  integrity sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==
-
-undici@6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.7.1.tgz#3cb27222fd5d72c1b2058f4e18bf9b53dd933af8"
-  integrity sha512-+Wtb9bAQw6HYWzCnxrPTMVEV3Q1QjYanI0E4q02ehReMuquQdLTEFEYbfs7hcImVYKcQkWSwT6buEmSVIiDDtQ==
-
-unfetch@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
-  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
-
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-
-unicode-match-property-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-filename@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
-  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
-  dependencies:
-    unique-slug "^4.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-slug@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
-  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
-
-untildify@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
-  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
-
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-use-memo-one@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
-  integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
-uuid@^3.2.1, uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.1.0, uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-validate-npm-package-license@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-validate-npm-package-name@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
-  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
-  dependencies:
-    builtins "^5.0.0"
-
-vary@^1, vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vite@5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb"
-  integrity sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==
-  dependencies:
-    esbuild "^0.19.3"
-    postcss "^8.4.35"
-    rollup "^4.2.0"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
-vite@5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.7.tgz#9f685a2c4c70707fef6d37341b0e809c366da619"
-  integrity sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==
-  dependencies:
-    esbuild "^0.19.3"
-    postcss "^8.4.35"
-    rollup "^4.2.0"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
-void-elements@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
-  integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
-
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
-
-watchpack@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-watchpack@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
-  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
-webdriver-manager@^12.1.8:
-  version "12.1.9"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.9.tgz#8d83543b92711b7217b39fef4cda958a4703d2df"
-  integrity sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==
-  dependencies:
-    adm-zip "^0.5.2"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-webfontloader@1.6.28:
-  version "1.6.28"
-  resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
-  integrity sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-webpack-bundle-analyzer@^4.8.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454"
-  integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==
-  dependencies:
-    "@discoveryjs/json-ext" "0.5.7"
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    commander "^7.2.0"
-    debounce "^1.2.1"
-    escape-string-regexp "^4.0.0"
-    gzip-size "^6.0.0"
-    html-escaper "^2.0.2"
-    is-plain-object "^5.0.0"
-    opener "^1.5.2"
-    picocolors "^1.0.0"
-    sirv "^2.0.3"
-    ws "^7.3.1"
-
-webpack-cli@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
-  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
-  dependencies:
-    "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^2.1.1"
-    "@webpack-cli/info" "^2.0.2"
-    "@webpack-cli/serve" "^2.0.5"
-    colorette "^2.0.14"
-    commander "^10.0.1"
-    cross-spawn "^7.0.3"
-    envinfo "^7.7.3"
-    fastest-levenshtein "^1.0.12"
-    import-local "^3.0.2"
-    interpret "^3.1.1"
-    rechoir "^0.8.0"
-    webpack-merge "^5.7.3"
-
-webpack-dev-middleware@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz#6bbc257ec83ae15522de7a62f995630efde7cc3d"
-  integrity sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.12"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-middleware@6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz#0463232e59b7d7330fa154121528d484d36eb973"
-  integrity sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.12"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-middleware@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
-  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-server@4.15.1:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
-    ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
-    colorette "^2.0.10"
-    compression "^1.7.4"
-    connect-history-api-fallback "^2.0.0"
-    default-gateway "^6.0.3"
-    express "^4.17.3"
-    graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
-    serve-index "^1.9.1"
-    sockjs "^0.3.24"
-    spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
-    ws "^8.13.0"
-
-webpack-dev-server@^4.15.1:
-  version "4.15.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173"
-  integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
-    ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
-    colorette "^2.0.10"
-    compression "^1.7.4"
-    connect-history-api-fallback "^2.0.0"
-    default-gateway "^6.0.3"
-    express "^4.17.3"
-    graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
-    serve-index "^1.9.1"
-    sockjs "^0.3.24"
-    spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.4"
-    ws "^8.13.0"
-
-webpack-merge@5.10.0, webpack-merge@^5.7.3:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
-  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
-  dependencies:
-    clone-deep "^4.0.1"
-    flat "^5.0.2"
-    wildcard "^2.0.0"
-
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-sources@^3.0.0, webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack-subresource-integrity@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz#8b7606b033c6ccac14e684267cb7fb1f5c2a132a"
-  integrity sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==
-  dependencies:
-    typed-assert "^1.0.8"
-
-webpack@5.94.0:
-  version "5.94.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
-  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
-  dependencies:
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.1"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.11"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.1"
-    webpack-sources "^3.2.3"
-
-websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-typed-array@^1.1.14:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
-  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.2"
-
-which@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
-  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
-  dependencies:
-    isexe "^3.1.1"
-
-wildcard@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
-  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-ws@^7.3.1:
-  version "7.5.10"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
-  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-
-ws@^8.13.0:
-  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
-  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
-
-ws@~8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
-
-xhr2@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93"
-  integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==
-
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-xmlhttprequest-ssl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
-  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yargs-parser@21.1.1, yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.3.1, yargs@^17.6.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^16.1.1:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-yocto-queue@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
-  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
-
-zone.js@~0.14.4:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.14.4.tgz#e0168fe450e3e4313c8efdb4a0ae4b557ac0fdd8"
-  integrity sha512-NtTUvIlNELez7Q1DzKVIFZBzNb646boQMgpATo9z3Ftuu/gWvzxCW7jdjcUDoRGxRikrhVHB/zLXh1hxeJawvw==
-  dependencies:
-    tslib "^2.3.0"

From 84c88a118f44404b8dfcb435a0f4c86eea4368af Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Mon, 8 Jul 2024 15:03:12 +0300
Subject: [PATCH 0392/1286] package.json: use "file:" for local dependencies

Instead of using the Yarn link protocol, we can use npm's built-in
support for local dependencies using "file:".
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3c73bfe72d..21d7ac7806 100644
--- a/package.json
+++ b/package.json
@@ -176,8 +176,8 @@
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
-    "eslint-plugin-dspace-angular-html": "link:./lint/dist/src/rules/html",
-    "eslint-plugin-dspace-angular-ts": "link:./lint/dist/src/rules/ts",
+    "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
+    "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",

From 74ac315b586354a6702e2f0a9d99bd6753de436f Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 10:30:05 +0300
Subject: [PATCH 0393/1286] package.json: update scripts to use "npm run"

All scripts should use "npm run" instead of "yarn".
---
 package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 21d7ac7806..2ef451cc85 100644
--- a/package.json
+++ b/package.json
@@ -5,27 +5,27 @@
     "ng": "ng",
     "config:watch": "nodemon",
     "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
-    "start": "yarn run start:prod",
-    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
-    "start:prod": "yarn run build:prod && cross-env NODE_ENV=production yarn run serve:ssr",
-    "start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
-    "preserve": "yarn base-href",
+    "start": "npm run start:prod",
+    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development npm run serve\"",
+    "start:prod": "npm run build:prod && cross-env NODE_ENV=production npm run serve:ssr",
+    "start:mirador:prod": "npm run build:mirador && npm run start:prod",
+    "preserve": "npm run base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
-    "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
+    "build:prod": "cross-env NODE_ENV=production npm run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "build:lint": "rimraf 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
-    "test:lint": "yarn build:lint && yarn test:lint:nobuild",
+    "test:lint": "npm run build:lint && npm run test:lint:nobuild",
     "test:lint:nobuild": "jasmine --config=lint/jasmine.json",
-    "lint": "yarn build:lint && yarn lint:nobuild",
+    "lint": "npm run build:lint && npm run lint:nobuild",
     "lint:nobuild": "ng lint",
-    "lint-fix": "yarn build:lint && ng lint --fix=true",
+    "lint-fix": "npm run build:lint && ng lint --fix=true",
     "docs:lint": "ts-node --project ./lint/tsconfig.json ./lint/generate-docs.ts",
     "e2e": "cross-env NODE_ENV=production ng e2e",
     "clean:dev:config": "rimraf src/assets/config.json",
@@ -36,8 +36,8 @@
     "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:cli && yarn run clean:node",
+    "clean:prod": "npm run clean:dist && npm run clean:log && npm run clean:doc && npm run clean:coverage && npm run clean:json",
+    "clean": "npm run clean:prod && npm run clean:dev:config && npm run clean:cli && npm 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",
@@ -46,7 +46,7 @@
     "env:yaml": "ts-node --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
     "base-href": "ts-node --project ./tsconfig.ts-node.json scripts/base-href.ts",
     "check-circ-deps": "npx madge --exclude '(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts$' --circular --extensions ts ./",
-    "postinstall": "yarn build:lint || echo 'Skipped DSpace ESLint plugins.'"
+    "postinstall": "npm run build:lint || echo 'Skipped DSpace ESLint plugins.'"
   },
   "browser": {
     "fs": false,

From ce3285c1f2c3e3b5ccc151189a475ba2d8b264c8 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Mon, 8 Jul 2024 15:23:42 +0300
Subject: [PATCH 0394/1286] .gitignore: remove package-lock.json

Now that we are using npm we need to commit this.
---
 .gitignore        |     2 -
 package-lock.json | 24368 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 24368 insertions(+), 2 deletions(-)
 create mode 100644 package-lock.json

diff --git a/.gitignore b/.gitignore
index ce44f6b3fb..e873eeb1e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,6 @@ yarn-error.log
 
 *.css
 
-package-lock.json
-
 .java-version
 
 .env
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..5db5d11f08
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,24368 @@
+{
+  "name": "dspace-angular",
+  "version": "9.0.0-next",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "dspace-angular",
+      "version": "9.0.0-next",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@angular/animations": "^17.3.11",
+        "@angular/cdk": "^17.3.10",
+        "@angular/common": "^17.3.11",
+        "@angular/compiler": "^17.3.11",
+        "@angular/core": "^17.3.11",
+        "@angular/forms": "^17.3.11",
+        "@angular/localize": "17.3.11",
+        "@angular/platform-browser": "^17.3.11",
+        "@angular/platform-browser-dynamic": "^17.3.11",
+        "@angular/platform-server": "^17.3.11",
+        "@angular/router": "^17.3.11",
+        "@angular/ssr": "^17.3.8",
+        "@babel/runtime": "7.21.0",
+        "@kolkov/ngx-gallery": "^2.0.1",
+        "@material-ui/core": "^4.11.0",
+        "@material-ui/icons": "^4.11.3",
+        "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+        "@ng-dynamic-forms/core": "^16.0.0",
+        "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
+        "@ngrx/effects": "^17.1.1",
+        "@ngrx/router-store": "^17.1.1",
+        "@ngrx/store": "^17.1.1",
+        "@ngx-translate/core": "^14.0.0",
+        "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
+        "@types/grecaptcha": "^3.0.4",
+        "angular-idle-preload": "3.0.0",
+        "angulartics2": "^12.2.0",
+        "axios": "^1.7.4",
+        "bootstrap": "^4.6.1",
+        "cerialize": "0.1.18",
+        "cli-progress": "^3.12.0",
+        "colors": "^1.4.0",
+        "compression": "^1.7.4",
+        "cookie-parser": "1.4.6",
+        "core-js": "^3.30.1",
+        "date-fns": "^2.29.3",
+        "date-fns-tz": "^1.3.7",
+        "deepmerge": "^4.3.1",
+        "ejs": "^3.1.10",
+        "express": "^4.19.2",
+        "express-rate-limit": "^5.1.3",
+        "fast-json-patch": "^3.1.1",
+        "filesize": "^6.1.0",
+        "http-proxy-middleware": "^1.0.5",
+        "http-terminator": "^3.2.0",
+        "isbot": "^3.6.10",
+        "js-cookie": "2.2.1",
+        "js-yaml": "^4.1.0",
+        "json5": "^2.2.3",
+        "jsonschema": "1.4.1",
+        "jwt-decode": "^3.1.2",
+        "klaro": "^0.7.18",
+        "lodash": "^4.17.21",
+        "lru-cache": "^7.14.1",
+        "markdown-it": "^13.0.1",
+        "mirador": "^3.3.0",
+        "mirador-dl-plugin": "^0.13.0",
+        "mirador-share-plugin": "^0.11.0",
+        "morgan": "^1.10.0",
+        "ng-mocks": "^14.10.0",
+        "ng2-file-upload": "5.0.0",
+        "ng2-nouislider": "^2.0.0",
+        "ngx-infinite-scroll": "^16.0.0",
+        "ngx-pagination": "6.0.3",
+        "ngx-ui-switch": "^14.1.0",
+        "nouislider": "^15.7.1",
+        "pem": "1.14.7",
+        "prop-types": "^15.8.1",
+        "react-copy-to-clipboard": "^5.1.0",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.8.0",
+        "sanitize-html": "^2.12.1",
+        "sortablejs": "1.15.0",
+        "uuid": "^8.3.2",
+        "webfontloader": "1.6.28",
+        "zone.js": "~0.14.4"
+      },
+      "devDependencies": {
+        "@angular-builders/custom-webpack": "~17.0.2",
+        "@angular-devkit/build-angular": "^17.3.8",
+        "@angular-eslint/builder": "17.2.1",
+        "@angular-eslint/bundled-angular-compiler": "17.2.1",
+        "@angular-eslint/eslint-plugin": "17.2.1",
+        "@angular-eslint/eslint-plugin-template": "17.2.1",
+        "@angular-eslint/schematics": "17.2.1",
+        "@angular-eslint/template-parser": "17.2.1",
+        "@angular/cli": "^17.3.8",
+        "@angular/compiler-cli": "^17.3.11",
+        "@angular/language-service": "^17.3.11",
+        "@cypress/schematic": "^1.5.0",
+        "@fortawesome/fontawesome-free": "^6.4.0",
+        "@ngrx/store-devtools": "^17.1.1",
+        "@ngtools/webpack": "^16.2.12",
+        "@types/deep-freeze": "0.1.2",
+        "@types/ejs": "^3.1.2",
+        "@types/express": "^4.17.17",
+        "@types/jasmine": "~3.6.0",
+        "@types/js-cookie": "2.2.6",
+        "@types/lodash": "^4.14.194",
+        "@types/node": "^14.14.9",
+        "@types/sanitize-html": "^2.9.0",
+        "@typescript-eslint/eslint-plugin": "^7.2.0",
+        "@typescript-eslint/parser": "^7.2.0",
+        "@typescript-eslint/rule-tester": "^7.2.0",
+        "@typescript-eslint/utils": "^7.2.0",
+        "axe-core": "^4.7.2",
+        "browser-sync": "^3.0.0",
+        "compression-webpack-plugin": "^9.2.0",
+        "copy-webpack-plugin": "^6.4.1",
+        "cross-env": "^7.0.3",
+        "cypress": "12.17.4",
+        "cypress-axe": "^1.4.0",
+        "deep-freeze": "0.0.1",
+        "eslint": "^8.39.0",
+        "eslint-plugin-deprecation": "^1.4.1",
+        "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
+        "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import-newlines": "^1.3.1",
+        "eslint-plugin-jsdoc": "^45.0.0",
+        "eslint-plugin-jsonc": "^2.6.0",
+        "eslint-plugin-lodash": "^7.4.0",
+        "eslint-plugin-rxjs": "^5.0.3",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-unused-imports": "^2.0.0",
+        "express-static-gzip": "^2.1.7",
+        "jasmine": "^3.8.0",
+        "jasmine-core": "^3.8.0",
+        "jasmine-marbles": "0.9.2",
+        "karma": "^6.4.2",
+        "karma-chrome-launcher": "~3.2.0",
+        "karma-coverage-istanbul-reporter": "~3.0.3",
+        "karma-jasmine": "~4.0.0",
+        "karma-jasmine-html-reporter": "^1.5.0",
+        "karma-mocha-reporter": "2.2.5",
+        "ngx-mask": "14.2.4",
+        "nodemon": "^2.0.22",
+        "postcss": "^8.4",
+        "postcss-apply": "0.12.0",
+        "postcss-import": "^14.0.0",
+        "postcss-loader": "^4.0.3",
+        "postcss-preset-env": "^7.4.2",
+        "postcss-responsive-type": "1.0.0",
+        "react": "^16.14.0",
+        "react-dom": "^16.14.0",
+        "rimraf": "^3.0.2",
+        "rxjs-spy": "^8.0.2",
+        "sass": "~1.62.0",
+        "sass-loader": "^12.6.0",
+        "sass-resources-loader": "^2.2.5",
+        "ts-node": "^8.10.2",
+        "typescript": "~5.3.3",
+        "webpack": "5.94.0",
+        "webpack-bundle-analyzer": "^4.8.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.1"
+      }
+    },
+    "lint/dist/src/rules/html": {
+      "name": "eslint-plugin-dspace-angular-html",
+      "version": "0.0.0",
+      "dev": true
+    },
+    "lint/dist/src/rules/ts": {
+      "name": "eslint-plugin-dspace-angular-ts",
+      "version": "0.0.0",
+      "dev": true
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@angular-builders/common": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-1.0.2.tgz",
+      "integrity": "sha512-lUusRq6jN1It5LcUTLS6Q+AYAYGTo/EEN8hV0M6Ek9qXzweAouJaSEnwv7p04/pD7yJTl0YOCbN79u+wGm3x4g==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "^17.1.0",
+        "ts-node": "^10.0.0",
+        "tsconfig-paths": "^4.1.0"
+      },
+      "engines": {
+        "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
+      }
+    },
+    "node_modules/@angular-builders/common/node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-17.0.2.tgz",
+      "integrity": "sha512-K0jqdW5UdVIeKiZXO4nLiiiVt0g6PKJELdxgjsBGMtyRk+RLEY+pIp1061oy/Yf09nGYseZ7Mdx3XASYHQjNwA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-builders/common": "1.0.2",
+        "@angular-devkit/architect": ">=0.1700.0 < 0.1800.0",
+        "@angular-devkit/build-angular": "^17.0.0",
+        "@angular-devkit/core": "^17.0.0",
+        "lodash": "^4.17.15",
+        "webpack-merge": "^5.7.3"
+      },
+      "engines": {
+        "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^17.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect": {
+      "version": "0.1703.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.8.tgz",
+      "integrity": "sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.8",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.8.tgz",
+      "integrity": "sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "2.3.0",
+        "@angular-devkit/architect": "0.1703.8",
+        "@angular-devkit/build-webpack": "0.1703.8",
+        "@angular-devkit/core": "17.3.8",
+        "@babel/core": "7.24.0",
+        "@babel/generator": "7.23.6",
+        "@babel/helper-annotate-as-pure": "7.22.5",
+        "@babel/helper-split-export-declaration": "7.22.6",
+        "@babel/plugin-transform-async-generator-functions": "7.23.9",
+        "@babel/plugin-transform-async-to-generator": "7.23.3",
+        "@babel/plugin-transform-runtime": "7.24.0",
+        "@babel/preset-env": "7.24.0",
+        "@babel/runtime": "7.24.0",
+        "@discoveryjs/json-ext": "0.5.7",
+        "@ngtools/webpack": "17.3.8",
+        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "ansi-colors": "4.1.3",
+        "autoprefixer": "10.4.18",
+        "babel-loader": "9.1.3",
+        "babel-plugin-istanbul": "6.1.1",
+        "browserslist": "^4.21.5",
+        "copy-webpack-plugin": "11.0.0",
+        "critters": "0.0.22",
+        "css-loader": "6.10.0",
+        "esbuild-wasm": "0.20.1",
+        "fast-glob": "3.3.2",
+        "http-proxy-middleware": "2.0.6",
+        "https-proxy-agent": "7.0.4",
+        "inquirer": "9.2.15",
+        "jsonc-parser": "3.2.1",
+        "karma-source-map-support": "1.4.0",
+        "less": "4.2.0",
+        "less-loader": "11.1.0",
+        "license-webpack-plugin": "4.0.2",
+        "loader-utils": "3.2.1",
+        "magic-string": "0.30.8",
+        "mini-css-extract-plugin": "2.8.1",
+        "mrmime": "2.0.0",
+        "open": "8.4.2",
+        "ora": "5.4.1",
+        "parse5-html-rewriting-stream": "7.0.0",
+        "picomatch": "4.0.1",
+        "piscina": "4.4.0",
+        "postcss": "8.4.35",
+        "postcss-loader": "8.1.1",
+        "resolve-url-loader": "5.0.0",
+        "rxjs": "7.8.1",
+        "sass": "1.71.1",
+        "sass-loader": "14.1.1",
+        "semver": "7.6.0",
+        "source-map-loader": "5.0.0",
+        "source-map-support": "0.5.21",
+        "terser": "5.29.1",
+        "tree-kill": "1.2.2",
+        "tslib": "2.6.2",
+        "undici": "6.11.1",
+        "vite": "5.1.7",
+        "watchpack": "2.4.0",
+        "webpack": "5.90.3",
+        "webpack-dev-middleware": "6.1.2",
+        "webpack-dev-server": "4.15.1",
+        "webpack-merge": "5.10.0",
+        "webpack-subresource-integrity": "5.1.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "optionalDependencies": {
+        "esbuild": "0.20.1"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^17.0.0",
+        "@angular/localize": "^17.0.0",
+        "@angular/platform-server": "^17.0.0",
+        "@angular/service-worker": "^17.0.0",
+        "@web/test-runner": "^0.18.0",
+        "browser-sync": "^3.0.2",
+        "jest": "^29.5.0",
+        "jest-environment-jsdom": "^29.5.0",
+        "karma": "^6.3.0",
+        "ng-packagr": "^17.0.0",
+        "protractor": "^7.0.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=5.2 <5.5"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/platform-server": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "@web/test-runner": {
+          "optional": true
+        },
+        "browser-sync": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        },
+        "jest-environment-jsdom": {
+          "optional": true
+        },
+        "karma": {
+          "optional": true
+        },
+        "ng-packagr": {
+          "optional": true
+        },
+        "protractor": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
+      "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.8.tgz",
+      "integrity": "sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^17.0.0",
+        "typescript": ">=5.2 <5.5",
+        "webpack": "^5.54.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
+      "version": "8.4.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
+      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^9.0.0",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/sass": {
+      "version": "1.71.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
+      "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/sass-loader": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz",
+      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
+      "dev": true,
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
+      "version": "5.90.3",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
+      "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.15.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1703.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.8.tgz",
+      "integrity": "sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1703.8",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^4.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/core": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.8.tgz",
+      "integrity": "sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.8.tgz",
+      "integrity": "sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.8",
+        "jsonc-parser": "3.2.1",
+        "magic-string": "0.30.8",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-eslint/builder": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.2.1.tgz",
+      "integrity": "sha512-O30eaR0wCPiP+zKWvXj2JM8hVq30Wok2rp7zJMFm3PurjF9nWIIyexXkE5fa538DYZYxu8N3gQRqhpv5jvTXCg==",
+      "dev": true,
+      "dependencies": {
+        "@nx/devkit": "17.2.8",
+        "nx": "17.2.8"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/bundled-angular-compiler": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.2.1.tgz",
+      "integrity": "sha512-puC0itsZv2QlrDOCcWtq1KZH+DvfrpV+mV78HHhi6+h25R5iIhr8ARKcl3EQxFjvrFq34jhG8pSupxKvFbHVfA==",
+      "dev": true
+    },
+    "node_modules/@angular-eslint/eslint-plugin": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.2.1.tgz",
+      "integrity": "sha512-9yA81BHpsaCUKRBtHGN3ieAy8HpIoffzPQMu34lYqZFT4yGHGhYmhQjNSQGBRbV2LD9dVv2U35rMHNmUcozXpw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/utils": "17.2.1",
+        "@typescript-eslint/utils": "6.19.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.2.1.tgz",
+      "integrity": "sha512-hl1hcHtcm90wyVL1OQGTz16oA0KHon+FFb3Qg0fLXObaXxA495Ecefd9ub5Xxg4JEOPRDi29bF1Y3YKpwflgeg==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "17.2.1",
+        "@angular-eslint/utils": "17.2.1",
+        "@typescript-eslint/type-utils": "6.19.0",
+        "@typescript-eslint/utils": "6.19.0",
+        "aria-query": "5.3.0",
+        "axobject-query": "4.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
+      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
+      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
+      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
+      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.19.0",
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/typescript-estree": "6.19.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
+      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
+      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
+      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
+      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
+      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.19.0",
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/typescript-estree": "6.19.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
+      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-eslint/schematics": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.2.1.tgz",
+      "integrity": "sha512-7ldtIePI4ZTp/TBpeOZkzfv30HSAn//4TgtFuqvojudI8n8batV5FqQ0VNm1e0zitl75t8Zwtr0KYT4I6vh59g==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/eslint-plugin": "17.2.1",
+        "@angular-eslint/eslint-plugin-template": "17.2.1",
+        "@nx/devkit": "17.2.8",
+        "ignore": "5.3.0",
+        "nx": "17.2.8",
+        "strip-json-comments": "3.1.1",
+        "tmp": "0.2.1"
+      },
+      "peerDependencies": {
+        "@angular/cli": ">= 17.0.0 < 18.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/template-parser": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.2.1.tgz",
+      "integrity": "sha512-WPQYFvRju0tCDXQ/pwrzC911pE07JvpeDgcN2elhzV6lxDHJEZpA5O9pnW9qgNA6J6XM9Q7dBkJ22ztAzC4WFw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "17.2.1",
+        "eslint-scope": "^8.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/utils": {
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.2.1.tgz",
+      "integrity": "sha512-qQYTBXy90dWM7fhhpa5i9lTtqqhJisvRa+naCrQx9kBgR458JScLdkVIdcZ9D/rPiDCmKiVUfgcDISnjUeqTqg==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "17.2.1",
+        "@typescript-eslint/utils": "6.19.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
+      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
+      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
+      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
+      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.19.0",
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/typescript-estree": "6.19.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
+      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular/animations": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.11.tgz",
+      "integrity": "sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.11"
+      }
+    },
+    "node_modules/@angular/cdk": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.10.tgz",
+      "integrity": "sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "optionalDependencies": {
+        "parse5": "^7.1.2"
+      },
+      "peerDependencies": {
+        "@angular/common": "^17.0.0 || ^18.0.0",
+        "@angular/core": "^17.0.0 || ^18.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/cli": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.8.tgz",
+      "integrity": "sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1703.8",
+        "@angular-devkit/core": "17.3.8",
+        "@angular-devkit/schematics": "17.3.8",
+        "@schematics/angular": "17.3.8",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.3",
+        "ini": "4.1.2",
+        "inquirer": "9.2.15",
+        "jsonc-parser": "3.2.1",
+        "npm-package-arg": "11.0.1",
+        "npm-pick-manifest": "9.0.0",
+        "open": "8.4.2",
+        "ora": "5.4.1",
+        "pacote": "17.0.6",
+        "resolve": "1.22.8",
+        "semver": "7.6.0",
+        "symbol-observable": "4.0.0",
+        "yargs": "17.7.2"
+      },
+      "bin": {
+        "ng": "bin/ng.js"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/common": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.11.tgz",
+      "integrity": "sha512-WG+HQjUaQziYLGdbcv2aW+G73uroN5VF9yk4qWYcolW+VB8SV/DOAol8uFVgCF21cIOl5+wfJZvA4r5oG3dYaw==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.11",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/compiler": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.11.tgz",
+      "integrity": "sha512-ingRoREDPkeZGSa13DlztSjZgGArNcmsAWjj+f+vQgQekTjkfQD/N+Bix/LSt5ZdbSjHMtrkDMyRPwbNyk5Keg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.11"
+      },
+      "peerDependenciesMeta": {
+        "@angular/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/compiler-cli": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz",
+      "integrity": "sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "7.23.9",
+        "@jridgewell/sourcemap-codec": "^1.4.14",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "reflect-metadata": "^0.2.0",
+        "semver": "^7.0.0",
+        "tslib": "^2.3.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "ng-xi18n": "bundles/src/bin/ng_xi18n.js",
+        "ngc": "bundles/src/bin/ngc.js",
+        "ngcc": "bundles/ngcc/index.js"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "17.3.11",
+        "typescript": ">=5.2 <5.5"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
+      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@babel/template": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/reflect-metadata": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
+      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
+      "dev": true
+    },
+    "node_modules/@angular/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-2wPZwXFei3kVxK2ylIH6CdGebrC4kvooFx7qoX+250OITAEFMODJGdh/e3x0DpFUjlRvQtIFQ+YpQlfC5JnL4g==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.14.0"
+      }
+    },
+    "node_modules/@angular/forms": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.11.tgz",
+      "integrity": "sha512-719flo/1L64YOAxL3pzszTK+7bczVVOQDXT1khnjb48GVZdBUBwW2D+cFbqSW1VMuWWr2Amwy1lL4YM5S7qPJQ==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "17.3.11",
+        "@angular/core": "17.3.11",
+        "@angular/platform-browser": "17.3.11",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/language-service": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.11.tgz",
+      "integrity": "sha512-C93TH34vG6Un8G0C75TU0aeTppJWUUbRcnR/3I6/ZmTirjIspXEAcmUr2LssFnULTYqA0npNn8cfDtsoLeoGog==",
+      "dev": true,
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      }
+    },
+    "node_modules/@angular/localize": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.11.tgz",
+      "integrity": "sha512-uc38JfGpIEb13rDZu7wZfEvLxBpWbhfsOR+yI21M4zIiKYQxI7RGgtH9GbCKZDEZmeTUSz/idA4zwRiiX8wNvQ==",
+      "dependencies": {
+        "@babel/core": "7.23.9",
+        "@types/babel__core": "7.20.5",
+        "fast-glob": "3.3.2",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "localize-extract": "tools/bundles/src/extract/cli.js",
+        "localize-migrate": "tools/bundles/src/migrate/cli.js",
+        "localize-translate": "tools/bundles/src/translate/cli.js"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "17.3.11",
+        "@angular/compiler-cli": "17.3.11"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/@babel/core": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
+      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@babel/template": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/@angular/localize/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.11.tgz",
+      "integrity": "sha512-sWjMy8qKH6AOt5YV4OMoPhExCbGdRIPjNSwUrxCm8a8Zz5DamoX3Sib9yRk1etjBuRj+oJySSxISJim2OYXJQQ==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "17.3.11",
+        "@angular/common": "17.3.11",
+        "@angular/core": "17.3.11"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/platform-browser-dynamic": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.11.tgz",
+      "integrity": "sha512-JPA0enJyJQ5H340WQ2wfXbCCHzjBiAljEDMr/Siw/CzSe0XI8aQYDqKMLUMtRyCdYhNCEYjnBWgXBi9Za9blZg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "17.3.11",
+        "@angular/compiler": "17.3.11",
+        "@angular/core": "17.3.11",
+        "@angular/platform-browser": "17.3.11"
+      }
+    },
+    "node_modules/@angular/platform-server": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.11.tgz",
+      "integrity": "sha512-xytV4+5gTCECUORniXBTE1lvJ3qf3IWlawmm3eZylvJMqH2W3ApZrrwLM7umL8BOU9ISEhjolbwfGXornKL+5A==",
+      "dependencies": {
+        "tslib": "^2.3.0",
+        "xhr2": "^0.2.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "17.3.11",
+        "@angular/common": "17.3.11",
+        "@angular/compiler": "17.3.11",
+        "@angular/core": "17.3.11",
+        "@angular/platform-browser": "17.3.11"
+      }
+    },
+    "node_modules/@angular/router": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.11.tgz",
+      "integrity": "sha512-A3aU6uHAeJfsfCw1dgNXHn2Kjw/UieRMnFwENkzz96YFCvFPCEZjy/mODuE3zHludMuqVsJhM/uUxWu8ATRTcA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "17.3.11",
+        "@angular/core": "17.3.11",
+        "@angular/platform-browser": "17.3.11",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/ssr": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.8.tgz",
+      "integrity": "sha512-qsCMMR7wEOlbPbqTOrcr/1hEoQjIQOGqq6stbK9J52IebTyzC+rZNzDjJcL9e39nSmvbIeCUaN1XquebQ12/pw==",
+      "dependencies": {
+        "critters": "0.0.22",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^17.0.0",
+        "@angular/core": "^17.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "dependencies": {
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
+      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
+      "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.24.0",
+        "@babel/parser": "^7.24.0",
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.0",
+        "@babel/types": "^7.24.0",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
+      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@babel/eslint-parser/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "dependencies": {
+        "@babel/types": "^7.23.6",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
+      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
+      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
+      "dependencies": {
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "browserslist": "^4.22.2",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
+      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
+      "dependencies": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
+      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
+      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
+      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-wrap-function": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
+      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
+      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
+      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
+      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
+      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
+      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
+      "dependencies": {
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
+      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
+      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
+      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
+      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
+      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
+      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
+      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
+      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
+      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
+      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
+      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
+      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/template": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
+      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
+      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
+      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
+      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
+      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
+      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
+      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
+      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
+      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
+      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
+      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
+      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
+      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
+      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
+      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
+      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
+      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
+      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
+      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
+      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
+      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
+      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
+      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
+      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
+      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
+      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
+      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
+      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
+      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "regenerator-transform": "^0.15.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
+      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
+      "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.8",
+        "babel-plugin-polyfill-corejs3": "^0.9.0",
+        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
+      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
+      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
+      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
+      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
+      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
+      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
+      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
+      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
+      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
+      "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.8",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+        "@babel/plugin-transform-for-of": "^7.23.6",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.0",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.8",
+        "babel-plugin-polyfill-corejs3": "^0.9.0",
+        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+      "dev": true
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
+      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
+      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
+      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
+      "dependencies": {
+        "@babel/types": "^7.24.7",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
+      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@cypress/request": {
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+      "dev": true,
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "http-signature": "~1.3.6",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "performance-now": "^2.1.0",
+        "qs": "~6.10.3",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "^4.1.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@cypress/request/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/@cypress/schematic": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.7.0.tgz",
+      "integrity": "sha512-CouQrVlZ+uHVVBQtmNoMYU9LyoSAmQTOLDpVjrdTdMPpJH1mWnHCL5OCMt+FZLR+43KRiWEvDUjNqSza11oGsQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "^0.1202.10",
+        "@angular-devkit/core": "^12.2.17",
+        "@angular-devkit/schematics": "^12.2.17",
+        "@schematics/angular": "^12.2.17",
+        "jsonc-parser": "^3.0.0",
+        "rxjs": "~6.6.0"
+      },
+      "peerDependencies": {
+        "@angular/cli": ">=12",
+        "@angular/core": ">=12"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/@angular-devkit/architect": {
+      "version": "0.1202.18",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.18.tgz",
+      "integrity": "sha512-C4ASKe+xBjl91MJyHDLt3z7ICPF9FU6B0CeJ1phwrlSHK9lmFG99WGxEj/Tc82+vHyPhajqS5XJ38KyVAPBGzA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.2.18",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/@angular-devkit/core": {
+      "version": "12.2.18",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.18.tgz",
+      "integrity": "sha512-GDLHGe9HEY5SRS+NrKr14C8aHsRCiBFkBFSSbeohgLgcgSXzZHFoU84nDWrl3KZNP8oqcUSv5lHu6dLcf2fnww==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.6.2",
+        "ajv-formats": "2.1.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/@angular-devkit/schematics": {
+      "version": "12.2.18",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.18.tgz",
+      "integrity": "sha512-bZ9NS5PgoVfetRC6WeQBHCY5FqPZ9y2TKHUo12sOB2YSL3tgWgh1oXyP8PtX34gasqsLjNULxEQsAQYEsiX/qQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.2.18",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/@schematics/angular": {
+      "version": "12.2.18",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.18.tgz",
+      "integrity": "sha512-niRS9Ly9y8uI0YmTSbo8KpdqCCiZ/ATMZWeS2id5M8JZvfXbngwiqJvojdSol0SWU+n1W4iA+lJBdt4gSKlD5w==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "12.2.18",
+        "@angular-devkit/schematics": "12.2.18",
+        "jsonc-parser": "3.0.0"
+      },
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/ajv": {
+      "version": "8.6.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/ajv-formats": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz",
+      "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
+      "dev": true
+    },
+    "node_modules/@cypress/schematic/node_modules/magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@cypress/schematic/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@cypress/xvfb": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.1.0",
+        "lodash.once": "^4.1.1"
+      }
+    },
+    "node_modules/@cypress/xvfb/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@edsilv/http-status-codes": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz",
+      "integrity": "sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg=="
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+      "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+    },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.39.4",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz",
+      "integrity": "sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==",
+      "dev": true,
+      "dependencies": {
+        "comment-parser": "1.3.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
+      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
+      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
+      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
+      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
+      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
+      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
+      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
+      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
+      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
+      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
+      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
+      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
+      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
+      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
+      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
+      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
+      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
+      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
+      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
+      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
+      "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "dev": true
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
+    },
+    "node_modules/@iiif/vocabulary": {
+      "version": "1.0.26",
+      "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz",
+      "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg=="
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@kolkov/ngx-gallery": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz",
+      "integrity": "sha512-mTigRy9Ha7bqCF/+GNKeW2Oe8ZILuM5GGMw+ZbvTQWq3X5hngeFFgv8GFG49Py3biX67kb0NhqCP+msLe4wbXQ==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": ">=13.0.0 <14",
+        "@angular/common": ">=13.0.0 <14",
+        "@angular/core": ">=13.0.0 <14"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "dev": true
+    },
+    "node_modules/@ljharb/through": {
+      "version": "2.3.13",
+      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
+      "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/@material-ui/core": {
+      "version": "4.12.4",
+      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz",
+      "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==",
+      "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "@material-ui/styles": "^4.11.5",
+        "@material-ui/system": "^4.12.2",
+        "@material-ui/types": "5.1.0",
+        "@material-ui/utils": "^4.11.3",
+        "@types/react-transition-group": "^4.2.0",
+        "clsx": "^1.0.4",
+        "hoist-non-react-statics": "^3.3.2",
+        "popper.js": "1.16.1-lts",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.0 || ^17.0.0",
+        "react-transition-group": "^4.4.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/material-ui"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.6 || ^17.0.0",
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/icons": {
+      "version": "4.11.3",
+      "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz",
+      "integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@material-ui/core": "^4.0.0",
+        "@types/react": "^16.8.6 || ^17.0.0",
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/lab": {
+      "version": "4.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz",
+      "integrity": "sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==",
+      "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "@material-ui/utils": "^4.11.3",
+        "clsx": "^1.0.4",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.0 || ^17.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "@material-ui/core": "^4.12.1",
+        "@types/react": "^16.8.6 || ^17.0.0",
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/styles": {
+      "version": "4.11.5",
+      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz",
+      "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==",
+      "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "@emotion/hash": "^0.8.0",
+        "@material-ui/types": "5.1.0",
+        "@material-ui/utils": "^4.11.3",
+        "clsx": "^1.0.4",
+        "csstype": "^2.5.2",
+        "hoist-non-react-statics": "^3.3.2",
+        "jss": "^10.5.1",
+        "jss-plugin-camel-case": "^10.5.1",
+        "jss-plugin-default-unit": "^10.5.1",
+        "jss-plugin-global": "^10.5.1",
+        "jss-plugin-nested": "^10.5.1",
+        "jss-plugin-props-sort": "^10.5.1",
+        "jss-plugin-rule-value-function": "^10.5.1",
+        "jss-plugin-vendor-prefixer": "^10.5.1",
+        "prop-types": "^15.7.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/material-ui"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.6 || ^17.0.0",
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/system": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz",
+      "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "@material-ui/utils": "^4.11.3",
+        "csstype": "^2.5.2",
+        "prop-types": "^15.7.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/material-ui"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.6 || ^17.0.0",
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/types": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz",
+      "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==",
+      "peerDependencies": {
+        "@types/react": "*"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@material-ui/utils": {
+      "version": "4.11.3",
+      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz",
+      "integrity": "sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==",
+      "dependencies": {
+        "@babel/runtime": "^7.4.4",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.0 || ^17.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0"
+      }
+    },
+    "node_modules/@ng-bootstrap/ng-bootstrap": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz",
+      "integrity": "sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^13.0.0",
+        "@angular/core": "^13.0.0",
+        "@angular/forms": "^13.0.0",
+        "@angular/localize": "^13.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ng-dynamic-forms/core": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@ng-dynamic-forms/core/-/core-16.0.0.tgz",
+      "integrity": "sha512-fH0OIgFs/bWkVnnOtDoAAXHXb3K2UOQXm7qEgO9hg86keE2x3Tu/G/Ma6tRVi5+RfKRgvI2Q6JlMLHIQHYFAgA==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^15.0.0",
+        "@angular/core": "^15.0.0",
+        "@angular/forms": "^15.0.0",
+        "core-js": "^3.8.1",
+        "rxjs": "^7.5.5"
+      }
+    },
+    "node_modules/@ng-dynamic-forms/ui-ng-bootstrap": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-16.0.0.tgz",
+      "integrity": "sha512-qopjC+j1wfOaB6a/xSUKEpl5vohEospvhLqPl33BgNH557DQg3x3oI/oPo3caLRhIo2vpKGIeuEN5Itok0B3vg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+        "@ng-dynamic-forms/core": "^16.0.0",
+        "bootstrap": "^4.0.0",
+        "ngx-mask": "^13.0.0"
+      }
+    },
+    "node_modules/@ngrx/effects": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.2.0.tgz",
+      "integrity": "sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==",
+      "dependencies": {
+        "@ngrx/operators": "17.0.0-beta.0",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^17.0.0",
+        "@ngrx/store": "17.2.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngrx/operators": {
+      "version": "17.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-17.0.0-beta.0.tgz",
+      "integrity": "sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ngrx/router-store": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-17.2.0.tgz",
+      "integrity": "sha512-Vynfg2xsB57Oedf0Bb6mjC4MIeaF2OtAewsSnppGIM2b8pwL5W89r2+q2SGc2D6Mp3/pZF3HRI6NxhnHWJdYmg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^17.0.0",
+        "@angular/core": "^17.0.0",
+        "@angular/router": "^17.0.0",
+        "@ngrx/store": "17.2.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngrx/store": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.2.0.tgz",
+      "integrity": "sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^17.0.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngrx/store-devtools": {
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-17.2.0.tgz",
+      "integrity": "sha512-ig0qr6hMexZGnrlxfHvZmu5CanRjH7hhx60XUbB5BdBvWJIIRaWKPLcsniiDUhljAD87gvzrrilbCTiML38+CA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@ngrx/store": "17.2.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngtools/webpack": {
+      "version": "16.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.14.tgz",
+      "integrity": "sha512-3+zPP3Wir46qrZ3FEiTz5/emSoVHYUCH+WgBmJ57mZCx1qBOYh2VgllnPr/Yusl1sc/jUZjdwq/es/9ZNw+zDQ==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^16.0.0",
+        "typescript": ">=4.9.3 <5.2",
+        "webpack": "^5.54.0"
+      }
+    },
+    "node_modules/@ngx-translate/core": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz",
+      "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=13.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@nicky-lenaers/ngx-scroll-to": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@nicky-lenaers/ngx-scroll-to/-/ngx-scroll-to-14.0.0.tgz",
+      "integrity": "sha512-nORagPmAQYDjB5jyQ3awGhbnKTKVARZUCK8FJIe46XjPQX2CI9+WBYvsdqq0CsNWVzCjhnC0Om6krzjOTrTHYQ==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=16.18.0",
+        "yarn": ">=1.22.18"
+      },
+      "peerDependencies": {
+        "@angular/common": "^14.0.0",
+        "@angular/core": "^14.0.0"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@npmcli/agent": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
+      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
+        "lru-cache": "^10.0.1",
+        "socks-proxy-agent": "^8.0.3"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "dev": true,
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@npmcli/git": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz",
+      "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/promise-spawn": "^7.0.0",
+        "lru-cache": "^10.0.1",
+        "npm-pick-manifest": "^9.0.0",
+        "proc-log": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz",
+      "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==",
+      "dev": true,
+      "dependencies": {
+        "npm-bundled": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "bin": {
+        "installed-package-contents": "bin/index.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/node-gyp": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
+      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/package-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
+      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/git": "^5.0.0",
+        "glob": "^10.2.2",
+        "hosted-git-info": "^7.0.0",
+        "json-parse-even-better-errors": "^3.0.0",
+        "normalize-package-data": "^6.0.0",
+        "proc-log": "^4.0.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/glob": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
+      "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==",
+      "dev": true,
+      "dependencies": {
+        "which": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/redact": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz",
+      "integrity": "sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz",
+      "integrity": "sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/node-gyp": "^3.0.0",
+        "@npmcli/package-json": "^5.0.0",
+        "@npmcli/promise-spawn": "^7.0.0",
+        "node-gyp": "^10.0.0",
+        "which": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@npmcli/run-script/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@nrwl/devkit": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-17.2.8.tgz",
+      "integrity": "sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==",
+      "dev": true,
+      "dependencies": {
+        "@nx/devkit": "17.2.8"
+      }
+    },
+    "node_modules/@nrwl/tao": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-17.2.8.tgz",
+      "integrity": "sha512-Qpk5YKeJ+LppPL/wtoDyNGbJs2MsTi6qyX/RdRrEc8lc4bk6Cw3Oul1qTXCI6jT0KzTz+dZtd0zYD/G7okkzvg==",
+      "dev": true,
+      "dependencies": {
+        "nx": "17.2.8",
+        "tslib": "^2.3.0"
+      },
+      "bin": {
+        "tao": "index.js"
+      }
+    },
+    "node_modules/@nx/devkit": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-17.2.8.tgz",
+      "integrity": "sha512-6LtiQihtZwqz4hSrtT5cCG5XMCWppG6/B8c1kNksg97JuomELlWyUyVF+sxmeERkcLYFaKPTZytP0L3dmCFXaw==",
+      "dev": true,
+      "dependencies": {
+        "@nrwl/devkit": "17.2.8",
+        "ejs": "^3.1.7",
+        "enquirer": "~2.3.6",
+        "ignore": "^5.0.4",
+        "semver": "7.5.3",
+        "tmp": "~0.2.1",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "nx": ">= 16 <= 18"
+      }
+    },
+    "node_modules/@nx/devkit/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@nx/devkit/node_modules/semver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@nx/nx-darwin-arm64": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.8.tgz",
+      "integrity": "sha512-dMb0uxug4hM7tusISAU1TfkDK3ixYmzc1zhHSZwpR7yKJIyKLtUpBTbryt8nyso37AS1yH+dmfh2Fj2WxfBHTg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-darwin-x64": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.8.tgz",
+      "integrity": "sha512-0cXzp1tGr7/6lJel102QiLA4NkaLCkQJj6VzwbwuvmuCDxPbpmbz7HC1tUteijKBtOcdXit1/MEoEU007To8Bw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-freebsd-x64": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.8.tgz",
+      "integrity": "sha512-YFMgx5Qpp2btCgvaniDGdu7Ctj56bfFvbbaHQWmOeBPK1krNDp2mqp8HK6ZKOfEuDJGOYAp7HDtCLvdZKvJxzA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm-gnueabihf": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.8.tgz",
+      "integrity": "sha512-iN2my6MrhLRkVDtdivQHugK8YmR7URo1wU9UDuHQ55z3tEcny7LV3W9NSsY9UYPK/FrxdDfevj0r2hgSSdhnzA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm64-gnu": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.8.tgz",
+      "integrity": "sha512-Iy8BjoW6mOKrSMiTGujUcNdv+xSM1DALTH6y3iLvNDkGbjGK1Re6QNnJAzqcXyDpv32Q4Fc57PmuexyysZxIGg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm64-musl": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.8.tgz",
+      "integrity": "sha512-9wkAxWzknjpzdofL1xjtU6qPFF1PHlvKCZI3hgEYJDo4mQiatGI+7Ttko+lx/ZMP6v4+Umjtgq7+qWrApeKamQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-x64-gnu": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.8.tgz",
+      "integrity": "sha512-sjG1bwGsjLxToasZ3lShildFsF0eyeGu+pOQZIp9+gjFbeIkd19cTlCnHrOV9hoF364GuKSXQyUlwtFYFR4VTQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-x64-musl": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.8.tgz",
+      "integrity": "sha512-QiakXZ1xBCIptmkGEouLHQbcM4klQkcr+kEaz2PlNwy/sW3gH1b/1c0Ed5J1AN9xgQxWspriAONpScYBRgxdhA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-win32-arm64-msvc": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.8.tgz",
+      "integrity": "sha512-XBWUY/F/GU3vKN9CAxeI15gM4kr3GOBqnzFZzoZC4qJt2hKSSUEWsMgeZtsMgeqEClbi4ZyCCkY7YJgU32WUGA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-win32-x64-msvc": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.8.tgz",
+      "integrity": "sha512-HTqDv+JThlLzbcEm/3f+LbS5/wYQWzb5YDXbP1wi7nlCTihNZOLNqGOkEmwlrR5tAdNHPRpHSmkYg4305W0CtA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+      "dev": true
+    },
+    "node_modules/@react-dnd/asap": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+      "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+    },
+    "node_modules/@react-dnd/invariant": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
+      "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+    },
+    "node_modules/@react-dnd/shallowequal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
+      "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+    },
+    "node_modules/@redux-saga/core": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.3.0.tgz",
+      "integrity": "sha512-L+i+qIGuyWn7CIg7k1MteHGfttKPmxwZR5E7OsGikCL2LzYA0RERlaUY00Y3P3ZV2EYgrsYlBrGs6cJP5OKKqA==",
+      "dependencies": {
+        "@babel/runtime": "^7.6.3",
+        "@redux-saga/deferred": "^1.2.1",
+        "@redux-saga/delay-p": "^1.2.1",
+        "@redux-saga/is": "^1.1.3",
+        "@redux-saga/symbols": "^1.1.3",
+        "@redux-saga/types": "^1.2.1",
+        "typescript-tuple": "^2.2.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/redux-saga"
+      }
+    },
+    "node_modules/@redux-saga/deferred": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@redux-saga/deferred/-/deferred-1.2.1.tgz",
+      "integrity": "sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g=="
+    },
+    "node_modules/@redux-saga/delay-p": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@redux-saga/delay-p/-/delay-p-1.2.1.tgz",
+      "integrity": "sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w==",
+      "dependencies": {
+        "@redux-saga/symbols": "^1.1.3"
+      }
+    },
+    "node_modules/@redux-saga/is": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@redux-saga/is/-/is-1.1.3.tgz",
+      "integrity": "sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q==",
+      "dependencies": {
+        "@redux-saga/symbols": "^1.1.3",
+        "@redux-saga/types": "^1.2.1"
+      }
+    },
+    "node_modules/@redux-saga/symbols": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@redux-saga/symbols/-/symbols-1.1.3.tgz",
+      "integrity": "sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg=="
+    },
+    "node_modules/@redux-saga/types": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@redux-saga/types/-/types-1.2.1.tgz",
+      "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA=="
+    },
+    "node_modules/@researchgate/react-intersection-observer": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz",
+      "integrity": "sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==",
+      "engines": {
+        "node": ">=10.18.1"
+      },
+      "peerDependencies": {
+        "react": "^16.3.2",
+        "react-dom": "^16.3.2"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@schematics/angular": {
+      "version": "17.3.8",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.8.tgz",
+      "integrity": "sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.8",
+        "@angular-devkit/schematics": "17.3.8",
+        "jsonc-parser": "3.2.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@sigstore/bundle": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
+      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.3.2"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/core": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
+      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/protobuf-specs": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
+      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/sign": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
+      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "make-fetch-happen": "^13.0.1",
+        "proc-log": "^4.2.0",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/sign/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/tuf": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
+      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "tuf-js": "^2.2.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/verify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
+      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.1.0",
+        "@sigstore/protobuf-specs": "^0.3.2"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
+    },
+    "node_modules/@tufjs/canonical-json": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz",
+      "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==",
+      "dev": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@tufjs/models": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
+      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
+      "dev": true,
+      "dependencies": {
+        "@tufjs/canonical-json": "2.0.0",
+        "minimatch": "^9.0.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/circular-json": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz",
+      "integrity": "sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==",
+      "dev": true
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "dev": true,
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.17",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
+      "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/deep-freeze": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz",
+      "integrity": "sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==",
+      "dev": true
+    },
+    "node_modules/@types/ejs": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
+      "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
+      "dev": true
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.19.5",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
+      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/grecaptcha": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.9.tgz",
+      "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw=="
+    },
+    "node_modules/@types/hoist-non-react-statics": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
+      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "dependencies": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
+      }
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "dev": true
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.14",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
+      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jasmine": {
+      "version": "3.6.11",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.11.tgz",
+      "integrity": "sha512-S6pvzQDvMZHrkBz2Mcn/8Du7cpr76PlRJBAoHnSDNbulULsH5dp0Gns+WRyNX5LHejz/ljxK4/vIHK/caHt6SQ==",
+      "dev": true
+    },
+    "node_modules/@types/js-cookie": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.6.tgz",
+      "integrity": "sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.6",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz",
+      "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==",
+      "dev": true
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "dev": true
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.12",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
+      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.15",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
+      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "dev": true
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true
+    },
+    "node_modules/@types/react": {
+      "version": "18.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
+      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@types/react-redux": {
+      "version": "7.1.33",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
+      "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==",
+      "dependencies": {
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
+      }
+    },
+    "node_modules/@types/react-transition-group": {
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
+      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/react/node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
+    "node_modules/@types/sanitize-html": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.11.0.tgz",
+      "integrity": "sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^8.0.0"
+      }
+    },
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "dev": true,
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "dev": true,
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "dev": true
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stacktrace-js": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz",
+      "integrity": "sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==",
+      "dev": true
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.10",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz",
+      "integrity": "sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.15.0",
+        "@typescript-eslint/type-utils": "7.15.0",
+        "@typescript-eslint/utils": "7.15.0",
+        "@typescript-eslint/visitor-keys": "7.15.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz",
+      "integrity": "sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.15.0",
+        "@typescript-eslint/utils": "7.15.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
+      "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.15.0.tgz",
+      "integrity": "sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "7.15.0",
+        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/typescript-estree": "7.15.0",
+        "@typescript-eslint/visitor-keys": "7.15.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/rule-tester": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.15.0.tgz",
+      "integrity": "sha512-QyBNG3gTpUJKb+Kx0hMbfZk9K7a3VnWEcWygZyKbw6ihTt/pf7c7AaR7JNbdnrFYc0q3JOgCXdKq8JM4RsAeaA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.15.0",
+        "@typescript-eslint/utils": "7.15.0",
+        "ajv": "^6.12.6",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "4.6.2",
+        "semver": "^7.6.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@eslint/eslintrc": ">=2",
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/rule-tester/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@typescript-eslint/rule-tester/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz",
+      "integrity": "sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/visitor-keys": "7.15.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz",
+      "integrity": "sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "6.19.0",
+        "@typescript-eslint/utils": "6.19.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
+      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
+      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
+      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/visitor-keys": "6.19.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
+      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.19.0",
+        "@typescript-eslint/types": "6.19.0",
+        "@typescript-eslint/typescript-estree": "6.19.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
+      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.19.0",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
+      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz",
+      "integrity": "sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/visitor-keys": "7.15.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.15.0.tgz",
+      "integrity": "sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.15.0",
+        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/typescript-estree": "7.15.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz",
+      "integrity": "sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.15.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
+      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "peerDependencies": {
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.12.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
+      "dev": true
+    },
+    "node_modules/@yarnpkg/parsers": {
+      "version": "3.0.0-rc.46",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
+      "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
+      "dev": true,
+      "dependencies": {
+        "js-yaml": "^3.10.0",
+        "tslib": "^2.4.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      }
+    },
+    "node_modules/@yarnpkg/parsers/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/@zkochan/js-yaml": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
+      "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/abbrev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
+      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "regex-parser": "^2.2.11"
+      },
+      "engines": {
+        "node": ">=8.9"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/angular-idle-preload": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz",
+      "integrity": "sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA=="
+    },
+    "node_modules/angulartics2": {
+      "version": "12.2.1",
+      "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-12.2.1.tgz",
+      "integrity": "sha512-+uDXkGGJJzzIITE59z1s3rL5okNyGXZN5mP7m2Ro9gouJF88COeRkhYlXZwIXkdQjBzIyOvUv6UamzgL9NiXLg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=13.0.0-0",
+        "@angular/core": ">=13.0.0-0",
+        "rxjs": "^7.0.0"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+      "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+    },
+    "node_modules/async-each-series": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz",
+      "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.18",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+      "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001591",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
+      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
+      "dev": true
+    },
+    "node_modules/axe-core": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.9.1.tgz",
+      "integrity": "sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/axios": {
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/axobject-query": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
+      "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^4.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0",
+        "webpack": ">=5"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "semver": "^6.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
+      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "core-js-compat": "^3.34.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
+      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true,
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "node_modules/batch-processor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
+      "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA=="
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/bent": {
+      "version": "7.3.12",
+      "resolved": "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz",
+      "integrity": "sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==",
+      "dev": true,
+      "dependencies": {
+        "bytesish": "^0.4.1",
+        "caseless": "~0.12.0",
+        "is-stream": "^2.0.0"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/blob-util": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
+      "dev": true
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
+      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+    },
+    "node_modules/boolean": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
+      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="
+    },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-sync": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.2.tgz",
+      "integrity": "sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==",
+      "dev": true,
+      "dependencies": {
+        "browser-sync-client": "^3.0.2",
+        "browser-sync-ui": "^3.0.2",
+        "bs-recipes": "1.3.4",
+        "chalk": "4.1.2",
+        "chokidar": "^3.5.1",
+        "connect": "3.6.6",
+        "connect-history-api-fallback": "^1",
+        "dev-ip": "^1.0.1",
+        "easy-extender": "^2.3.4",
+        "eazy-logger": "^4.0.1",
+        "etag": "^1.8.1",
+        "fresh": "^0.5.2",
+        "fs-extra": "3.0.1",
+        "http-proxy": "^1.18.1",
+        "immutable": "^3",
+        "micromatch": "^4.0.2",
+        "opn": "5.3.0",
+        "portscanner": "2.2.0",
+        "raw-body": "^2.3.2",
+        "resp-modifier": "6.0.2",
+        "rx": "4.1.0",
+        "send": "0.16.2",
+        "serve-index": "1.9.1",
+        "serve-static": "1.13.2",
+        "server-destroy": "1.0.1",
+        "socket.io": "^4.4.1",
+        "ua-parser-js": "^1.0.33",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "browser-sync": "dist/bin.js"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/browser-sync-client": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.2.tgz",
+      "integrity": "sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==",
+      "dev": true,
+      "dependencies": {
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
+        "mitt": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/browser-sync-ui": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz",
+      "integrity": "sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==",
+      "dev": true,
+      "dependencies": {
+        "async-each-series": "0.1.1",
+        "chalk": "4.1.2",
+        "connect-history-api-fallback": "^1",
+        "immutable": "^3",
+        "server-destroy": "1.0.1",
+        "socket.io-client": "^4.4.1",
+        "stream-throttle": "^0.1.3"
+      }
+    },
+    "node_modules/browser-sync-ui/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/browser-sync-ui/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/browser-sync-ui/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/browser-sync-ui/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/browser-sync-ui/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-sync-ui/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-sync/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/browser-sync/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/browser-sync/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/browser-sync/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/browser-sync/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-sync/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.16"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-recipes": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz",
+      "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==",
+      "dev": true
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/bytesish": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz",
+      "integrity": "sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==",
+      "dev": true
+    },
+    "node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cachedir": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001640",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true
+    },
+    "node_modules/cerialize": {
+      "version": "0.1.18",
+      "resolved": "https://registry.npmjs.org/cerialize/-/cerialize-0.1.18.tgz",
+      "integrity": "sha512-C/hp4UoPrMK060251Pt/21axF9aL4ceJlg3+pThB68VghhRjOzBzy4f8R9AirXdNB4gpqgaV2deU3UaexInL5w==",
+      "dependencies": {
+        "typescript": "^2.5.0"
+      }
+    },
+    "node_modules/cerialize/node_modules/typescript": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/check-more-types": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
+      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/circular-json": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
+      "deprecated": "CircularJSON is in maintenance only, flatted is its successor.",
+      "dev": true
+    },
+    "node_modules/classnames": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-progress": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
+      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
+      "dependencies": {
+        "string-width": "^4.2.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-table3": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+      "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "@colors/colors": "1.5.0"
+      }
+    },
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cliui/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/cliui/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/comment-parser": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true
+    },
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression-webpack-plugin": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz",
+      "integrity": "sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/connect": {
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+      "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.0",
+        "parseurl": "~1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-parser": {
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
+      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
+      "dependencies": {
+        "cookie": "0.4.1",
+        "cookie-signature": "1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/copy-anything": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
+      "dev": true,
+      "dependencies": {
+        "is-what": "^3.14.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/copy-to-clipboard": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
+      "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
+      "dependencies": {
+        "toggle-selection": "^1.0.6"
+      }
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz",
+      "integrity": "sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==",
+      "dev": true,
+      "dependencies": {
+        "cacache": "^15.0.5",
+        "fast-glob": "^3.2.4",
+        "find-cache-dir": "^3.3.1",
+        "glob-parent": "^5.1.1",
+        "globby": "^11.0.1",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^3.0.2",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "webpack-sources": "^1.4.3"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/copy-webpack-plugin/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
+      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.23.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/critters": {
+      "version": "0.0.22",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
+      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "css-select": "^5.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.2",
+        "htmlparser2": "^8.0.2",
+        "postcss": "^8.4.23",
+        "postcss-media-query-parser": "^0.2.3"
+      }
+    },
+    "node_modules/critters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/critters/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/critters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/critters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-box-model": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
+      "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==",
+      "dependencies": {
+        "tiny-invariant": "^1.0.6"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-has-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
+      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.4",
+        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "dev": true,
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-vendor": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz",
+      "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.3",
+        "is-in-browser": "^1.0.2"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssdb": {
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.11.2.tgz",
+      "integrity": "sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ]
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "2.6.21",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
+      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
+    },
+    "node_modules/custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
+      "dev": true
+    },
+    "node_modules/cypress": {
+      "version": "12.17.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
+      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@cypress/request": "2.88.12",
+        "@cypress/xvfb": "^1.2.4",
+        "@types/node": "^16.18.39",
+        "@types/sinonjs__fake-timers": "8.1.1",
+        "@types/sizzle": "^2.3.2",
+        "arch": "^2.2.0",
+        "blob-util": "^2.0.2",
+        "bluebird": "^3.7.2",
+        "buffer": "^5.6.0",
+        "cachedir": "^2.3.0",
+        "chalk": "^4.1.0",
+        "check-more-types": "^2.24.0",
+        "cli-cursor": "^3.1.0",
+        "cli-table3": "~0.6.1",
+        "commander": "^6.2.1",
+        "common-tags": "^1.8.0",
+        "dayjs": "^1.10.4",
+        "debug": "^4.3.4",
+        "enquirer": "^2.3.6",
+        "eventemitter2": "6.4.7",
+        "execa": "4.1.0",
+        "executable": "^4.1.1",
+        "extract-zip": "2.0.1",
+        "figures": "^3.2.0",
+        "fs-extra": "^9.1.0",
+        "getos": "^3.2.1",
+        "is-ci": "^3.0.0",
+        "is-installed-globally": "~0.4.0",
+        "lazy-ass": "^1.6.0",
+        "listr2": "^3.8.3",
+        "lodash": "^4.17.21",
+        "log-symbols": "^4.0.0",
+        "minimist": "^1.2.8",
+        "ospath": "^1.2.2",
+        "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
+        "proxy-from-env": "1.0.0",
+        "request-progress": "^3.0.0",
+        "semver": "^7.5.3",
+        "supports-color": "^8.1.1",
+        "tmp": "~0.2.1",
+        "untildify": "^4.0.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "cypress": "bin/cypress"
+      },
+      "engines": {
+        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
+      }
+    },
+    "node_modules/cypress-axe": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.5.0.tgz",
+      "integrity": "sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "axe-core": "^3 || ^4",
+        "cypress": "^10 || ^11 || ^12 || ^13"
+      }
+    },
+    "node_modules/cypress/node_modules/@types/node": {
+      "version": "16.18.101",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz",
+      "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==",
+      "dev": true
+    },
+    "node_modules/cypress/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cypress/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cypress/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/cypress/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/cypress/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cypress/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cypress/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/cypress/node_modules/proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
+      "dev": true
+    },
+    "node_modules/cypress/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/cypress/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
+    "node_modules/date-fns-tz": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz",
+      "integrity": "sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==",
+      "peerDependencies": {
+        "date-fns": ">=2.0.0"
+      }
+    },
+    "node_modules/date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.11",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
+      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
+      "dev": true
+    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
+      "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-freeze": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
+      "integrity": "sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/default-gateway/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/default-gateway/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-gateway/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/delay": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
+      "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true
+    },
+    "node_modules/dev-ip": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
+      "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
+      "dev": true,
+      "bin": {
+        "dev-ip": "lib/dev-ip.js"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
+      "dev": true
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dnd-core": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-10.0.2.tgz",
+      "integrity": "sha512-PrxEjxF0+6Y1n1n1Z9hSWZ1tvnDXv9syL+BccV1r1RC08uWNsyetf8AnWmUF3NgYPwy0HKQJwTqGkZK+1NlaFA==",
+      "dependencies": {
+        "@react-dnd/asap": "^4.0.0",
+        "@react-dnd/invariant": "^2.0.0",
+        "redux": "^4.0.4"
+      }
+    },
+    "node_modules/dnd-multi-backend": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/dnd-multi-backend/-/dnd-multi-backend-5.0.1.tgz",
+      "integrity": "sha512-BAOj6fIeGfZPA1LreehaV8mUD7Ww0EpaKqSDRrZ5mZXLWLIxFPPT3bIvpJhHUCt0+lTrOqkXu11Hudh+gHXNUA=="
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "dev": true,
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/dom-helpers/node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
+      "dev": true,
+      "dependencies": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/dompurify": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.6.tgz",
+      "integrity": "sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ=="
+    },
+    "node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz",
+      "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
+    },
+    "node_modules/dotenv-expand": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
+      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/easy-extender": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz",
+      "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.10"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/eazy-logger": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz",
+      "integrity": "sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "4.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eazy-logger/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eazy-logger/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eazy-logger/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eazy-logger/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eazy-logger/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eazy-logger/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/ecc-jsbn/node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.818",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.818.tgz",
+      "integrity": "sha512-eGvIk2V0dGImV9gWLq8fDfTTsCAeMDwZqEPMr+jMInxZdnp9Us8UpovYpRCf9NQ7VOFgrN2doNSgvISbsbNpxA=="
+    },
+    "node_modules/element-resize-detector": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
+      "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==",
+      "dependencies": {
+        "batch-processor": "1.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
+      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+      "dev": true,
+      "dependencies": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz",
+      "integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.0.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
+      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/ent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz",
+      "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^1.4.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
+      "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "dev": true,
+      "dependencies": {
+        "stackframe": "^1.3.4"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es6-promisify": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz",
+      "integrity": "sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
+      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.20.1",
+        "@esbuild/android-arm": "0.20.1",
+        "@esbuild/android-arm64": "0.20.1",
+        "@esbuild/android-x64": "0.20.1",
+        "@esbuild/darwin-arm64": "0.20.1",
+        "@esbuild/darwin-x64": "0.20.1",
+        "@esbuild/freebsd-arm64": "0.20.1",
+        "@esbuild/freebsd-x64": "0.20.1",
+        "@esbuild/linux-arm": "0.20.1",
+        "@esbuild/linux-arm64": "0.20.1",
+        "@esbuild/linux-ia32": "0.20.1",
+        "@esbuild/linux-loong64": "0.20.1",
+        "@esbuild/linux-mips64el": "0.20.1",
+        "@esbuild/linux-ppc64": "0.20.1",
+        "@esbuild/linux-riscv64": "0.20.1",
+        "@esbuild/linux-s390x": "0.20.1",
+        "@esbuild/linux-x64": "0.20.1",
+        "@esbuild/netbsd-x64": "0.20.1",
+        "@esbuild/openbsd-x64": "0.20.1",
+        "@esbuild/sunos-x64": "0.20.1",
+        "@esbuild/win32-arm64": "0.20.1",
+        "@esbuild/win32-ia32": "0.20.1",
+        "@esbuild/win32-x64": "0.20.1"
+      }
+    },
+    "node_modules/esbuild-wasm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz",
+      "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==",
+      "dev": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-compat-utils": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
+      "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/eslint-etc": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-etc/-/eslint-etc-5.2.1.tgz",
+      "integrity": "sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "^5.0.0",
+        "tsutils": "^3.17.1",
+        "tsutils-etc": "^1.4.1"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.0",
+        "typescript": ">=4.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz",
+      "integrity": "sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.57.0",
+        "tslib": "^2.3.1",
+        "tsutils": "^3.21.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
+        "typescript": "^3.7.5 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-plugin-dspace-angular-html": {
+      "resolved": "lint/dist/src/rules/html",
+      "link": true
+    },
+    "node_modules/eslint-plugin-dspace-angular-ts": {
+      "resolved": "lint/dist/src/rules/ts",
+      "link": true
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import-newlines": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.4.0.tgz",
+      "integrity": "sha512-+Cz1x2xBLtI9gJbmuYEpvY7F8K75wskBmJ7rk4VRObIJo+jklUJaejFJgtnWeL0dCFWabGEkhausrikXaNbtoQ==",
+      "dev": true,
+      "bin": {
+        "import-linter": "lib/index.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "45.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz",
+      "integrity": "sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==",
+      "dev": true,
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.39.4",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "semver": "^7.5.1",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-jsonc": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz",
+      "integrity": "sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "eslint-compat-utils": "^0.5.0",
+        "espree": "^9.6.1",
+        "graphemer": "^1.4.0",
+        "jsonc-eslint-parser": "^2.0.4",
+        "natural-compare": "^1.4.0",
+        "synckit": "^0.6.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ota-meshi"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-lodash": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz",
+      "integrity": "sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": ">=2"
+      }
+    },
+    "node_modules/eslint-plugin-rxjs": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-rxjs/-/eslint-plugin-rxjs-5.0.3.tgz",
+      "integrity": "sha512-fcVkqLmYLRfRp+ShafjpUKuaZ+cw/sXAvM5dfSxiEr7M28QZ/NY7vaOr09FB4rSaZsQyLBnNPh5SL+4EgKjh8Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/experimental-utils": "^5.0.0",
+        "common-tags": "^1.8.0",
+        "decamelize": "^5.0.0",
+        "eslint-etc": "^5.1.0",
+        "requireindex": "~1.2.0",
+        "rxjs-report-usage": "^1.0.4",
+        "tslib": "^2.0.0",
+        "tsutils": "^3.0.0",
+        "tsutils-etc": "^1.4.1"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.0",
+        "typescript": ">=4.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-simple-import-sort": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
+      "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=5.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-unused-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz",
+      "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==",
+      "dev": true,
+      "dependencies": {
+        "eslint-rule-composer": "^0.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "eslint": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-rule-composer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+      "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz",
+      "integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter2": {
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
+      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
+      "dev": true
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/exponential-backoff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
+      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "dev": true
+    },
+    "node_modules/express": {
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.2",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.6.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express-rate-limit": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz",
+      "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
+    },
+    "node_modules/express-static-gzip": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.7.tgz",
+      "integrity": "sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==",
+      "dev": true,
+      "dependencies": {
+        "serve-static": "^1.14.1"
+      }
+    },
+    "node_modules/express-static-gzip/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express-static-gzip/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/express-static-gzip/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/express-static-gzip/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/express-static-gzip/node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express-static-gzip/node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/express/node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/express/node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express/node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/express/node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/external-editor/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-patch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
+      "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fast-printf": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz",
+      "integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==",
+      "dependencies": {
+        "boolean": "^3.1.4"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/filesize": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz",
+      "integrity": "sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.1",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.3.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/finalhandler/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
+      "dev": true,
+      "dependencies": {
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "node_modules/fs-extra": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fscreen": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fscreen/-/fscreen-1.2.0.tgz",
+      "integrity": "sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/getos": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
+      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
+      "dev": true,
+      "dependencies": {
+        "async": "^3.2.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/global-dirs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+      "dev": true,
+      "dependencies": {
+        "ini": "2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/global-dirs/node_modules/ini": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/html-parse-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
+      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "dependencies": {
+        "void-elements": "3.1.0"
+      }
+    },
+    "node_modules/html-parse-stringify/node_modules/void-elements": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
+      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.5",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
+      "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^2.0.2",
+        "sshpk": "^1.14.1"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/http-terminator": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/http-terminator/-/http-terminator-3.2.0.tgz",
+      "integrity": "sha512-JLjck1EzPaWjsmIf8bziM3p9fgR1Y3JoUKAkyYEbZmFrIvJM6I8vVJfBGWlEtV9IWOvzNnaTtjuwZeBY2kwB4g==",
+      "dependencies": {
+        "delay": "^5.0.0",
+        "p-wait-for": "^3.2.0",
+        "roarr": "^7.0.4",
+        "type-fest": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/hyphenate-style-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
+      "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="
+    },
+    "node_modules/i18next": {
+      "version": "19.9.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.9.2.tgz",
+      "integrity": "sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0"
+      }
+    },
+    "node_modules/icomcom-react": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/icomcom-react/-/icomcom-react-1.0.1.tgz",
+      "integrity": "sha512-Xbz81qZ+er8RYZ6DFMmXxCl9YjxNWngNfPANTSOvzYNrQDieYvBZi+nv1MspI/ze+PAzfHUrmDcUii5RGCUifg==",
+      "dependencies": {
+        "prop-types": "^15.6.0"
+      },
+      "peerDependencies": {
+        "react": "^16.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true
+    },
+    "node_modules/ignore-walk": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz",
+      "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immutability-helper": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.1.1.tgz",
+      "integrity": "sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="
+    },
+    "node_modules/immutable": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
+      "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "9.2.15",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz",
+      "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==",
+      "dev": true,
+      "dependencies": {
+        "@ljharb/through": "^2.3.12",
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^5.3.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^4.1.0",
+        "external-editor": "^3.1.0",
+        "figures": "^3.2.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "1.0.0",
+        "ora": "^5.4.1",
+        "run-async": "^3.0.0",
+        "rxjs": "^7.8.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/intersection-observer": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.10.0.tgz",
+      "integrity": "sha512-fn4bQ0Xq8FTej09YC/jqKZwtijpvARlRp6wxL5WTA6yPe2YWSJ5RJh7Nm79rK2qB0wr6iDQzH60XGq5V/7u8YQ=="
+    },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-in-browser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
+      "integrity": "sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g=="
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+      "dev": true,
+      "dependencies": {
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-like": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
+      "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
+      "dev": true,
+      "dependencies": {
+        "lodash.isfinite": "^3.3.2"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isbinaryfile": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
+      }
+    },
+    "node_modules/isbot": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.8.0.tgz",
+      "integrity": "sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isomorphic-unfetch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
+      "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "unfetch": "^4.2.0"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
+      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.3",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/istanbul-lib-coverage": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.1.tgz",
+      "integrity": "sha512-U23pQPDnmYybVkYjObcuYMk43VRlMLLqLI+RdZy8s8WV8WsxO9SnqSroKaluuvcNOdCAlauKszDwd+umbot5Mg==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jake": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
+      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jake/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/jake/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jake/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jake/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jasmine": {
+      "version": "3.99.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.99.0.tgz",
+      "integrity": "sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.6",
+        "jasmine-core": "~3.99.0"
+      },
+      "bin": {
+        "jasmine": "bin/jasmine.js"
+      }
+    },
+    "node_modules/jasmine-core": {
+      "version": "3.99.1",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.99.1.tgz",
+      "integrity": "sha512-Hu1dmuoGcZ7AfyynN3LsfruwMbxMALMka+YtZeGoLuDEySVmVAPaonkNoBRIw/ectu8b9tVQCJNgp4a4knp+tg==",
+      "dev": true
+    },
+    "node_modules/jasmine-marbles": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz",
+      "integrity": "sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20"
+      },
+      "peerDependencies": {
+        "rxjs": "^7.0.0"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "dev": true,
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/js-cookie": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
+      "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-eslint-parser": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-2.4.0.tgz",
+      "integrity": "sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.5.0",
+        "eslint-visitor-keys": "^3.0.0",
+        "espree": "^9.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ota-meshi"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/jsonschema": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
+      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
+      "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/jss": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz",
+      "integrity": "sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "csstype": "^3.0.2",
+        "is-in-browser": "^1.1.3",
+        "tiny-warning": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/jss"
+      }
+    },
+    "node_modules/jss-plugin-camel-case": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz",
+      "integrity": "sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "hyphenate-style-name": "^1.0.3",
+        "jss": "10.10.0"
+      }
+    },
+    "node_modules/jss-plugin-default-unit": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz",
+      "integrity": "sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.10.0"
+      }
+    },
+    "node_modules/jss-plugin-global": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz",
+      "integrity": "sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.10.0"
+      }
+    },
+    "node_modules/jss-plugin-nested": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz",
+      "integrity": "sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.10.0",
+        "tiny-warning": "^1.0.2"
+      }
+    },
+    "node_modules/jss-plugin-props-sort": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz",
+      "integrity": "sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.10.0"
+      }
+    },
+    "node_modules/jss-plugin-rule-value-function": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz",
+      "integrity": "sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "jss": "10.10.0",
+        "tiny-warning": "^1.0.2"
+      }
+    },
+    "node_modules/jss-plugin-vendor-prefixer": {
+      "version": "10.10.0",
+      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz",
+      "integrity": "sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "css-vendor": "^2.0.8",
+        "jss": "10.10.0"
+      }
+    },
+    "node_modules/jss-rtl": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/jss-rtl/-/jss-rtl-0.3.0.tgz",
+      "integrity": "sha512-rg9jJmP1bAyhNOAp+BDZgOP/lMm4+oQ76qGueupDQ68Wq+G+6SGvCZvhIEg8OHSONRWOwFT6skCI+APGi8DgmA==",
+      "dependencies": {
+        "rtl-css-js": "^1.13.1"
+      },
+      "peerDependencies": {
+        "jss": "^10.0.0"
+      }
+    },
+    "node_modules/jss/node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    },
+    "node_modules/jwt-decode": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+    },
+    "node_modules/karma": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
+      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
+      "dev": true,
+      "dependencies": {
+        "@colors/colors": "1.5.0",
+        "body-parser": "^1.19.0",
+        "braces": "^3.0.2",
+        "chokidar": "^3.5.1",
+        "connect": "^3.7.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.1",
+        "glob": "^7.1.7",
+        "graceful-fs": "^4.2.6",
+        "http-proxy": "^1.18.1",
+        "isbinaryfile": "^4.0.8",
+        "lodash": "^4.17.21",
+        "log4js": "^6.4.1",
+        "mime": "^2.5.2",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
+        "qjobs": "^1.2.0",
+        "range-parser": "^1.2.1",
+        "rimraf": "^3.0.2",
+        "socket.io": "^4.7.2",
+        "source-map": "^0.6.1",
+        "tmp": "^0.2.1",
+        "ua-parser-js": "^0.7.30",
+        "yargs": "^16.1.1"
+      },
+      "bin": {
+        "karma": "bin/karma"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/karma-chrome-launcher": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz",
+      "integrity": "sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==",
+      "dev": true,
+      "dependencies": {
+        "which": "^1.2.1"
+      }
+    },
+    "node_modules/karma-chrome-launcher/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz",
+      "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^3.0.6",
+        "istanbul-reports": "^3.0.2",
+        "minimatch": "^3.0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mattlewis92"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma-jasmine": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz",
+      "integrity": "sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==",
+      "dev": true,
+      "dependencies": {
+        "jasmine-core": "^3.6.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "karma": "*"
+      }
+    },
+    "node_modules/karma-jasmine-html-reporter": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
+      "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
+      "dev": true,
+      "peerDependencies": {
+        "jasmine-core": ">=3.8",
+        "karma": ">=0.9",
+        "karma-jasmine": ">=1.1"
+      }
+    },
+    "node_modules/karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "peerDependencies": {
+        "karma": ">=0.13"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-source-map-support": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "dev": true,
+      "dependencies": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "node_modules/karma/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/karma/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/karma/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/karma/node_modules/connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/karma/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/karma/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/karma/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/karma/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/karma/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/karma/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/karma/node_modules/ua-parser-js": {
+      "version": "0.7.38",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
+      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/karma/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/karma/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klaro": {
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/klaro/-/klaro-0.7.21.tgz",
+      "integrity": "sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==",
+      "dependencies": {
+        "@babel/eslint-parser": "^7.23.10",
+        "sass": "^1.25.0",
+        "webpack-merge": "^5.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz",
+      "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.8.1"
+      }
+    },
+    "node_modules/lazy-ass": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
+      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
+      "dev": true,
+      "engines": {
+        "node": "> 0.8"
+      }
+    },
+    "node_modules/less": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
+      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
+      "dev": true,
+      "dependencies": {
+        "copy-anything": "^2.0.1",
+        "parse-node-version": "^1.0.1",
+        "tslib": "^2.3.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "needle": "^3.1.0",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/less-loader": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
+      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "less": "^3.5.0 || ^4.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/less/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/less/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/less/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/license-webpack-plugin": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
+      "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
+      "dev": true,
+      "dependencies": {
+        "webpack-sources": "^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-sources": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/license-webpack-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/limiter": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
+      "dev": true
+    },
+    "node_modules/lines-and-columns": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
+      "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/linkify-it": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
+      "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/listr2/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/listr2/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
+    },
+    "node_modules/lodash.isfinite": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz",
+      "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-update/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log4js": {
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
+      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
+      "dev": true,
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.5"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.8",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
+      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/agent": "^2.0.0",
+        "cacache": "^18.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "is-lambda": "^1.0.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "proc-log": "^4.2.0",
+        "promise-retry": "^2.0.1",
+        "ssri": "^10.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
+      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
+      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^10.0.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^2.0.1",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/glob": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
+      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/unique-filename": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
+      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/unique-slug": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
+      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/manifesto.js": {
+      "version": "4.2.17",
+      "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz",
+      "integrity": "sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==",
+      "dependencies": {
+        "@edsilv/http-status-codes": "^1.0.3",
+        "@iiif/vocabulary": "^1.0.26",
+        "isomorphic-unfetch": "^3.0.0",
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=8.9.1",
+        "npm": ">=3.10.8"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
+      "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~3.0.1",
+        "linkify-it": "^4.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
+      "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
+      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/minipass-fetch/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mirador": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz",
+      "integrity": "sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==",
+      "dependencies": {
+        "@material-ui/core": "^4.11.0",
+        "@material-ui/icons": "^4.9.1",
+        "@material-ui/lab": "^4.0.0-alpha.53",
+        "@researchgate/react-intersection-observer": "^1.0.0",
+        "classnames": "^2.2.6",
+        "clsx": "^1.0.4",
+        "deepmerge": "^4.2.2",
+        "dompurify": "^2.0.11",
+        "i18next": "^19.5.0",
+        "icomcom-react": "^1.0.1",
+        "intersection-observer": "^0.10.0",
+        "isomorphic-unfetch": "^3.0.0",
+        "jss": "^10.3.0",
+        "jss-rtl": "^0.3.0",
+        "lodash": "^4.17.11",
+        "manifesto.js": "^4.2.0",
+        "normalize-url": "^4.5.0",
+        "openseadragon": "^2.4.2",
+        "prop-types": "^15.6.2",
+        "re-reselect": "^4.0.0",
+        "react-aria-live": "^2.0.5",
+        "react-beautiful-dnd": "^13.0.0",
+        "react-copy-to-clipboard": "^5.0.1",
+        "react-dnd": "^10.0.2",
+        "react-dnd-html5-backend": "^10.0.2",
+        "react-dnd-multi-backend": "^5.0.0",
+        "react-dnd-touch-backend": "^10.0.2",
+        "react-full-screen": "^0.2.4",
+        "react-i18next": "^11.7.0",
+        "react-image": "^4.0.1",
+        "react-mosaic-component": "^4.0.1",
+        "react-redux": "^7.1.0",
+        "react-resize-observer": "^1.1.1",
+        "react-rnd": "^10.1",
+        "react-sizeme": "^2.6.7",
+        "react-virtualized-auto-sizer": "^1.0.2",
+        "react-window": "^1.8.5",
+        "redux": "^4.0.5",
+        "redux-devtools-extension": "^2.13.2",
+        "redux-saga": "^1.1.3",
+        "redux-thunk": "^2.3.0",
+        "reselect": "^4.0.0",
+        "uuid": "^8.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.3",
+        "react-dom": "^16.8.3"
+      }
+    },
+    "node_modules/mirador-dl-plugin": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz",
+      "integrity": "sha512-I/6etIvpTtO1zgjxx2uEUFoyB9NxQ43JWg8CMkKmZqblW7AAeFqRn1/zUlQH7N8KFZft9Rah6D8qxtuNAo9jmA==",
+      "peerDependencies": {
+        "@material-ui/core": "^4.11.0",
+        "@material-ui/icons": "^4.9.1",
+        "lodash": "^4.17.11",
+        "mirador": "^3.0.0-rc.7",
+        "prop-types": "^15.7.2",
+        "react": "16.x",
+        "react-dom": "16.x"
+      }
+    },
+    "node_modules/mirador-share-plugin": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz",
+      "integrity": "sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==",
+      "peerDependencies": {
+        "@material-ui/core": "^4.7.2",
+        "@material-ui/icons": "^4.5.1",
+        "mirador": "^3.0.0-beta.0",
+        "prop-types": "^15.7.2",
+        "react": "16.x",
+        "react-copy-to-clipboard": "^5.0.1",
+        "react-dom": "16.x"
+      }
+    },
+    "node_modules/mitt": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
+      "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
+      "dev": true
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "dependencies": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/morgan/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/morgan/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/morgan/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/mrmime": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
+      "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/needle": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/ng-mocks": {
+      "version": "14.13.0",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.0.tgz",
+      "integrity": "sha512-cQ6nUj/P+v7X52gYU6bAj/03iDKl2pzbPy2V0tx/d5lxME063Vxc190p6UPlJkbRIxcB+OqSALPgQvy83efzjw==",
+      "funding": {
+        "url": "https://github.com/sponsors/help-me-mom"
+      },
+      "peerDependencies": {
+        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18"
+      }
+    },
+    "node_modules/ng2-file-upload": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-5.0.0.tgz",
+      "integrity": "sha512-M2JaX0unB/30GmQUScfXko2vseaPlU1R5jnhL5cfvOLNw8BBSVJAdOSmcavJzicgTZWCYz7y7Fvpr939bd4eCA==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^16.0.0",
+        "@angular/core": "^16.0.0"
+      }
+    },
+    "node_modules/ng2-nouislider": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ng2-nouislider/-/ng2-nouislider-2.0.0.tgz",
+      "integrity": "sha512-NGbF/0w0+bZqclpSPFOlWIeVJaVwRRYFJzD1x8PClbw9GIeo7fCHoBzZ81y7K7FTJg6to+cgjSTFETPZG/Dizg==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=14.x",
+        "@angular/core": ">=14.x",
+        "nouislider": ">=15.x"
+      }
+    },
+    "node_modules/ngx-infinite-scroll": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz",
+      "integrity": "sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=16.0.0 <17.0.0",
+        "@angular/core": ">=16.0.0 <17.0.0"
+      }
+    },
+    "node_modules/ngx-mask": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-14.2.4.tgz",
+      "integrity": "sha512-158nAe2tyiZa2T8COoI6SvJCQHqpJ4+JW0amGcvVEYUBF6FIoYK66BlnOJURAOy5qry0d0N45w7J/LGsCBgZcg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=10.0.0",
+        "@angular/core": ">=10.0.0",
+        "@angular/forms": ">=10.0.0"
+      }
+    },
+    "node_modules/ngx-pagination": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/ngx-pagination/-/ngx-pagination-6.0.3.tgz",
+      "integrity": "sha512-lONjTQ7hFPh1SyhwDrRd5ZwM4NMGQ7bNR6vLrs6mrU0Z8Q1zCcWbf/pvyp4DOlGyd9uyZxRy2wUsSZLeIPjbAw==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=13.0.0",
+        "@angular/core": ">=13.0.0"
+      }
+    },
+    "node_modules/ngx-ui-switch": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz",
+      "integrity": "sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": ">=10.0.0",
+        "@angular/common": ">=10.0.0",
+        "@angular/core": ">=10.0.0",
+        "@angular/forms": ">=10.0.0",
+        "@angular/platform-browser": ">=10.0.0"
+      }
+    },
+    "node_modules/nice-napi": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
+      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "!win32"
+      ],
+      "dependencies": {
+        "node-addon-api": "^3.0.0",
+        "node-gyp-build": "^4.2.2"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
+      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^10.3.10",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^13.0.0",
+        "nopt": "^7.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^4.0.0"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/node-gyp/node_modules/glob": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/node-gyp/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/node-gyp/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/node-gyp/node_modules/which": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/node-machine-id": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
+      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+    },
+    "node_modules/nodemon": {
+      "version": "2.0.22",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+      "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
+        "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.5"
+      },
+      "bin": {
+        "nodemon": "bin/nodemon.js"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nodemon"
+      }
+    },
+    "node_modules/nodemon/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/nodemon/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/nodemon/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nodemon/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^2.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
+      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nouislider": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.8.1.tgz",
+      "integrity": "sha512-93TweAi8kqntHJSPiSWQ1o/uZ29VWOmal9YKb6KKGGlCkugaNfAupT7o1qTHqdJvNQ7S0su5rO6qRFCjP8fxtw=="
+    },
+    "node_modules/npm-bundled": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz",
+      "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==",
+      "dev": true,
+      "dependencies": {
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-install-checks": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz",
+      "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-package-arg": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz",
+      "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz",
+      "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==",
+      "dev": true,
+      "dependencies": {
+        "ignore-walk": "^6.0.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-pick-manifest": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz",
+      "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==",
+      "dev": true,
+      "dependencies": {
+        "npm-install-checks": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "npm-package-arg": "^11.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch": {
+      "version": "16.2.1",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz",
+      "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/redact": "^1.1.0",
+        "make-fetch-happen": "^13.0.0",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^3.0.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.1.2",
+        "npm-package-arg": "^11.0.0",
+        "proc-log": "^4.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nx": {
+      "version": "17.2.8",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-17.2.8.tgz",
+      "integrity": "sha512-rM5zXbuXLEuqQqcjVjClyvHwRJwt+NVImR2A6KFNG40Z60HP6X12wAxxeLHF5kXXTDRU0PFhf/yACibrpbPrAw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@nrwl/tao": "17.2.8",
+        "@yarnpkg/lockfile": "^1.1.0",
+        "@yarnpkg/parsers": "3.0.0-rc.46",
+        "@zkochan/js-yaml": "0.0.6",
+        "axios": "^1.5.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "3.1.0",
+        "cli-spinners": "2.6.1",
+        "cliui": "^8.0.1",
+        "dotenv": "~16.3.1",
+        "dotenv-expand": "~10.0.0",
+        "enquirer": "~2.3.6",
+        "figures": "3.2.0",
+        "flat": "^5.0.2",
+        "fs-extra": "^11.1.0",
+        "glob": "7.1.4",
+        "ignore": "^5.0.4",
+        "jest-diff": "^29.4.1",
+        "js-yaml": "4.1.0",
+        "jsonc-parser": "3.2.0",
+        "lines-and-columns": "~2.0.3",
+        "minimatch": "3.0.5",
+        "node-machine-id": "1.1.12",
+        "npm-run-path": "^4.0.1",
+        "open": "^8.4.0",
+        "semver": "7.5.3",
+        "string-width": "^4.2.3",
+        "strong-log-transformer": "^2.1.0",
+        "tar-stream": "~2.2.0",
+        "tmp": "~0.2.1",
+        "tsconfig-paths": "^4.1.2",
+        "tslib": "^2.3.0",
+        "yargs": "^17.6.2",
+        "yargs-parser": "21.1.1"
+      },
+      "bin": {
+        "nx": "bin/nx.js",
+        "nx-cloud": "bin/nx-cloud.js"
+      },
+      "optionalDependencies": {
+        "@nx/nx-darwin-arm64": "17.2.8",
+        "@nx/nx-darwin-x64": "17.2.8",
+        "@nx/nx-freebsd-x64": "17.2.8",
+        "@nx/nx-linux-arm-gnueabihf": "17.2.8",
+        "@nx/nx-linux-arm64-gnu": "17.2.8",
+        "@nx/nx-linux-arm64-musl": "17.2.8",
+        "@nx/nx-linux-x64-gnu": "17.2.8",
+        "@nx/nx-linux-x64-musl": "17.2.8",
+        "@nx/nx-win32-arm64-msvc": "17.2.8",
+        "@nx/nx-win32-x64-msvc": "17.2.8"
+      },
+      "peerDependencies": {
+        "@swc-node/register": "^1.6.7",
+        "@swc/core": "^1.3.85"
+      },
+      "peerDependenciesMeta": {
+        "@swc-node/register": {
+          "optional": true
+        },
+        "@swc/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/nx/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/nx/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/nx/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/nx/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/nx/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/nx/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/nx/node_modules/glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nx/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nx/node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
+    },
+    "node_modules/nx/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/nx/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/nx/node_modules/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/nx/node_modules/semver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/nx/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nx/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true,
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/openseadragon": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz",
+      "integrity": "sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw=="
+    },
+    "node_modules/opn": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/opn/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ospath": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
+      "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
+      "dev": true
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-retry/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-wait-for": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.2.0.tgz",
+      "integrity": "sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==",
+      "dependencies": {
+        "p-timeout": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true
+    },
+    "node_modules/pacote": {
+      "version": "17.0.6",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
+      "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/git": "^5.0.0",
+        "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/promise-spawn": "^7.0.0",
+        "@npmcli/run-script": "^7.0.0",
+        "cacache": "^18.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^7.0.2",
+        "npm-package-arg": "^11.0.0",
+        "npm-packlist": "^8.0.0",
+        "npm-pick-manifest": "^9.0.0",
+        "npm-registry-fetch": "^16.0.0",
+        "proc-log": "^3.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json": "^7.0.0",
+        "read-package-json-fast": "^3.0.0",
+        "sigstore": "^2.2.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/@npmcli/fs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
+      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/cacache": {
+      "version": "18.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
+      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^10.0.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^2.0.1",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/glob": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/pacote/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/pacote/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/pacote/node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
+      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/pacote/node_modules/ssri": {
+      "version": "10.0.6",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
+      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/unique-filename": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
+      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pacote/node_modules/unique-slug": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
+      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-json/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/parse-json/node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-srcset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
+      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
+    },
+    "node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "devOptional": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-html-rewriting-stream": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz",
+      "integrity": "sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.3.0",
+        "parse5": "^7.0.0",
+        "parse5-sax-parser": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-sax-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz",
+      "integrity": "sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
+      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pem": {
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/pem/-/pem-1.14.7.tgz",
+      "integrity": "sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==",
+      "dependencies": {
+        "es6-promisify": "^7.0.0",
+        "md5": "^2.3.0",
+        "os-tmpdir": "^1.0.2",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
+      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/piscina": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz",
+      "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==",
+      "dev": true,
+      "optionalDependencies": {
+        "nice-napi": "^1.0.2"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/yocto-queue": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
+      "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1-lts",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
+      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
+    },
+    "node_modules/portscanner": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz",
+      "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==",
+      "dev": true,
+      "dependencies": {
+        "async": "^2.6.0",
+        "is-number-like": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.0.0"
+      }
+    },
+    "node_modules/portscanner/node_modules/async": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-apply": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.12.0.tgz",
+      "integrity": "sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.14"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
+    "node_modules/postcss-apply/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-env-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
+      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz",
+      "integrity": "sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/postcss-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/postcss-logical": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig=="
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-responsive-type": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz",
+      "integrity": "sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.6"
+      }
+    },
+    "node_modules/postcss-responsive-type/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-responsive-type/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
+      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true
+    },
+    "node_modules/proc-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
+      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
+    "node_modules/pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "dev": true
+    },
+    "node_modules/qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.9"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.10.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+      "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/raf-schd": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
+      "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/re-reselect": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz",
+      "integrity": "sha512-xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==",
+      "peerDependencies": {
+        "reselect": ">1.0.0"
+      }
+    },
+    "node_modules/re-resizable": {
+      "version": "6.9.17",
+      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz",
+      "integrity": "sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g==",
+      "peerDependencies": {
+        "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-aria-live": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/react-aria-live/-/react-aria-live-2.0.5.tgz",
+      "integrity": "sha512-rXiH1HNKJrr/UfVeGwA2aKY43r5WbjLs+AYB6/kJF1qny2hwxzQc1qewQmUpdQ5h8HAOTD8O/XlGcEHjqlCl0g==",
+      "dependencies": {
+        "uuid": "^3.2.1"
+      },
+      "peerDependencies": {
+        "react": "^16.3.x"
+      }
+    },
+    "node_modules/react-aria-live/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/react-beautiful-dnd": {
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz",
+      "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.9.2",
+        "css-box-model": "^1.2.0",
+        "memoize-one": "^5.1.1",
+        "raf-schd": "^4.0.2",
+        "react-redux": "^7.2.0",
+        "redux": "^4.0.4",
+        "use-memo-one": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8.5 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-copy-to-clipboard": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
+      "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
+      "dependencies": {
+        "copy-to-clipboard": "^3.3.1",
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "react": "^15.3.0 || 16 || 17 || 18"
+      }
+    },
+    "node_modules/react-dnd": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-10.0.2.tgz",
+      "integrity": "sha512-SC2Ymvntynhoqtf5zaFhZscm9xenCoMofilxPdlwUlaelAzmbl9fw82C4ZJ//+lNm3kWAKXjGDZg2/aWjKEAtg==",
+      "dependencies": {
+        "@react-dnd/shallowequal": "^2.0.0",
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "dnd-core": "^10.0.2",
+        "hoist-non-react-statics": "^3.3.0"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8",
+        "react-dom": ">= 16.8"
+      }
+    },
+    "node_modules/react-dnd-html5-backend": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz",
+      "integrity": "sha512-ny17gUdInZ6PIGXdzfwPhoztRdNVVvjoJMdG80hkDBamJBeUPuNF2Wv4D3uoQJLjXssX1+i9PhBqc7EpogClwQ==",
+      "dependencies": {
+        "dnd-core": "^10.0.2"
+      }
+    },
+    "node_modules/react-dnd-multi-backend": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-dnd-multi-backend/-/react-dnd-multi-backend-5.0.1.tgz",
+      "integrity": "sha512-E45T5xVl4CLt9QFV9ZMjWCGLyF16+B6B6FgbeZE9J5o0rvLHaCqyAJTelRDXtbSiSBPaDlN1STO86jkiD31AHA==",
+      "dependencies": {
+        "dnd-multi-backend": "^5.0.1",
+        "prop-types": "^15.7.2",
+        "react-dnd-preview": "^5.0.1"
+      },
+      "peerDependencies": {
+        "react": "^16.13",
+        "react-dnd-html5-backend": "^10.0.2",
+        "react-dnd-touch-backend": "^10.0.2"
+      }
+    },
+    "node_modules/react-dnd-preview": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-dnd-preview/-/react-dnd-preview-5.0.1.tgz",
+      "integrity": "sha512-wwUgk8jWuO4WMOoa+GviHoZyYAiXer6vsSW2aEhpz0gsde08O+4cI+j7DG7q9vYlBnljNutdQ1WjDV0VskZ4jQ==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": "^16.13.1",
+        "react-dnd": "^10.0.2"
+      }
+    },
+    "node_modules/react-dnd-touch-backend": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz",
+      "integrity": "sha512-+lW/Ern0dKyHToD0oP+Wc/ZD6l7qJazosLqbjzL7OnPlig6WxdlrHkJylOLkeAdZj41fIJJ551Lb57pIL0CcPw==",
+      "dependencies": {
+        "@react-dnd/invariant": "^2.0.0",
+        "dnd-core": "^10.0.2"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.19.1"
+      },
+      "peerDependencies": {
+        "react": "^16.14.0"
+      }
+    },
+    "node_modules/react-draggable": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz",
+      "integrity": "sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==",
+      "dependencies": {
+        "clsx": "^1.1.1",
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "react": ">= 16.3.0",
+        "react-dom": ">= 16.3.0"
+      }
+    },
+    "node_modules/react-full-screen": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/react-full-screen/-/react-full-screen-0.2.5.tgz",
+      "integrity": "sha512-LNkxjLWmiR+AwemSVdn/miUcBy8tHA6mDVS1qz1AM/DHNEtQbzkh5ok9A6g99502OqutQq1zBvCBGLV8rsB2tw==",
+      "dependencies": {
+        "@types/react": "*",
+        "fscreen": "^1.0.1"
+      },
+      "peerDependencies": {
+        "prop-types": "^15.5",
+        "react": "^15.6 || ^16"
+      }
+    },
+    "node_modules/react-i18next": {
+      "version": "11.18.6",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+      "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
+      "dependencies": {
+        "@babel/runtime": "^7.14.5",
+        "html-parse-stringify": "^3.0.1"
+      },
+      "peerDependencies": {
+        "i18next": ">= 19.0.0",
+        "react": ">= 16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-image": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/react-image/-/react-image-4.1.0.tgz",
+      "integrity": "sha512-qwPNlelQe9Zy14K2pGWSwoL+vHsAwmJKS6gkotekDgRpcnRuzXNap00GfibD3eEPYu3WCPlyIUUNzcyHOrLHjw==",
+      "peerDependencies": {
+        "@babel/runtime": ">=7",
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
+    "node_modules/react-mosaic-component": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz",
+      "integrity": "sha512-HVlLvfYQ/AKmoKvw95Orx3Qyc7SNuS/QlAy+SkAVit1g9ipzXBGYoBg7RMXP5sF5w47CgYxA+1gT+fYRVf73jA==",
+      "dependencies": {
+        "classnames": "^2.2.6",
+        "immutability-helper": "^3.0.1",
+        "lodash": "^4.17.11",
+        "prop-types": "^15.7.2",
+        "react-dnd": "^10.0.2",
+        "react-dnd-html5-backend": "^10.0.2",
+        "react-dnd-multi-backend": "^5.0.0",
+        "react-dnd-touch-backend": "^10.0.2",
+        "uuid": "^3.3.2"
+      },
+      "peerDependencies": {
+        "react": "^16.3.0"
+      }
+    },
+    "node_modules/react-mosaic-component/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/react-redux": {
+      "version": "7.2.9",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
+      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.3 || ^17 || ^18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-resize-observer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/react-resize-observer/-/react-resize-observer-1.1.1.tgz",
+      "integrity": "sha512-3R+90Hou90Mr3wJYc+unsySC8Pn91V4nmjO32NKvUvjphRUbq9HisyLg7bDyGBE7xlMrrM6Fax7iNQaFdc/FYA==",
+      "peerDependencies": {
+        "react": ">=0.14"
+      }
+    },
+    "node_modules/react-rnd": {
+      "version": "10.4.11",
+      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz",
+      "integrity": "sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q==",
+      "dependencies": {
+        "re-resizable": "6.9.17",
+        "react-draggable": "4.4.6",
+        "tslib": "2.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      }
+    },
+    "node_modules/react-sizeme": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
+      "integrity": "sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==",
+      "dependencies": {
+        "element-resize-detector": "^1.2.1",
+        "invariant": "^2.2.4",
+        "shallowequal": "^1.1.0",
+        "throttle-debounce": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0",
+        "react-dom": "^0.14.0 || ^15.0.0-0 || ^16.0.0"
+      }
+    },
+    "node_modules/react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
+    "node_modules/react-virtualized-auto-sizer": {
+      "version": "1.0.24",
+      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz",
+      "integrity": "sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg==",
+      "peerDependencies": {
+        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-window": {
+      "version": "1.8.10",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz",
+      "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0",
+        "memoize-one": ">=3.1.1 <6"
+      },
+      "engines": {
+        "node": ">8.0.0"
+      },
+      "peerDependencies": {
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz",
+      "integrity": "sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==",
+      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.2.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "normalize-package-data": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/read-package-json-fast": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
+      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
+      "dev": true,
+      "dependencies": {
+        "json-parse-even-better-errors": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/read-package-json/node_modules/glob": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
+      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/read-package-json/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/redux": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+      "dependencies": {
+        "@babel/runtime": "^7.9.2"
+      }
+    },
+    "node_modules/redux-devtools-extension": {
+      "version": "2.13.9",
+      "resolved": "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz",
+      "integrity": "sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==",
+      "deprecated": "Package moved to @redux-devtools/extension.",
+      "peerDependencies": {
+        "redux": "^3.1.0 || ^4.0.0"
+      }
+    },
+    "node_modules/redux-saga": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.3.0.tgz",
+      "integrity": "sha512-J9RvCeAZXSTAibFY0kGw6Iy4EdyDNW7k6Q+liwX+bsck7QVsU78zz8vpBRweEfANxnnlG/xGGeOvf6r8UXzNJQ==",
+      "dependencies": {
+        "@redux-saga/core": "^1.3.0"
+      }
+    },
+    "node_modules/redux-thunk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
+      "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
+      "peerDependencies": {
+        "redux": "^4"
+      }
+    },
+    "node_modules/reflect-metadata": {
+      "version": "0.1.14",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz",
+      "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A=="
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-parser": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+      "dev": true
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsparser": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/request-progress": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+      "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
+      "dev": true,
+      "dependencies": {
+        "throttleit": "^1.0.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requireindex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.5"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
+    "node_modules/reselect": {
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
+      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-url-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+      "dev": true,
+      "dependencies": {
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^8.2.14",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resp-modifier": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz",
+      "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.2.0",
+        "minimatch": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/resp-modifier/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/resp-modifier/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/resp-modifier/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/resp-modifier/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/roarr": {
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-7.21.1.tgz",
+      "integrity": "sha512-3niqt5bXFY1InKU8HKWqqYTYjtrBaxBMnXELXCXUYgtNYGUtZM5rB46HIC430AyacL95iEniGf7RgqsesykLmQ==",
+      "dependencies": {
+        "fast-printf": "^1.6.9",
+        "safe-stable-stringify": "^2.4.3",
+        "semver-compare": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.18.0",
+        "@rollup/rollup-android-arm64": "4.18.0",
+        "@rollup/rollup-darwin-arm64": "4.18.0",
+        "@rollup/rollup-darwin-x64": "4.18.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+        "@rollup/rollup-linux-arm64-musl": "4.18.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-gnu": "4.18.0",
+        "@rollup/rollup-linux-x64-musl": "4.18.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+        "@rollup/rollup-win32-x64-msvc": "4.18.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rtl-css-js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.1.tgz",
+      "integrity": "sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==",
+      "dev": true
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/rxjs-report-usage": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz",
+      "integrity": "sha512-omv1DIv5z1kV+zDAEjaDjWSkx8w5TbFp5NZoPwUipwzYVcor/4So9ZU3bUyQ1c8lxY5Q0Es/ztWW7PGjY7to0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.10.3",
+        "@babel/traverse": "^7.10.3",
+        "@babel/types": "^7.10.3",
+        "bent": "~7.3.6",
+        "chalk": "~4.1.0",
+        "glob": "~7.2.0",
+        "prompts": "~2.4.2"
+      },
+      "bin": {
+        "rxjs-report-usage": "bin/rxjs-report-usage"
+      }
+    },
+    "node_modules/rxjs-report-usage/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/rxjs-report-usage/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/rxjs-report-usage/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/rxjs-report-usage/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/rxjs-report-usage/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rxjs-report-usage/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rxjs-spy": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-8.0.2.tgz",
+      "integrity": "sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==",
+      "dev": true,
+      "dependencies": {
+        "@types/circular-json": "^0.4.0",
+        "@types/stacktrace-js": "^0.0.33",
+        "circular-json": "^0.5.0",
+        "error-stack-parser": "^2.0.1",
+        "rxjs-report-usage": "^1.0.4",
+        "stacktrace-gps": "^3.0.2"
+      },
+      "peerDependencies": {
+        "rxjs": "^7.0.0"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-stable-stringify": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sanitize-html": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
+      "integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "parse-srcset": "^1.0.2",
+        "postcss": "^8.3.11"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.62.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
+      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sass-resources-loader": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz",
+      "integrity": "sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==",
+      "dev": true,
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.1.0",
+        "glob": "^7.1.6",
+        "loader-utils": "^2.0.0"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/sass-resources-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/sass-resources-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass/node_modules/immutable": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="
+    },
+    "node_modules/sax": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/scheduler": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
+    },
+    "node_modules/selfsigned": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node-forge": "^1.3.0",
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/server-destroy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
+      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
+      "dev": true
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sigstore": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
+      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "@sigstore/sign": "^2.3.2",
+        "@sigstore/tuf": "^2.3.4",
+        "@sigstore/verify": "^1.2.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/sirv": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+      "dev": true,
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socket.io": {
+      "version": "4.7.5",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
+      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.5.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      }
+    },
+    "node_modules/socket.io-client": {
+      "version": "4.7.5",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.5.tgz",
+      "integrity": "sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/sortablejs": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
+      "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-5.0.0.tgz",
+      "integrity": "sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.72.1"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+      "dev": true
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.18",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
+      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "dev": true
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
+    "node_modules/sshpk": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
+      "dev": true,
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sshpk/node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
+    },
+    "node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+      "dev": true
+    },
+    "node_modules/stacktrace-gps": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz",
+      "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "0.5.6",
+        "stackframe": "^1.3.4"
+      }
+    },
+    "node_modules/stacktrace-gps/node_modules/source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-throttle": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
+      "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.2.0",
+        "limiter": "^1.0.5"
+      },
+      "bin": {
+        "throttleproxy": "bin/throttleproxy.js"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/stream-throttle/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/streamroller": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
+      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
+      "dev": true,
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/streamroller/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/streamroller/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strong-log-transformer": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
+      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "^0.1.1",
+        "minimist": "^1.2.0",
+        "through": "^2.3.4"
+      },
+      "bin": {
+        "sl-log-transformer": "bin/sl-log-transformer.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-observable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
+      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/synckit": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.6.2.tgz",
+      "integrity": "sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.29.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
+      "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/throttle-debounce": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
+      "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/throttleit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
+      "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
+    },
+    "node_modules/tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toggle-selection": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/touch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
+      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
+      "dev": true,
+      "bin": {
+        "nodetouch": "bin/nodetouch.js"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-api-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
+      "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
+      "dev": true,
+      "dependencies": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.7"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils-etc": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/tsutils-etc/-/tsutils-etc-1.4.2.tgz",
+      "integrity": "sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs": "^17.0.0",
+        "yargs": "^17.0.0"
+      },
+      "bin": {
+        "ts-flags": "bin/ts-flags",
+        "ts-kind": "bin/ts-kind"
+      },
+      "peerDependencies": {
+        "tsutils": "^3.0.0",
+        "typescript": ">=4.0.0"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tuf-js": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
+      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
+      "dev": true,
+      "dependencies": {
+        "@tufjs/models": "2.0.1",
+        "debug": "^4.3.4",
+        "make-fetch-happen": "^13.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-assert": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
+      "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
+      "dev": true
+    },
+    "node_modules/typescript": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
+      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typescript-compare": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
+      "integrity": "sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==",
+      "dependencies": {
+        "typescript-logic": "^0.0.0"
+      }
+    },
+    "node_modules/typescript-logic": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz",
+      "integrity": "sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q=="
+    },
+    "node_modules/typescript-tuple": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz",
+      "integrity": "sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==",
+      "dependencies": {
+        "typescript-compare": "^0.0.2"
+      }
+    },
+    "node_modules/ua-parser-js": {
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.38.tgz",
+      "integrity": "sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/undefsafe": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true
+    },
+    "node_modules/undici": {
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz",
+      "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18.0"
+      }
+    },
+    "node_modules/unfetch": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/use-memo-one": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
+      "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+      "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.7.tgz",
+      "integrity": "sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.35",
+        "rollup": "^4.2.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
+    "node_modules/void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/webfontloader": {
+      "version": "1.6.28",
+      "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz",
+      "integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/webpack": {
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
+        "gzip-size": "^6.0.0",
+        "html-escaper": "^2.0.2",
+        "opener": "^1.5.2",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.1.1",
+        "@webpack-cli/info": "^2.0.2",
+        "@webpack-cli/serve": "^2.0.5",
+        "colorette": "^2.0.14",
+        "commander": "^10.0.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz",
+      "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.12",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.4",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-subresource-integrity": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
+      "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
+      "dev": true,
+      "dependencies": {
+        "typed-assert": "^1.0.8"
+      },
+      "engines": {
+        "node": ">= 12"
+      },
+      "peerDependencies": {
+        "html-webpack-plugin": ">= 5.0.0-beta.1 < 6",
+        "webpack": "^5.12.0"
+      },
+      "peerDependenciesMeta": {
+        "html-webpack-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/webpack/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack/node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xhr2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz",
+      "integrity": "sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
+      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zone.js": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.7.tgz",
+      "integrity": "sha512-0w6DGkX2BPuiK/NLf+4A8FLE43QwBfuqz2dVgi/40Rj1WmqUskCqj329O/pwrqFJLG5X8wkeG2RhIAro441xtg=="
+    }
+  }
+}

From ee33b8f9ccf243f284de25843053e2dcc4d46dd2 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 29 Aug 2024 19:25:05 +0300
Subject: [PATCH 0395/1286] package.json: remove resolutions

These are a yarn-specific concept that we don't need for npm.
---
 package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package.json b/package.json
index 2ef451cc85..b98cc21d2a 100644
--- a/package.json
+++ b/package.json
@@ -55,11 +55,6 @@
     "https": false
   },
   "private": true,
-  "resolutions": {
-    "minimist": "^1.2.5",
-    "webdriver-manager": "^12.1.8",
-    "ts-node": "10.2.1"
-  },
   "dependencies": {
     "@angular/animations": "^17.3.11",
     "@angular/cdk": "^17.3.10",

From c6f984b4cb27603871ec933ed184da3f1db30d1d Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 29 Aug 2024 21:10:10 +0300
Subject: [PATCH 0396/1286] package.json: add overrides for conflicts

Add overrides for conflicting peer dependencies. In yarn these were
handled less noisily, but in npm we need to add explicit overrides
for each. This allows us to use `npm install` without forcing or
using `--legacy-peer-deps`.
---
 package-lock.json | 192 ++++++++++++++--------------------------------
 package.json      |  40 ++++++++++
 2 files changed, 97 insertions(+), 135 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5db5d11f08..fc8ecc27ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1534,7 +1534,6 @@
       "version": "17.3.11",
       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz",
       "integrity": "sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "7.23.9",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -1562,7 +1561,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
       "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
-      "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -1591,14 +1589,12 @@
     "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1606,8 +1602,7 @@
     "node_modules/@angular/compiler-cli/node_modules/reflect-metadata": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
-      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==",
-      "dev": true
+      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
     },
     "node_modules/@angular/core": {
       "version": "17.3.11",
@@ -1826,7 +1821,6 @@
       "version": "7.24.0",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
       "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
-      "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -1855,14 +1849,12 @@
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -4626,7 +4618,6 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -4641,7 +4632,6 @@
       "version": "4.11.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
       "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -4650,7 +4640,6 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -4673,7 +4662,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4689,7 +4677,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4699,7 +4686,6 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -4713,14 +4699,12 @@
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4732,7 +4716,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4744,7 +4727,6 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
       "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -4770,7 +4752,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
         "debug": "^4.3.1",
@@ -4784,7 +4765,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4794,7 +4774,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4806,7 +4785,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -4819,8 +4797,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
+      "deprecated": "Use @eslint/object-schema instead"
     },
     "node_modules/@iiif/vocabulary": {
       "version": "1.0.26",
@@ -5109,6 +5086,12 @@
         }
       }
     },
+    "node_modules/@material-ui/core/node_modules/popper.js": {
+      "version": "1.16.1-lts",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
+      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==",
+      "license": "MIT"
+    },
     "node_modules/@material-ui/icons": {
       "version": "4.11.3",
       "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz",
@@ -6696,11 +6679,13 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "18.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+      "version": "17.0.80",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.80.tgz",
+      "integrity": "sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==",
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
+        "@types/scheduler": "^0.16",
         "csstype": "^3.0.2"
       }
     },
@@ -6743,6 +6728,12 @@
         "htmlparser2": "^8.0.0"
       }
     },
+    "node_modules/@types/scheduler": {
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
+      "license": "MIT"
+    },
     "node_modules/@types/semver": {
       "version": "7.5.8",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
@@ -7367,8 +7358,7 @@
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
@@ -7668,7 +7658,6 @@
       "version": "8.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7700,7 +7689,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -8971,7 +8959,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9541,8 +9528,7 @@
     "node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "node_modules/cookie": {
       "version": "0.4.1",
@@ -9907,7 +9893,6 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -10441,8 +10426,7 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -10692,7 +10676,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -10983,7 +10966,6 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
       "optional": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
@@ -10993,7 +10975,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
       "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -11382,7 +11363,6 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -11929,7 +11909,6 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -11941,7 +11920,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -11957,7 +11935,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11972,7 +11949,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11982,7 +11958,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11998,7 +11973,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12009,14 +11983,12 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12028,7 +12000,6 @@
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -12044,7 +12015,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -12060,7 +12030,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -12072,7 +12041,6 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -12087,7 +12055,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12095,14 +12062,12 @@
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -12117,7 +12082,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12129,7 +12093,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -12144,7 +12107,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12156,7 +12118,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12168,7 +12129,6 @@
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -12198,7 +12158,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -12229,7 +12188,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12618,8 +12576,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -12644,14 +12601,12 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-printf": {
       "version": "1.6.9",
@@ -12721,7 +12676,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -12862,7 +12816,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -12875,8 +12828,7 @@
     "node_modules/flatted": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
@@ -13023,8 +12975,7 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/fscreen": {
       "version": "1.2.0",
@@ -13177,7 +13128,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13214,7 +13164,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13224,7 +13173,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13320,8 +13268,7 @@
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
@@ -13747,7 +13694,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
       "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
-      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -13801,7 +13747,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -13817,7 +13762,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -13857,7 +13801,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -13882,7 +13825,6 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -14258,7 +14200,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14923,6 +14864,13 @@
         "jiti": "bin/jiti.js"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/js-cookie": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
@@ -14973,8 +14921,7 @@
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "3.0.2",
@@ -15000,8 +14947,7 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -15594,7 +15540,6 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -15761,7 +15706,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -15946,8 +15890,7 @@
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -16870,8 +16813,7 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/needle": {
       "version": "3.3.1",
@@ -16972,7 +16914,6 @@
       "version": "14.2.4",
       "resolved": "https://registry.npmjs.org/ngx-mask/-/ngx-mask-14.2.4.tgz",
       "integrity": "sha512-158nAe2tyiZa2T8COoI6SvJCQHqpJ4+JW0amGcvVEYUBF6FIoYK66BlnOJURAOy5qry0d0N45w7J/LGsCBgZcg==",
-      "dev": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -17797,7 +17738,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -17873,7 +17813,6 @@
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -18005,7 +17944,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -18292,7 +18230,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -18394,7 +18331,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18403,7 +18339,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18412,7 +18347,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18630,9 +18564,16 @@
       }
     },
     "node_modules/popper.js": {
-      "version": "1.16.1-lts",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
-      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
     },
     "node_modules/portscanner": {
       "version": "2.2.0",
@@ -19490,7 +19431,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -19776,7 +19716,6 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -19899,7 +19838,6 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -20565,7 +20503,6 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -21025,7 +20962,6 @@
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -21073,7 +21009,6 @@
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -21093,7 +21028,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -21376,7 +21310,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -21388,7 +21321,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -22085,7 +22017,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -22351,8 +22282,7 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "node_modules/throttle-debounce": {
       "version": "2.3.0",
@@ -22633,7 +22563,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -22747,7 +22676,6 @@
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
       "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
-      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -22957,7 +22885,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -22966,7 +22893,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -24133,7 +24059,6 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -24239,8 +24164,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
       "version": "8.17.1",
@@ -24291,8 +24215,7 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/yaml": {
       "version": "1.10.2",
@@ -24351,7 +24274,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
diff --git a/package.json b/package.json
index b98cc21d2a..4112a8cf57 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,46 @@
     "https": false
   },
   "private": true,
+  "overrides": {
+    "@kolkov/ngx-gallery": {
+        "@angular/animations": "^17.3.11",
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11"
+    },
+    "@ng-bootstrap/ng-bootstrap": {
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11",
+        "@angular/forms": "^17.3.11",
+        "@angular/localize": "17.3.11"
+    },
+    "@ng-dynamic-forms/core": {
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11",
+        "@angular/forms": "^17.3.11"
+    },
+    "@ng-dynamic-forms/ui-ng-bootstrap": {
+        "ngx-mask": "14.2.4"
+    },
+    "@ngtools/webpack": {
+        "@angular/compiler-cli": "^17.3.11",
+        "typescript": "~5.3.3"
+    },
+    "@nicky-lenaers/ngx-scroll-to": {
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11"
+    },
+    "eslint-plugin-unused-imports": {
+        "@typescript-eslint/eslint-plugin": "^7.2.0"
+    },
+    "ng2-file-upload": {
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11"
+    },
+    "ngx-infinite-scroll": {
+        "@angular/common": "^17.3.11",
+        "@angular/core": "^17.3.11"
+    }
+  },
   "dependencies": {
     "@angular/animations": "^17.3.11",
     "@angular/cdk": "^17.3.10",

From da1789aece9ff1c67f76ea624eb9008e9309e3cc Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 4 Sep 2024 09:01:08 +0300
Subject: [PATCH 0397/1286] .github/workflows/build.yml: use npm

Use npm instead of yarn in GitHub Actions.
---
 .github/workflows/build.yml | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f2a84ce8a..b26f5a7c06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,39 +69,39 @@ jobs:
           fi
           google-chrome --version
 
-      # https://github.com/actions/cache/blob/main/examples.md#node---yarn
-      - name: Get Yarn cache directory
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - name: Cache Yarn dependencies
+      # https://github.com/actions/cache/blob/main/examples.md#node---npm
+      - name: Get NPM cache directory
+        id: npm-cache-dir
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Cache NPM dependencies
         uses: actions/cache@v4
         with:
-          # Cache entire Yarn cache directory (see previous step)
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          # Cache key is hash of yarn.lock. Therefore changes to yarn.lock will invalidate cache
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-
+          # Cache entire NPM cache directory (see previous step)
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          # Cache key is hash of package-lock.json. Therefore changes to package-lock.json will invalidate cache
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-npm-
 
-      - name: Install Yarn dependencies
-        run: yarn install --frozen-lockfile
+      - name: Install NPM dependencies
+        run: npm clean-install
 
       - name: Build lint plugins
-        run: yarn run build:lint
+        run: npm run build:lint
 
       - name: Run lint plugin tests
-        run: yarn run test:lint:nobuild
+        run: npm run test:lint:nobuild
 
       - name: Run lint
-        run: yarn run lint:nobuild --quiet
+        run: npm run lint:nobuild -- --quiet
 
       - name: Check for circular dependencies
-        run: yarn run check-circ-deps
+        run: npm run check-circ-deps
 
       - name: Run build
-        run: yarn run build:prod
+        run: npm run build:prod
 
       - name: Run specs (unit tests)
-        run: yarn run test:headless
+        run: npm run test:headless
 
       # Upload code coverage report to artifact (for one version of Node only),
       # so that it can be shared with the 'codecov' job (see below)
@@ -131,7 +131,7 @@ jobs:
           # Run tests in Chrome, headless mode (default)
           browser: chrome
           # Start app before running tests (will be stopped automatically after tests finish)
-          start: yarn run serve:ssr
+          start: npm run serve:ssr
           # Wait for backend & frontend to be available
           # NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
           wait-on: http://127.0.0.1:8080/server/api/core/sites, http://127.0.0.1:4000
@@ -167,7 +167,7 @@ jobs:
       # Start up the app with SSR enabled (run in background)
       - name: Start app in SSR (server-side rendering) mode
         run: |
-          nohup yarn run serve:ssr &
+          nohup npm run serve:ssr &
           printf 'Waiting for app to start'
           until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
             printf '.'

From e29a6a3c0a702b45ce30c16a8803359b62183e71 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 4 Sep 2024 09:43:48 +0300
Subject: [PATCH 0398/1286] lint/src/util: fix TS2314

Fix error in lint:

> lint/src/util/structure.ts:16:20 - error TS2314: Generic type 'RuleMetaData<MessageIds, Options>' requires 2 type argument(s).
>
> 16 export type Meta = RuleMetaData<string>;
---
 lint/src/util/structure.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lint/src/util/structure.ts b/lint/src/util/structure.ts
index 13b2ef322b..2e3aebd9ab 100644
--- a/lint/src/util/structure.ts
+++ b/lint/src/util/structure.ts
@@ -13,7 +13,7 @@ import {
 } from '@typescript-eslint/utils/ts-eslint';
 import { EnumType } from 'typescript';
 
-export type Meta = RuleMetaData<string>;
+export type Meta = RuleMetaData<string, unknown[]>;
 export type Valid = ValidTestCase<unknown[]>;
 export type Invalid = InvalidTestCase<string, unknown[]>;
 

From f3619ff4d868670af34195063ca42c3383a1368b Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 09:03:52 +0300
Subject: [PATCH 0399/1286] Use eslint-plugin-unused-imports v3.x.x

Fix lint error. According to the docs we should be using v3.x.x:

> * Version 3.x.x is for eslint 8 with @typescript-eslint/eslint-plugin 6 - 7
> * Version 2.x.x is for eslint 8 with @typescript-eslint/eslint-plugin 5

See: https://www.npmjs.com/package/eslint-plugin-unused-imports
---
 package-lock.json | 13 +++++++------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc8ecc27ee..44f044bb35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -133,7 +133,7 @@
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
-        "eslint-plugin-unused-imports": "^2.0.0",
+        "eslint-plugin-unused-imports": "^3.2.0",
         "express-static-gzip": "^2.1.7",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
@@ -11860,10 +11860,11 @@
       }
     },
     "node_modules/eslint-plugin-unused-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz",
-      "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz",
+      "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "eslint-rule-composer": "^0.3.0"
       },
@@ -11871,8 +11872,8 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "eslint": "^8.0.0"
+        "@typescript-eslint/eslint-plugin": "6 - 7",
+        "eslint": "8"
       },
       "peerDependenciesMeta": {
         "@typescript-eslint/eslint-plugin": {
diff --git a/package.json b/package.json
index 4112a8cf57..af2628d50c 100644
--- a/package.json
+++ b/package.json
@@ -220,7 +220,7 @@
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-plugin-unused-imports": "^3.2.0",
     "express-static-gzip": "^2.1.7",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",

From 10df0ac366852037dcd371426e12a491102f819f Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 10:22:52 +0300
Subject: [PATCH 0400/1286] Use npm instead of yarn in Dockerfile

There is a minor difference in syntax when starting the application
with `npm run serve`. We use `--` to make sure npm doesn't try to
parse the `--host 0.0.0.0` as an option, allowing it instead to be
read by Angular CLI (ng).

Also, there is no direct npm equivalent to yarn's --network-timeout
option so I will remove it. If we need something similar later we
might be able to use these config options:

    npm config set fetch-retry-mintimeout 300000
    npm config set fetch-retry-maxtimeout 300000
---
 Dockerfile      | 6 ++----
 Dockerfile.dist | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8fac7495e1..cd29d762f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,7 @@ WORKDIR /app
 ADD . /app/
 EXPOSE 4000
 
-# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
-# See, for example https://github.com/yarnpkg/yarn/issues/5540
-RUN yarn install --network-timeout 300000
+RUN npm install
 
 # When running in dev mode, 4GB of memory is required to build & launch the app.
 # This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
@@ -25,4 +23,4 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
 ENV NODE_ENV development
-CMD yarn serve --host 0.0.0.0
+CMD npm run serve -- --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 4c47b0cb40..cb6e1bbd30 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -11,11 +11,11 @@ FROM node:18-alpine AS build
 RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
 
 WORKDIR /app
-COPY package.json yarn.lock ./
-RUN yarn install --network-timeout 300000
+COPY package.json package-lock.json ./
+RUN npm install
 
 ADD . /app/
-RUN yarn build:prod
+RUN npm run build:prod
 
 FROM node:18-alpine
 RUN npm install --global pm2

From fbf2aee48f4b76029ce716b30098d15d98f6c187 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 11:19:55 +0300
Subject: [PATCH 0401/1286] package.json: fix @angular/localize version pin

This was the only Angular package not using a "^" to specify the
semver range.
---
 package-lock.json | 2 +-
 package.json      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 44f044bb35..e917cd4d3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@angular/compiler": "^17.3.11",
         "@angular/core": "^17.3.11",
         "@angular/forms": "^17.3.11",
-        "@angular/localize": "17.3.11",
+        "@angular/localize": "^17.3.11",
         "@angular/platform-browser": "^17.3.11",
         "@angular/platform-browser-dynamic": "^17.3.11",
         "@angular/platform-server": "^17.3.11",
diff --git a/package.json b/package.json
index af2628d50c..a0584678fb 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "@angular/common": "^17.3.11",
         "@angular/core": "^17.3.11",
         "@angular/forms": "^17.3.11",
-        "@angular/localize": "17.3.11"
+        "@angular/localize": "^17.3.11"
     },
     "@ng-dynamic-forms/core": {
         "@angular/common": "^17.3.11",
@@ -102,7 +102,7 @@
     "@angular/compiler": "^17.3.11",
     "@angular/core": "^17.3.11",
     "@angular/forms": "^17.3.11",
-    "@angular/localize": "17.3.11",
+    "@angular/localize": "^17.3.11",
     "@angular/platform-browser": "^17.3.11",
     "@angular/platform-browser-dynamic": "^17.3.11",
     "@angular/platform-server": "^17.3.11",

From 3894c87ba263b2cceac6484c5b74aed7154f6e6a Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 12:08:20 +0300
Subject: [PATCH 0402/1286] .dockerignore: remove package-lock.json

We need this now that we are using npm instead of yarn.
---
 .dockerignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 3b81744d2d..f035984d15 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -25,4 +25,3 @@ npm-debug.log.*
 
 # Webpack files
 webpack.records.json
-package-lock.json

From d11e4170fd619978e7e3499bfb4650731bd97620 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 12:46:28 +0300
Subject: [PATCH 0403/1286] .github/pull_request_template.md: use npm

Use npm instead of yarn.
---
 .github/pull_request_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 873c5467fd..14bd09f5e3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -21,8 +21,8 @@ However, reviewers may request that you complete any actions in this list if you
 
 - [ ] My PR is **created against the `main` branch** of code (unless it is a backport or is fixing an issue specific to an older branch).
 - [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
-- [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `yarn lint`
-- [ ] My PR **doesn't introduce circular dependencies** (verified via `yarn check-circ-deps`)
+- [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `npm run lint`
+- [ ] My PR **doesn't introduce circular dependencies** (verified via `npm run check-circ-deps`)
 - [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
 - [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
 - [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)** if it makes changes to the user interface.

From 576aece31db1d38a49e4e4f8c7eaccd369bd9576 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 5 Sep 2024 13:11:10 +0300
Subject: [PATCH 0404/1286] README.md: use npm

Use npm instead of yarn. Mostly a search and replace, minus some
changes in terminology, for example "yarn add" vs "npm install".
---
 README.md | 84 +++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index ebc24f8b91..f2d1cc046d 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x`**
 
 ```bash
 # clone the repo
@@ -45,10 +45,10 @@ git clone https://github.com/DSpace/dspace-angular.git
 cd dspace-angular
 
 # install the local dependencies
-yarn install
+npm install
 
 # start the server
-yarn start
+npm start
 ```
 
 Then go to [http://localhost:4000](http://localhost:4000) in your browser
@@ -77,7 +77,7 @@ Table of Contents
 -	[Recommended Editors/IDEs](#recommended-editorsides)
 -	[Collaborating](#collaborating)
 -	[File Structure](#file-structure)
--	[Managing Dependencies (via yarn)](#managing-dependencies-via-yarn)
+-	[Managing Dependencies (via npm)](#managing-dependencies-via-npm)
 -	[Frequently asked questions](#frequently-asked-questions)
 -	[License](#license)
 
@@ -89,15 +89,15 @@ You can find more information on the technologies used in this project (Angular.
 Requirements
 ------------
 
--	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.x`
+-	[Node.js](https://nodejs.org)
+-	Ensure you're running node `v16.x` or `v18.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 
 Installing
 ----------
 
--	`yarn install` to install the local dependencies
+-	`npm install` to install the local dependencies
 
 ### Configuring
 
@@ -202,7 +202,7 @@ import { environment } from '../environment.ts';
 Running the app
 ---------------
 
-After you have installed all dependencies you can now run the app. Run `yarn run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
+After you have installed all dependencies you can now run the app. Run `npm run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
 
 ### Running in production mode
 
@@ -211,20 +211,20 @@ When building for production we're using Ahead of Time (AoT) compilation. With A
 To build the app for production and start the server (in one command) run:
 
 ```bash
-yarn start
+npm start
 ```
 This will run the application in an instance of the Express server, which is included.
 
 If you only want to build for production, without starting, run:
 
 ```bash
-yarn run build:prod
+npm run build:prod
 ```
 This will build the application and put the result in the `dist` folder.  You can copy this folder to wherever you need it for your application server.  If you will be using the built-in Express server, you'll also need a copy of the `node_modules` folder tucked inside your copy of `dist`.
 
 After building the app for production, it can be started by running:
 ```bash
-yarn run serve:ssr
+npm run serve:ssr
 ```
 
 ### Running the application with Docker
@@ -238,14 +238,14 @@ Cleaning
 --------
 
 ```bash
-# clean everything, including node_modules. You'll need to run yarn install again afterwards.
-yarn run clean
+# clean everything, including node_modules. You'll need to run npm install again afterwards.
+npm run clean
 
 # clean files generated by the production build (.ngfactory files, css files, etc)
-yarn run clean:prod
+npm run clean:prod
 
 # cleans the distribution directory
-yarn run clean:dist
+npm run clean:dist
 ```
 
 
@@ -259,9 +259,9 @@ If you would like to contribute by testing a Pull Request (PR), here's how to do
 1. Pull down the branch that the Pull Request was built from.  Easy instructions for doing so can be found on the Pull Request itself.
 	* Next to the "Merge" button, you'll see a link that says "command line instructions".
 	* Click it, and follow "Step 1" of those instructions to checkout the pull down the PR branch.
-2. `yarn run clean`  (This resets your local dependencies to ensure you are up-to-date with this PR)
-3. `yarn install` (Updates your local dependencies to those in the PR)
-4. `yarn start` (Rebuilds the project, and deploys to localhost:4000, by default)
+2. `npm run clean`  (This resets your local dependencies to ensure you are up-to-date with this PR)
+3. `npm install` (Updates your local dependencies to those in the PR)
+4. `npm start` (Rebuilds the project, and deploys to localhost:4000, by default)
 5. At this point, the code from the PR will be deployed to http://localhost:4000.  Test it out, and ensure that it does what is described in the PR (or fixes the bug described in the ticket linked to the PR).
 
 Once you have tested the Pull Request, please add a comment and/or approval to the PR to let us know whether you found it to be successful (or not). Thanks!
@@ -271,13 +271,13 @@ Once you have tested the Pull Request, please add a comment and/or approval to t
 
 Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/).
 
-You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`.
+You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `npm run coverage`.
 
 The default browser is Google Chrome.
 
 Place your tests in the same location of the application source code files that they test, e.g. ending with `*.component.spec.ts`
 
-and run: `yarn test`
+and run: `npm test`
 
 If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging
 
@@ -330,9 +330,9 @@ All E2E tests must be created under the `./cypress/integration/` folder, and mus
 * In the [Cypress Test Runner](https://docs.cypress.io/guides/core-concepts/test-runner), you'll Cypress automatically visit the page.  This first test will succeed, as all you are doing is making sure the _page exists_.
 * From here, you can use the [Selector Playground](https://docs.cypress.io/guides/core-concepts/test-runner#Selector-Playground) in the Cypress Test Runner window to determine how to tell Cypress to interact with a specific HTML element on that page.
     * Most commands start by telling Cypress to [get()](https://docs.cypress.io/api/commands/get) a specific element, using a CSS or jQuery style selector
-      * It's generally best not to rely on attributes like `class` and `id` in tests, as those are likely to change later on. Instead, you can add a `data-test` attribute to makes it clear that it's required for a test. 
+      * It's generally best not to rely on attributes like `class` and `id` in tests, as those are likely to change later on. Instead, you can add a `data-test` attribute to makes it clear that it's required for a test.
     * Cypress can then do actions like [click()](https://docs.cypress.io/api/commands/click) an element, or [type()](https://docs.cypress.io/api/commands/type) text in an input field, etc.
-      * When running with server-side rendering enabled, the client first receives HTML without the JS; only once the page is rendered client-side do some elements (e.g. a button that toggles a Bootstrap dropdown) become fully interactive. This can trip up Cypress in some cases as it may try to `click` or `type` in an element that's not fully loaded yet, causing tests to fail. 
+      * When running with server-side rendering enabled, the client first receives HTML without the JS; only once the page is rendered client-side do some elements (e.g. a button that toggles a Bootstrap dropdown) become fully interactive. This can trip up Cypress in some cases as it may try to `click` or `type` in an element that's not fully loaded yet, causing tests to fail.
       * To work around this issue, define the attributes you use for Cypress selectors as `[attr.data-test]="'button' | ngBrowserOnly"`. This will only show the attribute in CSR HTML, forcing Cypress to wait until CSR is complete before interacting with the element.
     * Cypress can also validate that something occurs, using [should()](https://docs.cypress.io/api/commands/should) assertions.
 * Any time you save your test file, the Cypress Test Runner will reload & rerun it. This allows you can see your results quickly as you write the tests & correct any broken tests rapidly.
@@ -357,14 +357,14 @@ Some UI specific configuration documentation is also found in the [`./docs`](doc
 
 To build the code documentation we use [TYPEDOC](http://typedoc.org). TYPEDOC is a documentation generator for TypeScript projects. It extracts information from properly formatted comments that can be written within the code files. Follow the instructions [here](http://typedoc.org/guides/doccomments/) to know how to make those comments.
 
-Run:`yarn run docs` to produce the documentation that will be available in the 'doc' folder.
+Run:`npm run docs` to produce the documentation that will be available in the 'doc' folder.
 
 Other commands
 --------------
 
 There are many more commands in the `scripts` section of `package.json`. Most of these are executed by one of the commands mentioned above.
 
-A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `yarn run start` the `prestart` script will run first, then the `start` script will trigger.
+A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `npm run start` the `prestart` script will run first, then the `start` script will trigger.
 
 Recommended Editors/IDEs
 ------------------------
@@ -456,6 +456,7 @@ dspace-angular
 ├── LICENSES_THIRD_PARTY                                *
 ├── nodemon.json                                        * Nodemon (https://nodemon.io/) configuration
 ├── package.json                                        * This file describes the npm package for this project, its dependencies, scripts, etc.
+├── package-lock.json                                   * npm lockfile (https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json)
 ├── postcss.config.js                                   * PostCSS (http://postcss.org/) configuration
 ├── README.md                                           * This document
 ├── SECURITY.md                                         *
@@ -466,30 +467,29 @@ dspace-angular
 ├── tsconfig.spec.json                                  * TypeScript config for tests
 ├── tsconfig.ts-node.json                               * TypeScript config for using ts-node directly
 ├── tslint.json                                         * TSLint (https://palantir.github.io/tslint/) configuration
-├── typedoc.json                                        * TYPEDOC configuration
-└── yarn.lock                                           * Yarn lockfile (https://yarnpkg.com/en/docs/yarn-lock)
+└── typedoc.json                                        * TYPEDOC configuration
 ```
 
-Managing Dependencies (via yarn)
+Managing Dependencies (via npm)
 -------------
 
-This project makes use of [`yarn`](https://yarnpkg.com/en/) to ensure that the exact same dependency versions are used every time you install it.
+This project makes use of [`npm`](https://docs.npmjs.com/about-npm) to ensure that the exact same dependency versions are used every time you install it.
 
-* `yarn` creates a [`yarn.lock`](https://yarnpkg.com/en/docs/yarn-lock) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via yarn.
-* **Adding new dependencies**: To install/add a new dependency (third party library), use [`yarn add`](https://yarnpkg.com/en/docs/cli/add). For example: `yarn add some-lib`.
-    * If you are adding a new build tool dependency (to `devDependencies`), use `yarn add some-lib --dev`
-* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`yarn upgrade`](https://yarnpkg.com/en/docs/cli/upgrade).  For example: `yarn upgrade some-lib` or `yarn upgrade some-lib@version`
-* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`yarn remove`](https://yarnpkg.com/en/docs/cli/remove) to remove it.
+* `npm` creates a [`package-lock.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via npm.
+* **Adding new dependencies**: To install/add a new dependency (third party library), use [`npm install`](https://docs.npmjs.com/cli/v10/commands/npm-install). For example: `npm install some-lib`.
+    * If you are adding a new build tool dependency (to `devDependencies`), use `npm install some-lib --save--dev`
+* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`npm update`](https://docs.npmjs.com/cli/v10/commands/npm-update).  For example: `npm update some-lib` or `npm update some-lib@version`
+* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`npm uninstall`](https://docs.npmjs.com/cli/v10/commands/npm-uninstall) to remove it.
 
-As you can see above, using `yarn` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `yarn` to keep dependencies updated / in sync.*
+As you can see above, using `npm` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `npm` to keep dependencies updated / in sync.*
 
 ### Adding Typings for libraries
 
-If the library does not include typings, you can install them using yarn:
+If the library does not include typings, you can install them using npm:
 
 ```bash
-yarn add d3
-yarn add @types/d3 --dev
+npm install d3
+npm install @types/d3 --save-dev
 ```
 
 If the library doesn't have typings available at `@types/`, you can still use it by manually adding typings for it:
@@ -528,12 +528,12 @@ Frequently asked questions
 	-	See [the official angular style guide](https://angular.io/styleguide)
 -	Why is the size of my app larger in development?
 	-	The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
--	node-pre-gyp ERR in yarn install (Windows)
+-	node-pre-gyp ERR in npm install (Windows)
 	-	install Python x86 version between 2.5 and 3.0 on windows. See [this issue](https://github.com/AngularClass/angular2-webpack-starter/issues/626)
--	How do I handle merge conflicts in yarn.lock?
-	-	first check out the yarn.lock file from the branch you're merging in to yours: e.g. `git checkout --theirs yarn.lock`
-	-	now run `yarn install` again. Yarn will create a new lockfile that contains both sets of changes.
-	-	then run `git add yarn.lock` to stage the lockfile for commit
+-	How do I handle merge conflicts in package-lock.json?
+	-	first check out the package-lock.json file from the branch you're merging in to yours: e.g. `git checkout --theirs package-lock.json`
+	-	now run `npm install` again. NPM will create a new lockfile that contains both sets of changes.
+	-	then run `git add package-lock.json` to stage the lockfile for commit
 	-	and `git commit` to conclude the merge
 
 Getting Help

From f00eae67602c3b1d12c5f8fcf43db774a7a70e11 Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Thu, 5 Sep 2024 09:35:55 -0300
Subject: [PATCH 0405/1286] Code refactoring - Accessibility on the new user
 registration and forgotten password forms

---
 .../register-email-form/register-email-form.component.html | 4 ++--
 src/assets/i18n/en.json5                                   | 4 +++-
 src/assets/i18n/es.json5                                   | 7 +++++--
 src/assets/i18n/pt-BR.json5                                | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 740018392c..8fd17157d7 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -15,9 +15,9 @@
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
-                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
                            aria-describedby="email-errors-required email-error-not-valid"
-                           [attr.aria-invalid]="form.get('email')?.invalid"/>
+                           [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
                     <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 020b4d7616..78e17f8d74 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6740,5 +6740,7 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
-  "register-email.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Enter your e-mail address",
+
+  "forgot-email.form.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 0306c5a9bb..25dfb54ca2 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8152,8 +8152,11 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 6f4f94d464..9ebdc5fbbf 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10250,6 +10250,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Digite seu e-mail",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Digite seu e-mail",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Digite seu e-mail",
 }

From c74c178533d8ffd2c4cca926896b703e10af00b8 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 5 Sep 2024 10:50:13 +0200
Subject: [PATCH 0406/1286] 117287: Removed method calls returning observables
 from the metadata registry

---
 .../metadata-registry.component.html          |   4 +-
 .../metadata-registry.component.spec.ts       |  42 ++---
 .../metadata-registry.component.ts            | 128 +++++++---------
 .../metadata-schema-form.component.html       |   2 +-
 .../metadata-schema-form.component.spec.ts    |  37 ++---
 .../metadata-schema-form.component.ts         | 145 +++++++++---------
 .../shared/testing/registry.service.stub.ts   | 107 +++++++++++++
 7 files changed, 268 insertions(+), 197 deletions(-)
 create mode 100644 src/app/shared/testing/registry.service.stub.ts

diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 35bffad185..0f9df119c7 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -27,11 +27,11 @@
                         </thead>
                         <tbody>
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                            [ngClass]="{'table-primary' : isActive(schema) | async}">
+                            [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
                             <td>
                                 <label class="mb-0">
                                     <input type="checkbox"
-                                           [checked]="isSelected(schema) | async"
+                                           [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
                                            (change)="selectMetadataSchema(schema, $event)"
                                     >
                                 </label>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 944288a7a5..d69d14aacf 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -1,7 +1,6 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
@@ -15,18 +14,21 @@ import { HostWindowService } from '../../../shared/host-window.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RegistryServiceStub } from '../../../shared/testing/registry.service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
-  let registryService: RegistryService;
-  let paginationService;
-  const mockSchemasList = [
+
+  let paginationService: PaginationServiceStub;
+  let registryService: RegistryServiceStub;
+
+  const mockSchemasList: MetadataSchema[] = [
     {
       id: 1,
       _links: {
@@ -47,32 +49,18 @@ describe('MetadataRegistryComponent', () => {
       prefix: 'mock',
       namespace: 'http://dspace.org/mockschema'
     }
-  ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getMetadataSchemas: () => mockSchemas,
-    getActiveMetadataSchema: () => observableOf(undefined),
-    getSelectedMetadataSchemas: () => observableOf([]),
-    editMetadataSchema: (schema) => {
-    },
-    cancelEditMetadataSchema: () => {
-    },
-    deleteMetadataSchema: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataSchema: () => {
-    },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-
-  paginationService = new PaginationServiceStub();
+  ] as MetadataSchema[];
 
   beforeEach(waitForAsync(() => {
+    paginationService = new PaginationServiceStub();
+    registryService = new RegistryServiceStub();
+    spyOn(registryService, 'getMetadataSchemas').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(mockSchemasList)));
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataRegistryComponent, PaginationComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
+        { provide: RegistryService, useValue: registryService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
@@ -123,7 +111,7 @@ describe('MetadataRegistryComponent', () => {
     }));
 
     it('should cancel editing the selected schema when clicked again', waitForAsync(() => {
-      spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0] as MetadataSchema));
+      comp.activeMetadataSchema$ = observableOf(mockSchemasList[0] as MetadataSchema);
       spyOn(registryService, 'cancelEditMetadataSchema');
       row.click();
       fixture.detectChanges();
@@ -138,7 +126,7 @@ describe('MetadataRegistryComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataSchema').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataSchemas').and.returnValue(observableOf(selectedSchemas as MetadataSchema[]));
+      comp.selectedMetadataSchemaIDs$ = observableOf(selectedSchemas.map((selectedSchema: MetadataSchema) => selectedSchema.id));
       comp.deleteSchemas();
       fixture.detectChanges();
     });
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 857034604e..dbeb2b4f52 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,13 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
+import { BehaviorSubject, Observable, zip, Subscription } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { filter, map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
@@ -24,13 +22,23 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
  * A component used for managing all existing metadata schemas within the repository.
  * The admin can create, edit or delete metadata schemas here.
  */
-export class MetadataRegistryComponent {
+export class MetadataRegistryComponent implements OnDestroy, OnInit {
 
   /**
    * A list of all the current metadata schemas within the repository
    */
   metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
 
+  /**
+   * The {@link MetadataSchema}that is being edited
+   */
+  activeMetadataSchema$: Observable<MetadataSchema>;
+
+  /**
+   * The selected {@link MetadataSchema} IDs
+   */
+  selectedMetadataSchemaIDs$: Observable<number[]>;
+
   /**
    * Pagination config used to display the list of metadata schemas
    */
@@ -40,15 +48,25 @@ export class MetadataRegistryComponent {
   });
 
   /**
-   * Whether or not the list of MetadataSchemas needs an update
+   * Whether the list of MetadataSchemas needs an update
    */
   needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
-  constructor(private registryService: RegistryService,
-              private notificationsService: NotificationsService,
-              private router: Router,
-              private paginationService: PaginationService,
-              private translateService: TranslateService) {
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected notificationsService: NotificationsService,
+    protected paginationService: PaginationService,
+    protected translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.activeMetadataSchema$ = this.registryService.getActiveMetadataSchema();
+    this.selectedMetadataSchemaIDs$ = this.registryService.getSelectedMetadataSchemas().pipe(
+      map((schemas: MetadataSchema[]) => schemas.map((schema: MetadataSchema) => schema.id)),
+    );
     this.updateSchemas();
   }
 
@@ -77,30 +95,13 @@ export class MetadataRegistryComponent {
    * @param schema
    */
   editSchema(schema: MetadataSchema) {
-    this.getActiveSchema().pipe(take(1)).subscribe((activeSchema) => {
+    this.subscriptions.push(this.activeMetadataSchema$.pipe(take(1)).subscribe((activeSchema: MetadataSchema) => {
       if (schema === activeSchema) {
         this.registryService.cancelEditMetadataSchema();
       } else {
         this.registryService.editMetadataSchema(schema);
       }
-    });
-  }
-
-  /**
-   * Checks whether the given metadata schema is active (being edited)
-   * @param schema
-   */
-  isActive(schema: MetadataSchema): Observable<boolean> {
-    return this.getActiveSchema().pipe(
-      map((activeSchema) => schema === activeSchema)
-    );
-  }
-
-  /**
-   * Gets the active metadata schema (being edited)
-   */
-  getActiveSchema(): Observable<MetadataSchema> {
-    return this.registryService.getActiveMetadataSchema();
+    }));
   }
 
   /**
@@ -114,42 +115,25 @@ export class MetadataRegistryComponent {
       this.registryService.deselectMetadataSchema(schema);
   }
 
-  /**
-   * Checks whether a given metadata schema is selected in the list (checkbox)
-   * @param schema
-   */
-  isSelected(schema: MetadataSchema): Observable<boolean> {
-    return this.registryService.getSelectedMetadataSchemas().pipe(
-      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
-    );
-  }
-
   /**
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
-    this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
-      (schemas) => {
-        const tasks$ = [];
-        for (const schema of schemas) {
-          if (hasValue(schema.id)) {
-            tasks$.push(this.registryService.deleteMetadataSchema(schema.id).pipe(getFirstCompletedRemoteData()));
-          }
-        }
-        zip(...tasks$).subscribe((responses: RemoteData<NoContent>[]) => {
-          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-          if (successResponses.length > 0) {
-            this.showNotification(true, successResponses.length);
-          }
-          if (failedResponses.length > 0) {
-            this.showNotification(false, failedResponses.length);
-          }
-          this.registryService.deselectAllMetadataSchema();
-          this.registryService.cancelEditMetadataSchema();
-        });
+    this.subscriptions.push(this.selectedMetadataSchemaIDs$.pipe(
+      take(1),
+      switchMap((schemaIDs: number[]) => zip(schemaIDs.map((schemaID: number) => this.registryService.deleteMetadataSchema(schemaID).pipe(getFirstCompletedRemoteData())))),
+    ).subscribe((responses: RemoteData<NoContent>[]) => {
+      const successResponses: RemoteData<NoContent>[] = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+      const failedResponses: RemoteData<NoContent>[] = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+      if (successResponses.length > 0) {
+        this.showNotification(true, successResponses.length);
       }
-    );
+      if (failedResponses.length > 0) {
+        this.showNotification(false, failedResponses.length);
+      }
+      this.registryService.deselectAllMetadataSchema();
+      this.registryService.cancelEditMetadataSchema();
+    }));
   }
 
   /**
@@ -160,20 +144,20 @@ export class MetadataRegistryComponent {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
-      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.deleted.${suffix}`, {amount: amount})
-    );
-    messages.subscribe(([head, content]) => {
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+
+    const head: string = this.translateService.instant(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`);
+    const content: string = this.translateService.instant(`${prefix}.deleted.${suffix}`, {amount: amount});
+
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index a4a4613565..521fb06a6e 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
+<div *ngIf="activeMetadataSchema$ | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
     <h4>{{messagePrefix + '.create' | translate}}</h4>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index b758767ddb..442a06dc67 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -10,41 +10,26 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { of as observableOf } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
 
 describe('MetadataSchemaFormComponent', () => {
   let component: MetadataSchemaFormComponent;
   let fixture: ComponentFixture<MetadataSchemaFormComponent>;
-  let registryService: RegistryService;
 
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getActiveMetadataSchema: () => observableOf(undefined),
-    createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {
-    },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
-  };
-  const formBuilderServiceStub = {
-    createFormGroup: () => {
-      return {
-        patchValue: () => {
-        },
-        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
-        },
-      };
-    }
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  let registryService: RegistryServiceStub;
 
   beforeEach(waitForAsync(() => {
+    registryService = new RegistryServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: RegistryService, useValue: registryService },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -75,7 +60,7 @@ describe('MetadataSchemaFormComponent', () => {
 
     describe('without an active schema', () => {
       beforeEach(() => {
-        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(undefined));
+        component.activeMetadataSchema$ = observableOf(undefined);
         component.onSubmit();
         fixture.detectChanges();
       });
@@ -94,7 +79,7 @@ describe('MetadataSchemaFormComponent', () => {
       } as MetadataSchema);
 
       beforeEach(() => {
-        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(expectedWithId));
+        component.activeMetadataSchema$ = observableOf(expectedWithId);
         component.onSubmit();
         fixture.detectChanges();
       });
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 1992289ff7..78680f6d9a 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -8,10 +8,10 @@ import {
 import { UntypedFormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { take } from 'rxjs/operators';
+import { take, switchMap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { Subscription, Observable } from 'rxjs';
 
 @Component({
   selector: 'ds-metadata-schema-form',
@@ -73,64 +73,71 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(public registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
+  /**
+   * The {@link MetadataSchema} that is currently being edited
+   */
+  activeMetadataSchema$: Observable<MetadataSchema>;
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected formBuilderService: FormBuilderService,
+    protected translateService: TranslateService,
+  ) {
   }
 
   ngOnInit() {
-    combineLatest([
-      this.translateService.get(`${this.messagePrefix}.name`),
-      this.translateService.get(`${this.messagePrefix}.namespace`)
-    ]).subscribe(([name, namespace]) => {
-      this.name = new DynamicInputModel({
-          id: 'name',
-          label: name,
-          name: 'name',
-          validators: {
-            required: null,
-            pattern: '^[^. ,]*$',
-            maxLength: 32,
-          },
-          required: true,
-          errorMessages: {
-            pattern: 'error.validation.metadata.name.invalid-pattern',
-            maxLength: 'error.validation.metadata.name.max-length',
-          },
-        });
-      this.namespace = new DynamicInputModel({
-          id: 'namespace',
-          label: namespace,
-          name: 'namespace',
-          validators: {
-            required: null,
-            maxLength: 256,
-          },
-          required: true,
-          errorMessages: {
-            maxLength: 'error.validation.metadata.namespace.max-length',
-          },
-        });
-      this.formModel = [
-        new DynamicFormGroupModel(
-          {
-            id: 'metadatadataschemagroup',
-            group:[this.namespace, this.name]
-          })
-      ];
-      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataSchema().subscribe((schema: MetadataSchema) => {
-        if (schema == null) {
-          this.clearFields();
-        } else {
-          this.formGroup.patchValue({
-            metadatadataschemagroup: {
-              name: schema.prefix,
-              namespace: schema.namespace,
-            },
-          });
-          this.name.disabled = true;
-        }
+    this.name = new DynamicInputModel({
+        id: 'name',
+        label: this.translateService.instant(`${this.messagePrefix}.name`),
+        name: 'name',
+        validators: {
+          required: null,
+          pattern: '^[^. ,]*$',
+          maxLength: 32,
+        },
+        required: true,
+        errorMessages: {
+          pattern: 'error.validation.metadata.name.invalid-pattern',
+          maxLength: 'error.validation.metadata.name.max-length',
+        },
       });
-    });
+    this.namespace = new DynamicInputModel({
+        id: 'namespace',
+        label: this.translateService.instant(`${this.messagePrefix}.namespace`),
+        name: 'namespace',
+        validators: {
+          required: null,
+          maxLength: 256,
+        },
+        required: true,
+        errorMessages: {
+          maxLength: 'error.validation.metadata.namespace.max-length',
+        },
+      });
+    this.formModel = [
+      new DynamicFormGroupModel(
+        {
+          id: 'metadatadataschemagroup',
+          group:[this.namespace, this.name]
+        })
+    ];
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.activeMetadataSchema$ = this.registryService.getActiveMetadataSchema();
+    this.subscriptions.push(this.activeMetadataSchema$.subscribe((schema: MetadataSchema) => {
+      if (schema == null) {
+        this.clearFields();
+      } else {
+        this.formGroup.patchValue({
+          metadatadataschemagroup: {
+            name: schema.prefix,
+            namespace: schema.namespace,
+          },
+        });
+        this.name.disabled = true;
+      }
+    }));
   }
 
   /**
@@ -148,29 +155,28 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   onSubmit(): void {
     this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
-      (schema: MetadataSchema) => {
+    this.subscriptions.push(this.activeMetadataSchema$.pipe(
+      take(1),
+      switchMap((schema: MetadataSchema) => {
         const values = {
           prefix: this.name.value,
           namespace: this.namespace.value
         };
         if (schema == null) {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            this.submitForm.emit(newSchema);
-          });
+          return this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values));
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
+          return this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
             id: schema.id,
             prefix: schema.prefix,
             namespace: values.namespace,
-          })).subscribe((updatedSchema: MetadataSchema) => {
-            this.submitForm.emit(updatedSchema);
-          });
+          }));
         }
-        this.clearFields();
-        this.registryService.cancelEditMetadataSchema();
-      }
-    );
+      }),
+    ).subscribe((schema: MetadataSchema) => {
+      this.clearFields();
+      this.registryService.cancelEditMetadataSchema();
+      this.submitForm.emit(schema);
+    }));
   }
 
   /**
@@ -186,5 +192,6 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    */
   ngOnDestroy(): void {
     this.onCancel();
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
   }
 }
diff --git a/src/app/shared/testing/registry.service.stub.ts b/src/app/shared/testing/registry.service.stub.ts
new file mode 100644
index 0000000000..de5e4f933f
--- /dev/null
+++ b/src/app/shared/testing/registry.service.stub.ts
@@ -0,0 +1,107 @@
+/* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { MetadataSchema } from '../../core/metadata/metadata-schema.model';
+import { Observable, of as observableOf } from 'rxjs';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { createPaginatedList } from './utils.test';
+import { MetadataField } from '../../core/metadata/metadata-field.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+
+/**
+ * Stub class of {@link RegistryService}
+ */
+export class RegistryServiceStub {
+
+  getMetadataSchemas(_options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+  getMetadataSchemaByPrefix(_prefix: string, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<MetadataSchema>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  getMetadataFieldsBySchema(_schema: MetadataSchema, _options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataField>[]): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+  editMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  cancelEditMetadataSchema(): void {
+  }
+
+  getActiveMetadataSchema(): Observable<MetadataSchema> {
+    return observableOf(undefined);
+  }
+
+  selectMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  deselectMetadataSchema(_schema: MetadataSchema): void {
+  }
+
+  deselectAllMetadataSchema(): void {
+  }
+
+  getSelectedMetadataSchemas(): Observable<MetadataSchema[]> {
+    return observableOf([]);
+  }
+
+  editMetadataField(_field: MetadataField): void {
+  }
+
+  cancelEditMetadataField(): void {
+  }
+
+  getActiveMetadataField(): Observable<MetadataField> {
+    return observableOf(undefined);
+  }
+
+  selectMetadataField(_field: MetadataField): void {
+  }
+
+  deselectMetadataField(_field: MetadataField): void {
+  }
+
+  deselectAllMetadataField(): void {
+  }
+
+  getSelectedMetadataFields(): Observable<MetadataField[]> {
+    return observableOf([]);
+  }
+
+  createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+    return observableOf(schema);
+  }
+
+  deleteMetadataSchema(_id: number): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  clearMetadataSchemaRequests(): Observable<string> {
+    return observableOf('');
+  }
+
+  createMetadataField(_field: MetadataField, _schema: MetadataSchema): Observable<MetadataField> {
+    return observableOf(undefined);
+  }
+
+  updateMetadataField(_field: MetadataField): Observable<MetadataField> {
+    return observableOf(undefined);
+  }
+
+  deleteMetadataField(_id: number): Observable<RemoteData<NoContent>> {
+    return createSuccessfulRemoteDataObject$(undefined);
+  }
+
+  clearMetadataFieldRequests(): void {
+  }
+
+  queryMetadataFields(_query: string, _options: FindListOptions = {}, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<MetadataField>[]): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return createSuccessfulRemoteDataObject$(createPaginatedList());
+  }
+
+}

From f03ed89687e12fa849e73b336e95fb2ab2996033 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 5 Sep 2024 11:49:18 +0200
Subject: [PATCH 0407/1286] 117287: Removed method calls returning observables
 from the metadata schema registry

---
 .../metadata-field-form.component.spec.ts     |  38 ++---
 .../metadata-schema.component.html            |   4 +-
 .../metadata-schema.component.spec.ts         |  65 ++++----
 .../metadata-schema.component.ts              | 139 +++++++-----------
 .../shared/testing/registry.service.stub.ts   |   8 +-
 5 files changed, 95 insertions(+), 159 deletions(-)

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index ad7b54945d..7ae672f9e1 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -9,14 +9,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RegistryServiceStub } from '../../../../shared/testing/registry.service.stub';
 
 describe('MetadataFieldFormComponent', () => {
   let component: MetadataFieldFormComponent;
   let fixture: ComponentFixture<MetadataFieldFormComponent>;
-  let registryService: RegistryService;
+
+  let registryService: RegistryServiceStub;
 
   const metadataSchema = Object.assign(new MetadataSchema(), {
     id: 1,
@@ -24,38 +27,17 @@ describe('MetadataFieldFormComponent', () => {
     prefix: 'fake'
   });
 
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getActiveMetadataField: () => observableOf(undefined),
-    createMetadataField: (field: MetadataField) => observableOf(field),
-    updateMetadataField: (field: MetadataField) => observableOf(field),
-    cancelEditMetadataField: () => {
-    },
-    cancelEditMetadataSchema: () => {
-    },
-    clearMetadataFieldRequests: () => observableOf(undefined)
-  };
-  const formBuilderServiceStub = {
-    createFormGroup: () => {
-      return {
-        patchValue: () => {
-        },
-        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
-        },
-      };
-    }
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-
   beforeEach(waitForAsync(() => {
+    registryService = new RegistryServiceStub();
+
     return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataFieldFormComponent, EnumKeysPipe],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: RegistryService, useValue: registryService },
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 557741df80..6d895d187b 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -32,11 +32,11 @@
               </thead>
               <tbody>
               <tr *ngFor="let field of fields?.page"
-                  [ngClass]="{'table-primary' : isActive(field) | async}">
+                  [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
                 <td>
                   <label class="mb-0">
                     <input type="checkbox"
-                           [checked]="isSelected(field) | async"
+                           [checked]="(selectedMetadataFieldIDs$ | async)?.includes(field.id)"
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index 2b660a6363..ce4987a02c 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -4,7 +4,7 @@ import { of as observableOf } from 'rxjs';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { By } from '@angular/platform-browser';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -12,25 +12,28 @@ import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RegistryServiceStub } from '../../../shared/testing/registry.service.stub';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
   let fixture: ComponentFixture<MetadataSchemaComponent>;
-  let registryService: RegistryService;
-  const mockSchemasList = [
+
+  let registryService: RegistryServiceStub;
+  let activatedRoute: ActivatedRouteStub;
+  let paginationService: PaginationServiceStub;
+
+  const mockSchemasList: MetadataSchema[] = [
     {
       id: 1,
       _links: {
@@ -51,8 +54,8 @@ describe('MetadataSchemaComponent', () => {
       prefix: 'mock',
       namespace: 'http://dspace.org/mockschema'
     }
-  ];
-  const mockFieldsList = [
+  ] as MetadataSchema[];
+  const mockFieldsList: MetadataField[] = [
     {
       id: 1,
       _links: {
@@ -101,47 +104,29 @@ describe('MetadataSchemaComponent', () => {
       scopeNote: null,
       schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
     }
-  ];
-  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-  const registryServiceStub = {
-    getMetadataSchemas: () => mockSchemas,
-    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))),
-    getMetadataSchemaByPrefix: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
-    getActiveMetadataField: () => observableOf(undefined),
-    getSelectedMetadataFields: () => observableOf([]),
-    editMetadataField: (schema) => {
-    },
-    cancelEditMetadataField: () => {
-    },
-    deleteMetadataField: () => observableOf(new RestResponse(true, 200, 'OK')),
-    deselectAllMetadataField: () => {
-    },
-    clearMetadataFieldRequests: () => observableOf(undefined)
-  };
-  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  ] as MetadataField[];
   const schemaNameParam = 'mock';
-  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({
-      schemaName: schemaNameParam
-    })
-  });
-
-  const paginationService = new PaginationServiceStub();
 
   beforeEach(waitForAsync(() => {
+    activatedRoute = new ActivatedRouteStub({
+      schemaName: schemaNameParam,
+    });
+    paginationService = new PaginationServiceStub();
+    registryService = new RegistryServiceStub();
+    spyOn(registryService, 'getMetadataFieldsBySchema').and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))));
+    spyOn(registryService, 'getMetadataSchemaByPrefix').and.callFake((schemaName) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]));
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
-        { provide: RegistryService, useValue: registryServiceStub },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: RegistryService, useValue: registryService },
+        { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: Router, useValue: new RouterStub() },
         { provide: PaginationService, useValue: paginationService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -190,7 +175,7 @@ describe('MetadataSchemaComponent', () => {
     }));
 
     it('should cancel editing the selected field when clicked again', waitForAsync(() => {
-      spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2] as MetadataField));
+      comp.activeField$ = observableOf(mockFieldsList[2] as MetadataField);
       spyOn(registryService, 'cancelEditMetadataField');
       row.click();
       fixture.detectChanges();
@@ -205,7 +190,7 @@ describe('MetadataSchemaComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataField').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataFields').and.returnValue(observableOf(selectedFields as MetadataField[]));
+      comp.selectedMetadataFieldIDs$ = observableOf(selectedFields.map((metadataField: MetadataField) => metadataField.id));
       comp.deleteFields();
       fixture.detectChanges();
     });
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index d0827e6e4d..1a5fd15ccd 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,19 +1,18 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import {
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
   combineLatest,
   Observable,
   of as observableOf,
-  zip
+  zip,
+  Subscription,
 } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
@@ -32,7 +31,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
  * A component used for managing all existing metadata fields within the current metadata schema.
  * The admin can create, edit or delete metadata fields here.
  */
-export class MetadataSchemaComponent implements OnInit {
+export class MetadataSchemaComponent implements OnDestroy, OnInit {
   /**
    * The metadata schema
    */
@@ -57,27 +56,33 @@ export class MetadataSchemaComponent implements OnInit {
    */
   needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
-  constructor(private registryService: RegistryService,
-              private route: ActivatedRoute,
-              private notificationsService: NotificationsService,
-              private router: Router,
-              private paginationService: PaginationService,
-              private translateService: TranslateService) {
+  /**
+   * The current {@link MetadataField} that is being edited
+   */
+  activeField$: Observable<MetadataField>;
 
+  /**
+   * The selected {@link MetadataField} IDs
+   */
+  selectedMetadataFieldIDs$: Observable<number[]>;
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected registryService: RegistryService,
+    protected route: ActivatedRoute,
+    protected notificationsService: NotificationsService,
+    protected paginationService: PaginationService,
+    protected translateService: TranslateService,
+  ) {
   }
 
   ngOnInit(): void {
-    this.route.params.subscribe((params) => {
-      this.initialize(params);
-    });
-  }
-
-  /**
-   * Initialize the component using the params within the url (schemaName)
-   * @param params
-   */
-  initialize(params) {
-    this.metadataSchema$ = this.registryService.getMetadataSchemaByPrefix(params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
+    this.metadataSchema$ = this.registryService.getMetadataSchemaByPrefix(this.route.snapshot.params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
+    this.activeField$ = this.registryService.getActiveMetadataField();
+    this.selectedMetadataFieldIDs$ = this.registryService.getSelectedMetadataFields().pipe(
+      map((metadataFields: MetadataField[]) => metadataFields.map((metadataField: MetadataField) => metadataField.id)),
+    );
     this.updateFields();
   }
 
@@ -86,7 +91,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   private updateFields() {
     this.metadataFields$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
-      switchMap((currentPagination) => combineLatest(this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination))),
+      switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination)])),
       switchMap(([schema, update, currentPagination]: [MetadataSchema, boolean, PaginationComponentOptions]) => {
         if (update) {
           this.needsUpdate$.next(false);
@@ -110,30 +115,13 @@ export class MetadataSchemaComponent implements OnInit {
    * @param field
    */
   editField(field: MetadataField) {
-    this.getActiveField().pipe(take(1)).subscribe((activeField) => {
+    this.subscriptions.push(this.activeField$.pipe(take(1)).subscribe((activeField) => {
       if (field === activeField) {
         this.registryService.cancelEditMetadataField();
       } else {
         this.registryService.editMetadataField(field);
       }
-    });
-  }
-
-  /**
-   * Checks whether the given metadata field is active (being edited)
-   * @param field
-   */
-  isActive(field: MetadataField): Observable<boolean> {
-    return this.getActiveField().pipe(
-      map((activeField) => field === activeField)
-    );
-  }
-
-  /**
-   * Gets the active metadata field (being edited)
-   */
-  getActiveField(): Observable<MetadataField> {
-    return this.registryService.getActiveMetadataField();
+    }));
   }
 
   /**
@@ -147,42 +135,25 @@ export class MetadataSchemaComponent implements OnInit {
       this.registryService.deselectMetadataField(field);
   }
 
-  /**
-   * Checks whether a given metadata field is selected in the list (checkbox)
-   * @param field
-   */
-  isSelected(field: MetadataField): Observable<boolean> {
-    return this.registryService.getSelectedMetadataFields().pipe(
-      map((fields) => fields.find((selectedField) => selectedField === field) != null)
-    );
-  }
-
   /**
    * Delete all the selected metadata fields
    */
   deleteFields() {
-    this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
-      (fields) => {
-        const tasks$ = [];
-        for (const field of fields) {
-          if (hasValue(field.id)) {
-            tasks$.push(this.registryService.deleteMetadataField(field.id).pipe(getFirstCompletedRemoteData()));
-          }
-        }
-        zip(...tasks$).subscribe((responses: RemoteData<NoContent>[]) => {
-          const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
-          const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
-          if (successResponses.length > 0) {
-            this.showNotification(true, successResponses.length);
-          }
-          if (failedResponses.length > 0) {
-            this.showNotification(false, failedResponses.length);
-          }
-          this.registryService.deselectAllMetadataField();
-          this.registryService.cancelEditMetadataField();
-        });
+    this.subscriptions.push(this.selectedMetadataFieldIDs$.pipe(
+      take(1),
+      switchMap((fieldIDs) => zip(fieldIDs.map((fieldID) => this.registryService.deleteMetadataField(fieldID).pipe(getFirstCompletedRemoteData())))),
+    ).subscribe((responses: RemoteData<NoContent>[]) => {
+      const successResponses = responses.filter((response: RemoteData<NoContent>) => response.hasSucceeded);
+      const failedResponses = responses.filter((response: RemoteData<NoContent>) => response.hasFailed);
+      if (successResponses.length > 0) {
+        this.showNotification(true, successResponses.length);
       }
-    );
+      if (failedResponses.length > 0) {
+        this.showNotification(false, failedResponses.length);
+      }
+      this.registryService.deselectAllMetadataField();
+      this.registryService.cancelEditMetadataField();
+    }));
   }
 
   /**
@@ -193,20 +164,18 @@ export class MetadataSchemaComponent implements OnInit {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
-      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
-    );
-    messages.subscribe(([head, content]) => {
-      if (success) {
-        this.notificationsService.success(head, content);
-      } else {
-        this.notificationsService.error(head, content);
-      }
-    });
+    const head = this.translateService.instant(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`);
+    const content = this.translateService.instant(`${prefix}.field.deleted.${suffix}`, { amount: amount });
+    if (success) {
+      this.notificationsService.success(head, content);
+    } else {
+      this.notificationsService.error(head, content);
+    }
   }
+
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
   }
 
 }
diff --git a/src/app/shared/testing/registry.service.stub.ts b/src/app/shared/testing/registry.service.stub.ts
index de5e4f933f..b52f32af4e 100644
--- a/src/app/shared/testing/registry.service.stub.ts
+++ b/src/app/shared/testing/registry.service.stub.ts
@@ -85,12 +85,12 @@ export class RegistryServiceStub {
     return observableOf('');
   }
 
-  createMetadataField(_field: MetadataField, _schema: MetadataSchema): Observable<MetadataField> {
-    return observableOf(undefined);
+  createMetadataField(field: MetadataField, _schema: MetadataSchema): Observable<MetadataField> {
+    return observableOf(field);
   }
 
-  updateMetadataField(_field: MetadataField): Observable<MetadataField> {
-    return observableOf(undefined);
+  updateMetadataField(field: MetadataField): Observable<MetadataField> {
+    return observableOf(field);
   }
 
   deleteMetadataField(_id: number): Observable<RemoteData<NoContent>> {

From 9d98d1a9aade9b2c6bbf039a1176470f4702cbe6 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 6 May 2024 16:19:03 -0700
Subject: [PATCH 0408/1286] Updated browser init to update cache after external
 auth.

(cherry picked from commit 4a236906eb6f487a9a475d70b808698dadb145f9)
---
 src/modules/app/browser-init.service.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 014a8f5daa..8cd869e15f 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -32,9 +32,11 @@ import { AppState } from '../../app/app.reducer';
 import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { AuthService } from '../../app/core/auth/auth.service';
 import { coreSelector } from '../../app/core/core.selectors';
+import { RequestService } from '../../app/core/data/request.service';
 import { RootDataService } from '../../app/core/data/root-data.service';
 import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
+import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
 import { KlaroService } from '../../app/shared/cookies/klaro.service';
@@ -81,6 +83,9 @@ export class BrowserInitService extends InitService {
     protected menuService: MenuService,
     private rootDataService: RootDataService,
     protected router: Router,
+    private requestService: RequestService,
+    private halService: HALEndpointService,
+
   ) {
     super(
       store,
@@ -169,17 +174,15 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * During an external authentication flow invalidate the SSR transferState
+   * During an external authentication flow invalidate the
    * data in the cache. This allows the app to fetch fresh content.
    * @private
    */
   private externalAuthCheck() {
-
     this.sub = this.authService.isExternalAuthentication().pipe(
       filter((externalAuth: boolean) => externalAuth),
     ).subscribe(() => {
-      // Clear the transferState data.
-      this.rootDataService.invalidateRootCache();
+      this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
       this.authService.setExternalAuthStatus(false);
     },
     );

From 98d9f639f7b8a99094cbf3a9a4b2dd25eaf7b96c Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 6 May 2024 16:19:03 -0700
Subject: [PATCH 0409/1286] Updated browser init to update cache after external
 auth.

---
 src/modules/app/browser-init.service.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index bf40f0c68b..3704892e6e 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -30,9 +30,11 @@ import { filter, find, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../app/shared/empty.util';
 import { logStartupMessage } from '../../../startup-message';
 import { MenuService } from '../../app/shared/menu/menu.service';
+import { RequestService } from '../../app/core/data/request.service';
 import { RootDataService } from '../../app/core/data/root-data.service';
 import { firstValueFrom, Subscription } from 'rxjs';
 import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
+import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
 
 /**
  * Performs client-side initialization.
@@ -59,6 +61,8 @@ export class BrowserInitService extends InitService {
     protected menuService: MenuService,
     private rootDataService: RootDataService,
     protected serverCheckGuard: ServerCheckGuard,
+    private requestService: RequestService,
+    private halService: HALEndpointService,
   ) {
     super(
       store,
@@ -145,17 +149,15 @@ export class BrowserInitService extends InitService {
   }
 
   /**
-   * During an external authentication flow invalidate the SSR transferState
+   * During an external authentication flow invalidate the
    * data in the cache. This allows the app to fetch fresh content.
    * @private
    */
   private externalAuthCheck() {
-
     this.sub = this.authService.isExternalAuthentication().pipe(
         filter((externalAuth: boolean) => externalAuth)
       ).subscribe(() => {
-        // Clear the transferState data.
-        this.rootDataService.invalidateRootCache();
+        this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
         this.authService.setExternalAuthStatus(false);
       }
     );

From 4d5910981ab239f36b174a2724aeb5ba6a846fa6 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Fri, 6 Sep 2024 17:10:09 +0200
Subject: [PATCH 0410/1286] [DURACOM-296] Enabled 'admin-div' only for Site
 Administrator

---
 ...e-community-parent-selector.component.html |  3 ++-
 ...ommunity-parent-selector.component.spec.ts | 24 ++++++++++++++++++-
 ...ate-community-parent-selector.component.ts | 16 +++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 8ae146b42c..a8ec02239d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -5,6 +5,7 @@
         </button>
     </div>
     <div class="modal-body">
+      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
         <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
@@ -12,7 +13,7 @@
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
         </div>
-
+      </div>
         <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index cfef8a6d68..04922d4deb 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -7,13 +7,16 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import {
   ActivatedRoute,
   Router,
 } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
@@ -38,7 +41,9 @@ describe('CreateCommunityParentSelectorComponent', () => {
   const communityRD = createSuccessfulRemoteDataObject(community);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   const createPath = '/communities/create';
-
+  const mockAuthorizationDataService = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true),
+  });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CreateCommunityParentSelectorComponent],
@@ -59,6 +64,7 @@ describe('CreateCommunityParentSelectorComponent', () => {
         {
           provide: Router, useValue: router,
         },
+        { provide: AuthorizationDataService, useValue: mockAuthorizationDataService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -85,4 +91,20 @@ describe('CreateCommunityParentSelectorComponent', () => {
     expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } });
   });
 
+  it('should show the div when user is an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(true);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeTruthy();
+  })));
+
+  it('should hide the div when user is not an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(false);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeFalsy();
+  })));
+
 });
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 6b1e51dbf5..d4e9b31245 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   OnInit,
@@ -9,6 +13,7 @@ import {
 } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
 import { environment } from '../../../../../environments/environment';
 import {
@@ -19,6 +24,8 @@ import {
   SortDirection,
   SortOptions,
 } from '../../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { hasValue } from '../../../empty.util';
@@ -40,18 +47,23 @@ import {
   styleUrls: ['./create-community-parent-selector.component.scss'],
   templateUrl: './create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  isAdmin$: Observable<boolean>;
 
-  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
+  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, protected authorizationService: AuthorizationDataService) {
     super(activeModal, route);
   }
 
+  ngOnInit() {
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+  }
+
   /**
    * Navigate to the community create page
    */

From 202e765b43cfc3d91e39ed4d50afad66dd3f1bd4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 12:33:26 -0500
Subject: [PATCH 0411/1286] Add yarn.lock to .dockerignore

---
 .dockerignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index f035984d15..9ba3d848a3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -25,3 +25,6 @@ npm-debug.log.*
 
 # Webpack files
 webpack.records.json
+
+# Yarn no longer used
+yarn.lock

From 8144d1bb9e6a391a25f8ac3e19e4913151984eed Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 12:35:52 -0500
Subject: [PATCH 0412/1286] Add yarn.lock to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index e873eeb1e8..7af424c50f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,8 @@ webpack.records.json
 
 morgan.log
 
+# Yarn no longer used
+yarn.lock
 yarn-error.log
 
 *.css

From a7377194685bf046c50ae5eb0b961b7a6c43ccb1 Mon Sep 17 00:00:00 2001
From: Emmanuel Pastor <pastor1212@gmail.com>
Date: Mon, 8 Jul 2024 18:22:22 +0200
Subject: [PATCH 0413/1286] Remove unused react dependencies

---
 package-lock.json |  4 ----
 package.json      | 44 ++++++++++++++++++++------------------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e917cd4d3d..a765c1fc32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,8 +23,6 @@
         "@angular/ssr": "^17.3.8",
         "@babel/runtime": "7.21.0",
         "@kolkov/ngx-gallery": "^2.0.1",
-        "@material-ui/core": "^4.11.0",
-        "@material-ui/icons": "^4.11.3",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
         "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
@@ -76,8 +74,6 @@
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
         "pem": "1.14.7",
-        "prop-types": "^15.8.1",
-        "react-copy-to-clipboard": "^5.1.0",
         "reflect-metadata": "^0.1.13",
         "rxjs": "^7.8.0",
         "sanitize-html": "^2.12.1",
diff --git a/package.json b/package.json
index a0584678fb..d528c9188b 100644
--- a/package.json
+++ b/package.json
@@ -57,42 +57,42 @@
   "private": true,
   "overrides": {
     "@kolkov/ngx-gallery": {
-        "@angular/animations": "^17.3.11",
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11"
+      "@angular/animations": "^17.3.11",
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11"
     },
     "@ng-bootstrap/ng-bootstrap": {
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11",
-        "@angular/forms": "^17.3.11",
-        "@angular/localize": "^17.3.11"
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11",
+      "@angular/forms": "^17.3.11",
+      "@angular/localize": "^17.3.11"
     },
     "@ng-dynamic-forms/core": {
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11",
-        "@angular/forms": "^17.3.11"
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11",
+      "@angular/forms": "^17.3.11"
     },
     "@ng-dynamic-forms/ui-ng-bootstrap": {
-        "ngx-mask": "14.2.4"
+      "ngx-mask": "14.2.4"
     },
     "@ngtools/webpack": {
-        "@angular/compiler-cli": "^17.3.11",
-        "typescript": "~5.3.3"
+      "@angular/compiler-cli": "^17.3.11",
+      "typescript": "~5.3.3"
     },
     "@nicky-lenaers/ngx-scroll-to": {
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11"
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11"
     },
     "eslint-plugin-unused-imports": {
-        "@typescript-eslint/eslint-plugin": "^7.2.0"
+      "@typescript-eslint/eslint-plugin": "^7.2.0"
     },
     "ng2-file-upload": {
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11"
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11"
     },
     "ngx-infinite-scroll": {
-        "@angular/common": "^17.3.11",
-        "@angular/core": "^17.3.11"
+      "@angular/common": "^17.3.11",
+      "@angular/core": "^17.3.11"
     }
   },
   "dependencies": {
@@ -110,8 +110,6 @@
     "@angular/ssr": "^17.3.8",
     "@babel/runtime": "7.21.0",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.11.3",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
@@ -163,8 +161,6 @@
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.7",
-    "prop-types": "^15.8.1",
-    "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",

From 3e0404c81797dee5cb3928f3be77c266cce3ff47 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Mon, 9 Sep 2024 08:07:28 +0300
Subject: [PATCH 0414/1286] yarn.lock: run yarn upgrade

---
 yarn.lock | 3076 ++++++++++++++++++++++++++---------------------------
 1 file changed, 1536 insertions(+), 1540 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 088a58c101..e06490123c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@2.3.0", "@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -36,20 +31,12 @@
     lodash "^4.17.15"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1703.0", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
-  version "0.1703.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.0.tgz#103b613b6ce2dcfdd76bea344e67a2a296a94b37"
-  integrity sha512-2X2cswI4TIwtQxCe5U9f4jeiDjAb8r89XLpU0QwEHyZyWx02uhYHO3FDMJq/NxCS95IUAQOBGBhbD4ey4Hl9cQ==
+"@angular-devkit/architect@0.1703.9", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
+  version "0.1703.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.9.tgz#f99d01a704407c5467841c49654f5c3ac930f143"
+  integrity sha512-kEPfTOVnzrJxPGTvaXy8653HU9Fucxttx9gVfQR1yafs+yIEGx3fKGKe89YPmaEay32bIm7ZUpxDF1FO14nkdQ==
   dependencies:
-    "@angular-devkit/core" "17.3.0"
-    rxjs "7.8.1"
-
-"@angular-devkit/architect@0.1703.8":
-  version "0.1703.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.8.tgz#2b4f26d9e32ac013931631876b4a7a6926657ad3"
-  integrity sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==
-  dependencies:
-    "@angular-devkit/core" "17.3.8"
+    "@angular-devkit/core" "17.3.9"
     rxjs "7.8.1"
 
 "@angular-devkit/architect@^0.1202.10":
@@ -60,15 +47,15 @@
     "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@^17.0.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.0.tgz#3a0d064d1afc5d786a3dfad1b99a0b756fc85e7a"
-  integrity sha512-mC70mZK/liITM4VlGL6hmYPkVsZwAb+X3TxwodBl/g8p/sYijDhK/4QJHzmcHTxLYQQS6nS5CUcr9ARQFkGN2w==
+"@angular-devkit/build-angular@^17.0.0", "@angular-devkit/build-angular@^17.3.8":
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.9.tgz#54d55052be3fcc9034a1a0659acd6dcd664cf034"
+  integrity sha512-EuAPSC4c2DSJLlL4ieviKLx1faTyY+ymWycq6KFwoxu1FgWly/dqBeWyXccYinLhPVZmoh6+A/5S4YWXlOGSnA==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.0"
-    "@angular-devkit/build-webpack" "0.1703.0"
-    "@angular-devkit/core" "17.3.0"
+    "@angular-devkit/architect" "0.1703.9"
+    "@angular-devkit/build-webpack" "0.1703.9"
+    "@angular-devkit/core" "17.3.9"
     "@babel/core" "7.24.0"
     "@babel/generator" "7.23.6"
     "@babel/helper-annotate-as-pure" "7.22.5"
@@ -79,78 +66,7 @@
     "@babel/preset-env" "7.24.0"
     "@babel/runtime" "7.24.0"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.0"
-    "@vitejs/plugin-basic-ssl" "1.1.0"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.18"
-    babel-loader "9.1.3"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "^4.21.5"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.22"
-    css-loader "6.10.0"
-    esbuild-wasm "0.20.1"
-    fast-glob "3.3.2"
-    http-proxy-middleware "2.0.6"
-    https-proxy-agent "7.0.4"
-    inquirer "9.2.15"
-    jsonc-parser "3.2.1"
-    karma-source-map-support "1.4.0"
-    less "4.2.0"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.30.8"
-    mini-css-extract-plugin "2.8.1"
-    mrmime "2.0.0"
-    open "8.4.2"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    picomatch "4.0.1"
-    piscina "4.4.0"
-    postcss "8.4.35"
-    postcss-loader "8.1.1"
-    resolve-url-loader "5.0.0"
-    rxjs "7.8.1"
-    sass "1.71.1"
-    sass-loader "14.1.1"
-    semver "7.6.0"
-    source-map-loader "5.0.0"
-    source-map-support "0.5.21"
-    terser "5.29.1"
-    tree-kill "1.2.2"
-    tslib "2.6.2"
-    undici "6.7.1"
-    vite "5.1.5"
-    watchpack "2.4.0"
-    webpack "5.94.0"
-    webpack-dev-middleware "6.1.1"
-    webpack-dev-server "4.15.1"
-    webpack-merge "5.10.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.20.1"
-
-"@angular-devkit/build-angular@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.8.tgz#a19f05909551f79b95711235b1141f83f96fd558"
-  integrity sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==
-  dependencies:
-    "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.8"
-    "@angular-devkit/build-webpack" "0.1703.8"
-    "@angular-devkit/core" "17.3.8"
-    "@babel/core" "7.24.0"
-    "@babel/generator" "7.23.6"
-    "@babel/helper-annotate-as-pure" "7.22.5"
-    "@babel/helper-split-export-declaration" "7.22.6"
-    "@babel/plugin-transform-async-generator-functions" "7.23.9"
-    "@babel/plugin-transform-async-to-generator" "7.23.3"
-    "@babel/plugin-transform-runtime" "7.24.0"
-    "@babel/preset-env" "7.24.0"
-    "@babel/runtime" "7.24.0"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.8"
+    "@ngtools/webpack" "17.3.9"
     "@vitejs/plugin-basic-ssl" "1.1.0"
     ansi-colors "4.1.3"
     autoprefixer "10.4.18"
@@ -202,20 +118,12 @@
   optionalDependencies:
     esbuild "0.20.1"
 
-"@angular-devkit/build-webpack@0.1703.0":
-  version "0.1703.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.0.tgz#1576a42e915cf22a664fff10361c96a0f9900319"
-  integrity sha512-IEaLzV5lolURJhMKM4naW6pYTDjI5E8I+97o/kbSa0yakvGOBwg7yRmfc54T1M0Z4nmifPsj4OVRGhBaa6dgXA==
+"@angular-devkit/build-webpack@0.1703.9":
+  version "0.1703.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.9.tgz#9eff5c69638d6cbb083b5c406e6dfca369e8641b"
+  integrity sha512-3b0LND39Nc+DwCQ0N7Tbsd7RAFWTeIc4VDwk/7RO8EMYTP5Kfgr/TK66nwTBypHsjmD69IMKHZZaZuiDfGfx2A==
   dependencies:
-    "@angular-devkit/architect" "0.1703.0"
-    rxjs "7.8.1"
-
-"@angular-devkit/build-webpack@0.1703.8":
-  version "0.1703.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.8.tgz#d157a5790d5045dd9c312936c3907bd3a184bbfc"
-  integrity sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==
-  dependencies:
-    "@angular-devkit/architect" "0.1703.8"
+    "@angular-devkit/architect" "0.1703.9"
     rxjs "7.8.1"
 
 "@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
@@ -230,22 +138,10 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@17.3.0", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.0.tgz#88f8a513dbf23d3248d4cc1ffadfb6324b3aa859"
-  integrity sha512-ldErhMYq8rcFOhWQ0syQdLy6IYb/LL0erigj7gCMOf59oJgM7B13o/ZTOCvyJttUZ9IP0HB98Gi3epEuJ30VLg==
-  dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.1"
-    picomatch "4.0.1"
-    rxjs "7.8.1"
-    source-map "0.7.4"
-
-"@angular-devkit/core@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.8.tgz#8679cacf84cf79764f027811020e235ab32016d2"
-  integrity sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==
+"@angular-devkit/core@17.3.9", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.9.tgz#68b72e775195f07742f84b6ebd60b241eee98a72"
+  integrity sha512-/iKyn5YT7NW5ylrg9yufUydS8byExeQ2HHIwFC4Ebwb/JYYCz+k4tBf2LdP+zXpemDpLznXTQGWia0/yJjG8Vg==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -263,12 +159,12 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.8.tgz#f853eb21682aadfb6667e090b5b509fc95ce8442"
-  integrity sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==
+"@angular-devkit/schematics@17.3.9":
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.9.tgz#0fcf22d51f49fd23eeb88620134f2cb622094b7b"
+  integrity sha512-9qg+uWywgAtaQlvbnCQv47hcL6ZuA+d9ucgZ0upZftBllZ2vp5WIthCPb2mB0uBkj84Csmtz9MsErFjOQtTj4g==
   dependencies:
-    "@angular-devkit/core" "17.3.8"
+    "@angular-devkit/core" "17.3.9"
     jsonc-parser "3.2.1"
     magic-string "0.30.8"
     ora "5.4.1"
@@ -337,9 +233,9 @@
     "@typescript-eslint/utils" "6.19.0"
 
 "@angular/animations@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.11.tgz#86e5c6a1fbf9b7e2bf5441e334db5b8b2132be2d"
-  integrity sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-17.3.12.tgz#561aa502c309034c6d19cbbfc3dafddb0422d301"
+  integrity sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==
   dependencies:
     tslib "^2.3.0"
 
@@ -353,14 +249,14 @@
     parse5 "^7.1.2"
 
 "@angular/cli@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.8.tgz#3673fd5dd4fbc96a6ed57c4e871ac5a92d5702c7"
-  integrity sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ==
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.9.tgz#cd571d288be3b3eb80acd25b54dd8a5008af417a"
+  integrity sha512-b5RGu5RO4VKZlMQDatwABAn1qocgD9u4IrGN2dvHDcrz5apTKYftUdGyG42vngyDNBCg1mWkSDQEWK4f2HfuGg==
   dependencies:
-    "@angular-devkit/architect" "0.1703.8"
-    "@angular-devkit/core" "17.3.8"
-    "@angular-devkit/schematics" "17.3.8"
-    "@schematics/angular" "17.3.8"
+    "@angular-devkit/architect" "0.1703.9"
+    "@angular-devkit/core" "17.3.9"
+    "@angular-devkit/schematics" "17.3.9"
+    "@schematics/angular" "17.3.9"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "4.1.2"
@@ -377,16 +273,16 @@
     yargs "17.7.2"
 
 "@angular/common@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.11.tgz#1698a0a93d3dab6e52da9d6600e8fba3a63a4e68"
-  integrity sha512-WG+HQjUaQziYLGdbcv2aW+G73uroN5VF9yk4qWYcolW+VB8SV/DOAol8uFVgCF21cIOl5+wfJZvA4r5oG3dYaw==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-17.3.12.tgz#49327f1d4fe5ff3ae31fadf742e258f5f9f00b48"
+  integrity sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/compiler-cli@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz#b2616d88111254790c12900d2cf424e2ac58f37e"
-  integrity sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-17.3.12.tgz#d54a65383ea56bdaf474af3ae475cc1585b11a0b"
+  integrity sha512-1F8M7nWfChzurb7obbvuE7mJXlHtY1UG58pcwcomVtpPb+kPavgAO8OEvJHYBMV+bzSxkXt5UIwL9lt9jHUxZA==
   dependencies:
     "@babel/core" "7.23.9"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -398,30 +294,30 @@
     yargs "^17.2.1"
 
 "@angular/compiler@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.11.tgz#ecf1138bbb69be4cb7a7bf88a71f4ad93128b466"
-  integrity sha512-ingRoREDPkeZGSa13DlztSjZgGArNcmsAWjj+f+vQgQekTjkfQD/N+Bix/LSt5ZdbSjHMtrkDMyRPwbNyk5Keg==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-17.3.12.tgz#c7f855deb67f05023d53358f6dcc8803c1c90efa"
+  integrity sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/core@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.11.tgz#8de94fbb986ceec7e96356a60c9edf98131ae97b"
-  integrity sha512-2wPZwXFei3kVxK2ylIH6CdGebrC4kvooFx7qoX+250OITAEFMODJGdh/e3x0DpFUjlRvQtIFQ+YpQlfC5JnL4g==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-17.3.12.tgz#d66ee14071c9f157f68907cff461f235e6eaffe1"
+  integrity sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/forms@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.11.tgz#5e37ff81964e184fbb98b1f016fe3062dd5d2571"
-  integrity sha512-719flo/1L64YOAxL3pzszTK+7bczVVOQDXT1khnjb48GVZdBUBwW2D+cFbqSW1VMuWWr2Amwy1lL4YM5S7qPJQ==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-17.3.12.tgz#09ffd2d09822bd4e0d1c2eada7d0bed959b47042"
+  integrity sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/language-service@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.3.11.tgz#0e9ee1614b443fd2ff3b4f3e99ed4b7e84cb1422"
-  integrity sha512-C93TH34vG6Un8G0C75TU0aeTppJWUUbRcnR/3I6/ZmTirjIspXEAcmUr2LssFnULTYqA0npNn8cfDtsoLeoGog==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.3.12.tgz#87a3d71e94ee7442eac046ca64be73a6a31a0027"
+  integrity sha512-MVmEXonXwdhFtIpU4q8qbXHsrAsdTjZcPPuWCU0zXVQ+VaB/y6oF7BVpmBtfyBcBCums1guEncPP+AZVvulXmQ==
 
 "@angular/localize@17.3.11":
   version "17.3.11"
@@ -434,54 +330,54 @@
     yargs "^17.2.1"
 
 "@angular/platform-browser-dynamic@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.11.tgz#d578cefbba24800e94756338a7789dbe8014b63b"
-  integrity sha512-JPA0enJyJQ5H340WQ2wfXbCCHzjBiAljEDMr/Siw/CzSe0XI8aQYDqKMLUMtRyCdYhNCEYjnBWgXBi9Za9blZg==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz#a31b5187dfff8f68a79083f5e48b502e966423f4"
+  integrity sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/platform-browser@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.11.tgz#44c4814b76c3de43496159d76e19913f8d331744"
-  integrity sha512-sWjMy8qKH6AOt5YV4OMoPhExCbGdRIPjNSwUrxCm8a8Zz5DamoX3Sib9yRk1etjBuRj+oJySSxISJim2OYXJQQ==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-17.3.12.tgz#ea03fd28b174ac33a5129f3580f606e449381ed1"
+  integrity sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/platform-server@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.11.tgz#b92c3cd6764292085d9300b85db1ac8bdde60697"
-  integrity sha512-xytV4+5gTCECUORniXBTE1lvJ3qf3IWlawmm3eZylvJMqH2W3ApZrrwLM7umL8BOU9ISEhjolbwfGXornKL+5A==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-17.3.12.tgz#e7ec48c4f0f4aeecac0689eb761107ac48c91570"
+  integrity sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==
   dependencies:
     tslib "^2.3.0"
     xhr2 "^0.2.0"
 
 "@angular/router@^17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.11.tgz#fd28e6b7f836683c571f2ed50eae6b97e6383038"
-  integrity sha512-A3aU6uHAeJfsfCw1dgNXHn2Kjw/UieRMnFwENkzz96YFCvFPCEZjy/mODuE3zHludMuqVsJhM/uUxWu8ATRTcA==
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-17.3.12.tgz#cd13de25d2b3f9df45eb9ce6bab5eb203addec69"
+  integrity sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==
   dependencies:
     tslib "^2.3.0"
 
 "@angular/ssr@^17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.8.tgz#f51b6b6ae999b0dd862bcec1d041ddd9e71a3197"
-  integrity sha512-qsCMMR7wEOlbPbqTOrcr/1hEoQjIQOGqq6stbK9J52IebTyzC+rZNzDjJcL9e39nSmvbIeCUaN1XquebQ12/pw==
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.9.tgz#69422608b9756c3e46f0489bc43433d8a90c4afe"
+  integrity sha512-AbS3tsHUVOqwC3XI4B8hQDWThfrOyv8Qhe1N9a712nJKcqmfrMO0gtvdhI//VxYz0X08/l97Yh5D61WqF7+CQw==
   dependencies:
     critters "0.0.22"
     tslib "^2.3.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5", "@babel/compat-data@^7.25.2":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
+  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
 
 "@babel/core@7.23.9":
   version "7.23.9"
@@ -504,7 +400,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/core@7.24.0", "@babel/core@^7.12.3":
+"@babel/core@7.24.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
   integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
@@ -525,7 +421,37 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@7.23.6", "@babel/generator@^7.23.6":
+"@babel/core@^7.12.3":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/eslint-parser@^7.23.10":
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz#469cee4bd18a88ff3edbdfbd227bd20e82aa9b82"
+  integrity sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==
+  dependencies:
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.1"
+
+"@babel/generator@7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
   integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
@@ -535,52 +461,68 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@7.22.5", "@babel/helper-annotate-as-pure@^7.22.5":
+"@babel/generator@^7.23.6", "@babel/generator@^7.25.0", "@babel/generator@^7.25.6":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c"
+  integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==
+  dependencies:
+    "@babel/types" "^7.25.6"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
+
+"@babel/helper-annotate-as-pure@7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
   integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"
+  integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
+  dependencies:
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.22.15":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz#fc7554141bdbfa2d17f7b4b80153b9b090e5d158"
-  integrity sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==
+"@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz#57eaf1af38be4224a9d9dd01ddde05b741f50e14"
+  integrity sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/traverse" "^7.25.4"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9"
+  integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
@@ -595,10 +537,10 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-define-polyfill-provider@^0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd"
-  integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==
+"@babel/helper-define-polyfill-provider@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
+  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -607,171 +549,163 @@
     resolve "^1.14.2"
 
 "@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+"@babel/helper-member-expression-to-functions@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6"
+  integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.8"
+    "@babel/types" "^7.24.8"
 
-"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-optimise-call-expression@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
+  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+
+"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e"
+  integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-wrap-function" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
-
-"@babel/helper-remap-async-to-generator@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
+"@babel/helper-replace-supers@^7.24.7", "@babel/helper-replace-supers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9"
+  integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/helper-replace-supers@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
-  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
+  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+"@babel/helper-validator-option@^7.23.5", "@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
 
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+"@babel/helper-wrap-function@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81"
+  integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==
   dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
+    "@babel/types" "^7.25.0"
 
-"@babel/helpers@^7.23.9", "@babel/helpers@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
-  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
+"@babel/helpers@^7.23.9", "@babel/helpers@^7.24.0", "@babel/helpers@^7.25.0":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60"
+  integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==
   dependencies:
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.6"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
-  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f"
+  integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==
+  dependencies:
+    "@babel/types" "^7.25.6"
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
-  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73"
+  integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
-  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89"
+  integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/plugin-transform-optional-chaining" "^7.24.7"
 
 "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
-  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb"
+  integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.0"
 
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
@@ -814,18 +748,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-import-assertions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
-  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz#bb918905c58711b86f9710d74a3744b6c56573b5"
+  integrity sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-syntax-import-attributes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
-  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz#6d4c78f042db0e82fd6436cd65fec5dc78ad2bde"
+  integrity sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
@@ -906,13 +840,13 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-arrow-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
-  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
+  integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-async-generator-functions@7.23.9", "@babel/plugin-transform-async-generator-functions@^7.23.9":
+"@babel/plugin-transform-async-generator-functions@7.23.9":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce"
   integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==
@@ -922,7 +856,17 @@
     "@babel/helper-remap-async-to-generator" "^7.22.20"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-async-to-generator@7.23.3", "@babel/plugin-transform-async-to-generator@^7.23.3":
+"@babel/plugin-transform-async-generator-functions@^7.23.9":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz#2afd4e639e2d055776c9f091b6c0c180ed8cf083"
+  integrity sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-remap-async-to-generator" "^7.25.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/traverse" "^7.25.4"
+
+"@babel/plugin-transform-async-to-generator@7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
   integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
@@ -931,300 +875,306 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-block-scoped-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
-  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc"
+  integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-remap-async-to-generator" "^7.24.7"
+
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"
+  integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-block-scoping@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
-  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac"
+  integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-class-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
-  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz#bae7dbfcdcc2e8667355cd1fb5eda298f05189fd"
+  integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.25.4"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-class-static-block@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
-  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d"
+  integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-transform-classes@^7.23.8":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
-  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz#d29dbb6a72d79f359952ad0b66d88518d65ef89a"
+  integrity sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/traverse" "^7.25.4"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
-  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"
+  integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/template" "^7.24.7"
 
 "@babel/plugin-transform-destructuring@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
-  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550"
+  integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-dotall-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
-  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0"
+  integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-duplicate-keys@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
-  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee"
+  integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-dynamic-import@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
-  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4"
+  integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-transform-exponentiation-operator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
-  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d"
+  integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-export-namespace-from@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
-  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197"
+  integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
 "@babel/plugin-transform-for-of@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
-  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"
+  integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
 "@babel/plugin-transform-function-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
-  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37"
+  integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.1"
 
 "@babel/plugin-transform-json-strings@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
-  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a"
+  integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
 "@babel/plugin-transform-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
-  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3"
+  integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-logical-assignment-operators@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
-  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0"
+  integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
 "@babel/plugin-transform-member-expression-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
-  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"
+  integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-modules-amd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
-  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7"
+  integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-modules-commonjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
-  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
+  integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-simple-access" "^7.24.7"
 
 "@babel/plugin-transform-modules-systemjs@^7.23.9":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
-  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33"
+  integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-transforms" "^7.25.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
 
 "@babel/plugin-transform-modules-umd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
-  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8"
+  integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923"
+  integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-new-target@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
-  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00"
+  integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
-  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120"
+  integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-transform-numeric-separator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
-  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63"
+  integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-transform-object-rest-spread@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz#7b836ad0088fdded2420ce96d4e1d3ed78b71df1"
-  integrity sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6"
+  integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-parameters" "^7.24.7"
 
 "@babel/plugin-transform-object-super@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
-  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"
+  integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
 
 "@babel/plugin-transform-optional-catch-binding@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
-  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4"
+  integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
-  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
+"@babel/plugin-transform-optional-chaining@^7.23.4", "@babel/plugin-transform-optional-chaining@^7.24.7":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d"
+  integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
-  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
+"@babel/plugin-transform-parameters@^7.23.3", "@babel/plugin-transform-parameters@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"
+  integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-private-methods@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
-  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz#9bbefbe3649f470d681997e0b64a4b254d877242"
+  integrity sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.25.4"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-private-property-in-object@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
-  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061"
+  integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-transform-property-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
-  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"
+  integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-regenerator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
-  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8"
+  integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
     regenerator-transform "^0.15.2"
 
 "@babel/plugin-transform-reserved-words@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
-  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4"
+  integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-runtime@7.24.0":
   version "7.24.0"
@@ -1239,71 +1189,71 @@
     semver "^6.3.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
-  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"
+  integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-spread@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
-  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"
+  integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
 "@babel/plugin-transform-sticky-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
-  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb"
+  integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-template-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
-  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"
+  integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-typeof-symbol@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
-  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c"
+  integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/plugin-transform-unicode-escapes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
-  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e"
+  integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-unicode-property-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
-  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd"
+  integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-unicode-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
-  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f"
+  integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-unicode-sets-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
-  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz#be664c2a0697ffacd3423595d5edef6049e8946c"
+  integrity sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
 "@babel/preset-env@7.24.0":
   version "7.24.0"
@@ -1412,45 +1362,49 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.24.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@7.24.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
   integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
-  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
+  integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    regenerator-runtime "^0.14.0"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.23.9", "@babel/traverse@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
-  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
+"@babel/template@^7.23.9", "@babel/template@^7.24.0", "@babel/template@^7.24.7", "@babel/template@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/traverse@^7.10.3", "@babel/traverse@^7.23.9", "@babel/traverse@^7.24.0", "@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.4":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41"
+  integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.6"
+    "@babel/parser" "^7.25.6"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.6"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.0", "@babel/types@^7.4.4":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+"@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.0", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.4.4":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
+  integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@colors/colors@1.5.0":
@@ -1882,9 +1836,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
+  integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
 
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
@@ -1907,9 +1861,9 @@
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@fortawesome/fontawesome-free@^6.4.0":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
-  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224"
+  integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==
 
 "@gar/promisify@^1.0.1":
   version "1.1.3"
@@ -1931,9 +1885,9 @@
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@iiif/vocabulary@^1.0.26":
   version "1.0.26"
@@ -2003,9 +1957,9 @@
     "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
@@ -2023,9 +1977,9 @@
     tslib "^2.3.0"
 
 "@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
-  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1"
+  integrity sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==
 
 "@ljharb/through@^2.3.12":
   version "2.3.13"
@@ -2138,9 +2092,9 @@
     tslib "^2.0.0"
 
 "@ngrx/effects@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-17.1.1.tgz#308942c131eae21da529c112476b0b212313c1a3"
-  integrity sha512-VDNVI70wfEwqoNliffAiMhsPry0CWKkifCLmfzr+SZEEdAaPEBr4FtRrrdcdq/ovmkcgoWukkH2MBljbCyHwtA==
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-17.2.0.tgz#37cec0b696cd7b14600f64e2ed0d9e47f5de10f1"
+  integrity sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==
   dependencies:
     "@ngrx/operators" "17.0.0-beta.0"
     tslib "^2.0.0"
@@ -2153,40 +2107,35 @@
     tslib "^2.3.0"
 
 "@ngrx/router-store@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-17.1.1.tgz#b6911082e4a8b08359b1f5f645badcfff1039dd4"
-  integrity sha512-DcCIgtaryYdSREcO9Mgc2Xup9fb9gyB98jB2hAQX2oWVSpwA/4hU6/WGU1mtHyQF0JqmiE2517JBLeqA3owSwQ==
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-17.2.0.tgz#ecee8aa884870ec3c56c09c661319d63d5c533b7"
+  integrity sha512-Vynfg2xsB57Oedf0Bb6mjC4MIeaF2OtAewsSnppGIM2b8pwL5W89r2+q2SGc2D6Mp3/pZF3HRI6NxhnHWJdYmg==
   dependencies:
     tslib "^2.0.0"
 
 "@ngrx/store-devtools@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-17.1.1.tgz#dcbb221da64282f79df696edfe1518e8b6659291"
-  integrity sha512-MCzM44wHzc0eY6FSvPQwuXn1HFst8Y4Ckq7jvlPA202nJYwMZQQJReI5KQNHfGiqe0RpZKov0FUmy6sIyOOt2A==
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-17.2.0.tgz#cb05dc997d7836a6aa8408ac9e04f3b1419fc3bc"
+  integrity sha512-ig0qr6hMexZGnrlxfHvZmu5CanRjH7hhx60XUbB5BdBvWJIIRaWKPLcsniiDUhljAD87gvzrrilbCTiML38+CA==
   dependencies:
     tslib "^2.0.0"
 
 "@ngrx/store@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-17.1.1.tgz#5e38aa2372331c0bbb6a6a73550d77c4e3cf9e1f"
-  integrity sha512-MGbKLTcl4uq2Uzx+qbMYNy6xW+JnkpRiznaGFX2/NFflq/zNZsjbxZrvn4/Z6ClVYIjj3uadjM1fupwMYMJxVA==
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-17.2.0.tgz#d1a588cd8bae18a190bb71582f07e992406a76fa"
+  integrity sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@17.3.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.0.tgz#91e6168304739350fb6f3b9877d29e4a382cadb2"
-  integrity sha512-wNTCDPPEtjP4mxYerLVLCMwOCTEOD2HqZMVXD8pJbarrGPMuoyglUZuqNSIS5KVqR+fFez6JEUnMvC3QSqf58w==
-
-"@ngtools/webpack@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.8.tgz#96c0f99055910dd21438d7697d625fdeb7261015"
-  integrity sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==
+"@ngtools/webpack@17.3.9":
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.9.tgz#cfb27add90a1bb522ecbf869b79369145d4d9e6e"
+  integrity sha512-2+NvEQuYKRWdZaJbRJWEnR48tpW0uYbhwfHBHLDI9Kazb3mb0oAwYBVXdq+TtDLBypXnMsFpCewjRHTvkVx4/A==
 
 "@ngtools/webpack@^16.2.12":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.2.12.tgz#478db8cca94a69f1708c38ad80b62d824c73f543"
-  integrity sha512-f9R9Qsk8v+ffDxryl6PQ7Wnf2JCNd4dDXOH+d/AuF06VFiwcwGDRDZpmqkAXbFxQfcWTbT1FFvfoJ+SFcJgXLA==
+  version "16.2.15"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.2.15.tgz#5c5c7b123b1e1d7e972a8d13d9ea2d6fc628b909"
+  integrity sha512-rD4IHt3nS6PdIKvmoqwIadMIGKsemBSz412kD8Deetl0TiCVhD/Tn1M00dxXzMSHSFCQcOKxdZAeD53yRwTOOA==
 
 "@ngx-translate/core@^14.0.0":
   version "14.0.0"
@@ -2202,6 +2151,13 @@
   dependencies:
     tslib "^2.3.0"
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2224,15 +2180,15 @@
     fastq "^1.6.0"
 
 "@npmcli/agent@^2.0.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.1.tgz#8aa677d0a4136d57524336a35d5679aedf2d56f7"
-  integrity sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5"
+  integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==
   dependencies:
     agent-base "^7.1.0"
     http-proxy-agent "^7.0.0"
     https-proxy-agent "^7.0.1"
     lru-cache "^10.0.1"
-    socks-proxy-agent "^8.0.1"
+    socks-proxy-agent "^8.0.3"
 
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
@@ -2243,30 +2199,31 @@
     semver "^7.3.5"
 
 "@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
+  integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
   dependencies:
     semver "^7.3.5"
 
 "@npmcli/git@^5.0.0":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.4.tgz#d18c50f99649e6e89e8b427318134f582498700c"
-  integrity sha512-nr6/WezNzuYUppzXRaYu/W4aT5rLxdXqEFupbh6e/ovlYFQ8hpu1UUPV3Ir/YTl+74iXl2ZOMlGzudh9ZPUchQ==
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.8.tgz#8ba3ff8724192d9ccb2735a2aa5380a992c5d3d1"
+  integrity sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==
   dependencies:
     "@npmcli/promise-spawn" "^7.0.0"
+    ini "^4.1.3"
     lru-cache "^10.0.1"
     npm-pick-manifest "^9.0.0"
-    proc-log "^3.0.0"
+    proc-log "^4.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^4.0.0"
 
 "@npmcli/installed-package-contents@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33"
-  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz#63048e5f6e40947a3a88dcbcb4fd9b76fdd37c17"
+  integrity sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==
   dependencies:
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
@@ -2285,25 +2242,30 @@
   integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
 
 "@npmcli/package-json@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.0.0.tgz#77d0f8b17096763ccbd8af03b7117ba6e34d6e91"
-  integrity sha512-OI2zdYBLhQ7kpNPaJxiflofYIpkNLi+lnGdzqUOfRmCF3r2l1nadcjtCYMJKv/Utm/ZtlffaUuTiAktPHbc17g==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-5.2.0.tgz#a1429d3111c10044c7efbfb0fce9f2c501f4cfad"
+  integrity sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==
   dependencies:
     "@npmcli/git" "^5.0.0"
     glob "^10.2.2"
     hosted-git-info "^7.0.0"
     json-parse-even-better-errors "^3.0.0"
     normalize-package-data "^6.0.0"
-    proc-log "^3.0.0"
+    proc-log "^4.0.0"
     semver "^7.5.3"
 
 "@npmcli/promise-spawn@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.1.tgz#a836de2f42a2245d629cf6fbb8dd6c74c74c55af"
-  integrity sha512-P4KkF9jX3y+7yFUxgcUdDtLy+t4OlDGuEBLNs57AZsfSfg+uV6MLndqGpnl4831ggaEdXwR50XFoZP4VFtHolg==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz#1d53d34ffeb5d151bfa8ec661bcccda8bbdfd532"
+  integrity sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==
   dependencies:
     which "^4.0.0"
 
+"@npmcli/redact@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/redact/-/redact-1.1.0.tgz#78e53a6a34f013543a73827a07ebdc3a6f10454b"
+  integrity sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==
+
 "@npmcli/run-script@^7.0.0":
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.4.tgz#9f29aaf4bfcf57f7de2a9e28d1ef091d14b2e6eb"
@@ -2466,78 +2428,98 @@
   resolved "https://registry.yarnpkg.com/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz#0321d2dd609aaacdb9bace8004d99c72824fb142"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@rollup/rollup-android-arm-eabi@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz#b98786c1304b4ff8db3a873180b778649b5dff2b"
-  integrity sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==
+"@rollup/rollup-android-arm-eabi@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz#0412834dc423d1ff7be4cb1fc13a86a0cd262c11"
+  integrity sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==
 
-"@rollup/rollup-android-arm64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz#8833679af11172b1bf1ab7cb3bad84df4caf0c9e"
-  integrity sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==
+"@rollup/rollup-android-arm64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz#baf1a014b13654f3b9e835388df9caf8c35389cb"
+  integrity sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==
 
-"@rollup/rollup-darwin-arm64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz#ef02d73e0a95d406e0eb4fd61a53d5d17775659b"
-  integrity sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==
+"@rollup/rollup-darwin-arm64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz#0a2c364e775acdf1172fe3327662eec7c46e55b1"
+  integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==
 
-"@rollup/rollup-darwin-x64@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz#3ce5b9bcf92b3341a5c1c58a3e6bcce0ea9e7455"
-  integrity sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==
+"@rollup/rollup-darwin-x64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz#a972db75890dfab8df0da228c28993220a468c42"
+  integrity sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz#3d3d2c018bdd8e037c6bfedd52acfff1c97e4be4"
-  integrity sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==
+"@rollup/rollup-linux-arm-gnueabihf@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz#1609d0630ef61109dd19a278353e5176d92e30a1"
+  integrity sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==
 
-"@rollup/rollup-linux-arm64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz#5fc8cc978ff396eaa136d7bfe05b5b9138064143"
-  integrity sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==
+"@rollup/rollup-linux-arm-musleabihf@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz#3c1dca5f160aa2e79e4b20ff6395eab21804f266"
+  integrity sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==
 
-"@rollup/rollup-linux-arm64-musl@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz#f2ae7d7bed416ffa26d6b948ac5772b520700eef"
-  integrity sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==
+"@rollup/rollup-linux-arm64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz#c2fe376e8b04eafb52a286668a8df7c761470ac7"
+  integrity sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==
 
-"@rollup/rollup-linux-riscv64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz#303d57a328ee9a50c85385936f31cf62306d30b6"
-  integrity sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==
+"@rollup/rollup-linux-arm64-musl@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz#e62a4235f01e0f66dbba587c087ca6db8008ec80"
+  integrity sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==
 
-"@rollup/rollup-linux-x64-gnu@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz#f672f6508f090fc73f08ba40ff76c20b57424778"
-  integrity sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==
+"@rollup/rollup-linux-powerpc64le-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz#24b3457e75ee9ae5b1c198bd39eea53222a74e54"
+  integrity sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==
 
-"@rollup/rollup-linux-x64-musl@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz#d2f34b1b157f3e7f13925bca3288192a66755a89"
-  integrity sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==
+"@rollup/rollup-linux-riscv64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz#38edfba9620fe2ca8116c97e02bd9f2d606bde09"
+  integrity sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==
 
-"@rollup/rollup-win32-arm64-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz#8ffecc980ae4d9899eb2f9c4ae471a8d58d2da6b"
-  integrity sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==
+"@rollup/rollup-linux-s390x-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz#a3bfb8bc5f1e802f8c76cff4a4be2e9f9ac36a18"
+  integrity sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==
 
-"@rollup/rollup-win32-ia32-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz#a7505884f415662e088365b9218b2b03a88fc6f2"
-  integrity sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==
+"@rollup/rollup-linux-x64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz#0dadf34be9199fcdda44b5985a086326344f30ad"
+  integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==
 
-"@rollup/rollup-win32-x64-msvc@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz#6abd79db7ff8d01a58865ba20a63cfd23d9e2a10"
-  integrity sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==
+"@rollup/rollup-linux-x64-musl@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz#7b7deddce240400eb87f2406a445061b4fed99a8"
+  integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==
 
-"@schematics/angular@17.3.8":
-  version "17.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.8.tgz#0b4adf9d05b22176b99ad8e311a274c102d74822"
-  integrity sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==
+"@rollup/rollup-win32-arm64-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz#a0ca0c5149c2cfb26fab32e6ba3f16996fbdb504"
+  integrity sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==
+
+"@rollup/rollup-win32-ia32-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz#aae2886beec3024203dbb5569db3a137bc385f8e"
+  integrity sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==
+
+"@rollup/rollup-win32-x64-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b"
+  integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==
+
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
+"@schematics/angular@17.3.9":
+  version "17.3.9"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.9.tgz#38ad60fea904592ea5d39be6581b22fb16f1baf1"
+  integrity sha512-q6N8mbcYC6cgPyjTrMH7ehULQoUUwEYN4g7uo4ylZ/PFklSLJvpSp4BuuxANgW449qHSBvQfdIoui9ayAUXQzA==
   dependencies:
-    "@angular-devkit/core" "17.3.8"
-    "@angular-devkit/schematics" "17.3.8"
+    "@angular-devkit/core" "17.3.9"
+    "@angular-devkit/schematics" "17.3.9"
     jsonc-parser "3.2.1"
 
 "@schematics/angular@^12.2.17":
@@ -2549,49 +2531,51 @@
     "@angular-devkit/schematics" "12.2.18"
     jsonc-parser "3.0.0"
 
-"@sigstore/bundle@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.2.0.tgz#e3f555a5c503fe176d8d1e0e829b00f842502e46"
-  integrity sha512-5VI58qgNs76RDrwXNhpmyN/jKpq9evV/7f1XrcqcAfvxDl5SeVY/I5Rmfe96ULAV7/FK5dge9RBKGBJPhL1WsQ==
+"@sigstore/bundle@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.3.2.tgz#ad4dbb95d665405fd4a7a02c8a073dbd01e4e95e"
+  integrity sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==
   dependencies:
-    "@sigstore/protobuf-specs" "^0.3.0"
+    "@sigstore/protobuf-specs" "^0.3.2"
 
-"@sigstore/core@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-1.0.0.tgz#0fcdb32d191d4145a70cb837061185353b3b08e3"
-  integrity sha512-dW2qjbWLRKGu6MIDUTBuJwXCnR8zivcSpf5inUzk7y84zqy/dji0/uahppoIgMoKeR+6pUZucrwHfkQQtiG9Rw==
-
-"@sigstore/protobuf-specs@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz#bdcc773671f625bb81591bca86ec5314d57297f3"
-  integrity sha512-zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA==
-
-"@sigstore/sign@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.2.3.tgz#f07bcd2cfee654fade867db44ae260f1a0142ba4"
-  integrity sha512-LqlA+ffyN02yC7RKszCdMTS6bldZnIodiox+IkT8B2f8oRYXCB3LQ9roXeiEL21m64CVH1wyveYAORfD65WoSw==
-  dependencies:
-    "@sigstore/bundle" "^2.2.0"
-    "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
-    make-fetch-happen "^13.0.0"
-
-"@sigstore/tuf@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.3.1.tgz#86ff3c3c907e271696c88de0108d9063a8cbcc45"
-  integrity sha512-9Iv40z652td/QbV0o5n/x25H9w6IYRt2pIGbTX55yFDYlApDQn/6YZomjz6+KBx69rXHLzHcbtTS586mDdFD+Q==
-  dependencies:
-    "@sigstore/protobuf-specs" "^0.3.0"
-    tuf-js "^2.2.0"
-
-"@sigstore/verify@^1.1.0":
+"@sigstore/core@^1.0.0", "@sigstore/core@^1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-1.1.0.tgz#ab617c5dc0bc09ead7f101a848f4870af2d84374"
-  integrity sha512-1fTqnqyTBWvV7cftUUFtDcHPdSox0N3Ub7C0lRyReYx4zZUlNTZjCV+HPy4Lre+r45dV7Qx5JLKvqqsgxuyYfg==
+  resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-1.1.0.tgz#5583d8f7ffe599fa0a89f2bf289301a5af262380"
+  integrity sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==
+
+"@sigstore/protobuf-specs@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz#5becf88e494a920f548d0163e2978f81b44b7d6f"
+  integrity sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==
+
+"@sigstore/sign@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.3.2.tgz#d3d01e56d03af96fd5c3a9b9897516b1233fc1c4"
+  integrity sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==
   dependencies:
-    "@sigstore/bundle" "^2.2.0"
+    "@sigstore/bundle" "^2.3.2"
     "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
+    "@sigstore/protobuf-specs" "^0.3.2"
+    make-fetch-happen "^13.0.1"
+    proc-log "^4.2.0"
+    promise-retry "^2.0.1"
+
+"@sigstore/tuf@^2.3.4":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.3.4.tgz#da1d2a20144f3b87c0172920cbc8dcc7851ca27c"
+  integrity sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.3.2"
+    tuf-js "^2.2.1"
+
+"@sigstore/verify@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-1.2.1.tgz#c7e60241b432890dcb8bd8322427f6062ef819e1"
+  integrity sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==
+  dependencies:
+    "@sigstore/bundle" "^2.3.2"
+    "@sigstore/core" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.3.2"
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
@@ -2599,14 +2583,14 @@
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@socket.io/component-emitter@~3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
-  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
+  integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==
 
 "@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
 
 "@tsconfig/node12@^1.0.7":
   version "1.0.11"
@@ -2628,13 +2612,13 @@
   resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz#a52f61a3d7374833fca945b2549bc30a2dd40d0a"
   integrity sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==
 
-"@tufjs/models@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.0.tgz#c7ab241cf11dd29deb213d6817dabb8c99ce0863"
-  integrity sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==
+"@tufjs/models@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.1.tgz#e429714e753b6c2469af3212e7f320a6973c2812"
+  integrity sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==
   dependencies:
     "@tufjs/canonical-json" "2.0.0"
-    minimatch "^9.0.3"
+    minimatch "^9.0.4"
 
 "@types/babel__core@7.20.5":
   version "7.20.5"
@@ -2663,9 +2647,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd"
-  integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
+  integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
   dependencies:
     "@babel/types" "^7.20.7"
 
@@ -2732,9 +2716,9 @@
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  version "4.17.43"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54"
-  integrity sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==
+  version "4.19.5"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6"
+  integrity sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -2752,9 +2736,9 @@
     "@types/serve-static" "*"
 
 "@types/grecaptcha@^3.0.4":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.8.tgz#a9ac1532c2d9ce0d5f287307f8184c9028cd4c7d"
-  integrity sha512-Yc1cIiHXRPHtbrfiTdpmBB1rakc5OntAUQkpaPtQb8UQ641j2DcQiGsn5GkgR8ztCGdTJeK3ibT5GnwdKGzvAA==
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.9.tgz#9f3b07ec06c8fff221aa6fc124fe5b8a0e2c3349"
+  integrity sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.5"
@@ -2770,9 +2754,9 @@
   integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
 
 "@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
-  version "1.17.14"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
-  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
+  version "1.17.15"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36"
+  integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==
   dependencies:
     "@types/node" "*"
 
@@ -2786,7 +2770,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -2797,14 +2781,9 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/lodash@^4.14.194":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
-
-"@types/mime@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
-  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
+  version "4.17.7"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.7.tgz#2f776bcb53adc9e13b2c0dfd493dfcbd7de43612"
+  integrity sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==
 
 "@types/mime@^1":
   version "1.3.5"
@@ -2819,11 +2798,11 @@
     "@types/node" "*"
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "20.11.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.28.tgz#4fd5b2daff2e580c12316e457473d68f15ee6f66"
-  integrity sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==
+  version "22.5.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8"
+  integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==
   dependencies:
-    undici-types "~5.26.4"
+    undici-types "~6.19.2"
 
 "@types/node@^14.14.9":
   version "14.18.63"
@@ -2831,9 +2810,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@^16.18.39":
-  version "16.18.89"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.89.tgz#264d1b6358c458f89f4e374f2210b58cf130fbab"
-  integrity sha512-QlrE8QI5z62nfnkiUZysUsAaxWaTMoGqFVcB3PvK1WxJ0c699bacErV4Fabe9Hki6ZnaHalgzihLbTl2d34XfQ==
+  version "16.18.108"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.108.tgz#b794e2b2a85b4c12935ea7d0f18641be68b352f9"
+  integrity sha512-fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A==
 
 "@types/parse-json@^4.0.0":
   version "4.0.2"
@@ -2841,14 +2820,14 @@
   integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
 "@types/prop-types@*":
-  version "15.7.11"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
-  integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
+  version "15.7.12"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
+  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
 
 "@types/qs@*":
-  version "6.9.12"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.12.tgz#afa96b383a3a6fdc859453a1892d41b607fc7756"
-  integrity sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==
+  version "6.9.15"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce"
+  integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==
 
 "@types/range-parser@*":
   version "1.2.7"
@@ -2866,19 +2845,18 @@
     redux "^4.0.0"
 
 "@types/react-transition-group@^4.2.0":
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac"
-  integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==
+  version "4.4.11"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5"
+  integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==
   dependencies:
     "@types/react" "*"
 
 "@types/react@*":
-  version "18.2.66"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.66.tgz#d2eafc8c4e70939c5432221adb23d32d76bfe451"
-  integrity sha512-OYTmMI4UigXeFMF/j4uv0lBBEbongSgptPrHBxqME44h9+yNov+oL6Z3ocJKo0WyXR84sQUNeyIp9MRfckvZpg==
+  version "18.3.5"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.5.tgz#5f524c2ad2089c0ff372bbdabc77ca2c4dbadf8f"
+  integrity sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==
   dependencies:
     "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/retry@0.12.0":
@@ -2887,18 +2865,13 @@
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 "@types/sanitize-html@^2.9.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.11.0.tgz#582d8c72215c0228e3af2be136e40e0b531addf2"
-  integrity sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.13.0.tgz#ac3620e867b7c68deab79c72bd117e2049cdd98e"
+  integrity sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==
   dependencies:
     htmlparser2 "^8.0.0"
 
-"@types/scheduler@*":
-  version "0.16.8"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
-  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
-
-"@types/semver@^7.3.12", "@types/semver@^7.5.0", "@types/semver@^7.5.8":
+"@types/semver@^7.3.12", "@types/semver@^7.5.0":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
@@ -2919,13 +2892,13 @@
     "@types/express" "*"
 
 "@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
-  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
+  version "1.15.7"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
+  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
   dependencies:
     "@types/http-errors" "*"
-    "@types/mime" "*"
     "@types/node" "*"
+    "@types/send" "*"
 
 "@types/sinonjs__fake-timers@8.1.1":
   version "8.1.1"
@@ -2950,9 +2923,9 @@
   integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
 
 "@types/ws@^8.5.5":
-  version "8.5.10"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
-  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+  version "8.5.12"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
+  integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==
   dependencies:
     "@types/node" "*"
 
@@ -2962,9 +2935,9 @@
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^17.0.0":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
-  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2976,20 +2949,18 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^7.2.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz#bf34a02f221811505b8bf2f31060c8560c1bb0a3"
-  integrity sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
+  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/type-utils" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
-    debug "^4.3.4"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/type-utils" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
 "@typescript-eslint/experimental-utils@^5.0.0":
@@ -3000,26 +2971,27 @@
     "@typescript-eslint/utils" "5.62.0"
 
 "@typescript-eslint/parser@^7.2.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.0.tgz#6b1b3ce76c5de002c43af8ae933613b0f2b4bcc6"
-  integrity sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
+  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
 
 "@typescript-eslint/rule-tester@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/rule-tester/-/rule-tester-7.2.0.tgz#ca72af90fc4d46f1c53a4fc1c28d95fe7a96e879"
-  integrity sha512-V/jxkkx+buBn9uM2QvdHzi1XzxBm2M+QpEORNZCRkq3vKhnZO2Sto1X0xaZ6vVbmHvOE+Zlkv7GO98PXvgGKVg==
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/rule-tester/-/rule-tester-7.18.0.tgz#1326101d6169dece15d91c0e96dc52e350d8c714"
+  integrity sha512-ClrFQlwen9pJcYPIBLuarzBpONQAwjmJ0+YUjAo1TGzoZFJPyUK/A7bb4Mps0u+SMJJnFXbfMN8I9feQDf0O5A==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.2.0"
-    "@typescript-eslint/utils" "7.2.0"
-    ajv "^6.10.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
+    ajv "^6.12.6"
+    json-stable-stringify-without-jsonify "^1.0.1"
     lodash.merge "4.6.2"
-    semver "^7.5.4"
+    semver "^7.6.0"
 
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
@@ -3045,21 +3017,13 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
-"@typescript-eslint/scope-manager@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da"
-  integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==
+"@typescript-eslint/scope-manager@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
+  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
-
-"@typescript-eslint/scope-manager@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz#3f0db079b275bb8b0cb5be7613fb3130cfb5de77"
-  integrity sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
 
 "@typescript-eslint/type-utils@6.19.0":
   version "6.19.0"
@@ -3071,13 +3035,13 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/type-utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz#36792ff4209a781b058de61631a48df17bdefbc5"
-  integrity sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==
+"@typescript-eslint/type-utils@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
+  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
@@ -3096,15 +3060,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/types@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f"
-  integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==
-
-"@typescript-eslint/types@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.0.tgz#23af4d24bf9ce15d8d301236e3e3014143604f27"
-  integrity sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==
+"@typescript-eslint/types@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
+  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -3147,27 +3106,13 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/typescript-estree@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556"
-  integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==
+"@typescript-eslint/typescript-estree@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
+  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/typescript-estree@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz#b5dd6383b4c6a852d7b256a37af971e8982be97f"
-  integrity sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -3202,31 +3147,15 @@
     "@typescript-eslint/typescript-estree" "6.19.0"
     semver "^7.5.4"
 
-"@typescript-eslint/utils@7.2.0", "@typescript-eslint/utils@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.2.0.tgz#fc8164be2f2a7068debb4556881acddbf0b7ce2a"
-  integrity sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==
+"@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.2.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "7.2.0"
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/typescript-estree" "7.2.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.0.tgz#3d2b6606a60ac34f3c625facfb3b3ab7e126f58d"
-  integrity sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.15"
-    "@types/semver" "^7.5.8"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    semver "^7.6.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
 
 "@typescript-eslint/utils@^6.0.0":
   version "6.21.0"
@@ -3265,20 +3194,12 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
-"@typescript-eslint/visitor-keys@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e"
-  integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==
+"@typescript-eslint/visitor-keys@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
+  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz#950148cf1ac11562a2d903fdf7acf76714a2dc9e"
-  integrity sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==
-  dependencies:
-    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/types" "7.18.0"
     eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
@@ -3457,11 +3378,6 @@
   dependencies:
     argparse "^2.0.1"
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 abbrev@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
@@ -3486,14 +3402,16 @@ acorn-jsx@^5.3.2:
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.0.0, acorn-walk@^8.1.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
-  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
+  version "8.3.3"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
+  integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
+  dependencies:
+    acorn "^8.11.0"
 
-acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+acorn@^8.0.4, acorn@^8.11.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
@@ -3504,14 +3422,14 @@ adjust-sourcemap-loader@^4.0.0:
     regex-parser "^2.2.11"
 
 adm-zip@^0.5.2:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.12.tgz#87786328e91d54b37358d8a50f954c4cd73ba60b"
-  integrity sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.16.tgz#0b5e4c779f07dedea5805cdccb1147071d94a909"
+  integrity sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==
 
-agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
+agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
     debug "^4.3.4"
 
@@ -3549,7 +3467,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.12.0, ajv@^8.0.0, ajv@^8.9.0:
+ajv@8.12.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -3569,7 +3487,7 @@ ajv@8.6.2:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3579,6 +3497,16 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.9.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+
 angular-idle-preload@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
@@ -3712,15 +3640,16 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-includes@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
-  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+array-includes@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
 array-union@^1.0.1:
@@ -3740,26 +3669,16 @@ array-uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
-array.prototype.filter@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e"
-  integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==
+array.prototype.findlastindex@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
-array.prototype.findlastindex@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f"
-  integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==
-  dependencies:
-    call-bind "^1.0.5"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
-    es-abstract "^1.22.3"
+    es-abstract "^1.23.2"
     es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
 array.prototype.flat@^1.3.2:
@@ -3831,9 +3750,9 @@ async@^2.6.0:
     lodash "^4.17.14"
 
 async@^3.2.0, async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -3845,7 +3764,7 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-autoprefixer@10.4.18, autoprefixer@^10.4.13:
+autoprefixer@10.4.18:
   version "10.4.18"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163"
   integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==
@@ -3857,6 +3776,18 @@ autoprefixer@10.4.18, autoprefixer@^10.4.13:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+autoprefixer@^10.4.13:
+  version "10.4.20"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
+  integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
+  dependencies:
+    browserslist "^4.23.3"
+    caniuse-lite "^1.0.30001646"
+    fraction.js "^4.3.7"
+    normalize-range "^0.1.2"
+    picocolors "^1.0.1"
+    postcss-value-parser "^4.2.0"
+
 available-typed-arrays@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
@@ -3870,19 +3801,19 @@ aws-sign2@~0.7.0:
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
-  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
+  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
 axe-core@^4.7.2:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.4.tgz#90db39a2b316f963f00196434d964e6e23648643"
-  integrity sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59"
+  integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==
 
 axios@^1.5.1, axios@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
-  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
+  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -3915,12 +3846,12 @@ babel-plugin-istanbul@6.1.1:
     test-exclude "^6.0.0"
 
 babel-plugin-polyfill-corejs2@^0.4.8:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1"
-  integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
+  integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.1"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
     semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.9.0:
@@ -4134,15 +4065,15 @@ browser-sync@^3.0.0:
     ua-parser-js "^1.0.33"
     yargs "^17.3.1"
 
-browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.22.2, browserslist@^4.22.3, browserslist@^4.23.0:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
 
 bs-recipes@1.3.4:
   version "1.3.4"
@@ -4167,13 +4098,6 @@ buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -4214,9 +4138,9 @@ cacache@^15.0.5:
     unique-filename "^1.1.1"
 
 cacache@^18.0.0:
-  version "18.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.2.tgz#fd527ea0f03a603be5c0da5805635f8eef00c60c"
-  integrity sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==
+  version "18.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.4.tgz#4601d7578dadb59c66044e157d02a3314682d6a5"
+  integrity sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==
   dependencies:
     "@npmcli/fs" "^3.1.0"
     fs-minipass "^3.0.0"
@@ -4257,10 +4181,10 @@ camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591:
-  version "1.0.30001597"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001597.tgz#8be94a8c1d679de23b22fbd944232aa1321639e6"
-  integrity sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==
+caniuse-lite@^1.0.30001591, caniuse-lite@^1.0.30001646:
+  version "1.0.30001659"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz#f370c311ffbc19c4965d8ec0064a3625c8aaa7af"
+  integrity sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -4343,9 +4267,9 @@ chownr@^2.0.0:
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
+  integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
 
 ci-info@^3.2.0:
   version "3.9.0"
@@ -4392,9 +4316,9 @@ cli-spinners@^2.5.0:
   integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
 
 cli-table3@~0.6.1:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
-  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f"
+  integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
@@ -4688,16 +4612,16 @@ copy-webpack-plugin@^6.4.1:
     webpack-sources "^1.4.3"
 
 core-js-compat@^3.31.0, core-js-compat@^3.34.0:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.0.tgz#087679119bc2fdbdefad0d45d8e5d307d45ba190"
-  integrity sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==
+  version "3.38.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09"
+  integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==
   dependencies:
-    browserslist "^4.22.3"
+    browserslist "^4.23.3"
 
 core-js@^3.30.1:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
-  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
+  version "3.38.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e"
+  integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4927,6 +4851,33 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 date-fns-tz@^1.3.7:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
@@ -4945,9 +4896,9 @@ date-format@^4.0.14:
   integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
 
 dayjs@^1.10.4:
-  version "1.11.10"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
-  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
+  version "1.11.13"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
+  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
 debounce@^1.2.1:
   version "1.2.1"
@@ -4962,11 +4913,11 @@ debug@2.6.9, debug@^2.2.0:
     ms "2.0.0"
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
@@ -5023,7 +4974,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.2.0, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -5187,9 +5138,9 @@ domhandler@^5.0.2, domhandler@^5.0.3:
     domelementtype "^2.3.0"
 
 dompurify@^2.0.11:
-  version "2.4.7"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc"
-  integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.6.tgz#8402b501611eaa7fb3786072297fcbe2787f8592"
+  integrity sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ==
 
 domutils@^3.0.1:
   version "3.1.0"
@@ -5254,10 +5205,10 @@ ejs@^3.1.10, ejs@^3.1.7:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.668:
-  version "1.4.707"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.707.tgz#77904f87432b8b50b8b8b654ba3940d2bef48d63"
-  integrity sha512-qRq74Mo7ChePOU6GHdfAJ0NREXU8vQTlVlfWz3wNygFay6xrd/fY2J7oGHwrhFeU30OVctGLdTh/FcnokTWpng==
+electron-to-chromium@^1.5.4:
+  version "1.5.18"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz#5fe62b9d21efbcfa26571066502d94f3ed97e495"
+  integrity sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -5301,25 +5252,25 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
     once "^1.4.0"
 
 engine.io-client@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.3.tgz#4cf6fa24845029b238f83c628916d9149c399bc5"
-  integrity sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.4.tgz#b8bc71ed3f25d0d51d587729262486b4b33bd0d0"
+  integrity sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
     engine.io-parser "~5.2.1"
-    ws "~8.11.0"
+    ws "~8.17.1"
     xmlhttprequest-ssl "~2.0.0"
 
 engine.io-parser@~5.2.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.2.tgz#37b48e2d23116919a3453738c5720455e64e1c49"
-  integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
+  integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
 
 engine.io@~6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc"
-  integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.5.tgz#430b80d8840caab91a50e9e23cb551455195fc93"
+  integrity sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -5330,7 +5281,7 @@ engine.io@~6.5.2:
     cors "~2.8.5"
     debug "~4.3.1"
     engine.io-parser "~5.2.1"
-    ws "~8.11.0"
+    ws "~8.17.1"
 
 enhanced-resolve@^5.17.1:
   version "5.17.1"
@@ -5356,9 +5307,11 @@ enquirer@~2.3.6:
     ansi-colors "^4.1.1"
 
 ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.1.tgz#68dc99a002f115792c26239baedaaea9e70c0ca2"
+  integrity sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==
+  dependencies:
+    punycode "^1.4.1"
 
 entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
   version "4.5.0"
@@ -5376,9 +5329,9 @@ env-paths@^2.2.0, env-paths@^2.2.1:
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.3:
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1"
-  integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg==
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31"
+  integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==
 
 err-code@^2.0.2:
   version "2.0.3"
@@ -5406,17 +5359,21 @@ error-stack-parser@^2.0.1:
   dependencies:
     stackframe "^1.3.4"
 
-es-abstract@^1.22.1, es-abstract@^1.22.3:
-  version "1.22.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.5.tgz#1417df4e97cc55f09bf7e58d1e614bc61cb8df46"
-  integrity sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
   dependencies:
     array-buffer-byte-length "^1.0.1"
     arraybuffer.prototype.slice "^1.0.3"
     available-typed-arrays "^1.0.7"
     call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
     es-define-property "^1.0.0"
     es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
     es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
     function.prototype.name "^1.1.6"
@@ -5427,10 +5384,11 @@ es-abstract@^1.22.1, es-abstract@^1.22.3:
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    hasown "^2.0.1"
+    hasown "^2.0.2"
     internal-slot "^1.0.7"
     is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
+    is-data-view "^1.0.1"
     is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.3"
@@ -5441,22 +5399,17 @@ es-abstract@^1.22.1, es-abstract@^1.22.3:
     object-keys "^1.1.1"
     object.assign "^4.1.5"
     regexp.prototype.flags "^1.5.2"
-    safe-array-concat "^1.1.0"
+    safe-array-concat "^1.1.2"
     safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.8"
-    string.prototype.trimend "^1.0.7"
-    string.prototype.trimstart "^1.0.7"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
     typed-array-buffer "^1.0.2"
     typed-array-byte-length "^1.0.1"
     typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.5"
+    typed-array-length "^1.0.6"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.14"
-
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+    which-typed-array "^1.1.15"
 
 es-define-property@^1.0.0:
   version "1.0.0"
@@ -5465,15 +5418,22 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0:
+es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-module-lexer@^1.2.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
-  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
+  dependencies:
+    es-errors "^1.3.0"
 
 es-set-tostringtag@^2.0.3:
   version "2.0.3"
@@ -5568,10 +5528,10 @@ esbuild@^0.19.3:
     "@esbuild/win32-ia32" "0.19.12"
     "@esbuild/win32-x64" "0.19.12"
 
-escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+escalade@^3.1.1, escalade@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5588,10 +5548,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-compat-utils@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.4.1.tgz#498d9dad03961174a283f7741838a3fbe4a34e89"
-  integrity sha512-5N7ZaJG5pZxUeNNJfUchurLVrunD1xJvyg5kYOIVF8kg1f3ajTikmAu/5fZ9w100omNPOoMjngRszh/Q/uFGMg==
+eslint-compat-utils@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
+  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
   dependencies:
     semver "^7.5.4"
 
@@ -5613,10 +5573,10 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-module-utils@^2.8.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
-  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
+eslint-module-utils@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz#b99b211ca4318243f09661fae088f373ad5243c4"
+  integrity sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==
   dependencies:
     debug "^3.2.7"
 
@@ -5643,25 +5603,26 @@ eslint-plugin-import-newlines@^1.3.1:
   integrity sha512-+Cz1x2xBLtI9gJbmuYEpvY7F8K75wskBmJ7rk4VRObIJo+jklUJaejFJgtnWeL0dCFWabGEkhausrikXaNbtoQ==
 
 eslint-plugin-import@^2.27.5:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
-  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449"
+  integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==
   dependencies:
-    array-includes "^3.1.7"
-    array.prototype.findlastindex "^1.2.3"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
     array.prototype.flat "^1.3.2"
     array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.8.0"
-    hasown "^2.0.0"
-    is-core-module "^2.13.1"
+    eslint-module-utils "^2.9.0"
+    hasown "^2.0.2"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.fromentries "^2.0.7"
-    object.groupby "^1.0.1"
-    object.values "^1.1.7"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.0"
     semver "^6.3.1"
     tsconfig-paths "^3.15.0"
 
@@ -5680,12 +5641,12 @@ eslint-plugin-jsdoc@^45.0.0:
     spdx-expression-parse "^3.0.1"
 
 eslint-plugin-jsonc@^2.6.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.13.0.tgz#e05f88d3671c08ca96e87b5be6a4cfe8d66e6746"
-  integrity sha512-2wWdJfpO/UbZzPDABuUVvlUQjfMJa2p2iQfYt/oWxOMpXCcjuiMUSaA02gtY/Dbu82vpaSqc+O7Xq6ECHwtIxA==
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
+  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.4.0"
+    eslint-compat-utils "^0.5.0"
     espree "^9.6.1"
     graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
@@ -5748,13 +5709,18 @@ eslint-scope@^7.2.2:
     estraverse "^5.2.0"
 
 eslint-scope@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.0.tgz#7b6b067599c436404ce856cd2c47331464603a4a"
-  integrity sha512-zj3Byw6jX4TcFCJmxOzLt6iol5FAr9xQyZZSQjEzW2UiCJXLwXdRIKCYVFftnpZckaC9Ps9xlC7jB8tSeWWOaw==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94"
+  integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-visitor-keys@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
 eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
@@ -5819,9 +5785,9 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.2, esquery@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -6024,11 +5990,6 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fast-memoize@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
-  integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
-
 fast-printf@^1.6.9:
   version "1.6.9"
   resolved "https://registry.yarnpkg.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
@@ -6036,6 +5997,11 @@ fast-printf@^1.6.9:
   dependencies:
     boolean "^3.1.4"
 
+fast-uri@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134"
+  integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==
+
 fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
@@ -6195,9 +6161,9 @@ flatted@^3.2.7, flatted@^3.2.9:
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 follow-redirects@^1.0.0, follow-redirects@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -6207,9 +6173,9 @@ for-each@^0.3.3:
     is-callable "^1.1.3"
 
 foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
   dependencies:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
@@ -6309,9 +6275,9 @@ fs-minipass@^3.0.0:
     minipass "^7.0.3"
 
 fs-monkey@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
-  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2"
+  integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -6441,15 +6407,16 @@ glob@7.1.4:
     path-is-absolute "^1.0.0"
 
 glob@^10.2.2, glob@^10.3.10:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
   dependencies:
     foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
 
 glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
   version "7.2.3"
@@ -6483,11 +6450,12 @@ globals@^13.19.0:
     type-fest "^0.20.2"
 
 globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
@@ -6612,7 +6580,7 @@ has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-hasown@^2.0.0, hasown@^2.0.1:
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -6627,9 +6595,9 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
     react-is "^16.7.0"
 
 hosted-git-info@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
-  integrity sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
+  integrity sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==
   dependencies:
     lru-cache "^10.0.1"
 
@@ -6773,7 +6741,7 @@ http-terminator@^3.2.0:
     roarr "^7.0.4"
     type-fest "^2.3.3"
 
-https-proxy-agent@7.0.4, https-proxy-agent@^7.0.1:
+https-proxy-agent@7.0.4:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
   integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
@@ -6781,6 +6749,14 @@ https-proxy-agent@7.0.4, https-proxy-agent@^7.0.1:
     agent-base "^7.0.2"
     debug "4"
 
+https-proxy-agent@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -6792,9 +6768,9 @@ human-signals@^2.1.0:
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 hyphenate-style-name@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
-  integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436"
+  integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==
 
 i18next@^19.5.0:
   version "19.9.2"
@@ -6840,9 +6816,9 @@ ignore-by-default@^1.0.1:
   integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
 
 ignore-walk@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
-  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.5.tgz#ef8d61eab7da169078723d1f82833b36e200b0dd"
+  integrity sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==
   dependencies:
     minimatch "^9.0.0"
 
@@ -6852,9 +6828,9 @@ ignore@5.3.0:
   integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
 
 ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
-  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -6872,9 +6848,9 @@ immutable@^3:
   integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
 
 immutable@^4.0.0:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
-  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
+  integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
@@ -6885,9 +6861,9 @@ import-fresh@^3.2.1, import-fresh@^3.3.0:
     resolve-from "^4.0.0"
 
 import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
   dependencies:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
@@ -6940,6 +6916,11 @@ ini@^1.3.4:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
+ini@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.3.tgz#4c359675a6071a46985eb39b14e4a2c0ec98a795"
+  integrity sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==
+
 inquirer@9.2.15:
   version "9.2.15"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-9.2.15.tgz#2135a36190a6e5c92f5d205e0af1fea36b9d3492"
@@ -7001,9 +6982,9 @@ ipaddr.js@1.9.1:
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
+  integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
 is-array-buffer@^3.0.4:
   version "3.0.4"
@@ -7057,12 +7038,19 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.8.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+is-core-module@^2.13.0, is-core-module@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
+
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
+  dependencies:
+    is-typed-array "^1.1.13"
 
 is-date-object@^1.0.1:
   version "1.0.5"
@@ -7353,19 +7341,19 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
 jake@^10.8.5:
-  version "10.8.7"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
-  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
+  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
   dependencies:
     async "^3.2.3"
     chalk "^4.0.2"
@@ -7417,9 +7405,9 @@ jest-worker@^27.4.5:
     supports-color "^8.0.0"
 
 jiti@^1.20.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
+  version "1.21.6"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
+  integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
 
 js-cookie@2.2.1:
   version "2.2.1"
@@ -7482,9 +7470,9 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-parse-even-better-errors@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
-  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
+  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -7543,11 +7531,16 @@ jsonc-parser@3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-jsonc-parser@3.2.1, jsonc-parser@^3.0.0:
+jsonc-parser@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
   integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==
 
+jsonc-parser@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4"
+  integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
+
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
@@ -7730,9 +7723,9 @@ karma-source-map-support@1.4.0:
     source-map-support "^0.5.5"
 
 karma@^6.4.2:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
-  integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -7772,9 +7765,13 @@ kind-of@^6.0.2:
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 klaro@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.18.tgz#fef3a05fcd656451b941e11459f37d6c336e84c0"
-  integrity sha512-Q5nehkGeZuFerisW4oeeB1ax6dHDszWckR70EcxKvhFiJQ61CM0WBSo20yLbdvz8N9MFsOFu4RNCO9JsbkCxgQ==
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.21.tgz#2ecaccb058ef7660fe21563b80a0c367d80b9c8a"
+  integrity sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==
+  dependencies:
+    "@babel/eslint-parser" "^7.23.10"
+    sass "^1.25.0"
+    webpack-merge "^5.10.0"
 
 kleur@^3.0.3:
   version "3.0.3"
@@ -7787,9 +7784,9 @@ klona@^2.0.4:
   integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
 
 launch-editor@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
-  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047"
+  integrity sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==
   dependencies:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
@@ -7982,10 +7979,10 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
-  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+lru-cache@^10.0.1, lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -8047,10 +8044,10 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
-  integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
+make-fetch-happen@^13.0.0, make-fetch-happen@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
+  integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==
   dependencies:
     "@npmcli/agent" "^2.0.0"
     cacache "^18.0.0"
@@ -8061,6 +8058,7 @@ make-fetch-happen@^13.0.0:
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     negotiator "^0.6.3"
+    proc-log "^4.2.0"
     promise-retry "^2.0.1"
     ssri "^10.0.0"
 
@@ -8144,11 +8142,16 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
+"mime-db@>= 1.43.0 < 2":
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
+  integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
+
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
@@ -8196,7 +8199,7 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3:
+minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
   integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
@@ -8217,10 +8220,10 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.4:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+minimatch@^9.0.0, minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -8244,9 +8247,9 @@ minipass-collect@^2.0.1:
     minipass "^7.0.3"
 
 minipass-fetch@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
-  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
+  integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
   dependencies:
     minipass "^7.0.3"
     minipass-sized "^1.0.3"
@@ -8262,9 +8265,9 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-json-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
-  integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz#5121616c77a11c406c3ffa77509e0b77bb267ec3"
+  integrity sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==
   dependencies:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
@@ -8295,10 +8298,10 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -8405,12 +8408,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8457,9 +8455,9 @@ neo-async@^2.6.2:
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 ng-mocks@^14.10.0:
-  version "14.12.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.12.1.tgz#a2d698c872616e0ceeefa08ecb4bd357ae85a7dd"
-  integrity sha512-5OdTYYOva7IkCCi6kTtgnII1hSfw+qYOM1ScrKhyo7iaI/ViV8xI4MGa89Ts7XnH6XqISSez2Un3zFSomkFpmg==
+  version "14.13.1"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.1.tgz#9fef8cc902a0d9d3250550d83514f9c65d4cd366"
+  integrity sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==
 
 ng2-file-upload@5.0.0:
   version "5.0.0"
@@ -8529,14 +8527,14 @@ node-forge@^1:
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-gyp-build@^4.2.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
-  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.2.tgz#4f802b71c1ab2ca16af830e6c1ea7dd1ad9496fa"
+  integrity sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==
 
 node-gyp@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966"
-  integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.2.0.tgz#80101c4aa4f7ab225f13fcc8daaaac4eb1a8dd86"
+  integrity sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
@@ -8544,9 +8542,9 @@ node-gyp@^10.0.0:
     graceful-fs "^4.2.6"
     make-fetch-happen "^13.0.0"
     nopt "^7.0.0"
-    proc-log "^3.0.0"
+    proc-log "^4.1.0"
     semver "^7.3.5"
-    tar "^6.1.2"
+    tar "^6.2.1"
     which "^4.0.0"
 
 node-machine-id@1.1.12:
@@ -8554,10 +8552,10 @@ node-machine-id@1.1.12:
   resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
   integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
 
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 nodemon@^2.0.22:
   version "2.0.22"
@@ -8576,26 +8574,18 @@ nodemon@^2.0.22:
     undefsafe "^2.0.5"
 
 nopt@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
-  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
+  integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
   dependencies:
     abbrev "^2.0.0"
 
-nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
-  dependencies:
-    abbrev "1"
-
 normalize-package-data@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
-  integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.2.tgz#a7bc22167fe24025412bcff0a9651eb768b03506"
+  integrity sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==
   dependencies:
     hosted-git-info "^7.0.0"
-    is-core-module "^2.8.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
 
@@ -8615,14 +8605,14 @@ normalize-url@^4.5.0:
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
 nouislider@^15.7.1:
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.7.1.tgz#77d55e47d9b4cd771728515713df43b489db9705"
-  integrity sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w==
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.8.1.tgz#18729ed29738d2d328a1b5e0429d38eb8be8a696"
+  integrity sha512-93TweAi8kqntHJSPiSWQ1o/uZ29VWOmal9YKb6KKGGlCkugaNfAupT7o1qTHqdJvNQ7S0su5rO6qRFCjP8fxtw==
 
 npm-bundled@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.0.tgz#7e8e2f8bb26b794265028491be60321a25a39db7"
-  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.1.tgz#cca73e15560237696254b10170d8f86dad62da25"
+  integrity sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==
   dependencies:
     npm-normalize-package-bin "^3.0.0"
 
@@ -8638,7 +8628,7 @@ npm-normalize-package-bin@^3.0.0:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
   integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
 
-npm-package-arg@11.0.1, npm-package-arg@^11.0.0:
+npm-package-arg@11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.1.tgz#f208b0022c29240a1c532a449bdde3f0a4708ebc"
   integrity sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==
@@ -8648,6 +8638,16 @@ npm-package-arg@11.0.1, npm-package-arg@^11.0.0:
     semver "^7.3.5"
     validate-npm-package-name "^5.0.0"
 
+npm-package-arg@^11.0.0:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.3.tgz#dae0c21199a99feca39ee4bfb074df3adac87e2d"
+  integrity sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==
+  dependencies:
+    hosted-git-info "^7.0.0"
+    proc-log "^4.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
+
 npm-packlist@^8.0.0:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-8.0.2.tgz#5b8d1d906d96d21c85ebbeed2cf54147477c8478"
@@ -8655,7 +8655,7 @@ npm-packlist@^8.0.0:
   dependencies:
     ignore-walk "^6.0.4"
 
-npm-pick-manifest@9.0.0, npm-pick-manifest@^9.0.0:
+npm-pick-manifest@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz#f87a4c134504a2c7931f2bb8733126e3c3bb7e8f"
   integrity sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==
@@ -8665,18 +8665,29 @@ npm-pick-manifest@9.0.0, npm-pick-manifest@^9.0.0:
     npm-package-arg "^11.0.0"
     semver "^7.3.5"
 
-npm-registry-fetch@^16.0.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz#10227b7b36c97bc1cf2902a24e4f710cfe62803c"
-  integrity sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==
+npm-pick-manifest@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz#83562afde52b0b07cb6244361788d319ce7e8636"
+  integrity sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==
   dependencies:
+    npm-install-checks "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    npm-package-arg "^11.0.0"
+    semver "^7.3.5"
+
+npm-registry-fetch@^16.0.0:
+  version "16.2.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz#c367df2d770f915da069ff19fd31762f4bca3ef1"
+  integrity sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==
+  dependencies:
+    "@npmcli/redact" "^1.1.0"
     make-fetch-happen "^13.0.0"
     minipass "^7.0.2"
     minipass-fetch "^3.0.0"
     minipass-json-stream "^1.0.1"
     minizlib "^2.1.2"
     npm-package-arg "^11.0.0"
-    proc-log "^3.0.0"
+    proc-log "^4.0.0"
 
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
@@ -8754,9 +8765,9 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -8773,34 +8784,33 @@ object.assign@^4.1.5:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.fromentries@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
-  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-object.groupby@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec"
-  integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==
-  dependencies:
-    array.prototype.filter "^1.0.3"
-    call-bind "^1.0.5"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.0.0"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
 
-object.values@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
-  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+
+object.values@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
+  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -8867,16 +8877,16 @@ opn@5.3.0:
     is-wsl "^1.1.0"
 
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 ora@5.4.1, ora@^5.4.1:
   version "5.4.1"
@@ -8984,6 +8994,11 @@ p-wait-for@^3.2.0:
   dependencies:
     p-timeout "^3.0.0"
 
+package-json-from-dist@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
+  integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
+
 pacote@17.0.6:
   version "17.0.6"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.6.tgz#874bb59cda5d44ab784d0b6530fcb4a7d9b76a60"
@@ -9093,12 +9108,12 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
   dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
+    lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-to-regexp@0.1.7:
@@ -9136,10 +9151,10 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
+  integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
 
 picomatch@4.0.1:
   version "4.0.1"
@@ -9387,23 +9402,23 @@ postcss-media-query-parser@^0.2.3:
   integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
 
 postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002"
+  integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==
 
 postcss-modules-local-by-default@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
-  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f"
+  integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
-  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5"
+  integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
@@ -9528,9 +9543,9 @@ postcss-selector-not@^6.0.1:
     postcss-selector-parser "^6.0.10"
 
 postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
-  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -9567,12 +9582,12 @@ postcss@^7.0.14:
     source-map "^0.6.1"
 
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  version "8.4.45"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603"
+  integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
@@ -9599,6 +9614,11 @@ proc-log@^3.0.0:
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
   integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
 
+proc-log@^4.0.0, proc-log@^4.1.0, proc-log@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
+  integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -9680,6 +9700,11 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
@@ -9756,12 +9781,10 @@ re-reselect@^4.0.0:
   resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-4.0.1.tgz#21a2306d11bbf377ac78687aa46e1a8848974194"
   integrity sha512-xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==
 
-re-resizable@6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.6.tgz#b95d37e3821481b56ddfb1e12862940a791e827d"
-  integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ==
-  dependencies:
-    fast-memoize "^2.5.1"
+re-resizable@6.9.17:
+  version "6.9.17"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.17.tgz#78e4349934ff24a8fcb4b6b5a43ff9ed5f319d2a"
+  integrity sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g==
 
 react-aria-live@^2.0.5:
   version "2.0.5"
@@ -9842,10 +9865,10 @@ react-dom@^16.14.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-draggable@4.4.5:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c"
-  integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==
+react-draggable@4.4.6:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e"
+  integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==
   dependencies:
     clsx "^1.1.1"
     prop-types "^15.8.1"
@@ -9882,9 +9905,9 @@ react-is@^16.13.1, react-is@^16.7.0:
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 react-mosaic-component@^4.0.1:
   version "4.1.1"
@@ -9919,13 +9942,13 @@ react-resize-observer@^1.1.1:
   integrity sha512-3R+90Hou90Mr3wJYc+unsySC8Pn91V4nmjO32NKvUvjphRUbq9HisyLg7bDyGBE7xlMrrM6Fax7iNQaFdc/FYA==
 
 react-rnd@^10.1:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.4.1.tgz#9e1c3f244895d7862ef03be98b2a620848c3fba1"
-  integrity sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q==
+  version "10.4.12"
+  resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.4.12.tgz#f3e0ae736e467c614f46f531f5f62e27aa14f352"
+  integrity sha512-EZ0ddi+R9JQVqk6jtPzvy11z5kjdw3aZbtiRmA9KP09UNx3LZT8WFrWO3QXbH7dHo1DKO3Rh8usCCwaJgu6Ahg==
   dependencies:
-    re-resizable "6.9.6"
-    react-draggable "4.4.5"
-    tslib "2.3.1"
+    re-resizable "6.9.17"
+    react-draggable "4.4.6"
+    tslib "2.6.2"
 
 react-sizeme@^2.6.7:
   version "2.6.12"
@@ -9985,9 +10008,9 @@ read-package-json-fast@^3.0.0:
     npm-normalize-package-bin "^3.0.0"
 
 read-package-json@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.0.tgz#d605c9dcf6bc5856da24204aa4e9518ee9714be0"
-  integrity sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.1.tgz#8b5f6aab97a796cfb436516ade24c011d10964a9"
+  integrity sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==
   dependencies:
     glob "^10.2.2"
     json-parse-even-better-errors "^3.0.0"
@@ -10060,9 +10083,9 @@ reflect-metadata@^0.1.13:
   integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
 
 reflect-metadata@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.1.tgz#8d5513c0f5ef2b4b9c3865287f3c0940c1f67f74"
-  integrity sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
+  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
 
 regenerate-unicode-properties@^10.1.0:
   version "10.1.1"
@@ -10254,9 +10277,9 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfdc@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
-  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
 rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
   version "2.7.1"
@@ -10282,25 +10305,28 @@ roarr@^7.0.4:
     semver-compare "^1.0.0"
 
 rollup@^4.2.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.13.0.tgz#dd2ae144b4cdc2ea25420477f68d4937a721237a"
-  integrity sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7"
+  integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.13.0"
-    "@rollup/rollup-android-arm64" "4.13.0"
-    "@rollup/rollup-darwin-arm64" "4.13.0"
-    "@rollup/rollup-darwin-x64" "4.13.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.13.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.13.0"
-    "@rollup/rollup-linux-arm64-musl" "4.13.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.13.0"
-    "@rollup/rollup-linux-x64-gnu" "4.13.0"
-    "@rollup/rollup-linux-x64-musl" "4.13.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.13.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.13.0"
-    "@rollup/rollup-win32-x64-msvc" "4.13.0"
+    "@rollup/rollup-android-arm-eabi" "4.21.2"
+    "@rollup/rollup-android-arm64" "4.21.2"
+    "@rollup/rollup-darwin-arm64" "4.21.2"
+    "@rollup/rollup-darwin-x64" "4.21.2"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.21.2"
+    "@rollup/rollup-linux-arm-musleabihf" "4.21.2"
+    "@rollup/rollup-linux-arm64-gnu" "4.21.2"
+    "@rollup/rollup-linux-arm64-musl" "4.21.2"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.21.2"
+    "@rollup/rollup-linux-riscv64-gnu" "4.21.2"
+    "@rollup/rollup-linux-s390x-gnu" "4.21.2"
+    "@rollup/rollup-linux-x64-gnu" "4.21.2"
+    "@rollup/rollup-linux-x64-musl" "4.21.2"
+    "@rollup/rollup-win32-arm64-msvc" "4.21.2"
+    "@rollup/rollup-win32-ia32-msvc" "4.21.2"
+    "@rollup/rollup-win32-x64-msvc" "4.21.2"
     fsevents "~2.3.2"
 
 rtl-css-js@^1.13.1:
@@ -10366,7 +10392,7 @@ rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.8.0, rxjs@^7.8.1:
   dependencies:
     tslib "^2.1.0"
 
-safe-array-concat@^1.1.0:
+safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
   integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
@@ -10396,9 +10422,9 @@ safe-regex-test@^1.0.3:
     is-regex "^1.1.4"
 
 safe-stable-stringify@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
-  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd"
+  integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
@@ -10406,9 +10432,9 @@ safe-stable-stringify@^2.4.3:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sanitize-html@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
-  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae"
+  integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -10451,6 +10477,15 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
+sass@^1.25.0:
+  version "1.78.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.78.0.tgz#cef369b2f9dc21ea1d2cf22c979f52365da60841"
+  integrity sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 sass@~1.62.0:
   version "1.62.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029"
@@ -10461,9 +10496,9 @@ sass@~1.62.0:
     source-map-js ">=0.6.2 <2.0.0"
 
 sax@>=0.6.0, sax@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
-  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
 scheduler@^0.19.1:
   version "0.19.1"
@@ -10517,7 +10552,7 @@ semver@7.5.3:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.6.0, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+semver@7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -10534,6 +10569,11 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -10711,16 +10751,16 @@ signal-exit@^4.0.1:
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 sigstore@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.2.2.tgz#5e4ff39febeae9e0679bafa22180cb0f445a7e35"
-  integrity sha512-2A3WvXkQurhuMgORgT60r6pOWiCOO5LlEqY2ADxGBDGVYLSo5HN0uLtb68YpVpuL/Vi8mLTe7+0Dx2Fq8lLqEg==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.3.1.tgz#0755dd2cc4820f2e922506da54d3d628e13bfa39"
+  integrity sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==
   dependencies:
-    "@sigstore/bundle" "^2.2.0"
+    "@sigstore/bundle" "^2.3.2"
     "@sigstore/core" "^1.0.0"
-    "@sigstore/protobuf-specs" "^0.3.0"
-    "@sigstore/sign" "^2.2.3"
-    "@sigstore/tuf" "^2.3.1"
-    "@sigstore/verify" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.3.2"
+    "@sigstore/sign" "^2.3.2"
+    "@sigstore/tuf" "^2.3.4"
+    "@sigstore/verify" "^1.2.1"
 
 simple-update-notifier@^1.0.7:
   version "1.1.0"
@@ -10777,12 +10817,12 @@ smart-buffer@^4.2.0:
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 socket.io-adapter@~2.5.2:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz#4fdb1358667f6d68f25343353bd99bd11ee41006"
-  integrity sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz#c7a1f9c703d7756844751b6ff9abfc1780664082"
+  integrity sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==
   dependencies:
     debug "~4.3.4"
-    ws "~8.11.0"
+    ws "~8.17.1"
 
 socket.io-client@^4.4.1:
   version "4.7.5"
@@ -10824,19 +10864,19 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
-  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
+socks-proxy-agent@^8.0.3:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz#9071dca17af95f483300316f4b063578fa0db08c"
+  integrity sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==
   dependencies:
-    agent-base "^7.0.2"
+    agent-base "^7.1.1"
     debug "^4.3.4"
-    socks "^2.7.1"
+    socks "^2.8.3"
 
-socks@^2.7.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af"
-  integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==
+socks@^2.8.3:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
   dependencies:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
@@ -10851,15 +10891,10 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
 source-map-loader@5.0.0:
   version "5.0.0"
@@ -10924,9 +10959,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
-  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
+  version "3.0.20"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89"
+  integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -10977,9 +11012,9 @@ sshpk@^1.14.1, sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^10.0.0:
-  version "10.0.5"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
-  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+  integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
   dependencies:
     minipass "^7.0.3"
 
@@ -11067,32 +11102,33 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.trim@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
-  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimend@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
-  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11226,7 +11262,7 @@ tar-stream@~2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.11, tar@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -11260,9 +11296,9 @@ terser@5.29.1:
     source-map-support "~0.5.20"
 
 terser@^5.26.0:
-  version "5.29.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.2.tgz#c17d573ce1da1b30f21a877bffd5655dd86fdb35"
-  integrity sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==
+  version "5.31.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
+  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -11360,16 +11396,14 @@ totalist@^3.0.0:
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
 touch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
-  integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
-  dependencies:
-    nopt "~1.0.10"
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
+  integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
 
 tough-cookie@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
@@ -11447,12 +11481,7 @@ tsconfig-paths@^4.1.0, tsconfig-paths@^4.1.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0:
+tslib@2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -11462,6 +11491,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
+
 tsutils-etc@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.4.2.tgz#6d6a9f33aa61867d832e4a455b2cebb6b104ebfa"
@@ -11477,14 +11511,14 @@ tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.0.tgz#4daaa8620ba7545501d04dfa933c98abbcc959b9"
-  integrity sha512-ZSDngmP1z6zw+FIkIBjvOp/II/mIub/O7Pp12j1WNsiCpg5R5wAc//i555bBQsE44O94btLt0xM/Zr2LQjwdCg==
+tuf-js@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.2.1.tgz#fdd8794b644af1a75c7aaa2b197ddffeb2911b56"
+  integrity sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==
   dependencies:
-    "@tufjs/models" "2.0.0"
+    "@tufjs/models" "2.0.1"
     debug "^4.3.4"
-    make-fetch-happen "^13.0.0"
+    make-fetch-happen "^13.0.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -11560,10 +11594,10 @@ typed-array-byte-offset@^1.0.2:
     has-proto "^1.0.3"
     is-typed-array "^1.1.13"
 
-typed-array-length@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5"
-  integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
   dependencies:
     call-bind "^1.0.7"
     for-each "^0.3.3"
@@ -11607,14 +11641,14 @@ typescript@~5.3.3:
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 ua-parser-js@^0.7.30:
-  version "0.7.37"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"
-  integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
+  version "0.7.38"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.38.tgz#f497d8a4dc1fec6e854e5caa4b2f9913422ef054"
+  integrity sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==
 
 ua-parser-js@^1.0.33:
-  version "1.0.37"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f"
-  integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.38.tgz#66bb0c4c0e322fe48edfe6d446df6042e62f25e2"
+  integrity sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -11636,21 +11670,16 @@ undefsafe@^2.0.5:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
 
 undici@6.11.1:
   version "6.11.1"
   resolved "https://registry.yarnpkg.com/undici/-/undici-6.11.1.tgz#75ab573677885b421ca2e6f5f17ff1185b24c68d"
   integrity sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==
 
-undici@6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.7.1.tgz#3cb27222fd5d72c1b2058f4e18bf9b53dd933af8"
-  integrity sha512-+Wtb9bAQw6HYWzCnxrPTMVEV3Q1QjYanI0E4q02ehReMuquQdLTEFEYbfs7hcImVYKcQkWSwT6buEmSVIiDDtQ==
-
 unfetch@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
@@ -11732,13 +11761,13 @@ untildify@^4.0.0:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -11789,11 +11818,9 @@ validate-npm-package-license@^3.0.4:
     spdx-expression-parse "^3.0.0"
 
 validate-npm-package-name@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713"
-  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
-  dependencies:
-    builtins "^5.0.0"
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
+  integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
@@ -11809,17 +11836,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb"
-  integrity sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==
-  dependencies:
-    esbuild "^0.19.3"
-    postcss "^8.4.35"
-    rollup "^4.2.0"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
 vite@5.1.7:
   version "5.1.7"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.7.tgz#9f685a2c4c70707fef6d37341b0e809c366da619"
@@ -11899,9 +11915,9 @@ webidl-conversions@^3.0.0:
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webpack-bundle-analyzer@^4.8.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454"
-  integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -11911,7 +11927,6 @@ webpack-bundle-analyzer@^4.8.0:
     escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
     html-escaper "^2.0.2"
-    is-plain-object "^5.0.0"
     opener "^1.5.2"
     picocolors "^1.0.0"
     sirv "^2.0.3"
@@ -11936,17 +11951,6 @@ webpack-cli@^5.1.4:
     rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz#6bbc257ec83ae15522de7a62f995630efde7cc3d"
-  integrity sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.12"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
 webpack-dev-middleware@6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz#0463232e59b7d7330fa154121528d484d36eb973"
@@ -11958,18 +11962,7 @@ webpack-dev-middleware@6.1.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-middleware@^5.3.4:
+webpack-dev-middleware@^5.3.1, webpack-dev-middleware@^5.3.4:
   version "5.3.4"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
   integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
@@ -12052,7 +12045,7 @@ webpack-dev-server@^4.15.1:
     webpack-dev-middleware "^5.3.4"
     ws "^8.13.0"
 
-webpack-merge@5.10.0, webpack-merge@^5.7.3:
+webpack-merge@5.10.0, webpack-merge@^5.10.0, webpack-merge@^5.7.3:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
   integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
@@ -12143,7 +12136,7 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.14:
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
@@ -12180,6 +12173,11 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -12227,15 +12225,15 @@ ws@^7.3.1:
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.13.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+
+ws@~8.17.1:
   version "8.17.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
   integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
-ws@~8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
-
 xhr2@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93"
@@ -12334,13 +12332,11 @@ yocto-queue@^0.1.0:
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
 yocto-queue@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
-  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110"
+  integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==
 
 zone.js@~0.14.4:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.14.4.tgz#e0168fe450e3e4313c8efdb4a0ae4b557ac0fdd8"
-  integrity sha512-NtTUvIlNELez7Q1DzKVIFZBzNb646boQMgpATo9z3Ftuu/gWvzxCW7jdjcUDoRGxRikrhVHB/zLXh1hxeJawvw==
-  dependencies:
-    tslib "^2.3.0"
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.14.10.tgz#23b8b29687c6bffece996e5ee5b854050e7775c8"
+  integrity sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==

From 3626cdf69992442958196b8dc4ec684e161243e6 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 4 Sep 2024 09:43:48 +0300
Subject: [PATCH 0415/1286] lint/src/util: fix TS2314

Fix error in lint:

> lint/src/util/structure.ts:16:20 - error TS2314: Generic type 'RuleMetaData<MessageIds, Options>' requires 2 type argument(s).
>
> 16 export type Meta = RuleMetaData<string>;
---
 lint/src/util/structure.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lint/src/util/structure.ts b/lint/src/util/structure.ts
index 13b2ef322b..2e3aebd9ab 100644
--- a/lint/src/util/structure.ts
+++ b/lint/src/util/structure.ts
@@ -13,7 +13,7 @@ import {
 } from '@typescript-eslint/utils/ts-eslint';
 import { EnumType } from 'typescript';
 
-export type Meta = RuleMetaData<string>;
+export type Meta = RuleMetaData<string, unknown[]>;
 export type Valid = ValidTestCase<unknown[]>;
 export type Invalid = InvalidTestCase<string, unknown[]>;
 

From 81675b7a3a95aef06fb7644cc8496a544ac8c7fd Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Tue, 10 Sep 2024 10:16:26 +0300
Subject: [PATCH 0416/1286] package.json: Use eslint-plugin-unused-imports
 v3.x.x

According to the docs we should be using v3.x.x:

> * Version 3.x.x is for eslint 8 with @typescript-eslint/eslint-plugin 6 - 7
> * Version 2.x.x is for eslint 8 with @typescript-eslint/eslint-plugin 5

This fixes a lint error.

See: https://www.npmjs.com/package/eslint-plugin-unused-imports
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 28845e606c..9e8d173198 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-plugin-unused-imports": "^3.2.0",
     "express-static-gzip": "^2.1.7",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
diff --git a/yarn.lock b/yarn.lock
index e06490123c..d51b2d024b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5680,10 +5680,10 @@ eslint-plugin-simple-import-sort@^10.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
   integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
 
-eslint-plugin-unused-imports@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz#d8db8c4d0cfa0637a8b51ce3fd7d1b6bc3f08520"
-  integrity sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==
+eslint-plugin-unused-imports@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz#63a98c9ad5f622cd9f830f70bc77739f25ccfe0d"
+  integrity sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==
   dependencies:
     eslint-rule-composer "^0.3.0"
 

From 45875f13c460675eceade9ab49047f32608f6d8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:48:08 +0000
Subject: [PATCH 0417/1286] Bump body-parser and express

Bumps [body-parser](https://github.com/expressjs/body-parser) to 1.20.3 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `body-parser` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3)

Updates `express` from 4.19.2 to 4.20.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.19.2...4.20.0)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
...

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

diff --git a/package-lock.json b/package-lock.json
index a765c1fc32..f3d6856745 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.19.2",
+        "express": "^4.20.0",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
@@ -8467,9 +8467,9 @@
       "dev": true
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.5",
@@ -8479,7 +8479,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -8511,11 +8511,11 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/body-parser/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -10954,6 +10954,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -12259,36 +12260,36 @@
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz",
+      "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "finalhandler": "1.2.0",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
         "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.0",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -12401,6 +12402,14 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -12418,6 +12427,14 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/express/node_modules/finalhandler/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -12468,9 +12485,9 @@
       ]
     },
     "node_modules/express/node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -12490,15 +12507,23 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/express/node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/send/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/express/node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz",
+      "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -12509,6 +12534,42 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/express/node_modules/serve-static/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/serve-static/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/express/node_modules/serve-static/node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -16367,9 +16428,12 @@
       "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -18389,9 +18453,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index d528c9188b..d85644ad23 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",

From 0ef2db146bc6c965e15582713e3a16ab4136c04b Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 14:48:59 -0300
Subject: [PATCH 0418/1286] Configuring the URI link target

---
 .../metadata-values/metadata-values.component.html   |  5 ++++-
 .../metadata-values/metadata-values.component.ts     | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 44a3657fa5..4fc0b41136 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -18,7 +18,10 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
+    <a class="dont-break-out ds-simple-metadata-link"
+      [href]="value"
+      [attr.target]="getLinkAttributes(value).target"
+      [attr.rel]="getLinkAttributes(value).rel">
       {{value}}
     </a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index c6ff454737..7bc91237d1 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -134,4 +134,16 @@ export class MetadataValuesComponent implements OnChanges {
   hasInternalLink(linkValue: string): boolean {
     return linkValue.startsWith(environment.ui.baseUrl);
   }
+
+  /**
+   * This method performs a validation and determines the target of the url.
+   * @returns - Returns the target url.
+   */
+ getLinkAttributes(urlValue: string): { target: string, rel: string } {
+    if (this.hasInternalLink(urlValue)) {
+      return { target: '_self', rel: '' };
+    } else {
+      return { target: '_blank', rel: 'noopener noreferrer' };
+    }
+  }
 }

From d7869f408ef221bc614547534a57b9b63a0aeef3 Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 15:15:26 -0300
Subject: [PATCH 0419/1286] fix identation

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

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 7bc91237d1..b42caace7b 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -139,7 +139,7 @@ export class MetadataValuesComponent implements OnChanges {
    * This method performs a validation and determines the target of the url.
    * @returns - Returns the target url.
    */
- getLinkAttributes(urlValue: string): { target: string, rel: string } {
+  getLinkAttributes(urlValue: string): { target: string, rel: string } {
     if (this.hasInternalLink(urlValue)) {
       return { target: '_self', rel: '' };
     } else {

From 8cda55a92e3146e6173b6e83a93640f7cb29a2b6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 11 Sep 2024 14:24:01 -0500
Subject: [PATCH 0420/1286] Bump Express to v4.20.0

---
 package.json |   2 +-
 yarn.lock    | 101 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 9e8d173198..82822316aa 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index d51b2d024b..d923560e56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3946,7 +3946,25 @@ bluebird@^3.7.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.2, body-parser@^1.19.0:
+body-parser@1.20.3:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.13.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
+body-parser@^1.19.0:
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
   integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
@@ -5237,6 +5255,11 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
+encodeurl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
@@ -5887,37 +5910,37 @@ express-static-gzip@^2.1.7:
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.3, express@^4.19.2:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
-  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+express@^4.17.3, express@^4.20.0:
+  version "4.20.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
+  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.2"
+    body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
     finalhandler "1.2.0"
     fresh "0.5.2"
     http-errors "2.0.0"
-    merge-descriptors "1.0.1"
+    merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
+    path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
     qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
+    send "0.19.0"
+    serve-static "1.16.0"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -8114,10 +8137,10 @@ memfs@^3.4.12, memfs@^3.4.3:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+merge-descriptors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
+  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -9116,10 +9139,10 @@ path-scurry@^1.11.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+path-to-regexp@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
+  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -9727,6 +9750,13 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
+qs@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+  dependencies:
+    side-channel "^1.0.6"
+
 qs@~6.10.3:
   version "6.10.5"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
@@ -10617,6 +10647,25 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
+send@0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
+  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+  dependencies:
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
+
 serialize-javascript@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
@@ -10654,7 +10703,17 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.15.0, serve-static@^1.14.1:
+serve-static@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
+  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.18.0"
+
+serve-static@^1.14.1:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
   integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
@@ -10730,7 +10789,7 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
-side-channel@^1.0.4:
+side-channel@^1.0.4, side-channel@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
   integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==

From f7706760cd730006a79093ba65cc13413e4aff95 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 11 Sep 2024 16:30:40 -0500
Subject: [PATCH 0421/1286] Bump Express to v4.20.0

---
 package.json |   2 +-
 yarn.lock    | 178 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 155 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 1d7bb0ee20..86959196d0 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index c6f4d25211..efc65983c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3652,10 +3652,10 @@ bluebird@^3.7.2:
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+body-parser@1.20.3:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.5"
@@ -3665,7 +3665,7 @@ body-parser@1.20.2:
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.11.0"
+    qs "6.13.0"
     raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
@@ -3958,6 +3958,17 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
@@ -4786,6 +4797,15 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
@@ -5089,6 +5109,11 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
+encodeurl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
@@ -5246,6 +5271,18 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
 es-get-iterator@^1.1.2:
   version "1.1.3"
   resolved "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"
@@ -5663,37 +5700,37 @@ express-static-gzip@^2.1.7:
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.3, express@^4.18.2, express@^4.19.2:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
-  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+express@^4.17.3, express@^4.18.2, express@^4.20.0:
+  version "4.20.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
+  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.2"
+    body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
     finalhandler "1.2.0"
     fresh "0.5.2"
     http-errors "2.0.0"
-    merge-descriptors "1.0.1"
+    merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
+    path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
     qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
+    send "0.19.0"
+    serve-static "1.16.0"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -6052,6 +6089,11 @@ function-bind@^1.1.1:
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 function.prototype.name@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
@@ -6100,6 +6142,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
@@ -6342,6 +6395,13 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
 has-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"
@@ -6371,6 +6431,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
   resolved "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz"
@@ -8066,10 +8133,10 @@ mensch@^0.3.4:
   resolved "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz"
   integrity sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+merge-descriptors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
+  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -8698,6 +8765,11 @@ object-inspect@^1.12.3, object-inspect@^1.9.0:
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
+object-inspect@^1.13.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
+
 object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"
@@ -9067,10 +9139,10 @@ path-scurry@^1.6.1:
     lru-cache "^9.0.0"
     minipass "^5.0.0"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+path-to-regexp@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
+  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -9646,6 +9718,13 @@ qs@6.11.0, qs@^6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
+qs@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+  dependencies:
+    side-channel "^1.0.6"
+
 qs@~6.10.3:
   version "6.10.4"
   resolved "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz"
@@ -10509,6 +10588,25 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
+send@0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
+  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+  dependencies:
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
+
 serialize-javascript@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"
@@ -10546,7 +10644,17 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.15.0, serve-static@^1.14.1:
+serve-static@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
+  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.18.0"
+
+serve-static@^1.14.1:
   version "1.15.0"
   resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
   integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
@@ -10566,6 +10674,18 @@ set-blocking@^2.0.0:
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
@@ -10614,6 +10734,16 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
+
 signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"

From 74c52bc5abf7474e11a6f924e40b071cad3b19da Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 13 Sep 2024 16:34:16 -0300
Subject: [PATCH 0422/1286] DSpace#2668 - Adding and changing classes in global
 scss to make cookie settings more accessible

---
 src/styles/_custom_variables.scss |  3 ++-
 src/styles/_global-styles.scss    | 34 +++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index f261f0f400..8af6583974 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -146,7 +146,8 @@
   --ds-process-overview-table-user-column-width: 200px;
   --ds-process-overview-table-info-column-width: 250px;
   --ds-process-overview-table-actions-column-width: 80px;
-  
+
   --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
   --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
+  --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 765b50ae86..dece9521b8 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -43,17 +43,39 @@ body {
     .cm-btn.cm-btn-success {
       color: var(--button-text-color-cookie);
       background-color: var(--green1);
-    }
-    .cm-btn.cm-btn-success.cm-btn-accept-all {
-      color: var(--button-text-color-cookie);
-      background-color: var(--green1);
+      font-weight: 600;
     }
   }
 }
 
-.klaro .cookie-modal a, .klaro .context-notice a, .klaro .cookie-notice a
-{
+.klaro .cookie-modal .cm-btn.cm-btn-success.cm-btn-accept-all {
+  color: var(--button-text-color-cookie);
+  background-color: var(--green1);
+  font-weight: 600;
+}
+
+.klaro .cookie-modal a,
+.klaro .context-notice a,
+.klaro .cookie-notice a {
   color: var(--green1);
+  text-decoration: underline !important;
+}
+
+.klaro .cookie-modal .cm-modal .cm-body span,
+.klaro
+  .cookie-modal
+  .cm-modal
+  .cm-body
+  ul.cm-purposes
+  li.cm-purpose
+  span.cm-required,
+p.purposes,
+.klaro .cookie-modal .cm-modal .cm-footer .cm-powered-by a {
+  color: var(--bs-light) !important;
+}
+
+.klaro .cookie-modal .cm-btn.cm-btn-info {
+  background-color: var(--very-dark-cyan) !important;
 }
 
 .media-viewer

From a9da80caaef3bf4e8c64aa56c61451e18f850575 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 16 Sep 2024 10:23:26 +0200
Subject: [PATCH 0423/1286] [CST-15593] run npm i for orejime

---
 package-lock.json | 261 ++++++++++++++++++++++++++++++----------------
 1 file changed, 169 insertions(+), 92 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f3d6856745..cebdf17570 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,6 @@
         "json5": "^2.2.3",
         "jsonschema": "1.4.1",
         "jwt-decode": "^3.1.2",
-        "klaro": "^0.7.18",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
@@ -73,6 +72,7 @@
         "ngx-pagination": "6.0.3",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
+        "orejime": "^2.3.0",
         "pem": "1.14.7",
         "reflect-metadata": "^0.1.13",
         "rxjs": "^7.8.0",
@@ -1855,39 +1855,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
-      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/generator": {
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
@@ -4614,6 +4581,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -4628,6 +4596,7 @@
       "version": "4.11.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
       "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -4636,6 +4605,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -4658,6 +4628,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4673,6 +4644,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4682,6 +4654,7 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -4695,12 +4668,14 @@
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4712,6 +4687,7 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4723,6 +4699,7 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
       "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -4748,6 +4725,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
         "debug": "^4.3.1",
@@ -4761,6 +4739,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4770,6 +4749,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4781,6 +4761,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -4793,7 +4774,8 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead"
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
     },
     "node_modules/@iiif/vocabulary": {
       "version": "1.0.26",
@@ -5389,34 +5371,6 @@
         "@angular/core": "^14.0.0"
       }
     },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7354,7 +7308,8 @@
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
     },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
@@ -7654,6 +7609,7 @@
       "version": "8.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7685,6 +7641,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -8955,6 +8912,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9273,6 +9231,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -9286,6 +9245,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -9889,6 +9849,7 @@
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -10422,7 +10383,8 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -10672,6 +10634,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -11360,6 +11323,7 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -11907,6 +11871,7 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -11918,6 +11883,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -11933,6 +11899,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11947,6 +11914,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11956,6 +11924,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11971,6 +11940,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -11981,12 +11951,14 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -11998,6 +11970,7 @@
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -12013,6 +11986,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -12028,6 +12002,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -12039,6 +12014,7 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -12053,6 +12029,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12060,12 +12037,14 @@
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -12080,6 +12059,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12091,6 +12071,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -12105,6 +12086,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12116,6 +12098,7 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12127,6 +12110,7 @@
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -12156,6 +12140,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -12167,6 +12152,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -12178,6 +12164,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -12186,6 +12173,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12253,6 +12241,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
+    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -12634,7 +12627,8 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -12659,12 +12653,14 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
     "node_modules/fast-printf": {
       "version": "1.6.9",
@@ -12734,6 +12730,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -12866,6 +12863,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
       "bin": {
         "flat": "cli.js"
       }
@@ -12874,6 +12872,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -12886,7 +12885,8 @@
     "node_modules/flatted": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
@@ -13033,7 +13033,8 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/fscreen": {
       "version": "1.2.0",
@@ -13186,6 +13187,7 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13222,6 +13224,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13231,6 +13234,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13326,7 +13330,8 @@
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
@@ -13752,6 +13757,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
       "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -13805,6 +13811,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -13820,6 +13827,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -13859,6 +13867,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -13883,6 +13892,7 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -14258,6 +14268,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14452,6 +14463,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14979,7 +14991,8 @@
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "3.0.2",
@@ -15005,7 +15018,8 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -15598,6 +15612,7 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -15606,20 +15621,11 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/klaro": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/klaro/-/klaro-0.7.21.tgz",
-      "integrity": "sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==",
-      "dependencies": {
-        "@babel/eslint-parser": "^7.23.10",
-        "sass": "^1.25.0",
-        "webpack-merge": "^5.10.0"
-      }
-    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -15764,6 +15770,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -15948,7 +15955,8 @@
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -16874,7 +16882,8 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "node_modules/needle": {
       "version": "3.3.1",
@@ -17799,6 +17808,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -17874,6 +17884,7 @@
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -17979,6 +17990,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/orejime": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.0.tgz",
+      "integrity": "sha512-eDUgd5yEF5pCIUHPNXVDKmgH+4k4GEwxU7eexBFeVESba3ZYDHSDq4ULXiF2LnZwxg+H6Qi28o8rGfGxNeOriA==",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2",
+        "react-modal": "^3.13.1"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16"
+      }
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -18005,6 +18029,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -18291,6 +18316,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -18392,6 +18418,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18400,6 +18427,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18408,6 +18436,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -19492,6 +19521,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -19971,6 +20001,29 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "node_modules/react-modal": {
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
+      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "dependencies": {
+        "exenv": "^1.2.0",
+        "prop-types": "^15.7.2",
+        "react-lifecycles-compat": "^3.0.0",
+        "warning": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+      }
+    },
     "node_modules/react-mosaic-component": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz",
@@ -20564,6 +20617,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -20861,6 +20915,7 @@
       "version": "1.62.1",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
       "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -21010,7 +21065,8 @@
     "node_modules/sass/node_modules/immutable": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "dev": true
     },
     "node_modules/sax": {
       "version": "1.4.1",
@@ -21355,6 +21411,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -21371,6 +21428,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -21382,6 +21440,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -22078,6 +22137,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -22343,7 +22403,8 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
     },
     "node_modules/throttle-debounce": {
       "version": "2.3.0",
@@ -22624,6 +22685,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -22946,6 +23008,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -22954,6 +23017,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -23515,6 +23579,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -23881,6 +23953,7 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
       "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
@@ -24114,12 +24187,14 @@
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true
     },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -24225,7 +24300,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "node_modules/ws": {
       "version": "8.17.1",
@@ -24335,6 +24411,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },

From 58c5d742b7e7a00605de8982ea2b2b95ad3ff1b7 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 16 Sep 2024 11:44:08 +0200
Subject: [PATCH 0424/1286] [CST-15593] fix orejime startup error

this was happening because of hidden apps not being removed from category arrays.
---
 src/app/shared/cookies/browser-orejime.service.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/cookies/browser-orejime.service.ts b/src/app/shared/cookies/browser-orejime.service.ts
index e23b19c58b..aa9d56d9ee 100644
--- a/src/app/shared/cookies/browser-orejime.service.ts
+++ b/src/app/shared/cookies/browser-orejime.service.ts
@@ -382,9 +382,13 @@ export class BrowserOrejimeService extends OrejimeService {
   }
 
   /**
-   * remove the Google Analytics from the apps
+   * remove apps that should be hidden from the configuration
    */
   private filterConfigApps(appsToHide: string[]) {
+    this.orejimeConfig.categories.forEach((category) => {
+      category.apps = category.apps.filter(service => !appsToHide.some(name => name === service));
+    });
+    this.orejimeConfig.categories = this.orejimeConfig.categories.filter(category => category.apps.length > 0);
     return this.orejimeConfig.apps.filter(service => !appsToHide.some(name => name === service.name));
   }
 

From 9fd3c2d73480059c140589159abf3198e6bf0999 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:44:06 +0200
Subject: [PATCH 0425/1286] 117544: PR feedback - added typedocs - changed
 directive to only be present for buttons - various other small fixes

---
 .../filtered-items.component.html             |  2 +-
 .../dso-edit-metadata-value.component.html    |  2 +-
 .../dso-edit-metadata-value.component.spec.ts |  3 +-
 .../item-delete/item-delete.component.html    |  2 +-
 .../access-control-array-form.component.html  |  2 +-
 ...cess-control-form-container.component.html | 12 ++++----
 src/app/shared/disabled-directive.spec.ts     |  8 ++++++
 src/app/shared/disabled-directive.ts          | 28 ++++++++++++++++++-
 ...amic-form-control-container.component.html |  2 +-
 .../date-picker/date-picker.component.html    |  6 ++--
 .../disabled/dynamic-disabled.component.html  |  2 +-
 .../dynamic-disabled.component.spec.ts        |  2 +-
 .../lookup/dynamic-lookup.component.html      |  4 +--
 .../onebox/dynamic-onebox.component.html      |  4 +--
 ...dynamic-scrollable-dropdown.component.html |  2 +-
 .../number-picker.component.html              |  2 +-
 .../vocabulary-treeview.component.html        |  4 +--
 .../collection-select.component.html          |  2 +-
 .../item-select/item-select.component.html    |  2 +-
 .../item-select/item-select.component.spec.ts |  3 +-
 .../pagination/pagination.component.html      |  2 +-
 ...mission-section-cc-licenses.component.html |  4 +--
 .../file/section-upload-file.component.html   |  2 +-
 23 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 38591b0fcd..1750975c9a 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -12,7 +12,7 @@
                         </ng-template>
                         <ng-template ngbPanelContent>
                             <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [dsDisabled]="item.disabled">{{item.name$ | async}}</option>
+                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
                             </select>
                             <div class="row">
                                 <span class="col-3"></span>
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 450dfae98c..221ae13451 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
@@ -36,7 +36,7 @@
           [authorityValue]="mdValue.newValue.confidence"
           [iconMode]="true"
       ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [dsDisabled]="!editingAuthority"
+        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
               (change)="onChangeAuthorityKey()" />
         <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
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 dee03772f8..c4daf09dbb 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
@@ -462,8 +462,7 @@ describe('DsoEditMetadataValueComponent', () => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
           const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
-          expect(inputElement.getAttribute('aria-disabled')).toBe('true');
-          expect(inputElement.classList.contains('disabled')).toBeTrue();
+          expect(inputElement.disabled).toBeTruthy();
           done();
         });
       });
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index eadec9babf..667363a381 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 630812c345..f2a5bdd422 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [dsDisabled]="ngForm.disabled"
+            [disabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index b01c3a30a6..92e5760efa 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index 7099e62d52..0443ca84dd 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -48,6 +48,14 @@ describe('DisabledDirective', () => {
     expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
   });
 
+  it('should bind aria-disabled to false and not have disabled class when isDisabled is false', () => {
+    component.isDisabled = false;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
   it('should prevent click events when disabled', () => {
     component.isDisabled = true;
     fixture.detectChanges();
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 8939c744ad..3563afbaf1 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -9,15 +9,36 @@ import {
   selector: '[dsDisabled]',
   standalone: true,
 })
+
+/**
+ * This directive can be added to a html element to disable it (make it non-interactive).
+ * It acts as a replacement for HTML's disabled attribute.
+ *
+ * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
+ */
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
     this.isDisabled = !!value;
   }
 
+    /**
+     * Binds the aria-disabled attribute to the directive's isDisabled property.
+     * This is used to make the element accessible to screen readers. If the element is disabled, the screen reader will announce it as such.
+     */
     @HostBinding('attr.aria-disabled') isDisabled = false;
+
+    /**
+     * Binds the class attribute to the directive's isDisabled property.
+     * This is used to style the element when it is disabled (make it look disabled).
+     */
     @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
 
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via mouse click).
+     * @param event The click event.
+     */
     @HostListener('click', ['$event'])
     handleClick(event: Event) {
       if (this.isDisabled) {
@@ -26,7 +47,12 @@ export class DisabledDirective {
       }
     }
 
-    @HostListener('keydown', ['$event'])
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via keystrokes).
+     * @param event The keydown event.
+     */
+  @HostListener('keydown', ['$event'])
     handleKeydown(event: KeyboardEvent) {
       if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
         event.preventDefault();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index ed3cbfb946..7224f1843d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -31,7 +31,7 @@
     <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
       <select
         #language="ngModel"
-        [dsDisabled]="model.readOnly"
+        [disabled]="model.readOnly"
         [(ngModel)]="model.language"
         class="form-control"
         (blur)="onBlur($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index bb15b82685..3bf02c4abd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -6,7 +6,7 @@
     <ds-number-picker
       tabindex="0"
       [id]="model.id + '_year'"
-      [dsDisabled]="model.disabled"
+      [disabled]="model.disabled"
       [min]="minYear"
       [max]="maxYear"
       [name]="'year'"
@@ -30,7 +30,7 @@
       [(ngModel)]="initialMonth"
       [value]="month"
       [placeholder]="monthPlaceholder"
-      [dsDisabled]="!year || model.disabled"
+      [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -46,7 +46,7 @@
       [(ngModel)]="initialDay"
       [value]="day"
       [placeholder]="dayPlaceholder"
-      [dsDisabled]="!month || model.disabled"
+      [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index c7b9441da8..5b58352214 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -6,7 +6,7 @@
                  [id]="id"
                  [name]="model.name"
                  [value]="modelValuesString"
-                 [dsDisabled]="model.disabled"
+                 [disabled]="model.disabled"
                  [type]="model.inputType"
                  [placeholder]="model.placeholder | translate"
                  [readonly]="model.readOnly">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index 88a24e1917..9e1a70090b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -75,7 +75,7 @@ describe('DsDynamicDisabledComponent', () => {
     expect(comp).toBeTruthy();
   });
 
-  xit('should have a disabled input', () => {
+  it('should have a disabled input', () => {
     const input = de.query(By.css('input'));
     expect(input.nativeElement.getAttribute('disabled')).toEqual('');
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c0b8aa4f3a..fe1278d5aa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -18,7 +18,7 @@
              [name]="model.name"
              [type]="model.inputType"
              [(ngModel)]="firstInputValue"
-             [dsDisabled]="isInputDisabled()"
+             [disabled]="isInputDisabled()"
              [placeholder]="model.placeholder | translate"
              [readonly]="model.readOnly"
              (change)="onChange($event)"
@@ -38,7 +38,7 @@
               [name]="model.name + '_2'"
               [type]="model.inputType"
               [(ngModel)]="secondInputValue"
-              [dsDisabled]="firstInputValue.length === 0 || isInputDisabled()"
+              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
               [placeholder]="model.secondPlaceholder | translate"
               [readonly]="model.readOnly"
               (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index ae8167b634..5463b06827 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -40,7 +40,7 @@
          [ngbTypeahead]="search"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [resultTemplate]="rt"
          [type]="model.inputType"
          [(ngModel)]="currentValue"
@@ -66,7 +66,7 @@
          [name]="model.name"
          [placeholder]="model.placeholder"
          [readonly]="true"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
          (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 62ca6db740..b4e6ac2c44 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -18,7 +18,7 @@
            [id]="id"
            [name]="model.name"
            [readonly]="true"
-           [dsDisabled]="model.readOnly"
+           [disabled]="model.readOnly"
            [type]="model.inputType"
            [value]="(currentValue | async)"
            (blur)="onBlur($event)"
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 48ace1eabf..8f2a875685 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -21,7 +21,7 @@
       (change)="update($event); $event.stopPropagation();"
       (focus)="onFocus($event); $event.stopPropagation();"
       [readonly]="disabled"
-      [dsDisabled]="disabled"
+      [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
       [attr.aria-label]="placeholder"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 3777c79ab2..4dc683fae8 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -40,7 +40,7 @@
                  container="body"
           >
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
@@ -72,7 +72,7 @@
                 [openDelay]="500"
                 container="body">
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index bc07b6b049..9bfe3e1156 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 9159b7e617..c74fe26afd 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 259b134a99..7aa6c7a639 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -197,8 +197,7 @@ describe('ItemSelectComponent', () => {
 
       const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
       expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-      expect(checkbox.getAttribute('aria-disabled')).toBe('true');
-      expect(checkbox.classList.contains('disabled')).toBe(true);
+      expect(checkbox.disabled).toBeTrue();
     }));
   });
 });
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index b3fb746945..2ce7f34166 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -41,7 +41,7 @@
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
       <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
-                      [dsDisabled]="paginationOptions.disabled"
+                      [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
                       [maxSize]="(isXs)?5:paginationOptions.maxSize"
                       [page]="(currentPage$|async)"
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 8847507a74..0c8c1abeeb 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,6 +1,6 @@
 <div class="mb-4 ccLicense-select">
   <ds-select
-    [dsDisabled]="!submissionCcLicenses">
+    [disabled]="!submissionCcLicenses">
 
     <ng-container class="selection">
       <span *ngIf="!submissionCcLicenses">
@@ -81,7 +81,7 @@
 
     </ng-template>
 
-    <ds-select *ngIf="field.enums?.length > 5" [dsDisabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
       <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
         <span *ngIf="option">
           {{ option.label }}
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 20e2e80a56..f8d6b9ca93 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -7,7 +7,7 @@
         type="checkbox"
         class="custom-control-input"
         id="primaryBitstream{{fileIndex}}"
-        [dsDisabled]="processingSaveStatus$ | async"
+        [disabled]="processingSaveStatus$ | async"
         [checked]="isPrimary"
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">

From 5a609d5bb173e0e2527fbececad8fe33b6e679e2 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:45:33 +0200
Subject: [PATCH 0426/1286] 117544: rename directive to be clear it should
 currently only be used for buttons

---
 .../bulk-access/bulk-access.component.html       |  2 +-
 .../bulk-access/bulk-access.component.ts         |  4 ++--
 .../epeople-registry.component.spec.ts           |  4 ++--
 .../eperson-form/eperson-form.component.html     |  2 +-
 .../eperson-form/eperson-form.component.spec.ts  |  4 ++--
 .../eperson-form/eperson-form.component.ts       |  4 ++--
 .../members-list/members-list.component.html     |  6 +++---
 .../members-list/members-list.component.ts       |  4 ++--
 .../groups-registry.component.html               |  2 +-
 .../groups-registry.component.spec.ts            |  4 ++--
 .../group-registry/groups-registry.component.ts  |  4 ++--
 .../filtered-items/filtered-items.component.html |  6 +++---
 .../filtered-items/filtered-items.component.ts   |  4 ++--
 .../delete-collection-page.component.html        |  4 ++--
 .../delete-collection-page.component.ts          |  4 ++--
 .../collection-source-controls.component.html    | 12 ++++++------
 .../collection-source-controls.component.spec.ts |  4 ++--
 .../collection-source-controls.component.ts      |  4 ++--
 .../collection-source.component.html             |  8 ++++----
 .../collection-source.component.ts               |  4 ++--
 .../delete-community-page.component.html         |  4 ++--
 .../delete-community-page.component.ts           |  4 ++--
 .../dso-edit-metadata-value.component.html       | 10 +++++-----
 .../dso-edit-metadata-value.component.spec.ts    |  4 ++--
 .../dso-edit-metadata-value.component.ts         |  4 ++--
 .../dso-edit-metadata.component.html             | 14 +++++++-------
 .../dso-edit-metadata.component.spec.ts          |  4 ++--
 .../dso-edit-metadata.component.ts               |  4 ++--
 .../forgot-password-form.component.html          |  2 +-
 .../forgot-password-form.component.ts            |  4 ++--
 .../end-user-agreement.component.html            |  2 +-
 .../end-user-agreement.component.spec.ts         |  4 ++--
 .../end-user-agreement.component.ts              |  4 ++--
 .../feedback-form/feedback-form.component.html   |  2 +-
 .../feedback-form.component.spec.ts              |  4 ++--
 .../feedback-form/feedback-form.component.ts     |  4 ++--
 .../bitstream-request-a-copy-page.component.html |  2 +-
 .../bitstream-request-a-copy-page.component.ts   |  4 ++--
 .../item-bitstreams.component.html               |  8 ++++----
 .../item-bitstreams/item-bitstreams.component.ts |  4 ++--
 .../item-edit-bitstream.component.html           |  4 ++--
 .../item-edit-bitstream.component.ts             |  4 ++--
 .../item-delete/item-delete.component.html       |  4 ++--
 .../item-delete/item-delete.component.ts         |  4 ++--
 .../item-move/item-move.component.html           |  4 ++--
 .../item-move/item-move.component.ts             |  4 ++--
 .../item-operation/item-operation.component.html |  4 ++--
 .../item-operation.component.spec.ts             |  4 ++--
 .../item-operation/item-operation.component.ts   |  4 ++--
 .../edit-relationship-list.component.html        |  2 +-
 .../edit-relationship-list.component.ts          |  4 ++--
 .../edit-relationship.component.html             |  4 ++--
 .../edit-relationship.component.ts               |  4 ++--
 .../item-relationships.component.html            |  4 ++--
 .../item-relationships.component.ts              |  4 ++--
 .../media-viewer-video.component.html            |  4 ++--
 .../media-viewer-video.component.ts              |  4 ++--
 .../orcid-auth/orcid-auth.component.html         |  2 +-
 .../orcid-auth/orcid-auth.component.ts           |  4 ++--
 ...m-versions-row-element-version.component.html |  4 ++--
 ...tem-versions-row-element-version.component.ts |  4 ++--
 .../versions/item-versions.component.html        |  2 +-
 .../versions/item-versions.component.spec.ts     |  4 ++--
 .../versions/item-versions.component.ts          |  4 ++--
 ...y-dspace-new-external-dropdown.component.html |  4 ++--
 .../my-dspace-new-external-dropdown.component.ts |  4 ++--
 ...dspace-new-submission-dropdown.component.html |  4 ++--
 ...y-dspace-new-submission-dropdown.component.ts |  4 ++--
 .../quality-assurance-events.component.html      | 16 ++++++++--------
 .../events/quality-assurance-events.component.ts |  4 ++--
 .../project-entry-import-modal.component.html    |  6 +++---
 .../project-entry-import-modal.component.ts      |  4 ++--
 .../suggestion-actions.component.html            |  2 +-
 .../suggestion-actions.component.ts              |  4 ++--
 .../overview/process-overview.component.html     |  4 ++--
 .../overview/process-overview.component.ts       |  4 ++--
 .../profile-claim-item-modal.component.html      |  2 +-
 .../profile-claim-item-modal.component.ts        |  4 ++--
 .../profile-page-researcher-form.component.html  |  6 +++---
 .../profile-page-researcher-form.component.ts    |  4 ++--
 .../register-email-form.component.html           |  4 ++--
 .../register-email-form.component.ts             |  4 ++--
 .../create-profile/create-profile.component.html |  2 +-
 .../create-profile/create-profile.component.ts   |  4 ++--
 .../email-request-copy.component.html            |  2 +-
 .../email-request-copy.component.ts              |  4 ++--
 .../access-control-array-form.component.html     |  8 ++++----
 .../access-control-array-form.component.ts       |  4 ++--
 .../access-control-form-container.component.html |  4 ++--
 .../access-control-form-container.component.ts   |  4 ++--
 ...ed-directive.ts => btn-disabled.directive.ts} |  4 ++--
 src/app/shared/disabled-directive.spec.ts        |  6 +++---
 .../shared/ds-select/ds-select.component.html    |  2 +-
 src/app/shared/ds-select/ds-select.component.ts  |  4 ++--
 ...o-edit-menu-expandable-section.component.html |  2 +-
 ...dso-edit-menu-expandable-section.component.ts |  4 ++--
 .../dso-edit-menu-section.component.html         |  4 ++--
 .../dso-edit-menu-section.component.ts           |  4 ++--
 ...s-dynamic-form-control-container.component.ts |  4 ++--
 .../dynamic-date-picker-inline.component.html    |  2 +-
 .../dynamic-date-picker-inline.component.ts      |  4 ++--
 .../models/date-picker/date-picker.component.ts  |  4 ++--
 .../disabled/dynamic-disabled.component.ts       |  4 ++--
 .../models/lookup/dynamic-lookup.component.html  |  8 ++++----
 .../lookup/dynamic-lookup.component.spec.ts      |  4 ++--
 .../models/lookup/dynamic-lookup.component.ts    |  4 ++--
 .../models/onebox/dynamic-onebox.component.ts    |  4 ++--
 .../dynamic-relation-group.component.html        |  6 +++---
 .../dynamic-relation-group.components.ts         |  4 ++--
 .../dynamic-scrollable-dropdown.component.ts     |  4 ++--
 .../dynamic-lookup-relation-modal.component.html |  8 ++++----
 ...namic-lookup-relation-modal.component.spec.ts |  4 ++--
 .../dynamic-lookup-relation-modal.component.ts   |  4 ++--
 ...rnal-source-entry-import-modal.component.html |  2 +-
 ...ternal-source-entry-import-modal.component.ts |  4 ++--
 src/app/shared/form/form.component.html          |  4 ++--
 src/app/shared/form/form.component.ts            |  4 ++--
 .../number-picker/number-picker.component.html   |  4 ++--
 .../number-picker/number-picker.component.ts     |  4 ++--
 .../vocabulary-treeview.component.html           |  8 ++++----
 .../vocabulary-treeview.component.ts             |  4 ++--
 .../password/log-in-password.component.html      |  2 +-
 .../password/log-in-password.component.ts        |  4 ++--
 .../claimed-task-actions-approve.component.html  |  2 +-
 .../claimed-task-actions-approve.component.ts    |  4 ++--
 ...imed-task-actions-decline-task.component.html |  2 +-
 ...laimed-task-actions-decline-task.component.ts |  4 ++--
 .../claimed-task-actions-reject.component.html   |  4 ++--
 .../claimed-task-actions-reject.component.ts     |  4 ++--
 ...ed-task-actions-return-to-pool.component.html |  2 +-
 ...imed-task-actions-return-to-pool.component.ts |  4 ++--
 .../pool-task/pool-task-actions.component.html   |  2 +-
 .../pool-task/pool-task-actions.component.ts     |  4 ++--
 .../collection-select.component.html             |  2 +-
 .../collection-select.component.ts               |  4 ++--
 .../item-select/item-select.component.html       |  2 +-
 .../item-select/item-select.component.spec.ts    |  4 ++--
 .../item-select/item-select.component.ts         |  4 ++--
 .../shared/pagination/pagination.component.html  |  4 ++--
 .../shared/pagination/pagination.component.ts    |  4 ++--
 .../form/resource-policy-form.component.html     |  4 ++--
 .../form/resource-policy-form.component.spec.ts  |  4 ++--
 .../form/resource-policy-form.component.ts       |  4 ++--
 .../resource-policies.component.html             |  4 ++--
 .../resource-policies.component.ts               |  4 ++--
 .../advanced-search.component.html               |  2 +-
 .../advanced-search/advanced-search.component.ts |  4 ++--
 .../subscription-modal.component.html            |  2 +-
 .../subscription-modal.component.ts              |  4 ++--
 .../subscription-view.component.html             |  2 +-
 .../subscription-view.component.ts               |  4 ++--
 .../upload/uploader/uploader.component.html      |  2 +-
 .../shared/upload/uploader/uploader.component.ts |  4 ++--
 .../submission-form-collection.component.html    |  2 +-
 .../submission-form-collection.component.spec.ts |  4 ++--
 .../submission-form-collection.component.ts      |  4 ++--
 .../footer/submission-form-footer.component.html |  8 ++++----
 .../submission-form-footer.component.spec.ts     |  4 ++--
 .../footer/submission-form-footer.component.ts   |  4 ++--
 .../submission-form-section-add.component.html   |  2 +-
 .../submission-form-section-add.component.ts     |  4 ++--
 ...sion-import-external-searchbar.component.html |  2 +-
 ...ission-import-external-searchbar.component.ts |  4 ++--
 .../submission-section-cc-licenses.component.ts  |  4 ++--
 .../edit/section-upload-file-edit.component.html |  2 +-
 .../edit/section-upload-file-edit.component.ts   |  4 ++--
 .../file/section-upload-file.component.html      |  2 +-
 .../upload/file/section-upload-file.component.ts |  4 ++--
 .../system-wide-alert-form.component.html        |  2 +-
 .../system-wide-alert-form.component.ts          |  4 ++--
 .../reviewers-list/reviewers-list.component.ts   |  4 ++--
 .../dso-edit-metadata.component.ts               |  4 ++--
 .../forgot-password-form.component.ts            |  4 ++--
 .../end-user-agreement.component.ts              |  4 ++--
 .../feedback-form/feedback-form.component.ts     |  4 ++--
 .../media-viewer-video.component.ts              |  4 ++--
 .../register-email-form.component.ts             |  4 ++--
 .../create-profile/create-profile.component.ts   |  4 ++--
 .../email-request-copy.component.ts              |  4 ++--
 ...ternal-source-entry-import-modal.component.ts |  4 ++--
 .../upload/file/section-upload-file.component.ts |  4 ++--
 181 files changed, 365 insertions(+), 365 deletions(-)
 rename src/app/shared/{disabled-directive.ts => btn-disabled.directive.ts} (96%)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 619ba1888d..cda6b805bc 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -10,7 +10,7 @@
     <button class="btn btn-outline-primary mr-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [dsDisabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index 10be65f24a..a1608d27d0 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -14,7 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
@@ -28,7 +28,7 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
     TranslateModule,
     BulkAccessSettingsComponent,
     BulkAccessBrowseComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 9ce1674e23..cd7441022c 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -42,7 +42,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
@@ -152,7 +152,7 @@ describe('EPeopleRegistryComponent', () => {
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
-        TranslateModule.forRoot(), EPeopleRegistryComponent, DisabledDirective],
+        TranslateModule.forRoot(), EPeopleRegistryComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 694fe9d7c5..98ff328884 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [dsDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 0b5a6ec752..2e9427df9c 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -45,7 +45,7 @@ import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -228,7 +228,7 @@ describe('EPersonFormComponent', () => {
     route = new ActivatedRouteStub();
     router = new RouterStub();
     TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, DisabledDirective, BrowserModule,
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BtnDisabledDirective, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 40f920f8d8..1c6f1929f3 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -66,7 +66,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
@@ -93,7 +93,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 e531b35f9e..d289d036bb 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
@@ -35,14 +35,14 @@
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
                       *ngIf="epersonDTO.ableToDelete"
-                      [dsDisabled]="actionConfig.remove.disabled"
+                      [dsBtnDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
               <button *ngIf="!epersonDTO.ableToDelete"
                       (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [dsDisabled]="actionConfig.add.disabled"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
@@ -122,7 +122,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [dsDisabled]="actionConfig.add.disabled"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 9e6087be35..6563a765d2 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -55,7 +55,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
@@ -114,7 +114,7 @@ export interface EPersonListActionConfig {
     RouterLink,
     NgClass,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index c64937af1d..4150e2560c 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -69,7 +69,7 @@
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
-                      [dsDisabled]="true"
+                      [dsBtnDisabled]="true"
                       class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 22bf2c35db..aaea59cead 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -50,7 +50,7 @@ import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   DSONameServiceMock,
   UNDEFINED_NAME,
@@ -209,7 +209,7 @@ describe('GroupsRegistryComponent', () => {
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot(),
         GroupsRegistryComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 73cfea2718..07b7317a1e 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -62,7 +62,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -85,7 +85,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     NgSwitchCase,
     NgbTooltipModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 1750975c9a..a765c4a190 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -54,7 +54,7 @@
                                             <div class="col-auto">
                                                 <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
                                                 &nbsp;
-                                                <button class="btn btn-light" [dsDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                                <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
                                             </div>
                                         </div>
                                     </div>
@@ -158,8 +158,8 @@
                                 {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
                             </div>
                             <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
 <!--
                                 <button id="export">{{'admin.reports.commons.export' | translate}}</button>
 -->
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 73b0eeb771..04ee4894ec 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -43,7 +43,7 @@ import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operator
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
 import { FilteredItems } from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
@@ -65,7 +65,7 @@ import { QueryPredicate } from './query-predicate.model';
     NgIf,
     NgForOf,
     FiltersComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ab1bff0849..0cdba00f03 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                       <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 1fab715aa4..3d4d4abb5f 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -16,7 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -32,7 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index cc01848290..1e09758bd1 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 22012263e0..2e3cf5477c 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,7 +22,7 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import { Process } from '../../../../process-page/processes/process.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
@@ -105,7 +105,7 @@ describe('CollectionSourceControlsComponent', () => {
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']);
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: ScriptDataService, useValue: scriptDataService },
         { provide: ProcessDataService, useValue: processDataService },
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 06dd537d9d..e35a64af16 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -40,7 +40,7 @@ import {
 } from '../../../../core/shared/operators';
 import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { VarDirective } from '../../../../shared/utils/var.directive';
@@ -57,7 +57,7 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 5b13401d22..7aa1f1a8b7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [dsDisabled]="(hasChanges$ | async) !== true"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [dsDisabled]="(hasChanges$ | async) !== true"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 96861c47a5..afeb2e2352 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -56,7 +56,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -82,7 +82,7 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 49058b0ebd..b5d215e3b6 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 59fb75fa97..b2fa5956cb 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -16,7 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -32,7 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     VarDirective,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 221ae13451..57cad2e9a7 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
@@ -71,29 +71,29 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [dsDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+                  [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [dsDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [dsDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                  [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="disabled"
+                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="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>
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 c4daf09dbb..196a13ec4a 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
@@ -34,7 +34,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -189,7 +189,7 @@ describe('DsoEditMetadataValueComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataValueComponent,
         VarDirective,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
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 1076be8431..3a67f3a180 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
@@ -67,7 +67,7 @@ import {
 import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import {
@@ -95,7 +95,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, DisabledDirective],
+  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
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 05d578324d..54392a00b0 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" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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" [dsDisabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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" [dsDisabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
@@ -21,7 +21,7 @@
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [dsDisabled]="!hasChanges || (saving$ | async)"
+            [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -77,13 +77,13 @@
   </div>
   <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" [dsDisabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
@@ -92,7 +92,7 @@
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [dsDisabled]="!hasChanges || (saving$ | async)"
+              [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
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 7f54c6eeeb..cbe2c18792 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
@@ -22,7 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { AlertComponent } from '../../shared/alert/alert.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TestDataService } from '../../shared/testing/test-data-service.mock';
@@ -95,7 +95,7 @@ describe('DsoEditMetadataComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataComponent,
         VarDirective,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
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 d27f4445bd..4a40e3c26a 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
@@ -47,7 +47,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -67,7 +67,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 1f3df7e333..6cff2903b9 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -28,7 +28,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValid"
+                    [dsBtnDisabled]="isInValid"
                     class="btn btn-default btn-primary"
                     (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
         </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 4b70fce18f..68f0f9d203 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -29,7 +29,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
@@ -43,7 +43,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 4b93d631b7..ceb2ad23a4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -7,7 +7,7 @@
 
     <div class="d-flex mt-4">
       <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [dsDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index 8195ce75eb..88cb46e377 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -16,7 +16,7 @@ import { of as observableOf } from 'rxjs';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
@@ -58,7 +58,7 @@ describe('EndUserAgreementComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), EndUserAgreementComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), EndUserAgreementComponent, BtnDisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index 7a02f10039..e9835945f5 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -23,7 +23,7 @@ import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
@@ -33,7 +33,7 @@ import { EndUserAgreementContentComponent } from './end-user-agreement-content/e
   templateUrl: './end-user-agreement.component.html',
   styleUrls: ['./end-user-agreement.component.scss'],
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 3fdc66820a..c5c4b460a2 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,7 +41,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 0b1f3439f4..56275ad5a3 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,7 +18,7 @@ import { FeedbackDataService } from '../../../core/feedback/feedback-data.servic
 import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -46,7 +46,7 @@ describe('FeedbackFormComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), FeedbackFormComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), FeedbackFormComponent, BtnDisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index f33ef35352..db98a2ee01 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -30,7 +30,7 @@ import {
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
@@ -39,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index a67dfb18be..5f42ccee74 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -79,7 +79,7 @@
             </a>
 
             <button
-                    [dsDisabled]="requestCopyForm.invalid"
+                    [dsBtnDisabled]="requestCopyForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
         </div>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 5db70ae51a..454725f2e6 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -55,7 +55,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -72,7 +72,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     AsyncPipe,
     ReactiveFormsModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index f068864b45..76b1f1096c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 6c734ad7c0..227908ca47 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -50,7 +50,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -80,7 +80,7 @@ import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag
     ItemEditBitstreamDragHandleComponent,
     NgForOf,
     ThemedLoadingComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   providers: [ObjectValuesPipe],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index d9a679a654..2cd245f320 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canRemove()" (click)="remove()"
+        <button [dsBtnDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canUndo()" (click)="undo()"
+        <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index e0b819b873..1be915b125 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -29,7 +29,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
 
@@ -44,7 +44,7 @@ import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
     NgbTooltipModule,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 667363a381..25780d989c 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 4e09a0b9ea..c54ca32a53 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -56,7 +56,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -110,7 +110,7 @@ class RelationshipDTO {
     VarDirective,
     NgForOf,
     RouterLink,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 0812c36f2d..63378f5afe 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -40,7 +40,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary" [dsDisabled]="!canMove" (click)="moveToCollection()">
+              <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
@@ -48,7 +48,7 @@
                 <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
               </span>
               </button>
-              <button class="btn btn-danger" [dsDisabled]="!canSubmit" (click)="discard()">
+              <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
                 <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
               </button>
             </div>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 5e2d355bba..07098aab11 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -37,7 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -57,7 +57,7 @@ import {
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 88acec3171..75f0736bbc 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" [dsDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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" [dsDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 42765f4d74..85ad62de93 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperationComponent } from './item-operation.component';
 import { ItemOperation } from './itemOperation.model';
 
@@ -18,7 +18,7 @@ describe('ItemOperationComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent, BtnDisabledDirective],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index b82fb154bf..7c3793cc57 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -7,7 +7,7 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperation } from './itemOperation.model';
 
 @Component({
@@ -18,7 +18,7 @@ import { ItemOperation } from './itemOperation.model';
     RouterLink,
     NgbTooltipModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index b0157cb989..06e3a4ace7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
     {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 1bc95291c7..79b57cee10 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -65,7 +65,7 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -101,7 +101,7 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 169a171d3f..8cd86d597b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -9,12 +9,12 @@
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
-      <button [dsDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+      <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               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 [dsDisabled]="!canUndo()" (click)="undo()"
+      <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
               class="btn btn-outline-warning btn-sm"
               title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
         <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 95aa87a28b..e711de94c6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -37,7 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -55,7 +55,7 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
     NgIf,
     TranslateModule,
     VirtualMetadataComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index cced89db93..0ee2e6acfd 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [dsDisabled]="(hasChanges$ | async) !== true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 359177c253..42309116f2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -42,7 +42,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -68,7 +68,7 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 46c6947868..a64b4ce548 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
@@ -19,7 +19,7 @@
 <div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
-    [dsDisabled]="currentIndex === 0"
+    [dsBtnDisabled]="currentIndex === 0"
     (click)="prevMedia()"
   >
     {{ "media-viewer.previous" | translate }}
@@ -27,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [dsDisabled]="currentIndex === medias.length - 1"
+    [dsBtnDisabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
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 bf1b58b467..6f962bfa8c 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
@@ -12,7 +12,7 @@ import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CaptionInfo } from './caption-info';
 import { languageHelper } from './language-helper';
 
@@ -28,7 +28,7 @@ import { languageHelper } from './language-helper';
     NgbDropdownModule,
     TranslateModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index d5aa0e2789..905372ba8c 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [dsDisabled]="(unlinkProcessing | async)">
+                [dsBtnDisabled]="(unlinkProcessing | async)">
           <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 6870d7e63e..c72b963356 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -33,7 +33,7 @@ import {
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
@@ -46,7 +46,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
     NgIf,
     NgForOf,
     AlertComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index 845a785168..a22ba008d8 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -31,7 +31,7 @@
         <!--CREATE-->
         <ng-container *ngIf="canCreateVersion$ | async">
           <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [dsDisabled]="isAnyBeingEdited() || hasDraftVersion"
+                  [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
                   (click)="createNewVersion(version)"
                   title="{{createVersionTitle | translate }}">
             <i class="fas fa-code-branch fa-fw"></i>
@@ -41,7 +41,7 @@
         <ng-container *ngIf="canDeleteVersion$ | async">
           <button class="btn btn-sm version-row-element-delete"
                   [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [dsDisabled]="isAnyBeingEdited()"
+                  [dsBtnDisabled]="isAnyBeingEdited()"
                   (click)="deleteVersion(version, version.id === itemVersion.id)"
                   title="{{'item.version.history.table.action.deleteVersion' | translate}}">
             <i class="fas fa-trash fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 2e41819c22..e142f7854c 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -49,7 +49,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   getItemEditVersionhistoryRoute,
@@ -68,7 +68,7 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     TranslateModule,
     NgClass,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 9dc96b6a3a..ad2f216838 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -67,7 +67,7 @@
                 <ng-template #notThisBeingEdited>
                   <!--EDIT-->
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          [dsDisabled]="isAnyBeingEdited()"
+                          [dsBtnDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(versionDTO.version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index 030c5a898a..b6ef946815 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -42,7 +42,7 @@ import { VersionHistory } from '../../core/shared/version-history.model';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { AlertComponent } from '../../shared/alert/alert.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -159,7 +159,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 4145b7cb69..90d70b90d3 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -48,7 +48,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -86,7 +86,7 @@ interface VersionDTO {
     NgIf,
     PaginationComponent,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7dbc440436..70905d95ee 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [dsDisabled]="(initialized$ | async) !== true"
+            type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 3af2f74bfe..cf242670b3 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -27,7 +27,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
@@ -46,7 +46,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index f40041f8a6..c68968e91f 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [dsDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+            [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [dsDisabled]="(initialized$ | async) !== true"
+            type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index f6c2874923..f06df3082e 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -28,7 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
@@ -48,7 +48,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index fa4fc5d3da..14438777fb 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -138,7 +138,7 @@
                       <div class="btn-group">
                         <button *ngIf="!eventElement.hasProject"
                                 class="btn btn-outline-primary btn-sm"
-                                [dsDisabled]="eventElement.isRunning"
+                                [dsBtnDisabled]="eventElement.isRunning"
                                 (click)="openModalLookup(eventElement); $event.stopPropagation();"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
                         >
@@ -146,7 +146,7 @@
                         </button>
                         <button *ngIf="eventElement.hasProject"
                                 class="btn btn-outline-danger btn-sm"
-                                [dsDisabled]="eventElement.isRunning"
+                                [dsBtnDisabled]="eventElement.isRunning"
                                 (click)="removeProject(eventElement)"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
                         >
@@ -161,7 +161,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
                               [attr.aria-label]="'quality-assurance.event.action.import' | translate"
                       >
@@ -171,7 +171,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="executeAction('ACCEPTED', eventElement)"
                               [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
                       >
@@ -180,7 +180,7 @@
                       <button class="btn btn-outline-dark btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="openModal('DISCARDED', eventElement, ignoreModal)"
                               [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
                       >
@@ -190,7 +190,7 @@
                               *ngIf="(isAdmin$ | async)"
                               ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="openModal('REJECTED', eventElement, rejectModal)"
                               [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
                       >
@@ -200,7 +200,7 @@
                               *ngIf="(isAdmin$ | async) === false"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
@@ -210,7 +210,7 @@
                       <button class="btn btn-outline-danger btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 488b432d89..23fc73345d 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -65,7 +65,7 @@ import {
 } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -87,7 +87,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, DisabledDirective],
+  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index f6375c2e02..4b9bbe64f3 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -32,8 +32,8 @@
     <div id="project-search" class="input-group mb-3">
       <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
       <div class="input-group-append">
-        <button type="button" class="btn btn-outline-secondary" [dsDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
-        <button type="button" class="btn btn-primary" [dsDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+        <button type="button" class="btn btn-outline-secondary" [dsBtnDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [dsBtnDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
       </div>
     </div>
 
@@ -66,6 +66,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 523e9afb7a..4954a32747 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -30,7 +30,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -106,7 +106,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index e83d0a4123..342919d4ae 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -21,7 +21,7 @@
   </div>
   <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
     {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsDisabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ml-2">
     <i class="fa fa-eye"></i>
     <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
     <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 1cb03bb8d2..0362e50f4c 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -15,7 +15,7 @@ import { take } from 'rxjs/operators';
 import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
 import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
@@ -32,7 +32,7 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
     TranslateModule,
     NgIf,
     NgbDropdownModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 8040cb786e..cd7b97609a 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -64,10 +64,10 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary mr-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
-                        [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                        [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
                 </button>
             </div>
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 09bc00d6f1..47efe888bf 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -16,7 +16,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -32,7 +32,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, DisabledDirective],
+  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, BtnDisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a118cd680d..3233aa5555 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -29,7 +29,7 @@
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsDisabled]="!checked">
+    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 53a013e7d3..7730b1e4dd 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -25,7 +25,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -43,7 +43,7 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     AsyncPipe,
     TranslateModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 2a2b356b31..d0279d9c5f 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -13,7 +13,7 @@
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
   <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [dsDisabled]="(isProcessingCreate() | async)"
+          [dsBtnDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
@@ -23,10 +23,10 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [dsDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary mr-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [dsDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index c31184e3d3..925ed6d5a6 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -37,7 +37,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
@@ -54,7 +54,7 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
     TranslateModule,
     UiSwitchModule,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 18cd7b9de2..b89ccd6151 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
-      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 302c6bc9c5..37ce725778 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -55,7 +55,7 @@ import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
 import { KlaroService } from '../shared/cookies/klaro.service';
-import { DisabledDirective } from '../shared/disabled-directive';
+import { BtnDisabledDirective } from '../shared/btn-disabled.directive';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -67,7 +67,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index dbdb006785..e5cf6c3e2e 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -81,7 +81,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValidPassword || userInfoForm.invalid"
+                    [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 1ec95c8f52..43ee0c8cd3 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -43,7 +43,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 
@@ -61,7 +61,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 815a9a9691..b2227bfbae 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [dsDisabled]="!subject || subject.length === 0"
+            [dsBtnDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index eb39ada853..34adfff97d 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -12,7 +12,7 @@ import {
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 
@@ -21,7 +21,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index f2a5bdd422..69c49d6117 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [dsDisabled]="ngForm.disabled"
+          [dsBtnDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 9c308ce1a2..8f7f640c28 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -17,7 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 import { dateToISOFormat } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
@@ -26,7 +26,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, DisabledDirective],
+  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, BtnDisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 92e5760efa..0c93aabcf5 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 11313dfc99..46895b8532 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -31,7 +31,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AlertComponent } from '../alert/alert.component';
 import { AlertType } from '../alert/alert-type';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
 import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
@@ -47,7 +47,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/btn-disabled.directive.ts
similarity index 96%
rename from src/app/shared/disabled-directive.ts
rename to src/app/shared/btn-disabled.directive.ts
index 3563afbaf1..f73422a9d5 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -6,7 +6,7 @@ import {
 } from '@angular/core';
 
 @Directive({
-  selector: '[dsDisabled]',
+  selector: '[dsBtnDisabled]',
   standalone: true,
 })
 
@@ -16,7 +16,7 @@ import {
  *
  * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
  */
-export class DisabledDirective {
+export class BtnDisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
     this.isDisabled = !!value;
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index 0443ca84dd..96f760fc46 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -8,11 +8,11 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
-import { DisabledDirective } from './disabled-directive';
+import { BtnDisabledDirective } from './btn-disabled.directive';
 
 @Component({
   template: `
-    <button [dsDisabled]="isDisabled">Test Button</button>
+    <button [dsBtnDisabled]="isDisabled">Test Button</button>
   `,
 })
 class TestComponent {
@@ -26,7 +26,7 @@ describe('DisabledDirective', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [DisabledDirective],
+      imports: [BtnDisabledDirective],
       declarations: [TestComponent],
     });
     fixture = TestBed.createComponent(TestComponent);
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index de53ef0792..e87b7c5cc6 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -13,7 +13,7 @@
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
-            [dsDisabled]="disabled"
+            [dsBtnDisabled]="disabled"
             ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index c7a8fafa72..2616ce4a9f 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -8,7 +8,7 @@ import {
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 
 /**
  * Component which represent a DSpace dropdown selector.
@@ -18,7 +18,7 @@ import { DisabledDirective } from '../disabled-directive';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule, DisabledDirective],
+  imports: [NgbDropdownModule, NgIf, TranslateModule, BtnDisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 747d14cac6..0503281329 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index d2ed04641e..fadaee8b22 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -22,7 +22,7 @@ import { MenuID } from 'src/app/shared/menu/menu-id.model';
 import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { hasValue } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 
@@ -34,7 +34,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, DisabledDirective],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, BtnDisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 9f796c35ce..0738e2f28a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index c23e50d9bc..246f9efb6e 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -10,7 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
@@ -24,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, DisabledDirective],
+  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 340474981e..9c72cd4ffa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -101,7 +101,7 @@ import { SubmissionObject } from '../../../../core/submission/models/submission-
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { SubmissionService } from '../../../../submission/submission.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -143,7 +143,7 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 088cd6efbb..c0ff290d73 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -29,7 +29,7 @@
                 type="button"
                 [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
-                [dsDisabled]="model.disabled"
+                [dsBtnDisabled]="model.disabled"
                 (click)="datepicker.toggle()">
 
             <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 7130bfaf1a..bc47884198 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -26,7 +26,7 @@ import {
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
@@ -36,7 +36,7 @@ import { DisabledDirective } from '../../../../../disabled-directive';
     NgbDatepickerModule,
     ReactiveFormsModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index a43286dda8..f398ea6965 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -24,7 +24,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import isEqual from 'lodash/isEqual';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { hasValue } from '../../../../../empty.util';
 import { NumberPickerComponent } from '../../../../number-picker/number-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
@@ -42,7 +42,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 6d4d39d67f..cb429dd7e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -12,7 +12,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 /**
@@ -23,7 +23,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
   templateUrl: './dynamic-disabled.component.html',
   imports: [
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index fe1278d5aa..e2b1f29492 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -52,7 +52,7 @@
               type="button"
               ngbTooltip="{{'form.search-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly || isSearchDisabled()"
+              [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
               [hidden]="isInputDisabled()"
               (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
@@ -60,7 +60,7 @@
               type="button"
               ngbTooltip="{{'form.clear-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly"
+              [dsBtnDisabled]="model.readOnly"
               (click)="remove()">{{'form.clear' | translate}}
       </button>
     </div>
@@ -69,14 +69,14 @@
               type="button"
               ngbTooltip="{{'form.edit-help' | translate}}"
               placement="top"
-              [dsDisabled]="isEditDisabled()"
+              [dsBtnDisabled]="isEditDisabled()"
               (click)="switchEditMode()">{{'form.edit' | translate}}
       </button>
       <button *ngIf="editMode" class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.save-help' | translate}}"
               placement="top"
-              [dsDisabled]="!hasEmptyValue()"
+              [dsBtnDisabled]="!hasEmptyValue()"
               (click)="saveChanges()">{{'form.save' | translate}}
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 77de7953f1..493c56e29d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -33,7 +33,7 @@ import { of as observableOf } from 'rxjs';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
@@ -175,7 +175,7 @@ describe('Dynamic Lookup component', () => {
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index b16ec0e537..39c39cf8bc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -46,7 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -77,7 +77,7 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 055e5c9c19..de6b50d589 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -59,7 +59,7 @@ import { Vocabulary } from '../../../../../../core/submission/vocabularies/model
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -91,7 +91,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
     ObjNgFor,
     NgForOf,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index bad0f1ab91..1cb8ee1e1a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -32,21 +32,21 @@
 
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
           <i class="fas fa-save text-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="!editMode"
+                [dsBtnDisabled]="!editMode"
                 (click)="delete()">
           <i class="fas fa-trash text-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="clear()">
           <i class="fas fa-undo fa-2x"
              aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index d9c5fbd9e1..f397687686 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -46,7 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { shrinkInOut } from '../../../../../animations/shrink';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -82,7 +82,7 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 1dfa624d61..645be48fdc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -43,7 +43,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
@@ -63,7 +63,7 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
     InfiniteScrollModule,
     NgForOf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index cd5979f779..d12c27eb64 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsBtnDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -73,18 +73,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+              [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+            [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index c1a795d5c3..d6db87b993 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -33,7 +33,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
-import { DisabledDirective } from '../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
@@ -124,7 +124,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index c81ea8eccd..3cbcbc8460 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -50,7 +50,7 @@ import {
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
-import { DisabledDirective } from '../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -92,7 +92,7 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     AsyncPipe,
     NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/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.html b/src/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.html
index 6a39c49c67..7d233fe0b7 100644
--- a/src/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.html
+++ b/src/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.html
@@ -49,6 +49,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/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.ts b/src/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.ts
index 89504ccdfc..c666baf21f 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -38,7 +38,7 @@ import {
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
-import { DisabledDirective } from '../../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
@@ -70,7 +70,7 @@ export enum ImportType {
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 92b0e05552..85e32e66ea 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [dsDisabled]="(isValid() | async) !== true">
+                    [dsBtnDisabled]="(isValid() | async) !== true">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index d96f16044a..a757239aea 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -39,7 +39,7 @@ import {
   map,
 } from 'rxjs/operators';
 
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -70,7 +70,7 @@ import { FormService } from './form.service';
     DynamicFormsCoreModule,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 8f2a875685..9b9d038e86 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -3,7 +3,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
       <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
@@ -30,7 +30,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
       <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 70ad484680..ef35e1ee79 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -20,7 +20,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -34,7 +34,7 @@ import { isEmpty } from '../../empty.util';
     NgClass,
     FormsModule,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 4dc683fae8..c249dc850c 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -6,7 +6,7 @@
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsDisabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
@@ -15,7 +15,7 @@
         <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -49,7 +49,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
@@ -81,7 +81,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
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 9d2a8e12ab..ae98afc2eb 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -30,7 +30,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { AlertComponent } from '../../alert/alert.component';
 import { AlertType } from '../../alert/alert-type';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -66,7 +66,7 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 2447565331..00ef253167 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -24,7 +24,7 @@
        @fadeOut>{{ (message | async) | translate }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [dsDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+          [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
 
 <ng-container *ngIf="canShowDivider$ | async">
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 84d618cb79..25ec0cba74 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -49,7 +49,7 @@ import { AuthorizationDataService } from '../../../../core/data/feature-authoriz
 import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { fadeOut } from '../../../animations/fade';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
 
@@ -63,7 +63,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, BtnDisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index a672763a86..affbec108c 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-success'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index a03a1eb00c..f154837be6 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -22,7 +22,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -34,7 +34,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index b942d2b19c..0d1f0d471e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,5 +1,5 @@
 <button (click)="submitTask()"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         class="declineTaskAction btn btn-warning"
         ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
         type="button">
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 5bc0ccb946..e021a21ae0 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -21,7 +21,7 @@ import { RemoteData } from 'src/app/core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -33,7 +33,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index d6e4c95ee9..21e7f4d21b 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,7 +1,7 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
         [ngbTooltip]="rejectTipContent"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
@@ -28,7 +28,7 @@
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
               class="btn btn-danger btn-lg btn-block mt-3"
-              [dsDisabled]="!rejectForm.valid || (processing$ | async)"
+              [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
         <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 433bfa8fc3..6d7ec9c036 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -33,7 +33,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -45,7 +45,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 60ff5f39ce..32a619d671 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-secondary'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index 313a6efe6b..a7d510a8e6 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -20,7 +20,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 
@@ -31,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 926effa95d..b164767c23 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,5 +1,5 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsDisabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 2f1cb1b95e..67340c9ec7 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -34,7 +34,7 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
@@ -46,7 +46,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9bfe3e1156..03491e7491 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -34,7 +34,7 @@
     </button>
     <button class="btn collection-confirm"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index c2111927dc..1d1b8ed06b 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -20,7 +20,7 @@ import { getCollectionPageRoute } from '../../../collection-page/collection-page
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -37,7 +37,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index c74fe26afd..6f3d31703d 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 7aa6c7a639..656e0716e9 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -18,7 +18,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { HostWindowService } from '../../host-window.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
@@ -102,7 +102,7 @@ describe('ItemSelectComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), BtnDisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index a44627c622..2267a65686 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -19,7 +19,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -35,7 +35,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 2ce7f34166..9dd093be2b 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -55,12 +55,12 @@
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
-                [dsDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+                [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
-              [dsDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 93fe8036ec..6796950285 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -40,7 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
@@ -59,7 +59,7 @@ import { PaginationComponentOptions } from './pagination-component-options.model
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, DisabledDirective],
+  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, BtnDisabledDirective],
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 64f97696ed..14171cb30b 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [dsDisabled]="(isProcessing | async)"
+                  [dsBtnDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [dsDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+                  [dsBtnDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 64836aeb8c..d4dac77d72 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -49,7 +49,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
@@ -217,7 +217,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         ResourcePolicyFormComponent,
         TestComponent,
         NgxMaskModule.forRoot(),
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index e61940dad4..e13ba9ecc7 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -51,7 +51,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -96,7 +96,7 @@ export interface ResourcePolicyEvent {
     AsyncPipe,
     NgIf,
     NgFor,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 3de68cfa63..04d5fb7960 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [dsDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                      [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [dsDisabled]="(isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 971f3a747b..729789bc6e 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -41,7 +41,7 @@ import { GroupDataService } from '../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -64,7 +64,7 @@ import {
     NgIf,
     AsyncPipe,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index 1465d73645..259e10c275 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -30,7 +30,7 @@
                                (findSuggestions)="findSuggestions($event)"
                                ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [dsDisabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index dfc934ad9c..99eaa23a0d 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -31,7 +31,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -56,7 +56,7 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     KeyValuePipe,
     NgForOf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index f44dc2ce3f..37a7a3f431 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -34,7 +34,7 @@
             (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [dsDisabled]="(processing$ | async) || !isValid">
+    <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 23fba5f502..05ee5bcc51 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -50,7 +50,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../alert/alert.component';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -62,7 +62,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 986b4f3dc8..6bdc0d397a 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -21,7 +21,7 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsDisabled]="!dso"
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
             [title]="'subscriptions.table.edit' | translate"
             class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 15239fd506..9d9ce08905 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -20,7 +20,7 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
@@ -33,7 +33,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, DisabledDirective],
+  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index d7795942be..b9e42fa759 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -35,7 +35,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsDisabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index ec66981f16..fbafe811eb 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -27,7 +27,7 @@ import {
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
 } from '../../../core/xsrf/xsrf.constants';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -43,7 +43,7 @@ import { UploaderProperties } from './uploader-properties.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [TranslateModule, FileUploadModule, CommonModule, DisabledDirective],
+  imports: [TranslateModule, FileUploadModule, CommonModule, BtnDisabledDirective],
 })
 export class UploaderComponent implements OnInit, AfterViewInit {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 2af47497b2..db33afc76a 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [dsDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+            [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 9ff048a626..61bad0439f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -31,7 +31,7 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
@@ -153,7 +153,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         TranslateModule.forRoot(),
         SubmissionFormCollectionComponent,
         TestComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 7e574a00d5..10b1f815dc 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -36,7 +36,7 @@ import { SubmissionObject } from '../../../core/submission/models/submission-obj
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -58,7 +58,7 @@ import { SubmissionService } from '../../submission.service';
     TranslateModule,
     NgbDropdownModule,
     ThemedCollectionDropdownComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges, OnInit {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index 4d3e76ff51..c860fb557b 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index 3b36d56aca..82bc309cc8 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -25,7 +25,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
@@ -52,7 +52,7 @@ describe('SubmissionFormFooterComponent', () => {
         TranslateModule.forRoot(),
         SubmissionFormFooterComponent,
         TestComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index adaf5c85ef..8645003783 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -15,7 +15,7 @@ import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { SubmissionService } from '../../submission.service';
@@ -28,7 +28,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-footer.component.scss'],
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
-  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, DisabledDirective],
+  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index c5f8d25fc2..563044d270 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -6,7 +6,7 @@
   <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [dsDisabled]="(hasSections$ | async) !== true"
+          [dsBtnDisabled]="(hasSections$ | async) !== true"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index c97afc9d83..eeeda893f1 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
 import { SectionsService } from '../../sections/sections.service';
@@ -23,7 +23,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-section-add.component.scss'],
   templateUrl: './submission-form-section-add.component.html',
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgbDropdownModule, DisabledDirective],
+  imports: [CommonModule, TranslateModule, NgbDropdownModule, BtnDisabledDirective],
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 96e7e2e172..f5bde4e81a 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsBtnDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index 7572d3ac8b..eb7a703cc2 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -36,7 +36,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -71,7 +71,7 @@ export interface ExternalSourceData {
     InfiniteScrollModule,
     NgbDropdownModule,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index 62546e1835..7618de5173 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -40,7 +40,7 @@ import {
 import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -65,7 +65,7 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 91b89e8435..b03504c6be 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,7 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsDisabled]="isSaving">
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
       <span aria-hidden="true">×</span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index c7ba64e4b9..0a6c1bd44d 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -39,7 +39,7 @@ import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/build
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
 import { dateToISOFormat } from '../../../../../shared/date.util';
-import { DisabledDirective } from '../../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -81,7 +81,7 @@ import {
     FormComponent,
     NgIf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index f8d6b9ca93..bfc09e86c1 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -35,7 +35,7 @@
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [dsDisabled]="(processingDelete$ | async)"
+                  [dsBtnDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
             <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 9e9c15bb2f..09ea3cb112 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -28,7 +28,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotUndefined,
@@ -55,7 +55,7 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 0f20e0e927..dc2699b6d1 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,7 +87,7 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index b695bb47ed..ea1c0a55f0 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -43,7 +43,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -60,7 +60,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index e87a292c0c..57e8c73031 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -45,7 +45,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -77,7 +77,7 @@ enum SubKey {
     RouterLink,
     NgClass,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
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
index 40a6264e4e..f74a73a4b8 100644
--- 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
@@ -13,7 +13,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso
 import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 
 @Component({
@@ -23,7 +23,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index ff64b09664..37fb383429 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 @Component({
@@ -23,7 +23,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 /**
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index e557fc466c..2b78006f65 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-end-user-agreement',
@@ -13,7 +13,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
   // templateUrl: './end-user-agreement.component.html'
   templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index b86fecae7a..3835667111 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -7,7 +7,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
-import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
 
 @Component({
@@ -17,7 +17,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 020293214e..0efa013064 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -7,7 +7,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
-import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-media-viewer-video',
@@ -21,7 +21,7 @@ import { DisabledDirective } from '../../../../../../app/shared/disabled-directi
     NgbDropdownModule,
     TranslateModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class MediaViewerVideoComponent extends BaseComponent {
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index d9be35f39d..d1f4a6d3ff 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -12,14 +12,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component';
 import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component';
 
 import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
-import { DisabledDirective } from '../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-register-email-form',
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index 659e260b1c..7c1ff908c3 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -28,7 +28,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class CreateProfileComponent extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index a299e47a27..cf4981d289 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -7,7 +7,7 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-email-request-copy',
@@ -16,7 +16,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/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.ts b/src/themes/custom/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.ts
index 7936deb406..aec7bfd6db 100644
--- a/src/themes/custom/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.ts
+++ b/src/themes/custom/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.ts
@@ -5,7 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../../../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../../../../../app/shared/btn-disabled.directive';
 import { ExternalSourceEntryImportModalComponent as BaseComponent } 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 { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component';
 
@@ -20,7 +20,7 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class ExternalSourceEntryImportModalComponent extends BaseComponent {
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 17bc5d9136..cea515102a 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
-import { DisabledDirective } from '../../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../../app/shared/btn-disabled.directive';
 import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
 import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
 import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component';
@@ -28,7 +28,7 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionSectionUploadFileComponent

From 0928dc1ca95065482c6fc190b287b5841a55ed55 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 14:11:59 +0200
Subject: [PATCH 0427/1286] 117544: linting

---
 .../epeople-registry/eperson-form/eperson-form.component.ts     | 2 +-
 .../group-form/members-list/members-list.component.ts           | 2 +-
 .../delete-collection-page/delete-collection-page.component.ts  | 2 +-
 .../delete-community-page/delete-community-page.component.ts    | 2 +-
 .../profile-page-researcher-form.component.ts                   | 2 +-
 src/app/register-email-form/register-email-form.component.ts    | 2 +-
 .../access-control-array-form.component.ts                      | 2 +-
 .../external-source-entry-import-modal.component.ts             | 2 +-
 .../form/resource-policy-form.component.spec.ts                 | 2 +-
 .../resource-policies/form/resource-policy-form.component.ts    | 2 +-
 .../subscription-view/subscription-view.component.ts            | 2 +-
 .../collection/submission-form-collection.component.spec.ts     | 2 +-
 .../form/collection/submission-form-collection.component.ts     | 2 +-
 .../upload/file/edit/section-upload-file-edit.component.ts      | 2 +-
 .../reviewers-list/reviewers-list.component.ts                  | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 1c6f1929f3..c8236ca22d 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -65,8 +65,8 @@ import {
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
-import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 6563a765d2..22934394c8 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -54,8 +54,8 @@ import {
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 3d4d4abb5f..acc716b52a 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -15,8 +15,8 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index b2fa5956cb..9c19a5eb47 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -15,8 +15,8 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index 925ed6d5a6..5d09097e6b 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -36,8 +36,8 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 37ce725778..585ca71c24 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -54,8 +54,8 @@ import {
 import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
-import { KlaroService } from '../shared/cookies/klaro.service';
 import { BtnDisabledDirective } from '../shared/btn-disabled.directive';
+import { KlaroService } from '../shared/cookies/klaro.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 8f7f640c28..3dc84a833a 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -16,8 +16,8 @@ import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
-import { dateToISOFormat } from '../../date.util';
 import { BtnDisabledDirective } from '../../btn-disabled.directive';
+import { dateToISOFormat } from '../../date.util';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
diff --git a/src/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.ts b/src/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.ts
index c666baf21f..e0cc90ceaa 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -37,8 +37,8 @@ import {
   getRemoteDataPayload,
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
-import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
 import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive';
+import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index d4dac77d72..deaef6c611 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -45,11 +45,11 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
 import { SubmissionService } from '../../../submission/submission.service';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index e13ba9ecc7..08a7f18492 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -47,11 +47,11 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 9d9ce08905..f940e69795 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -19,8 +19,8 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 61bad0439f..3a5ae8a18d 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -30,8 +30,8 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
+import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 10b1f815dc..1736b474d5 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -34,9 +34,9 @@ import { Collection } from '../../../core/shared/collection.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 0a6c1bd44d..79b3d3a565 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -38,8 +38,8 @@ import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/b
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
-import { dateToISOFormat } from '../../../../../shared/date.util';
 import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive';
+import { dateToISOFormat } from '../../../../../shared/date.util';
 import {
   hasNoValue,
   hasValue,
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 57e8c73031..c43fabdb83 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -44,8 +44,8 @@ import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.mod
 import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';

From e7d050d3ebe92b20223259a657077b72f0247402 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:44:06 +0200
Subject: [PATCH 0428/1286] 117544: PR feedback - added typedocs - changed
 directive to only be present for buttons - various other small fixes

---
 .../filtered-items.component.html             |  2 +-
 .../dso-edit-metadata-value.component.html    |  2 +-
 .../dso-edit-metadata-value.component.spec.ts |  3 +-
 .../item-delete/item-delete.component.html    |  2 +-
 .../access-control-array-form.component.html  |  2 +-
 ...cess-control-form-container.component.html | 12 ++++----
 src/app/shared/disabled-directive.spec.ts     |  8 ++++++
 src/app/shared/disabled-directive.ts          | 28 ++++++++++++++++++-
 ...amic-form-control-container.component.html |  2 +-
 .../date-picker/date-picker.component.html    |  6 ++--
 .../disabled/dynamic-disabled.component.html  |  2 +-
 .../dynamic-disabled.component.spec.ts        |  2 +-
 .../lookup/dynamic-lookup.component.html      |  4 +--
 .../onebox/dynamic-onebox.component.html      |  4 +--
 ...dynamic-scrollable-dropdown.component.html |  2 +-
 .../number-picker.component.html              |  2 +-
 .../vocabulary-treeview.component.html        |  4 +--
 .../collection-select.component.html          |  2 +-
 .../item-select/item-select.component.html    |  2 +-
 .../item-select/item-select.component.spec.ts |  3 +-
 .../pagination/pagination.component.html      |  2 +-
 ...mission-section-cc-licenses.component.html |  4 +--
 .../file/section-upload-file.component.html   |  2 +-
 23 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 38591b0fcd..1750975c9a 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -12,7 +12,7 @@
                         </ng-template>
                         <ng-template ngbPanelContent>
                             <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [dsDisabled]="item.disabled">{{item.name$ | async}}</option>
+                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
                             </select>
                             <div class="row">
                                 <span class="col-3"></span>
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 450dfae98c..221ae13451 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
@@ -36,7 +36,7 @@
           [authorityValue]="mdValue.newValue.confidence"
           [iconMode]="true"
       ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [dsDisabled]="!editingAuthority"
+        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
               (change)="onChangeAuthorityKey()" />
         <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
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 dee03772f8..c4daf09dbb 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
@@ -462,8 +462,7 @@ describe('DsoEditMetadataValueComponent', () => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
           const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
-          expect(inputElement.getAttribute('aria-disabled')).toBe('true');
-          expect(inputElement.classList.contains('disabled')).toBeTrue();
+          expect(inputElement.disabled).toBeTruthy();
           done();
         });
       });
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index eadec9babf..667363a381 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 630812c345..f2a5bdd422 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [dsDisabled]="ngForm.disabled"
+            [disabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index b01c3a30a6..92e5760efa 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index 7099e62d52..0443ca84dd 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -48,6 +48,14 @@ describe('DisabledDirective', () => {
     expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
   });
 
+  it('should bind aria-disabled to false and not have disabled class when isDisabled is false', () => {
+    component.isDisabled = false;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
   it('should prevent click events when disabled', () => {
     component.isDisabled = true;
     fixture.detectChanges();
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 8939c744ad..3563afbaf1 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -9,15 +9,36 @@ import {
   selector: '[dsDisabled]',
   standalone: true,
 })
+
+/**
+ * This directive can be added to a html element to disable it (make it non-interactive).
+ * It acts as a replacement for HTML's disabled attribute.
+ *
+ * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
+ */
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
     this.isDisabled = !!value;
   }
 
+    /**
+     * Binds the aria-disabled attribute to the directive's isDisabled property.
+     * This is used to make the element accessible to screen readers. If the element is disabled, the screen reader will announce it as such.
+     */
     @HostBinding('attr.aria-disabled') isDisabled = false;
+
+    /**
+     * Binds the class attribute to the directive's isDisabled property.
+     * This is used to style the element when it is disabled (make it look disabled).
+     */
     @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
 
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via mouse click).
+     * @param event The click event.
+     */
     @HostListener('click', ['$event'])
     handleClick(event: Event) {
       if (this.isDisabled) {
@@ -26,7 +47,12 @@ export class DisabledDirective {
       }
     }
 
-    @HostListener('keydown', ['$event'])
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via keystrokes).
+     * @param event The keydown event.
+     */
+  @HostListener('keydown', ['$event'])
     handleKeydown(event: KeyboardEvent) {
       if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
         event.preventDefault();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index ed3cbfb946..7224f1843d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -31,7 +31,7 @@
     <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
       <select
         #language="ngModel"
-        [dsDisabled]="model.readOnly"
+        [disabled]="model.readOnly"
         [(ngModel)]="model.language"
         class="form-control"
         (blur)="onBlur($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index bb15b82685..3bf02c4abd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -6,7 +6,7 @@
     <ds-number-picker
       tabindex="0"
       [id]="model.id + '_year'"
-      [dsDisabled]="model.disabled"
+      [disabled]="model.disabled"
       [min]="minYear"
       [max]="maxYear"
       [name]="'year'"
@@ -30,7 +30,7 @@
       [(ngModel)]="initialMonth"
       [value]="month"
       [placeholder]="monthPlaceholder"
-      [dsDisabled]="!year || model.disabled"
+      [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -46,7 +46,7 @@
       [(ngModel)]="initialDay"
       [value]="day"
       [placeholder]="dayPlaceholder"
-      [dsDisabled]="!month || model.disabled"
+      [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index c7b9441da8..5b58352214 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -6,7 +6,7 @@
                  [id]="id"
                  [name]="model.name"
                  [value]="modelValuesString"
-                 [dsDisabled]="model.disabled"
+                 [disabled]="model.disabled"
                  [type]="model.inputType"
                  [placeholder]="model.placeholder | translate"
                  [readonly]="model.readOnly">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index 88a24e1917..9e1a70090b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -75,7 +75,7 @@ describe('DsDynamicDisabledComponent', () => {
     expect(comp).toBeTruthy();
   });
 
-  xit('should have a disabled input', () => {
+  it('should have a disabled input', () => {
     const input = de.query(By.css('input'));
     expect(input.nativeElement.getAttribute('disabled')).toEqual('');
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index c0b8aa4f3a..fe1278d5aa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -18,7 +18,7 @@
              [name]="model.name"
              [type]="model.inputType"
              [(ngModel)]="firstInputValue"
-             [dsDisabled]="isInputDisabled()"
+             [disabled]="isInputDisabled()"
              [placeholder]="model.placeholder | translate"
              [readonly]="model.readOnly"
              (change)="onChange($event)"
@@ -38,7 +38,7 @@
               [name]="model.name + '_2'"
               [type]="model.inputType"
               [(ngModel)]="secondInputValue"
-              [dsDisabled]="firstInputValue.length === 0 || isInputDisabled()"
+              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
               [placeholder]="model.secondPlaceholder | translate"
               [readonly]="model.readOnly"
               (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index ae8167b634..5463b06827 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -40,7 +40,7 @@
          [ngbTypeahead]="search"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [resultTemplate]="rt"
          [type]="model.inputType"
          [(ngModel)]="currentValue"
@@ -66,7 +66,7 @@
          [name]="model.name"
          [placeholder]="model.placeholder"
          [readonly]="true"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
          (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 62ca6db740..b4e6ac2c44 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -18,7 +18,7 @@
            [id]="id"
            [name]="model.name"
            [readonly]="true"
-           [dsDisabled]="model.readOnly"
+           [disabled]="model.readOnly"
            [type]="model.inputType"
            [value]="(currentValue | async)"
            (blur)="onBlur($event)"
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 48ace1eabf..8f2a875685 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -21,7 +21,7 @@
       (change)="update($event); $event.stopPropagation();"
       (focus)="onFocus($event); $event.stopPropagation();"
       [readonly]="disabled"
-      [dsDisabled]="disabled"
+      [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
       [attr.aria-label]="placeholder"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index d9f5738cc7..f8ad321d31 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -39,7 +39,7 @@
                  container="body"
           >
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
@@ -71,7 +71,7 @@
                 [openDelay]="500"
                 container="body">
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index bc07b6b049..9bfe3e1156 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 9159b7e617..c74fe26afd 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 259b134a99..7aa6c7a639 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -197,8 +197,7 @@ describe('ItemSelectComponent', () => {
 
       const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
       expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-      expect(checkbox.getAttribute('aria-disabled')).toBe('true');
-      expect(checkbox.classList.contains('disabled')).toBe(true);
+      expect(checkbox.disabled).toBeTrue();
     }));
   });
 });
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index b3fb746945..2ce7f34166 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -41,7 +41,7 @@
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
       <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
-                      [dsDisabled]="paginationOptions.disabled"
+                      [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
                       [maxSize]="(isXs)?5:paginationOptions.maxSize"
                       [page]="(currentPage$|async)"
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 8847507a74..0c8c1abeeb 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,6 +1,6 @@
 <div class="mb-4 ccLicense-select">
   <ds-select
-    [dsDisabled]="!submissionCcLicenses">
+    [disabled]="!submissionCcLicenses">
 
     <ng-container class="selection">
       <span *ngIf="!submissionCcLicenses">
@@ -81,7 +81,7 @@
 
     </ng-template>
 
-    <ds-select *ngIf="field.enums?.length > 5" [dsDisabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
       <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
         <span *ngIf="option">
           {{ option.label }}
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 20e2e80a56..f8d6b9ca93 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -7,7 +7,7 @@
         type="checkbox"
         class="custom-control-input"
         id="primaryBitstream{{fileIndex}}"
-        [dsDisabled]="processingSaveStatus$ | async"
+        [disabled]="processingSaveStatus$ | async"
         [checked]="isPrimary"
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">

From aec970f9d1bdd48d31f5421afd1a9cd517a01c31 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:45:33 +0200
Subject: [PATCH 0429/1286] 117544: rename directive to be clear it should
 currently only be used for buttons

---
 .../bulk-access/bulk-access.component.html       |  2 +-
 .../bulk-access/bulk-access.component.ts         |  4 ++--
 .../epeople-registry.component.spec.ts           |  4 ++--
 .../eperson-form/eperson-form.component.html     |  2 +-
 .../eperson-form/eperson-form.component.spec.ts  |  4 ++--
 .../eperson-form/eperson-form.component.ts       |  4 ++--
 .../members-list/members-list.component.html     |  6 +++---
 .../members-list/members-list.component.ts       |  4 ++--
 .../groups-registry.component.html               |  2 +-
 .../groups-registry.component.spec.ts            |  4 ++--
 .../group-registry/groups-registry.component.ts  |  4 ++--
 .../filtered-items/filtered-items.component.html |  6 +++---
 .../filtered-items/filtered-items.component.ts   |  4 ++--
 .../delete-collection-page.component.html        |  4 ++--
 .../delete-collection-page.component.ts          |  4 ++--
 .../collection-source-controls.component.html    | 12 ++++++------
 .../collection-source-controls.component.spec.ts |  4 ++--
 .../collection-source-controls.component.ts      |  4 ++--
 .../collection-source.component.html             |  8 ++++----
 .../collection-source.component.ts               |  4 ++--
 .../delete-community-page.component.html         |  4 ++--
 .../delete-community-page.component.ts           |  4 ++--
 .../dso-edit-metadata-value.component.html       | 10 +++++-----
 .../dso-edit-metadata-value.component.spec.ts    |  4 ++--
 .../dso-edit-metadata-value.component.ts         |  4 ++--
 .../dso-edit-metadata.component.html             | 14 +++++++-------
 .../dso-edit-metadata.component.spec.ts          |  4 ++--
 .../dso-edit-metadata.component.ts               |  4 ++--
 .../forgot-password-form.component.html          |  2 +-
 .../forgot-password-form.component.ts            |  4 ++--
 .../end-user-agreement.component.html            |  2 +-
 .../end-user-agreement.component.spec.ts         |  4 ++--
 .../end-user-agreement.component.ts              |  4 ++--
 .../feedback-form/feedback-form.component.html   |  2 +-
 .../feedback-form.component.spec.ts              |  4 ++--
 .../feedback-form/feedback-form.component.ts     |  4 ++--
 .../bitstream-request-a-copy-page.component.html |  2 +-
 .../bitstream-request-a-copy-page.component.ts   |  4 ++--
 .../item-bitstreams.component.html               |  8 ++++----
 .../item-bitstreams/item-bitstreams.component.ts |  4 ++--
 .../item-edit-bitstream.component.html           |  4 ++--
 .../item-edit-bitstream.component.ts             |  4 ++--
 .../item-delete/item-delete.component.html       |  4 ++--
 .../item-delete/item-delete.component.ts         |  4 ++--
 .../item-move/item-move.component.html           |  4 ++--
 .../item-move/item-move.component.ts             |  4 ++--
 .../item-operation/item-operation.component.html |  4 ++--
 .../item-operation.component.spec.ts             |  4 ++--
 .../item-operation/item-operation.component.ts   |  4 ++--
 .../edit-relationship-list.component.html        |  2 +-
 .../edit-relationship-list.component.ts          |  4 ++--
 .../edit-relationship.component.html             |  4 ++--
 .../edit-relationship.component.ts               |  4 ++--
 .../item-relationships.component.html            |  4 ++--
 .../item-relationships.component.ts              |  4 ++--
 .../media-viewer-video.component.html            |  4 ++--
 .../media-viewer-video.component.ts              |  4 ++--
 .../orcid-auth/orcid-auth.component.html         |  2 +-
 .../orcid-auth/orcid-auth.component.ts           |  4 ++--
 ...m-versions-row-element-version.component.html |  4 ++--
 ...tem-versions-row-element-version.component.ts |  4 ++--
 .../versions/item-versions.component.html        |  2 +-
 .../versions/item-versions.component.spec.ts     |  4 ++--
 .../versions/item-versions.component.ts          |  4 ++--
 ...y-dspace-new-external-dropdown.component.html |  4 ++--
 .../my-dspace-new-external-dropdown.component.ts |  4 ++--
 ...dspace-new-submission-dropdown.component.html |  4 ++--
 ...y-dspace-new-submission-dropdown.component.ts |  4 ++--
 .../quality-assurance-events.component.html      | 16 ++++++++--------
 .../events/quality-assurance-events.component.ts |  4 ++--
 .../project-entry-import-modal.component.html    |  6 +++---
 .../project-entry-import-modal.component.ts      |  4 ++--
 .../suggestion-actions.component.html            |  2 +-
 .../suggestion-actions.component.ts              |  4 ++--
 .../overview/process-overview.component.html     |  4 ++--
 .../overview/process-overview.component.ts       |  4 ++--
 .../profile-claim-item-modal.component.html      |  2 +-
 .../profile-claim-item-modal.component.ts        |  4 ++--
 .../profile-page-researcher-form.component.html  |  6 +++---
 .../profile-page-researcher-form.component.ts    |  4 ++--
 .../register-email-form.component.html           |  4 ++--
 .../register-email-form.component.ts             |  4 ++--
 .../create-profile/create-profile.component.html |  2 +-
 .../create-profile/create-profile.component.ts   |  4 ++--
 .../email-request-copy.component.html            |  2 +-
 .../email-request-copy.component.ts              |  4 ++--
 .../access-control-array-form.component.html     |  8 ++++----
 .../access-control-array-form.component.ts       |  4 ++--
 .../access-control-form-container.component.html |  4 ++--
 .../access-control-form-container.component.ts   |  4 ++--
 ...ed-directive.ts => btn-disabled.directive.ts} |  4 ++--
 src/app/shared/disabled-directive.spec.ts        |  6 +++---
 .../shared/ds-select/ds-select.component.html    |  2 +-
 src/app/shared/ds-select/ds-select.component.ts  |  4 ++--
 ...o-edit-menu-expandable-section.component.html |  2 +-
 ...dso-edit-menu-expandable-section.component.ts |  4 ++--
 .../dso-edit-menu-section.component.html         |  4 ++--
 .../dso-edit-menu-section.component.ts           |  4 ++--
 ...s-dynamic-form-control-container.component.ts |  4 ++--
 .../dynamic-date-picker-inline.component.html    |  2 +-
 .../dynamic-date-picker-inline.component.ts      |  4 ++--
 .../models/date-picker/date-picker.component.ts  |  4 ++--
 .../disabled/dynamic-disabled.component.ts       |  4 ++--
 .../models/lookup/dynamic-lookup.component.html  |  8 ++++----
 .../lookup/dynamic-lookup.component.spec.ts      |  4 ++--
 .../models/lookup/dynamic-lookup.component.ts    |  4 ++--
 .../models/onebox/dynamic-onebox.component.ts    |  4 ++--
 .../dynamic-relation-group.component.html        |  6 +++---
 .../dynamic-relation-group.components.ts         |  4 ++--
 .../dynamic-scrollable-dropdown.component.ts     |  4 ++--
 .../dynamic-lookup-relation-modal.component.html |  8 ++++----
 ...namic-lookup-relation-modal.component.spec.ts |  4 ++--
 .../dynamic-lookup-relation-modal.component.ts   |  4 ++--
 ...rnal-source-entry-import-modal.component.html |  2 +-
 ...ternal-source-entry-import-modal.component.ts |  4 ++--
 src/app/shared/form/form.component.html          |  4 ++--
 src/app/shared/form/form.component.ts            |  4 ++--
 .../number-picker/number-picker.component.html   |  4 ++--
 .../number-picker/number-picker.component.ts     |  4 ++--
 .../vocabulary-treeview.component.html           |  8 ++++----
 .../vocabulary-treeview.component.ts             |  4 ++--
 .../password/log-in-password.component.html      |  2 +-
 .../password/log-in-password.component.ts        |  4 ++--
 .../claimed-task-actions-approve.component.html  |  2 +-
 .../claimed-task-actions-approve.component.ts    |  4 ++--
 ...imed-task-actions-decline-task.component.html |  2 +-
 ...laimed-task-actions-decline-task.component.ts |  4 ++--
 .../claimed-task-actions-reject.component.html   |  4 ++--
 .../claimed-task-actions-reject.component.ts     |  4 ++--
 ...ed-task-actions-return-to-pool.component.html |  2 +-
 ...imed-task-actions-return-to-pool.component.ts |  4 ++--
 .../pool-task/pool-task-actions.component.html   |  2 +-
 .../pool-task/pool-task-actions.component.ts     |  4 ++--
 .../collection-select.component.html             |  2 +-
 .../collection-select.component.ts               |  4 ++--
 .../item-select/item-select.component.html       |  2 +-
 .../item-select/item-select.component.spec.ts    |  4 ++--
 .../item-select/item-select.component.ts         |  4 ++--
 .../shared/pagination/pagination.component.html  |  4 ++--
 .../shared/pagination/pagination.component.ts    |  4 ++--
 .../form/resource-policy-form.component.html     |  4 ++--
 .../form/resource-policy-form.component.spec.ts  |  4 ++--
 .../form/resource-policy-form.component.ts       |  4 ++--
 .../resource-policies.component.html             |  4 ++--
 .../resource-policies.component.ts               |  4 ++--
 .../advanced-search.component.html               |  2 +-
 .../advanced-search/advanced-search.component.ts |  4 ++--
 .../subscription-modal.component.html            |  2 +-
 .../subscription-modal.component.ts              |  4 ++--
 .../subscription-view.component.html             |  2 +-
 .../subscription-view.component.ts               |  4 ++--
 .../upload/uploader/uploader.component.html      |  2 +-
 .../shared/upload/uploader/uploader.component.ts |  4 ++--
 .../submission-form-collection.component.html    |  2 +-
 .../submission-form-collection.component.spec.ts |  4 ++--
 .../submission-form-collection.component.ts      |  4 ++--
 .../footer/submission-form-footer.component.html |  8 ++++----
 .../submission-form-footer.component.spec.ts     |  4 ++--
 .../footer/submission-form-footer.component.ts   |  4 ++--
 .../submission-form-section-add.component.html   |  2 +-
 .../submission-form-section-add.component.ts     |  4 ++--
 ...sion-import-external-searchbar.component.html |  2 +-
 ...ission-import-external-searchbar.component.ts |  4 ++--
 .../submission-section-cc-licenses.component.ts  |  4 ++--
 .../edit/section-upload-file-edit.component.html |  2 +-
 .../edit/section-upload-file-edit.component.ts   |  4 ++--
 .../file/section-upload-file.component.html      |  2 +-
 .../upload/file/section-upload-file.component.ts |  4 ++--
 .../system-wide-alert-form.component.html        |  2 +-
 .../system-wide-alert-form.component.ts          |  4 ++--
 .../reviewers-list/reviewers-list.component.ts   |  4 ++--
 .../dso-edit-metadata.component.ts               |  4 ++--
 .../forgot-password-form.component.ts            |  4 ++--
 .../end-user-agreement.component.ts              |  4 ++--
 .../feedback-form/feedback-form.component.ts     |  4 ++--
 .../media-viewer-video.component.ts              |  4 ++--
 .../register-email-form.component.ts             |  4 ++--
 .../create-profile/create-profile.component.ts   |  4 ++--
 .../email-request-copy.component.ts              |  4 ++--
 ...ternal-source-entry-import-modal.component.ts |  4 ++--
 .../upload/file/section-upload-file.component.ts |  4 ++--
 181 files changed, 365 insertions(+), 365 deletions(-)
 rename src/app/shared/{disabled-directive.ts => btn-disabled.directive.ts} (96%)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 619ba1888d..cda6b805bc 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -10,7 +10,7 @@
     <button class="btn btn-outline-primary mr-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [dsDisabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index 10be65f24a..a1608d27d0 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -14,7 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
@@ -28,7 +28,7 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
     TranslateModule,
     BulkAccessSettingsComponent,
     BulkAccessBrowseComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 9ce1674e23..cd7441022c 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -42,7 +42,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
@@ -152,7 +152,7 @@ describe('EPeopleRegistryComponent', () => {
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
-        TranslateModule.forRoot(), EPeopleRegistryComponent, DisabledDirective],
+        TranslateModule.forRoot(), EPeopleRegistryComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 694fe9d7c5..98ff328884 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [dsDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 0b5a6ec752..2e9427df9c 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -45,7 +45,7 @@ import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -228,7 +228,7 @@ describe('EPersonFormComponent', () => {
     route = new ActivatedRouteStub();
     router = new RouterStub();
     TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, DisabledDirective, BrowserModule,
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BtnDisabledDirective, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 40f920f8d8..1c6f1929f3 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -66,7 +66,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
@@ -93,7 +93,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 e531b35f9e..d289d036bb 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
@@ -35,14 +35,14 @@
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
                       *ngIf="epersonDTO.ableToDelete"
-                      [dsDisabled]="actionConfig.remove.disabled"
+                      [dsBtnDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
               <button *ngIf="!epersonDTO.ableToDelete"
                       (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [dsDisabled]="actionConfig.add.disabled"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
@@ -122,7 +122,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [dsDisabled]="actionConfig.add.disabled"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 9e6087be35..6563a765d2 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -55,7 +55,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
@@ -114,7 +114,7 @@ export interface EPersonListActionConfig {
     RouterLink,
     NgClass,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index c64937af1d..4150e2560c 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -69,7 +69,7 @@
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
-                      [dsDisabled]="true"
+                      [dsBtnDisabled]="true"
                       class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 22bf2c35db..aaea59cead 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -50,7 +50,7 @@ import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   DSONameServiceMock,
   UNDEFINED_NAME,
@@ -209,7 +209,7 @@ describe('GroupsRegistryComponent', () => {
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot(),
         GroupsRegistryComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 73cfea2718..07b7317a1e 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -62,7 +62,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -85,7 +85,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     NgSwitchCase,
     NgbTooltipModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 1750975c9a..a765c4a190 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -54,7 +54,7 @@
                                             <div class="col-auto">
                                                 <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
                                                 &nbsp;
-                                                <button class="btn btn-light" [dsDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                                <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
                                             </div>
                                         </div>
                                     </div>
@@ -158,8 +158,8 @@
                                 {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
                             </div>
                             <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
 <!--
                                 <button id="export">{{'admin.reports.commons.export' | translate}}</button>
 -->
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 73b0eeb771..04ee4894ec 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -43,7 +43,7 @@ import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operator
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
 import { FilteredItems } from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
@@ -65,7 +65,7 @@ import { QueryPredicate } from './query-predicate.model';
     NgIf,
     NgForOf,
     FiltersComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index ab1bff0849..0cdba00f03 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                       <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 1fab715aa4..3d4d4abb5f 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -16,7 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -32,7 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index cc01848290..1e09758bd1 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 22012263e0..2e3cf5477c 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,7 +22,7 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import { Process } from '../../../../process-page/processes/process.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
@@ -105,7 +105,7 @@ describe('CollectionSourceControlsComponent', () => {
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']);
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: ScriptDataService, useValue: scriptDataService },
         { provide: ProcessDataService, useValue: processDataService },
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 06dd537d9d..e35a64af16 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -40,7 +40,7 @@ import {
 } from '../../../../core/shared/operators';
 import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { VarDirective } from '../../../../shared/utils/var.directive';
@@ -57,7 +57,7 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 5b13401d22..7aa1f1a8b7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [dsDisabled]="(hasChanges$ | async) !== true"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [dsDisabled]="(hasChanges$ | async) !== true"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 96861c47a5..afeb2e2352 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -56,7 +56,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -82,7 +82,7 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 49058b0ebd..b5d215e3b6 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 59fb75fa97..b2fa5956cb 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -16,7 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -32,7 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     VarDirective,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 221ae13451..57cad2e9a7 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
@@ -71,29 +71,29 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [dsDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+                  [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [dsDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [dsDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                  [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="disabled"
+                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="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>
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 c4daf09dbb..196a13ec4a 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
@@ -34,7 +34,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -189,7 +189,7 @@ describe('DsoEditMetadataValueComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataValueComponent,
         VarDirective,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
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 1076be8431..3a67f3a180 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
@@ -67,7 +67,7 @@ import {
 import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import {
@@ -95,7 +95,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, DisabledDirective],
+  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
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 05d578324d..54392a00b0 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" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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" [dsDisabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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" [dsDisabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
@@ -21,7 +21,7 @@
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [dsDisabled]="!hasChanges || (saving$ | async)"
+            [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -77,13 +77,13 @@
   </div>
   <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" [dsDisabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
@@ -92,7 +92,7 @@
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [dsDisabled]="!hasChanges || (saving$ | async)"
+              [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
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 7f54c6eeeb..cbe2c18792 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
@@ -22,7 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { AlertComponent } from '../../shared/alert/alert.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TestDataService } from '../../shared/testing/test-data-service.mock';
@@ -95,7 +95,7 @@ describe('DsoEditMetadataComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataComponent,
         VarDirective,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
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 12d77ab24f..2b8f42567c 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
@@ -47,7 +47,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -67,7 +67,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 1f3df7e333..6cff2903b9 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -28,7 +28,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValid"
+                    [dsBtnDisabled]="isInValid"
                     class="btn btn-default btn-primary"
                     (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
         </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 4b70fce18f..68f0f9d203 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -29,7 +29,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
@@ -43,7 +43,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 4b93d631b7..ceb2ad23a4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -7,7 +7,7 @@
 
     <div class="d-flex mt-4">
       <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [dsDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index 8195ce75eb..88cb46e377 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -16,7 +16,7 @@ import { of as observableOf } from 'rxjs';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
@@ -58,7 +58,7 @@ describe('EndUserAgreementComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), EndUserAgreementComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), EndUserAgreementComponent, BtnDisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index 7a02f10039..e9835945f5 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -23,7 +23,7 @@ import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
@@ -33,7 +33,7 @@ import { EndUserAgreementContentComponent } from './end-user-agreement-content/e
   templateUrl: './end-user-agreement.component.html',
   styleUrls: ['./end-user-agreement.component.scss'],
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 3fdc66820a..c5c4b460a2 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,7 +41,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 0b1f3439f4..56275ad5a3 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,7 +18,7 @@ import { FeedbackDataService } from '../../../core/feedback/feedback-data.servic
 import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -46,7 +46,7 @@ describe('FeedbackFormComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), FeedbackFormComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), FeedbackFormComponent, BtnDisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index f33ef35352..db98a2ee01 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -30,7 +30,7 @@ import {
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
@@ -39,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index a67dfb18be..5f42ccee74 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -79,7 +79,7 @@
             </a>
 
             <button
-                    [dsDisabled]="requestCopyForm.invalid"
+                    [dsBtnDisabled]="requestCopyForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
         </div>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 35fd357da2..dcc999e938 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -55,7 +55,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -72,7 +72,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     AsyncPipe,
     ReactiveFormsModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index f068864b45..76b1f1096c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 6c734ad7c0..227908ca47 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -50,7 +50,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -80,7 +80,7 @@ import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag
     ItemEditBitstreamDragHandleComponent,
     NgForOf,
     ThemedLoadingComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   providers: [ObjectValuesPipe],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index d9a679a654..2cd245f320 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canRemove()" (click)="remove()"
+        <button [dsBtnDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canUndo()" (click)="undo()"
+        <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index e0b819b873..1be915b125 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -29,7 +29,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
 
@@ -44,7 +44,7 @@ import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
     NgbTooltipModule,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 667363a381..25780d989c 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 4e09a0b9ea..c54ca32a53 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -56,7 +56,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -110,7 +110,7 @@ class RelationshipDTO {
     VarDirective,
     NgForOf,
     RouterLink,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 0812c36f2d..63378f5afe 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -40,7 +40,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary" [dsDisabled]="!canMove" (click)="moveToCollection()">
+              <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
@@ -48,7 +48,7 @@
                 <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
               </span>
               </button>
-              <button class="btn btn-danger" [dsDisabled]="!canSubmit" (click)="discard()">
+              <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
                 <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
               </button>
             </div>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 5e2d355bba..07098aab11 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -37,7 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -57,7 +57,7 @@ import {
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 88acec3171..75f0736bbc 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" [dsDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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" [dsDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 42765f4d74..85ad62de93 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperationComponent } from './item-operation.component';
 import { ItemOperation } from './itemOperation.model';
 
@@ -18,7 +18,7 @@ describe('ItemOperationComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent, BtnDisabledDirective],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index b82fb154bf..7c3793cc57 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -7,7 +7,7 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperation } from './itemOperation.model';
 
 @Component({
@@ -18,7 +18,7 @@ import { ItemOperation } from './itemOperation.model';
     RouterLink,
     NgbTooltipModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index b0157cb989..06e3a4ace7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
     {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 1bc95291c7..79b57cee10 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -65,7 +65,7 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -101,7 +101,7 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 169a171d3f..8cd86d597b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -9,12 +9,12 @@
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
-      <button [dsDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+      <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               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 [dsDisabled]="!canUndo()" (click)="undo()"
+      <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
               class="btn btn-outline-warning btn-sm"
               title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
         <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 95aa87a28b..e711de94c6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -37,7 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -55,7 +55,7 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
     NgIf,
     TranslateModule,
     VirtualMetadataComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index cced89db93..0ee2e6acfd 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [dsDisabled]="(hasChanges$ | async) !== true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 359177c253..42309116f2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -42,7 +42,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -68,7 +68,7 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
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 46c6947868..a64b4ce548 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
@@ -19,7 +19,7 @@
 <div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
-    [dsDisabled]="currentIndex === 0"
+    [dsBtnDisabled]="currentIndex === 0"
     (click)="prevMedia()"
   >
     {{ "media-viewer.previous" | translate }}
@@ -27,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [dsDisabled]="currentIndex === medias.length - 1"
+    [dsBtnDisabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
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 bf1b58b467..6f962bfa8c 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
@@ -12,7 +12,7 @@ import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CaptionInfo } from './caption-info';
 import { languageHelper } from './language-helper';
 
@@ -28,7 +28,7 @@ import { languageHelper } from './language-helper';
     NgbDropdownModule,
     TranslateModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index d5aa0e2789..905372ba8c 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [dsDisabled]="(unlinkProcessing | async)">
+                [dsBtnDisabled]="(unlinkProcessing | async)">
           <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 6870d7e63e..c72b963356 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -33,7 +33,7 @@ import {
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
@@ -46,7 +46,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
     NgIf,
     NgForOf,
     AlertComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index 845a785168..a22ba008d8 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -31,7 +31,7 @@
         <!--CREATE-->
         <ng-container *ngIf="canCreateVersion$ | async">
           <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [dsDisabled]="isAnyBeingEdited() || hasDraftVersion"
+                  [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
                   (click)="createNewVersion(version)"
                   title="{{createVersionTitle | translate }}">
             <i class="fas fa-code-branch fa-fw"></i>
@@ -41,7 +41,7 @@
         <ng-container *ngIf="canDeleteVersion$ | async">
           <button class="btn btn-sm version-row-element-delete"
                   [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [dsDisabled]="isAnyBeingEdited()"
+                  [dsBtnDisabled]="isAnyBeingEdited()"
                   (click)="deleteVersion(version, version.id === itemVersion.id)"
                   title="{{'item.version.history.table.action.deleteVersion' | translate}}">
             <i class="fas fa-trash fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 2e41819c22..e142f7854c 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -49,7 +49,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   getItemEditVersionhistoryRoute,
@@ -68,7 +68,7 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     TranslateModule,
     NgClass,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index d26b59bde3..6c42456189 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -63,7 +63,7 @@
                 <ng-container *ngIf="canEditVersion$(version) | async">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
-                          [dsDisabled]="isAnyBeingEdited()"
+                          [dsBtnDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index 030c5a898a..b6ef946815 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -42,7 +42,7 @@ import { VersionHistory } from '../../core/shared/version-history.model';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { AlertComponent } from '../../shared/alert/alert.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -159,7 +159,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 34598266a5..2fa9ae415a 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -51,7 +51,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -70,7 +70,7 @@ import { ItemVersionsRowElementVersionComponent } from './item-versions-row-elem
   templateUrl: './item-versions.component.html',
   styleUrls: ['./item-versions.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent, DisabledDirective],
+  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 7dbc440436..70905d95ee 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [dsDisabled]="(initialized$ | async) !== true"
+            type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 3af2f74bfe..cf242670b3 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -27,7 +27,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
@@ -46,7 +46,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index f40041f8a6..c68968e91f 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [dsDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+            [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [dsDisabled]="(initialized$ | async) !== true"
+            type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index f893ac0525..3e79747b1c 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -28,7 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
@@ -48,7 +48,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index fa4fc5d3da..14438777fb 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -138,7 +138,7 @@
                       <div class="btn-group">
                         <button *ngIf="!eventElement.hasProject"
                                 class="btn btn-outline-primary btn-sm"
-                                [dsDisabled]="eventElement.isRunning"
+                                [dsBtnDisabled]="eventElement.isRunning"
                                 (click)="openModalLookup(eventElement); $event.stopPropagation();"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
                         >
@@ -146,7 +146,7 @@
                         </button>
                         <button *ngIf="eventElement.hasProject"
                                 class="btn btn-outline-danger btn-sm"
-                                [dsDisabled]="eventElement.isRunning"
+                                [dsBtnDisabled]="eventElement.isRunning"
                                 (click)="removeProject(eventElement)"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
                         >
@@ -161,7 +161,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
                               [attr.aria-label]="'quality-assurance.event.action.import' | translate"
                       >
@@ -171,7 +171,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="executeAction('ACCEPTED', eventElement)"
                               [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
                       >
@@ -180,7 +180,7 @@
                       <button class="btn btn-outline-dark btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="openModal('DISCARDED', eventElement, ignoreModal)"
                               [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
                       >
@@ -190,7 +190,7 @@
                               *ngIf="(isAdmin$ | async)"
                               ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               (click)="openModal('REJECTED', eventElement, rejectModal)"
                               [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
                       >
@@ -200,7 +200,7 @@
                               *ngIf="(isAdmin$ | async) === false"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
@@ -210,7 +210,7 @@
                       <button class="btn btn-outline-danger btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                               container="body"
-                              [dsDisabled]="eventElement.isRunning"
+                              [dsBtnDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 2c1e850ce4..1bbd477ece 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -65,7 +65,7 @@ import {
 } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -87,7 +87,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, DisabledDirective],
+  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index f6375c2e02..4b9bbe64f3 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -32,8 +32,8 @@
     <div id="project-search" class="input-group mb-3">
       <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
       <div class="input-group-append">
-        <button type="button" class="btn btn-outline-secondary" [dsDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
-        <button type="button" class="btn btn-primary" [dsDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+        <button type="button" class="btn btn-outline-secondary" [dsBtnDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [dsBtnDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
       </div>
     </div>
 
@@ -66,6 +66,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 6f6feb8f28..6e156eee7e 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -30,7 +30,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { AlertComponent } from '../../../shared/alert/alert.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -106,7 +106,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index e83d0a4123..342919d4ae 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -21,7 +21,7 @@
   </div>
   <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
     {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsDisabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ml-2">
     <i class="fa fa-eye"></i>
     <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
     <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 1cb03bb8d2..0362e50f4c 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -15,7 +15,7 @@ import { take } from 'rxjs/operators';
 import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
 import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
@@ -32,7 +32,7 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
     TranslateModule,
     NgIf,
     NgbDropdownModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 8040cb786e..cd7b97609a 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -64,10 +64,10 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary mr-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
-                        [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                        [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
                 </button>
             </div>
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 09bc00d6f1..47efe888bf 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -16,7 +16,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -32,7 +32,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, DisabledDirective],
+  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, BtnDisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a118cd680d..3233aa5555 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -29,7 +29,7 @@
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsDisabled]="!checked">
+    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 53a013e7d3..7730b1e4dd 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -25,7 +25,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -43,7 +43,7 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     AsyncPipe,
     TranslateModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 2a2b356b31..d0279d9c5f 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -13,7 +13,7 @@
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
   <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [dsDisabled]="(isProcessingCreate() | async)"
+          [dsBtnDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
@@ -23,10 +23,10 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [dsDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary mr-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [dsDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index c31184e3d3..925ed6d5a6 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -37,7 +37,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
@@ -54,7 +54,7 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
     TranslateModule,
     UiSwitchModule,
     VarDirective,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 18cd7b9de2..b89ccd6151 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
-      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 302c6bc9c5..37ce725778 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -55,7 +55,7 @@ import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
 import { KlaroService } from '../shared/cookies/klaro.service';
-import { DisabledDirective } from '../shared/disabled-directive';
+import { BtnDisabledDirective } from '../shared/btn-disabled.directive';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -67,7 +67,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index dbdb006785..e5cf6c3e2e 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -81,7 +81,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValidPassword || userInfoForm.invalid"
+                    [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 1ec95c8f52..43ee0c8cd3 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -43,7 +43,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 
@@ -61,7 +61,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 815a9a9691..b2227bfbae 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [dsDisabled]="!subject || subject.length === 0"
+            [dsBtnDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index eb39ada853..34adfff97d 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -12,7 +12,7 @@ import {
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 
@@ -21,7 +21,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index f2a5bdd422..69c49d6117 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [dsDisabled]="ngForm.disabled"
+          [dsBtnDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 9c308ce1a2..8f7f640c28 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -17,7 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 import { dateToISOFormat } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
@@ -26,7 +26,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, DisabledDirective],
+  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, BtnDisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 92e5760efa..0c93aabcf5 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 11313dfc99..46895b8532 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -31,7 +31,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AlertComponent } from '../alert/alert.component';
 import { AlertType } from '../alert/alert-type';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
 import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
@@ -47,7 +47,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/btn-disabled.directive.ts
similarity index 96%
rename from src/app/shared/disabled-directive.ts
rename to src/app/shared/btn-disabled.directive.ts
index 3563afbaf1..f73422a9d5 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -6,7 +6,7 @@ import {
 } from '@angular/core';
 
 @Directive({
-  selector: '[dsDisabled]',
+  selector: '[dsBtnDisabled]',
   standalone: true,
 })
 
@@ -16,7 +16,7 @@ import {
  *
  * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
  */
-export class DisabledDirective {
+export class BtnDisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
     this.isDisabled = !!value;
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index 0443ca84dd..96f760fc46 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -8,11 +8,11 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
-import { DisabledDirective } from './disabled-directive';
+import { BtnDisabledDirective } from './btn-disabled.directive';
 
 @Component({
   template: `
-    <button [dsDisabled]="isDisabled">Test Button</button>
+    <button [dsBtnDisabled]="isDisabled">Test Button</button>
   `,
 })
 class TestComponent {
@@ -26,7 +26,7 @@ describe('DisabledDirective', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [DisabledDirective],
+      imports: [BtnDisabledDirective],
       declarations: [TestComponent],
     });
     fixture = TestBed.createComponent(TestComponent);
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index de53ef0792..e87b7c5cc6 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -13,7 +13,7 @@
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
-            [dsDisabled]="disabled"
+            [dsBtnDisabled]="disabled"
             ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index c7a8fafa72..2616ce4a9f 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -8,7 +8,7 @@ import {
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 
 /**
  * Component which represent a DSpace dropdown selector.
@@ -18,7 +18,7 @@ import { DisabledDirective } from '../disabled-directive';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule, DisabledDirective],
+  imports: [NgbDropdownModule, NgIf, TranslateModule, BtnDisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 747d14cac6..0503281329 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index d2ed04641e..fadaee8b22 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -22,7 +22,7 @@ import { MenuID } from 'src/app/shared/menu/menu-id.model';
 import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { hasValue } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 
@@ -34,7 +34,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, DisabledDirective],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, BtnDisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 9f796c35ce..0738e2f28a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 2f68c6a23e..d4d3af4ec5 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -10,7 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
@@ -24,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, DisabledDirective],
+  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 340474981e..9c72cd4ffa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -101,7 +101,7 @@ import { SubmissionObject } from '../../../../core/submission/models/submission-
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { SubmissionService } from '../../../../submission/submission.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -143,7 +143,7 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 088cd6efbb..c0ff290d73 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -29,7 +29,7 @@
                 type="button"
                 [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
-                [dsDisabled]="model.disabled"
+                [dsBtnDisabled]="model.disabled"
                 (click)="datepicker.toggle()">
 
             <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 7130bfaf1a..bc47884198 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -26,7 +26,7 @@ import {
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
@@ -36,7 +36,7 @@ import { DisabledDirective } from '../../../../../disabled-directive';
     NgbDatepickerModule,
     ReactiveFormsModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index a43286dda8..f398ea6965 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -24,7 +24,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import isEqual from 'lodash/isEqual';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { hasValue } from '../../../../../empty.util';
 import { NumberPickerComponent } from '../../../../number-picker/number-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
@@ -42,7 +42,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 6d4d39d67f..cb429dd7e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -12,7 +12,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 /**
@@ -23,7 +23,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
   templateUrl: './dynamic-disabled.component.html',
   imports: [
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index fe1278d5aa..e2b1f29492 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -52,7 +52,7 @@
               type="button"
               ngbTooltip="{{'form.search-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly || isSearchDisabled()"
+              [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
               [hidden]="isInputDisabled()"
               (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
@@ -60,7 +60,7 @@
               type="button"
               ngbTooltip="{{'form.clear-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly"
+              [dsBtnDisabled]="model.readOnly"
               (click)="remove()">{{'form.clear' | translate}}
       </button>
     </div>
@@ -69,14 +69,14 @@
               type="button"
               ngbTooltip="{{'form.edit-help' | translate}}"
               placement="top"
-              [dsDisabled]="isEditDisabled()"
+              [dsBtnDisabled]="isEditDisabled()"
               (click)="switchEditMode()">{{'form.edit' | translate}}
       </button>
       <button *ngIf="editMode" class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.save-help' | translate}}"
               placement="top"
-              [dsDisabled]="!hasEmptyValue()"
+              [dsBtnDisabled]="!hasEmptyValue()"
               (click)="saveChanges()">{{'form.save' | translate}}
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 77de7953f1..493c56e29d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -33,7 +33,7 @@ import { of as observableOf } from 'rxjs';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
@@ -175,7 +175,7 @@ describe('Dynamic Lookup component', () => {
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index b16ec0e537..39c39cf8bc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -46,7 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -77,7 +77,7 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 055e5c9c19..de6b50d589 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -59,7 +59,7 @@ import { Vocabulary } from '../../../../../../core/submission/vocabularies/model
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -91,7 +91,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
     ObjNgFor,
     NgForOf,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index bad0f1ab91..1cb8ee1e1a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -32,21 +32,21 @@
 
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
           <i class="fas fa-save text-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="!editMode"
+                [dsBtnDisabled]="!editMode"
                 (click)="delete()">
           <i class="fas fa-trash text-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="clear()">
           <i class="fas fa-undo fa-2x"
              aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index d9c5fbd9e1..f397687686 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -46,7 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { shrinkInOut } from '../../../../../animations/shrink';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -82,7 +82,7 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 1dfa624d61..645be48fdc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -43,7 +43,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DisabledDirective } from '../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
@@ -63,7 +63,7 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
     InfiniteScrollModule,
     NgForOf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index cd5979f779..d12c27eb64 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsBtnDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -73,18 +73,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+              [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+            [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index c1a795d5c3..d6db87b993 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -33,7 +33,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
-import { DisabledDirective } from '../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
@@ -124,7 +124,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index c81ea8eccd..3cbcbc8460 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -50,7 +50,7 @@ import {
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
-import { DisabledDirective } from '../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -92,7 +92,7 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     AsyncPipe,
     NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/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.html b/src/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.html
index 6a39c49c67..7d233fe0b7 100644
--- a/src/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.html
+++ b/src/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.html
@@ -49,6 +49,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/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.ts b/src/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.ts
index 89504ccdfc..c666baf21f 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -38,7 +38,7 @@ import {
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
-import { DisabledDirective } from '../../../../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
@@ -70,7 +70,7 @@ export enum ImportType {
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 92b0e05552..85e32e66ea 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [dsDisabled]="(isValid() | async) !== true">
+                    [dsBtnDisabled]="(isValid() | async) !== true">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index d96f16044a..a757239aea 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -39,7 +39,7 @@ import {
   map,
 } from 'rxjs/operators';
 
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -70,7 +70,7 @@ import { FormService } from './form.service';
     DynamicFormsCoreModule,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 8f2a875685..9b9d038e86 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -3,7 +3,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
       <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
@@ -30,7 +30,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
       <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index 70ad484680..ef35e1ee79 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -20,7 +20,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -34,7 +34,7 @@ import { isEmpty } from '../../empty.util';
     NgClass,
     FormsModule,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index f8ad321d31..4798a43a87 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -5,7 +5,7 @@
       <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsDisabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
@@ -14,7 +14,7 @@
         <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -48,7 +48,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
@@ -80,7 +80,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
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 9d2a8e12ab..ae98afc2eb 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -30,7 +30,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { AlertComponent } from '../../alert/alert.component';
 import { AlertType } from '../../alert/alert-type';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -66,7 +66,7 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 2447565331..00ef253167 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -24,7 +24,7 @@
        @fadeOut>{{ (message | async) | translate }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [dsDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+          [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
 
 <ng-container *ngIf="canShowDivider$ | async">
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 84d618cb79..25ec0cba74 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -49,7 +49,7 @@ import { AuthorizationDataService } from '../../../../core/data/feature-authoriz
 import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { fadeOut } from '../../../animations/fade';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
 
@@ -63,7 +63,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, BtnDisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index a672763a86..affbec108c 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-success'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index a03a1eb00c..f154837be6 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -22,7 +22,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -34,7 +34,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index b942d2b19c..0d1f0d471e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,5 +1,5 @@
 <button (click)="submitTask()"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         class="declineTaskAction btn btn-warning"
         ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
         type="button">
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 5bc0ccb946..e021a21ae0 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -21,7 +21,7 @@ import { RemoteData } from 'src/app/core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -33,7 +33,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index d6e4c95ee9..21e7f4d21b 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,7 +1,7 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
         [ngbTooltip]="rejectTipContent"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
@@ -28,7 +28,7 @@
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
               class="btn btn-danger btn-lg btn-block mt-3"
-              [dsDisabled]="!rejectForm.valid || (processing$ | async)"
+              [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
         <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 433bfa8fc3..6d7ec9c036 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -33,7 +33,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -45,7 +45,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 60ff5f39ce..32a619d671 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-secondary'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index 313a6efe6b..a7d510a8e6 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -20,7 +20,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { DisabledDirective } from '../../../disabled-directive';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 
@@ -31,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 926effa95d..b164767c23 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,5 +1,5 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsDisabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 2f1cb1b95e..67340c9ec7 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -34,7 +34,7 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
@@ -46,7 +46,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9bfe3e1156..03491e7491 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -34,7 +34,7 @@
     </button>
     <button class="btn collection-confirm"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index f11fc45c13..69d32bb93f 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -20,7 +20,7 @@ import { getCollectionPageRoute } from '../../../collection-page/collection-page
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -37,7 +37,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index c74fe26afd..6f3d31703d 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 7aa6c7a639..656e0716e9 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -18,7 +18,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { HostWindowService } from '../../host-window.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
@@ -102,7 +102,7 @@ describe('ItemSelectComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), DisabledDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), BtnDisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 64d6a9b2ba..f5d8a4f9b3 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -19,7 +19,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -35,7 +35,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 2ce7f34166..9dd093be2b 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -55,12 +55,12 @@
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
-                [dsDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+                [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
-              [dsDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 93fe8036ec..6796950285 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -40,7 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
@@ -59,7 +59,7 @@ import { PaginationComponentOptions } from './pagination-component-options.model
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, DisabledDirective],
+  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, BtnDisabledDirective],
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 64f97696ed..14171cb30b 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [dsDisabled]="(isProcessing | async)"
+                  [dsBtnDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [dsDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+                  [dsBtnDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 64836aeb8c..d4dac77d72 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -49,7 +49,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
@@ -217,7 +217,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         ResourcePolicyFormComponent,
         TestComponent,
         NgxMaskModule.forRoot(),
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index e61940dad4..e13ba9ecc7 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -51,7 +51,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -96,7 +96,7 @@ export interface ResourcePolicyEvent {
     AsyncPipe,
     NgIf,
     NgFor,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 3de68cfa63..04d5fb7960 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [dsDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                      [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [dsDisabled]="(isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 971f3a747b..729789bc6e 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -41,7 +41,7 @@ import { GroupDataService } from '../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { DisabledDirective } from '../disabled-directive';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -64,7 +64,7 @@ import {
     NgIf,
     AsyncPipe,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index 1465d73645..259e10c275 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -30,7 +30,7 @@
                                (findSuggestions)="findSuggestions($event)"
                                ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [dsDisabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index dfc934ad9c..99eaa23a0d 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -31,7 +31,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -56,7 +56,7 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     KeyValuePipe,
     NgForOf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index f44dc2ce3f..37a7a3f431 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -34,7 +34,7 @@
             (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [dsDisabled]="(processing$ | async) || !isValid">
+    <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 23fba5f502..05ee5bcc51 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -50,7 +50,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../alert/alert.component';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -62,7 +62,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 986b4f3dc8..6bdc0d397a 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -21,7 +21,7 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsDisabled]="!dso"
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
             [title]="'subscriptions.table.edit' | translate"
             class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 15239fd506..9d9ce08905 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -20,7 +20,7 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
@@ -33,7 +33,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, DisabledDirective],
+  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index d7795942be..b9e42fa759 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -35,7 +35,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsDisabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index ec66981f16..fbafe811eb 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -27,7 +27,7 @@ import {
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
 } from '../../../core/xsrf/xsrf.constants';
-import { DisabledDirective } from '../../disabled-directive';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -43,7 +43,7 @@ import { UploaderProperties } from './uploader-properties.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [TranslateModule, FileUploadModule, CommonModule, DisabledDirective],
+  imports: [TranslateModule, FileUploadModule, CommonModule, BtnDisabledDirective],
 })
 export class UploaderComponent implements OnInit, AfterViewInit {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 2af47497b2..db33afc76a 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [dsDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+            [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 9ff048a626..61bad0439f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -31,7 +31,7 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
@@ -153,7 +153,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         TranslateModule.forRoot(),
         SubmissionFormCollectionComponent,
         TestComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 7e574a00d5..10b1f815dc 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -36,7 +36,7 @@ import { SubmissionObject } from '../../../core/submission/models/submission-obj
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -58,7 +58,7 @@ import { SubmissionService } from '../../submission.service';
     TranslateModule,
     NgbDropdownModule,
     ThemedCollectionDropdownComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges, OnInit {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index 4d3e76ff51..c860fb557b 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index 3b36d56aca..82bc309cc8 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -25,7 +25,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
@@ -52,7 +52,7 @@ describe('SubmissionFormFooterComponent', () => {
         TranslateModule.forRoot(),
         SubmissionFormFooterComponent,
         TestComponent,
-        DisabledDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index adaf5c85ef..8645003783 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -15,7 +15,7 @@ import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { SubmissionService } from '../../submission.service';
@@ -28,7 +28,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-footer.component.scss'],
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
-  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, DisabledDirective],
+  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index c5f8d25fc2..563044d270 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -6,7 +6,7 @@
   <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [dsDisabled]="(hasSections$ | async) !== true"
+          [dsBtnDisabled]="(hasSections$ | async) !== true"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index c97afc9d83..eeeda893f1 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
 import { SectionsService } from '../../sections/sections.service';
@@ -23,7 +23,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-section-add.component.scss'],
   templateUrl: './submission-form-section-add.component.html',
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgbDropdownModule, DisabledDirective],
+  imports: [CommonModule, TranslateModule, NgbDropdownModule, BtnDisabledDirective],
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 96e7e2e172..f5bde4e81a 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsBtnDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index 7572d3ac8b..eb7a703cc2 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -36,7 +36,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -71,7 +71,7 @@ export interface ExternalSourceData {
     InfiniteScrollModule,
     NgbDropdownModule,
     FormsModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index 62546e1835..7618de5173 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -40,7 +40,7 @@ import {
 import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
-import { DisabledDirective } from '../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -65,7 +65,7 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 91b89e8435..b03504c6be 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,7 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsDisabled]="isSaving">
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
       <span aria-hidden="true">×</span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index c7ba64e4b9..0a6c1bd44d 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -39,7 +39,7 @@ import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/build
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
 import { dateToISOFormat } from '../../../../../shared/date.util';
-import { DisabledDirective } from '../../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -81,7 +81,7 @@ import {
     FormComponent,
     NgIf,
     TranslateModule,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index f8d6b9ca93..bfc09e86c1 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -35,7 +35,7 @@
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [dsDisabled]="(processingDelete$ | async)"
+                  [dsBtnDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
             <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 9e9c15bb2f..09ea3cb112 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -28,7 +28,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotUndefined,
@@ -55,7 +55,7 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 0f20e0e927..dc2699b6d1 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,7 +87,7 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index b695bb47ed..ea1c0a55f0 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -43,7 +43,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { DisabledDirective } from '../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -60,7 +60,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index e87a292c0c..57e8c73031 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -45,7 +45,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
-import { DisabledDirective } from '../../../../shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -77,7 +77,7 @@ enum SubKey {
     RouterLink,
     NgClass,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
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
index 40a6264e4e..f74a73a4b8 100644
--- 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
@@ -13,7 +13,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso
 import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 
 @Component({
@@ -23,7 +23,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index ff64b09664..37fb383429 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 @Component({
@@ -23,7 +23,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 /**
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index e557fc466c..2b78006f65 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-end-user-agreement',
@@ -13,7 +13,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
   // templateUrl: './end-user-agreement.component.html'
   templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index b86fecae7a..3835667111 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -7,7 +7,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
-import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
 
 @Component({
@@ -17,7 +17,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 020293214e..0efa013064 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -7,7 +7,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
-import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-media-viewer-video',
@@ -21,7 +21,7 @@ import { DisabledDirective } from '../../../../../../app/shared/disabled-directi
     NgbDropdownModule,
     TranslateModule,
     NgIf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class MediaViewerVideoComponent extends BaseComponent {
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index d9be35f39d..d1f4a6d3ff 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -12,14 +12,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component';
 import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component';
 
 import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
-import { DisabledDirective } from '../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-register-email-form',
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index 659e260b1c..7c1ff908c3 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -28,7 +28,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class CreateProfileComponent extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index a299e47a27..cf4981d289 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -7,7 +7,7 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
-import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-email-request-copy',
@@ -16,7 +16,7 @@ import { DisabledDirective } from '../../../../../app/shared/disabled-directive'
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/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.ts b/src/themes/custom/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.ts
index 7936deb406..aec7bfd6db 100644
--- a/src/themes/custom/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.ts
+++ b/src/themes/custom/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.ts
@@ -5,7 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DisabledDirective } from '../../../../../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../../../../../app/shared/btn-disabled.directive';
 import { ExternalSourceEntryImportModalComponent as BaseComponent } 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 { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component';
 
@@ -20,7 +20,7 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class ExternalSourceEntryImportModalComponent extends BaseComponent {
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 17bc5d9136..cea515102a 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
-import { DisabledDirective } from '../../../../../../../app/shared/disabled-directive';
+import { BtnDisabledDirective } from '../../../../../../../app/shared/btn-disabled.directive';
 import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
 import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
 import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component';
@@ -28,7 +28,7 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    DisabledDirective,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionSectionUploadFileComponent

From eb5aadaf8ac9f5a4928997983aee00098d9ca8cd Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 14:11:59 +0200
Subject: [PATCH 0430/1286] 117544: linting

---
 .../epeople-registry/eperson-form/eperson-form.component.ts     | 2 +-
 .../group-form/members-list/members-list.component.ts           | 2 +-
 .../delete-collection-page/delete-collection-page.component.ts  | 2 +-
 .../delete-community-page/delete-community-page.component.ts    | 2 +-
 .../profile-page-researcher-form.component.ts                   | 2 +-
 src/app/register-email-form/register-email-form.component.ts    | 2 +-
 .../access-control-array-form.component.ts                      | 2 +-
 .../external-source-entry-import-modal.component.ts             | 2 +-
 .../form/resource-policy-form.component.spec.ts                 | 2 +-
 .../resource-policies/form/resource-policy-form.component.ts    | 2 +-
 .../subscription-view/subscription-view.component.ts            | 2 +-
 .../collection/submission-form-collection.component.spec.ts     | 2 +-
 .../form/collection/submission-form-collection.component.ts     | 2 +-
 .../upload/file/edit/section-upload-file-edit.component.ts      | 2 +-
 .../reviewers-list/reviewers-list.component.ts                  | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 1c6f1929f3..c8236ca22d 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -65,8 +65,8 @@ import {
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
-import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 6563a765d2..22934394c8 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -54,8 +54,8 @@ import {
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 3d4d4abb5f..acc716b52a 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -15,8 +15,8 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index b2fa5956cb..9c19a5eb47 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -15,8 +15,8 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index 925ed6d5a6..5d09097e6b 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -36,8 +36,8 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 37ce725778..585ca71c24 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -54,8 +54,8 @@ import {
 import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
-import { KlaroService } from '../shared/cookies/klaro.service';
 import { BtnDisabledDirective } from '../shared/btn-disabled.directive';
+import { KlaroService } from '../shared/cookies/klaro.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 8f7f640c28..3dc84a833a 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -16,8 +16,8 @@ import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
-import { dateToISOFormat } from '../../date.util';
 import { BtnDisabledDirective } from '../../btn-disabled.directive';
+import { dateToISOFormat } from '../../date.util';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
diff --git a/src/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.ts b/src/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.ts
index c666baf21f..e0cc90ceaa 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -37,8 +37,8 @@ import {
   getRemoteDataPayload,
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
-import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
 import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive';
+import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index d4dac77d72..deaef6c611 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -45,11 +45,11 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
 import { SubmissionService } from '../../../submission/submission.service';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index e13ba9ecc7..08a7f18492 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -47,11 +47,11 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
-import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 9d9ce08905..f940e69795 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -19,8 +19,8 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
 import { BtnDisabledDirective } from '../../btn-disabled.directive';
+import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 61bad0439f..3a5ae8a18d 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -30,8 +30,8 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
+import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 10b1f815dc..1736b474d5 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -34,9 +34,9 @@ import { Collection } from '../../../core/shared/collection.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
-import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 0a6c1bd44d..79b3d3a565 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -38,8 +38,8 @@ import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/b
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
-import { dateToISOFormat } from '../../../../../shared/date.util';
 import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive';
+import { dateToISOFormat } from '../../../../../shared/date.util';
 import {
   hasNoValue,
   hasValue,
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 57e8c73031..c43fabdb83 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -44,8 +44,8 @@ import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.mod
 import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
+import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';

From 80e1daeb659cfe7461845d4680bed747994e720a Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 16 Sep 2024 14:22:13 +0200
Subject: [PATCH 0431/1286] [CST-15593] allow orejime to start if privacy
 statement is disabled

---
 src/app/shared/cookies/browser-orejime.service.ts | 3 +++
 src/assets/i18n/en.json5                          | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/app/shared/cookies/browser-orejime.service.ts b/src/app/shared/cookies/browser-orejime.service.ts
index aa9d56d9ee..4a7a182e0a 100644
--- a/src/app/shared/cookies/browser-orejime.service.ts
+++ b/src/app/shared/cookies/browser-orejime.service.ts
@@ -117,6 +117,9 @@ export class BrowserOrejimeService extends OrejimeService {
    *  - Add and translate orejime configuration messages
    */
   initialize() {
+    if (!environment.info.enablePrivacyStatement) {
+      this.orejimeConfig.translations.zz.consentModal.privacyPolicy.text = 'cookies.consent.content-modal.no-privacy-policy.text';
+    }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
       getFirstCompletedRemoteData(),
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5d06f4c19b..8ced30954b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1604,6 +1604,8 @@
 
   "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
 
+  "cookies.consent.content-modal.no-privacy-policy.text": "",
+
   "cookies.consent.content-modal.title": "Information that we collect",
 
   "cookies.consent.app.title.authentication": "Authentication",

From 685e6d83c5a85269d0c47678ab4a282346184d99 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:44:06 +0200
Subject: [PATCH 0432/1286] 117544: PR feedback - added typedocs - changed
 directive to only be present for buttons - various other small fixes

---
 .../filtered-items.component.html             |  0
 .../dso-edit-metadata-value.component.html    | 47 +++++++++++++++++++
 .../item-delete/item-delete.component.html    |  2 +-
 .../access-control-array-form.component.html  |  2 +-
 ...cess-control-form-container.component.html | 12 ++---
 src/app/shared/disabled-directive.spec.ts     |  8 ++++
 src/app/shared/disabled-directive.ts          | 28 ++++++++++-
 ...amic-form-control-container.component.html |  2 +-
 .../date-picker/date-picker.component.html    |  6 +--
 .../disabled/dynamic-disabled.component.html  |  2 +-
 .../dynamic-disabled.component.spec.ts        |  2 +-
 .../lookup/dynamic-lookup.component.html      |  4 +-
 .../onebox/dynamic-onebox.component.html      |  4 +-
 ...dynamic-scrollable-dropdown.component.html |  2 +-
 .../number-picker.component.html              |  2 +-
 .../vocabulary-treeview.component.html        |  4 +-
 .../collection-select.component.html          |  2 +-
 .../item-select/item-select.component.html    |  2 +-
 .../item-select/item-select.component.spec.ts |  3 +-
 .../pagination/pagination.component.html      |  2 +-
 ...mission-section-cc-licenses.component.html |  4 +-
 21 files changed, 110 insertions(+), 30 deletions(-)
 create mode 100644 src/app/admin/admin-reports/filtered-items/filtered-items.component.html

diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
new file mode 100644
index 0000000000..e69de29bb2
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 f3d92ace2d..1837801902 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
@@ -6,6 +6,53 @@
     <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+                                    [bindId]="mdField"
+                                    [group]="group"
+                                    [model]="getModel()"
+                                    (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-scrollable-dropdown>
+    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
+                      [group]="group"
+                      [model]="getModel()"
+                      (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-onebox>
+    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
+      <span class="badge badge-light border" >
+        <i dsAuthorityConfidenceState
+           class="fas fa-fw p-0"
+           aria-hidden="true"
+           [authorityValue]="mdValue.newValue"
+           [iconMode]="true"
+        ></i>
+        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+      </span>
+    </div>
+    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
+      <div class="btn-group w-75">
+        <i dsAuthorityConfidenceState
+          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
+          aria-hidden="true"
+          [authorityValue]="mdValue.newValue.confidence"
+          [iconMode]="true"
+      ></i>
+        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
+              (change)="onChangeAuthorityKey()" />
+        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(true)">
+          <i class="fas fa-lock fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(false)">
+          <i class="fas fa-lock-open fa-fw"></i>
+        </button>
+      </div>
+    </div>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
       <ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index eadec9babf..667363a381 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 630812c345..f2a5bdd422 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [dsDisabled]="ngForm.disabled"
+            [disabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index b01c3a30a6..92e5760efa 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [dsDisabled]="!state.item.toggleStatus"
+                         [disabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [dsDisabled]="!state.bitstream.toggleStatus"
+                       [disabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index c4ca4f0599..514011cebd 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -40,6 +40,14 @@ describe('DisabledDirective', () => {
         expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
+  it('should bind aria-disabled to false and not have disabled class when isDisabled is false', () => {
+    component.isDisabled = false;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
     it('should prevent click events when disabled', () => {
         component.isDisabled = true;
         fixture.detectChanges();
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 38f92cd1d7..e5ae820e50 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -3,15 +3,36 @@ import { Directive, Input, HostBinding, HostListener } from '@angular/core';
 @Directive({
     selector: '[dsDisabled]'
 })
+
+/**
+ * This directive can be added to a html element to disable it (make it non-interactive).
+ * It acts as a replacement for HTML's disabled attribute.
+ *
+ * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
+ */
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
         this.isDisabled = !!value;
     }
 
+    /**
+     * Binds the aria-disabled attribute to the directive's isDisabled property.
+     * This is used to make the element accessible to screen readers. If the element is disabled, the screen reader will announce it as such.
+     */
     @HostBinding('attr.aria-disabled') isDisabled = false;
+
+    /**
+     * Binds the class attribute to the directive's isDisabled property.
+     * This is used to style the element when it is disabled (make it look disabled).
+     */
     @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
 
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via mouse click).
+     * @param event The click event.
+     */
     @HostListener('click', ['$event'])
     handleClick(event: Event) {
         if (this.isDisabled) {
@@ -20,7 +41,12 @@ export class DisabledDirective {
         }
     }
 
-    @HostListener('keydown', ['$event'])
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via keystrokes).
+     * @param event The keydown event.
+     */
+  @HostListener('keydown', ['$event'])
     handleKeydown(event: KeyboardEvent) {
         if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
             event.preventDefault();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index aeeb4f2722..606db29db3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -31,7 +31,7 @@
     <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
       <select
         #language="ngModel"
-        [dsDisabled]="model.readOnly"
+        [disabled]="model.readOnly"
         [(ngModel)]="model.language"
         class="form-control"
         (blur)="onBlur($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index bb15b82685..3bf02c4abd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -6,7 +6,7 @@
     <ds-number-picker
       tabindex="0"
       [id]="model.id + '_year'"
-      [dsDisabled]="model.disabled"
+      [disabled]="model.disabled"
       [min]="minYear"
       [max]="maxYear"
       [name]="'year'"
@@ -30,7 +30,7 @@
       [(ngModel)]="initialMonth"
       [value]="month"
       [placeholder]="monthPlaceholder"
-      [dsDisabled]="!year || model.disabled"
+      [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -46,7 +46,7 @@
       [(ngModel)]="initialDay"
       [value]="day"
       [placeholder]="dayPlaceholder"
-      [dsDisabled]="!month || model.disabled"
+      [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index c7b9441da8..5b58352214 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -6,7 +6,7 @@
                  [id]="id"
                  [name]="model.name"
                  [value]="modelValuesString"
-                 [dsDisabled]="model.disabled"
+                 [disabled]="model.disabled"
                  [type]="model.inputType"
                  [placeholder]="model.placeholder | translate"
                  [readonly]="model.readOnly">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index e0ea6af31f..a25ad4d231 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -63,7 +63,7 @@ describe('DsDynamicDisabledComponent', () => {
     expect(comp).toBeTruthy();
   });
 
-  xit('should have a disabled input', () => {
+  it('should have a disabled input', () => {
     const input = de.query(By.css('input'));
     expect(input.nativeElement.getAttribute('disabled')).toEqual('');
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index de0b9d4f9f..f32fa86281 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -18,7 +18,7 @@
              [name]="model.name"
              [type]="model.inputType"
              [(ngModel)]="firstInputValue"
-             [dsDisabled]="isInputDisabled()"
+             [disabled]="isInputDisabled()"
              [placeholder]="model.placeholder | translate"
              [readonly]="model.readOnly"
              (change)="onChange($event)"
@@ -38,7 +38,7 @@
               [name]="model.name + '_2'"
               [type]="model.inputType"
               [(ngModel)]="secondInputValue"
-              [dsDisabled]="firstInputValue.length === 0 || isInputDisabled()"
+              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
               [placeholder]="model.secondPlaceholder | translate"
               [readonly]="model.readOnly"
               (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 0c36c777ed..3c19ecda13 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -39,7 +39,7 @@
          [ngbTypeahead]="search"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [resultTemplate]="rt"
          [type]="model.inputType"
          [(ngModel)]="currentValue"
@@ -64,7 +64,7 @@
          [name]="model.name"
          [placeholder]="model.placeholder"
          [readonly]="true"
-         [dsDisabled]="model.readOnly"
+         [disabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
          (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index eed238a7d0..50acdd575c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -18,7 +18,7 @@
            [id]="id"
            [name]="model.name"
            [readonly]="true"
-           [dsDisabled]="model.readOnly"
+           [disabled]="model.readOnly"
            [type]="model.inputType"
            [value]="(currentValue | async)"
            (blur)="onBlur($event)"
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 48ace1eabf..8f2a875685 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -21,7 +21,7 @@
       (change)="update($event); $event.stopPropagation();"
       (focus)="onFocus($event); $event.stopPropagation();"
       [readonly]="disabled"
-      [dsDisabled]="disabled"
+      [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
       [attr.aria-label]="placeholder"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index e6eb168d4c..7d3c7e4bea 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -36,7 +36,7 @@
                  container="body"
           >
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
@@ -68,7 +68,7 @@
                 [openDelay]="500"
                 container="body">
             <input class="mr-2" type="checkbox"
-                   [dsDisabled]="!node.item?.selectable"
+                   [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
                    (change)="onSelect(node.item)"
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 551edd446c..1534f88895 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index a6cb7738d7..58eed6ae4a 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index d7a906d8b2..7d2e5c4146 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -194,8 +194,7 @@ describe('ItemSelectComponent', () => {
 
       const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
       expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-      expect(checkbox.getAttribute('aria-disabled')).toBe('true');
-      expect(checkbox.classList.contains('disabled')).toBe(true);
+      expect(checkbox.disabled).toBeTrue();
     }));
   });
 });
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index ee13c6414d..b85dcb01ee 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -41,7 +41,7 @@
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
       <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
-                      [dsDisabled]="paginationOptions.disabled"
+                      [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
                       [maxSize]="(isXs)?5:paginationOptions.maxSize"
                       [page]="(currentPage$|async)"
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index de9ea3bb8f..61e420b23a 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,6 +1,6 @@
 <div class="mb-4 ccLicense-select">
   <ds-select
-    [dsDisabled]="!submissionCcLicenses">
+    [disabled]="!submissionCcLicenses">
 
     <ng-container class="selection">
       <span *ngIf="!submissionCcLicenses">
@@ -81,7 +81,7 @@
 
     </ng-template>
 
-    <ds-select *ngIf="field.enums?.length > 5" [dsDisabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
       <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
         <span *ngIf="option">
           {{ option.label }}

From f65d6c577536ec912730f68ecde887f063c59b14 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 13:45:33 +0200
Subject: [PATCH 0433/1286] 117544: rename directive to be clear it should
 currently only be used for buttons

---
 .../bulk-access/bulk-access.component.html         |  2 +-
 .../epeople-registry.component.spec.ts             |  4 ++--
 .../eperson-form/eperson-form.component.html       |  2 +-
 .../eperson-form/eperson-form.component.spec.ts    |  4 ++--
 .../members-list/members-list.component.html       |  4 ++--
 .../group-registry/groups-registry.component.html  |  2 +-
 .../groups-registry.component.spec.ts              |  4 ++--
 .../delete-collection-page.component.html          |  4 ++--
 .../collection-source-controls.component.html      | 12 ++++++------
 .../collection-source-controls.component.spec.ts   |  4 ++--
 .../collection-source.component.html               |  8 ++++----
 .../delete-community-page.component.html           |  4 ++--
 .../dso-edit-metadata-value.component.html         | 10 +++++-----
 .../dso-edit-metadata-value.component.spec.ts      |  4 ++--
 .../dso-edit-metadata.component.html               | 14 +++++++-------
 .../dso-edit-metadata.component.spec.ts            |  4 ++--
 .../forgot-password-form.component.html            |  2 +-
 .../end-user-agreement.component.html              |  2 +-
 .../end-user-agreement.component.spec.ts           |  4 ++--
 .../feedback-form/feedback-form.component.html     |  2 +-
 .../feedback-form/feedback-form.component.spec.ts  |  4 ++--
 .../bitstream-request-a-copy-page.component.html   |  2 +-
 .../item-bitstreams/item-bitstreams.component.html |  8 ++++----
 .../item-edit-bitstream.component.html             |  4 ++--
 .../item-delete/item-delete.component.html         |  4 ++--
 .../item-move/item-move.component.html             |  4 ++--
 .../item-operation/item-operation.component.html   |  4 ++--
 .../item-operation.component.spec.ts               |  4 ++--
 .../edit-relationship-list.component.html          |  2 +-
 .../edit-relationship.component.html               |  4 ++--
 .../item-relationships.component.html              |  4 ++--
 .../media-viewer-video.component.html              |  4 ++--
 .../orcid-auth/orcid-auth.component.html           |  2 +-
 .../versions/item-versions.component.html          |  6 +++---
 .../versions/item-versions.component.spec.ts       |  4 ++--
 .../my-dspace-new-external-dropdown.component.html |  4 ++--
 ...y-dspace-new-submission-dropdown.component.html |  4 ++--
 .../overview/process-overview.component.html       |  4 ++--
 .../profile-claim-item-modal.component.html        |  2 +-
 .../profile-page-researcher-form.component.html    |  6 +++---
 .../register-email-form.component.html             |  4 ++--
 .../create-profile/create-profile.component.html   |  2 +-
 .../email-request-copy.component.html              |  2 +-
 .../access-control-array-form.component.html       |  8 ++++----
 .../access-control-form-container.component.html   |  4 ++--
 ...bled-directive.ts => btn-disabled.directive.ts} |  4 ++--
 src/app/shared/disabled-directive.spec.ts          |  6 +++---
 src/app/shared/ds-select/ds-select.component.html  |  2 +-
 ...dso-edit-menu-expandable-section.component.html |  2 +-
 .../dso-edit-menu-section.component.html           |  4 ++--
 .../dynamic-date-picker-inline.component.html      |  2 +-
 .../models/lookup/dynamic-lookup.component.html    |  8 ++++----
 .../models/lookup/dynamic-lookup.component.spec.ts |  4 ++--
 .../dynamic-relation-group.component.html          |  6 +++---
 .../dynamic-lookup-relation-modal.component.html   |  8 ++++----
 ...dynamic-lookup-relation-modal.component.spec.ts |  4 ++--
 ...ternal-source-entry-import-modal.component.html |  2 +-
 src/app/shared/form/form.component.html            |  4 ++--
 .../number-picker/number-picker.component.html     |  4 ++--
 .../number-picker/number-picker.component.spec.ts  |  2 +-
 .../vocabulary-treeview.component.html             |  8 ++++----
 .../password/log-in-password.component.html        |  2 +-
 .../claimed-task-actions-approve.component.html    |  2 +-
 ...laimed-task-actions-decline-task.component.html |  2 +-
 .../claimed-task-actions-reject.component.html     |  4 ++--
 ...imed-task-actions-return-to-pool.component.html |  2 +-
 .../pool-task/pool-task-actions.component.html     |  2 +-
 .../collection-select.component.html               |  2 +-
 .../item-select/item-select.component.html         |  2 +-
 .../item-select/item-select.component.spec.ts      |  4 ++--
 .../shared/pagination/pagination.component.html    |  4 ++--
 .../form/resource-policy-form.component.html       |  4 ++--
 .../form/resource-policy-form.component.spec.ts    |  4 ++--
 .../resource-policies.component.html               |  4 ++--
 src/app/shared/shared.module.ts                    |  4 ++--
 .../subscription-modal.component.html              |  2 +-
 .../subscription-view.component.html               |  2 +-
 .../shared/upload/uploader/uploader.component.html |  2 +-
 .../submission-form-collection.component.html      |  2 +-
 .../submission-form-collection.component.spec.ts   |  4 ++--
 .../footer/submission-form-footer.component.html   |  8 ++++----
 .../submission-form-footer.component.spec.ts       |  4 ++--
 ...ission-import-external-searchbar.component.html |  2 +-
 .../edit/section-upload-file-edit.component.html   |  2 +-
 .../upload/file/section-upload-file.component.html |  2 +-
 .../system-wide-alert-form.component.html          |  2 +-
 86 files changed, 170 insertions(+), 170 deletions(-)
 rename src/app/shared/{disabled-directive.ts => btn-disabled.directive.ts} (96%)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index 619ba1888d..cda6b805bc 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -10,7 +10,7 @@
     <button class="btn btn-outline-primary mr-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [dsDisabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 0961369fe1..d948732321 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -27,7 +27,7 @@ import { RequestService } from '../../core/data/request.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { FindListOptions } from '../../core/data/find-list-options.model';
-import {DisabledDirective} from '../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
@@ -132,7 +132,7 @@ describe('EPeopleRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [EPeopleRegistryComponent, DisabledDirective],
+      declarations: [EPeopleRegistryComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index d21c1cfa85..3d34675ecc 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [dsDisabled]="!(canReset$ | async)" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsBtnDisabled]="!(canReset$ | async)" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index b698d43651..d1e6d70edd 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -35,7 +35,7 @@ import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -203,7 +203,7 @@ describe('EPersonFormComponent', () => {
           }
         }),
       ],
-      declarations: [EPersonFormComponent, DisabledDirective],
+      declarations: [EPersonFormComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
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 1d0e6b9abd..984442ebc4 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
@@ -34,7 +34,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(eperson)"
-                      [dsDisabled]="actionConfig.remove.disabled"
+                      [dsBtnDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
@@ -114,7 +114,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [dsDisabled]="actionConfig.add.disabled"
+                      [dsBtnDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 1b834cfdf0..eb00017d8f 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -69,7 +69,7 @@
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
-                      [dsDisabled]="true"
+                      [dsBtnDisabled]="true"
                       class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index f9fd91d6cc..fbf7e982d1 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -34,7 +34,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
-import {DisabledDirective} from '../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -172,7 +172,7 @@ describe('GroupsRegistryComponent', () => {
           }
         }),
       ],
-      declarations: [GroupsRegistryComponent, DisabledDirective],
+      declarations: [GroupsRegistryComponent, BtnDisabledDirective],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index f8df2d6af1..6327eed944 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                   <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                       <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 16401999e1..05307b86ee 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="!(testConfigRunning$ |async)" class="btn btn-secondary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="!(importRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="!(reImportRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="!(isEnabled)"
+                [dsBtnDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [dsDisabled]="true">
+                [dsBtnDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 245fbe4d58..12de34d3a9 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,7 +22,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
-import {DisabledDirective} from '../../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../../shared/btn-disabled.directive';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
@@ -101,7 +101,7 @@ describe('CollectionSourceControlsComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
-      declarations: [CollectionSourceControlsComponent, VarDirective, DisabledDirective],
+      declarations: [CollectionSourceControlsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         {provide: ScriptDataService, useValue: scriptDataService},
         {provide: ProcessDataService, useValue: processDataService},
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 506877c42c..2839ba8fbf 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [dsDisabled]="(hasChanges$ | async) !== true"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [dsDisabled]="(hasChanges$ | async) !== true"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 0b439ec0c1..8c20240354 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="!(processing$ | async)"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
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 1837801902..e07585b39b 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
@@ -71,31 +71,31 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [dsDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+                  [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [dsDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [dsDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                  [dsBtnDisabled]="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" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="disabled"
+              cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="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>
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 07bc66da3c..e90e7391f8 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
@@ -11,7 +11,7 @@ import { ItemMetadataRepresentation } from '../../../core/shared/metadata-repres
 import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
 import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form';
 import { By } from '@angular/platform-browser';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -50,7 +50,7 @@ describe('DsoEditMetadataValueComponent', () => {
     initServices();
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataValueComponent, VarDirective, DisabledDirective],
+      declarations: [DsoEditMetadataValueComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
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 507ce23cc1..1598558e51 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" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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" [dsDisabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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" [dsDisabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
@@ -21,7 +21,7 @@
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [dsDisabled]="!hasChanges || (saving$ | async)"
+            [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -76,13 +76,13 @@
   </div>
   <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" [dsDisabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
@@ -91,7 +91,7 @@
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [dsDisabled]="!hasChanges || (saving$ | async)"
+              [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
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 3a431705c3..eef3e45fa9 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
@@ -16,7 +16,7 @@ import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorato
 import { Operation } from 'fast-json-patch';
 import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/internal/Observable';
-import {DisabledDirective} from '../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -72,7 +72,7 @@ describe('DsoEditMetadataComponent', () => {
     notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
 
     TestBed.configureTestingModule({
-      declarations: [DsoEditMetadataComponent, VarDirective, DisabledDirective],
+      declarations: [DsoEditMetadataComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
         TestDataService,
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 1f3df7e333..6cff2903b9 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -28,7 +28,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValid"
+                    [dsBtnDisabled]="isInValid"
                     class="btn btn-default btn-primary"
                     (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
         </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 4b93d631b7..ceb2ad23a4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -7,7 +7,7 @@
 
     <div class="d-flex mt-4">
       <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [dsDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index 153fe4a51f..c7735f0579 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -11,7 +11,7 @@ import { Store } from '@ngrx/store';
 import { By } from '@angular/platform-browser';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import {DisabledDirective} from '../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
@@ -50,7 +50,7 @@ describe('EndUserAgreementComponent', () => {
     init();
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [EndUserAgreementComponent, DisabledDirective],
+      declarations: [EndUserAgreementComponent, BtnDisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 3fdc66820a..c5c4b460a2 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,7 +41,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 0507b7173b..7b7c6e28b6 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,7 +18,7 @@ import { Router } from '@angular/router';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NativeWindowService } from '../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 
 describe('FeedbackFormComponent', () => {
@@ -39,7 +39,7 @@ describe('FeedbackFormComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [FeedbackFormComponent, DisabledDirective],
+      declarations: [FeedbackFormComponent, BtnDisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index feffb1066f..5b4b1bda52 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -79,7 +79,7 @@
             </a>
 
             <button
-                    [dsDisabled]="requestCopyForm.invalid"
+                    [dsBtnDisabled]="requestCopyForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
         </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index c52d99b439..ab20c3c22b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 8386c07194..146046c2ed 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canRemove()" (click)="remove()"
+        <button [dsBtnDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [dsDisabled]="!canUndo()" (click)="undo()"
+        <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 667363a381..25780d989c 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 2df52c6651..e8061ae88b 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -40,7 +40,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary" [dsDisabled]="!canMove" (click)="moveToCollection()">
+              <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
@@ -48,7 +48,7 @@
                 <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
               </span>
               </button>
-              <button class="btn btn-danger" [dsDisabled]="!canSubmit" (click)="discard()">
+              <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
                 <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
               </button>
             </div>
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 88acec3171..75f0736bbc 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" [dsDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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" [dsDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+    <button class="btn btn-outline-primary" [dsBtnDisabled]="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/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 8c2774ad6c..7d7087e02d 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -4,7 +4,7 @@ import { ItemOperationComponent } from './item-operation.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
@@ -15,7 +15,7 @@ describe('ItemOperationComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
-      declarations: [ItemOperationComponent, DisabledDirective]
+      declarations: [ItemOperationComponent, BtnDisabledDirective]
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index b9a01c6b38..27faee89a7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
    {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 169a171d3f..8cd86d597b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -9,12 +9,12 @@
   </div>
   <div class="col-2">
     <div class="btn-group relationship-action-buttons">
-      <button [dsDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+      <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               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 [dsDisabled]="!canUndo()" (click)="undo()"
+      <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
               class="btn btn-outline-warning btn-sm"
               title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
         <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 6ba593e1f2..2a3f92377c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [dsDisabled]="(hasChanges$ | async) !== true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
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 46c6947868..a64b4ce548 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
@@ -19,7 +19,7 @@
 <div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
-    [dsDisabled]="currentIndex === 0"
+    [dsBtnDisabled]="currentIndex === 0"
     (click)="prevMedia()"
   >
     {{ "media-viewer.previous" | translate }}
@@ -27,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [dsDisabled]="currentIndex === medias.length - 1"
+    [dsBtnDisabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index 979cee0118..c37b54aab3 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [dsDisabled]="(unlinkProcessing | async)">
+                [dsBtnDisabled]="(unlinkProcessing | async)">
           <span *ngIf="!(unlinkProcessing | async)"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index b9216f9ca8..719253c95c 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -63,7 +63,7 @@
                       <!--CREATE-->
                       <ng-container *ngIf="canCreateVersion$ | async">
                         <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                                [dsDisabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
+                                [dsBtnDisabled]="isAnyBeingEdited() || (hasDraftVersion$ | async)"
                                 (click)="createNewVersion(version)"
                                 title="{{createVersionTitle$ | async | translate }}">
                           <i class="fas fa-code-branch fa-fw"></i>
@@ -73,7 +73,7 @@
                       <ng-container *ngIf="canDeleteVersion$(version) | async">
                         <button class="btn btn-sm version-row-element-delete"
                                 [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                                [dsDisabled]="isAnyBeingEdited()"
+                                [dsBtnDisabled]="isAnyBeingEdited()"
                                 (click)="deleteVersion(version, version.id==itemVersion.id)"
                                 title="{{'item.version.history.table.action.deleteVersion' | translate}}">
                           <i class="fas fa-trash fa-fw"></i>
@@ -117,7 +117,7 @@
                 <ng-container *ngIf="canEditVersion$(version) | async">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
-                          [dsDisabled]="isAnyBeingEdited()"
+                          [dsBtnDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index 0d04ea12db..0f65381dcd 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -29,7 +29,7 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser
 import { Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ItemSharedModule } from '../item-shared.module';
-import {DisabledDirective} from '../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../shared/btn-disabled.directive';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -137,7 +137,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      declarations: [ItemVersionsComponent, VarDirective, DisabledDirective],
+      declarations: [ItemVersionsComponent, VarDirective, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
         {provide: PaginationService, useValue: new PaginationServiceStub()},
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 955122301f..dacf36b940 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="!(initialized$|async)"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="!(initialized$|async)"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [dsDisabled]="!(initialized$|async)"
+            type="button" [dsBtnDisabled]="!(initialized$|async)"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 8bc3f174b6..8de1afedec 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="!(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [dsDisabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
+            [dsBtnDisabled]="!(initialized$|async)" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [dsDisabled]="!(initialized$|async)"
+            type="button"  [dsBtnDisabled]="!(initialized$|async)"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 53f96d61cd..b904133b01 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -77,10 +77,10 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary mr-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
-                        [dsDisabled]="processBulkDeleteService.isProcessing$() |async"
+                        [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
                 </button>
             </div>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a118cd680d..3233aa5555 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -29,7 +29,7 @@
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsDisabled]="!checked">
+    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index aa2b81f057..d14a9edfec 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -13,7 +13,7 @@
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
   <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [dsDisabled]="(isProcessingCreate() | async)"
+          [dsBtnDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
@@ -23,10 +23,10 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [dsDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary mr-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [dsDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index fb305a0512..db77b43a8f 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="!((googleRecaptchaService.captchaVersion() | async) === 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
-      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index dbdb006785..e5cf6c3e2e 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -81,7 +81,7 @@
     <div class="row">
         <div class="col-12">
             <button
-                    [dsDisabled]="isInValidPassword || userInfoForm.invalid"
+                    [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
                     class="btn btn-default btn-primary"
                     (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 815a9a9691..b2227bfbae 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [dsDisabled]="!subject || subject.length === 0"
+            [dsBtnDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index f2a5bdd422..69c49d6117 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [dsDisabled]="ngForm.disabled"
+                [dsBtnDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [dsDisabled]="ngForm.disabled"
+          [dsBtnDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 92e5760efa..0c93aabcf5 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/btn-disabled.directive.ts
similarity index 96%
rename from src/app/shared/disabled-directive.ts
rename to src/app/shared/btn-disabled.directive.ts
index e5ae820e50..ab37643c02 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, Input, HostBinding, HostListener } from '@angular/core';
 
 @Directive({
-    selector: '[dsDisabled]'
+    selector: '[dsBtnDisabled]'
 })
 
 /**
@@ -10,7 +10,7 @@ import { Directive, Input, HostBinding, HostListener } from '@angular/core';
  *
  * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
  */
-export class DisabledDirective {
+export class BtnDisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
         this.isDisabled = !!value;
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index 514011cebd..71515c48ff 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -1,11 +1,11 @@
 import { Component, DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { DisabledDirective } from './disabled-directive';
+import { BtnDisabledDirective } from './btn-disabled.directive';
 
 @Component({
     template: `
-    <button [dsDisabled]="isDisabled">Test Button</button>
+    <button [dsBtnDisabled]="isDisabled">Test Button</button>
   `
 })
 class TestComponent {
@@ -19,7 +19,7 @@ describe('DisabledDirective', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [TestComponent, DisabledDirective]
+            declarations: [TestComponent, BtnDisabledDirective]
         });
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index de53ef0792..e87b7c5cc6 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -13,7 +13,7 @@
             class="btn btn-outline-primary selection"
             (blur)="close.emit($event)"
             (click)="close.emit($event)"
-            [dsDisabled]="disabled"
+            [dsBtnDisabled]="disabled"
             ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 747d14cac6..0503281329 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 9f796c35ce..0738e2f28a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 088cd6efbb..c0ff290d73 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -29,7 +29,7 @@
                 type="button"
                 [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
-                [dsDisabled]="model.disabled"
+                [dsBtnDisabled]="model.disabled"
                 (click)="datepicker.toggle()">
 
             <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index f32fa86281..4c855b397c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -52,7 +52,7 @@
               type="button"
               ngbTooltip="{{'form.search-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly || isSearchDisabled()"
+              [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
               [hidden]="isInputDisabled()"
               (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
@@ -60,7 +60,7 @@
               type="button"
               ngbTooltip="{{'form.clear-help' | translate}}"
               placement="top"
-              [dsDisabled]="model.readOnly"
+              [dsBtnDisabled]="model.readOnly"
               (click)="remove()">{{'form.clear' | translate}}
       </button>
     </div>
@@ -69,14 +69,14 @@
               type="button"
               ngbTooltip="{{'form.edit-help' | translate}}"
               placement="top"
-              [dsDisabled]="isEditDisabled()"
+              [dsBtnDisabled]="isEditDisabled()"
               (click)="switchEditMode()">{{'form.edit' | translate}}
       </button>
       <button *ngIf="editMode" class="btn btn-secondary"
               type="button"
               ngbTooltip="{{'form.save-help' | translate}}"
               placement="top"
-              [dsDisabled]="!hasEmptyValue()"
+              [dsBtnDisabled]="!hasEmptyValue()"
               (click)="saveChanges()">{{'form.save' | translate}}
       </button>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2fb6488e93..81db85f863 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -26,7 +26,7 @@ import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService
 } from '../../../../../testing/dynamic-form-mock-services';
-import {DisabledDirective} from '../../../../../disabled-directive';
+import {BtnDisabledDirective} from '../../../../../btn-disabled.directive';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
@@ -155,7 +155,7 @@ describe('Dynamic Lookup component', () => {
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
-        DisabledDirective
+        BtnDisabledDirective
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 92c68fd9b9..6a0e34f671 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -32,21 +32,21 @@
 
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
           <i class="fas fa-save text-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="!editMode"
+                [dsBtnDisabled]="!editMode"
                 (click)="delete()">
           <i class="fas fa-trash text-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
-                [dsDisabled]="isMandatoryFieldEmpty()"
+                [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="clear()">
           <i class="fas fa-undo fa-2x"
              aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index 934397e8e5..1d2a244840 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsBtnDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -73,18 +73,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [dsDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+              [dsBtnDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [dsDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+            [dsBtnDisabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 01d3c5d142..991858c263 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -24,7 +24,7 @@ import { WorkspaceItem } from '../../../../../core/submission/models/workspaceit
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
-import {DisabledDirective} from '../../../../disabled-directive';
+import {BtnDisabledDirective} from '../../../../btn-disabled.directive';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -104,7 +104,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      declarations: [DsDynamicLookupRelationModalComponent, DisabledDirective],
+      declarations: [DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
       providers: [
         {
diff --git a/src/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.html b/src/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.html
index 6a39c49c67..7d233fe0b7 100644
--- a/src/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.html
+++ b/src/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.html
@@ -49,6 +49,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 4099cdb915..fca41bc252 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [dsDisabled]="!(isValid() | async)">
+                    [dsBtnDisabled]="!(isValid() | async)">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 8f2a875685..9b9d038e86 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -3,7 +3,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
       <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
@@ -30,7 +30,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [dsDisabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
       <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
diff --git a/src/app/shared/form/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
index 5857d9e4a5..b6d623d70b 100644
--- a/src/app/shared/form/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -44,7 +44,7 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        [dsDisabled]="disabled"
+        [disabled]="disabled"
         [min]="min"
         [max]="max"
         [id]="'ds_test_field'"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 7d3c7e4bea..2da0f01def 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -5,13 +5,13 @@
       <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsDisabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
         <button class="btn btn-outline-secondary" type="button" (click)="reset()">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -45,7 +45,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
@@ -77,7 +77,7 @@
           </label>
           <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
                   [class.text-success]="node.isSelected"
-                  [dsDisabled]="!node.item?.selectable"
+                  [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
                   [openDelay]="500"
                   container="body"
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index fed7466c61..865247e39a 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -24,7 +24,7 @@
        @fadeOut>{{ (message | async) | translate }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [dsDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+          [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
 
 <div class="mt-2">
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index e4f52cf361..9785715ee8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-success'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 77532a28f2..28c96e3825 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,5 +1,5 @@
 <button (click)="submitTask()"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         class="declineTaskAction btn btn-warning"
         ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
         type="button">
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 435fa119c3..02d8a37dbb 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,7 +1,7 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
         [ngbTooltip]="rejectTipContent"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="openRejectModal(rejectModal)" >
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
@@ -28,7 +28,7 @@
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
               class="btn btn-danger btn-lg btn-block mt-3"
-              [dsDisabled]="!rejectForm.valid || (processing$ | async)"
+              [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
         <span *ngIf="!(processing$ | async)">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index a6da62a294..52c7df0736 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,7 +1,7 @@
 <button type="button"
         [className]="'btn btn-secondary'"
         ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [dsDisabled]="processing$ | async"
+        [dsBtnDisabled]="processing$ | async"
         (click)="submitTask()">
   <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
   <span *ngIf="!(processing$ | async)"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index fdad9cb243..27aa30a4b6 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,5 +1,5 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsDisabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
   <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
     {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 1534f88895..c51ebf9723 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -34,7 +34,7 @@
     </button>
     <button class="btn collection-confirm"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 58eed6ae4a..d1c2986076 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsDisabled]="selectedIds?.length === 0"
+            [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 7d2e5c4146..9fb9a0260a 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -24,7 +24,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
-import {DisabledDirective} from '../../disabled-directive';
+import {BtnDisabledDirective} from '../../btn-disabled.directive';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -99,7 +99,7 @@ describe('ItemSelectComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])],
-      declarations: [DisabledDirective],
+      declarations: [BtnDisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index b85dcb01ee..f7f2c64e2c 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -55,12 +55,12 @@
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
         <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
                 (click)="goPrev()"
-                [dsDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+                [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
       <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
               (click)="goNext()"
-              [dsDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
             <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
           </span>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 899b693591..e155d1689b 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [dsDisabled]="(isProcessing | async)"
+                  [dsBtnDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [dsDisabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  [dsBtnDisabled]="!(isFormValid() | async) || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 5a0e08a496..6012fe291c 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -39,7 +39,7 @@ import { PaginationServiceStub } from '../../testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreMock } from '../../testing/store.mock';
-import {DisabledDirective} from '../../disabled-directive';
+import {BtnDisabledDirective} from '../../btn-disabled.directive';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -191,7 +191,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         EpersonGroupListComponent,
         ResourcePolicyFormComponent,
         TestComponent,
-        DisabledDirective
+        BtnDisabledDirective
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index b7dd81d7f1..62962495e6 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [dsDisabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [dsDisabled]="(isProcessingDelete() | async)"
+                      [dsBtnDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index b1e29fea06..2b1fdb43d8 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -284,7 +284,7 @@ import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bi
 import { NgxPaginationModule } from 'ngx-pagination';
 import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
 import {ThemedUserMenuComponent} from './auth-nav-menu/user-menu/themed-user-menu.component';
-import {DisabledDirective} from './disabled-directive';
+import {BtnDisabledDirective} from './btn-disabled.directive';
 
 const MODULES = [
   CommonModule,
@@ -494,7 +494,7 @@ const DIRECTIVES = [
   MetadataFieldValidator,
   HoverClassDirective,
   ContextHelpDirective,
-  DisabledDirective,
+  BtnDisabledDirective,
 ];
 
 @NgModule({
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 8b1b74891a..d483e9d944 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -34,7 +34,7 @@
             (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [dsDisabled]="(processing$ | async) || !isValid">
+    <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 10c91e06de..a55c2092d4 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -21,7 +21,7 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsDisabled]="!dso"
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
             [title]="'subscriptions.table.edit' | translate"
             class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index d7795942be..b9e42fa759 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -35,7 +35,7 @@
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
             <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsDisabled]="!uploader.queue.length">
+              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 7f50e5a341..fe9527c266 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [dsDisabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
+            [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 4cb40e2293..467f164f89 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -25,7 +25,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -137,7 +137,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
       declarations: [
         SubmissionFormCollectionComponent,
         TestComponent,
-        DisabledDirective
+        BtnDisabledDirective
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index f7e8bae792..457a56cc76 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index 9071805514..658926834c 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -16,7 +16,7 @@ import { SubmissionFormFooterComponent } from './submission-form-footer.componen
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
-import {DisabledDirective} from '../../../shared/disabled-directive';
+import {BtnDisabledDirective} from '../../../shared/btn-disabled.directive';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -40,7 +40,7 @@ describe('SubmissionFormFooterComponent', () => {
         SubmissionFormFooterComponent,
         TestComponent,
         BrowserOnlyMockPipe,
-        DisabledDirective
+        BtnDisabledDirective
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 28fa4695fb..cb8dde18c5 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsBtnDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 1ce811ce66..b529d9aee4 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,7 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsDisabled]="isSaving">
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
       <span aria-hidden="true">×</span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 589e7b6ebf..3567ef5c64 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -19,7 +19,7 @@
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [dsDisabled]="(processingDelete$ | async)"
+                  [dsBtnDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
             <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
             <i *ngIf="!(processingDelete$ | async)" class="fa fa-trash fa-2x text-danger"></i>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 0f20e0e927..dc2699b6d1 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,7 +87,7 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>

From 1209b40ac9370453a53b4d0097999f3a0934a937 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 16:09:41 +0200
Subject: [PATCH 0434/1286] 117544: fix remaining bug

---
 src/app/shared/btn-disabled.directive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/btn-disabled.directive.ts b/src/app/shared/btn-disabled.directive.ts
index f73422a9d5..427d1654da 100644
--- a/src/app/shared/btn-disabled.directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -18,7 +18,7 @@ import {
  */
 export class BtnDisabledDirective {
 
-    @Input() set dsDisabled(value: boolean) {
+    @Input() set dsBtnDisabled(value: boolean) {
     this.isDisabled = !!value;
   }
 

From d3e87c68fdb6cc797e641d45d2040a94b6302232 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 16:09:41 +0200
Subject: [PATCH 0435/1286] 117544: fix remaining bug

---
 src/app/shared/btn-disabled.directive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/btn-disabled.directive.ts b/src/app/shared/btn-disabled.directive.ts
index f73422a9d5..427d1654da 100644
--- a/src/app/shared/btn-disabled.directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -18,7 +18,7 @@ import {
  */
 export class BtnDisabledDirective {
 
-    @Input() set dsDisabled(value: boolean) {
+    @Input() set dsBtnDisabled(value: boolean) {
     this.isDisabled = !!value;
   }
 

From 4a7ebeea16cdd902f99da11ba2dc9e5ab155620e Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 16 Sep 2024 16:09:41 +0200
Subject: [PATCH 0436/1286] 117544: fix remaining bug

---
 src/app/shared/btn-disabled.directive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/btn-disabled.directive.ts b/src/app/shared/btn-disabled.directive.ts
index ab37643c02..512aa87ede 100644
--- a/src/app/shared/btn-disabled.directive.ts
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -12,7 +12,7 @@ import { Directive, Input, HostBinding, HostListener } from '@angular/core';
  */
 export class BtnDisabledDirective {
 
-    @Input() set dsDisabled(value: boolean) {
+    @Input() set dsBtnDisabled(value: boolean) {
         this.isDisabled = !!value;
     }
 

From c419dd608b8b183c7aa4c9b04485d023d5d0c57d Mon Sep 17 00:00:00 2001
From: nwoodward <woodward.nicholas@gmail.com>
Date: Mon, 16 Sep 2024 15:07:08 -0500
Subject: [PATCH 0437/1286] updates isbot dependency to newest version

---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 server.ts         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f3d6856745..75016e4b85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^1.0.5",
         "http-terminator": "^3.2.0",
-        "isbot": "^3.6.10",
+        "isbot": "^5.1.17",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
@@ -14436,11 +14436,11 @@
       }
     },
     "node_modules/isbot": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-3.8.0.tgz",
-      "integrity": "sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==",
+      "version": "5.1.17",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz",
+      "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/isexe": {
diff --git a/package.json b/package.json
index d85644ad23..9fdc97ff63 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^1.0.5",
     "http-terminator": "^3.2.0",
-    "isbot": "^3.6.10",
+    "isbot": "^5.1.17",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
diff --git a/server.ts b/server.ts
index d0c17166ad..07a05656d8 100644
--- a/server.ts
+++ b/server.ts
@@ -27,7 +27,7 @@ import * as expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
-import isbot from 'isbot';
+import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';

From 7ade45321814218c02e40047318703c1799b2471 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 18 Sep 2024 09:46:38 +0200
Subject: [PATCH 0438/1286] lint rule with autofix to disallow the disabled
 input on button elements

---
 .eslintrc.json                          |   3 +-
 lint/src/rules/html/index.ts            |   3 +
 lint/src/rules/html/no-disabled-attr.ts | 144 ++++++++++++++++++++++++
 3 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 lint/src/rules/html/no-disabled-attr.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index 5fb4c12171..a9e44c5937 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -293,7 +293,8 @@
       ],
       "rules": {
         // Custom DSpace Angular rules
-        "dspace-angular-html/themed-component-usages": "error"
+        "dspace-angular-html/themed-component-usages": "error",
+        "dspace-angular-html/no-disabled-attr": "error"
       }
     },
     {
diff --git a/lint/src/rules/html/index.ts b/lint/src/rules/html/index.ts
index 7c1370ae2d..120751d65a 100644
--- a/lint/src/rules/html/index.ts
+++ b/lint/src/rules/html/index.ts
@@ -10,10 +10,13 @@ import {
   bundle,
   RuleExports,
 } from '../../util/structure';
+import * as noDisabledAttr from './no-disabled-attr';
 import * as themedComponentUsages from './themed-component-usages';
 
 const index = [
   themedComponentUsages,
+  noDisabledAttr,
+
 ] as unknown as RuleExports[];
 
 export = {
diff --git a/lint/src/rules/html/no-disabled-attr.ts b/lint/src/rules/html/no-disabled-attr.ts
new file mode 100644
index 0000000000..22f987d52b
--- /dev/null
+++ b/lint/src/rules/html/no-disabled-attr.ts
@@ -0,0 +1,144 @@
+import {
+  TmplAstBoundAttribute,
+  TmplAstTextAttribute
+} from '@angular-eslint/bundled-angular-compiler';
+import { TemplateParserServices } from '@angular-eslint/utils';
+import {
+  ESLintUtils,
+  TSESLint,
+} from '@typescript-eslint/utils';
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+} from '../../util/structure';
+import { getSourceCode } from '../../util/typescript';
+
+export enum Message {
+  USE_DSBTN_DISABLED = 'mustUseDsBtnDisabled',
+}
+
+export const info = {
+  name: 'no-disabled-attr',
+  meta: {
+    docs: {
+      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute for accessibility reasons.`,
+    },
+    type: 'problem',
+    fixable: 'code',
+    schema: [],
+    messages: {
+      [Message.USE_DSBTN_DISABLED]: 'Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.',
+    },
+  },
+  defaultOptions: [],
+} as DSpaceESLintRuleInfo;
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+    const parserServices = getSourceCode(context).parserServices as TemplateParserServices;
+
+    /**
+     * Some dynamic angular inputs will have disabled as name because of how Angular handles this internally (e.g [class.disabled]="isDisabled")
+     * But these aren't actually the disabled attribute we're looking for, we can determine this by checking the details of the keySpan
+     */
+    function isOtherAttributeDisabled(node: TmplAstBoundAttribute | TmplAstTextAttribute): boolean {
+      // if the details are not null, and the details are not 'disabled', then it's not the disabled attribute we're looking for
+      return node.keySpan?.details !== null && node.keySpan?.details !== 'disabled';
+    }
+
+    /**
+     * Replace the disabled text with [dsBtnDisabled] in the template
+     */
+    function replaceDisabledText(text: string ): string {
+      const hasBrackets = text.includes('[') && text.includes(']');
+      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]';
+      return text.replace('disabled', newDisabledText);
+    }
+
+    function inputIsChildOfButton(node: any): boolean {
+      return (node.parent?.tagName === 'button' || node.parent?.name === 'button');
+    }
+
+    function reportAndFix(node: TmplAstBoundAttribute | TmplAstTextAttribute) {
+      if (!inputIsChildOfButton(node) || isOtherAttributeDisabled(node)) {
+        return;
+      }
+
+      const sourceSpan = node.sourceSpan;
+      context.report({
+        messageId: Message.USE_DSBTN_DISABLED,
+        loc: parserServices.convertNodeSourceSpanToLoc(sourceSpan),
+        fix(fixer) {
+          const templateText = sourceSpan.start.file.content;
+          const disabledText = templateText.slice(sourceSpan.start.offset, sourceSpan.end.offset);
+          const newText = replaceDisabledText(disabledText);
+          return fixer.replaceTextRange([sourceSpan.start.offset, sourceSpan.end.offset], newText);
+        },
+      });
+    }
+
+    return {
+      'BoundAttribute[name="disabled"]'(node: TmplAstBoundAttribute) {
+        reportAndFix(node);
+      },
+      'TextAttribute[name="disabled"]'(node: TmplAstTextAttribute) {
+        reportAndFix(node);
+      },
+    };
+  },
+});
+
+export const tests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'should use [dsBtnDisabled] in HTML templates',
+      code: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'disabled attribute is still valid on non-button elements',
+      code: `
+<input disabled="true">
+      `,
+    },
+    {
+      name: '[disabled] attribute is still valid on non-button elements',
+      code: `
+<input [disabled]="true">
+      `,
+    },
+    {
+      name: 'angular dynamic attributes that use disabled are still valid',
+      code: `
+<button [class.disabled]="isDisabled">Submit</button>
+      `,
+    },
+  ],
+  invalid: [
+    {
+      name: 'should not use disabled attribute in HTML templates',
+      code: `
+<button disabled="true">Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'should not use [disabled] attribute in HTML templates',
+      code: `
+<button [disabled]="true">Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+  ],
+} as NamedTests;
+
+export default rule;

From c249afdb3f0d50facec699606b5e4ccbd4ccd716 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 18 Sep 2024 09:46:38 +0200
Subject: [PATCH 0439/1286] lint rule with autofix to disallow the disabled
 input on button elements

---
 .eslintrc.json                          |   3 +-
 lint/src/rules/html/index.ts            |   3 +
 lint/src/rules/html/no-disabled-attr.ts | 144 ++++++++++++++++++++++++
 3 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 lint/src/rules/html/no-disabled-attr.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index 5fb4c12171..a9e44c5937 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -293,7 +293,8 @@
       ],
       "rules": {
         // Custom DSpace Angular rules
-        "dspace-angular-html/themed-component-usages": "error"
+        "dspace-angular-html/themed-component-usages": "error",
+        "dspace-angular-html/no-disabled-attr": "error"
       }
     },
     {
diff --git a/lint/src/rules/html/index.ts b/lint/src/rules/html/index.ts
index 7c1370ae2d..120751d65a 100644
--- a/lint/src/rules/html/index.ts
+++ b/lint/src/rules/html/index.ts
@@ -10,10 +10,13 @@ import {
   bundle,
   RuleExports,
 } from '../../util/structure';
+import * as noDisabledAttr from './no-disabled-attr';
 import * as themedComponentUsages from './themed-component-usages';
 
 const index = [
   themedComponentUsages,
+  noDisabledAttr,
+
 ] as unknown as RuleExports[];
 
 export = {
diff --git a/lint/src/rules/html/no-disabled-attr.ts b/lint/src/rules/html/no-disabled-attr.ts
new file mode 100644
index 0000000000..22f987d52b
--- /dev/null
+++ b/lint/src/rules/html/no-disabled-attr.ts
@@ -0,0 +1,144 @@
+import {
+  TmplAstBoundAttribute,
+  TmplAstTextAttribute
+} from '@angular-eslint/bundled-angular-compiler';
+import { TemplateParserServices } from '@angular-eslint/utils';
+import {
+  ESLintUtils,
+  TSESLint,
+} from '@typescript-eslint/utils';
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+} from '../../util/structure';
+import { getSourceCode } from '../../util/typescript';
+
+export enum Message {
+  USE_DSBTN_DISABLED = 'mustUseDsBtnDisabled',
+}
+
+export const info = {
+  name: 'no-disabled-attr',
+  meta: {
+    docs: {
+      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute for accessibility reasons.`,
+    },
+    type: 'problem',
+    fixable: 'code',
+    schema: [],
+    messages: {
+      [Message.USE_DSBTN_DISABLED]: 'Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.',
+    },
+  },
+  defaultOptions: [],
+} as DSpaceESLintRuleInfo;
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+    const parserServices = getSourceCode(context).parserServices as TemplateParserServices;
+
+    /**
+     * Some dynamic angular inputs will have disabled as name because of how Angular handles this internally (e.g [class.disabled]="isDisabled")
+     * But these aren't actually the disabled attribute we're looking for, we can determine this by checking the details of the keySpan
+     */
+    function isOtherAttributeDisabled(node: TmplAstBoundAttribute | TmplAstTextAttribute): boolean {
+      // if the details are not null, and the details are not 'disabled', then it's not the disabled attribute we're looking for
+      return node.keySpan?.details !== null && node.keySpan?.details !== 'disabled';
+    }
+
+    /**
+     * Replace the disabled text with [dsBtnDisabled] in the template
+     */
+    function replaceDisabledText(text: string ): string {
+      const hasBrackets = text.includes('[') && text.includes(']');
+      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]';
+      return text.replace('disabled', newDisabledText);
+    }
+
+    function inputIsChildOfButton(node: any): boolean {
+      return (node.parent?.tagName === 'button' || node.parent?.name === 'button');
+    }
+
+    function reportAndFix(node: TmplAstBoundAttribute | TmplAstTextAttribute) {
+      if (!inputIsChildOfButton(node) || isOtherAttributeDisabled(node)) {
+        return;
+      }
+
+      const sourceSpan = node.sourceSpan;
+      context.report({
+        messageId: Message.USE_DSBTN_DISABLED,
+        loc: parserServices.convertNodeSourceSpanToLoc(sourceSpan),
+        fix(fixer) {
+          const templateText = sourceSpan.start.file.content;
+          const disabledText = templateText.slice(sourceSpan.start.offset, sourceSpan.end.offset);
+          const newText = replaceDisabledText(disabledText);
+          return fixer.replaceTextRange([sourceSpan.start.offset, sourceSpan.end.offset], newText);
+        },
+      });
+    }
+
+    return {
+      'BoundAttribute[name="disabled"]'(node: TmplAstBoundAttribute) {
+        reportAndFix(node);
+      },
+      'TextAttribute[name="disabled"]'(node: TmplAstTextAttribute) {
+        reportAndFix(node);
+      },
+    };
+  },
+});
+
+export const tests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'should use [dsBtnDisabled] in HTML templates',
+      code: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'disabled attribute is still valid on non-button elements',
+      code: `
+<input disabled="true">
+      `,
+    },
+    {
+      name: '[disabled] attribute is still valid on non-button elements',
+      code: `
+<input [disabled]="true">
+      `,
+    },
+    {
+      name: 'angular dynamic attributes that use disabled are still valid',
+      code: `
+<button [class.disabled]="isDisabled">Submit</button>
+      `,
+    },
+  ],
+  invalid: [
+    {
+      name: 'should not use disabled attribute in HTML templates',
+      code: `
+<button disabled="true">Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'should not use [disabled] attribute in HTML templates',
+      code: `
+<button [disabled]="true">Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+  ],
+} as NamedTests;
+
+export default rule;

From e2dc89c737abbea43ed195f7f7d31b3844c077ff Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Fri, 20 Sep 2024 10:26:46 +0200
Subject: [PATCH 0440/1286] [CST-15595] fix tests

---
 src/app/shared/cookies/browser-orejime.service.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/cookies/browser-orejime.service.spec.ts b/src/app/shared/cookies/browser-orejime.service.spec.ts
index d0fe608c3f..a281805238 100644
--- a/src/app/shared/cookies/browser-orejime.service.spec.ts
+++ b/src/app/shared/cookies/browser-orejime.service.spec.ts
@@ -126,6 +126,7 @@ describe('BrowserOrejimeService', () => {
     };
 
     service.orejimeConfig = mockConfig;
+    service.createCategories();
   });
 
   it('should be created', () => {

From 83a44ba924fb20065f0bb62fc2a09a7aaec391bc Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 16 Sep 2024 15:46:07 +0200
Subject: [PATCH 0441/1286] 118220: Add live-region service and component

---
 config/config.example.yml                     |  16 ++-
 .../live-region/live-region.component.html    |   3 +
 .../live-region/live-region.component.scss    |  13 ++
 .../live-region/live-region.component.ts      |  25 ++++
 .../shared/live-region/live-region.config.ts  |   9 ++
 .../shared/live-region/live-region.service.ts | 118 ++++++++++++++++++
 src/app/shared/shared.module.ts               |   4 +-
 src/config/app-config.interface.ts            |   2 +
 src/config/default-app-config.ts              |   7 ++
 src/environments/environment.test.ts          |   7 +-
 src/styles/_custom_variables.scss             |   1 +
 11 files changed, 202 insertions(+), 3 deletions(-)
 create mode 100644 src/app/shared/live-region/live-region.component.html
 create mode 100644 src/app/shared/live-region/live-region.component.scss
 create mode 100644 src/app/shared/live-region/live-region.component.ts
 create mode 100644 src/app/shared/live-region/live-region.config.ts
 create mode 100644 src/app/shared/live-region/live-region.service.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index ea38303fa3..58eb6ff33d 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -379,4 +379,18 @@ vocabularies:
 # Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
 comcolSelectionSort:
   sortField: 'dc.title'
-  sortDirection: 'ASC'
\ No newline at end of file
+  sortDirection: 'ASC'
+
+# Live Region configuration
+# Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms:
+# Live regions are perceivable regions of a web page that are typically updated as a
+# result of an external event when user focus may be elsewhere.
+#
+# The DSpace live region is a component present at the bottom of all pages that is invisible by default, but is useful
+# for screen readers. Any message pushed to the live region will be announced by the screen reader. These messages
+# usually contain information about changes on the page that might not be in focus.
+liveRegion:
+  # The duration after which messages disappear from the live region in milliseconds
+  messageTimeOutDurationMs: 30000
+  # The visibility of the live region. Setting this to true is only useful for debugging purposes.
+  isVisible: false
diff --git a/src/app/shared/live-region/live-region.component.html b/src/app/shared/live-region/live-region.component.html
new file mode 100644
index 0000000000..a48f3ad52e
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.html
@@ -0,0 +1,3 @@
+<div class="live-region" [ngClass]="{'visually-hidden': !isVisible }" aria-live="assertive" role="log" aria-relevant="additions" aria-atomic="true">
+  <div class="live-region-message" *ngFor="let message of (messages$ | async)">{{ message }}</div>
+</div>
diff --git a/src/app/shared/live-region/live-region.component.scss b/src/app/shared/live-region/live-region.component.scss
new file mode 100644
index 0000000000..69844a93e1
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.scss
@@ -0,0 +1,13 @@
+.live-region {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding-left: 60px;
+  height: 90px;
+  line-height: 18px;
+  color: var(--bs-white);
+  background-color: var(--bs-dark);
+  opacity: 0.94;
+  z-index: var(--ds-live-region-z-index);
+}
diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
new file mode 100644
index 0000000000..d7bd5eb806
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+import { LiveRegionService } from './live-region.service';
+import { Observable } from 'rxjs';
+
+@Component({
+  selector: `ds-live-region`,
+  templateUrl: './live-region.component.html',
+  styleUrls: ['./live-region.component.scss'],
+})
+export class LiveRegionComponent implements OnInit {
+
+  protected isVisible: boolean;
+
+  protected messages$: Observable<string[]>;
+
+  constructor(
+    protected liveRegionService: LiveRegionService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.isVisible = this.liveRegionService.getLiveRegionVisibility();
+    this.messages$ = this.liveRegionService.getMessages$();
+  }
+}
diff --git a/src/app/shared/live-region/live-region.config.ts b/src/app/shared/live-region/live-region.config.ts
new file mode 100644
index 0000000000..e545bfd254
--- /dev/null
+++ b/src/app/shared/live-region/live-region.config.ts
@@ -0,0 +1,9 @@
+import { Config } from '../../../config/config.interface';
+
+/**
+ * Configuration interface used by the LiveRegionService
+ */
+export class LiveRegionConfig implements Config {
+  messageTimeOutDurationMs: number;
+  isVisible: boolean;
+}
diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
new file mode 100644
index 0000000000..482d1ca1bb
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -0,0 +1,118 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { environment } from '../../../environments/environment';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class LiveRegionService {
+
+  /**
+   * The duration after which the messages disappear in milliseconds
+   * @protected
+   */
+  protected messageTimeOutDurationMs: number = environment.liveRegion.messageTimeOutDurationMs;
+
+  /**
+   * Array containing the messages that should be shown in the live region
+   * @protected
+   */
+  protected messages: string[] = [];
+
+  /**
+   * BehaviorSubject emitting the array with messages every time the array updates
+   * @protected
+   */
+  protected messages$: BehaviorSubject<string[]> = new BehaviorSubject([]);
+
+  /**
+   * Whether the live region should be visible
+   * @protected
+   */
+  protected liveRegionIsVisible: boolean = environment.liveRegion.isVisible;
+
+  /**
+   * Returns a copy of the array with the current live region messages
+   */
+  getMessages() {
+    return [...this.messages];
+  }
+
+  /**
+   * Returns the BehaviorSubject emitting the array with messages every time the array updates
+   */
+  getMessages$() {
+    return this.messages$;
+  }
+
+  /**
+   * Adds a message to the live-region messages array
+   * @param message
+   */
+  addMessage(message: string) {
+    this.messages.push(message);
+    this.emitCurrentMessages();
+
+    // Clear the message once the timeOut has passed
+    setTimeout(() => this.pop(), this.messageTimeOutDurationMs);
+  }
+
+  /**
+   * Clears the live-region messages array
+   */
+  clear() {
+    this.messages = [];
+    this.emitCurrentMessages();
+  }
+
+  /**
+   * Removes the longest living message from the array.
+   * @protected
+   */
+  protected pop() {
+    if (this.messages.length > 0) {
+      this.messages.shift();
+      this.emitCurrentMessages();
+    }
+  }
+
+  /**
+   * Makes the messages$ BehaviorSubject emit the current messages array
+   * @protected
+   */
+  protected emitCurrentMessages() {
+    this.messages$.next(this.getMessages());
+  }
+
+  /**
+   * Returns a boolean specifying whether the live region should be visible.
+   * Returns 'true' if the region should be visible and false otherwise.
+   */
+  getLiveRegionVisibility(): boolean {
+    return this.liveRegionIsVisible;
+  }
+
+  /**
+   * Sets the visibility of the live region.
+   * Setting this to true will make the live region visible which is useful for debugging purposes.
+   * @param isVisible
+   */
+  setLiveRegionVisibility(isVisible: boolean) {
+    this.liveRegionIsVisible = isVisible;
+  }
+
+  /**
+   * Gets the current message timeOut duration in milliseconds
+   */
+  getMessageTimeOutMs(): number {
+    return this.messageTimeOutDurationMs;
+  }
+
+  /**
+   * Sets the message timeOut duration
+   * @param timeOutMs the message timeOut duration in milliseconds
+   */
+  setMessageTimeOutMs(timeOutMs: number) {
+    this.messageTimeOutDurationMs = timeOutMs;
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 0f7871f7f9..db5b778722 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -284,6 +284,7 @@ import {
 } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
 import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
 import { NgxPaginationModule } from 'ngx-pagination';
+import { LiveRegionComponent } from './live-region/live-region.component';
 
 const MODULES = [
   CommonModule,
@@ -465,7 +466,8 @@ const ENTRY_COMPONENTS = [
   AdvancedClaimedTaskActionRatingComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  LiveRegionComponent,
 ];
 
 const PROVIDERS = [
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 84a30549a7..aa3033ecec 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -22,6 +22,7 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -48,6 +49,7 @@ interface AppConfig extends Config {
   markdown: MarkdownConfig;
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
+  liveRegion: LiveRegionConfig;
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index a6e9e092e4..1c0f88cf47 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -22,6 +22,7 @@ import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
+import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -432,4 +433,10 @@ export class DefaultAppConfig implements AppConfig {
     sortField:'dc.title',
     sortDirection:'ASC',
   };
+
+  // Live Region configuration, used by the LiveRegionService
+  liveRegion: LiveRegionConfig = {
+    messageTimeOutDurationMs: 30000,
+    isVisible: false,
+  };
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index cb9d2c7130..498799a454 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -313,5 +313,10 @@ export const environment: BuildConfig = {
       vocabulary: 'srsc',
       enabled: true
     }
-  ]
+  ],
+
+  liveRegion: {
+    messageTimeOutDurationMs: 30000,
+    isVisible: false,
+  },
 };
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index ddf490c7a7..09267d15ae 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -13,6 +13,7 @@
   --ds-login-logo-width:72px;
   --ds-submission-header-z-index: 1001;
   --ds-submission-footer-z-index: 999;
+  --ds-live-region-z-index: 1030;
 
   --ds-main-z-index: 1;
   --ds-nav-z-index: 10;

From e987c35450f2a03e73fe5a9951ec412fb9675e33 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 17 Sep 2024 09:07:02 +0200
Subject: [PATCH 0442/1286] 118220: Add liveRegionComponent & Service tests

---
 .../live-region/live-region.component.spec.ts |  57 +++++++
 .../live-region/live-region.service.spec.ts   | 140 ++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 src/app/shared/live-region/live-region.component.spec.ts
 create mode 100644 src/app/shared/live-region/live-region.service.spec.ts

diff --git a/src/app/shared/live-region/live-region.component.spec.ts b/src/app/shared/live-region/live-region.component.spec.ts
new file mode 100644
index 0000000000..2e9797f9c3
--- /dev/null
+++ b/src/app/shared/live-region/live-region.component.spec.ts
@@ -0,0 +1,57 @@
+import { LiveRegionComponent } from './live-region.component';
+import { ComponentFixture, waitForAsync, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { LiveRegionService } from './live-region.service';
+import { of } from 'rxjs';
+import { By } from '@angular/platform-browser';
+
+describe('liveRegionComponent', () => {
+  let fixture: ComponentFixture<LiveRegionComponent>;
+  let liveRegionService: LiveRegionService;
+
+  beforeEach(waitForAsync(() => {
+    liveRegionService = jasmine.createSpyObj('liveRegionService', {
+      getMessages$: of(['message1', 'message2']),
+      getLiveRegionVisibility: false,
+      setLiveRegionVisibility: undefined,
+    });
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [LiveRegionComponent],
+      providers: [
+        { provide: LiveRegionService, useValue: liveRegionService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LiveRegionComponent);
+    fixture.detectChanges();
+  });
+
+  it('should contain the current live region messages', () => {
+    const messages = fixture.debugElement.queryAll(By.css('.live-region-message'));
+
+    expect(messages.length).toEqual(2);
+    expect(messages[0].nativeElement.textContent).toEqual('message1');
+    expect(messages[1].nativeElement.textContent).toEqual('message2');
+  });
+
+  it('should respect the live region visibility', () => {
+    const liveRegion = fixture.debugElement.query(By.css('.live-region'));
+    expect(liveRegion).toBeDefined();
+
+    const liveRegionHidden = fixture.debugElement.query(By.css('.visually-hidden'));
+    expect(liveRegionHidden).toBeDefined();
+
+    liveRegionService.getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(true);
+    fixture = TestBed.createComponent(LiveRegionComponent);
+    fixture.detectChanges();
+
+    const liveRegionVisible  = fixture.debugElement.query(By.css('.visually-hidden'));
+    expect(liveRegionVisible).toBeNull();
+  });
+});
diff --git a/src/app/shared/live-region/live-region.service.spec.ts b/src/app/shared/live-region/live-region.service.spec.ts
new file mode 100644
index 0000000000..fe5e8b8d8c
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.spec.ts
@@ -0,0 +1,140 @@
+import { LiveRegionService } from './live-region.service';
+import { fakeAsync, tick, flush } from '@angular/core/testing';
+
+describe('liveRegionService', () => {
+  let service: LiveRegionService;
+
+
+  beforeEach(() => {
+    service = new LiveRegionService();
+  });
+
+  describe('addMessage', () => {
+    it('should correctly add messages', () => {
+      expect(service.getMessages().length).toEqual(0);
+
+      service.addMessage('Message One');
+      expect(service.getMessages().length).toEqual(1);
+      expect(service.getMessages()[0]).toEqual('Message One');
+
+      service.addMessage('Message Two');
+      expect(service.getMessages().length).toEqual(2);
+      expect(service.getMessages()[1]).toEqual('Message Two');
+    });
+  });
+
+  describe('clearMessages', () => {
+    it('should clear the messages', () => {
+      expect(service.getMessages().length).toEqual(0);
+
+      service.addMessage('Message One');
+      service.addMessage('Message Two');
+      expect(service.getMessages().length).toEqual(2);
+
+      service.clear();
+      expect(service.getMessages().length).toEqual(0);
+    });
+  });
+
+  describe('messages$', () => {
+    it('should emit when a message is added and when a message is removed after the timeOut', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('message');
+
+      tick();
+
+      expect(results.length).toEqual(2);
+      expect(results[1]).toEqual(['message']);
+
+      tick(service.getMessageTimeOutMs());
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual([]);
+    }));
+
+    it('should only emit once when the messages are cleared', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('Message One');
+      service.addMessage('Message Two');
+
+      tick();
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual(['Message One', 'Message Two']);
+
+      service.clear();
+      flush();
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual([]);
+    }));
+
+    it('should respect configured timeOut', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      const timeOutMs = 500;
+      service.setMessageTimeOutMs(timeOutMs);
+
+      service.addMessage('Message One');
+      tick(timeOutMs - 1);
+
+      expect(results.length).toEqual(2);
+      expect(results[1]).toEqual(['Message One']);
+
+      tick(1);
+
+      expect(results.length).toEqual(3);
+      expect(results[2]).toEqual([]);
+
+      const timeOutMsTwo = 50000;
+      service.setMessageTimeOutMs(timeOutMsTwo);
+
+      service.addMessage('Message Two');
+      tick(timeOutMsTwo - 1);
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual(['Message Two']);
+
+      tick(1);
+
+      expect(results.length).toEqual(5);
+      expect(results[4]).toEqual([]);
+    }));
+  });
+
+  describe('liveRegionVisibility', () => {
+    it('should be false by default', () => {
+      expect(service.getLiveRegionVisibility()).toBeFalse();
+    });
+
+    it('should correctly update', () => {
+      service.setLiveRegionVisibility(true);
+      expect(service.getLiveRegionVisibility()).toBeTrue();
+      service.setLiveRegionVisibility(false);
+      expect(service.getLiveRegionVisibility()).toBeFalse();
+    });
+  });
+});

From 35d29c84258e1656ed17c53e6e7054c69b7878d1 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 20 Sep 2024 09:38:31 +0200
Subject: [PATCH 0443/1286] 118220: Add LiveRegion to RootComponent

---
 src/app/root/root.component.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index bf49e507c0..d59bea1db4 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -27,3 +27,5 @@
 <div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
   <ds-themed-loading [showMessage]="false"></ds-themed-loading>
 </div>
+
+<ds-live-region></ds-live-region>

From 2380d4e751563181b341c5a225bae5a9be40d7e3 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 20 Sep 2024 16:45:05 +0200
Subject: [PATCH 0444/1286] fix bug in lint rule, add docs for rule and update
 name so it's clear this is only for buttons currently

---
 .eslintrc.json                                    |  2 +-
 docs/lint/html/index.md                           |  1 +
 lint/src/rules/html/index.ts                      |  4 ++--
 ...attr.ts => no-disabled-attribute-on-button.ts} | 15 +++++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename lint/src/rules/html/{no-disabled-attr.ts => no-disabled-attribute-on-button.ts} (89%)

diff --git a/.eslintrc.json b/.eslintrc.json
index a9e44c5937..888c968b5c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -294,7 +294,7 @@
       "rules": {
         // Custom DSpace Angular rules
         "dspace-angular-html/themed-component-usages": "error",
-        "dspace-angular-html/no-disabled-attr": "error"
+        "dspace-angular-html/no-disabled-attribute-on-button": "error"
       }
     },
     {
diff --git a/docs/lint/html/index.md b/docs/lint/html/index.md
index 15d693843c..e134e1070f 100644
--- a/docs/lint/html/index.md
+++ b/docs/lint/html/index.md
@@ -2,3 +2,4 @@
 _______
 
 - [`dspace-angular-html/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via the selector of their `ThemedComponent` wrapper class
+- [`dspace-angular-html/no-disabled-attribute-on-button`](./rules/no-disabled-attribute-on-button.md): Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
diff --git a/lint/src/rules/html/index.ts b/lint/src/rules/html/index.ts
index 120751d65a..3d425c3ad4 100644
--- a/lint/src/rules/html/index.ts
+++ b/lint/src/rules/html/index.ts
@@ -10,12 +10,12 @@ import {
   bundle,
   RuleExports,
 } from '../../util/structure';
-import * as noDisabledAttr from './no-disabled-attr';
+import * as noDisabledAttributeOnButton from './no-disabled-attribute-on-button';
 import * as themedComponentUsages from './themed-component-usages';
 
 const index = [
   themedComponentUsages,
-  noDisabledAttr,
+  noDisabledAttributeOnButton,
 
 ] as unknown as RuleExports[];
 
diff --git a/lint/src/rules/html/no-disabled-attr.ts b/lint/src/rules/html/no-disabled-attribute-on-button.ts
similarity index 89%
rename from lint/src/rules/html/no-disabled-attr.ts
rename to lint/src/rules/html/no-disabled-attribute-on-button.ts
index 22f987d52b..bf1a72d70d 100644
--- a/lint/src/rules/html/no-disabled-attr.ts
+++ b/lint/src/rules/html/no-disabled-attribute-on-button.ts
@@ -1,12 +1,13 @@
 import {
   TmplAstBoundAttribute,
-  TmplAstTextAttribute
+  TmplAstTextAttribute,
 } from '@angular-eslint/bundled-angular-compiler';
 import { TemplateParserServices } from '@angular-eslint/utils';
 import {
   ESLintUtils,
   TSESLint,
 } from '@typescript-eslint/utils';
+
 import {
   DSpaceESLintRuleInfo,
   NamedTests,
@@ -18,10 +19,12 @@ export enum Message {
 }
 
 export const info = {
-  name: 'no-disabled-attr',
+  name: 'no-disabled-attribute-on-button',
   meta: {
     docs: {
-      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute for accessibility reasons.`,
+      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.`,
     },
     type: 'problem',
     fixable: 'code',
@@ -52,7 +55,7 @@ export const rule = ESLintUtils.RuleCreator.withoutDocs({
      */
     function replaceDisabledText(text: string ): string {
       const hasBrackets = text.includes('[') && text.includes(']');
-      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]';
+      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]="true"';
       return text.replace('disabled', newDisabledText);
     }
 
@@ -101,7 +104,7 @@ export const tests = {
     {
       name: 'disabled attribute is still valid on non-button elements',
       code: `
-<input disabled="true">
+<input disabled>
       `,
     },
     {
@@ -121,7 +124,7 @@ export const tests = {
     {
       name: 'should not use disabled attribute in HTML templates',
       code: `
-<button disabled="true">Submit</button>
+<button disabled>Submit</button>
       `,
       errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
       output: `

From ee83beae94d8ef35838fe00c11359164800a0e51 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 20 Sep 2024 16:45:05 +0200
Subject: [PATCH 0445/1286] fix bug in lint rule, add docs for rule and update
 name so it's clear this is only for buttons currently

(cherry picked from commit 2380d4e751563181b341c5a225bae5a9be40d7e3)
---
 .eslintrc.json                                    |  2 +-
 docs/lint/html/index.md                           |  1 +
 lint/src/rules/html/index.ts                      |  4 ++--
 ...attr.ts => no-disabled-attribute-on-button.ts} | 15 +++++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename lint/src/rules/html/{no-disabled-attr.ts => no-disabled-attribute-on-button.ts} (89%)

diff --git a/.eslintrc.json b/.eslintrc.json
index a9e44c5937..888c968b5c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -294,7 +294,7 @@
       "rules": {
         // Custom DSpace Angular rules
         "dspace-angular-html/themed-component-usages": "error",
-        "dspace-angular-html/no-disabled-attr": "error"
+        "dspace-angular-html/no-disabled-attribute-on-button": "error"
       }
     },
     {
diff --git a/docs/lint/html/index.md b/docs/lint/html/index.md
index 15d693843c..e134e1070f 100644
--- a/docs/lint/html/index.md
+++ b/docs/lint/html/index.md
@@ -2,3 +2,4 @@
 _______
 
 - [`dspace-angular-html/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via the selector of their `ThemedComponent` wrapper class
+- [`dspace-angular-html/no-disabled-attribute-on-button`](./rules/no-disabled-attribute-on-button.md): Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
diff --git a/lint/src/rules/html/index.ts b/lint/src/rules/html/index.ts
index 120751d65a..3d425c3ad4 100644
--- a/lint/src/rules/html/index.ts
+++ b/lint/src/rules/html/index.ts
@@ -10,12 +10,12 @@ import {
   bundle,
   RuleExports,
 } from '../../util/structure';
-import * as noDisabledAttr from './no-disabled-attr';
+import * as noDisabledAttributeOnButton from './no-disabled-attribute-on-button';
 import * as themedComponentUsages from './themed-component-usages';
 
 const index = [
   themedComponentUsages,
-  noDisabledAttr,
+  noDisabledAttributeOnButton,
 
 ] as unknown as RuleExports[];
 
diff --git a/lint/src/rules/html/no-disabled-attr.ts b/lint/src/rules/html/no-disabled-attribute-on-button.ts
similarity index 89%
rename from lint/src/rules/html/no-disabled-attr.ts
rename to lint/src/rules/html/no-disabled-attribute-on-button.ts
index 22f987d52b..bf1a72d70d 100644
--- a/lint/src/rules/html/no-disabled-attr.ts
+++ b/lint/src/rules/html/no-disabled-attribute-on-button.ts
@@ -1,12 +1,13 @@
 import {
   TmplAstBoundAttribute,
-  TmplAstTextAttribute
+  TmplAstTextAttribute,
 } from '@angular-eslint/bundled-angular-compiler';
 import { TemplateParserServices } from '@angular-eslint/utils';
 import {
   ESLintUtils,
   TSESLint,
 } from '@typescript-eslint/utils';
+
 import {
   DSpaceESLintRuleInfo,
   NamedTests,
@@ -18,10 +19,12 @@ export enum Message {
 }
 
 export const info = {
-  name: 'no-disabled-attr',
+  name: 'no-disabled-attribute-on-button',
   meta: {
     docs: {
-      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute for accessibility reasons.`,
+      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.`,
     },
     type: 'problem',
     fixable: 'code',
@@ -52,7 +55,7 @@ export const rule = ESLintUtils.RuleCreator.withoutDocs({
      */
     function replaceDisabledText(text: string ): string {
       const hasBrackets = text.includes('[') && text.includes(']');
-      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]';
+      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]="true"';
       return text.replace('disabled', newDisabledText);
     }
 
@@ -101,7 +104,7 @@ export const tests = {
     {
       name: 'disabled attribute is still valid on non-button elements',
       code: `
-<input disabled="true">
+<input disabled>
       `,
     },
     {
@@ -121,7 +124,7 @@ export const tests = {
     {
       name: 'should not use disabled attribute in HTML templates',
       code: `
-<button disabled="true">Submit</button>
+<button disabled>Submit</button>
       `,
       errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
       output: `

From ed5ac47f886fb0e2ad7ef29c2152abcbe414cca1 Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Mon, 23 Sep 2024 15:53:55 -0400
Subject: [PATCH 0446/1286] Update en.json5 - fixed typo for occurred

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index bf866950bc..31e45d4624 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1460,7 +1460,7 @@
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "An error occurred while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1670,7 +1670,7 @@
 
   "curation.form.submit.error.head": "Running the curation task failed",
 
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
 
   "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
 
@@ -1934,7 +1934,7 @@
 
   "forgot-email.form.error.head": "Error when trying to reset password",
 
-  "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": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
 
   "forgot-password.title": "Forgot Password",
 
@@ -4110,7 +4110,7 @@
 
   "register-page.registration.error.head": "Error when trying to register email",
 
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
 
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
 

From e6a02bcbea39f44211d6bcf6d5b95be76498cf30 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 23 Sep 2024 18:15:39 +0200
Subject: [PATCH 0447/1286] [CST-15077] add orcid icon with tooltip

---
 ...-item-metadata-list-element.component.html |  5 ++
 ...on-item-metadata-list-element.component.ts |  3 +-
 .../orcid-badge-and-tooltip.component.html    | 11 +++
 .../orcid-badge-and-tooltip.component.scss    | 11 +++
 .../orcid-badge-and-tooltip.component.spec.ts | 71 +++++++++++++++++++
 .../orcid-badge-and-tooltip.component.ts      | 65 +++++++++++++++++
 src/assets/i18n/en.json5                      |  4 ++
 7 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..f61c14d3ba 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -12,4 +12,9 @@
   <a [routerLink]="[itemPageRoute]"
      [innerHTML]="mdRepresentation.getValue()"
      [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  <ds-orcid-badge-and-tooltip class="ml-1"
+                              *ngIf="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+  </ds-orcid-badge-and-tooltip>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index 48957a6cbd..c7b9e1a333 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -7,13 +7,14 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import { OrcidBadgeAndTooltipComponent } from '../../../../shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
 
 @Component({
   selector: 'ds-person-item-metadata-list-element',
   templateUrl: './person-item-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule],
+  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
new file mode 100644
index 0000000000..fc34aee970
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -0,0 +1,11 @@
+<img placement="top"
+     [ngbTooltip]="orcidTooltipTemplate"
+     class="orcid-icon"
+     [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
+     alt="orcid-logo"
+     src="assets/images/orcid.logo.icon.svg"
+     data-test="orcidIcon"/>
+
+<ng-template #orcidTooltipTemplate>
+    <span class="text-muted">{{ orcidTooltip }}</span>
+</ng-template>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
new file mode 100644
index 0000000000..6a1c259e18
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: inline-block;
+}
+
+.orcid-icon {
+  height: 1.2rem;
+
+  &.not-authenticated {
+    filter: grayscale(100%);
+  }
+}
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
new file mode 100644
index 0000000000..dd47fd918b
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -0,0 +1,71 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component';
+
+describe('OrcidBadgeAndTooltipComponent', () => {
+  let component: OrcidBadgeAndTooltipComponent;
+  let fixture: ComponentFixture<OrcidBadgeAndTooltipComponent>;
+  let translateService: TranslateService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        OrcidBadgeAndTooltipComponent,
+        NgbTooltipModule,
+        NgClass,
+        NgIf,
+      ],
+      providers: [
+        { provide: TranslateService, useValue: { instant: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OrcidBadgeAndTooltipComponent);
+    component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
+
+    component.orcid = { value: '0000-0002-1825-0097' } as MetadataValue;
+    component.authenticatedTimestamp = { value: '2023-10-01' } as MetadataValue;
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is provided', () => {
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.authenticated');
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is not provided', () => {
+    component.authenticatedTimestamp = null;
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.not-authenticated');
+  });
+
+  it('should display the ORCID icon', () => {
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon).toBeTruthy();
+  });
+
+  it('should display the ORCID icon in greyscale if there is no authenticated timestamp', () => {
+    component.authenticatedTimestamp = null;
+    fixture.detectChanges();
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon.nativeElement.classList).toContain('not-authenticated');
+  });
+
+});
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
new file mode 100644
index 0000000000..6e8ba7100f
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -0,0 +1,65 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+/**
+ * Component to display an ORCID badge with a tooltip.
+ * The tooltip text changes based on whether the ORCID is authenticated.
+ */
+@Component({
+  selector: 'ds-orcid-badge-and-tooltip',
+  standalone: true,
+  imports: [
+    NgIf,
+    NgbTooltipModule,
+    NgClass,
+  ],
+  templateUrl: './orcid-badge-and-tooltip.component.html',
+  styleUrl: './orcid-badge-and-tooltip.component.scss',
+})
+export class OrcidBadgeAndTooltipComponent implements OnInit {
+
+  /**
+   * The ORCID value to be displayed.
+   */
+  @Input() orcid: MetadataValue;
+
+  /**
+   * The timestamp indicating when the ORCID was authenticated.
+   */
+  @Input() authenticatedTimestamp: MetadataValue;
+
+  /**
+   * The tooltip text to be displayed.
+   */
+  orcidTooltip: string;
+
+  /**
+   * Constructor to inject the TranslateService.
+   * @param translateService - Service for translation.
+   */
+  constructor(
+    private translateService: TranslateService,
+  ) { }
+
+  /**
+   * Initializes the component.
+   * Sets the tooltip text based on the presence of the authenticated timestamp.
+   */
+  ngOnInit() {
+    this.orcidTooltip = this.authenticatedTimestamp ?
+      this.translateService.instant('person.orcid-tooltip.authenticated', { orcid: this.orcid.value }) :
+      this.translateService.instant('person.orcid-tooltip.not-authenticated', { orcid: this.orcid.value });
+  }
+
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8f20c657f9..7ae8985fbe 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5980,6 +5980,10 @@
 
   "person.orcid.registry.auth": "ORCID Authorizations",
 
+  "person.orcid-tooltip.authenticated": "{{orcid}}",
+
+  "person.orcid-tooltip.not-authenticated": "{{orcid}} (unconfirmed)",
+
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",

From 99100371b8ff5fdcd7896a307ff4efa04c10289c Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 23 Sep 2024 18:15:39 +0200
Subject: [PATCH 0448/1286] [CST-15078] add orcid icon with tooltip

---
 ...-item-metadata-list-element.component.html |  5 ++
 ...on-item-metadata-list-element.component.ts |  3 +-
 .../orcid-badge-and-tooltip.component.html    | 11 +++
 .../orcid-badge-and-tooltip.component.scss    | 11 +++
 .../orcid-badge-and-tooltip.component.spec.ts | 71 +++++++++++++++++++
 .../orcid-badge-and-tooltip.component.ts      | 65 +++++++++++++++++
 src/assets/i18n/en.json5                      |  4 ++
 7 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..f61c14d3ba 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -12,4 +12,9 @@
   <a [routerLink]="[itemPageRoute]"
      [innerHTML]="mdRepresentation.getValue()"
      [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  <ds-orcid-badge-and-tooltip class="ml-1"
+                              *ngIf="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+  </ds-orcid-badge-and-tooltip>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index 48957a6cbd..c7b9e1a333 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -7,13 +7,14 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import { OrcidBadgeAndTooltipComponent } from '../../../../shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
 
 @Component({
   selector: 'ds-person-item-metadata-list-element',
   templateUrl: './person-item-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule],
+  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
new file mode 100644
index 0000000000..fc34aee970
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -0,0 +1,11 @@
+<img placement="top"
+     [ngbTooltip]="orcidTooltipTemplate"
+     class="orcid-icon"
+     [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
+     alt="orcid-logo"
+     src="assets/images/orcid.logo.icon.svg"
+     data-test="orcidIcon"/>
+
+<ng-template #orcidTooltipTemplate>
+    <span class="text-muted">{{ orcidTooltip }}</span>
+</ng-template>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
new file mode 100644
index 0000000000..6a1c259e18
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: inline-block;
+}
+
+.orcid-icon {
+  height: 1.2rem;
+
+  &.not-authenticated {
+    filter: grayscale(100%);
+  }
+}
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
new file mode 100644
index 0000000000..dd47fd918b
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -0,0 +1,71 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component';
+
+describe('OrcidBadgeAndTooltipComponent', () => {
+  let component: OrcidBadgeAndTooltipComponent;
+  let fixture: ComponentFixture<OrcidBadgeAndTooltipComponent>;
+  let translateService: TranslateService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        OrcidBadgeAndTooltipComponent,
+        NgbTooltipModule,
+        NgClass,
+        NgIf,
+      ],
+      providers: [
+        { provide: TranslateService, useValue: { instant: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OrcidBadgeAndTooltipComponent);
+    component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
+
+    component.orcid = { value: '0000-0002-1825-0097' } as MetadataValue;
+    component.authenticatedTimestamp = { value: '2023-10-01' } as MetadataValue;
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is provided', () => {
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.authenticated');
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is not provided', () => {
+    component.authenticatedTimestamp = null;
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.not-authenticated');
+  });
+
+  it('should display the ORCID icon', () => {
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon).toBeTruthy();
+  });
+
+  it('should display the ORCID icon in greyscale if there is no authenticated timestamp', () => {
+    component.authenticatedTimestamp = null;
+    fixture.detectChanges();
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon.nativeElement.classList).toContain('not-authenticated');
+  });
+
+});
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
new file mode 100644
index 0000000000..6e8ba7100f
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -0,0 +1,65 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+/**
+ * Component to display an ORCID badge with a tooltip.
+ * The tooltip text changes based on whether the ORCID is authenticated.
+ */
+@Component({
+  selector: 'ds-orcid-badge-and-tooltip',
+  standalone: true,
+  imports: [
+    NgIf,
+    NgbTooltipModule,
+    NgClass,
+  ],
+  templateUrl: './orcid-badge-and-tooltip.component.html',
+  styleUrl: './orcid-badge-and-tooltip.component.scss',
+})
+export class OrcidBadgeAndTooltipComponent implements OnInit {
+
+  /**
+   * The ORCID value to be displayed.
+   */
+  @Input() orcid: MetadataValue;
+
+  /**
+   * The timestamp indicating when the ORCID was authenticated.
+   */
+  @Input() authenticatedTimestamp: MetadataValue;
+
+  /**
+   * The tooltip text to be displayed.
+   */
+  orcidTooltip: string;
+
+  /**
+   * Constructor to inject the TranslateService.
+   * @param translateService - Service for translation.
+   */
+  constructor(
+    private translateService: TranslateService,
+  ) { }
+
+  /**
+   * Initializes the component.
+   * Sets the tooltip text based on the presence of the authenticated timestamp.
+   */
+  ngOnInit() {
+    this.orcidTooltip = this.authenticatedTimestamp ?
+      this.translateService.instant('person.orcid-tooltip.authenticated', { orcid: this.orcid.value }) :
+      this.translateService.instant('person.orcid-tooltip.not-authenticated', { orcid: this.orcid.value });
+  }
+
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index bf866950bc..c67fbaf3bc 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5982,6 +5982,10 @@
 
   "person.orcid.registry.auth": "ORCID Authorizations",
 
+  "person.orcid-tooltip.authenticated": "{{orcid}}",
+
+  "person.orcid-tooltip.not-authenticated": "{{orcid}} (unconfirmed)",
+
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",

From cd51baa5f1ee5d8fa66e8ee94beb3168f93c5c01 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 23 Sep 2024 18:15:39 +0200
Subject: [PATCH 0449/1286] [CST-14904] add orcid icon with tooltip

---
 ...-item-metadata-list-element.component.html |  5 ++
 .../orcid-badge-and-tooltip.component.html    | 11 +++
 .../orcid-badge-and-tooltip.component.scss    | 11 +++
 .../orcid-badge-and-tooltip.component.spec.ts | 71 +++++++++++++++++++
 .../orcid-badge-and-tooltip.component.ts      | 56 +++++++++++++++
 src/app/shared/shared.module.ts               |  2 +
 src/assets/i18n/en.json5                      |  4 ++
 7 files changed, 160 insertions(+)
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
 create mode 100644 src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..f61c14d3ba 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -12,4 +12,9 @@
   <a [routerLink]="[itemPageRoute]"
      [innerHTML]="mdRepresentation.getValue()"
      [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  <ds-orcid-badge-and-tooltip class="ml-1"
+                              *ngIf="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+                              [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+  </ds-orcid-badge-and-tooltip>
 </ds-truncatable>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
new file mode 100644
index 0000000000..fc34aee970
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -0,0 +1,11 @@
+<img placement="top"
+     [ngbTooltip]="orcidTooltipTemplate"
+     class="orcid-icon"
+     [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
+     alt="orcid-logo"
+     src="assets/images/orcid.logo.icon.svg"
+     data-test="orcidIcon"/>
+
+<ng-template #orcidTooltipTemplate>
+    <span class="text-muted">{{ orcidTooltip }}</span>
+</ng-template>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
new file mode 100644
index 0000000000..6a1c259e18
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: inline-block;
+}
+
+.orcid-icon {
+  height: 1.2rem;
+
+  &.not-authenticated {
+    filter: grayscale(100%);
+  }
+}
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
new file mode 100644
index 0000000000..adb3c91f94
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -0,0 +1,71 @@
+import {
+  NgClass,
+  NgIf,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component';
+
+describe('OrcidBadgeAndTooltipComponent', () => {
+  let component: OrcidBadgeAndTooltipComponent;
+  let fixture: ComponentFixture<OrcidBadgeAndTooltipComponent>;
+  let translateService: TranslateService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [OrcidBadgeAndTooltipComponent],
+      imports: [
+        NgbTooltipModule,
+        NgClass,
+        NgIf,
+      ],
+      providers: [
+        { provide: TranslateService, useValue: { instant: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OrcidBadgeAndTooltipComponent);
+    component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
+
+    component.orcid = { value: '0000-0002-1825-0097' } as MetadataValue;
+    component.authenticatedTimestamp = { value: '2023-10-01' } as MetadataValue;
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is provided', () => {
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.authenticated');
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is not provided', () => {
+    component.authenticatedTimestamp = null;
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.not-authenticated');
+  });
+
+  it('should display the ORCID icon', () => {
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon).toBeTruthy();
+  });
+
+  it('should display the ORCID icon in greyscale if there is no authenticated timestamp', () => {
+    component.authenticatedTimestamp = null;
+    fixture.detectChanges();
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon.nativeElement.classList).toContain('not-authenticated');
+  });
+
+});
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
new file mode 100644
index 0000000000..1939bad57f
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -0,0 +1,56 @@
+
+
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+/**
+ * Component to display an ORCID badge with a tooltip.
+ * The tooltip text changes based on whether the ORCID is authenticated.
+ */
+@Component({
+  selector: 'ds-orcid-badge-and-tooltip',
+  templateUrl: './orcid-badge-and-tooltip.component.html',
+  styleUrls: ['./orcid-badge-and-tooltip.component.scss'],
+})
+export class OrcidBadgeAndTooltipComponent implements OnInit {
+
+  /**
+   * The ORCID value to be displayed.
+   */
+  @Input() orcid: MetadataValue;
+
+  /**
+   * The timestamp indicating when the ORCID was authenticated.
+   */
+  @Input() authenticatedTimestamp: MetadataValue;
+
+  /**
+   * The tooltip text to be displayed.
+   */
+  orcidTooltip: string;
+
+  /**
+   * Constructor to inject the TranslateService.
+   * @param translateService - Service for translation.
+   */
+  constructor(
+    private translateService: TranslateService,
+  ) { }
+
+  /**
+   * Initializes the component.
+   * Sets the tooltip text based on the presence of the authenticated timestamp.
+   */
+  ngOnInit() {
+    this.orcidTooltip = this.authenticatedTimestamp ?
+      this.translateService.instant('person.orcid-tooltip.authenticated', { orcid: this.orcid.value }) :
+      this.translateService.instant('person.orcid-tooltip.not-authenticated', { orcid: this.orcid.value });
+  }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 9f05b1d370..d6b6e861ce 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -284,6 +284,7 @@ import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bi
 import { NgxPaginationModule } from 'ngx-pagination';
 import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
 import {ThemedUserMenuComponent} from './auth-nav-menu/user-menu/themed-user-menu.component';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip/orcid-badge-and-tooltip.component';
 
 const MODULES = [
   CommonModule,
@@ -404,6 +405,7 @@ const COMPONENTS = [
   EpersonSearchBoxComponent,
   GroupSearchBoxComponent,
   ThemedItemPageTitleFieldComponent,
+  OrcidBadgeAndTooltipComponent,
 ];
 
 const ENTRY_COMPONENTS = [
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0a1804fa5c..3f85e8b687 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5248,6 +5248,10 @@
 
   "person.orcid.registry.auth": "ORCID Authorizations",
 
+  "person.orcid-tooltip.authenticated": "{{orcid}}",
+
+  "person.orcid-tooltip.not-authenticated": "{{orcid}} (unconfirmed)",
+
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",

From e45b6af26dc8faf25774951fe9e3309fda46b3c1 Mon Sep 17 00:00:00 2001
From: nwoodward <woodward.nicholas@gmail.com>
Date: Tue, 24 Sep 2024 09:46:58 -0500
Subject: [PATCH 0450/1286] updates isbot dependency to newest version

---
 package.json | 2 +-
 server.ts    | 2 +-
 yarn.lock    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 82822316aa..75c40857bc 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^1.0.5",
     "http-terminator": "^3.2.0",
-    "isbot": "^3.6.10",
+    "isbot": "^5.1.17",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
diff --git a/server.ts b/server.ts
index 22f3423287..032b79b8f2 100644
--- a/server.ts
+++ b/server.ts
@@ -27,7 +27,7 @@ import * as expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
-import isbot from 'isbot';
+import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
diff --git a/yarn.lock b/yarn.lock
index d923560e56..f42bb504fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7282,10 +7282,10 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
-isbot@^3.6.10:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.8.0.tgz#b1f8e3d19aca0961b5ed27b62bb8bb0a275781e4"
-  integrity sha512-vne1mzQUTR+qsMLeCBL9+/tgnDXRyc2pygLGl/WsgA+EZKIiB5Ehu0CiVTHIIk30zhJ24uGz4M5Ppse37aR0Hg==
+isbot@^5.1.17:
+  version "5.1.17"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
+  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
 
 isexe@^2.0.0:
   version "2.0.0"

From 35946dcf7cefdaafb70a2ee5ee02a2b53c7e8817 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 25 Sep 2024 08:13:21 +0300
Subject: [PATCH 0451/1286] Update isbot dependency

Note that the minimum supported Node.js version is now v18, as v16
is now end of life.
---
 package.json | 2 +-
 server.ts    | 2 +-
 yarn.lock    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 86959196d0..78f0cc9887 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^1.0.5",
     "http-terminator": "^3.2.0",
-    "isbot": "^3.6.10",
+    "isbot": "^5.1.17",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
diff --git a/server.ts b/server.ts
index 93f3e86876..23d29723c6 100644
--- a/server.ts
+++ b/server.ts
@@ -28,7 +28,7 @@ import * as expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
-import isbot from 'isbot';
+import { isbot } from 'isbot';
 import { createCertificate } from 'pem';
 import { createServer } from 'https';
 import { json } from 'body-parser';
diff --git a/yarn.lock b/yarn.lock
index efc65983c6..2a4fd40b5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7188,10 +7188,10 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
-isbot@^3.6.10:
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.6.10.tgz#7b66334e81794f0461794debb567975cf08eaf2b"
-  integrity sha512-+I+2998oyP4oW9+OTQD8TS1r9P6wv10yejukj+Ksj3+UR5pUhsZN3f8W7ysq0p1qxpOVNbl5mCuv0bCaF8y5iQ==
+isbot@^5.1.17:
+  version "5.1.17"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
+  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
 
 isexe@^2.0.0:
   version "2.0.0"

From 29c1b510733a6081fb5bfa09a5c8f7c0c25de300 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 25 Sep 2024 08:34:04 +0300
Subject: [PATCH 0452/1286] .github/workflows/build.yml: use Node.js v18 and
 v20

Node.js v16 LTS is end of life since October, 2023.

See: https://nodejs.org/en/about/previous-releases
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50b260b59e..f6ffa5e004 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job

From c1fa52ee64e7c50f38c0e671aa13757bc7a4c024 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 25 Sep 2024 09:50:33 +0200
Subject: [PATCH 0453/1286] 118220: Store messages with ID so clears can be
 targeted

---
 .../live-region/live-region.service.spec.ts   | 34 +++++++++++++++-
 .../shared/live-region/live-region.service.ts | 39 ++++++++++++-------
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/app/shared/live-region/live-region.service.spec.ts b/src/app/shared/live-region/live-region.service.spec.ts
index fe5e8b8d8c..858ef88313 100644
--- a/src/app/shared/live-region/live-region.service.spec.ts
+++ b/src/app/shared/live-region/live-region.service.spec.ts
@@ -1,12 +1,14 @@
 import { LiveRegionService } from './live-region.service';
 import { fakeAsync, tick, flush } from '@angular/core/testing';
+import { UUIDService } from '../../core/shared/uuid.service';
 
 describe('liveRegionService', () => {
   let service: LiveRegionService;
 
-
   beforeEach(() => {
-    service = new LiveRegionService();
+    service = new LiveRegionService(
+      new UUIDService(),
+    );
   });
 
   describe('addMessage', () => {
@@ -85,6 +87,34 @@ describe('liveRegionService', () => {
       expect(results[3]).toEqual([]);
     }));
 
+    it('should not pop messages added after clearing within timeOut period', fakeAsync(() => {
+      const results: string[][] = [];
+
+      service.getMessages$().subscribe((messages) => {
+        results.push(messages);
+      });
+
+      expect(results.length).toEqual(1);
+      expect(results[0]).toEqual([]);
+
+      service.addMessage('Message One');
+      tick(10000);
+      service.clear();
+      tick(15000);
+      service.addMessage('Message Two');
+
+      // Message Two should not be cleared after 5 more seconds
+      tick(5000);
+
+      expect(results.length).toEqual(4);
+      expect(results[3]).toEqual(['Message Two']);
+
+      // But should be cleared 30 seconds after it was added
+      tick(25000);
+      expect(results.length).toEqual(5);
+      expect(results[4]).toEqual([]);
+    }));
+
     it('should respect configured timeOut', fakeAsync(() => {
       const results: string[][] = [];
 
diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
index 482d1ca1bb..d89d72a967 100644
--- a/src/app/shared/live-region/live-region.service.ts
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -1,12 +1,18 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { environment } from '../../../environments/environment';
+import { UUIDService } from '../../core/shared/uuid.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class LiveRegionService {
 
+  constructor(
+    protected uuidService: UUIDService,
+  ) {
+  }
+
   /**
    * The duration after which the messages disappear in milliseconds
    * @protected
@@ -14,10 +20,11 @@ export class LiveRegionService {
   protected messageTimeOutDurationMs: number = environment.liveRegion.messageTimeOutDurationMs;
 
   /**
-   * Array containing the messages that should be shown in the live region
+   * Array containing the messages that should be shown in the live region,
+   * together with a uuid, so they can be uniquely identified
    * @protected
    */
-  protected messages: string[] = [];
+  protected messages: { message: string, uuid: string }[] = [];
 
   /**
    * BehaviorSubject emitting the array with messages every time the array updates
@@ -34,27 +41,28 @@ export class LiveRegionService {
   /**
    * Returns a copy of the array with the current live region messages
    */
-  getMessages() {
-    return [...this.messages];
+  getMessages(): string[] {
+    return this.messages.map(messageObj => messageObj.message);
   }
 
   /**
    * Returns the BehaviorSubject emitting the array with messages every time the array updates
    */
-  getMessages$() {
+  getMessages$(): BehaviorSubject<string[]> {
     return this.messages$;
   }
 
   /**
    * Adds a message to the live-region messages array
    * @param message
+   * @return The uuid of the message
    */
-  addMessage(message: string) {
-    this.messages.push(message);
+  addMessage(message: string): string {
+    const uuid = this.uuidService.generate();
+    this.messages.push({ message, uuid });
+    setTimeout(() => this.clearMessageByUUID(uuid), this.messageTimeOutDurationMs);
     this.emitCurrentMessages();
-
-    // Clear the message once the timeOut has passed
-    setTimeout(() => this.pop(), this.messageTimeOutDurationMs);
+    return uuid;
   }
 
   /**
@@ -66,12 +74,15 @@ export class LiveRegionService {
   }
 
   /**
-   * Removes the longest living message from the array.
+   * Removes the message with the given UUID from the messages array
+   * @param uuid The uuid of the message to clear
    * @protected
    */
-  protected pop() {
-    if (this.messages.length > 0) {
-      this.messages.shift();
+  clearMessageByUUID(uuid: string) {
+    const index = this.messages.findIndex(messageObj => messageObj.uuid === uuid);
+
+    if (index !== -1) {
+      this.messages.splice(index, 1);
       this.emitCurrentMessages();
     }
   }

From 8a5181a9a32df05fc52022244b34a525768fea7c Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 25 Sep 2024 14:55:37 +0200
Subject: [PATCH 0454/1286] documentation file

---
 .../rules/no-disabled-attribute-on-button.md  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 docs/lint/html/rules/no-disabled-attribute-on-button.md

diff --git a/docs/lint/html/rules/no-disabled-attribute-on-button.md b/docs/lint/html/rules/no-disabled-attribute-on-button.md
new file mode 100644
index 0000000000..d9d39ce82c
--- /dev/null
+++ b/docs/lint/html/rules/no-disabled-attribute-on-button.md
@@ -0,0 +1,78 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [HTML rules](../index.md) > `dspace-angular-html/no-disabled-attribute-on-button`
+_______
+
+Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.
+
+_______
+
+[Source code](../../../../lint/src/rules/html/no-disabled-attribute-on-button.ts)
+
+### Examples
+
+
+#### Valid code
+    
+##### should use [dsBtnDisabled] in HTML templates
+        
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+    
+##### disabled attribute is still valid on non-button elements
+        
+```html
+<input disabled>
+```
+    
+##### [disabled] attribute is still valid on non-button elements
+        
+```html
+<input [disabled]="true">
+```
+    
+##### angular dynamic attributes that use disabled are still valid
+        
+```html
+<button [class.disabled]="isDisabled">Submit</button>
+```
+    
+
+
+
+#### Invalid code  &amp; automatic fixes
+    
+##### should not use disabled attribute in HTML templates
+        
+```html
+<button disabled>Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+##### should not use [disabled] attribute in HTML templates
+        
+```html
+<button [disabled]="true">Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+

From 1b17879d7ae74e45b6e383db81ca6a3eb5817928 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 25 Sep 2024 14:55:37 +0200
Subject: [PATCH 0455/1286] documentation file

---
 .../rules/no-disabled-attribute-on-button.md  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 docs/lint/html/rules/no-disabled-attribute-on-button.md

diff --git a/docs/lint/html/rules/no-disabled-attribute-on-button.md b/docs/lint/html/rules/no-disabled-attribute-on-button.md
new file mode 100644
index 0000000000..d9d39ce82c
--- /dev/null
+++ b/docs/lint/html/rules/no-disabled-attribute-on-button.md
@@ -0,0 +1,78 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [HTML rules](../index.md) > `dspace-angular-html/no-disabled-attribute-on-button`
+_______
+
+Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.
+
+_______
+
+[Source code](../../../../lint/src/rules/html/no-disabled-attribute-on-button.ts)
+
+### Examples
+
+
+#### Valid code
+    
+##### should use [dsBtnDisabled] in HTML templates
+        
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+    
+##### disabled attribute is still valid on non-button elements
+        
+```html
+<input disabled>
+```
+    
+##### [disabled] attribute is still valid on non-button elements
+        
+```html
+<input [disabled]="true">
+```
+    
+##### angular dynamic attributes that use disabled are still valid
+        
+```html
+<button [class.disabled]="isDisabled">Submit</button>
+```
+    
+
+
+
+#### Invalid code  &amp; automatic fixes
+    
+##### should not use disabled attribute in HTML templates
+        
+```html
+<button disabled>Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+##### should not use [disabled] attribute in HTML templates
+        
+```html
+<button [disabled]="true">Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+

From aed97c9dccf5460897f5c24ea9473fa642468c0c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 26 Jun 2024 14:46:13 +0200
Subject: [PATCH 0456/1286] added missing German translations (500 error)

(cherry picked from commit 5f6b6ef9849e27eaf87e5b8b0f94ccde271d8043)
---
 src/assets/i18n/de.json5 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 8efda0390e..d1ac01fe2a 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -9,8 +9,6 @@
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "unautorisiert",
 
-
-
   // "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": "Sie sind nicht berechtigt, auf diese Seite zuzugreifen. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -20,8 +18,6 @@
   // "403.forbidden": "forbidden",
   "403.forbidden": "verboten",
 
-
-
   // "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": "Die Seite konnte nicht gefunden werden. Eventuell wurde sie verschoben oder gelöscht. Über den Button unten auf der Seite gelangen Sie zurück zur Startseite.",
 
@@ -31,6 +27,16 @@
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Seite nicht gefunden",
 
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "Dienst nicht verfügbar",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Der Dienst steht momentan nicht zur Verfügung. Bitte versuchen Sie es später noch einmal.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Zur Startseite",
+
+
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Personen suchen",
 

From 48ec0cdc340ecf472688c6d606c3fb3643456663 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:42:49 +0200
Subject: [PATCH 0457/1286] minor change: added missing periods in German
 translations

(cherry picked from commit e26ab86dd33981ea4a9969b6043449619948a2b8)
---
 src/assets/i18n/de.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 8efda0390e..c154ae91c9 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5143,10 +5143,10 @@
   "submission.sections.general.deposit_error_notice": "Beim Einreichen des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht",
+  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal",
+  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",

From 6b081ee470638d54ca856d6cd9219a715ddcd33c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:42:49 +0200
Subject: [PATCH 0458/1286] minor change: added missing periods in German
 translations

(cherry picked from commit e26ab86dd33981ea4a9969b6043449619948a2b8)
---
 src/assets/i18n/de.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index dac2eb4a52..e1ebb489cf 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5560,10 +5560,10 @@
   "submission.sections.general.deposit_error_notice": "Beim Einreichen des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht",
+  "submission.sections.general.deposit_success_notice": "Veröffentlichung erfolgreich eingereicht.",
 
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal",
+  "submission.sections.general.discard_error_notice": "Beim Verwerfen der Einreichung ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
 
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",

From edc738ae3964fada0c6628ce1732f047ae24a603 Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Mon, 23 Sep 2024 15:53:55 -0400
Subject: [PATCH 0459/1286] Update en.json5 - fixed typo for occurred

(cherry picked from commit ed5ac47f886fb0e2ad7ef29c2152abcbe414cca1)
---
 src/assets/i18n/en.json5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0a1804fa5c..d00e16caa0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1240,7 +1240,7 @@
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "An error occurred while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1448,7 +1448,7 @@
 
   "curation.form.submit.error.head": "Running the curation task failed",
 
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
 
   "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
 
@@ -1700,7 +1700,7 @@
 
   "forgot-email.form.error.head": "Error when trying to reset password",
 
-  "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": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
 
   "forgot-password.title": "Forgot Password",
 
@@ -3518,7 +3518,7 @@
 
   "register-page.registration.error.head": "Error when trying to register email",
 
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
 
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
 

From c2e9d5453aa1c74526b90a2f00e8e22e45a781c9 Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Mon, 23 Sep 2024 15:53:55 -0400
Subject: [PATCH 0460/1286] Update en.json5 - fixed typo for occurred

(cherry picked from commit ed5ac47f886fb0e2ad7ef29c2152abcbe414cca1)
---
 src/assets/i18n/en.json5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8f20c657f9..17fbf33b4a 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1460,7 +1460,7 @@
 
   "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
 
-  "community.edit.notifications.error": "An error occured while editing the community",
+  "community.edit.notifications.error": "An error occurred while editing the community",
 
   "community.edit.return": "Back",
 
@@ -1670,7 +1670,7 @@
 
   "curation.form.submit.error.head": "Running the curation task failed",
 
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
 
   "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
 
@@ -1932,7 +1932,7 @@
 
   "forgot-email.form.error.head": "Error when trying to reset password",
 
-  "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": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
 
   "forgot-password.title": "Forgot Password",
 
@@ -4108,7 +4108,7 @@
 
   "register-page.registration.error.head": "Error when trying to register email",
 
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
 
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
 

From fe7d2a8a7e05bcdb3b63943261ab84cfdd9614d5 Mon Sep 17 00:00:00 2001
From: Elvi Nemiz <eulereadgbe@users.noreply.github.com>
Date: Sat, 29 Jun 2024 08:14:10 +0800
Subject: [PATCH 0461/1286] Fix to Mobile navbar hamburger menu for base
 (custom) theme

https://github.com/DSpace/dspace-angular/pull/2444 only fixes the DSpace theme, not the base (and custom) theme.
(cherry picked from commit a3b6aef66a81e93f537bf35647be97d14f5b1472)
---
 src/app/navbar/navbar.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index b74408f0f5..bbf5feec15 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -10,7 +10,7 @@
   /** Mobile menu styling **/
   @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-      width: 100%;
+      width: 100vw;
       background-color: var(--bs-white);
       position: absolute;
       overflow: hidden;

From 0cff856bf5d4e3ad8087491973abf6516db776bc Mon Sep 17 00:00:00 2001
From: Elvi Nemiz <eulereadgbe@users.noreply.github.com>
Date: Sat, 29 Jun 2024 08:14:10 +0800
Subject: [PATCH 0462/1286] Fix to Mobile navbar hamburger menu for base
 (custom) theme

https://github.com/DSpace/dspace-angular/pull/2444 only fixes the DSpace theme, not the base (and custom) theme.
(cherry picked from commit a3b6aef66a81e93f537bf35647be97d14f5b1472)
---
 src/app/navbar/navbar.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index b74408f0f5..bbf5feec15 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -10,7 +10,7 @@
   /** Mobile menu styling **/
   @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) {
     .navbar {
-      width: 100%;
+      width: 100vw;
       background-color: var(--bs-white);
       position: absolute;
       overflow: hidden;

From 751d689ff65b15fa4f8b2f898d43ecaa682e8085 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 27 Sep 2024 10:02:26 +0200
Subject: [PATCH 0463/1286] 118220: Add additional TypeDocs

---
 src/app/shared/live-region/live-region.component.ts | 6 ++++++
 src/app/shared/live-region/live-region.service.ts   | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
index d7bd5eb806..8a25c4657c 100644
--- a/src/app/shared/live-region/live-region.component.ts
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -2,6 +2,12 @@ import { Component, OnInit } from '@angular/core';
 import { LiveRegionService } from './live-region.service';
 import { Observable } from 'rxjs';
 
+/**
+ * The Live Region Component is an accessibility tool for screenreaders. When a change occurs on a page when the changed
+ * section is not in focus, a message should be displayed by this component so it can be announced by a screen reader.
+ *
+ * This component should not be used directly. Use the {@link LiveRegionService} to add messages.
+ */
 @Component({
   selector: `ds-live-region`,
   templateUrl: './live-region.component.html',
diff --git a/src/app/shared/live-region/live-region.service.ts b/src/app/shared/live-region/live-region.service.ts
index d89d72a967..72940c1a0e 100644
--- a/src/app/shared/live-region/live-region.service.ts
+++ b/src/app/shared/live-region/live-region.service.ts
@@ -3,6 +3,10 @@ import { BehaviorSubject } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { UUIDService } from '../../core/shared/uuid.service';
 
+/**
+ * The LiveRegionService is responsible for handling the messages that are shown by the {@link LiveRegionComponent}.
+ * Use this service to add or remove messages to the Live Region.
+ */
 @Injectable({
   providedIn: 'root',
 })
@@ -76,7 +80,6 @@ export class LiveRegionService {
   /**
    * Removes the message with the given UUID from the messages array
    * @param uuid The uuid of the message to clear
-   * @protected
    */
   clearMessageByUUID(uuid: string) {
     const index = this.messages.findIndex(messageObj => messageObj.uuid === uuid);

From 9565f9b9ee96b763ea22c39a0faf4e49cdab84ae Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 13:44:31 -0300
Subject: [PATCH 0464/1286] Adding the aria-label attribute to buttons

---
 .../vocabulary-treeview.component.html         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 758d1426e0..6a4d9ea87d 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -6,16 +6,20 @@
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
-        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
+        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -91,13 +95,15 @@
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>

From e54b1ce274febd27e6a3c47bfa14e8be82eb5d8e Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 14:01:44 -0300
Subject: [PATCH 0465/1286] Adding focus to the input after the reset button is
 clicked

---
 .../vocabulary-treeview.component.html                    | 2 +-
 .../vocabulary-treeview/vocabulary-treeview.component.ts  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 6a4d9ea87d..782eb24be4 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -2,7 +2,7 @@
 <div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+      <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
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 cd836a4a47..8ed1c769e5 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -8,6 +8,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  ElementRef,
   EventEmitter,
   Input,
   OnChanges,
@@ -15,6 +16,7 @@ import {
   OnInit,
   Output,
   SimpleChanges,
+  ViewChild,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -70,6 +72,11 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
+  /**
+   * Implemented to manage focus on input
+   */
+  @ViewChild('searchInput') searchInput: ElementRef;
+
   /**
    * The {@link VocabularyOptions} object
    */
@@ -332,6 +339,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
+    this.searchInput.nativeElement.focus();
   }
 
   add() {

From 3658ad1ec09ce6a314dad7e8c5339c2a18cff6e4 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 15:08:53 -0300
Subject: [PATCH 0466/1286] =?UTF-8?q?Ensuring=20that=20the=20message=20?=
 =?UTF-8?q?=E2=80=9CThere=20were=20no=20items=20to=20show=E2=80=9D=20is=20?=
 =?UTF-8?q?announced=20to=20the=20screen=20reader=20when=20necessary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vocabulary-treeview.component.html                    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 782eb24be4..f55f26aa68 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -28,9 +28,11 @@
 </div>
 <div class="treeview-container">
   <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
-  <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
-    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h2>
+  <div aria-live="polite">
+    <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
+      <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+    </h2>
+  </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">

From 73d39abfe562a3ecd8b6e4ed20e8744a177ea1de Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 16:18:56 -0300
Subject: [PATCH 0467/1286] Trying to correct an error in the focus
 implementation

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

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 8ed1c769e5..89d908ec7f 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -75,7 +75,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
   /**
    * Implemented to manage focus on input
    */
-  @ViewChild('searchInput') searchInput: ElementRef;
+  @ViewChild('searchInput') searchInput!: ElementRef;
 
   /**
    * The {@link VocabularyOptions} object
@@ -339,7 +339,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
-    this.searchInput.nativeElement.focus();
+    if (this.searchInput) {
+      this.searchInput.nativeElement.focus();
+    }
   }
 
   add() {

From cf54af2c22a8344d67573d7185401ade04cf5588 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 3 Sep 2024 13:43:02 +0200
Subject: [PATCH 0468/1286] 117803: Refactor Item Edit Bitstreams page to use
 HTML Table elements

---
 .../item-bitstreams.component.html            |  11 +-
 .../item-bitstreams.component.scss            |  20 +-
 .../item-edit-bitstream-bundle.component.html | 109 +++++++--
 .../item-edit-bitstream-bundle.component.scss |  20 ++
 .../item-edit-bitstream-bundle.component.ts   | 216 +++++++++++++++++-
 ...-drag-and-drop-bitstream-list.component.ts |   4 +
 src/assets/i18n/en.json5                      |   2 +
 7 files changed, 336 insertions(+), 46 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 4cb9577fcb..70f6ca55e8 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -23,16 +23,7 @@
     </button>
   </div>
 
-  <div *ngIf="item && bundles?.length > 0" class="container table-bordered mt-4">
-    <div class="row header-row font-weight-bold">
-      <div class="{{columnSizes.columns[0].buildClasses()}} row-element">
-        <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-        {{'item.edit.bitstreams.headers.name' | translate}}
-      </div>
-      <div class="{{columnSizes.columns[1].buildClasses()}} row-element">{{'item.edit.bitstreams.headers.description' | translate}}</div>
-      <div class="{{columnSizes.columns[2].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.format' | translate}}</div>
-      <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.actions' | translate}}</div>
-    </div>
+  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border">
     <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
                                    [bundle]="bundle"
                                    [item]="item"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 7de575b785..480bf56cc7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -1,20 +1,4 @@
-.header-row {
-  color: var(--bs-table-dark-color);
-  background-color: var(--bs-table-dark-bg);
-  border-color: var(--bs-table-dark-border-color);
-}
 
-.bundle-row {
-  color: var(--bs-table-head-color);
-  background-color: var(--bs-table-head-bg);
-  border-color: var(--bs-table-border-color);
-}
-
-.row-element {
-  padding: 12px;
-  padding: 0.75em;
-  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
-}
 
 .drag-handle {
   visibility: hidden;
@@ -54,3 +38,7 @@
 :host ::ng-deep .larger-tooltip .tooltip-inner {
   max-width: 500px;
 }
+
+.table-border {
+  border: 1px solid #dee2e6;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 62170235a3..c11035e305 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -1,21 +1,92 @@
 <ng-template #bundleView>
-  <div class="row bundle-row">
-    <div class="{{bundleNameColumn.buildClasses()}} font-weight-bold row-element d-flex">
-      <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-      <div class="float-left d-flex align-items-center">
-        {{'item.edit.bitstreams.bundle.name' | translate:{ name: dsoNameService.getName(bundle) } }}
-      </div>
-    </div>
-    <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">
-      <div class="btn-group bundle-action-buttons">
-        <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
-                [queryParams]="{bundle: bundle.id}"
-                class="btn btn-outline-success btn-sm"
-                title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
-          <i class="fas fa-upload fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes" (dropObject)="dropObject.emit($event)"></ds-paginated-drag-and-drop-bitstream-list>
+
+  <ds-pagination *ngIf="(bitstreamsRD$ | async)?.payload as bitstreamsList"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 [hidePaginationDetail]="true"
+                 [paginationOptions]="paginationOptions"
+                 [collectionSize]="bitstreamsList.totalElements">
+    <ng-container *ngIf="(updates$ | async) as updates">
+
+      <table class="table"
+             [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
+        <thead>
+        <tr class="header-row font-weight-bold">
+          <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.name' | translate}}
+          </th>
+          <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.description' | translate}}
+          </th>
+          <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
+            {{'item.edit.bitstreams.headers.format' | translate}}
+          </th>
+          <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
+            {{'item.edit.bitstreams.headers.actions' | translate}}
+          </th>
+        </tr>
+        </thead>
+
+        <tbody>
+        <tr class="bundle-row">
+          <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+            {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
+          </th>
+          <td class="text-center">
+            <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                    [queryParams]="{bundle: bundle.id}"
+                    class="btn btn-outline-success btn-sm"
+                    title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
+              <i class="fas fa-upload fa-fw"></i>
+            </button>
+          </td>
+        </tr>
+
+        <ng-container *ngFor="let entry of (tableEntries$ | async)">
+          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row">
+
+            <th class="bitstream-name row-element" scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+              {{ entry.name }}
+            </th>
+            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} description">
+              {{ entry.description }}
+            </td>
+            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} format">
+              {{ (entry.format | async)?.shortDescription }}
+            </td>
+            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+              <div class="text-center w-100">
+                <div class="btn-group relationship-action-buttons">
+                  <a [href]="entry.downloadUrl"
+                     class="btn btn-outline-primary btn-sm"
+                     title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+                     [attr.data-test]="'download-button' | dsBrowserOnly">
+                    <i class="fas fa-download fa-fw"></i>
+                  </a>
+                  <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
+                    <i class="fas fa-edit fa-fw"></i>
+                  </button>
+                  <button [disabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                          class="btn btn-outline-danger btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
+                    <i class="fas fa-trash-alt fa-fw"></i>
+                  </button>
+                  <button [disabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                          class="btn btn-outline-warning btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
+                    <i class="fas fa-undo-alt fa-fw"></i>
+                  </button>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </ng-container>
+
+        </tbody>
+      </table>
+
+    </ng-container>
+  </ds-pagination>
+
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
new file mode 100644
index 0000000000..d344b1657a
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -0,0 +1,20 @@
+.header-row {
+  color: var(--bs-table-dark-color);
+  background-color: var(--bs-table-dark-bg);
+  border-color: var(--bs-table-dark-border-color);
+}
+
+.bundle-row {
+  color: var(--bs-table-head-color);
+  background-color: var(--bs-table-head-bg);
+  border-color: var(--bs-table-border-color);
+}
+
+.row-element {
+  padding: 0.75em;
+  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
+}
+
+.bitstream-name {
+  font-weight: normal;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 70f4b63217..ad009e7cb7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -5,10 +5,65 @@ import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { PaginatedList } from 'src/app/core/data/paginated-list.model';
+import { Bitstream } from 'src/app/core/shared/bitstream.model';
+import { Observable, BehaviorSubject, switchMap } from 'rxjs';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
+import { PaginatedSearchOptions } from '../../../../shared/search/models/paginated-search-options.model';
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import {
+  getAllSucceededRemoteData,
+  paginatedListToArray,
+  getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteData
+} from '../../../../core/shared/operators';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { map } from 'rxjs/operators';
+import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+
+/**
+ * Interface storing all the information necessary to create a row in the bitstream edit table
+ */
+export interface BitstreamTableEntry {
+  /**
+   * The bitstream
+   */
+  bitstream: Bitstream,
+  /**
+   * The uuid of the Bitstream
+   */
+  id: string,
+  /**
+   * The name of the Bitstream
+   */
+  name: string,
+  /**
+   * The name of the Bitstream with all whitespace removed
+   */
+  nameStripped: string,
+  /**
+   * The description of the Bitstream
+   */
+  description: string,
+  /**
+   * Observable emitting the Format of the Bitstream
+   */
+  format: Observable<BitstreamFormat>,
+  /**
+   * The download url of the Bitstream
+   */
+  downloadUrl: string,
+}
 
 @Component({
   selector: 'ds-item-edit-bitstream-bundle',
-  styleUrls: ['../item-bitstreams.component.scss'],
+  styleUrls: ['../item-bitstreams.component.scss', './item-edit-bitstream-bundle.component.scss'],
   templateUrl: './item-edit-bitstream-bundle.component.html',
 })
 /**
@@ -17,6 +72,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-bundle element)
  */
 export class ItemEditBitstreamBundleComponent implements OnInit {
+  protected readonly FieldChangeType = FieldChangeType;
 
   /**
    * The view on the bundle information and bitstreams
@@ -56,9 +112,48 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   itemPageRoute: string;
 
+  /**
+   * The name of the bundle
+   */
+  bundleName: string;
+
+  /**
+   * The bitstreams to show in the table
+   */
+  bitstreamsRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * The data to show in the table
+   */
+  tableEntries$: Observable<BitstreamTableEntry[]>;
+
+  /**
+   * The initial page options to use for fetching the bitstreams
+   */
+  paginationOptions: PaginationComponentOptions;
+
+  /**
+   * The current page options
+   */
+  currentPaginationOptions$: BehaviorSubject<PaginationComponentOptions>;
+
+  /**
+   * The self url of the bundle, also used when retrieving fieldUpdates
+   */
+  bundleUrl: string;
+
+  /**
+   * The updates to the current bitstreams
+   */
+  updates$: Observable<FieldUpdates>;
+
+
   constructor(
     protected viewContainerRef: ViewContainerRef,
     public dsoNameService: DSONameService,
+    protected bundleService: BundleDataService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected paginationService: PaginationService,
   ) {
   }
 
@@ -66,5 +161,124 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.bundleNameColumn = this.columnSizes.combineColumns(0, 2);
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
+    this.bundleName = this.dsoNameService.getName(this.bundle);
+    this.bundleUrl = this.bundle.self;
+
+    this.initializePagination();
+    this.initializeBitstreams();
+
+    // this.bitstreamsRD = this.
+  }
+
+  protected initializePagination() {
+    this.paginationOptions = Object.assign(new PaginationComponentOptions(),{
+      id: this.bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
+      currentPage: 1,
+      pageSize: 10
+    });
+
+    this.currentPaginationOptions$ = new BehaviorSubject(this.paginationOptions);
+
+    this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
+      .subscribe((pagination) => {
+        this.currentPaginationOptions$.next(pagination);
+    });
+  }
+
+  protected initializeBitstreams() {
+    this.bitstreamsRD$ = this.currentPaginationOptions$.pipe(
+      switchMap((page: PaginationComponentOptions) => {
+        const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
+        return this.bundleService.getBitstreams(this.bundle.id, paginatedOptions, followLink('format'));
+      }),
+    );
+
+    this.bitstreamsRD$.pipe(
+      getFirstSucceededRemoteData(),
+      paginatedListToArray(),
+    ).subscribe((bitstreams) => {
+      this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
+    });
+
+    this.updates$ = this.bitstreamsRD$.pipe(
+      getAllSucceededRemoteData(),
+      paginatedListToArray(),
+      switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams))
+    );
+
+    this.tableEntries$ = this.bitstreamsRD$.pipe(
+      getAllSucceededRemoteData(),
+      paginatedListToArray(),
+      map((bitstreams) => {
+        return bitstreams.map((bitstream) => {
+          const name = this.dsoNameService.getName(bitstream);
+
+          return {
+            bitstream: bitstream,
+            id: bitstream.uuid,
+            name: name,
+            nameStripped: this.stripWhiteSpace(name),
+            description: bitstream.firstMetadataValue('dc.description'),
+            format: bitstream.format.pipe(getFirstSucceededRemoteDataPayload()),
+            downloadUrl: getBitstreamDownloadRoute(bitstream),
+          };
+        });
+      }),
+    );
+  }
+
+  /**
+   * Check if a user should be allowed to remove this field
+   */
+  canRemove(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType !== FieldChangeType.REMOVE;
+  }
+
+  /**
+   * Check if a user should be allowed to cancel the update to this field
+   */
+  canUndo(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType >= 0;
+  }
+
+  /**
+   * Sends a new remove update for this field to the object updates service
+   */
+  remove(bitstream: Bitstream): void {
+    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, bitstream);
+  }
+
+  /**
+   * Cancels the current update for this field in the object updates service
+   */
+  undo(bitstream: Bitstream): void {
+    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, bitstream.uuid);
+  }
+
+  getRowClass(update: FieldUpdate): string {
+    switch (update.changeType) {
+      case FieldChangeType.UPDATE:
+        return 'table-warning';
+      case FieldChangeType.ADD:
+        return 'table-success';
+      case FieldChangeType.REMOVE:
+        return 'table-danger';
+      default:
+        return 'bg-white';
+    }
+  }
+
+  /**
+   * Returns a string equal to the input string with all whitespace removed.
+   * @param str
+   */
+  // Whitespace is stripped from the Bitstream names for accessibility reasons.
+  // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
+  // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
+  // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
+  // ID can not contain strings itself.
+  stripWhiteSpace(str: string): string {
+    // '/\s+/g' matches all occurrences of any amount of whitespace characters
+    return str.replace(/\s+/g, '');
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
index 2c81a4e2cb..d5bb9eceea 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
@@ -24,6 +24,10 @@ import { PaginationComponentOptions } from '../../../../../shared/pagination/pag
  * bitstreams within the paginated list. To drag and drop a bitstream between two pages, drag the row on top of the
  * page number you want the bitstream to end up at. Doing so will add the bitstream to the top of that page.
  */
+// NOTE:
+// This component was used by the item-edit-bitstream-bundle.component, but this is no longer the case. It is left here
+// as a reference for the drag-and-drop functionality. This component (and the abstract version it extends) should be
+// removed once this reference is no longer useful.
 export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginatedDragAndDropListComponent<Bitstream> implements OnInit {
   /**
    * The bundle to display bitstreams for
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6c91bae4c1..4d5ef9ee1b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1934,6 +1934,8 @@
 
   "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
 
+  "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+
   "item.edit.bitstreams.discard-button": "Discard",
 
   "item.edit.bitstreams.edit.buttons.download": "Download",

From a11bfc80ad5b087aab9c6e283a08f0db2f87d5ed Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 3 Sep 2024 14:24:31 +0200
Subject: [PATCH 0469/1286] 117803: Hide table headers for subsequent bundle
 tables

---
 .../item-bitstreams/item-bitstreams.component.html |  3 ++-
 .../item-edit-bitstream-bundle.component.html      | 14 +++++++++-----
 .../item-edit-bitstream-bundle.component.ts        |  5 +++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 70f6ca55e8..f22dbe6a0e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -24,10 +24,11 @@
   </div>
 
   <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border">
-    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
+    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles; first as isFirst"
                                    [bundle]="bundle"
                                    [item]="item"
                                    [columnSizes]="columnSizes"
+                                   [hideHeader]="!isFirst"
                                    (dropObject)="dropBitstream(bundle, $event)">
     </ds-item-edit-bitstream-bundle>
   </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index c11035e305..a95a7921a4 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -10,7 +10,7 @@
 
       <table class="table"
              [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
-        <thead>
+        <thead *ngIf="!hideHeader">
         <tr class="header-row font-weight-bold">
           <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
             {{'item.edit.bitstreams.headers.name' | translate}}
@@ -45,16 +45,20 @@
         <ng-container *ngFor="let entry of (tableEntries$ | async)">
           <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row">
 
-            <th class="bitstream-name row-element" scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+            <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
+                scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
               {{ entry.name }}
             </th>
-            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} description">
+            <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} description">
               {{ entry.description }}
             </td>
-            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} format">
+            <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} format">
               {{ (entry.format | async)?.shortDescription }}
             </td>
-            <td class="row-element" headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+            <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
+                headers="{{ entry.nameStripped }} {{ bundleName }} actions">
               <div class="text-center w-100">
                 <div class="btn-group relationship-action-buttons">
                   <a [href]="entry.downloadUrl"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index ad009e7cb7..ae6bc0876c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -94,6 +94,11 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @Input() columnSizes: ResponsiveTableSizes;
 
+  /**
+   * Whether to hide the table headers
+   */
+  @Input() hideHeader = false;
+
   /**
    * Send an event when the user drops an object on the pagination
    * The event contains details about the index the object came from and is dropped to (across the entirety of the list,

From 1773a75e98360bf930820d480533ec09d1811f75 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 4 Sep 2024 09:45:03 +0200
Subject: [PATCH 0470/1286] 117803: Allow changing page size of Bitstream list

---
 .../item-edit-bitstream-bundle.component.html | 34 +++++++++++++++----
 .../item-edit-bitstream-bundle.component.scss |  9 +++++
 .../item-edit-bitstream-bundle.component.ts   | 23 +++++++++++++
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index a95a7921a4..6a505b9274 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -33,12 +33,34 @@
             {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
           </th>
           <td class="text-center">
-            <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
-                    [queryParams]="{bundle: bundle.id}"
-                    class="btn btn-outline-success btn-sm"
-                    title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
-              <i class="fas fa-upload fa-fw"></i>
-            </button>
+
+            <div class="btn-group">
+              <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                      [queryParams]="{bundle: bundle.id}"
+                      class="btn btn-outline-success btn-sm"
+                      title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
+                <i class="fas fa-upload fa-fw"></i>
+              </button>
+              <div ngbDropdown #paginationControls="ngbDropdown" class="btn btn-outline-secondary btn-sm p-0 pagination-control-container" placement="bottom-right">
+                <button class="btn pagination-control" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false">
+                  <i class="fas fa-cog" aria-hidden="true"></i>
+                </button>
+
+                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+                  <li role="menuitem">
+                    <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                      <li *ngFor="let size of pageSizeOptions" role="option" [attr.aria-selected]="size === (pageSize$ | async)">
+                        <button (click)="doPageSizeChange(size)" class="dropdown-item">
+                          <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{size}}
+                        </button>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </div>
+            </div>
+
           </td>
         </tr>
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
index d344b1657a..725d329936 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -18,3 +18,12 @@
 .bitstream-name {
   font-weight: normal;
 }
+
+.pagination-control-container {
+  display: flex;
+}
+
+.pagination-control {
+  padding: 0 0.1rem;
+  vertical-align: center;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index ae6bc0876c..2a84c00c02 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -26,6 +26,8 @@ import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { SortDirection } from '../../../../core/cache/models/sort-options.model';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -79,6 +81,8 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @ViewChild('bundleView', {static: true}) bundleView;
 
+  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
+
   /**
    * The bundle to display bitstreams for
    */
@@ -142,6 +146,16 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   currentPaginationOptions$: BehaviorSubject<PaginationComponentOptions>;
 
+  /**
+   * The available page size options
+   */
+  pageSizeOptions: number[];
+
+  /**
+   * The currently selected page size
+   */
+  pageSize$: BehaviorSubject<number>;
+
   /**
    * The self url of the bundle, also used when retrieving fieldUpdates
    */
@@ -182,11 +196,15 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
       pageSize: 10
     });
 
+    this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
+
     this.currentPaginationOptions$ = new BehaviorSubject(this.paginationOptions);
+    this.pageSize$ = new BehaviorSubject(this.paginationOptions.pageSize);
 
     this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
       .subscribe((pagination) => {
         this.currentPaginationOptions$.next(pagination);
+        this.pageSize$.next(pagination.pageSize);
     });
   }
 
@@ -286,4 +304,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     // '/\s+/g' matches all occurrences of any amount of whitespace characters
     return str.replace(/\s+/g, '');
   }
+
+  public doPageSizeChange(pageSize: number) {
+    this.paginationComponent.doPageSizeChange(pageSize);
+  }
+
 }

From d85124c121db1ef88f3015cfdc333bfe1b8c9ce3 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 4 Sep 2024 14:32:29 +0200
Subject: [PATCH 0471/1286] 117803: Fix deleted bitstreams not being removed
 from list

---
 .../item-edit-bitstream-bundle.component.ts          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 2a84c00c02..6ef15397b0 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -26,8 +26,8 @@ import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { SortDirection } from '../../../../core/cache/models/sort-options.model';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { RequestService } from '../../../../core/data/request.service';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -173,6 +173,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     protected bundleService: BundleDataService,
     protected objectUpdatesService: ObjectUpdatesService,
     protected paginationService: PaginationService,
+    protected requestService: RequestService,
   ) {
   }
 
@@ -212,7 +213,14 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.bitstreamsRD$ = this.currentPaginationOptions$.pipe(
       switchMap((page: PaginationComponentOptions) => {
         const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
-        return this.bundleService.getBitstreams(this.bundle.id, paginatedOptions, followLink('format'));
+        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
+          switchMap((href) => this.requestService.hasByHref$(href)),
+          switchMap(() => this.bundleService.getBitstreams(
+            this.bundle.id,
+            paginatedOptions,
+            followLink('format')
+          ))
+        );
       }),
     );
 

From 374a9ae14eb036c1bf91eec2891aa722722545ed Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 4 Sep 2024 15:46:04 +0200
Subject: [PATCH 0472/1286] 117803: Add item-bitstream service

---
 .../item-bitstreams.component.ts              |  82 ++-------
 .../item-bitstreams.service.ts                | 158 ++++++++++++++++++
 .../item-edit-bitstream-bundle.component.ts   |  41 +----
 3 files changed, 176 insertions(+), 105 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index ee53bd919c..9f27cf11b3 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -8,23 +8,19 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Bundle } from '../../../core/shared/bundle.model';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { Operation } from 'fast-json-patch';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ItemBitstreamsService } from './item-bitstreams.service';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -41,28 +37,10 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   bundles$: Observable<Bundle[]>;
 
-  /**
-   * The page options to use for fetching the bundles
-   */
-  bundlesOptions = {
-    id: 'bundles-pagination-options',
-    currentPage: 1,
-    pageSize: 9999
-  } as any;
-
   /**
    * The bootstrap sizes used for the columns within this table
    */
-  columnSizes = new ResponsiveTableSizes([
-    // Name column
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    // Description column
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    // Format column
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    // Actions column
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-  ]);
+  columnSizes: ResponsiveTableSizes;
 
   /**
    * Are we currently submitting the changes?
@@ -88,16 +66,21 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService,
-    public zone: NgZone
+    public zone: NgZone,
+    public itemBitstreamsService: ItemBitstreamsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
+
+    this.columnSizes = this.itemBitstreamsService.getColumnSizes();
   }
 
   /**
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
+    const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
+
+    this. bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: bundlesOptions})).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
@@ -119,30 +102,12 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   submit() {
     this.submitting = true;
-    const bundlesOnce$ = this.bundles$.pipe(take(1));
 
-    // Fetch all removed bitstreams from the object update service
-    const removedBitstreams$ = bundlesOnce$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(
-        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true))
-      )),
-      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
-        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE))
-      )),
-      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
-    );
-
-    // Send out delete requests for all deleted bitstreams
-    const removedResponses$: Observable<RemoteData<NoContent>> = removedBitstreams$.pipe(
-      take(1),
-      switchMap((removedBitstreams: Bitstream[]) => {
-        return this.bitstreamService.removeMultiple(removedBitstreams);
-      })
-    );
+    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$);
 
     // Perform the setup actions from above in order and display notifications
     removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
-      this.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
+      this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
       this.submitting = false;
     });
   }
@@ -164,7 +129,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
         } as Operation;
         this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
           this.zone.run(() => {
-            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
+            this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
             // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
             this.requestService.removeByHrefSubstring(bundle.self).pipe(
               filter((isCached) => isCached),
@@ -176,27 +141,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     });
   }
 
-  /**
-   * Display notifications
-   * - Error notification for each failed response with their message
-   * - Success notification in case there's at least one successful response
-   * @param key       The i18n key for the notification messages
-   * @param responses The returned responses to display notifications for
-   */
-  displayNotifications(key: string, responses: RemoteData<any>[]) {
-    if (isNotEmpty(responses)) {
-      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
-      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
-
-      failedResponses.forEach((response: RemoteData<Bundle>) => {
-        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
-      });
-      if (successfulResponses.length > 0) {
-        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
-      }
-    }
-  }
-
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
new file mode 100644
index 0000000000..487df77b28
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -0,0 +1,158 @@
+import { Injectable } from '@angular/core';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { RemoteData } from '../../../core/data/remote-data';
+import { isNotEmpty, hasValue } from '../../../shared/empty.util';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, zip as observableZip } from 'rxjs';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { take, switchMap, map } from 'rxjs/operators';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BitstreamTableEntry } from './item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { getBitstreamDownloadRoute } from '../../../app-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+
+@Injectable(
+  { providedIn: 'root' },
+)
+export class ItemBitstreamsService {
+
+  constructor(
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected bitstreamService: BitstreamDataService,
+    protected dsoNameService: DSONameService,
+  ) {
+  }
+
+  /**
+   * Returns the pagination options to use when fetching the bundles
+   */
+  getInitialBundlesPaginationOptions(): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(), {
+      id: 'bundles-pagination-options',
+      currentPage: 1,
+      pageSize: 9999
+    });
+  }
+
+  getInitialBitstreamsPaginationOptions(bundleName: string): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(),{
+      id: bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
+      currentPage: 1,
+      pageSize: 10
+    });
+  }
+
+  /**
+   * Returns the {@link ResponsiveTableSizes} for use in the columns of the edit bitstreams table
+   */
+  getColumnSizes(): ResponsiveTableSizes {
+    return new ResponsiveTableSizes([
+      // Name column
+      new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+      // Description column
+      new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+      // Format column
+      new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+      // Actions column
+      new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    ]);
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayNotifications(key: string, responses: RemoteData<any>[]) {
+    if (isNotEmpty(responses)) {
+      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+
+      failedResponses.forEach((response: RemoteData<Bundle>) => {
+        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
+      });
+      if (successfulResponses.length > 0) {
+        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+      }
+    }
+  }
+
+  /**
+   * Removes the bitstreams marked for deletion from the Bundles emitted by the provided observable.
+   * @param bundles$
+   */
+  removeMarkedBitstreams(bundles$: Observable<Bundle[]>): Observable<RemoteData<NoContent>> {
+    const bundlesOnce$ = bundles$.pipe(take(1));
+
+    // Fetch all removed bitstreams from the object update service
+    const removedBitstreams$ = bundlesOnce$.pipe(
+      switchMap((bundles: Bundle[]) => observableZip(
+        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true))
+      )),
+      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
+        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE))
+      )),
+      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
+    );
+
+    // Send out delete requests for all deleted bitstreams
+    return removedBitstreams$.pipe(
+      take(1),
+      switchMap((removedBitstreams: Bitstream[]) => {
+        return this.bitstreamService.removeMultiple(removedBitstreams);
+      })
+    );
+  }
+
+  mapBitstreamsToTableEntries(bitstreams: Bitstream[]): BitstreamTableEntry[] {
+    return bitstreams.map((bitstream) => {
+      const name = this.dsoNameService.getName(bitstream);
+
+      return {
+        bitstream: bitstream,
+        id: bitstream.uuid,
+        name: name,
+        nameStripped: this.nameToHeader(name),
+        description: bitstream.firstMetadataValue('dc.description'),
+        format: bitstream.format.pipe(getFirstSucceededRemoteDataPayload()),
+        downloadUrl: getBitstreamDownloadRoute(bitstream),
+      };
+    });
+  }
+
+  /**
+   * Returns a string appropriate to be used as header ID
+   * @param name
+   */
+  nameToHeader(name: string): string {
+    // Whitespace is stripped from the Bitstream names for accessibility reasons.
+    // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
+    // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
+    // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
+    // ID can not contain strings itself.
+    return this.stripWhiteSpace(name);
+  }
+
+  /**
+   * Returns a string equal to the input string with all whitespace removed.
+   * @param str
+   */
+  stripWhiteSpace(str: string): string {
+    // '/\s+/g' matches all occurrences of any amount of whitespace characters
+    return str.replace(/\s+/g, '');
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 6ef15397b0..9c62fe06e7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -17,17 +17,17 @@ import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import {
   getAllSucceededRemoteData,
   paginatedListToArray,
-  getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteData
+  getFirstSucceededRemoteData
 } from '../../../../core/shared/operators';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { map } from 'rxjs/operators';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { RequestService } from '../../../../core/data/request.service';
+import { ItemBitstreamsService } from '../item-bitstreams.service';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -174,6 +174,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     protected objectUpdatesService: ObjectUpdatesService,
     protected paginationService: PaginationService,
     protected requestService: RequestService,
+    protected itemBitstreamsService: ItemBitstreamsService,
   ) {
   }
 
@@ -191,11 +192,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   }
 
   protected initializePagination() {
-    this.paginationOptions = Object.assign(new PaginationComponentOptions(),{
-      id: this.bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
-      currentPage: 1,
-      pageSize: 10
-    });
+    this.paginationOptions = this.itemBitstreamsService.getInitialBitstreamsPaginationOptions(this.bundleName);
 
     this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
 
@@ -240,21 +237,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.tableEntries$ = this.bitstreamsRD$.pipe(
       getAllSucceededRemoteData(),
       paginatedListToArray(),
-      map((bitstreams) => {
-        return bitstreams.map((bitstream) => {
-          const name = this.dsoNameService.getName(bitstream);
-
-          return {
-            bitstream: bitstream,
-            id: bitstream.uuid,
-            name: name,
-            nameStripped: this.stripWhiteSpace(name),
-            description: bitstream.firstMetadataValue('dc.description'),
-            format: bitstream.format.pipe(getFirstSucceededRemoteDataPayload()),
-            downloadUrl: getBitstreamDownloadRoute(bitstream),
-          };
-        });
-      }),
+      map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
     );
   }
 
@@ -299,20 +282,6 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     }
   }
 
-  /**
-   * Returns a string equal to the input string with all whitespace removed.
-   * @param str
-   */
-  // Whitespace is stripped from the Bitstream names for accessibility reasons.
-  // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
-  // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
-  // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
-  // ID can not contain strings itself.
-  stripWhiteSpace(str: string): string {
-    // '/\s+/g' matches all occurrences of any amount of whitespace characters
-    return str.replace(/\s+/g, '');
-  }
-
   public doPageSizeChange(pageSize: number) {
     this.paginationComponent.doPageSizeChange(pageSize);
   }

From 3f4bf7ce0fdf73494bcb28045ef6d7cb8a4634dd Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 4 Sep 2024 16:32:30 +0200
Subject: [PATCH 0473/1286] 117803: Fix existing tests

---
 ...em-edit-bitstream-bundle.component.spec.ts | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index c26f99eb8f..1502ad2311 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -6,6 +6,15 @@ import { Item } from '../../../../core/shared/item.model';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { of as observableOf } from 'rxjs';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { RequestService } from '../../../../core/data/request.service';
+import { getMockRequestService } from '../../../../shared/mocks/request.service.mock';
+import { ItemBitstreamsService } from '../item-bitstreams.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 describe('ItemEditBitstreamBundleComponent', () => {
   let comp: ItemEditBitstreamBundleComponent;
@@ -31,10 +40,37 @@ describe('ItemEditBitstreamBundleComponent', () => {
     }
   });
 
+  const restEndpoint = 'fake-rest-endpoint';
+  const bundleService = jasmine.createSpyObj('bundleService', {
+    getBitstreamsEndpoint: observableOf(restEndpoint),
+    getBitstreams: null,
+  });
+
+  const objectUpdatesService = {
+    initialize: () => {
+      // do nothing
+    },
+  };
+
+  const itemBitstreamsService = jasmine.createSpyObj('itemBitstreamsService', {
+    getInitialBitstreamsPaginationOptions: Object.assign(new PaginationComponentOptions(), {
+      id: 'bundles-pagination-options',
+      currentPage: 1,
+      pageSize: 9999
+    }),
+  });
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemEditBitstreamBundleComponent],
+      providers: [
+        { provide: BundleDataService, useValue: bundleService },
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: RequestService, useValue: getMockRequestService() },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
+      ],
       schemas: [
         NO_ERRORS_SCHEMA
       ]

From d8b426d7458da47320447a85e3c2fb4c7028f20c Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 5 Sep 2024 10:52:02 +0200
Subject: [PATCH 0474/1286] 117803: Add ItemBitsreamsService tests

---
 .../object-updates.service.stub.ts            |  28 ++++
 .../item-bitstreams.service.spec.ts           | 129 ++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 src/app/core/data/object-updates/object-updates.service.stub.ts
 create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts

diff --git a/src/app/core/data/object-updates/object-updates.service.stub.ts b/src/app/core/data/object-updates/object-updates.service.stub.ts
new file mode 100644
index 0000000000..c41728a338
--- /dev/null
+++ b/src/app/core/data/object-updates/object-updates.service.stub.ts
@@ -0,0 +1,28 @@
+export class ObjectUpdatesServiceStub {
+
+  initialize = jasmine.createSpy('initialize');
+  saveFieldUpdate = jasmine.createSpy('saveFieldUpdate');
+  getObjectEntry = jasmine.createSpy('getObjectEntry');
+  getFieldState = jasmine.createSpy('getFieldState');
+  getFieldUpdates = jasmine.createSpy('getFieldUpdates');
+  getFieldUpdatesExclusive = jasmine.createSpy('getFieldUpdatesExclusive');
+  isValid = jasmine.createSpy('isValid');
+  isValidPage = jasmine.createSpy('isValidPage');
+  saveAddFieldUpdate = jasmine.createSpy('saveAddFieldUpdate');
+  saveRemoveFieldUpdate = jasmine.createSpy('saveRemoveFieldUpdate');
+  saveChangeFieldUpdate = jasmine.createSpy('saveChangeFieldUpdate');
+  isSelectedVirtualMetadata = jasmine.createSpy('isSelectedVirtualMetadata');
+  setSelectedVirtualMetadata = jasmine.createSpy('setSelectedVirtualMetadata');
+  setEditableFieldUpdate = jasmine.createSpy('setEditableFieldUpdate');
+  setValidFieldUpdate = jasmine.createSpy('setValidFieldUpdate');
+  discardFieldUpdates = jasmine.createSpy('discardFieldUpdates');
+  discardAllFieldUpdates = jasmine.createSpy('discardAllFieldUpdates');
+  reinstateFieldUpdates = jasmine.createSpy('reinstateFieldUpdates');
+  removeSingleFieldUpdate = jasmine.createSpy('removeSingleFieldUpdate');
+  getUpdateFields = jasmine.createSpy('getUpdateFields');
+  hasUpdates = jasmine.createSpy('hasUpdates');
+  isReinstatable = jasmine.createSpy('isReinstatable');
+  getLastModified = jasmine.createSpy('getLastModified');
+  createPatch = jasmine.createSpy('getPatch');
+
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
new file mode 100644
index 0000000000..89ecfb518f
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -0,0 +1,129 @@
+import { ItemBitstreamsService } from './item-bitstreams.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { ObjectUpdatesServiceStub } from '../../../core/data/object-updates/object-updates.service.stub';
+import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { TranslateService } from '@ngx-translate/core';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import {
+  createSuccessfulRemoteDataObject$,
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject
+} from '../../../shared/remote-data.utils';
+
+describe('ItemBitstreamsService', () => {
+  let service: ItemBitstreamsService;
+  let notificationsService: NotificationsService;
+  let translateService: TranslateService;
+  let objectUpdatesService: ObjectUpdatesService;
+  let bitstreamDataService: BitstreamDataService;
+  let dsoNameService: DSONameService;
+
+  beforeEach(() => {
+    notificationsService = new NotificationsServiceStub() as any;
+    translateService = getMockTranslateService();
+    objectUpdatesService = new ObjectUpdatesServiceStub() as any;
+    bitstreamDataService = new BitstreamDataServiceStub() as any;
+    dsoNameService = new DSONameServiceMock() as any;
+
+    service = new ItemBitstreamsService(
+      notificationsService,
+      translateService,
+      objectUpdatesService,
+      bitstreamDataService,
+      dsoNameService,
+    );
+  });
+
+  describe('displayNotifications', () => {
+    it('should display an error notification if a response failed', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.failed.title');
+    });
+
+    it('should display a success notification if a response succeeded', () => {
+      const responses = [
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).not.toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+
+    it('should display both notifications if some failed and some succeeded', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+  });
+
+  describe('mapBitstreamsToTableEntries', () => {
+    it('should correctly map a Bitstream to a BitstreamTableEntry', () => {
+      const format: BitstreamFormat = new BitstreamFormat();
+
+      const bitstream: Bitstream = Object.assign(new Bitstream(), {
+        uuid: 'testUUID',
+        format: createSuccessfulRemoteDataObject$(format),
+      });
+
+      spyOn(dsoNameService, 'getName').and.returnValue('Test Name');
+      spyOn(bitstream, 'firstMetadataValue').and.returnValue('description');
+
+      const tableEntry = service.mapBitstreamsToTableEntries([bitstream])[0];
+
+      expect(tableEntry.name).toEqual('Test Name');
+      expect(tableEntry.nameStripped).toEqual('TestName');
+      expect(tableEntry.bitstream).toBe(bitstream);
+      expect(tableEntry.id).toEqual('testUUID');
+      expect(tableEntry.description).toEqual('description');
+      expect(tableEntry.downloadUrl).toEqual('/bitstreams/testUUID/download');
+    });
+  });
+
+  describe('nameToHeader', () => {
+    it('should correctly transform a string to an appropriate header ID', () => {
+      const stringA = 'Test String';
+      const stringAResult = 'TestString';
+      expect(service.nameToHeader(stringA)).toEqual(stringAResult);
+
+      const stringB = 'Test String Two';
+      const stringBResult = 'TestStringTwo';
+      expect(service.nameToHeader(stringB)).toEqual(stringBResult);
+
+      const stringC = 'Test           String           Three';
+      const stringCResult = 'TestStringThree';
+      expect(service.nameToHeader(stringC)).toEqual(stringCResult);
+    });
+  });
+
+});

From cc5b841a65ee396a2622ca3eceb1f2d9bbce07c7 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 10 Sep 2024 13:36:27 +0200
Subject: [PATCH 0475/1286] 117803: Only visually hide header rows

---
 .../item-edit-bitstream-bundle.component.html                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 6a505b9274..2eb1a151b7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -10,7 +10,7 @@
 
       <table class="table"
              [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
-        <thead *ngIf="!hideHeader">
+        <thead [class.visually-hidden]="hideHeader">
         <tr class="header-row font-weight-bold">
           <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
             {{'item.edit.bitstreams.headers.name' | translate}}

From 8481604b1eb63acdc152fc9b7061bb9cd464294e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 10 Sep 2024 14:14:58 +0200
Subject: [PATCH 0476/1286] 117803: Fix table & pagination margin

---
 .../item-bitstreams/item-bitstreams.component.scss            | 4 ++++
 .../item-edit-bitstream-bundle.component.scss                 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 480bf56cc7..662c999461 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -42,3 +42,7 @@
 .table-border {
   border: 1px solid #dee2e6;
 }
+
+:host ::ng-deep .pagination {
+  padding-top: 0.5rem;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
index 725d329936..ae4eac8d52 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -27,3 +27,7 @@
   padding: 0 0.1rem;
   vertical-align: center;
 }
+
+.table {
+  margin-bottom: 0;
+}

From 79f3a3116e2e358d5d7b778324d15c4977c7d55f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 10 Sep 2024 14:35:05 +0200
Subject: [PATCH 0477/1286] 117803: Set header border to background color

---
 .../item-edit-bitstream-bundle.component.scss                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
index ae4eac8d52..7088c3978e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -1,7 +1,7 @@
 .header-row {
   color: var(--bs-table-dark-color);
   background-color: var(--bs-table-dark-bg);
-  border-color: var(--bs-table-dark-border-color);
+  border-color: var(--bs-table-dark-bg);
 }
 
 .bundle-row {

From 6a8095d456167a139d320c4ad5c3a3d8a20a365e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 10 Sep 2024 15:00:18 +0200
Subject: [PATCH 0478/1286] 117803: Change pagination settings styling

---
 .../item-edit-bitstream-bundle.component.html            | 4 ++--
 .../item-edit-bitstream-bundle.component.scss            | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 2eb1a151b7..f434bf0f8f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -41,8 +41,8 @@
                       title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
                 <i class="fas fa-upload fa-fw"></i>
               </button>
-              <div ngbDropdown #paginationControls="ngbDropdown" class="btn btn-outline-secondary btn-sm p-0 pagination-control-container" placement="bottom-right">
-                <button class="btn pagination-control" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false">
+              <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0" placement="bottom-right">
+                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false">
                   <i class="fas fa-cog" aria-hidden="true"></i>
                 </button>
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
index 7088c3978e..bbd4e1e75c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -19,15 +19,6 @@
   font-weight: normal;
 }
 
-.pagination-control-container {
-  display: flex;
-}
-
-.pagination-control {
-  padding: 0 0.1rem;
-  vertical-align: center;
-}
-
 .table {
   margin-bottom: 0;
 }

From a230eee76d931a5b55046587c0fe06fcdd383a90 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 10 Sep 2024 16:06:44 +0200
Subject: [PATCH 0479/1286] 117803: Add negative top-margin to subsequent
 tables

---
 .../item-bitstreams/item-bitstreams.component.html            | 2 +-
 .../item-edit-bitstream-bundle.component.html                 | 4 ++--
 .../item-edit-bitstream-bundle.component.ts                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index f22dbe6a0e..3527f2f5b8 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -28,7 +28,7 @@
                                    [bundle]="bundle"
                                    [item]="item"
                                    [columnSizes]="columnSizes"
-                                   [hideHeader]="!isFirst"
+                                   [isFirstTable]="isFirst"
                                    (dropObject)="dropBitstream(bundle, $event)">
     </ds-item-edit-bitstream-bundle>
   </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index f434bf0f8f..3d6ee4fa47 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -8,9 +8,9 @@
                  [collectionSize]="bitstreamsList.totalElements">
     <ng-container *ngIf="(updates$ | async) as updates">
 
-      <table class="table"
+      <table class="table" [class.mt-n1]="!isFirstTable"
              [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
-        <thead [class.visually-hidden]="hideHeader">
+        <thead [class.visually-hidden]="!isFirstTable">
         <tr class="header-row font-weight-bold">
           <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
             {{'item.edit.bitstreams.headers.name' | translate}}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 9c62fe06e7..0974da3f8c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -99,9 +99,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   @Input() columnSizes: ResponsiveTableSizes;
 
   /**
-   * Whether to hide the table headers
+   * Whether this is the first in a series of bundle tables
    */
-  @Input() hideHeader = false;
+  @Input() isFirstTable = false;
 
   /**
    * Send an event when the user drops an object on the pagination

From be99cc5c23763240869697798b95608e4ff1e319 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 11 Sep 2024 10:09:03 +0200
Subject: [PATCH 0480/1286] 118219: Allow dragging of table rows

---
 .../item-bitstreams/item-bitstreams.component.scss         | 7 -------
 .../item-edit-bitstream-bundle.component.html              | 7 +++++--
 .../item-edit-bitstream-bundle.component.ts                | 5 +++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 662c999461..0ee56fe67e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -1,7 +1,4 @@
-
-
 .drag-handle {
-  visibility: hidden;
   &:hover {
     cursor: move;
   }
@@ -11,10 +8,6 @@
   cursor: move;
 }
 
-:host ::ng-deep .bitstream-row:hover .drag-handle, :host ::ng-deep .bitstream-row-drag-handle:focus .drag-handle {
-  visibility: visible !important;
-}
-
 .cdk-drag-preview {
   margin-left: 0;
   box-sizing: border-box;
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 3d6ee4fa47..b79518a763 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -27,7 +27,7 @@
         </tr>
         </thead>
 
-        <tbody>
+        <tbody cdkDropList (cdkDropListDropped)="drop($event)">
         <tr class="bundle-row">
           <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
             {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
@@ -65,10 +65,13 @@
         </tr>
 
         <ng-container *ngFor="let entry of (tableEntries$ | async)">
-          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row">
+          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row" cdkDrag>
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+              <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle>
+                <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
+              </div>
               {{ entry.name }}
             </th>
             <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 0974da3f8c..c0c4e30231 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -28,6 +28,7 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { RequestService } from '../../../../core/data/request.service';
 import { ItemBitstreamsService } from '../item-bitstreams.service';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -286,4 +287,8 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.paginationComponent.doPageSizeChange(pageSize);
   }
 
+  drop(event: CdkDragDrop<any>) {
+    console.log('dropEvent:', event);
+  }
+
 }

From eadbcdbe14108b6c47f9e623e8b99c10d03ff5bd Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 11 Sep 2024 16:25:42 +0200
Subject: [PATCH 0481/1286] 118219: Store result of drag & dropping bitstream

---
 .../item-bitstreams.component.ts              | 15 +++--
 .../item-edit-bitstream-bundle.component.ts   | 60 ++++++++++++++++---
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 9f27cf11b3..e7c846b5da 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { Observable, Subscription, zip as observableZip } from 'rxjs';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
@@ -11,7 +11,11 @@ import { BitstreamDataService } from '../../../core/data/bitstream-data.service'
 import { hasValue } from '../../../shared/empty.util';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Bundle } from '../../../core/shared/bundle.model';
@@ -127,12 +131,13 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
           from: `/_links/bitstreams/${event.fromIndex}/href`,
           path: `/_links/bitstreams/${event.toIndex}/href`
         } as Operation;
-        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
+        this.bundleService.patch(bundle, [moveOperation]).pipe(
+          getFirstCompletedRemoteData(),
+        ).subscribe((response: RemoteData<Bundle>) => {
           this.zone.run(() => {
             this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
             // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
-            this.requestService.removeByHrefSubstring(bundle.self).pipe(
-              filter((isCached) => isCached),
+            this.requestService.setStaleByHrefSubstring(bundle.self).pipe(
               take(1)
             ).subscribe(() => event.finish());
           });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index c0c4e30231..0293a1daea 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -28,7 +28,8 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { RequestService } from '../../../../core/data/request.service';
 import { ItemBitstreamsService } from '../item-bitstreams.service';
-import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { hasValue } from '../../../../shared/empty.util';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -135,7 +136,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   /**
    * The data to show in the table
    */
-  tableEntries$: Observable<BitstreamTableEntry[]>;
+  tableEntries$: BehaviorSubject<BitstreamTableEntry[]> = new BehaviorSubject(null);
 
   /**
    * The initial page options to use for fetching the bitstreams
@@ -165,7 +166,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   /**
    * The updates to the current bitstreams
    */
-  updates$: Observable<FieldUpdates>;
+  updates$: BehaviorSubject<FieldUpdates> = new BehaviorSubject(null);
 
 
   constructor(
@@ -229,17 +230,17 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
       this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
     });
 
-    this.updates$ = this.bitstreamsRD$.pipe(
+    this.bitstreamsRD$.pipe(
       getAllSucceededRemoteData(),
       paginatedListToArray(),
       switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams))
-    );
+    ).subscribe((updates) => this.updates$.next(updates));
 
-    this.tableEntries$ = this.bitstreamsRD$.pipe(
+    this.bitstreamsRD$.pipe(
       getAllSucceededRemoteData(),
       paginatedListToArray(),
       map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
-    );
+    ).subscribe((tableEntries) => this.tableEntries$.next(tableEntries));
   }
 
   /**
@@ -288,7 +289,50 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   }
 
   drop(event: CdkDragDrop<any>) {
-    console.log('dropEvent:', event);
+    const dragIndex = event.previousIndex;
+    let dropIndex = event.currentIndex;
+    const dragPage = this.currentPaginationOptions$.value.currentPage - 1;
+    let dropPage = this.currentPaginationOptions$.value.currentPage - 1;
+
+    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
+    const droppedOnElement = document.elementFromPoint(event.dropPoint.x, event.dropPoint.y);
+    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent) && droppedOnElement.classList.contains('page-link')) {
+      // The user is hovering over a page, fetch the page's number from the element
+      const droppedPage = Number(droppedOnElement.textContent);
+      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
+        dropPage = droppedPage - 1;
+        dropIndex = 0;
+      }
+    }
+
+    const isNewPage = dragPage !== dropPage;
+    // Move the object in the custom order array if the drop happened within the same page
+    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
+    if (!isNewPage && dragIndex !== dropIndex) {
+      const currentEntries = [...this.tableEntries$.value];
+      moveItemInArray(currentEntries, dragIndex, dropIndex);
+      this.tableEntries$.next(currentEntries);
+    }
+
+    const pageSize = this.currentPaginationOptions$.value.pageSize;
+    const redirectPage = dropPage + 1;
+    const fromIndex = (dragPage * pageSize) + dragIndex;
+    const toIndex = (dropPage * pageSize) + dropIndex;
+    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
+    if (fromIndex !== toIndex) {
+      // if (isNewPage) {
+      //   this.loading$.next(true);
+      // }
+      this.dropObject.emit(Object.assign({
+        fromIndex,
+        toIndex,
+        finish: () => {
+          if (isNewPage) {
+            this.paginationComponent.doPageChange(redirectPage);
+          }
+        }
+      }));
+    }
   }
 
 }

From 6a2c7d09d69e6275d5e29d06a2672ce9b79e52fb Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 12 Sep 2024 10:01:55 +0200
Subject: [PATCH 0482/1286] 118219: Add dragging tooltip explaining how to drag
 to other page

---
 .../item-edit-bitstream-bundle.component.html |  7 +++--
 .../item-edit-bitstream-bundle.component.ts   | 30 ++++++++++++++++++-
 src/assets/i18n/en.json5                      |  2 ++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index b79518a763..0338055df5 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -27,7 +27,9 @@
         </tr>
         </thead>
 
-        <tbody cdkDropList (cdkDropListDropped)="drop($event)">
+        <tbody cdkDropList (cdkDropListDropped)="drop($event)"
+               [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom-left"
+               [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
         <tr class="bundle-row">
           <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
             {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
@@ -65,7 +67,8 @@
         </tr>
 
         <ng-container *ngFor="let entry of (tableEntries$ | async)">
-          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row" cdkDrag>
+          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row" cdkDrag
+          (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 0293a1daea..bd99fc1a09 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -21,7 +21,7 @@ import {
 } from '../../../../core/shared/operators';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { map } from 'rxjs/operators';
+import { map, take, filter } from 'rxjs/operators';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
@@ -83,8 +83,16 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @ViewChild('bundleView', {static: true}) bundleView;
 
+  /**
+   * The view on the pagination component
+   */
   @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
 
+  /**
+   * The view on the drag tooltip
+   */
+  @ViewChild('dragTooltip') dragTooltip;
+
   /**
    * The bundle to display bitstreams for
    */
@@ -158,6 +166,11 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   pageSize$: BehaviorSubject<number>;
 
+  /**
+   * Whether the table has multiple pages
+   */
+  hasMultiplePages = false;
+
   /**
    * The self url of the bundle, also used when retrieving fieldUpdates
    */
@@ -288,6 +301,21 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.paginationComponent.doPageSizeChange(pageSize);
   }
 
+  dragStart() {
+    // Only open the drag tooltip when there are multiple pages
+    this.paginationComponent.shouldShowBottomPager.pipe(
+      take(1),
+      filter((hasMultiplePages) => hasMultiplePages),
+    ).subscribe(() => {
+      this.dragTooltip.open();
+    });
+  }
+
+  dragEnd() {
+    this.dragTooltip.close();
+  }
+
+
   drop(event: CdkDragDrop<any>) {
     const dragIndex = event.previousIndex;
     let dropIndex = event.currentIndex;
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4d5ef9ee1b..f2dbf9b2d1 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1936,6 +1936,8 @@
 
   "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
 
+  "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+
   "item.edit.bitstreams.discard-button": "Discard",
 
   "item.edit.bitstreams.edit.buttons.download": "Download",

From 8a16597b6958f99f949a413028ee2d5dee2905dc Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 12 Sep 2024 10:33:21 +0200
Subject: [PATCH 0483/1286] 118219: Fix tests

---
 .../item-bitstreams.component.spec.ts           | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 10e1812131..6ce7394473 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -18,7 +18,6 @@ import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { Bundle } from '../../../core/shared/bundle.model';
-import { RestResponse } from '../../../core/cache/response.models';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
@@ -145,7 +144,7 @@ describe('ItemBitstreamsComponent', () => {
       url: url
     });
     bundleService = jasmine.createSpyObj('bundleService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: createSuccessfulRemoteDataObject$({}),
     });
 
     TestBed.configureTestingModule({
@@ -191,20 +190,6 @@ describe('ItemBitstreamsComponent', () => {
     });
   });
 
-  describe('when dropBitstream is called', () => {
-    const event = {
-      fromIndex: 0,
-      toIndex: 50,
-      // eslint-disable-next-line no-empty,@typescript-eslint/no-empty-function
-      finish: () => {
-      }
-    };
-
-    beforeEach(() => {
-      comp.dropBitstream(bundle, event);
-    });
-  });
-
   describe('when dropBitstream is called', () => {
     beforeEach((done) => {
       comp.dropBitstream(bundle, {

From a207fb51e9159c0076bb8a76cd5a73944a11655b Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 12 Sep 2024 10:38:38 +0200
Subject: [PATCH 0484/1286] 118219: Remove unused paginated-drag-and-drop
 components

---
 .../edit-item-page/edit-item-page.module.ts   |   4 -
 ...rag-and-drop-bitstream-list.component.html |  33 ---
 ...-and-drop-bitstream-list.component.spec.ts | 150 -----------
 ...-drag-and-drop-bitstream-list.component.ts |  80 ------
 ...-edit-bitstream-drag-handle.component.html |   5 -
 ...em-edit-bitstream-drag-handle.component.ts |  26 --
 ...nated-drag-and-drop-list.component.spec.ts | 136 ----------
 ...-paginated-drag-and-drop-list.component.ts | 239 ------------------
 8 files changed, 673 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
 delete mode 100644 src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
 delete mode 100644 src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts

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 0a75394ddd..4ae5ebe666 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
@@ -26,8 +26,6 @@ import { ItemMoveComponent } from './item-move/item-move.component';
 import { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
 import { BundleDataService } from '../../core/data/bundle-data.service';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
 import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
@@ -82,12 +80,10 @@ import {
     ItemVersionHistoryComponent,
     ItemEditBitstreamComponent,
     ItemEditBitstreamBundleComponent,
-    PaginatedDragAndDropBitstreamListComponent,
     EditRelationshipComponent,
     EditRelationshipListComponent,
     ItemCollectionMapperComponent,
     ItemMoveComponent,
-    ItemEditBitstreamDragHandleComponent,
     VirtualMetadataComponent,
     ItemAuthorizationsComponent,
     IdentifierDataComponent,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
deleted file mode 100644
index f54aa73597..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<ds-pagination *ngIf="(objectsRD$ | async)?.payload"
-               [hideGear]="true"
-               [hidePagerWhenSinglePage]="true"
-               [hidePaginationDetail]="true"
-               [paginationOptions]="options"
-               [pageInfoState]="(objectsRD$ | async)?.payload"
-               [collectionSize]="(objectsRD$ | async)?.payload?.totalElements">
-  <ng-container *ngIf="!(loading$ | async)">
-    <div [id]="bundle.id" class="bundle-bitstreams-list"
-         [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
-         *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
-      <ng-container *ngIf="updates">
-        <div class="row bitstream-row" *ngFor="let uuid of customOrder" cdkDrag
-             [id]="uuid"
-             [ngClass]="{
-                  'table-warning': updates[uuid].changeType === 0,
-                  'table-danger': updates[uuid].changeType === 2,
-                  'table-success': updates[uuid].changeType === 1,
-                  'bg-white': updates[uuid].changeType === undefined
-                }">
-          <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
-                                  [bundleUrl]="bundle.self"
-                                  [columnSizes]="columnSizes">
-            <div class="d-flex align-items-center bitstream-row-drag-handle" slot="drag-handle" cdkDragHandle tabindex="0">
-              <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-            </div>
-          </ds-item-edit-bitstream>
-        </div>
-      </ng-container>
-    </div>
-  </ng-container>
-  <ds-themed-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-themed-loading>
-</ds-pagination>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
deleted file mode 100644
index 7317eb93be..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
-import { VarDirective } from '../../../../../shared/utils/var.directive';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
-import { of as observableOf } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../../shared/testing/utils.test';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub';
-
-describe('PaginatedDragAndDropBitstreamListComponent', () => {
-  let comp: PaginatedDragAndDropBitstreamListComponent;
-  let fixture: ComponentFixture<PaginatedDragAndDropBitstreamListComponent>;
-  let objectUpdatesService: ObjectUpdatesService;
-  let bundleService: BundleDataService;
-  let objectValuesPipe: ObjectValuesPipe;
-  let requestService: RequestService;
-  let paginationService;
-
-  const columnSizes = new ResponsiveTableSizes([
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-  ]);
-
-  const bundle = Object.assign(new Bundle(), {
-    id: 'bundle-1',
-    uuid: 'bundle-1',
-    _links: {
-      self: { href: 'bundle-1-selflink' }
-    }
-  });
-  const date = new Date();
-  const format = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'PDF'
-  });
-  const bitstream1 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID1',
-    name: 'Fake Bitstream 1',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
-  });
-  const fieldUpdate1 = {
-    field: bitstream1,
-    changeType: undefined
-  };
-  const bitstream2 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID2',
-    name: 'Fake Bitstream 2',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
-  });
-  const fieldUpdate2 = {
-    field: bitstream2,
-    changeType: undefined
-  };
-
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesByCustomOrder: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        saveMoveFieldUpdate: {},
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream1, bitstream2]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true),
-        initializeWithCustomOrder: {},
-        addPageToCustomOrder: {}
-      }
-    );
-
-    bundleService = jasmine.createSpyObj('bundleService', {
-      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
-      getBitstreamsEndpoint: observableOf('')
-    });
-
-    objectValuesPipe = new ObjectValuesPipe();
-
-    requestService = jasmine.createSpyObj('requestService', {
-      hasByHref$: observableOf(true)
-    });
-
-    paginationService = new PaginationServiceStub();
-
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: BundleDataService, useValue: bundleService },
-        { provide: ObjectValuesPipe, useValue: objectValuesPipe },
-        { provide: RequestService, useValue: requestService },
-        { provide: PaginationService, useValue: paginationService }
-      ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PaginatedDragAndDropBitstreamListComponent);
-    comp = fixture.componentInstance;
-    comp.bundle = bundle;
-    comp.columnSizes = columnSizes;
-    fixture.detectChanges();
-  });
-
-  it('should initialize the objectsRD$', (done) => {
-    comp.objectsRD$.pipe(take(1)).subscribe((objects) => {
-      expect(objects.payload.page).toEqual([bitstream1, bitstream2]);
-      done();
-    });
-  });
-
-  it('should initialize the URL', () => {
-    expect(comp.url).toEqual(bundle.self);
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
deleted file mode 100644
index d5bb9eceea..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
-import { Component, ElementRef, Input, OnInit } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
-
-@Component({
-  selector: 'ds-paginated-drag-and-drop-bitstream-list',
-  styleUrls: ['../../item-bitstreams.component.scss'],
-  templateUrl: './paginated-drag-and-drop-bitstream-list.component.html',
-})
-/**
- * A component listing edit-bitstream rows for each bitstream within the given bundle.
- * This component makes use of the AbstractPaginatedDragAndDropListComponent, allowing for users to drag and drop
- * bitstreams within the paginated list. To drag and drop a bitstream between two pages, drag the row on top of the
- * page number you want the bitstream to end up at. Doing so will add the bitstream to the top of that page.
- */
-// NOTE:
-// This component was used by the item-edit-bitstream-bundle.component, but this is no longer the case. It is left here
-// as a reference for the drag-and-drop functionality. This component (and the abstract version it extends) should be
-// removed once this reference is no longer useful.
-export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginatedDragAndDropListComponent<Bitstream> implements OnInit {
-  /**
-   * The bundle to display bitstreams for
-   */
-  @Input() bundle: Bundle;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected bundleService: BundleDataService,
-              protected paginationService: PaginationService,
-              protected requestService: RequestService) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  ngOnInit() {
-    super.ngOnInit();
-  }
-
-  /**
-   * Initialize the bitstreams observable depending on currentPage$
-   */
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.currentPage$.pipe(
-      switchMap((page: PaginationComponentOptions) => {
-        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, page)});
-        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
-          switchMap((href) => this.requestService.hasByHref$(href)),
-          switchMap(() => this.bundleService.getBitstreams(
-            this.bundle.id,
-            paginatedOptions,
-            followLink('format')
-          ))
-        );
-      })
-    );
-  }
-
-  /**
-   * Initialize the URL used for the field-update store, in this case the bundle's self-link
-   */
-  initializeURL(): void {
-    this.url = this.bundle.self;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
deleted file mode 100644
index 1bce8667ee..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ng-template #handleView>
-  <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0">
-    <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
deleted file mode 100644
index e5cb9ba403..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-
-@Component({
-  selector: 'ds-item-edit-bitstream-drag-handle',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream-drag-handle.component.html',
-})
-/**
- * Component displaying a drag handle for the item-edit-bitstream page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-drag-handle element)
- */
-export class ItemEditBitstreamDragHandleComponent implements OnInit {
-  /**
-   * The view on the drag-handle
-   */
-  @ViewChild('handleView', {static: true}) handleView;
-
-  constructor(private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.handleView);
-  }
-
-}
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
deleted file mode 100644
index bac6b89583..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { Component, ElementRef } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { take } from 'rxjs/operators';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { createPaginatedList } from '../testing/utils.test';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-
-@Component({
-  selector: 'ds-mock-paginated-drag-drop-abstract',
-  template: ''
-})
-class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected mockUrl: string,
-              protected paginationService: PaginationService,
-  protected mockObjectsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.mockObjectsRD$;
-  }
-
-  initializeURL(): void {
-    this.url = this.mockUrl;
-  }
-}
-
-describe('AbstractPaginatedDragAndDropListComponent', () => {
-  let component: MockAbstractPaginatedDragAndDropListComponent;
-  let objectUpdatesService: ObjectUpdatesService;
-  let elRef: ElementRef;
-  let objectValuesPipe: ObjectValuesPipe;
-
-  const url = 'mock-abstract-paginated-drag-and-drop-list-component';
-
-
-  const object1 = Object.assign(new DSpaceObject(), { uuid: 'object-1' });
-  const object2 = Object.assign(new DSpaceObject(), { uuid: 'object-2' });
-  const objectsRD = createSuccessfulRemoteDataObject(createPaginatedList([object1, object2]));
-  let objectsRD$: BehaviorSubject<RemoteData<PaginatedList<DSpaceObject>>>;
-  let paginationService;
-
-  const updates = {
-    [object1.uuid]: { field: object1, changeType: undefined },
-    [object2.uuid]: { field: object2, changeType: undefined }
-  } as FieldUpdates;
-
-  let paginationComponent: PaginationComponent;
-
-  beforeEach(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
-      initialize: {},
-      getFieldUpdatesExclusive: observableOf(updates)
-    });
-    elRef = {
-      nativeElement: jasmine.createSpyObj('nativeElement', {
-        querySelector: {}
-      })
-    };
-    objectValuesPipe = new ObjectValuesPipe();
-    paginationComponent = jasmine.createSpyObj('paginationComponent', {
-      doPageChange: {}
-    });
-    paginationService = new PaginationServiceStub();
-    objectsRD$ = new BehaviorSubject(objectsRD);
-    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, paginationService, objectsRD$);
-    component.paginationComponent = paginationComponent;
-    component.ngOnInit();
-  });
-
-  it('should call initialize to initialize the objects in the store', () => {
-    expect(objectUpdatesService.initialize).toHaveBeenCalled();
-  });
-
-  it('should initialize the updates correctly', (done) => {
-    component.updates$.pipe(take(1)).subscribe((fieldUpdates) => {
-      expect(fieldUpdates).toEqual(updates);
-      done();
-    });
-  });
-
-  describe('drop', () => {
-    const event = {
-      previousIndex: 0,
-      currentIndex: 1,
-      item: { element: { nativeElement: { id: object1.uuid } } }
-    } as any;
-
-    describe('when the user is hovering over a new page', () => {
-      const hoverPage = 3;
-      const hoverElement = { textContent: '' + hoverPage };
-
-      beforeEach(() => {
-        elRef.nativeElement.querySelector.and.returnValue(hoverElement);
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected processed paginated indexes', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: ((component.currentPage$.value.currentPage - 1) * component.pageSize) + event.previousIndex,
-          toIndex: ((hoverPage - 1) * component.pageSize),
-          finish: jasmine.anything()
-        }));
-      });
-    });
-
-    describe('when the user is not hovering over a new page', () => {
-      beforeEach(() => {
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected properties', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: event.previousIndex,
-          toIndex: event.currentIndex,
-          finish: jasmine.anything()
-        }));
-      });
-    });
-  });
-});
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
deleted file mode 100644
index 8dba47566f..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
-import { hasValue } from '../empty.util';
-import {
-  paginatedListToArray,
-  getFirstSucceededRemoteData,
-  getAllSucceededRemoteData
-} from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
-import { Component, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { FieldUpdate } from '../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-
-/**
- * Operator used for comparing {@link FieldUpdate}s by their field's UUID
- */
-export const compareArraysUsingFieldUuids = () =>
-  compareArraysUsing((fieldUpdate: FieldUpdate) => (hasValue(fieldUpdate) && hasValue(fieldUpdate.field)) ? fieldUpdate.field.uuid : undefined);
-
-/**
- * An abstract component containing general methods and logic to be able to drag and drop objects within a paginated
- * list. This implementation supports being able to drag and drop objects between pages.
- * Dragging an object on top of a page number will automatically detect the page it's being dropped on and send a
- * dropObject event to the parent component containing detailed information about the indexes the object was dropped from
- * and to.
- *
- * To extend this component, it is important to make sure to:
- * - Initialize objectsRD$ within the initializeObjectsRD() method
- * - Initialize a unique URL for this component/page within the initializeURL() method
- * - Add (cdkDropListDropped)="drop($event)" to the cdkDropList element in your template
- * - Add (pageChange)="switchPage($event)" to the ds-pagination element in your template
- * - Use the updates$ observable for building your list of cdkDrag elements in your template
- *
- * An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
- */
-@Component({
-  selector: 'ds-paginated-drag-drop-abstract',
-  template: ''
-})
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
-  /**
-   * A view on the child pagination component
-   */
-  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
-
-  /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
-   */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
-
-  /**
-   * The URL to use for accessing the object updates from this list
-   */
-  url: string;
-
-  /**
-   * The objects to retrieve data for and transform into field updates
-   */
-  objectsRD$: Observable<RemoteData<PaginatedList<T>>>;
-
-  /**
-   * The updates to the current list
-   */
-  updates$: Observable<FieldUpdates>;
-
-  /**
-   * A list of object UUIDs
-   * This is the order the objects will be displayed in
-   */
-  customOrder: string[];
-
-  /**
-   * The amount of objects to display per page
-   */
-  pageSize = 10;
-
-  /**
-   * The page options to use for fetching the objects
-   * Start at page 1 and always use the set page size
-   */
-  options = Object.assign(new PaginationComponentOptions(),{
-    id: 'dad',
-    currentPage: 1,
-    pageSize: this.pageSize
-  });
-
-  /**
-   * The current page being displayed
-   */
-  currentPage$ = new BehaviorSubject<PaginationComponentOptions>(this.options);
-
-  /**
-   * Whether or not we should display a loading animation
-   * This is used to display a loading page when the user drops a bitstream onto a new page. The loading animation
-   * should stop once the bitstream has moved to the new page and the new page's response has loaded and contains the
-   * dropped object on top (see this.stopLoadingWhenFirstIs below)
-   */
-  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  protected constructor(protected objectUpdatesService: ObjectUpdatesService,
-                        protected elRef: ElementRef,
-                        protected objectValuesPipe: ObjectValuesPipe,
-                        protected paginationService: PaginationService
-                        ) {
-  }
-
-  /**
-   * Initialize the observables
-   */
-  ngOnInit() {
-    this.initializeObjectsRD();
-    this.initializeURL();
-    this.initializeUpdates();
-    this.initializePagination();
-  }
-
-  /**
-   * Overwrite this method to define how the list of objects is initialized and updated
-   */
-  abstract initializeObjectsRD(): void;
-
-  /**
-   * Overwrite this method to define how the URL is set
-   */
-  abstract initializeURL(): void;
-
-  /**
-   * Initialize the current pagination retrieval from the paginationService and push to the currentPage$
-   */
-  initializePagination() {
-    this.paginationService.getCurrentPagination(this.options.id, this.options).subscribe((currentPagination) => {
-      this.currentPage$.next(currentPagination);
-    });
-  }
-
-  /**
-   * Initialize the field-updates in the store
-   */
-  initializeUpdates(): void {
-    this.objectsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      paginatedListToArray(),
-    ).subscribe((objects: T[]) => {
-      this.objectUpdatesService.initialize(this.url, objects, new Date());
-    });
-    this.updates$ = this.objectsRD$.pipe(
-      getAllSucceededRemoteData(),
-      paginatedListToArray(),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
-    );
-    this.subs.push(
-      this.updates$.pipe(
-        map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
-        distinctUntilChanged(compareArraysUsingFieldUuids())
-      ).subscribe((updateValues) => {
-        this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
-        // We received new values, stop displaying a loading indicator if it's present
-        this.loading$.next(false);
-      }),
-      // Disable the pagination when objects are loading
-      this.loading$.subscribe((loading) => this.options.disabled = loading)
-    );
-  }
-
-  /**
-   * An object was moved, send updates to the dropObject EventEmitter
-   * When the object is dropped on a page within the pagination of this component, the object moves to the top of that
-   * page and the pagination automatically loads and switches the view to that page (this is done by calling the event's
-   * finish() method after sending patch requests to the REST API)
-   * @param event
-   */
-  drop(event: CdkDragDrop<any>) {
-    const dragIndex = event.previousIndex;
-    let dropIndex = event.currentIndex;
-    const dragPage = this.currentPage$.value.currentPage - 1;
-    let dropPage = this.currentPage$.value.currentPage - 1;
-
-    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
-    const droppedOnElement = this.elRef.nativeElement.querySelector('.page-item:hover');
-    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent)) {
-      // The user is hovering over a page, fetch the page's number from the element
-      const droppedPage = Number(droppedOnElement.textContent);
-      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
-        dropPage = droppedPage - 1;
-        dropIndex = 0;
-      }
-    }
-
-    const isNewPage = dragPage !== dropPage;
-    // Move the object in the custom order array if the drop happened within the same page
-    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
-    if (!isNewPage && dragIndex !== dropIndex) {
-      moveItemInArray(this.customOrder, dragIndex, dropIndex);
-    }
-
-    const redirectPage = dropPage + 1;
-    const fromIndex = (dragPage * this.pageSize) + dragIndex;
-    const toIndex = (dropPage * this.pageSize) + dropIndex;
-    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
-    if (fromIndex !== toIndex) {
-      if (isNewPage) {
-        this.loading$.next(true);
-      }
-      this.dropObject.emit(Object.assign({
-        fromIndex,
-        toIndex,
-        finish: () => {
-          if (isNewPage) {
-            this.paginationComponent.doPageChange(redirectPage);
-          }
-        }
-      }));
-    }
-  }
-
-  /**
-   * unsub all subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-    this.paginationService.clearPagination(this.options.id);
-  }
-}

From 8fb4772b6c6308d2ba9e358e2858244105064c7f Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 1 Oct 2024 13:12:10 +0200
Subject: [PATCH 0485/1286] Always sanitize HTML in dsMarkdown even if markdown
 disabled

Instead of setting innerHTML directly to value, sanitize
the value, even if not passing to renderMarkdown/Mathjax
---
 .../shared/utils/markdown.directive.spec.ts   | 58 +++++++++++++++++--
 src/app/shared/utils/markdown.directive.ts    |  2 +-
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/utils/markdown.directive.spec.ts b/src/app/shared/utils/markdown.directive.spec.ts
index 79e795be87..b984543c40 100644
--- a/src/app/shared/utils/markdown.directive.spec.ts
+++ b/src/app/shared/utils/markdown.directive.spec.ts
@@ -8,21 +8,20 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
+import { environment } from '../../../environments/environment.test';
 import { MathService } from '../../core/shared/math.service';
 import { MockMathService } from '../../core/shared/math.service.spec';
 import { MarkdownDirective } from './markdown.directive';
 
 @Component({
-  template: `<div dsMarkdown="test"></div>`,
+  template: `<div [dsMarkdown]="'test<script>alert(1);</script>'"></div>`,
   standalone: true,
   imports: [ MarkdownDirective ],
 })
 class TestComponent {}
 
 describe('MarkdownDirective', () => {
-  let component: TestComponent;
   let fixture: ComponentFixture<TestComponent>;
-  let divEl: DebugElement;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -32,12 +31,61 @@ describe('MarkdownDirective', () => {
     }).compileComponents();
     spyOn(MarkdownDirective.prototype, 'render');
     fixture = TestBed.createComponent(TestComponent);
-    component = fixture.componentInstance;
-    divEl = fixture.debugElement.query(By.css('div'));
   });
 
   it('should call render method', () => {
     fixture.detectChanges();
     expect(MarkdownDirective.prototype.render).toHaveBeenCalled();
   });
+
+});
+
+describe('MarkdownDirective sanitization with markdown disabled', () => {
+  let fixture: ComponentFixture<TestComponent>;
+  let divEl: DebugElement;
+  // Disable markdown
+  environment.markdown.enabled = false;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        { provide: MathService, useClass: MockMathService },
+      ],
+    }).compileComponents();
+    fixture = TestBed.createComponent(TestComponent);
+    divEl = fixture.debugElement.query(By.css('div'));
+
+  });
+
+  it('should sanitize the script element out of innerHTML (markdown disabled)',() => {
+    fixture.detectChanges();
+    divEl = fixture.debugElement.query(By.css('div'));
+    expect(divEl.nativeElement.innerHTML).toEqual('test');
+  });
+
+});
+
+describe('MarkdownDirective sanitization with markdown enabled', () => {
+  let fixture: ComponentFixture<TestComponent>;
+  let divEl: DebugElement;
+  // Enable markdown
+  environment.markdown.enabled = true;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        { provide: MathService, useClass: MockMathService },
+      ],
+    }).compileComponents();
+    fixture = TestBed.createComponent(TestComponent);
+    divEl = fixture.debugElement.query(By.css('div'));
+
+  });
+
+  it('should sanitize the script element out of innerHTML (markdown enabled)',() => {
+    fixture.detectChanges();
+    divEl = fixture.debugElement.query(By.css('div'));
+    expect(divEl.nativeElement.innerHTML).toEqual('test');
+  });
+
 });
diff --git a/src/app/shared/utils/markdown.directive.ts b/src/app/shared/utils/markdown.directive.ts
index 0540e25cc5..de13acb303 100644
--- a/src/app/shared/utils/markdown.directive.ts
+++ b/src/app/shared/utils/markdown.directive.ts
@@ -55,7 +55,7 @@ export class MarkdownDirective implements OnInit, OnDestroy {
 
   async render(value: string, forcePreview = false): Promise<SafeHtml> {
     if (isEmpty(value) || (!environment.markdown.enabled && !forcePreview)) {
-      this.el.innerHTML = value;
+      this.el.innerHTML = this.sanitizer.sanitize(SecurityContext.HTML, value);
       return;
     } else {
       if (environment.markdown.mathjax) {

From 85f1ba21769a6fe2df07c6840fc63e5a0862ea7d Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Tue, 1 Oct 2024 13:12:10 +0200
Subject: [PATCH 0486/1286] Always sanitize HTML in dsMarkdown even if markdown
 disabled

Instead of setting innerHTML directly to value, sanitize
the value, even if not passing to renderMarkdown/Mathjax

(cherry picked from commit 8fb4772b6c6308d2ba9e358e2858244105064c7f)
---
 .../shared/utils/markdown.directive.spec.ts   | 58 +++++++++++++++++--
 src/app/shared/utils/markdown.directive.ts    |  2 +-
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/utils/markdown.directive.spec.ts b/src/app/shared/utils/markdown.directive.spec.ts
index 79e795be87..b984543c40 100644
--- a/src/app/shared/utils/markdown.directive.spec.ts
+++ b/src/app/shared/utils/markdown.directive.spec.ts
@@ -8,21 +8,20 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
+import { environment } from '../../../environments/environment.test';
 import { MathService } from '../../core/shared/math.service';
 import { MockMathService } from '../../core/shared/math.service.spec';
 import { MarkdownDirective } from './markdown.directive';
 
 @Component({
-  template: `<div dsMarkdown="test"></div>`,
+  template: `<div [dsMarkdown]="'test<script>alert(1);</script>'"></div>`,
   standalone: true,
   imports: [ MarkdownDirective ],
 })
 class TestComponent {}
 
 describe('MarkdownDirective', () => {
-  let component: TestComponent;
   let fixture: ComponentFixture<TestComponent>;
-  let divEl: DebugElement;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -32,12 +31,61 @@ describe('MarkdownDirective', () => {
     }).compileComponents();
     spyOn(MarkdownDirective.prototype, 'render');
     fixture = TestBed.createComponent(TestComponent);
-    component = fixture.componentInstance;
-    divEl = fixture.debugElement.query(By.css('div'));
   });
 
   it('should call render method', () => {
     fixture.detectChanges();
     expect(MarkdownDirective.prototype.render).toHaveBeenCalled();
   });
+
+});
+
+describe('MarkdownDirective sanitization with markdown disabled', () => {
+  let fixture: ComponentFixture<TestComponent>;
+  let divEl: DebugElement;
+  // Disable markdown
+  environment.markdown.enabled = false;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        { provide: MathService, useClass: MockMathService },
+      ],
+    }).compileComponents();
+    fixture = TestBed.createComponent(TestComponent);
+    divEl = fixture.debugElement.query(By.css('div'));
+
+  });
+
+  it('should sanitize the script element out of innerHTML (markdown disabled)',() => {
+    fixture.detectChanges();
+    divEl = fixture.debugElement.query(By.css('div'));
+    expect(divEl.nativeElement.innerHTML).toEqual('test');
+  });
+
+});
+
+describe('MarkdownDirective sanitization with markdown enabled', () => {
+  let fixture: ComponentFixture<TestComponent>;
+  let divEl: DebugElement;
+  // Enable markdown
+  environment.markdown.enabled = true;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        { provide: MathService, useClass: MockMathService },
+      ],
+    }).compileComponents();
+    fixture = TestBed.createComponent(TestComponent);
+    divEl = fixture.debugElement.query(By.css('div'));
+
+  });
+
+  it('should sanitize the script element out of innerHTML (markdown enabled)',() => {
+    fixture.detectChanges();
+    divEl = fixture.debugElement.query(By.css('div'));
+    expect(divEl.nativeElement.innerHTML).toEqual('test');
+  });
+
 });
diff --git a/src/app/shared/utils/markdown.directive.ts b/src/app/shared/utils/markdown.directive.ts
index 0540e25cc5..de13acb303 100644
--- a/src/app/shared/utils/markdown.directive.ts
+++ b/src/app/shared/utils/markdown.directive.ts
@@ -55,7 +55,7 @@ export class MarkdownDirective implements OnInit, OnDestroy {
 
   async render(value: string, forcePreview = false): Promise<SafeHtml> {
     if (isEmpty(value) || (!environment.markdown.enabled && !forcePreview)) {
-      this.el.innerHTML = value;
+      this.el.innerHTML = this.sanitizer.sanitize(SecurityContext.HTML, value);
       return;
     } else {
       if (environment.markdown.mathjax) {

From f975e1da897b34df0621ecd78ee11d4fc58460b4 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Tue, 1 Oct 2024 14:34:43 -0300
Subject: [PATCH 0487/1286] Edit item - making page content more responsive and
 accessible

---
 .../item-status/item-status.component.html       | 16 ++++++++--------
 .../item-status/item-status.component.scss       |  3 +++
 .../item-status/item-status.component.ts         |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-status/item-status.component.scss

diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index faad0e679b..30212c4a4c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,28 +1,28 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100">
-    <div class="col-3 float-left status-label">
+  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
+    <div class="col-12 col-md-3 float-left status-label">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
-    <div class="col-9 float-left status-data" id="status-{{statusKey}}">
+    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
       {{statusData[statusKey]}}
     </div>
   </div>
 
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.scss b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
new file mode 100644
index 0000000000..349416cd20
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
@@ -0,0 +1,3 @@
+.status-label {
+  font-weight: 700;
+}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 1bb17dc77c..0ad500b56f 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -60,6 +60,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-base-item-status',
+  styleUrls: ['item-status.component.scss'],
   templateUrl: './item-status.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [

From fec4aa6df1bd6c5ea1ca9eeb10e4bc643a16d39e Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:15:53 -0300
Subject: [PATCH 0488/1286] Changing the bitstream title in the submission form
 to use the view component title, avoiding disappearance with changes to the
 form

---
 .../sections/upload/file/section-upload-file.component.html  | 3 +--
 .../upload/file/view/section-upload-file-view.component.html | 5 +++--
 .../upload/file/view/section-upload-file-view.component.ts   | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index da83e3f9a0..4698fdf68a 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -18,7 +18,7 @@
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
-        <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
+        <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
       </div>
       <div class="float-right w-15">
         <ng-container>
@@ -43,7 +43,6 @@
         </ng-container>
       </div>
       <div class="clearfix"></div>
-      <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
     </div>
   </div>
 </ng-container>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index cc12b5dea6..dc72fbdad0 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -2,9 +2,10 @@
   <ng-container *ngIf="metadata">
     <ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
       <ng-container *ngIf="entry.value !== ''">
-        <h5>
+        <h3>
           {{entry.value}}
-        </h5>
+          <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
+        </h3>
       </ng-container>
       <ng-container *ngIf="entry.value === ''">
         <h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 0630a28a76..7ab21fb85b 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,6 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
+import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
 
 /**
  * This component allow to show bitstream's metadata
@@ -31,7 +32,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
     TruncatePipe,
     NgIf,
     NgForOf,
-  ],
+    FileSizePipe
+],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {

From 876d94e124cf11477a5548f11f095bc129c4b313 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 2 Oct 2024 09:23:26 +0200
Subject: [PATCH 0489/1286] 115284: Add tests for isRepeatable

---
 .../edit-relationship-list.component.spec.ts  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 312f2936ac..69a2340fd5 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -78,7 +78,7 @@ describe('EditRelationshipListComponent', () => {
     fixture.detectChanges();
   };
 
-  function init(leftType: string, rightType: string): void {
+  function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void {
     entityTypeLeft = Object.assign(new ItemType(), {
       id: leftType,
       uuid: leftType,
@@ -98,6 +98,8 @@ describe('EditRelationshipListComponent', () => {
       rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
       leftwardType: `is${rightType}Of${leftType}`,
       rightwardType: `is${leftType}Of${rightType}`,
+      leftMaxCardinality: leftMaxCardinality,
+      rightMaxCardinality: rightMaxCardinality,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -367,4 +369,31 @@ describe('EditRelationshipListComponent', () => {
       }));
     });
   });
+
+  describe('Is repeatable relationship', () => {
+      beforeEach(waitForAsync(() => {
+        currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+      }));
+    describe('when max cardinality is 1', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined)));
+      it('should return false', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeFalse();
+      });
+    });
+    describe('when max cardinality is 2', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+    describe('when max cardinality is undefined', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+  });
 });

From 161daffcc08e3c9ebcc209ba3115111243d2e6ae Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 2 Oct 2024 09:23:26 +0200
Subject: [PATCH 0490/1286] 115284: Add tests for isRepeatable

---
 .../edit-relationship-list.component.spec.ts  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 48415000be..4784e8fc5c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -110,7 +110,7 @@ describe('EditRelationshipListComponent', () => {
     },
   };
 
-  function init(leftType: string, rightType: string): void {
+  function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void {
     entityTypeLeft = Object.assign(new ItemType(), {
       id: leftType,
       uuid: leftType,
@@ -130,6 +130,8 @@ describe('EditRelationshipListComponent', () => {
       rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
       leftwardType: `is${rightType}Of${leftType}`,
       rightwardType: `is${leftType}Of${rightType}`,
+      leftMaxCardinality: leftMaxCardinality,
+      rightMaxCardinality: rightMaxCardinality,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -402,4 +404,31 @@ describe('EditRelationshipListComponent', () => {
       }));
     });
   });
+
+  describe('Is repeatable relationship', () => {
+    beforeEach(waitForAsync(() => {
+      currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+    }));
+    describe('when max cardinality is 1', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined)));
+      it('should return false', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeFalse();
+      });
+    });
+    describe('when max cardinality is 2', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+    describe('when max cardinality is undefined', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+  });
 });

From df24a63a464c3f88adedf982cdf540241414a86a Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:38:42 -0300
Subject: [PATCH 0491/1286] Adjusting spacing and good rules

---
 .../upload/file/view/section-upload-file-view.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7ab21fb85b..378753a1e6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,7 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
-import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
+import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
 
 /**
  * This component allow to show bitstream's metadata
@@ -32,8 +32,8 @@ import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
     TruncatePipe,
     NgIf,
     NgForOf,
-    FileSizePipe
-],
+    FileSizePipe,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {

From 4aed1b60563b3486da9f5c98cd4ee15451553b73 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Wed, 2 Oct 2024 08:45:52 -0300
Subject: [PATCH 0492/1286] Adjusting bold text on labels

---
 .../item-operation/item-operation.component.html          | 2 +-
 .../edit-item-page/item-status/item-status.component.html | 8 ++++----
 .../edit-item-page/item-status/item-status.component.scss | 3 ---
 .../edit-item-page/item-status/item-status.component.ts   | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-status/item-status.component.scss

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 deb8e15d29..0977876a19 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
@@ -1,5 +1,5 @@
 <div class="col-12 col-md-3 h-auto float-left d-flex action-label">
-      <span class="justify-content-center align-self-center">
+      <span class="justify-content-center align-self-center font-weight-bold">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 30212c4a4c..7d6e2e9559 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,7 +1,7 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
   <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
-    <div class="col-12 col-md-3 float-left status-label">
+    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
     <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
@@ -11,15 +11,15 @@
 
   <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-12 col-md-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-12 col-md-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-12 col-md-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
   <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.scss b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
deleted file mode 100644
index 349416cd20..0000000000
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.status-label {
-  font-weight: 700;
-}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 0ad500b56f..1bb17dc77c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -60,7 +60,6 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-base-item-status',
-  styleUrls: ['item-status.component.scss'],
   templateUrl: './item-status.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [

From 762bc8ce8c5a87a1dc7ba9763916addaabe06398 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:46:37 -0300
Subject: [PATCH 0493/1286] Adjusting spacing

---
 .../upload/file/view/section-upload-file-view.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6..7b8e870400 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    * The bitstream's title key
    * @type {string}
    */
-  public fileTitleKey = 'Title';
+  public fileTitleKey: string = 'Title';
 
   /**
    * The bitstream's description key
    * @type {string}
    */
-  public fileDescrKey = 'Description';
+  public fileDescrKey: string = 'Description';
 
   public fileFormat!: string;
 

From 62006c00cacf7e74661d6cc3dd4b5a53f47aeb72 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:01:56 -0300
Subject: [PATCH 0494/1286] Fix last commit

---
 .../upload/file/view/section-upload-file-view.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7b8e870400..378753a1e6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    * The bitstream's title key
    * @type {string}
    */
-  public fileTitleKey: string = 'Title';
+  public fileTitleKey = 'Title';
 
   /**
    * The bitstream's description key
    * @type {string}
    */
-  public fileDescrKey: string = 'Description';
+  public fileDescrKey = 'Description';
 
   public fileFormat!: string;
 

From eeaac8965b8b82e8d21f712350781c3e7f627157 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:10:48 -0300
Subject: [PATCH 0495/1286] Import order adjustment

---
 .../upload/file/view/section-upload-file-view.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6..20e86a492d 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -17,8 +17,8 @@ import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 
 /**
  * This component allow to show bitstream's metadata

From 2643a459b6a1213b4edb16f245732ba0a1b32bcb Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:24:46 -0300
Subject: [PATCH 0496/1286] Import order adjustment

---
 .../upload/file/view/section-upload-file-view.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 20e86a492d..f065fc9e19 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -16,8 +16,8 @@ import {
 import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 
 /**

From 01d09810ba045affc083fdf0398930231a80d51a Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 26 Jun 2024 08:29:32 -0300
Subject: [PATCH 0497/1286] Resolution of issue #1190 - Improving the
 accessibility of the status page using the item-operation component

(cherry picked from commit e06b67fd73358ac52e2e71fa96d708520de33f3e)
---
 .../item-operation/item-operation.component.html         | 4 ++--
 .../item-operation/item-operation.component.scss         | 9 +++++++++
 .../item-operation/item-operation.component.ts           | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-operation/item-operation.component.scss

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 85c6a2cca1..e282017315 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
@@ -1,9 +1,9 @@
-<div class="col-3 float-left d-flex h-100 action-label">
+<div class="col-12 col-md-3 column-height float-left d-flex h-100 action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
-<div class="col-9 float-left action-button">
+<div class="col-12 col-md-9 float-left action-button">
   <span *ngIf="operation.authorized">
     <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}}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
new file mode 100644
index 0000000000..ff42005e34
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
@@ -0,0 +1,9 @@
+.column-height {
+  height: 100%;
+}
+
+@media screen and (max-width: map-get($grid-breakpoints, sm)) {
+  .column-height {
+    height: auto;
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 9cf4b30e6c..f6773bc043 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -11,6 +11,7 @@ import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
+  styleUrls: ['item-operation.component.scss'],
   templateUrl: './item-operation.component.html',
   imports: [
     TranslateModule,

From 57d3a3a769163da2b35740265ac5b4da0a6cbe24 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 11 Jul 2024 15:51:33 -0300
Subject: [PATCH 0498/1286] Issue-1190/PR-3148 Improve the space between the
 text and the button

(cherry picked from commit 5f4a049fddeceda0fdbb870410d3780b858bcca9)
---
 .../edit-item-page/item-operation/item-operation.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e282017315..97e18cdaa6 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
@@ -1,4 +1,4 @@
-<div class="col-12 col-md-3 column-height float-left d-flex h-100 action-label">
+<div class="col-12 col-md-3 column-height float-left d-flex action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>

From dadba96975b95df905c5415fd2ad9b1338e7da3a Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 15 Jul 2024 09:30:20 -0300
Subject: [PATCH 0499/1286] Issue-1190/PR-3148 Removing 100% height from the
 column containing the button text and leaving it automatic

(cherry picked from commit 3800021ed364a7994b454e1a75c59a3f7f7581d1)
---
 .../item-operation/item-operation.component.html         | 2 +-
 .../item-operation/item-operation.component.scss         | 9 ---------
 .../item-operation/item-operation.component.ts           | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-operation/item-operation.component.scss

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 97e18cdaa6..deb8e15d29 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
@@ -1,4 +1,4 @@
-<div class="col-12 col-md-3 column-height float-left d-flex action-label">
+<div class="col-12 col-md-3 h-auto float-left d-flex action-label">
       <span class="justify-content-center align-self-center">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss b/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
deleted file mode 100644
index ff42005e34..0000000000
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.column-height {
-  height: 100%;
-}
-
-@media screen and (max-width: map-get($grid-breakpoints, sm)) {
-  .column-height {
-    height: auto;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index f6773bc043..9cf4b30e6c 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -11,7 +11,6 @@ import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
-  styleUrls: ['item-operation.component.scss'],
   templateUrl: './item-operation.component.html',
   imports: [
     TranslateModule,

From 8cc999e81eabf1a28b373c31f5b2fdf17e07817b Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Tue, 1 Oct 2024 14:34:43 -0300
Subject: [PATCH 0500/1286] Edit item - making page content more responsive and
 accessible

(cherry picked from commit f975e1da897b34df0621ecd78ee11d4fc58460b4)
---
 .../item-status/item-status.component.html       | 16 ++++++++--------
 .../item-status/item-status.component.scss       |  3 +++
 .../item-status/item-status.component.ts         |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-status/item-status.component.scss

diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index faad0e679b..30212c4a4c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,28 +1,28 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100">
-    <div class="col-3 float-left status-label">
+  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
+    <div class="col-12 col-md-3 float-left status-label">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
-    <div class="col-9 float-left status-data" id="status-{{statusKey}}">
+    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
       {{statusData[statusKey]}}
     </div>
   </div>
 
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.scss b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
new file mode 100644
index 0000000000..349416cd20
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
@@ -0,0 +1,3 @@
+.status-label {
+  font-weight: 700;
+}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 1bb17dc77c..0ad500b56f 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -60,6 +60,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-base-item-status',
+  styleUrls: ['item-status.component.scss'],
   templateUrl: './item-status.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [

From aa9d2490d1f37236d982f446d5ba3fceb44a300a Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Wed, 2 Oct 2024 08:45:52 -0300
Subject: [PATCH 0501/1286] Adjusting bold text on labels

(cherry picked from commit 4aed1b60563b3486da9f5c98cd4ee15451553b73)
---
 .../item-operation/item-operation.component.html          | 2 +-
 .../edit-item-page/item-status/item-status.component.html | 8 ++++----
 .../edit-item-page/item-status/item-status.component.scss | 3 ---
 .../edit-item-page/item-status/item-status.component.ts   | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-status/item-status.component.scss

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 deb8e15d29..0977876a19 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
@@ -1,5 +1,5 @@
 <div class="col-12 col-md-3 h-auto float-left d-flex action-label">
-      <span class="justify-content-center align-self-center">
+      <span class="justify-content-center align-self-center font-weight-bold">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 30212c4a4c..7d6e2e9559 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,7 +1,7 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
   <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
-    <div class="col-12 col-md-3 float-left status-label">
+    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
     <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
@@ -11,15 +11,15 @@
 
   <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-12 col-md-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-12 col-md-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-12 col-md-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
   <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.scss b/src/app/item-page/edit-item-page/item-status/item-status.component.scss
deleted file mode 100644
index 349416cd20..0000000000
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.status-label {
-  font-weight: 700;
-}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 0ad500b56f..1bb17dc77c 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -60,7 +60,6 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-base-item-status',
-  styleUrls: ['item-status.component.scss'],
   templateUrl: './item-status.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [

From 4bd607107146f4149ce004aba749dbccef7eba71 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 2 Oct 2024 17:02:12 -0500
Subject: [PATCH 0502/1286] Squashed commit of changes in #3148 from
 @Andrea-Guevara Co-authored-by: @Andrea-Guevara

---
 .../item-operation/item-operation.component.html |  6 +++---
 .../item-status/item-status.component.html       | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 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 85c6a2cca1..5364d5b9aa 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
@@ -1,9 +1,9 @@
-<div class="col-3 float-left d-flex h-100 action-label">
-      <span class="justify-content-center align-self-center">
+<div class="col-12 col-md-3 h-auto float-left d-flex h-100 action-label">
+      <span class="justify-content-center align-self-center font-weight-bold">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
-<div class="col-9 float-left action-button">
+<div class="col-12 col-md-9 float-left action-button">
   <span *ngIf="operation.authorized">
     <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}}
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 155b947804..766e61aa06 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,28 +1,28 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100">
-    <div class="col-3 float-left status-label">
+  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
+    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
-    <div class="col-9 float-left status-data" id="status-{{statusKey}}">
+    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
       {{statusData[statusKey]}}
     </div>
   </div>
 
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType=='doi')">
-      <div class="col-3 float-left status-label">
+      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-9 float-left status-label">{{identifier.value}}
+      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-3 float-left status-label">
+  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 

From c5b395802c890eab0761206aaae25f54b92212cc Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Fri, 4 Oct 2024 10:24:27 -0400
Subject: [PATCH 0503/1286] Update fr.json5 to add capitalization

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 399363f017..185576e186 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -2053,7 +2053,7 @@
   "community.all-lists.head": "Sous-communautés et collections",
 
   // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "collections au sein de cette communauté",
+  "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Sous-communautés au sein de cette communauté",

From e2a84b2145b7cdf38045fb53e982e20dbe67b529 Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Fri, 4 Oct 2024 10:24:27 -0400
Subject: [PATCH 0504/1286] Update fr.json5 to add capitalization

(cherry picked from commit c5b395802c890eab0761206aaae25f54b92212cc)
---
 src/assets/i18n/fr.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 20d57f3b72..a73baacf2d 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1757,7 +1757,7 @@
   "community.all-lists.head": "Sous-communautés et collections",
 
   // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "collections au sein de cette communauté",
+  "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Sous-communautés au sein de cette communauté",

From 884238bc12a354a0ab3f7f14eaab94e69dd05a6a Mon Sep 17 00:00:00 2001
From: Julia <j.gilmore@utoronto.ca>
Date: Fri, 4 Oct 2024 10:24:27 -0400
Subject: [PATCH 0505/1286] Update fr.json5 to add capitalization

(cherry picked from commit c5b395802c890eab0761206aaae25f54b92212cc)
---
 src/assets/i18n/fr.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 399363f017..185576e186 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -2053,7 +2053,7 @@
   "community.all-lists.head": "Sous-communautés et collections",
 
   // "community.sub-collection-list.head": "Collections of this Community",
-  "community.sub-collection-list.head": "collections au sein de cette communauté",
+  "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Sous-communautés au sein de cette communauté",

From 3306d0d6992dbec3eae593efa4d768944bb423f9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 26 Jul 2024 13:57:47 +0200
Subject: [PATCH 0506/1286] 116728: Removed unnecessary *ngVars from the
 ThumbnailComponent

(cherry picked from commit d31e17894ce3f8f6be82f426de879816d76acd97)
---
 src/app/thumbnail/thumbnail.component.html    | 20 ++++++-------
 src/app/thumbnail/thumbnail.component.spec.ts | 28 +++++++++----------
 src/app/thumbnail/thumbnail.component.ts      | 14 +++++-----
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 6a0516b0d4..049a47e1b0 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
-<div class="thumbnail" [class.limit-width]="limitWidth" *ngVar="(isLoading$ | async) as isLoading">
+<div class="thumbnail" [class.limit-width]="limitWidth">
   <div *ngIf="isLoading" class="thumbnail-content outer">
     <div class="inner">
       <div class="centered">
@@ -6,16 +6,14 @@
       </div>
     </div>
   </div>
-  <ng-container *ngVar="(src$ | async) as src">
-    <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-    <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-         [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-    <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-      <div class="inner">
-        <div class="thumbnail-placeholder centered lead">
-          {{ placeholder | translate }}
-        </div>
+  <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
+  <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
+       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
+    <div class="inner">
+      <div class="thumbnail-placeholder centered lead">
+        {{ placeholder | translate }}
       </div>
     </div>
-  </ng-container>
+  </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index ebecb5e075..2a25c9a318 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -67,31 +67,31 @@ describe('ThumbnailComponent', () => {
 
   describe('loading', () => {
     it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading$.getValue()).toBeTrue();
+      expect(comp.isLoading).toBeTrue();
     });
 
     it('should set isLoading$ to false once an image is successfully loaded', () => {
       comp.setSrc('http://bit.stream');
       fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should set isLoading$ to false once the src is set to null', () => {
       comp.setSrc(null);
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should show a loading animation while isLoading$ is true', () => {
       expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
 
-      comp.isLoading$.next(false);
+      comp.isLoading = false;
       fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeFalsy();
     });
 
     describe('with a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next('https://bit.stream');
+        comp.src = 'https://bit.stream';
         fixture.detectChanges();
       });
 
@@ -100,7 +100,7 @@ describe('ThumbnailComponent', () => {
         expect(img).toBeTruthy();
         expect(img.classes['d-none']).toBeTrue();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         img = fixture.debugElement.query(By.css('img.thumbnail-content'));
         expect(img).toBeTruthy();
@@ -111,14 +111,14 @@ describe('ThumbnailComponent', () => {
 
     describe('without a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next(null);
+        comp.src = null;
         fixture.detectChanges();
       });
 
       it('should only show the HTML placeholder once done loading', () => {
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
       });
@@ -214,14 +214,14 @@ describe('ThumbnailComponent', () => {
   describe('fallback', () => {
     describe('if there is a default image', () => {
       it('should display the default image', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(comp.defaultImage);
+        expect(comp.src).toBe(comp.defaultImage);
       });
 
       it('should include the alt text', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
 
@@ -233,10 +233,10 @@ describe('ThumbnailComponent', () => {
 
     describe('if there is no default image', () => {
       it('should display the HTML placeholder', () => {
-        comp.src$.next('http://default.img');
+        comp.src = 'http://default.img';
         comp.defaultImage = null;
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(null);
+        expect(comp.src).toBe(null);
 
         fixture.detectChanges();
         const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
@@ -328,7 +328,7 @@ describe('ThumbnailComponent', () => {
       it('should show the default image', () => {
         comp.defaultImage = 'default/image.jpg';
         comp.ngOnChanges({});
-        expect(comp.src$.getValue()).toBe('default/image.jpg');
+        expect(comp.src).toBe('default/image.jpg');
       });
     });
   });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 7f6531cc5e..0827a33e77 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasNoValue, hasValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
@@ -34,7 +34,7 @@ export class ThumbnailComponent implements OnChanges {
   /**
    * The src attribute used in the template to render the image.
    */
-  src$ = new BehaviorSubject<string>(undefined);
+  src: string = undefined;
 
   retriedWithToken = false;
 
@@ -57,7 +57,7 @@ export class ThumbnailComponent implements OnChanges {
    * Whether the thumbnail is currently loading
    * Start out as true to avoid flashing the alt text while a thumbnail is being loaded.
    */
-  isLoading$ = new BehaviorSubject(true);
+  isLoading = true;
 
   constructor(
     protected auth: AuthService,
@@ -110,7 +110,7 @@ export class ThumbnailComponent implements OnChanges {
    * Otherwise, fall back to the default image or a HTML placeholder
    */
   errorHandler() {
-    const src = this.src$.getValue();
+    const src = this.src;
     const thumbnail = this.bitstream;
     const thumbnailSrc = thumbnail?._links?.content?.href;
 
@@ -162,9 +162,9 @@ export class ThumbnailComponent implements OnChanges {
    * @param src
    */
   setSrc(src: string): void {
-    this.src$.next(src);
+    this.src = src;
     if (src === null) {
-      this.isLoading$.next(false);
+      this.isLoading = false;
     }
   }
 
@@ -172,6 +172,6 @@ export class ThumbnailComponent implements OnChanges {
    * Stop the loading animation once the thumbnail is successfully loaded
    */
   successHandler() {
-    this.isLoading$.next(false);
+    this.isLoading = false;
   }
 }

From 64596c306ef7f3c5b1e3dabb7f868c14cf19fbf7 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 26 Jul 2024 13:57:47 +0200
Subject: [PATCH 0507/1286] 116728: Removed unnecessary *ngVars from the
 ThumbnailComponent

---
 src/app/thumbnail/thumbnail.component.html    | 20 ++++++-------
 src/app/thumbnail/thumbnail.component.spec.ts | 28 +++++++++----------
 src/app/thumbnail/thumbnail.component.ts      | 17 +++++------
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index c32a44da3f..e151684a01 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
-<div class="thumbnail" [class.limit-width]="limitWidth" *ngVar="(isLoading$ | async) as isLoading">
+<div class="thumbnail" [class.limit-width]="limitWidth">
   <div *ngIf="isLoading" class="thumbnail-content outer">
     <div class="inner">
       <div class="centered">
@@ -6,16 +6,14 @@
       </div>
     </div>
   </div>
-  <ng-container *ngVar="(src$ | async) as src">
-    <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-    <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-         [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-    <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-      <div class="inner">
-        <div class="thumbnail-placeholder centered lead">
-          {{ placeholder | translate }}
-        </div>
+  <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
+  <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
+       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
+    <div class="inner">
+      <div class="thumbnail-placeholder centered lead">
+        {{ placeholder | translate }}
       </div>
     </div>
-  </ng-container>
+  </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index b5bf5474f7..10e461112b 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -96,31 +96,31 @@ describe('ThumbnailComponent', () => {
 
   describe('loading', () => {
     it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading$.getValue()).toBeTrue();
+      expect(comp.isLoading).toBeTrue();
     });
 
     it('should set isLoading$ to false once an image is successfully loaded', () => {
       comp.setSrc('http://bit.stream');
       fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should set isLoading$ to false once the src is set to null', () => {
       comp.setSrc(null);
-      expect(comp.isLoading$.getValue()).toBeFalse();
+      expect(comp.isLoading).toBeFalse();
     });
 
     it('should show a loading animation while isLoading$ is true', () => {
       expect(de.query(By.css('ds-loading'))).toBeTruthy();
 
-      comp.isLoading$.next(false);
+      comp.isLoading = false;
       fixture.detectChanges();
       expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
     });
 
     describe('with a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next('https://bit.stream');
+        comp.src = 'https://bit.stream';
         fixture.detectChanges();
       });
 
@@ -129,7 +129,7 @@ describe('ThumbnailComponent', () => {
         expect(img).toBeTruthy();
         expect(img.classes['d-none']).toBeTrue();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         img = fixture.debugElement.query(By.css('img.thumbnail-content'));
         expect(img).toBeTruthy();
@@ -140,14 +140,14 @@ describe('ThumbnailComponent', () => {
 
     describe('without a thumbnail image', () => {
       beforeEach(() => {
-        comp.src$.next(null);
+        comp.src = null;
         fixture.detectChanges();
       });
 
       it('should only show the HTML placeholder once done loading', () => {
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
 
-        comp.isLoading$.next(false);
+        comp.isLoading = false;
         fixture.detectChanges();
         expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
       });
@@ -243,14 +243,14 @@ describe('ThumbnailComponent', () => {
   describe('fallback', () => {
     describe('if there is a default image', () => {
       it('should display the default image', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(comp.defaultImage);
+        expect(comp.src).toBe(comp.defaultImage);
       });
 
       it('should include the alt text', () => {
-        comp.src$.next('http://bit.stream');
+        comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
 
@@ -262,10 +262,10 @@ describe('ThumbnailComponent', () => {
 
     describe('if there is no default image', () => {
       it('should display the HTML placeholder', () => {
-        comp.src$.next('http://default.img');
+        comp.src = 'http://default.img';
         comp.defaultImage = null;
         comp.errorHandler();
-        expect(comp.src$.getValue()).toBe(null);
+        expect(comp.src).toBe(null);
 
         fixture.detectChanges();
         const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
@@ -357,7 +357,7 @@ describe('ThumbnailComponent', () => {
       it('should show the default image', () => {
         comp.defaultImage = 'default/image.jpg';
         comp.ngOnChanges({});
-        expect(comp.src$.getValue()).toBe('default/image.jpg');
+        expect(comp.src).toBe('default/image.jpg');
       });
     });
   });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index efcbfb1a81..cc583c3998 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -6,10 +6,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import {
-  BehaviorSubject,
-  of as observableOf,
-} from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
 import { AuthService } from '../core/auth/auth.service';
@@ -53,7 +50,7 @@ export class ThumbnailComponent implements OnChanges {
   /**
    * The src attribute used in the template to render the image.
    */
-  src$ = new BehaviorSubject<string>(undefined);
+  src: string = undefined;
 
   retriedWithToken = false;
 
@@ -76,7 +73,7 @@ export class ThumbnailComponent implements OnChanges {
    * Whether the thumbnail is currently loading
    * Start out as true to avoid flashing the alt text while a thumbnail is being loaded.
    */
-  isLoading$ = new BehaviorSubject(true);
+  isLoading = true;
 
   constructor(
     protected auth: AuthService,
@@ -129,7 +126,7 @@ export class ThumbnailComponent implements OnChanges {
    * Otherwise, fall back to the default image or a HTML placeholder
    */
   errorHandler() {
-    const src = this.src$.getValue();
+    const src = this.src;
     const thumbnail = this.bitstream;
     const thumbnailSrc = thumbnail?._links?.content?.href;
 
@@ -181,9 +178,9 @@ export class ThumbnailComponent implements OnChanges {
    * @param src
    */
   setSrc(src: string): void {
-    this.src$.next(src);
+    this.src = src;
     if (src === null) {
-      this.isLoading$.next(false);
+      this.isLoading = false;
     }
   }
 
@@ -191,6 +188,6 @@ export class ThumbnailComponent implements OnChanges {
    * Stop the loading animation once the thumbnail is successfully loaded
    */
   successHandler() {
-    this.isLoading$.next(false);
+    this.isLoading = false;
   }
 }

From e6a7fb852a147e9193fd3164660d12228c36d56a Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 19 Jul 2024 17:41:12 +0200
Subject: [PATCH 0508/1286] [CST-15592] add accessibility tests for following
 pages:

Metadata Import
Batch Import
Processes Overview
New Process
Quality Assurance Sources
---
 cypress/e2e/batch-import-page.cy.ts            | 17 +++++++++++++++++
 cypress/e2e/metadata-import-page.cy.ts         | 17 +++++++++++++++++
 cypress/e2e/new-process.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/processes-overview.cy.ts           | 18 ++++++++++++++++++
 .../e2e/quality-assurance-source-page.cy.ts    | 17 +++++++++++++++++
 .../quality-assurance-source.component.html    |  2 +-
 .../process-overview-table.component.html      |  1 -
 7 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 cypress/e2e/batch-import-page.cy.ts
 create mode 100644 cypress/e2e/metadata-import-page.cy.ts
 create mode 100644 cypress/e2e/new-process.cy.ts
 create mode 100644 cypress/e2e/processes-overview.cy.ts
 create mode 100644 cypress/e2e/quality-assurance-source-page.cy.ts

diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
new file mode 100644
index 0000000000..82660e8e43
--- /dev/null
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Batch Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/batch-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Batch import form must first be visible
+    cy.get('ds-batch-import-page').should('be.visible');
+    // Analyze <ds-batch-import-page> for accessibility issues
+    testA11y('ds-batch-import-page');
+  });
+});
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
new file mode 100644
index 0000000000..3c1d1a91af
--- /dev/null
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/metadata-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Metadata import form must first be visible
+    cy.get('ds-metadata-import-page').should('be.visible');
+    // Analyze <ds-metadata-import-page> for accessibility issues
+    testA11y('ds-metadata-import-page');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
new file mode 100644
index 0000000000..d2a6ab4731
--- /dev/null
+++ b/cypress/e2e/new-process.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('New Process', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes/new');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-new-process').should('be.visible');
+    // Analyze <ds-new-process> for accessibility issues
+    testA11y('ds-new-process');
+  });
+});
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
new file mode 100644
index 0000000000..f0e1ccc3fe
--- /dev/null
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Processes Overview', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    // Process overview must first be visible
+    cy.get('ds-process-overview').should('be.visible');
+    // Analyze <ds-process-overview> for accessibility issues
+    testA11y('ds-process-overview');
+  });
+});
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
new file mode 100644
index 0000000000..beb797df41
--- /dev/null
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Quality Assurance Source Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/notifications/quality-assurance');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Source page must first be visible
+    cy.get('ds-quality-assurance-source-page-component').should('be.visible');
+    // Analyze <ds-quality-assurance-source-page-component> for accessibility issues
+    testA11y('ds-quality-assurance-source-page-component');
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index bf461873a1..faeb571234 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -7,7 +7,7 @@
     </div>
     <div class="row">
       <div class="col-12">
-        <h4 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h4>
+        <h3 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h3>
 
         <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
         <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index b270c33a7b..0d699d9f38 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -44,7 +44,6 @@
               <td>{{tableEntry.info}}</td>
               <td>
                 <button [attr.aria-label]="'process.overview.delete-process' | translate"
-                        aria-hidden="true"
                         (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
                         class="btn btn-outline-danger">
                   <i class="fas fa-trash"></i>

From a0e3c41be6d7fbf93dc98ce2973831ab3b222b68 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 11:17:34 +0200
Subject: [PATCH 0509/1286] [CST-15592] add accessibility tests for:

Edit Eperson
Edit Group
Create EPerson
Epeople Registry
Groups Registry
---
 cypress.config.ts                               |  3 +++
 cypress/e2e/create-eperson.cy.ts                | 17 +++++++++++++++++
 cypress/e2e/edit-eperson.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/edit-group.cy.ts                    | 17 +++++++++++++++++
 cypress/e2e/epeople-registry.cy.ts              | 17 +++++++++++++++++
 cypress/e2e/groups-registry.cy.ts               | 17 +++++++++++++++++
 .../context-help-toggle.component.html          |  2 +-
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 cypress/e2e/create-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-group.cy.ts
 create mode 100644 cypress/e2e/epeople-registry.cy.ts
 create mode 100644 cypress/e2e/groups-registry.cy.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index 458b035a48..442dde3607 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -18,6 +18,7 @@ export default defineConfig({
 
     // Admin account used for administrative tests
     DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
     DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
@@ -33,6 +34,8 @@ export default defineConfig({
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+    // Administrator users group
+    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
   },
   e2e: {
     // Setup our plugins for e2e tests
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
new file mode 100644
index 0000000000..b1c5d27dc4
--- /dev/null
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
new file mode 100644
index 0000000000..0fc052472b
--- /dev/null
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
new file mode 100644
index 0000000000..63a5af857b
--- /dev/null
+++ b/cypress/e2e/edit-group.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Group', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
new file mode 100644
index 0000000000..b278350c10
--- /dev/null
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Epeople registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-epeople-registry').should('be.visible');
+    // Analyze <ds-epeople-registry> for accessibility issues
+    testA11y('ds-epeople-registry');
+  });
+});
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
new file mode 100644
index 0000000000..dc97e17c9f
--- /dev/null
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Groups registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-groups-registry').should('be.visible');
+    // Analyze <ds-groups-registry> for accessibility issues
+    testA11y('ds-groups-registry');
+  });
+});
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 1ec2050497..6f04326d56 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,6 +1,6 @@
 <div *ngIf="buttonVisible$ | async">
   <a href="javascript:void(0);"
-     role="button"
+     role="menuitem"
      (click)="onClick()"
      [attr.aria-label]="'nav.context-help-toggle' | translate"
      [title]="'nav.context-help-toggle' | translate"

From 85e486438a1aab91856ecd218cdd497a081b4003 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 15:47:13 +0200
Subject: [PATCH 0510/1286] [CST-15592] add accessibility tests for:

Admin Notifications Publication Claim
Admin Search Page
Bulk Access
Create Group
Metadata Registry
---
 ...notifications-publication-claim-page.cy.ts | 17 +++++++++++++
 cypress/e2e/admin-search-page.cy.ts           | 18 ++++++++++++++
 cypress/e2e/batch-import-page.cy.ts           |  1 -
 cypress/e2e/bulk-access.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/create-eperson.cy.ts              |  3 +--
 cypress/e2e/create-group.cy.ts                | 16 +++++++++++++
 cypress/e2e/edit-eperson.cy.ts                |  3 +--
 cypress/e2e/edit-group.cy.ts                  |  3 +--
 cypress/e2e/epeople-registry.cy.ts            |  3 +--
 cypress/e2e/groups-registry.cy.ts             |  3 +--
 cypress/e2e/metadata-import-page.cy.ts        |  3 +--
 cypress/e2e/metadata-registry.cy.ts           | 16 +++++++++++++
 cypress/e2e/new-process.cy.ts                 |  3 +--
 cypress/e2e/processes-overview.cy.ts          |  3 +--
 .../e2e/quality-assurance-source-page.cy.ts   |  3 +--
 15 files changed, 100 insertions(+), 19 deletions(-)
 create mode 100644 cypress/e2e/admin-notifications-publication-claim-page.cy.ts
 create mode 100644 cypress/e2e/admin-search-page.cy.ts
 create mode 100644 cypress/e2e/bulk-access.cy.ts
 create mode 100644 cypress/e2e/create-group.cy.ts
 create mode 100644 cypress/e2e/metadata-registry.cy.ts

diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
new file mode 100644
index 0000000000..4d297f5c9d
--- /dev/null
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Notifications Publication Claim', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/notifications/publication-claim');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    //Page must first be visible
+    cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
+    // Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
+    testA11y('ds-admin-notifications-publication-claim-page');
+  });
+});
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
new file mode 100644
index 0000000000..2e1d13aa13
--- /dev/null
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Search Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/search');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    //Page must first be visible
+    cy.get('ds-admin-search-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-search-page> for accessibility issues
+    testA11y('ds-admin-search-page');
+  });
+});
diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
index 82660e8e43..871b8644ce 100644
--- a/cypress/e2e/batch-import-page.cy.ts
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Batch Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
     // Must login as an Admin to see processes
     cy.visit('/admin/batch-import');
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
new file mode 100644
index 0000000000..4d199f53f9
--- /dev/null
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Bulk Access', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/bulk-access');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bulk-access').should('be.visible');
+    // Analyze <ds-bulk-access> for accessibility issues
+    testA11y('ds-bulk-access', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
index b1c5d27dc4..d23986ba29 100644
--- a/cypress/e2e/create-eperson.cy.ts
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Create Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/create');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/create-group.cy.ts b/cypress/e2e/create-group.cy.ts
new file mode 100644
index 0000000000..135c041a8d
--- /dev/null
+++ b/cypress/e2e/create-group.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Group', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
index 0fc052472b..166c913b8c 100644
--- a/cypress/e2e/edit-eperson.cy.ts
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index 63a5af857b..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Group', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
index b278350c10..a6192f13d9 100644
--- a/cypress/e2e/epeople-registry.cy.ts
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Epeople registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
index dc97e17c9f..5c0099c2f1 100644
--- a/cypress/e2e/groups-registry.cy.ts
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Groups registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
index 3c1d1a91af..a31c18e4eb 100644
--- a/cypress/e2e/metadata-import-page.cy.ts
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Metadata Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/admin/metadata-import');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
new file mode 100644
index 0000000000..f0f3db48d3
--- /dev/null
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-registry').should('be.visible');
+    // Analyze <ds-metadata-registry> for accessibility issues
+    testA11y('ds-metadata-registry');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
index d2a6ab4731..d26da7cc4d 100644
--- a/cypress/e2e/new-process.cy.ts
+++ b/cypress/e2e/new-process.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('New Process', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes/new');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
index f0e1ccc3fe..2be3bd4c18 100644
--- a/cypress/e2e/processes-overview.cy.ts
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Processes Overview', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
index beb797df41..722917ef16 100644
--- a/cypress/e2e/quality-assurance-source-page.cy.ts
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Quality Assurance Source Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/notifications/quality-assurance');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });

From d12d0faf0904e241008c1e8c1f9463e19daf3b91 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 17:53:03 +0200
Subject: [PATCH 0511/1286] [CST-15592] add accessibility tests for:

Admin Curation Task
Bitstream Format
Health Page
Metadata Schema
---
 cypress/e2e/admin-curation-tasks.cy.ts        | 16 +++++++++++++
 ...notifications-publication-claim-page.cy.ts |  2 +-
 cypress/e2e/bitstreams-format.cy.ts           | 16 +++++++++++++
 cypress/e2e/health-page.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/metadata-registry.cy.ts           |  2 +-
 cypress/e2e/metadata-schema.cy.ts             | 16 +++++++++++++
 6 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 cypress/e2e/admin-curation-tasks.cy.ts
 create mode 100644 cypress/e2e/bitstreams-format.cy.ts
 create mode 100644 cypress/e2e/health-page.cy.ts
 create mode 100644 cypress/e2e/metadata-schema.cy.ts

diff --git a/cypress/e2e/admin-curation-tasks.cy.ts b/cypress/e2e/admin-curation-tasks.cy.ts
new file mode 100644
index 0000000000..e66f0ccaad
--- /dev/null
+++ b/cypress/e2e/admin-curation-tasks.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Curation Tasks', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/curation-tasks');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-curation-task').should('be.visible');
+    // Analyze <ds-admin-curation-task> for accessibility issues
+    testA11y('ds-admin-curation-task');
+  });
+});
diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
index 4d297f5c9d..877a0542e2 100644
--- a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Admin Notifications Publication Claim', () => {
+describe('Admin Notifications Publication Claim Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/notifications/publication-claim');
diff --git a/cypress/e2e/bitstreams-format.cy.ts b/cypress/e2e/bitstreams-format.cy.ts
new file mode 100644
index 0000000000..f113d45ebc
--- /dev/null
+++ b/cypress/e2e/bitstreams-format.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Bitstreams Formats', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/bitstream-formats');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bitstream-formats').should('be.visible');
+    // Analyze <ds-bitstream-formats> for accessibility issues
+    testA11y('ds-bitstream-formats');
+  });
+});
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
new file mode 100644
index 0000000000..91c68638ea
--- /dev/null
+++ b/cypress/e2e/health-page.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Health Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/health');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
index f0f3db48d3..0402d33153 100644
--- a/cypress/e2e/metadata-registry.cy.ts
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Metadata registry', () => {
+describe('Metadata Registry', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/registries/metadata');
diff --git a/cypress/e2e/metadata-schema.cy.ts b/cypress/e2e/metadata-schema.cy.ts
new file mode 100644
index 0000000000..9ff0db0714
--- /dev/null
+++ b/cypress/e2e/metadata-schema.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Schema', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata/dc');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-schema').should('be.visible');
+    // Analyze <ds-metadata-schema> for accessibility issues
+    testA11y('ds-metadata-schema');
+  });
+});

From 4cd55d6669ca5c7e61d7b7e924602dfa477391ae Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 11:50:47 +0200
Subject: [PATCH 0512/1286] [CST-15592] add accessibility tests for:

Admin Add New Modals
Admin Edit Modals
Admin Export Modals
Admin Workflow Page
End User Agreement
Feedback
Profile Page
System Wide Alert
---
 cypress/e2e/admin-add-new-modals.cy.ts        | 48 +++++++++++++++++++
 cypress/e2e/admin-edit-modals.cy.ts           | 48 +++++++++++++++++++
 cypress/e2e/admin-export-modals.cy.ts         | 35 ++++++++++++++
 cypress/e2e/admin-workflow-page.cy.ts         | 18 +++++++
 cypress/e2e/end-user-agreement.cy.ts          | 13 +++++
 cypress/e2e/feedback.cy.ts                    | 13 +++++
 cypress/e2e/privacy.cy.ts                     | 13 +++++
 cypress/e2e/profile-page.cy.ts                | 16 +++++++
 cypress/e2e/system-wide-alert.cy.ts           | 16 +++++++
 .../end-user-agreement-content.component.html |  4 +-
 .../privacy-content.component.html            |  4 +-
 .../dso-selector/dso-selector.component.html  |  1 +
 src/styles/_global-styles.scss                |  8 ++++
 13 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 cypress/e2e/admin-add-new-modals.cy.ts
 create mode 100644 cypress/e2e/admin-edit-modals.cy.ts
 create mode 100644 cypress/e2e/admin-export-modals.cy.ts
 create mode 100644 cypress/e2e/admin-workflow-page.cy.ts
 create mode 100644 cypress/e2e/end-user-agreement.cy.ts
 create mode 100644 cypress/e2e/feedback.cy.ts
 create mode 100644 cypress/e2e/privacy.cy.ts
 create mode 100644 cypress/e2e/profile-page.cy.ts
 create mode 100644 cypress/e2e/system-wide-alert.cy.ts

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
new file mode 100644
index 0000000000..6e2e8e6970
--- /dev/null
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Add New Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Add new Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_community"]').click();
+
+    // Analyze <ds-create-community-parent-selector> for accessibility
+    testA11y('ds-create-community-parent-selector');
+  });
+
+  it('Add new Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_collection"]').click();
+
+    // Analyze <ds-create-collection-parent-selector> for accessibility
+    testA11y('ds-create-collection-parent-selector');
+  });
+
+  it('Add new Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_item"]').click();
+
+    // Analyze <ds-create-item-parent-selector> for accessibility
+    testA11y('ds-create-item-parent-selector');
+  });
+});
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
new file mode 100644
index 0000000000..256a6d89cb
--- /dev/null
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Edit Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Edit Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_community"]').click();
+
+    // Analyze <ds-edit-community-selector> for accessibility
+    testA11y('ds-edit-community-selector');
+  });
+
+  it('Edit Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_collection"]').click();
+
+    // Analyze <ds-edit-collection-selector> for accessibility
+    testA11y('ds-edit-collection-selector');
+  });
+
+  it('Edit Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_item"]').click();
+
+    // Analyze <ds-edit-item-selector> for accessibility
+    testA11y('ds-edit-item-selector');
+  });
+});
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
new file mode 100644
index 0000000000..b611bb8fd5
--- /dev/null
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -0,0 +1,35 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Export Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Export metadata modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_metadata"]').click();
+
+    // Analyze <ds-export-metadata-selector> for accessibility
+    testA11y('ds-export-metadata-selector');
+  });
+
+  it('Export batch modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_batch"]').click();
+
+    // Analyze <ds-export-batch-selector> for accessibility
+    testA11y('ds-export-batch-selector');
+  });
+});
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
new file mode 100644
index 0000000000..cd2275f584
--- /dev/null
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Workflow Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/workflow');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-workflow-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-workflow-page> for accessibility issues
+    testA11y('ds-admin-workflow-page');
+  });
+});
diff --git a/cypress/e2e/end-user-agreement.cy.ts b/cypress/e2e/end-user-agreement.cy.ts
new file mode 100644
index 0000000000..989d21ce60
--- /dev/null
+++ b/cypress/e2e/end-user-agreement.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('End User Agreement', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/end-user-agreement');
+
+    // Page must first be visible
+    cy.get('ds-end-user-agreement').should('be.visible');
+
+    // Analyze <ds-end-user-agreement> for accessibility
+    testA11y('ds-end-user-agreement');
+  });
+});
diff --git a/cypress/e2e/feedback.cy.ts b/cypress/e2e/feedback.cy.ts
new file mode 100644
index 0000000000..75fe1097c6
--- /dev/null
+++ b/cypress/e2e/feedback.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Feedback', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/feedback');
+
+    // Page must first be visible
+    cy.get('ds-feedback').should('be.visible');
+
+    // Analyze <ds-feedback> for accessibility
+    testA11y('ds-feedback');
+  });
+});
diff --git a/cypress/e2e/privacy.cy.ts b/cypress/e2e/privacy.cy.ts
new file mode 100644
index 0000000000..16e049f701
--- /dev/null
+++ b/cypress/e2e/privacy.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Privacy', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/privacy');
+
+    // Page must first be visible
+    cy.get('ds-privacy').should('be.visible');
+
+    // Analyze <ds-privacy> for accessibility
+    testA11y('ds-privacy');
+  });
+});
diff --git a/cypress/e2e/profile-page.cy.ts b/cypress/e2e/profile-page.cy.ts
new file mode 100644
index 0000000000..911ef33ba5
--- /dev/null
+++ b/cypress/e2e/profile-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Profile page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/profile');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-profile-page').should('be.visible');
+    // Analyze <ds-profile-page> for accessibility issues
+    testA11y('ds-profile-page');
+  });
+});
diff --git a/cypress/e2e/system-wide-alert.cy.ts b/cypress/e2e/system-wide-alert.cy.ts
new file mode 100644
index 0000000000..046bfe619f
--- /dev/null
+++ b/cypress/e2e/system-wide-alert.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('System Wide Alert', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/system-wide-alert');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-system-wide-alert-form').should('be.visible');
+    // Analyze <ds-system-wide-alert-form> for accessibility issues
+    testA11y('ds-system-wide-alert-form');
+  });
+});
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
index d5e6de85d4..79edebd35a 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
@@ -63,7 +63,7 @@
 <p>We reserve the right, but not the obligation, to: (1) monitor the Site for violations of these Terms of Use; (2) take appropriate legal action against anyone who, in our sole discretion, violates the law or these Terms of Use, including without limitation, reporting such user to law enforcement authorities; (3) in our sole discretion and without limitation, refuse, restrict access to, limit the availability of, or disable (to the extent technologically feasible) any of your Contributions or any portion thereof; (4) in our sole discretion and without limitation, notice, or liability, to remove from the Site or otherwise disable all files and content that are excessive in size or are in any way burdensome to our systems; and (5) otherwise manage the Site in a manner designed to protect our rights and property and to facilitate the proper functioning of the Site.</p>
 
 <h2>Privacy policy</h2>
-<p>We care about data privacy and security. Please review our <a [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
+<p>We care about data privacy and security. Please review our <a class="link-contrast" [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
 <p>Please be advised the Site is hosted in {{ 'info.end-user-agreement.hosting-country' | translate }}. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in {{ 'info.end-user-agreement.hosting-country' | translate }}, then through your continued use of the Site, you are transferring your data to {{ 'info.end-user-agreement.hosting-country' | translate }}, and you agree to have your data transferred to and processed in {{ 'info.end-user-agreement.hosting-country' | translate }}.</p>
 
 <h2>Term and termination</h2>
@@ -92,4 +92,4 @@
 <h2>Miscellaneous</h2>
 <p>These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use.</p>
 
-<p><a [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
\ No newline at end of file
+<p><a class="link-contrast" [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a class="link-contrast" href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index 003e6b0d51..58ce7efb02 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -83,9 +83,9 @@
 <p>We may also disclose your personal information:</p>
 <ul>
   <li>To comply with any court order, law, or legal process, including to respond to any government or regulatory request.</li>
-  <li>To enforce or apply our <a [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
+  <li>To enforce or apply our <a class="link-contrast" [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
   <li>If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of the Company, our customers, or others.</li>
 </ul>
 
 <h2>Changes to our privacy policy</h2>
-<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
\ No newline at end of file
+<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index c30bc389cc..24f579cbba 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -31,6 +31,7 @@
       </button>
     </ng-container>
     <button *ngIf="loading"
+            title="{{'loading.default' | translate}}"
             class="list-group-item list-group-item-action border-0 list-entry">
       <ds-loading [showMessage]="false"></ds-loading>
     </button>
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 765b50ae86..b3120c08cd 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -466,3 +466,11 @@ ngb-accordion {
 .mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
 .my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
+
+
+.link-contrast {
+  // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
+  color: darken($link-color, 5%);
+  // We use underline to discern link from text as we can't make color lighter on a white bg
+  text-decoration: underline;
+}

From 69f618e8566445b800b83bcc4604bd2e59a98b28 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 17:13:20 +0200
Subject: [PATCH 0513/1286] [CST-15592] improve tests, add attributes for
 testing, fix wrong references

---
 cypress/e2e/admin-add-new-modals.cy.ts        |  6 ++--
 cypress/e2e/admin-edit-modals.cy.ts           |  6 ++--
 cypress/e2e/admin-export-modals.cy.ts         |  4 +--
 cypress/e2e/admin-search-page.cy.ts           |  3 ++
 cypress/e2e/admin-workflow-page.cy.ts         |  3 ++
 cypress/e2e/bulk-access.cy.ts                 |  7 +++++
 cypress/e2e/health-page.cy.ts                 | 31 +++++++++++++++----
 .../health-page/health-page.component.html    |  4 +--
 .../onclick-menu-item.component.html          |  3 +-
 9 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 6e2e8e6970..565ae154f1 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_community"]').click();
+    cy.get('a[data-test="menu.section.new_community"]').click();
 
     // Analyze <ds-create-community-parent-selector> for accessibility
     testA11y('ds-create-community-parent-selector');
@@ -27,7 +27,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_collection"]').click();
+    cy.get('a[data-test="menu.section.new_collection"]').click();
 
     // Analyze <ds-create-collection-parent-selector> for accessibility
     testA11y('ds-create-collection-parent-selector');
@@ -40,7 +40,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_item"]').click();
+    cy.get('a[data-test="menu.section.new_item"]').click();
 
     // Analyze <ds-create-item-parent-selector> for accessibility
     testA11y('ds-create-item-parent-selector');
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index 256a6d89cb..e96d6ce898 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_community"]').click();
+    cy.get('a[data-test="menu.section.edit_community"]').click();
 
     // Analyze <ds-edit-community-selector> for accessibility
     testA11y('ds-edit-community-selector');
@@ -27,7 +27,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_collection"]').click();
+    cy.get('a[data-test="menu.section.edit_collection"]').click();
 
     // Analyze <ds-edit-collection-selector> for accessibility
     testA11y('ds-edit-collection-selector');
@@ -40,7 +40,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_item"]').click();
+    cy.get('a[data-test="menu.section.edit_item"]').click();
 
     // Analyze <ds-edit-item-selector> for accessibility
     testA11y('ds-edit-item-selector');
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index b611bb8fd5..9f69764d19 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_metadata"]').click();
+    cy.get('a[data-test="menu.section.export_metadata"]').click();
 
     // Analyze <ds-export-metadata-selector> for accessibility
     testA11y('ds-export-metadata-selector');
@@ -27,7 +27,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_batch"]').click();
+    cy.get('a[data-test="menu.section.export_batch"]').click();
 
     // Analyze <ds-export-batch-selector> for accessibility
     testA11y('ds-export-batch-selector');
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
index 2e1d13aa13..4fbf8939fe 100644
--- a/cypress/e2e/admin-search-page.cy.ts
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Search Page', () => {
     cy.get('ds-admin-search-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-search-page> for accessibility issues
     testA11y('ds-admin-search-page');
   });
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
index cd2275f584..c3c235e346 100644
--- a/cypress/e2e/admin-workflow-page.cy.ts
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Workflow Page', () => {
     cy.get('ds-admin-workflow-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-workflow-page> for accessibility issues
     testA11y('ds-admin-workflow-page');
   });
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
index 4d199f53f9..87033e13e4 100644
--- a/cypress/e2e/bulk-access.cy.ts
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -11,6 +11,11 @@ describe('Bulk Access', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-bulk-access').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-bulk-access> for accessibility issues
     testA11y('ds-bulk-access', {
       rules: {
@@ -18,6 +23,8 @@ describe('Bulk Access', () => {
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },
+        // Card titles fail this test currently
+        'heading-order': { enabled: false },
       },
     } as Options);
   });
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 91c68638ea..79ebf4bc04 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -1,13 +1,14 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-describe('Health Page', () => {
-  beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/health');
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-  });
 
+beforeEach(() => {
+  // Must login as an Admin to see the page
+  cy.visit('/health');
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -22,3 +23,21 @@ describe('Health Page', () => {
     } as Options);
   });
 });
+
+describe('Health Page > Info Tab', () => {
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    cy.get('a[data-test="health-page.info-tab"]').click();
+
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index d8cba1d46d..797ca0bc6e 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -3,7 +3,7 @@
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
       <li [ngbNavItem]="'status'" role="presentation">
-        <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
             <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
@@ -11,7 +11,7 @@
         </ng-template>
       </li>
       <li [ngbNavItem]="'info'" role="presentation">
-        <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
             <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 4e68b6c5bc..b8ee6ebe17 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -6,5 +6,6 @@
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
+   [attr.data-test]="item.text"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>

From 2369b27178890b44d79e52ad7d4d02d3dcfff89b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 18:03:26 +0200
Subject: [PATCH 0514/1286] [CST-15592] change health page test target for
 second tab

---
 cypress/e2e/health-page.cy.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 79ebf4bc04..8ae0ef8e97 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -30,8 +30,10 @@ describe('Health Page > Info Tab', () => {
     cy.get('ds-health-page').should('be.visible');
     cy.get('a[data-test="health-page.info-tab"]').click();
 
-    // Analyze <ds-health-page> for accessibility issues
-    testA11y('ds-health-page', {
+    cy.get('ds-health-info').should('be.visible');
+
+    // Analyze <ds-health-info> for accessibility issues
+    testA11y('ds-health-info', {
       rules: {
         // All panels are accordians & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216

From f131ae2f6babf03170f3ee719285456cbfa22392 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 24 Jul 2024 10:30:06 +0200
Subject: [PATCH 0515/1286] [CST-15592] refine health page tests

---
 cypress/e2e/health-page.cy.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 8ae0ef8e97..f23b0bf4ad 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,8 +10,15 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
+    cy.get('ds-health-panel').should('be.visible');
+
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-component').should('be.visible');
+    });
     // Analyze <ds-health-page> for accessibility issues
     testA11y('ds-health-page', {
       rules: {
@@ -26,16 +33,21 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+
+    cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
-    cy.get('a[data-test="health-page.info-tab"]').click();
-
     cy.get('ds-health-info').should('be.visible');
 
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-info-component').should('be.visible');
+    });
+
     // Analyze <ds-health-info> for accessibility issues
     testA11y('ds-health-info', {
       rules: {
-        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // All panels are accordions & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },

From 0e5b924f4266e8c83f2b03e0a8de9347cd45d3b5 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 26 Jul 2024 17:12:15 +0200
Subject: [PATCH 0516/1286] [CST-15592] add interceptor to prevent sudden
 timeout failure

---
 cypress/e2e/health-page.cy.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index f23b0bf4ad..c702fa72d7 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,6 +10,9 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/health').as('status');
+    cy.wait('@status');
+
     cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -33,6 +36,8 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/info').as('info');
+    cy.wait('@info');
 
     cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible

From 55ab43f132864e22396e369184f6c3c8a98e4a53 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 13:15:07 +0200
Subject: [PATCH 0517/1286] [CST-15592] add interceptor for item edit page

---
 cypress/e2e/item-edit.cy.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 60e1b924ee..a0d49a7657 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,6 +9,11 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
+  // This because the edit item page causes often tests to fails due to timeout.
+  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
+  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {

From 2b466bb382553907d743a2cdbed2df3f90782814 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 14:16:47 +0200
Subject: [PATCH 0518/1286] [CST-15592] add interceptor for edit group, fix
 landmark-unique accessibility issue in pagination component

---
 cypress/e2e/edit-group.cy.ts                        | 3 +++
 src/app/shared/pagination/pagination.component.html | 3 ++-
 src/assets/i18n/en.json5                            | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index e43ede978a..ef5adbb89d 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,6 +5,9 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    // Wait for all search components to be loaded
+    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
+    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 9ae978c41b..63a95beacd 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -39,7 +39,8 @@
 
   <div *ngIf="shouldShowBottomPager | async">
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
+      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+                      [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
                       [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 31e45d4624..05f528af07 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1048,6 +1048,8 @@
 
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
+  "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   "browse.startsWith.choose_start": "(Choose start)",

From 813d644b32a28685f8a4205bc383268b2502afdb Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 15:08:31 +0200
Subject: [PATCH 0519/1286] Updated cs messages following review requirements

---
 src/assets/i18n/cs.json5 | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index a957232a89..5e52f751ec 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1475,9 +1475,9 @@
   "auth.messages.token-refresh-failed": "Nepodařilo se obnovit váš přístupový token. Prosím přihlašte se znovu.",
 
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
-  "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
+  "bitstream.download.page": "Nyní se stahuje {{bitstream}}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4308,7 +4308,7 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Zobrazit celý záznam",
+  "item.page.link.full": "Zobrazit úplný záznam",
 
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Zobrazit minimální záznam",
@@ -4344,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "Identifikátor",
+  "item.page.uri": "Permanentní identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Problém:",
+  "iiif.page.issue": "Číslo:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5375,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Vaše zázmany",
+  "mydspace.results.head": "Vaše záznamy",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5387,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádny datum",
+  "mydspace.results.no-date": "Žádné datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -6910,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Předkladatel",
+  "search.filters.applied.f.submitter": "Odesílatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7193,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Předkladatel",
+  "search.filters.filter.submitter.head": "Odesílatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Předkladatel",
+  "search.filters.filter.submitter.placeholder": "Odesílatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat předkladatele",
+  "search.filters.filter.submitter.label": "Hledat odesílatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -8626,7 +8626,6 @@
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nový příspěvek",
 
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
 
@@ -8692,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu předložit.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8707,7 +8706,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Předkladatel",
+  "submission.workflow.tasks.generic.submitter": "Odesílatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",

From 9e985cf2d448d3a720a7ae208f14b7e7475dd7df Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 15:13:14 +0200
Subject: [PATCH 0520/1286] [CST-15592] remove interceptor for edit group

---
 cypress/e2e/edit-group.cy.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index ef5adbb89d..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,9 +5,6 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    // Wait for all search components to be loaded
-    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
-    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {

From 5e5c627b8b4dbafc5454d91e24797f3ef6ef76aa Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:09:51 +0200
Subject: [PATCH 0521/1286] Fixed messages following the PR from the UFAL -
 https://github.com/dataquest-dev/dspace-angular/pull/669/commits/f18d45ce23ea9c42778885f59e5f7d25e548b2e9

---
 src/assets/i18n/cs.json5 | 220 +++++++++++++++++++--------------------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 5e52f751ec..2cb95f10d3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -13,7 +13,7 @@
   "403.help": "Nemáte povolení k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "403.link.home-page": "Take me to the home page",
-  "403.link.home-page": "Přesměrujte mě na domovskou stránku",
+  "403.link.home-page": "Návrat na domovskou stránku",
 
   // "403.forbidden": "Forbidden",
   "403.forbidden": "Přístup zakázán",
@@ -46,7 +46,7 @@
   "error-page.description.500": "Služba je nedostupná",
 
   // "error-page.description.404": "Page not found",
-  "error-page.description.404": "Stránka nebyla nenalezena",
+  "error-page.description.404": "Stránka nebyla nalezena",
 
   // "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": "Při přihlašování přes ORCID došlo k chybě. Ujistěte se, že jste sdíleli e-mailovou adresu připojenou ke svému účtu ORCID s DSpace. Pokud chyba přetrvává, kontaktujte správce",
@@ -67,13 +67,13 @@
   "access-status.unknown.listelement.badge": "Status neznámý",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  "admin.curation-tasks.breadcrumbs": "Kurátorská úloha systému",
+  "admin.curation-tasks.breadcrumbs": "Systémové úlohy správy",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Kurátorská úloha systému",
+  "admin.curation-tasks.title": "Systémové úlohy správy",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Kurátorská úloha systému",
+  "admin.curation-tasks.header": "Systémové úlohy správy",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Registr formátů",
@@ -172,7 +172,7 @@
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Úroveň podpory",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registr formátu souboru",
+  "admin.registries.bitstream-formats.head": "Registr formátů souboru",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Žádné formáty souboru k zobrazení.",
@@ -373,7 +373,7 @@
   "admin.access-control.bulk-access.breadcrumbs": "Hromadná správa přístupu",
 
   // "administrativeBulkAccess.search.results.head": "Search Results",
-  "administrativeBulkAccess.search.results.head": "Prohledávat výsledky",
+  "administrativeBulkAccess.search.results.head": "Výsledky vyhledávání",
 
   // "admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "Hromadná správa přístupu",
@@ -403,7 +403,7 @@
   "admin.access-control.epeople.actions.reset": "Resetovat heslo",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "admin.access-control.epeople.actions.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Uživatelé",
@@ -612,7 +612,7 @@
   "admin.access-control.groups.table.edit.buttons.remove": "Odstranit \"{{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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto jako UUID,",
+  "admin.access-control.groups.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo UUID",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "Úspěšně odstraněna skupina \"{{name}}\"",
@@ -696,7 +696,7 @@
   "admin.access-control.groups.form.members-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  "admin.access-control.groups.form.members-list.headMembers": "Aktuální členové",
+  "admin.access-control.groups.form.members-list.headMembers": "Současní členové",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Hledat",
@@ -738,13 +738,13 @@
   "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Přidat člena jménem \"{{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": "Žádná aktuální aktivní skupina, nejprve zadejte jméno.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "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": "Ve skupině zatím nejsou žádní členové, vyhledejte je a přidejte.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyly nalezeni žádní uživatelé",
+  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Neúspěch: Něco se pokazilo: \"{{cause}}\"",
@@ -801,7 +801,7 @@
   "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Toto je aktuální skupina, nelze přidat.",
 
   // "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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo 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": "Ve skupině zatím nejsou žádné podskupiny.",
@@ -831,7 +831,7 @@
   "admin.notifications.source.breadcrumbs": "Quality Assurance",
 
   // "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.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
   // "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.",
   "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pro přidání nebo odebrání uživatele z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno pro vyhledání uživatele (použijte roletku na levé straně vyhledávacího okna a vyberte, zda chcete prohledávat pomocí metadat nebo e-mailu). Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
@@ -1406,7 +1406,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Prohledávat vše",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktuální členové",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Současní členové",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hledat",
@@ -1448,7 +1448,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Přidat uživatele jménem \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktivní skupina, nejdříve vložte název.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Žádní členové ve skupině, nejdříve vyhledejte a přidejte.",
@@ -1792,7 +1792,7 @@
   "claimed-approved-search-result-list-element.title": "Schváleno",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět vkladateli",
+  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět odesílateli",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
@@ -1815,7 +1815,7 @@
   "collection.create.sub-head": "Vytvořit kolekci pro komunitu {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  "collection.curate.header": "Kurátorovat kolekci: {{collection}}",
+  "collection.curate.header": "Spravovat kolekci: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Zrušit",
@@ -1923,7 +1923,7 @@
   "collection.edit.logo.notifications.add.success": "Nahrání loga kolekce proběhlo úspěšně.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "collection.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo kolekce",
@@ -1948,10 +1948,10 @@
   "collection.edit.tabs.access-control.title": "Úprava kolekce - Řízení přístupu",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  "collection.edit.tabs.curate.head": "Kurátorovat",
+  "collection.edit.tabs.curate.head": "Spravovat",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Upravit kolekci - kurátorovat",
+  "collection.edit.tabs.curate.title": "Upravit kolekci - správa",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Oprávnění",
@@ -2014,7 +2014,7 @@
   "collection.edit.tabs.source.head": "Zdroj obsahu",
 
   // "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": "Vaše změny byly vyřazeny. Chcete-li své změny obnovit, klikněte na tlačítko Zpět",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
@@ -2024,7 +2024,7 @@
   "collection.edit.tabs.source.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata neplatná",
+  "collection.edit.tabs.source.notifications.invalid.title": "Neplatná metadata",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "Vaše změny ve zdroji obsahu této kolekce byly uloženy.",
@@ -2215,7 +2215,7 @@
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  "collection.source.update.notifications.error.content": "Zadané nastavení bylo testováno a nefungovalo.",
+  "collection.source.update.notifications.error.content": "Zadané nastavení bylo otestováno a nefungovalo.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Chyba serveru",
@@ -2262,7 +2262,7 @@
   "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Kurátorství komunity: {{ community }}",
+  "community.curate.header": "Spravovat komunitu: {{ community }}",
 
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Zrušit",
@@ -2295,7 +2295,7 @@
   "community.edit.breadcrumbs": "Upravit komunitu",
 
   // "community.edit.logo.delete.title": "Delete logo",
-  "community.edit.logo.delete.title": "Odstranit logo",
+  "community.edit.logo.delete.title": "Smazat logo",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Zrušit odstranění",
@@ -2310,7 +2310,7 @@
   "community.edit.logo.notifications.add.success": "Nahrání loga komunity proběhlo úspěšně.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "community.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo komunity",
@@ -2335,10 +2335,10 @@
   "community.edit.return": "Zpět",
 
   // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Kurátorovat",
+  "community.edit.tabs.curate.head": "Spravovat",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Upravit komunitu - kurátorovat",
+  "community.edit.tabs.curate.title": "Upravit komunitu - správa",
 
   // "community.edit.tabs.access-control.head": "Access Control",
   "community.edit.tabs.access-control.head": "Řízení přístupu",
@@ -2396,13 +2396,13 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  "comcol-role.edit.submitters.name": "Vkladatelé",
+  "comcol-role.edit.submitters.name": "Odesílatelé",
 
   // "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": "Uživatelé a skupiny, které mají oprávnění ke vkládání nových záznamů do této kolekce.",
@@ -2460,7 +2460,7 @@
   "community.form.errors.title.required": "Zadejte název komunity",
 
   // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Text autorských práv (HTML)",
+  "community.form.rights": "Copyright (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Novinky (HTML)",
@@ -2640,16 +2640,16 @@
   "curation.form.submit": "Start",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  "curation.form.submit.success.head": "Kurátorská úloha byla úspěšně spuštěna",
+  "curation.form.submit.success.head": "Úloha správy byla úspěšně spuštěna",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Budete přesměrováni na příslušnou stránku procesu.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  "curation.form.submit.error.head": "Spuštění kurátorské úlohy se nezdařilo.",
+  "curation.form.submit.error.head": "Spuštění úlohy správy se nezdařilo.",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  "curation.form.submit.error.content": "Při pokusu o spuštění kurátorské úlohy došlo k chybě.",
+  "curation.form.submit.error.content": "Při pokusu o spuštění úlohy správy došlo k chybě.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
   "curation.form.submit.error.invalid-handle": "Nepodařilo se určit handle pro tento objekt",
@@ -3044,7 +3044,7 @@
   "forgot-email.form.success.head": "E-mail pro obnovení hesla odeslán",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální adresu URL a další pokyny.",
+  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální URL a další instrukce.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
   // TODO Source message changed - Revise the translation
@@ -3242,7 +3242,7 @@
   "grant-deny-request-copy.header": "Žádost o kopii dokumentu",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
-  "grant-deny-request-copy.home-page": "Přesměrujte mne na domovskou stránku",
+  "grant-deny-request-copy.home-page": "Návrat na domovskou stránku",
 
   // "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": "Pokud jste jedním z autorů dokumentu <a href='{{ url }}'>{{ name }}</a>, použijte prosím jednu z níže uvedených možností, abyste odpověděli na žádost uživatele.",
@@ -3278,13 +3278,13 @@
   "health-page.info-tab": "Informace",
 
   // "health-page.status-tab": "Status",
-  "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stav",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "Služba kontrolující stav systému je momentálně nedostupná.",
 
   // "health-page.property.status": "Status code",
-  "health-page.property.status": "Kód statusu",
+  "health-page.property.status": "Stavový kód",
 
   // "health-page.section.db.title": "Database",
   "health-page.section.db.title": "Databáze",
@@ -3455,7 +3455,7 @@
   "item.badge.private": "Nedohledatelné",
 
   // "item.badge.withdrawn": "Withdrawn",
-  "item.badge.withdrawn": "Zrušeno",
+  "item.badge.withdrawn": "Vyřazeno",
 
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Svazek",
@@ -3543,10 +3543,10 @@
   "item.edit.bitstreams.headers.name": "Název",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Undo'",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  "item.edit.bitstreams.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.bitstreams.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Chyba při přesunu souborů",
@@ -3558,7 +3558,7 @@
   "item.edit.bitstreams.notifications.move.saved.title": "Změny uloženy",
 
   // "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": "Záznam, na které právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.bitstreams.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Změny jsou zastaralé",
@@ -3651,13 +3651,13 @@
   "item.edit.identifiers.doi.status.MINTED": "Vydáno (nezaregistrováno)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  "item.edit.tabs.status.buttons.register-doi.label": "Registrace nového nebo čekání na nové DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
   "item.edit.tabs.status.buttons.register-doi.button": "Zaregistrujte DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  "item.edit.register-doi.header": "Zaregistrujte nové DOI nebo čekající k registraci",
+  "item.edit.register-doi.header": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
   "item.edit.register-doi.description": "Níže zkontrolujte všechny identifikátory a metadata ve frontě. Zvolte \"Potvrdit\" pro pokračování v registraci DOI nebo \"Zrušit\" pro přerušení procesu.",
@@ -3687,7 +3687,7 @@
   "item.edit.item-mapper.cancel": "Zrušit",
 
   // "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": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tuto záznam na jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
+  "item.edit.item-mapper.description": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tento záznam do jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Mapování do jiných kolekcí - mapovat záznam do kolekcí",
@@ -3768,7 +3768,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
 
   // "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.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z příbuzné entity. Nemůže být zděděna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
+  "item.edit.metadata.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z provázané entity. Nemůže být změněna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Záznam aktuálně neobsahuje žádná metadata. Kliknutím na tlačítko Přidat začněte přidávat hodnotu metadat.",
@@ -3796,11 +3796,11 @@
   "item.edit.metadata.metadatafield.invalid": "Prosím, vyberte platné metadatové pole",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
-  "item.edit.metadata.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.metadata.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Došlo k chybě",
@@ -3809,17 +3809,17 @@
   "item.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  "item.edit.metadata.notifications.invalid.title": "Metadata neplatná",
+  "item.edit.metadata.notifications.invalid.title": "Neplatná metadata",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.metadata.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat této záznamu byly uloženy.",
+  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat tohoto záznamu byly uloženy.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadata uložena",
@@ -3976,16 +3976,16 @@
   "item.edit.relationships.no-relationships": "Žádné vztahy",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  "item.edit.relationships.notifications.discarded.title": "Změny vyřazeny",
+  "item.edit.relationships.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "Chyba při úpravě vztahů",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou vyřazeny, aby se zabránilo konfliktům",
+  "item.edit.relationships.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Změny jsou zastaralé",
@@ -4009,25 +4009,25 @@
   "item.edit.return": "Zpět",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  "item.edit.tabs.bitstreams.head": "Soubor",
+  "item.edit.tabs.bitstreams.head": "Soubory",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Úprava záznamu - soubor",
 
   // "item.edit.tabs.curate.head": "Curate",
-  "item.edit.tabs.curate.head": "Kurátorovat",
+  "item.edit.tabs.curate.head": "Spravovat",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  "item.edit.tabs.curate.title": "Úprava záznamu - Kurátorovat",
+  "item.edit.tabs.curate.title": "Úprava záznamu - spravovat",
 
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  "item.edit.curate.title": "Kurátorovat záznam: {{item}}",
+  "item.edit.curate.title": "Spravovat záznam: {{item}}",
 
   // "item.edit.tabs.access-control.head": "Access Control",
-  "item.edit.tabs.access-control.head": "Kontrola přístupu",
+  "item.edit.tabs.access-control.head": "Řízení přístupu",
 
   // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
-  "item.edit.tabs.access-control.title": "Úprava záznamu - Kontrola přístupu",
+  "item.edit.tabs.access-control.title": "Úprava záznamu - Řízení přístupu",
 
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadata",
@@ -4275,7 +4275,7 @@
   "item.page.collections": "Kolekce",
 
   // "item.page.collections.loading": "Loading...",
-  "item.page.collections.loading": "Načítání...",
+  "item.page.collections.loading": "Načítá se...",
 
   // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "Načíst další",
@@ -4377,7 +4377,7 @@
   "item.page.reinstate": "Request reinstatement",
 
   // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
-  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí právě probíhá zadání nové verze.",
+  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
   "item.page.claim.button": "Prohlásit",
@@ -4585,7 +4585,7 @@
   "item.version.history.table.action.deleteVersion": "Smazat verzi",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.history.table.action.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "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": "Toto není nejnovější verze tohoto záznamu. Nejnovější verzi naleznete <a href='{{destination}}'>zde</a>.",
@@ -4698,7 +4698,7 @@
   "item.version.create.notification.failure": "Nová verze nebyla vytvořena",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.create.notification.inProgress": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Smazat verzi",
@@ -4788,7 +4788,7 @@
   "itemtemplate.edit.metadata.metadatafield.invalid": "Prosím zvolte platné metadatové pole",
 
   // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Chcete-li obnovit své změny, klikněte na tlačítko 'Zpět'.",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
   "itemtemplate.edit.metadata.notifications.discarded.title": "Změny byly zahozeny",
@@ -4797,7 +4797,7 @@
   "itemtemplate.edit.metadata.notifications.error.title": "Vyskytla se chyba",
 
   // "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.content": "Vaše změny nebyly uloženy. Před uložením se ujistěte, že všechna pole jsou platná.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "itemtemplate.edit.metadata.notifications.invalid.title": "Neplatná metadata",
@@ -4812,7 +4812,7 @@
   "itemtemplate.edit.metadata.notifications.saved.content": "Vaše změny v šabloně metadat tohoto záznamu byly uloženy.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uloženy",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uložena",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
   "itemtemplate.edit.metadata.reinstate-button": "Vrátit zpět",
@@ -5043,7 +5043,7 @@
   "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
-  "menu.header.image.logo": "Logo úložiště",
+  "menu.header.image.logo": "Logo repozitáře",
 
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Management menu",
@@ -5119,7 +5119,7 @@
   "menu.section.control_panel": "Ovládací panel",
 
   // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Kurátorská úloha",
+  "menu.section.curation_task": "Úloha správy",
 
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Upravit",
@@ -5165,25 +5165,25 @@
   "menu.section.icon.control_panel": "Sekce menu Ovládací panel",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-  "menu.section.icon.curation_tasks": "Sekce menu Kurátorská úloha",
+  "menu.section.icon.curation_tasks": "Sekce menu úloha správy",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Sekce menu Upravit",
 
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Exportovat sekci menu",
+  "menu.section.icon.export": "Sekce menu Exportovat",
 
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Najít sekci menu",
+  "menu.section.icon.find": "Sekce menu Najít",
 
   // "menu.section.icon.health": "Health check menu section",
-  "menu.section.icon.health": "Kontrola stavu sekce menu",
+  "menu.section.icon.health": "Sekce menu Kontrola stavu",
 
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Importovat sekci menu",
+  "menu.section.icon.import": "Sekce menu Importovat",
 
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Nová sekce menu",
+  "menu.section.icon.new": "Sekce menu Nový",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Připnout postranní panel",
@@ -5260,7 +5260,7 @@
   "menu.section.health": "Stav systému",
 
   // "menu.section.registries": "Registries",
-  "menu.section.registries": "Rejstřík",
+  "menu.section.registries": "Registry",
 
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formát",
@@ -5285,7 +5285,7 @@
   "menu.section.toggle.control_panel": "Přepnout sekci ovládacího panelu",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Přepnout sekci Kurátorská úloha",
+  "menu.section.toggle.curation_task": "Přepnout sekci úloha správy",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Přepnout sekci Úpravy",
@@ -5303,7 +5303,7 @@
   "menu.section.toggle.new": "Přepnout sekci Nová",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Přepnout sekci Rejstříky",
+  "menu.section.toggle.registries": "Přepnout sekci Registry",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Přepnout sekci Statistická úloha",
@@ -5327,7 +5327,7 @@
   "mydspace.description": "",
 
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu vkladateli záznamu.",
+  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu odesílateli záznamu.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Zde vložte svou zprávu...",
@@ -5506,7 +5506,7 @@
   "nav.statistics.header": "Statistika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "nav.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "Nastavení notifikací",
@@ -5810,7 +5810,7 @@
   "orgunit.page.city": "Město",
 
   // "orgunit.page.country": "Country",
-  "orgunit.page.country": "Stát",
+  "orgunit.page.country": "Země",
 
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Datum založení.",
@@ -5892,7 +5892,7 @@
   "person-relationships.search.results.head": "Výsledky vyhledávání osob",
 
   // "person.search.title": "Person Search",
-  "person.search.title": "Vyledatávání osob",
+  "person.search.title": "Vyhledávání osob",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametry",
@@ -6121,7 +6121,7 @@
   "process.overview.delete.clear": "Zrušit výběr mazá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": "Smazává se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
+  "process.overview.delete.processing": "Maže se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
   "process.overview.delete.body": "Určitě chcete smazat {{count}} procesů",
@@ -6512,7 +6512,7 @@
   "register-page.registration.header": "Registrace nového uživatele",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru sbírek pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
+  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru kolekcí pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
 
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-mailová adresa *",
@@ -6880,7 +6880,7 @@
   "search.filters.applied.f.dateIssued.min": "Datum zahájení",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  "search.filters.applied.f.dateSubmitted": "Date vložení",
+  "search.filters.applied.f.dateSubmitted": "Datum vložení",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
   // TODO Source message changed - Revise the translation
@@ -6925,7 +6925,7 @@
   "search.filters.applied.f.supervisedBy": "Zkontrolováno",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  "search.filters.applied.f.withdrawn": "Zrušeno",
+  "search.filters.applied.f.withdrawn": "Vyřazeno",
 
   // "search.filters.applied.operator.equals": "",
   // TODO New key - Add a translation
@@ -7142,10 +7142,10 @@
   "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  "search.filters.filter.organizationAddressCountry.head": "Stát",
+  "search.filters.filter.organizationAddressCountry.head": "Země",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  "search.filters.filter.organizationAddressCountry.placeholder": "Stát",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Země",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
   "search.filters.filter.organizationAddressCountry.label": "Hledat stát",
@@ -7438,10 +7438,10 @@
   "sorting.dc.date.issued.DESC": "Datum vydání sestupně",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  "sorting.dc.date.accessioned.ASC": "Datum přírůstku vzestupně",
+  "sorting.dc.date.accessioned.ASC": "Datum odeslání vzestupně",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  "sorting.dc.date.accessioned.DESC": "Datum přírůstku sestupně",
+  "sorting.dc.date.accessioned.DESC": "Datum odeslání sestupně",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Naposledy upraveno vzestupně",
@@ -8284,7 +8284,7 @@
   "submission.sections.identifiers.info": "Pro tento záznam budou vytvořeny následující identifikátory:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  "submission.sections.identifiers.no_handle": "Tomuto záznamu nybyl přidělen žádný handle.",
+  "submission.sections.identifiers.no_handle": "Tomuto záznamu nebyl přidělen žádný handle.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
   "submission.sections.identifiers.no_doi": "Tomuto záznamu nebylo přiděleno žádné DOI.",
@@ -8446,10 +8446,10 @@
   "submission.sections.upload.form.until-placeholder": "Až do",
 
   // "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": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.nolist": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následujících skupin:",
 
   // "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": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.withlist": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následujících skupin:",
 
   // "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 by dragging & dropping them anywhere on the page.</strong>",
   "submission.sections.upload.info": "Zde najdete všechny soubory, které jsou aktuálně v záznamu. Můžete aktualizovat metadata souborů a podmínky přístupu nebo <strong>nahrát další soubory pouhým přetažením kdekoli na stránku</strong>.",
@@ -8618,7 +8618,7 @@
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  "submission.sections.sherpa.error.message": "Informace ze Sherpa Romeo se nepodařilo načíst.",
+  "submission.sections.sherpa.error.message": "Při načítání informací ze služby Sherpa došlo k chybě",
 
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nově podaný záznam",
@@ -8676,7 +8676,7 @@
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může vkladatel problém odstranit a podání znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může odesílatel problém odstranit a podání znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Popište důvod odmítnutí",
@@ -8691,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl odesílatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8712,7 +8712,7 @@
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Vyžádat si",
+  "submission.workflow.tasks.pool.claim": "Převzít",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Přiřaďte si tento úkol.",
@@ -8909,7 +8909,7 @@
   "uploader.or": ", nebo ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  "uploader.processing": "(nyní je bezpečné tuto stránku zavřít)",
+  "uploader.processing": "Zpracovávám nahrané soubory... (nyní je bezpečné tuto stránku zavřít)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Délka fronty",
@@ -8933,7 +8933,7 @@
   "workflowAdmin.search.results.head": "Spravovat workflow",
 
   // "workflow.search.results.head": "Workflow tasks",
-  "workflow.search.results.head": "Kroky workflow",
+  "workflow.search.results.head": "Úlohy workflow",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Úlohy Workflow a osobního pracovního prostoru",
@@ -8973,22 +8973,22 @@
   "workflow-item.delete.button.confirm": "Smazat",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  "workflow-item.send-back.notification.success.title": "Odesláno zpět vkladateli",
+  "workflow-item.send-back.notification.success.title": "Vráceno zpět odesílateli",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně odeslán zpět vkladateli",
+  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně vrácen zpět odesílateli",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Něco se pokazilo",
 
   // "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": "Záznam ve workflow se nepodařilo odeslat zpět vkladateli",
+  "workflow-item.send-back.notification.error.content": "Záznam ve workflow se nepodařilo vrátit zpět odesílateli",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.title": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.header": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Zrušit",
@@ -9004,7 +9004,7 @@
   "workspace-item.view.breadcrumbs": "Zobrazení pracovního prostoru",
 
   // "workspace-item.view.title": "Workspace View",
-  "workspace-item.view.title": "Zobrazení pracovní prostoru",
+  "workspace-item.view.title": "Zobrazení pracovního prostoru",
 
   // "workspace-item.delete.breadcrumbs": "Workspace Delete",
   "workspace-item.delete.breadcrumbs": "Vymazat obsah pracovního prostoru",
@@ -9337,7 +9337,7 @@
   "person.page.orcid.sync-queue.send.bad-request-error": "Odeslání do ORCID se nezdařilo, protože zdroj odeslaný do registru ORCID není platný",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
-  "person.page.orcid.sync-queue.send.error": "Podání do ORCID se nezdařilo",
+  "person.page.orcid.sync-queue.send.error": "Odeslání do ORCID se nezdařilo",
 
   // "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": "Odeslání do ORCID se nezdařilo, protože zdroj se již nachází v registru ORCID",
@@ -9490,7 +9490,7 @@
   "system-wide-alert-form.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  "system-wide-alert.form.cancel": "Zrušir",
+  "system-wide-alert.form.cancel": "Zrušit",
 
   // "system-wide-alert.form.save": "Save",
   "system-wide-alert.form.save": "Uložit",
@@ -9508,7 +9508,7 @@
   "system-wide-alert.form.label.message": "Obsah upozornění",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočítávací měřič",
+  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočet",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Nápověda: Nastavte odpočítávací měřič. Je-li to povoleno, lze datum nastavit i v budoucnosti a systémový upozornění bude uvádět odpočítávání do nastaveného data. Ve chvíli, kdy skončí odpočítávání, zmizí i odpočítávač z upozornění. Server NEBUDE automaticky zastaven.",
@@ -9643,7 +9643,7 @@
 
   // "vocabulary-treeview.search.form.add": "Add",
   // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Přidat",
 
   // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
   // TODO New key - Add a translation

From 9badd4a4b6261a2abf5ed838f16bb000b1a127f0 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:14:04 +0200
Subject: [PATCH 0522/1286] Updated cs localization for subcommunities and
 subcollections

---
 src/assets/i18n/cs.json5 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 2cb95f10d3..09dd023e8d 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2259,7 +2259,7 @@
   "community.create.notifications.success": "Úspěšně vytvořena komunita",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
+  "community.create.sub-head": "Vytvořit podkomunitu v komunitě {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Spravovat komunitu: {{ community }}",
@@ -2396,7 +2396,7 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
@@ -2421,7 +2421,7 @@
 
   // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
   // TODO Source message changed - Revise the translation
-  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Výchozí čtení pro příchozí soubory je v současné době nastaveno na hodnotu Anonymní.",
@@ -2481,7 +2481,7 @@
   "community.page.news": "Novinky",
 
   // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Dílčí komunity a kolekce",
+  "community.all-lists.head": "Podkomunity a kolekce",
 
   // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
@@ -2927,10 +2927,10 @@
   "error.invalid-search-query": "Vyhledávací dotaz není platný. Další informace o této chybě naleznete v osvědčených postupech <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Chyba při načítání dílčích kolekcí",
+  "error.sub-collections": "Chyba při načítání podkolekcí",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Chyba při načítání dílčích komunit",
+  "error.sub-communities": "Chyba při načítání podkomunit",
 
   // "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": "Při inicializaci sekce došlo k chybě, zkontrolujte prosím konfiguraci vstupního formuláře. Podrobnosti jsou uvedeny níže : <br> <br>",
@@ -4985,10 +4985,10 @@
   "loading.search-results": "Načítají se výsledky vyhledávání...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Načítají se dílčí kolekce...",
+  "loading.sub-collections": "Načítají se podkolekce...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Načítají se dílčí komunity...",
+  "loading.sub-communities": "Načítají se podkomunity...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",

From cd6fda20be8b41f240e1acb92082b63fb9391af2 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 19 Jul 2024 17:41:12 +0200
Subject: [PATCH 0523/1286] [CST-15592] add accessibility tests for following
 pages:

Metadata Import
Batch Import
Processes Overview
New Process
Quality Assurance Sources

(cherry picked from commit e6a7fb852a147e9193fd3164660d12228c36d56a)
---
 cypress/e2e/batch-import-page.cy.ts            | 17 +++++++++++++++++
 cypress/e2e/metadata-import-page.cy.ts         | 17 +++++++++++++++++
 cypress/e2e/new-process.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/processes-overview.cy.ts           | 18 ++++++++++++++++++
 .../e2e/quality-assurance-source-page.cy.ts    | 17 +++++++++++++++++
 .../quality-assurance-source.component.html    |  2 +-
 .../process-overview-table.component.html      |  1 -
 7 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 cypress/e2e/batch-import-page.cy.ts
 create mode 100644 cypress/e2e/metadata-import-page.cy.ts
 create mode 100644 cypress/e2e/new-process.cy.ts
 create mode 100644 cypress/e2e/processes-overview.cy.ts
 create mode 100644 cypress/e2e/quality-assurance-source-page.cy.ts

diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
new file mode 100644
index 0000000000..82660e8e43
--- /dev/null
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Batch Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/batch-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Batch import form must first be visible
+    cy.get('ds-batch-import-page').should('be.visible');
+    // Analyze <ds-batch-import-page> for accessibility issues
+    testA11y('ds-batch-import-page');
+  });
+});
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
new file mode 100644
index 0000000000..3c1d1a91af
--- /dev/null
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/metadata-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Metadata import form must first be visible
+    cy.get('ds-metadata-import-page').should('be.visible');
+    // Analyze <ds-metadata-import-page> for accessibility issues
+    testA11y('ds-metadata-import-page');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
new file mode 100644
index 0000000000..d2a6ab4731
--- /dev/null
+++ b/cypress/e2e/new-process.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('New Process', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes/new');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-new-process').should('be.visible');
+    // Analyze <ds-new-process> for accessibility issues
+    testA11y('ds-new-process');
+  });
+});
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
new file mode 100644
index 0000000000..f0e1ccc3fe
--- /dev/null
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Processes Overview', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    // Process overview must first be visible
+    cy.get('ds-process-overview').should('be.visible');
+    // Analyze <ds-process-overview> for accessibility issues
+    testA11y('ds-process-overview');
+  });
+});
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
new file mode 100644
index 0000000000..beb797df41
--- /dev/null
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Quality Assurance Source Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/notifications/quality-assurance');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Source page must first be visible
+    cy.get('ds-quality-assurance-source-page-component').should('be.visible');
+    // Analyze <ds-quality-assurance-source-page-component> for accessibility issues
+    testA11y('ds-quality-assurance-source-page-component');
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index bf461873a1..faeb571234 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -7,7 +7,7 @@
     </div>
     <div class="row">
       <div class="col-12">
-        <h4 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h4>
+        <h3 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h3>
 
         <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
         <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index b270c33a7b..0d699d9f38 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -44,7 +44,6 @@
               <td>{{tableEntry.info}}</td>
               <td>
                 <button [attr.aria-label]="'process.overview.delete-process' | translate"
-                        aria-hidden="true"
                         (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
                         class="btn btn-outline-danger">
                   <i class="fas fa-trash"></i>

From c3273c8d5e2a15b158548add87b70699781a09f5 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 11:17:34 +0200
Subject: [PATCH 0524/1286] [CST-15592] add accessibility tests for:

Edit Eperson
Edit Group
Create EPerson
Epeople Registry
Groups Registry

(cherry picked from commit a0e3c41be6d7fbf93dc98ce2973831ab3b222b68)
---
 cypress.config.ts                               |  3 +++
 cypress/e2e/create-eperson.cy.ts                | 17 +++++++++++++++++
 cypress/e2e/edit-eperson.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/edit-group.cy.ts                    | 17 +++++++++++++++++
 cypress/e2e/epeople-registry.cy.ts              | 17 +++++++++++++++++
 cypress/e2e/groups-registry.cy.ts               | 17 +++++++++++++++++
 .../context-help-toggle.component.html          |  2 +-
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 cypress/e2e/create-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-group.cy.ts
 create mode 100644 cypress/e2e/epeople-registry.cy.ts
 create mode 100644 cypress/e2e/groups-registry.cy.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index 458b035a48..442dde3607 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -18,6 +18,7 @@ export default defineConfig({
 
     // Admin account used for administrative tests
     DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
     DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
@@ -33,6 +34,8 @@ export default defineConfig({
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+    // Administrator users group
+    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
   },
   e2e: {
     // Setup our plugins for e2e tests
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
new file mode 100644
index 0000000000..b1c5d27dc4
--- /dev/null
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
new file mode 100644
index 0000000000..0fc052472b
--- /dev/null
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
new file mode 100644
index 0000000000..63a5af857b
--- /dev/null
+++ b/cypress/e2e/edit-group.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Group', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
new file mode 100644
index 0000000000..b278350c10
--- /dev/null
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Epeople registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-epeople-registry').should('be.visible');
+    // Analyze <ds-epeople-registry> for accessibility issues
+    testA11y('ds-epeople-registry');
+  });
+});
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
new file mode 100644
index 0000000000..dc97e17c9f
--- /dev/null
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Groups registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-groups-registry').should('be.visible');
+    // Analyze <ds-groups-registry> for accessibility issues
+    testA11y('ds-groups-registry');
+  });
+});
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 1ec2050497..6f04326d56 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,6 +1,6 @@
 <div *ngIf="buttonVisible$ | async">
   <a href="javascript:void(0);"
-     role="button"
+     role="menuitem"
      (click)="onClick()"
      [attr.aria-label]="'nav.context-help-toggle' | translate"
      [title]="'nav.context-help-toggle' | translate"

From 5e9cca13994dd6f77965e4f4cde3cc592b381b65 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 15:47:13 +0200
Subject: [PATCH 0525/1286] [CST-15592] add accessibility tests for:

Admin Notifications Publication Claim
Admin Search Page
Bulk Access
Create Group
Metadata Registry

(cherry picked from commit 85e486438a1aab91856ecd218cdd497a081b4003)
---
 ...notifications-publication-claim-page.cy.ts | 17 +++++++++++++
 cypress/e2e/admin-search-page.cy.ts           | 18 ++++++++++++++
 cypress/e2e/batch-import-page.cy.ts           |  1 -
 cypress/e2e/bulk-access.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/create-eperson.cy.ts              |  3 +--
 cypress/e2e/create-group.cy.ts                | 16 +++++++++++++
 cypress/e2e/edit-eperson.cy.ts                |  3 +--
 cypress/e2e/edit-group.cy.ts                  |  3 +--
 cypress/e2e/epeople-registry.cy.ts            |  3 +--
 cypress/e2e/groups-registry.cy.ts             |  3 +--
 cypress/e2e/metadata-import-page.cy.ts        |  3 +--
 cypress/e2e/metadata-registry.cy.ts           | 16 +++++++++++++
 cypress/e2e/new-process.cy.ts                 |  3 +--
 cypress/e2e/processes-overview.cy.ts          |  3 +--
 .../e2e/quality-assurance-source-page.cy.ts   |  3 +--
 15 files changed, 100 insertions(+), 19 deletions(-)
 create mode 100644 cypress/e2e/admin-notifications-publication-claim-page.cy.ts
 create mode 100644 cypress/e2e/admin-search-page.cy.ts
 create mode 100644 cypress/e2e/bulk-access.cy.ts
 create mode 100644 cypress/e2e/create-group.cy.ts
 create mode 100644 cypress/e2e/metadata-registry.cy.ts

diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
new file mode 100644
index 0000000000..4d297f5c9d
--- /dev/null
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Notifications Publication Claim', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/notifications/publication-claim');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    //Page must first be visible
+    cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
+    // Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
+    testA11y('ds-admin-notifications-publication-claim-page');
+  });
+});
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
new file mode 100644
index 0000000000..2e1d13aa13
--- /dev/null
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Search Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/search');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    //Page must first be visible
+    cy.get('ds-admin-search-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-search-page> for accessibility issues
+    testA11y('ds-admin-search-page');
+  });
+});
diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
index 82660e8e43..871b8644ce 100644
--- a/cypress/e2e/batch-import-page.cy.ts
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Batch Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
     // Must login as an Admin to see processes
     cy.visit('/admin/batch-import');
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
new file mode 100644
index 0000000000..4d199f53f9
--- /dev/null
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Bulk Access', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/bulk-access');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bulk-access').should('be.visible');
+    // Analyze <ds-bulk-access> for accessibility issues
+    testA11y('ds-bulk-access', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
index b1c5d27dc4..d23986ba29 100644
--- a/cypress/e2e/create-eperson.cy.ts
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Create Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/create');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/create-group.cy.ts b/cypress/e2e/create-group.cy.ts
new file mode 100644
index 0000000000..135c041a8d
--- /dev/null
+++ b/cypress/e2e/create-group.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Group', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
index 0fc052472b..166c913b8c 100644
--- a/cypress/e2e/edit-eperson.cy.ts
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index 63a5af857b..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Group', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
index b278350c10..a6192f13d9 100644
--- a/cypress/e2e/epeople-registry.cy.ts
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Epeople registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
index dc97e17c9f..5c0099c2f1 100644
--- a/cypress/e2e/groups-registry.cy.ts
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Groups registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
index 3c1d1a91af..a31c18e4eb 100644
--- a/cypress/e2e/metadata-import-page.cy.ts
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Metadata Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/admin/metadata-import');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
new file mode 100644
index 0000000000..f0f3db48d3
--- /dev/null
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-registry').should('be.visible');
+    // Analyze <ds-metadata-registry> for accessibility issues
+    testA11y('ds-metadata-registry');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
index d2a6ab4731..d26da7cc4d 100644
--- a/cypress/e2e/new-process.cy.ts
+++ b/cypress/e2e/new-process.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('New Process', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes/new');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
index f0e1ccc3fe..2be3bd4c18 100644
--- a/cypress/e2e/processes-overview.cy.ts
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Processes Overview', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
index beb797df41..722917ef16 100644
--- a/cypress/e2e/quality-assurance-source-page.cy.ts
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Quality Assurance Source Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/notifications/quality-assurance');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });

From bae0442ede8be12589377207d92db3c335a1d907 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 17:53:03 +0200
Subject: [PATCH 0526/1286] [CST-15592] add accessibility tests for:

Admin Curation Task
Bitstream Format
Health Page
Metadata Schema

(cherry picked from commit d12d0faf0904e241008c1e8c1f9463e19daf3b91)
---
 cypress/e2e/admin-curation-tasks.cy.ts        | 16 +++++++++++++
 ...notifications-publication-claim-page.cy.ts |  2 +-
 cypress/e2e/bitstreams-format.cy.ts           | 16 +++++++++++++
 cypress/e2e/health-page.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/metadata-registry.cy.ts           |  2 +-
 cypress/e2e/metadata-schema.cy.ts             | 16 +++++++++++++
 6 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 cypress/e2e/admin-curation-tasks.cy.ts
 create mode 100644 cypress/e2e/bitstreams-format.cy.ts
 create mode 100644 cypress/e2e/health-page.cy.ts
 create mode 100644 cypress/e2e/metadata-schema.cy.ts

diff --git a/cypress/e2e/admin-curation-tasks.cy.ts b/cypress/e2e/admin-curation-tasks.cy.ts
new file mode 100644
index 0000000000..e66f0ccaad
--- /dev/null
+++ b/cypress/e2e/admin-curation-tasks.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Curation Tasks', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/curation-tasks');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-curation-task').should('be.visible');
+    // Analyze <ds-admin-curation-task> for accessibility issues
+    testA11y('ds-admin-curation-task');
+  });
+});
diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
index 4d297f5c9d..877a0542e2 100644
--- a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Admin Notifications Publication Claim', () => {
+describe('Admin Notifications Publication Claim Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/notifications/publication-claim');
diff --git a/cypress/e2e/bitstreams-format.cy.ts b/cypress/e2e/bitstreams-format.cy.ts
new file mode 100644
index 0000000000..f113d45ebc
--- /dev/null
+++ b/cypress/e2e/bitstreams-format.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Bitstreams Formats', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/bitstream-formats');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bitstream-formats').should('be.visible');
+    // Analyze <ds-bitstream-formats> for accessibility issues
+    testA11y('ds-bitstream-formats');
+  });
+});
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
new file mode 100644
index 0000000000..91c68638ea
--- /dev/null
+++ b/cypress/e2e/health-page.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Health Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/health');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
index f0f3db48d3..0402d33153 100644
--- a/cypress/e2e/metadata-registry.cy.ts
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Metadata registry', () => {
+describe('Metadata Registry', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/registries/metadata');
diff --git a/cypress/e2e/metadata-schema.cy.ts b/cypress/e2e/metadata-schema.cy.ts
new file mode 100644
index 0000000000..9ff0db0714
--- /dev/null
+++ b/cypress/e2e/metadata-schema.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Schema', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata/dc');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-schema').should('be.visible');
+    // Analyze <ds-metadata-schema> for accessibility issues
+    testA11y('ds-metadata-schema');
+  });
+});

From 48d74ee2cdf8dace9c483980c1bccadd7a90c4ac Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 11:50:47 +0200
Subject: [PATCH 0527/1286] [CST-15592] add accessibility tests for:

Admin Add New Modals
Admin Edit Modals
Admin Export Modals
Admin Workflow Page
End User Agreement
Feedback
Profile Page
System Wide Alert

(cherry picked from commit 4cd55d6669ca5c7e61d7b7e924602dfa477391ae)
---
 cypress/e2e/admin-add-new-modals.cy.ts        | 48 +++++++++++++++++++
 cypress/e2e/admin-edit-modals.cy.ts           | 48 +++++++++++++++++++
 cypress/e2e/admin-export-modals.cy.ts         | 35 ++++++++++++++
 cypress/e2e/admin-workflow-page.cy.ts         | 18 +++++++
 cypress/e2e/end-user-agreement.cy.ts          | 13 +++++
 cypress/e2e/feedback.cy.ts                    | 13 +++++
 cypress/e2e/privacy.cy.ts                     | 13 +++++
 cypress/e2e/profile-page.cy.ts                | 16 +++++++
 cypress/e2e/system-wide-alert.cy.ts           | 16 +++++++
 .../end-user-agreement-content.component.html |  4 +-
 .../privacy-content.component.html            |  4 +-
 .../dso-selector/dso-selector.component.html  |  1 +
 src/styles/_global-styles.scss                |  8 ++++
 13 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 cypress/e2e/admin-add-new-modals.cy.ts
 create mode 100644 cypress/e2e/admin-edit-modals.cy.ts
 create mode 100644 cypress/e2e/admin-export-modals.cy.ts
 create mode 100644 cypress/e2e/admin-workflow-page.cy.ts
 create mode 100644 cypress/e2e/end-user-agreement.cy.ts
 create mode 100644 cypress/e2e/feedback.cy.ts
 create mode 100644 cypress/e2e/privacy.cy.ts
 create mode 100644 cypress/e2e/profile-page.cy.ts
 create mode 100644 cypress/e2e/system-wide-alert.cy.ts

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
new file mode 100644
index 0000000000..6e2e8e6970
--- /dev/null
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Add New Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Add new Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_community"]').click();
+
+    // Analyze <ds-create-community-parent-selector> for accessibility
+    testA11y('ds-create-community-parent-selector');
+  });
+
+  it('Add new Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_collection"]').click();
+
+    // Analyze <ds-create-collection-parent-selector> for accessibility
+    testA11y('ds-create-collection-parent-selector');
+  });
+
+  it('Add new Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_item"]').click();
+
+    // Analyze <ds-create-item-parent-selector> for accessibility
+    testA11y('ds-create-item-parent-selector');
+  });
+});
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
new file mode 100644
index 0000000000..256a6d89cb
--- /dev/null
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Edit Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Edit Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_community"]').click();
+
+    // Analyze <ds-edit-community-selector> for accessibility
+    testA11y('ds-edit-community-selector');
+  });
+
+  it('Edit Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_collection"]').click();
+
+    // Analyze <ds-edit-collection-selector> for accessibility
+    testA11y('ds-edit-collection-selector');
+  });
+
+  it('Edit Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_item"]').click();
+
+    // Analyze <ds-edit-item-selector> for accessibility
+    testA11y('ds-edit-item-selector');
+  });
+});
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
new file mode 100644
index 0000000000..b611bb8fd5
--- /dev/null
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -0,0 +1,35 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Export Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Export metadata modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_metadata"]').click();
+
+    // Analyze <ds-export-metadata-selector> for accessibility
+    testA11y('ds-export-metadata-selector');
+  });
+
+  it('Export batch modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_batch"]').click();
+
+    // Analyze <ds-export-batch-selector> for accessibility
+    testA11y('ds-export-batch-selector');
+  });
+});
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
new file mode 100644
index 0000000000..cd2275f584
--- /dev/null
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Workflow Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/workflow');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-workflow-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-workflow-page> for accessibility issues
+    testA11y('ds-admin-workflow-page');
+  });
+});
diff --git a/cypress/e2e/end-user-agreement.cy.ts b/cypress/e2e/end-user-agreement.cy.ts
new file mode 100644
index 0000000000..989d21ce60
--- /dev/null
+++ b/cypress/e2e/end-user-agreement.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('End User Agreement', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/end-user-agreement');
+
+    // Page must first be visible
+    cy.get('ds-end-user-agreement').should('be.visible');
+
+    // Analyze <ds-end-user-agreement> for accessibility
+    testA11y('ds-end-user-agreement');
+  });
+});
diff --git a/cypress/e2e/feedback.cy.ts b/cypress/e2e/feedback.cy.ts
new file mode 100644
index 0000000000..75fe1097c6
--- /dev/null
+++ b/cypress/e2e/feedback.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Feedback', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/feedback');
+
+    // Page must first be visible
+    cy.get('ds-feedback').should('be.visible');
+
+    // Analyze <ds-feedback> for accessibility
+    testA11y('ds-feedback');
+  });
+});
diff --git a/cypress/e2e/privacy.cy.ts b/cypress/e2e/privacy.cy.ts
new file mode 100644
index 0000000000..16e049f701
--- /dev/null
+++ b/cypress/e2e/privacy.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Privacy', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/privacy');
+
+    // Page must first be visible
+    cy.get('ds-privacy').should('be.visible');
+
+    // Analyze <ds-privacy> for accessibility
+    testA11y('ds-privacy');
+  });
+});
diff --git a/cypress/e2e/profile-page.cy.ts b/cypress/e2e/profile-page.cy.ts
new file mode 100644
index 0000000000..911ef33ba5
--- /dev/null
+++ b/cypress/e2e/profile-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Profile page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/profile');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-profile-page').should('be.visible');
+    // Analyze <ds-profile-page> for accessibility issues
+    testA11y('ds-profile-page');
+  });
+});
diff --git a/cypress/e2e/system-wide-alert.cy.ts b/cypress/e2e/system-wide-alert.cy.ts
new file mode 100644
index 0000000000..046bfe619f
--- /dev/null
+++ b/cypress/e2e/system-wide-alert.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('System Wide Alert', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/system-wide-alert');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-system-wide-alert-form').should('be.visible');
+    // Analyze <ds-system-wide-alert-form> for accessibility issues
+    testA11y('ds-system-wide-alert-form');
+  });
+});
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
index d5e6de85d4..79edebd35a 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
@@ -63,7 +63,7 @@
 <p>We reserve the right, but not the obligation, to: (1) monitor the Site for violations of these Terms of Use; (2) take appropriate legal action against anyone who, in our sole discretion, violates the law or these Terms of Use, including without limitation, reporting such user to law enforcement authorities; (3) in our sole discretion and without limitation, refuse, restrict access to, limit the availability of, or disable (to the extent technologically feasible) any of your Contributions or any portion thereof; (4) in our sole discretion and without limitation, notice, or liability, to remove from the Site or otherwise disable all files and content that are excessive in size or are in any way burdensome to our systems; and (5) otherwise manage the Site in a manner designed to protect our rights and property and to facilitate the proper functioning of the Site.</p>
 
 <h2>Privacy policy</h2>
-<p>We care about data privacy and security. Please review our <a [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
+<p>We care about data privacy and security. Please review our <a class="link-contrast" [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
 <p>Please be advised the Site is hosted in {{ 'info.end-user-agreement.hosting-country' | translate }}. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in {{ 'info.end-user-agreement.hosting-country' | translate }}, then through your continued use of the Site, you are transferring your data to {{ 'info.end-user-agreement.hosting-country' | translate }}, and you agree to have your data transferred to and processed in {{ 'info.end-user-agreement.hosting-country' | translate }}.</p>
 
 <h2>Term and termination</h2>
@@ -92,4 +92,4 @@
 <h2>Miscellaneous</h2>
 <p>These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use.</p>
 
-<p><a [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
\ No newline at end of file
+<p><a class="link-contrast" [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a class="link-contrast" href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index 003e6b0d51..58ce7efb02 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -83,9 +83,9 @@
 <p>We may also disclose your personal information:</p>
 <ul>
   <li>To comply with any court order, law, or legal process, including to respond to any government or regulatory request.</li>
-  <li>To enforce or apply our <a [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
+  <li>To enforce or apply our <a class="link-contrast" [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
   <li>If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of the Company, our customers, or others.</li>
 </ul>
 
 <h2>Changes to our privacy policy</h2>
-<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
\ No newline at end of file
+<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index c30bc389cc..24f579cbba 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -31,6 +31,7 @@
       </button>
     </ng-container>
     <button *ngIf="loading"
+            title="{{'loading.default' | translate}}"
             class="list-group-item list-group-item-action border-0 list-entry">
       <ds-loading [showMessage]="false"></ds-loading>
     </button>
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 765b50ae86..b3120c08cd 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -466,3 +466,11 @@ ngb-accordion {
 .mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
 .my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
+
+
+.link-contrast {
+  // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
+  color: darken($link-color, 5%);
+  // We use underline to discern link from text as we can't make color lighter on a white bg
+  text-decoration: underline;
+}

From 75981cf46e5f10d3186b45c363b86f2749c6a0d9 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 17:13:20 +0200
Subject: [PATCH 0528/1286] [CST-15592] improve tests, add attributes for
 testing, fix wrong references

(cherry picked from commit 69f618e8566445b800b83bcc4604bd2e59a98b28)
---
 cypress/e2e/admin-add-new-modals.cy.ts        |  6 ++--
 cypress/e2e/admin-edit-modals.cy.ts           |  6 ++--
 cypress/e2e/admin-export-modals.cy.ts         |  4 +--
 cypress/e2e/admin-search-page.cy.ts           |  3 ++
 cypress/e2e/admin-workflow-page.cy.ts         |  3 ++
 cypress/e2e/bulk-access.cy.ts                 |  7 +++++
 cypress/e2e/health-page.cy.ts                 | 31 +++++++++++++++----
 .../health-page/health-page.component.html    |  4 +--
 .../onclick-menu-item.component.html          |  3 +-
 9 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 6e2e8e6970..565ae154f1 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_community"]').click();
+    cy.get('a[data-test="menu.section.new_community"]').click();
 
     // Analyze <ds-create-community-parent-selector> for accessibility
     testA11y('ds-create-community-parent-selector');
@@ -27,7 +27,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_collection"]').click();
+    cy.get('a[data-test="menu.section.new_collection"]').click();
 
     // Analyze <ds-create-collection-parent-selector> for accessibility
     testA11y('ds-create-collection-parent-selector');
@@ -40,7 +40,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_item"]').click();
+    cy.get('a[data-test="menu.section.new_item"]').click();
 
     // Analyze <ds-create-item-parent-selector> for accessibility
     testA11y('ds-create-item-parent-selector');
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index 256a6d89cb..e96d6ce898 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_community"]').click();
+    cy.get('a[data-test="menu.section.edit_community"]').click();
 
     // Analyze <ds-edit-community-selector> for accessibility
     testA11y('ds-edit-community-selector');
@@ -27,7 +27,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_collection"]').click();
+    cy.get('a[data-test="menu.section.edit_collection"]').click();
 
     // Analyze <ds-edit-collection-selector> for accessibility
     testA11y('ds-edit-collection-selector');
@@ -40,7 +40,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_item"]').click();
+    cy.get('a[data-test="menu.section.edit_item"]').click();
 
     // Analyze <ds-edit-item-selector> for accessibility
     testA11y('ds-edit-item-selector');
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index b611bb8fd5..9f69764d19 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_metadata"]').click();
+    cy.get('a[data-test="menu.section.export_metadata"]').click();
 
     // Analyze <ds-export-metadata-selector> for accessibility
     testA11y('ds-export-metadata-selector');
@@ -27,7 +27,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_batch"]').click();
+    cy.get('a[data-test="menu.section.export_batch"]').click();
 
     // Analyze <ds-export-batch-selector> for accessibility
     testA11y('ds-export-batch-selector');
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
index 2e1d13aa13..4fbf8939fe 100644
--- a/cypress/e2e/admin-search-page.cy.ts
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Search Page', () => {
     cy.get('ds-admin-search-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-search-page> for accessibility issues
     testA11y('ds-admin-search-page');
   });
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
index cd2275f584..c3c235e346 100644
--- a/cypress/e2e/admin-workflow-page.cy.ts
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Workflow Page', () => {
     cy.get('ds-admin-workflow-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-workflow-page> for accessibility issues
     testA11y('ds-admin-workflow-page');
   });
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
index 4d199f53f9..87033e13e4 100644
--- a/cypress/e2e/bulk-access.cy.ts
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -11,6 +11,11 @@ describe('Bulk Access', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-bulk-access').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-bulk-access> for accessibility issues
     testA11y('ds-bulk-access', {
       rules: {
@@ -18,6 +23,8 @@ describe('Bulk Access', () => {
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },
+        // Card titles fail this test currently
+        'heading-order': { enabled: false },
       },
     } as Options);
   });
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 91c68638ea..79ebf4bc04 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -1,13 +1,14 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-describe('Health Page', () => {
-  beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/health');
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-  });
 
+beforeEach(() => {
+  // Must login as an Admin to see the page
+  cy.visit('/health');
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -22,3 +23,21 @@ describe('Health Page', () => {
     } as Options);
   });
 });
+
+describe('Health Page > Info Tab', () => {
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    cy.get('a[data-test="health-page.info-tab"]').click();
+
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index d8cba1d46d..797ca0bc6e 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -3,7 +3,7 @@
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
       <li [ngbNavItem]="'status'" role="presentation">
-        <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
             <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
@@ -11,7 +11,7 @@
         </ng-template>
       </li>
       <li [ngbNavItem]="'info'" role="presentation">
-        <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
             <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 4e68b6c5bc..b8ee6ebe17 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -6,5 +6,6 @@
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
+   [attr.data-test]="item.text"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>

From a80b324f1fd2840e64dedacdb75a59678d0da499 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 18:03:26 +0200
Subject: [PATCH 0529/1286] [CST-15592] change health page test target for
 second tab

(cherry picked from commit 2369b27178890b44d79e52ad7d4d02d3dcfff89b)
---
 cypress/e2e/health-page.cy.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 79ebf4bc04..8ae0ef8e97 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -30,8 +30,10 @@ describe('Health Page > Info Tab', () => {
     cy.get('ds-health-page').should('be.visible');
     cy.get('a[data-test="health-page.info-tab"]').click();
 
-    // Analyze <ds-health-page> for accessibility issues
-    testA11y('ds-health-page', {
+    cy.get('ds-health-info').should('be.visible');
+
+    // Analyze <ds-health-info> for accessibility issues
+    testA11y('ds-health-info', {
       rules: {
         // All panels are accordians & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216

From dfd698c91449ceace1d93ba6aff933a77357ecb9 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 24 Jul 2024 10:30:06 +0200
Subject: [PATCH 0530/1286] [CST-15592] refine health page tests

(cherry picked from commit f131ae2f6babf03170f3ee719285456cbfa22392)
---
 cypress/e2e/health-page.cy.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 8ae0ef8e97..f23b0bf4ad 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,8 +10,15 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
+    cy.get('ds-health-panel').should('be.visible');
+
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-component').should('be.visible');
+    });
     // Analyze <ds-health-page> for accessibility issues
     testA11y('ds-health-page', {
       rules: {
@@ -26,16 +33,21 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+
+    cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
-    cy.get('a[data-test="health-page.info-tab"]').click();
-
     cy.get('ds-health-info').should('be.visible');
 
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-info-component').should('be.visible');
+    });
+
     // Analyze <ds-health-info> for accessibility issues
     testA11y('ds-health-info', {
       rules: {
-        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // All panels are accordions & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },

From 7a03713783c1b090e8d0df5ddc74d6471f11e082 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 26 Jul 2024 17:12:15 +0200
Subject: [PATCH 0531/1286] [CST-15592] add interceptor to prevent sudden
 timeout failure

(cherry picked from commit 0e5b924f4266e8c83f2b03e0a8de9347cd45d3b5)
---
 cypress/e2e/health-page.cy.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index f23b0bf4ad..c702fa72d7 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,6 +10,9 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/health').as('status');
+    cy.wait('@status');
+
     cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -33,6 +36,8 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/info').as('info');
+    cy.wait('@info');
 
     cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible

From a1bbd32315775091679020580787ac721eb88b9c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 13:15:07 +0200
Subject: [PATCH 0532/1286] [CST-15592] add interceptor for item edit page

(cherry picked from commit 55ab43f132864e22396e369184f6c3c8a98e4a53)
---
 cypress/e2e/item-edit.cy.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 60e1b924ee..a0d49a7657 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,6 +9,11 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
+  // This because the edit item page causes often tests to fails due to timeout.
+  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
+  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {

From 6f6a4994baa47eff840d1cfc2fc29b50d7f09f23 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 14:16:47 +0200
Subject: [PATCH 0533/1286] [CST-15592] add interceptor for edit group, fix
 landmark-unique accessibility issue in pagination component

(cherry picked from commit 2b466bb382553907d743a2cdbed2df3f90782814)
---
 cypress/e2e/edit-group.cy.ts                        | 3 +++
 src/app/shared/pagination/pagination.component.html | 3 ++-
 src/assets/i18n/en.json5                            | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index e43ede978a..ef5adbb89d 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,6 +5,9 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    // Wait for all search components to be loaded
+    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
+    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 9ae978c41b..63a95beacd 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -39,7 +39,8 @@
 
   <div *ngIf="shouldShowBottomPager | async">
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
+      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+                      [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
                       [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 17fbf33b4a..7c106f3c70 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1048,6 +1048,8 @@
 
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
+  "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   "browse.startsWith.choose_start": "(Choose start)",

From 70a38ea0fbeec4f2bb32487fa456d3fe5b6ea520 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 15:13:14 +0200
Subject: [PATCH 0534/1286] [CST-15592] remove interceptor for edit group

(cherry picked from commit 9e985cf2d448d3a720a7ae208f14b7e7475dd7df)
---
 cypress/e2e/edit-group.cy.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index ef5adbb89d..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,9 +5,6 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    // Wait for all search components to be loaded
-    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
-    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {

From 59ba031b1f733aa43576a042ad639f5ded6f7ca3 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 14:47:16 -0500
Subject: [PATCH 0535/1286] Upgrade to Cypress 13

---
 package-lock.json | 74 ++++++++++++++++++++++++-----------------------
 package.json      |  2 +-
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75016e4b85..26724237a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,7 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "12.17.4",
+        "cypress": "^13.14.2",
         "cypress-axe": "^1.4.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
@@ -3989,9 +3989,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.12",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.4.tgz",
+      "integrity": "sha512-eqNHMsxEXuit0sRvvWoGG3/4+Q5qwqjKARWXKM/KoSsKvTNBwWt8pwspg5+TniP3POAZcPPx0O8CiEIQ4e6NWg==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -4000,14 +4000,14 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "http-signature": "~1.3.6",
+        "form-data": "~2.5.0",
+        "http-signature": "~1.4.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "~6.10.3",
+        "qs": "6.13.0",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
@@ -4018,9 +4018,9 @@
       }
     },
     "node_modules/@cypress/request/node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -8200,9 +8200,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
-      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
       "dev": true
     },
     "node_modules/axe-core": {
@@ -10075,21 +10075,20 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "12.17.4",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
-      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
+      "version": "13.14.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.2.tgz",
+      "integrity": "sha512-lsiQrN17vHMB2fnvxIrKLAjOr9bPwsNbPZNrWf99s4u+DVmCY6U+w7O3GGG9FvP4EUVYaDu+guWeNLiUzBrqvA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "2.88.12",
+        "@cypress/request": "^3.0.1",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
-        "buffer": "^5.6.0",
+        "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
@@ -10107,7 +10106,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.0",
+        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -10121,7 +10120,7 @@
         "request-progress": "^3.0.0",
         "semver": "^7.5.3",
         "supports-color": "^8.1.1",
-        "tmp": "~0.2.1",
+        "tmp": "~0.2.3",
         "untildify": "^4.0.0",
         "yauzl": "^2.10.0"
       },
@@ -10129,7 +10128,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
+        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/cypress-axe": {
@@ -10145,12 +10144,6 @@
         "cypress": "^10 || ^11 || ^12 || ^13"
       }
     },
-    "node_modules/cypress/node_modules/@types/node": {
-      "version": "16.18.101",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.101.tgz",
-      "integrity": "sha512-AAsx9Rgz2IzG8KJ6tXd6ndNkVcu+GYB6U/SnFAaokSPNx2N7dcIIfnighYUNumvj6YS2q39Dejz5tT0NCV7CWA==",
-      "dev": true
-    },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -10269,6 +10262,15 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/cypress/node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/cypress/node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -13632,14 +13634,14 @@
       }
     },
     "node_modules/http-signature": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
-      "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
+      "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^2.0.2",
-        "sshpk": "^1.14.1"
+        "sshpk": "^1.18.0"
       },
       "engines": {
         "node": ">=0.10"
@@ -19673,12 +19675,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.10.4",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
-      "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
diff --git a/package.json b/package.json
index 9fdc97ff63..037ab6ba13 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "12.17.4",
+    "cypress": "^13.14.2",
     "cypress-axe": "^1.4.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",

From f9911ce5ba125e28e81cb5338dd887f6d892fe91 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:31:40 -0500
Subject: [PATCH 0536/1286] Ensure Cypress still creates videos in GitHub
 Actions

---
 cypress.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress.config.ts b/cypress.config.ts
index 442dde3607..36d8120342 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  video: true,
   videosFolder: 'cypress/videos',
   screenshotsFolder: 'cypress/screenshots',
   fixturesFolder: 'cypress/fixtures',

From 7aba69edd6c345ad48045748940390eb964a8961 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:32:10 -0500
Subject: [PATCH 0537/1286] Minor changes to login-modal.cy.ts to cleanup CSS
 selectors

---
 cypress/e2e/login-modal.cy.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index ec218e80af..0eb6da8f0f 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -3,31 +3,31 @@ import { testA11y } from 'cypress/support/utils';
 const page = {
   openLoginMenu() {
     // Click the "Log In" dropdown menu in header
-    cy.get('ds-header [data-test="login-menu"]').click();
+    cy.get('[data-test="login-menu"]').click();
   },
   openUserMenu() {
     // Once logged in, click the User menu in header
-    cy.get('ds-header [data-test="user-menu"]').click();
+    cy.get('[data-test="user-menu"]').click();
   },
   submitLoginAndPasswordByPressingButton(email, password) {
     // Enter email
-    cy.get('ds-header [data-test="email"]').type(email);
+    cy.get('[data-test="email"]').type(email);
     // Enter password
-    cy.get('ds-header [data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type(password);
     // Click login button
-    cy.get('ds-header [data-test="login-button"]').click();
+    cy.get('[data-test="login-button"]').click();
   },
   submitLoginAndPasswordByPressingEnter(email, password) {
     // In opened Login modal, fill out email & password, then click Enter
-    cy.get('ds-header [data-test="email"]').type(email);
-    cy.get('ds-header [data-test="password"]').type(password);
-    cy.get('ds-header [data-test="password"]').type('{enter}');
+    cy.get('[data-test="email"]').type(email);
+    cy.get('[data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type('{enter}');
   },
   submitLogoutByPressingButton() {
     // This is the POST command that will actually log us out
     cy.intercept('POST', '/server/api/authn/logout').as('logout');
     // Click logout button
-    cy.get('ds-header [data-test="logout-button"]').click();
+    cy.get('[data-test="logout-button"]').click();
     // Wait until above POST command responds before continuing
     // (This ensures next action waits until logout completes)
     cy.wait('@logout');

From 968c5bda7158e874bb248361e39d39f732996f7d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:03 -0500
Subject: [PATCH 0538/1286] Simplify login CSS selectors

---
 cypress/support/commands.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index b3e3b9630b..8cc2c5c721 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -101,11 +101,11 @@ Cypress.Commands.add('login', login);
  */
 function loginViaForm(email: string, password: string): void {
   // Enter email
-  cy.get('ds-log-in [data-test="email"]').type(email);
+  cy.get('[data-test="email"]').type(email);
   // Enter password
-  cy.get('ds-log-in [data-test="password"]').type(password);
+  cy.get('[data-test="password"]').type(password);
   // Click login button
-  cy.get('ds-log-in [data-test="login-button"]').click();
+  cy.get('[data-test="login-button"]').click();
 }
 // Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
 Cypress.Commands.add('loginViaForm', loginViaForm);

From a012e4cea25423fed9bce67aafaa4e7432c58b41 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:24 -0500
Subject: [PATCH 0539/1286] Test stability fixes. Ensure Item Edit tests wait
 on tabs to load by testing if tab is active. Fix small bug in login-modal
 test.

---
 cypress/e2e/item-edit.cy.ts   | 24 ++++++++++++++++++++++++
 cypress/e2e/login-modal.cy.ts |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index a0d49a7657..45131baace 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -20,6 +20,9 @@ describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="metadata"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="metadata"]').should('have.class', 'active');
+
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
@@ -38,6 +41,9 @@ describe('Edit Item > Status tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="status"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="status"]').should('have.class', 'active');
+
     // <ds-item-status> tag must be loaded
     cy.get('ds-item-status').should('be.visible');
 
@@ -51,6 +57,9 @@ describe('Edit Item > Bitstreams tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="bitstreams"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+
     // <ds-item-bitstreams> tag must be loaded
     cy.get('ds-item-bitstreams').should('be.visible');
 
@@ -75,6 +84,9 @@ describe('Edit Item > Curate tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="curate"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="curate"]').should('have.class', 'active');
+
     // <ds-item-curate> tag must be loaded
     cy.get('ds-item-curate').should('be.visible');
 
@@ -88,6 +100,9 @@ describe('Edit Item > Relationships tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="relationships"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="relationships"]').should('have.class', 'active');
+
     // <ds-item-relationships> tag must be loaded
     cy.get('ds-item-relationships').should('be.visible');
 
@@ -101,6 +116,9 @@ describe('Edit Item > Version History tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="versionhistory"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+
     // <ds-item-version-history> tag must be loaded
     cy.get('ds-item-version-history').should('be.visible');
 
@@ -114,6 +132,9 @@ describe('Edit Item > Access Control tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="access-control"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="access-control"]').should('have.class', 'active');
+
     // <ds-item-access-control> tag must be loaded
     cy.get('ds-item-access-control').should('be.visible');
 
@@ -127,6 +148,9 @@ describe('Edit Item > Collection Mapper tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="mapper"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="mapper"]').should('have.class', 'active');
+
     // <ds-item-collection-mapper> tag must be loaded
     cy.get('ds-item-collection-mapper').should('be.visible');
 
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 0eb6da8f0f..80d36a0309 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -67,7 +67,7 @@ describe('Login Modal', () => {
 
     // Login, and the <ds-log-in> tag should no longer exist
     page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    cy.get('.form-login').should('not.exist');
+    cy.get('ds-log-in').should('not.exist');
 
     // Verify we are still on homepage
     cy.url().should('include', '/home');

From b543b32a373dcae05bfe529f6f8353b627aed15b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 10 Sep 2024 14:18:30 -0500
Subject: [PATCH 0540/1286] Bump cypress-axe to 1.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 26724237a4..c2a146a40e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -116,7 +116,7 @@
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
         "cypress": "^13.14.2",
-        "cypress-axe": "^1.4.0",
+        "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
         "eslint-plugin-deprecation": "^1.4.1",
diff --git a/package.json b/package.json
index 037ab6ba13..30386d0265 100644
--- a/package.json
+++ b/package.json
@@ -203,7 +203,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "cypress": "^13.14.2",
-    "cypress-axe": "^1.4.0",
+    "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",

From 75655f1bb8cad0e56a5a73ba299b473fac05801f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:52:39 +0000
Subject: [PATCH 0541/1286] Bump rollup from 4.18.0 to 4.24.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.18.0 to 4.24.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.18.0...v4.24.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 142 +++++++++++++++++++++++-----------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75016e4b85..36f53e322b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6049,9 +6049,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-      "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -6062,9 +6062,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-      "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -6075,9 +6075,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-      "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -6088,9 +6088,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-      "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -6101,9 +6101,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-      "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -6114,9 +6114,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-      "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -6127,9 +6127,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-      "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -6140,9 +6140,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-      "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -6153,9 +6153,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-      "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -6166,9 +6166,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-      "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -6179,9 +6179,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-      "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -6192,9 +6192,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -6205,9 +6205,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-      "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -6218,9 +6218,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-      "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -6231,9 +6231,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-      "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -6244,9 +6244,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-      "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -6544,9 +6544,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
     "node_modules/@types/express": {
@@ -20588,12 +20588,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-      "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -20603,22 +20603,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.18.0",
-        "@rollup/rollup-android-arm64": "4.18.0",
-        "@rollup/rollup-darwin-arm64": "4.18.0",
-        "@rollup/rollup-darwin-x64": "4.18.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-        "@rollup/rollup-linux-arm64-musl": "4.18.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-gnu": "4.18.0",
-        "@rollup/rollup-linux-x64-musl": "4.18.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-        "@rollup/rollup-win32-x64-msvc": "4.18.0",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },

From b4d932a91b07a781510d4cfa54aad30dfe218c5c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 10:24:42 -0500
Subject: [PATCH 0542/1286] Bump to Cypress 13.5.0

---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2a146a40e..329fcbae33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,7 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.14.2",
+        "cypress": "^13.15.0",
         "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
@@ -10075,13 +10075,13 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.14.2",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.14.2.tgz",
-      "integrity": "sha512-lsiQrN17vHMB2fnvxIrKLAjOr9bPwsNbPZNrWf99s4u+DVmCY6U+w7O3GGG9FvP4EUVYaDu+guWeNLiUzBrqvA==",
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.0.tgz",
+      "integrity": "sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.1",
+        "@cypress/request": "^3.0.4",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
diff --git a/package.json b/package.json
index 30386d0265..96c7ad68bd 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "^13.14.2",
+    "cypress": "^13.15.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",

From 8e1736f608cf96624b09784d5ce639168fee777b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:30:21 +0000
Subject: [PATCH 0543/1286] Bump send, express, browser-sync and serve-static

Bumps [send](https://github.com/pillarjs/send) to 0.19.0 and updates ancestor dependencies [send](https://github.com/pillarjs/send), [express](https://github.com/expressjs/express), [browser-sync](https://github.com/BrowserSync/browser-sync) and [serve-static](https://github.com/expressjs/serve-static). These dependencies need to be updated together.


Updates `send` from 0.18.0 to 0.19.0
- [Release notes](https://github.com/pillarjs/send/releases)
- [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md)
- [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0)

Updates `express` from 4.20.0 to 4.21.0
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.20.0...4.21.0)

Updates `browser-sync` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/BrowserSync/browser-sync/releases)
- [Changelog](https://github.com/BrowserSync/browser-sync/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BrowserSync/browser-sync/compare/v3.0.2...v3.0.3)

Updates `serve-static` from 1.15.0 to 1.16.2
- [Release notes](https://github.com/expressjs/serve-static/releases)
- [Changelog](https://github.com/expressjs/serve-static/blob/v1.16.2/HISTORY.md)
- [Commits](https://github.com/expressjs/serve-static/compare/v1.15.0...v1.16.2)

---
updated-dependencies:
- dependency-name: send
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
- dependency-name: browser-sync
  dependency-type: direct:development
- dependency-name: serve-static
  dependency-type: indirect
...

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

diff --git a/package-lock.json b/package-lock.json
index 36f53e322b..b9e3796570 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.20.0",
+        "express": "^4.21.1",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
@@ -111,7 +111,7 @@
         "@typescript-eslint/rule-tester": "^7.2.0",
         "@typescript-eslint/utils": "^7.2.0",
         "axe-core": "^4.7.2",
-        "browser-sync": "^3.0.0",
+        "browser-sync": "^3.0.3",
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
@@ -8583,13 +8583,13 @@
       }
     },
     "node_modules/browser-sync": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.2.tgz",
-      "integrity": "sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.3.tgz",
+      "integrity": "sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==",
       "dev": true,
       "dependencies": {
-        "browser-sync-client": "^3.0.2",
-        "browser-sync-ui": "^3.0.2",
+        "browser-sync-client": "^3.0.3",
+        "browser-sync-ui": "^3.0.3",
         "bs-recipes": "1.3.4",
         "chalk": "4.1.2",
         "chokidar": "^3.5.1",
@@ -8603,15 +8603,15 @@
         "fs-extra": "3.0.1",
         "http-proxy": "^1.18.1",
         "immutable": "^3",
-        "micromatch": "^4.0.2",
+        "micromatch": "^4.0.8",
         "opn": "5.3.0",
         "portscanner": "2.2.0",
         "raw-body": "^2.3.2",
         "resp-modifier": "6.0.2",
         "rx": "4.1.0",
-        "send": "0.16.2",
-        "serve-index": "1.9.1",
-        "serve-static": "1.13.2",
+        "send": "^0.19.0",
+        "serve-index": "^1.9.1",
+        "serve-static": "^1.16.2",
         "server-destroy": "1.0.1",
         "socket.io": "^4.4.1",
         "ua-parser-js": "^1.0.33",
@@ -8625,9 +8625,9 @@
       }
     },
     "node_modules/browser-sync-client": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.2.tgz",
-      "integrity": "sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.3.tgz",
+      "integrity": "sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==",
       "dev": true,
       "dependencies": {
         "etag": "1.8.1",
@@ -8639,9 +8639,9 @@
       }
     },
     "node_modules/browser-sync-ui": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz",
-      "integrity": "sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz",
+      "integrity": "sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==",
       "dev": true,
       "dependencies": {
         "async-each-series": "0.1.1",
@@ -10954,7 +10954,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -11011,16 +11010,16 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz",
-      "integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
+      "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
       "dev": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
         "ws": "~8.17.1",
-        "xmlhttprequest-ssl": "~2.0.0"
+        "xmlhttprequest-ssl": "~2.1.1"
       }
     },
     "node_modules/engine.io-parser": {
@@ -12260,23 +12259,23 @@
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz",
-      "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==",
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
         "merge-descriptors": "1.0.3",
@@ -12285,11 +12284,11 @@
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
         "send": "0.19.0",
-        "serve-static": "1.16.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -12314,82 +12313,10 @@
         "serve-static": "^1.14.1"
       }
     },
-    "node_modules/express-static-gzip/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express-static-gzip/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/express-static-gzip/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/express-static-gzip/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/express-static-gzip/node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/express-static-gzip/node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -12411,12 +12338,12 @@
       }
     },
     "node_modules/express/node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -12427,36 +12354,17 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/express/node_modules/finalhandler/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -12484,92 +12392,6 @@
         }
       ]
     },
-    "node_modules/express/node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/express/node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/express/node_modules/serve-static": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz",
-      "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/express/node_modules/serve-static/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/serve-static/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/express/node_modules/serve-static/node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -21097,24 +20919,23 @@
       }
     },
     "node_modules/send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -21124,88 +20945,30 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/send/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/send/node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/send/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/send/node_modules/mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true,
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "bin": {
         "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
@@ -21295,20 +21058,27 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "dev": true,
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/server-destroy": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
@@ -21571,14 +21341,14 @@
       }
     },
     "node_modules/socket.io-client": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.5.tgz",
-      "integrity": "sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.0.tgz",
+      "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==",
       "dev": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~6.5.2",
+        "engine.io-client": "~6.6.1",
         "socket.io-parser": "~4.2.4"
       },
       "engines": {
@@ -24257,9 +24027,9 @@
       }
     },
     "node_modules/xmlhttprequest-ssl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
-      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
+      "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
diff --git a/package.json b/package.json
index 9fdc97ff63..39c1259514 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.20.0",
+    "express": "^4.21.1",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
@@ -198,7 +198,7 @@
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",
     "axe-core": "^4.7.2",
-    "browser-sync": "^3.0.0",
+    "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",

From 6671c776b3f59fdcea82736e50855faf9407afec Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 10:33:39 -0500
Subject: [PATCH 0544/1286] Bump rollup from 4.21.2 to 4.24.0

---
 yarn.lock | 175 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 90 insertions(+), 85 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f42bb504fd..4870d05b43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2428,85 +2428,85 @@
   resolved "https://registry.yarnpkg.com/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz#0321d2dd609aaacdb9bace8004d99c72824fb142"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@rollup/rollup-android-arm-eabi@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz#0412834dc423d1ff7be4cb1fc13a86a0cd262c11"
-  integrity sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==
+"@rollup/rollup-android-arm-eabi@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz#1661ff5ea9beb362795304cb916049aba7ac9c54"
+  integrity sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==
 
-"@rollup/rollup-android-arm64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz#baf1a014b13654f3b9e835388df9caf8c35389cb"
-  integrity sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==
+"@rollup/rollup-android-arm64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz#2ffaa91f1b55a0082b8a722525741aadcbd3971e"
+  integrity sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==
 
-"@rollup/rollup-darwin-arm64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz#0a2c364e775acdf1172fe3327662eec7c46e55b1"
-  integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==
+"@rollup/rollup-darwin-arm64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz#627007221b24b8cc3063703eee0b9177edf49c1f"
+  integrity sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==
 
-"@rollup/rollup-darwin-x64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz#a972db75890dfab8df0da228c28993220a468c42"
-  integrity sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==
+"@rollup/rollup-darwin-x64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz#0605506142b9e796c370d59c5984ae95b9758724"
+  integrity sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz#1609d0630ef61109dd19a278353e5176d92e30a1"
-  integrity sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==
+"@rollup/rollup-linux-arm-gnueabihf@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz#62dfd196d4b10c0c2db833897164d2d319ee0cbb"
+  integrity sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==
 
-"@rollup/rollup-linux-arm-musleabihf@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz#3c1dca5f160aa2e79e4b20ff6395eab21804f266"
-  integrity sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==
+"@rollup/rollup-linux-arm-musleabihf@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz#53ce72aeb982f1f34b58b380baafaf6a240fddb3"
+  integrity sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==
 
-"@rollup/rollup-linux-arm64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz#c2fe376e8b04eafb52a286668a8df7c761470ac7"
-  integrity sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==
+"@rollup/rollup-linux-arm64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz#1632990f62a75c74f43e4b14ab3597d7ed416496"
+  integrity sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==
 
-"@rollup/rollup-linux-arm64-musl@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz#e62a4235f01e0f66dbba587c087ca6db8008ec80"
-  integrity sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==
+"@rollup/rollup-linux-arm64-musl@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz#8c03a996efb41e257b414b2e0560b7a21f2d9065"
+  integrity sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==
 
-"@rollup/rollup-linux-powerpc64le-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz#24b3457e75ee9ae5b1c198bd39eea53222a74e54"
-  integrity sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==
+"@rollup/rollup-linux-powerpc64le-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz#5b98729628d5bcc8f7f37b58b04d6845f85c7b5d"
+  integrity sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==
 
-"@rollup/rollup-linux-riscv64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz#38edfba9620fe2ca8116c97e02bd9f2d606bde09"
-  integrity sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==
+"@rollup/rollup-linux-riscv64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz#48e42e41f4cabf3573cfefcb448599c512e22983"
+  integrity sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==
 
-"@rollup/rollup-linux-s390x-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz#a3bfb8bc5f1e802f8c76cff4a4be2e9f9ac36a18"
-  integrity sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==
+"@rollup/rollup-linux-s390x-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz#e0b4f9a966872cb7d3e21b9e412a4b7efd7f0b58"
+  integrity sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==
 
-"@rollup/rollup-linux-x64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz#0dadf34be9199fcdda44b5985a086326344f30ad"
-  integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==
+"@rollup/rollup-linux-x64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz#78144741993100f47bd3da72fce215e077ae036b"
+  integrity sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==
 
-"@rollup/rollup-linux-x64-musl@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz#7b7deddce240400eb87f2406a445061b4fed99a8"
-  integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==
+"@rollup/rollup-linux-x64-musl@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz#d9fe32971883cd1bd858336bd33a1c3ca6146127"
+  integrity sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==
 
-"@rollup/rollup-win32-arm64-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz#a0ca0c5149c2cfb26fab32e6ba3f16996fbdb504"
-  integrity sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==
+"@rollup/rollup-win32-arm64-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz#71fa3ea369316db703a909c790743972e98afae5"
+  integrity sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==
 
-"@rollup/rollup-win32-ia32-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz#aae2886beec3024203dbb5569db3a137bc385f8e"
-  integrity sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==
+"@rollup/rollup-win32-ia32-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz#653f5989a60658e17d7576a3996deb3902e342e2"
+  integrity sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==
 
-"@rollup/rollup-win32-x64-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b"
-  integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==
+"@rollup/rollup-win32-x64-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz#0574d7e87b44ee8511d08cc7f914bcb802b70818"
+  integrity sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
@@ -2710,7 +2710,12 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
   integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
-"@types/estree@1.0.5", "@types/estree@^1.0.5":
+"@types/estree@1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+
+"@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -10335,28 +10340,28 @@ roarr@^7.0.4:
     semver-compare "^1.0.0"
 
 rollup@^4.2.0:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7"
-  integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.24.0.tgz#c14a3576f20622ea6a5c9cad7caca5e6e9555d05"
+  integrity sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==
   dependencies:
-    "@types/estree" "1.0.5"
+    "@types/estree" "1.0.6"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.21.2"
-    "@rollup/rollup-android-arm64" "4.21.2"
-    "@rollup/rollup-darwin-arm64" "4.21.2"
-    "@rollup/rollup-darwin-x64" "4.21.2"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.21.2"
-    "@rollup/rollup-linux-arm-musleabihf" "4.21.2"
-    "@rollup/rollup-linux-arm64-gnu" "4.21.2"
-    "@rollup/rollup-linux-arm64-musl" "4.21.2"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.21.2"
-    "@rollup/rollup-linux-riscv64-gnu" "4.21.2"
-    "@rollup/rollup-linux-s390x-gnu" "4.21.2"
-    "@rollup/rollup-linux-x64-gnu" "4.21.2"
-    "@rollup/rollup-linux-x64-musl" "4.21.2"
-    "@rollup/rollup-win32-arm64-msvc" "4.21.2"
-    "@rollup/rollup-win32-ia32-msvc" "4.21.2"
-    "@rollup/rollup-win32-x64-msvc" "4.21.2"
+    "@rollup/rollup-android-arm-eabi" "4.24.0"
+    "@rollup/rollup-android-arm64" "4.24.0"
+    "@rollup/rollup-darwin-arm64" "4.24.0"
+    "@rollup/rollup-darwin-x64" "4.24.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.24.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.24.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.24.0"
+    "@rollup/rollup-linux-arm64-musl" "4.24.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.24.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.24.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.24.0"
+    "@rollup/rollup-linux-x64-gnu" "4.24.0"
+    "@rollup/rollup-linux-x64-musl" "4.24.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.24.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.24.0"
+    "@rollup/rollup-win32-x64-msvc" "4.24.0"
     fsevents "~2.3.2"
 
 rtl-css-js@^1.13.1:

From 68608a1a8c21acd377d1cb6974d15f53667aa9cb Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 11:18:25 -0500
Subject: [PATCH 0545/1286] Bump to Cypress 13.15.0

---
 package.json |  2 +-
 yarn.lock    | 63 +++++++++++++++++++++-------------------------------
 2 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 75c40857bc..b957980996 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "12.17.4",
+    "cypress": "^13.15.0",
     "cypress-axe": "^1.4.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index 4870d05b43..177cd92c10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1530,10 +1530,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@2.88.12":
-  version "2.88.12"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
-  integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
+"@cypress/request@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63"
+  integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1541,14 +1541,14 @@
     combined-stream "~1.0.6"
     extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
+    form-data "~4.0.0"
+    http-signature "~1.4.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "~6.10.3"
+    qs "6.13.0"
     safe-buffer "^5.1.2"
     tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
@@ -2814,11 +2814,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^16.18.39":
-  version "16.18.108"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.108.tgz#b794e2b2a85b4c12935ea7d0f18641be68b352f9"
-  integrity sha512-fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A==
-
 "@types/parse-json@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
@@ -4113,7 +4108,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.5.0, buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -4818,20 +4813,19 @@ cypress-axe@^1.4.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@12.17.4:
-  version "12.17.4"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c"
-  integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==
+cypress@^13.15.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
+  integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
   dependencies:
-    "@cypress/request" "2.88.12"
+    "@cypress/request" "^3.0.4"
     "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^16.18.39"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
-    buffer "^5.6.0"
+    buffer "^5.7.1"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
@@ -4849,7 +4843,7 @@ cypress@12.17.4:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.0"
+    is-ci "^3.0.1"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -4863,7 +4857,7 @@ cypress@12.17.4:
     request-progress "^3.0.0"
     semver "^7.5.3"
     supports-color "^8.1.1"
-    tmp "~0.2.1"
+    tmp "~0.2.3"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -6213,7 +6207,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-form-data@^4.0.0:
+form-data@^4.0.0, form-data@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
@@ -6750,14 +6744,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+http-signature@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
+  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
-    sshpk "^1.14.1"
+    sshpk "^1.18.0"
 
 http-terminator@^3.2.0:
   version "3.2.0"
@@ -7059,7 +7053,7 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^3.0.0:
+is-ci@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
@@ -9762,13 +9756,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-qs@~6.10.3:
-  version "6.10.5"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
-  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@~6.5.2:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
@@ -11060,7 +11047,7 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.14.1, sshpk@^1.7.0:
+sshpk@^1.18.0, sshpk@^1.7.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
   integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
@@ -11427,7 +11414,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.1, tmp@~0.2.1:
+tmp@^0.2.1, tmp@~0.2.1, tmp@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==

From d9167262ddc09fc5732d1dc480120d1dee0d8079 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 11:19:14 -0500
Subject: [PATCH 0546/1286] Bump cypress-axe to 1.5.0

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b957980996..d0d503d437 100644
--- a/package.json
+++ b/package.json
@@ -172,7 +172,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "cypress": "^13.15.0",
-    "cypress-axe": "^1.4.0",
+    "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
diff --git a/yarn.lock b/yarn.lock
index 177cd92c10..a25c90d17a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4808,7 +4808,7 @@ custom-event@~1.0.0:
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
   integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-cypress-axe@^1.4.0:
+cypress-axe@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==

From b262a3d0f2d66528bec5ecdfb20faf5eefe2a520 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:31:40 -0500
Subject: [PATCH 0547/1286] Ensure Cypress still creates videos in GitHub
 Actions

---
 cypress.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress.config.ts b/cypress.config.ts
index 442dde3607..36d8120342 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  video: true,
   videosFolder: 'cypress/videos',
   screenshotsFolder: 'cypress/screenshots',
   fixturesFolder: 'cypress/fixtures',

From 86f21de0a640f5f168dd66b6b391c03a0d433091 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:32:10 -0500
Subject: [PATCH 0548/1286] Minor changes to login-modal.cy.ts to cleanup CSS
 selectors

---
 cypress/e2e/login-modal.cy.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 3d978dfaca..3fe4658602 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -3,31 +3,31 @@ import { testA11y } from 'cypress/support/utils';
 const page = {
   openLoginMenu() {
     // Click the "Log In" dropdown menu in header
-    cy.get('ds-header [data-test="login-menu"]').click();
+    cy.get('[data-test="login-menu"]').click();
   },
   openUserMenu() {
     // Once logged in, click the User menu in header
-    cy.get('ds-header [data-test="user-menu"]').click();
+    cy.get('[data-test="user-menu"]').click();
   },
   submitLoginAndPasswordByPressingButton(email, password) {
     // Enter email
-    cy.get('ds-header [data-test="email"]').type(email);
+    cy.get('[data-test="email"]').type(email);
     // Enter password
-    cy.get('ds-header [data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type(password);
     // Click login button
-    cy.get('ds-header [data-test="login-button"]').click();
+    cy.get('[data-test="login-button"]').click();
   },
   submitLoginAndPasswordByPressingEnter(email, password) {
     // In opened Login modal, fill out email & password, then click Enter
-    cy.get('ds-header [data-test="email"]').type(email);
-    cy.get('ds-header [data-test="password"]').type(password);
-    cy.get('ds-header [data-test="password"]').type('{enter}');
+    cy.get('[data-test="email"]').type(email);
+    cy.get('[data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type('{enter}');
   },
   submitLogoutByPressingButton() {
     // This is the POST command that will actually log us out
     cy.intercept('POST', '/server/api/authn/logout').as('logout');
     // Click logout button
-    cy.get('ds-header [data-test="logout-button"]').click();
+    cy.get('[data-test="logout-button"]').click();
     // Wait until above POST command responds before continuing
     // (This ensures next action waits until logout completes)
     cy.wait('@logout');

From 976ed6bb0acdeeb3151f234eb3a7507054196d65 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:03 -0500
Subject: [PATCH 0549/1286] Simplify login CSS selectors

---
 cypress/support/commands.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index b3e3b9630b..8cc2c5c721 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -101,11 +101,11 @@ Cypress.Commands.add('login', login);
  */
 function loginViaForm(email: string, password: string): void {
   // Enter email
-  cy.get('ds-log-in [data-test="email"]').type(email);
+  cy.get('[data-test="email"]').type(email);
   // Enter password
-  cy.get('ds-log-in [data-test="password"]').type(password);
+  cy.get('[data-test="password"]').type(password);
   // Click login button
-  cy.get('ds-log-in [data-test="login-button"]').click();
+  cy.get('[data-test="login-button"]').click();
 }
 // Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
 Cypress.Commands.add('loginViaForm', loginViaForm);

From 28fc0924100cd30fdf81971e79bf5c9b4bcac963 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:24 -0500
Subject: [PATCH 0550/1286] Test stability fixes. Ensure Item Edit tests wait
 on tabs to load by testing if tab is active. Fix small bug in login-modal
 test.

---
 cypress/e2e/item-edit.cy.ts   | 24 ++++++++++++++++++++++++
 cypress/e2e/login-modal.cy.ts |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index a0d49a7657..45131baace 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -20,6 +20,9 @@ describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="metadata"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="metadata"]').should('have.class', 'active');
+
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
@@ -38,6 +41,9 @@ describe('Edit Item > Status tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="status"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="status"]').should('have.class', 'active');
+
     // <ds-item-status> tag must be loaded
     cy.get('ds-item-status').should('be.visible');
 
@@ -51,6 +57,9 @@ describe('Edit Item > Bitstreams tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="bitstreams"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+
     // <ds-item-bitstreams> tag must be loaded
     cy.get('ds-item-bitstreams').should('be.visible');
 
@@ -75,6 +84,9 @@ describe('Edit Item > Curate tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="curate"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="curate"]').should('have.class', 'active');
+
     // <ds-item-curate> tag must be loaded
     cy.get('ds-item-curate').should('be.visible');
 
@@ -88,6 +100,9 @@ describe('Edit Item > Relationships tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="relationships"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="relationships"]').should('have.class', 'active');
+
     // <ds-item-relationships> tag must be loaded
     cy.get('ds-item-relationships').should('be.visible');
 
@@ -101,6 +116,9 @@ describe('Edit Item > Version History tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="versionhistory"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+
     // <ds-item-version-history> tag must be loaded
     cy.get('ds-item-version-history').should('be.visible');
 
@@ -114,6 +132,9 @@ describe('Edit Item > Access Control tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="access-control"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="access-control"]').should('have.class', 'active');
+
     // <ds-item-access-control> tag must be loaded
     cy.get('ds-item-access-control').should('be.visible');
 
@@ -127,6 +148,9 @@ describe('Edit Item > Collection Mapper tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="mapper"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="mapper"]').should('have.class', 'active');
+
     // <ds-item-collection-mapper> tag must be loaded
     cy.get('ds-item-collection-mapper').should('be.visible');
 
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 3fe4658602..1d72306acc 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -67,7 +67,7 @@ describe('Login Modal', () => {
 
     // Login, and the <ds-log-in> tag should no longer exist
     page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    cy.get('.form-login').should('not.exist');
+    cy.get('ds-log-in').should('not.exist');
 
     // Verify we are still on homepage
     cy.url().should('include', '/home');

From 7a60cd9aafc50f2e27683e31065f6f4bae20246c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 11:55:32 -0500
Subject: [PATCH 0551/1286] Bump to Cypress 13.15.0

---
 package.json |  2 +-
 yarn.lock    | 85 ++++++++++++++++++++++++++++------------------------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 78f0cc9887..77c232cb91 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "12.17.4",
+    "cypress": "^13.15.0",
     "cypress-axe": "^1.4.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index 2a4fd40b5a..7be663a00f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1658,10 +1658,10 @@
   resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@2.88.12":
-  version "2.88.12"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
-  integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
+"@cypress/request@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63"
+  integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1669,14 +1669,14 @@
     combined-stream "~1.0.6"
     extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
+    form-data "~4.0.0"
+    http-signature "~1.4.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "~6.10.3"
+    qs "6.13.0"
     safe-buffer "^5.1.2"
     tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
@@ -2598,11 +2598,6 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz"
   integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==
 
-"@types/node@^16.18.39":
-  version "16.18.46"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.46.tgz#9f2102d0ba74a318fcbe170cbff5463f119eab59"
-  integrity sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
@@ -3829,7 +3824,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.5.0, buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -4618,20 +4613,19 @@ cypress-axe@^1.4.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.4.0.tgz#e67482bfe9e740796bf77c7823f19781a8a2faff"
   integrity sha512-Ut7NKfzjyKm0BEbt2WxuKtLkIXmx6FD2j0RwdvO/Ykl7GmB/qRQkwbKLk3VP35+83hiIr8GKD04PDdrTK5BnyA==
 
-cypress@12.17.4:
-  version "12.17.4"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c"
-  integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==
+cypress@^13.15.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
+  integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
   dependencies:
-    "@cypress/request" "2.88.12"
+    "@cypress/request" "^3.0.4"
     "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^16.18.39"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
-    buffer "^5.6.0"
+    buffer "^5.7.1"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
@@ -4649,7 +4643,7 @@ cypress@12.17.4:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.0"
+    is-ci "^3.0.1"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -4663,7 +4657,7 @@ cypress@12.17.4:
     request-progress "^3.0.0"
     semver "^7.5.3"
     supports-color "^8.1.1"
-    tmp "~0.2.1"
+    tmp "~0.2.3"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -5989,7 +5983,7 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^4.0.0:
+form-data@^4.0.0, form-data@~4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
@@ -6631,14 +6625,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+http-signature@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
+  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
-    sshpk "^1.14.1"
+    sshpk "^1.18.0"
 
 http-terminator@^3.2.0:
   version "3.2.0"
@@ -6935,9 +6929,9 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^3.0.0:
+is-ci@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
   dependencies:
     ci-info "^3.2.0"
@@ -9725,13 +9719,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-qs@~6.10.3:
-  version "6.10.4"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz"
-  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@~6.5.2:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
@@ -11007,7 +10994,22 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.14.1, sshpk@^1.7.0:
+sshpk@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
   integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
@@ -11319,7 +11321,7 @@ tiny-warning@^1.0.2:
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@0.2.1, tmp@^0.2.1, tmp@~0.2.1:
+tmp@0.2.1, tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -11333,6 +11335,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"

From a4e2c47c51aeaf68dec3893725746e6e8b0aed57 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 11:56:11 -0500
Subject: [PATCH 0552/1286] Bump cypress-axe to 1.5.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 77c232cb91..b21a1bb47b 100644
--- a/package.json
+++ b/package.json
@@ -165,7 +165,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "cypress": "^13.15.0",
-    "cypress-axe": "^1.4.0",
+    "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
diff --git a/yarn.lock b/yarn.lock
index 7be663a00f..e358ab5834 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4608,10 +4608,10 @@ custom-event@~1.0.0:
   resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
   integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-cypress-axe@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.4.0.tgz#e67482bfe9e740796bf77c7823f19781a8a2faff"
-  integrity sha512-Ut7NKfzjyKm0BEbt2WxuKtLkIXmx6FD2j0RwdvO/Ykl7GmB/qRQkwbKLk3VP35+83hiIr8GKD04PDdrTK5BnyA==
+cypress-axe@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
+  integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
 cypress@^13.15.0:
   version "13.15.0"

From 35cc7a8096d6eba44f967d0ba58a4aea72eac8db Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:31:40 -0500
Subject: [PATCH 0553/1286] Ensure Cypress still creates videos in GitHub
 Actions

---
 cypress.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress.config.ts b/cypress.config.ts
index 458b035a48..8bf45db5f0 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  video: true,
   videosFolder: 'cypress/videos',
   screenshotsFolder: 'cypress/screenshots',
   fixturesFolder: 'cypress/fixtures',

From 5621b84284582c6adbf177ff6bea0498ba284350 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 6 Sep 2024 16:32:10 -0500
Subject: [PATCH 0554/1286] Minor changes to login-modal.cy.ts to cleanup CSS
 selectors

---
 cypress/e2e/login-modal.cy.ts | 62 +++++++++++++++++------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 673041e9f3..5ed6fed165 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,37 +1,37 @@
 import { testA11y } from 'cypress/support/utils';
 
 const page = {
-    openLoginMenu() {
-        // Click the "Log In" dropdown menu in header
-        cy.get('ds-themed-header [data-test="login-menu"]').click();
-    },
-    openUserMenu() {
-        // Once logged in, click the User menu in header
-        cy.get('ds-themed-header [data-test="user-menu"]').click();
-    },
-    submitLoginAndPasswordByPressingButton(email, password) {
-        // Enter email
-        cy.get('ds-themed-header [data-test="email"]').type(email);
-        // Enter password
-        cy.get('ds-themed-header [data-test="password"]').type(password);
-        // Click login button
-        cy.get('ds-themed-header [data-test="login-button"]').click();
-    },
-    submitLoginAndPasswordByPressingEnter(email, password) {
-        // In opened Login modal, fill out email & password, then click Enter
-        cy.get('ds-themed-header [data-test="email"]').type(email);
-        cy.get('ds-themed-header [data-test="password"]').type(password);
-        cy.get('ds-themed-header [data-test="password"]').type('{enter}');
-    },
-    submitLogoutByPressingButton() {
-        // This is the POST command that will actually log us out
-        cy.intercept('POST', '/server/api/authn/logout').as('logout');
-        // Click logout button
-        cy.get('ds-themed-header [data-test="logout-button"]').click();
-        // Wait until above POST command responds before continuing
-        // (This ensures next action waits until logout completes)
-        cy.wait('@logout');
-    }
+  openLoginMenu() {
+    // Click the "Log In" dropdown menu in header
+    cy.get('[data-test="login-menu"]').click();
+  },
+  openUserMenu() {
+    // Once logged in, click the User menu in header
+    cy.get('[data-test="user-menu"]').click();
+  },
+  submitLoginAndPasswordByPressingButton(email, password) {
+    // Enter email
+    cy.get('[data-test="email"]').type(email);
+    // Enter password
+    cy.get('[data-test="password"]').type(password);
+    // Click login button
+    cy.get('[data-test="login-button"]').click();
+  },
+  submitLoginAndPasswordByPressingEnter(email, password) {
+    // In opened Login modal, fill out email & password, then click Enter
+    cy.get('[data-test="email"]').type(email);
+    cy.get('[data-test="password"]').type(password);
+    cy.get('[data-test="password"]').type('{enter}');
+  },
+  submitLogoutByPressingButton() {
+    // This is the POST command that will actually log us out
+    cy.intercept('POST', '/server/api/authn/logout').as('logout');
+    // Click logout button
+    cy.get('[data-test="logout-button"]').click();
+    // Wait until above POST command responds before continuing
+    // (This ensures next action waits until logout completes)
+    cy.wait('@logout');
+  },
 };
 
 describe('Login Modal', () => {

From 5636db84a8b46fe5575c5bfb536fda2e1cb3a974 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:03 -0500
Subject: [PATCH 0555/1286] Simplify login CSS selectors

---
 cypress/support/commands.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 7da454e2d0..d433424d6f 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -94,12 +94,12 @@ Cypress.Commands.add('login', login);
  * @param password password to login as
  */
 function loginViaForm(email: string, password: string): void {
-    // Enter email
-    cy.get('ds-log-in [data-test="email"]').type(email);
-    // Enter password
-    cy.get('ds-log-in [data-test="password"]').type(password);
-    // Click login button
-    cy.get('ds-log-in [data-test="login-button"]').click();
+  // Enter email
+  cy.get('[data-test="email"]').type(email);
+  // Enter password
+  cy.get('[data-test="password"]').type(password);
+  // Click login button
+  cy.get('[data-test="login-button"]').click();
 }
 // Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
 Cypress.Commands.add('loginViaForm', loginViaForm);

From bd8659ac116b4780223c2fea833616990a59b1a3 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 9 Sep 2024 16:21:24 -0500
Subject: [PATCH 0556/1286] Test stability fixes. Ensure Item Edit tests wait
 on tabs to load by testing if tab is active. Fix small bug in login-modal
 test.

---
 cypress/e2e/item-edit.cy.ts   | 24 ++++++++++++++++++++++++
 cypress/e2e/login-modal.cy.ts |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 44c8f567bd..9d49cbf224 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -15,6 +15,9 @@ describe('Edit Item > Edit Metadata tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="metadata"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="metadata"]').should('have.class', 'active');
+
         // <ds-edit-item-page> tag must be loaded
         cy.get('ds-edit-item-page').should('be.visible');
 
@@ -33,6 +36,9 @@ describe('Edit Item > Status tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="status"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="status"]').should('have.class', 'active');
+
         // <ds-item-status> tag must be loaded
         cy.get('ds-item-status').should('be.visible');
 
@@ -46,6 +52,9 @@ describe('Edit Item > Bitstreams tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="bitstreams"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+
         // <ds-item-bitstreams> tag must be loaded
         cy.get('ds-item-bitstreams').should('be.visible');
 
@@ -70,6 +79,9 @@ describe('Edit Item > Curate tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="curate"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="curate"]').should('have.class', 'active');
+
         // <ds-item-curate> tag must be loaded
         cy.get('ds-item-curate').should('be.visible');
 
@@ -83,6 +95,9 @@ describe('Edit Item > Relationships tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="relationships"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="relationships"]').should('have.class', 'active');
+
         // <ds-item-relationships> tag must be loaded
         cy.get('ds-item-relationships').should('be.visible');
 
@@ -96,6 +111,9 @@ describe('Edit Item > Version History tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="versionhistory"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+
         // <ds-item-version-history> tag must be loaded
         cy.get('ds-item-version-history').should('be.visible');
 
@@ -109,6 +127,9 @@ describe('Edit Item > Access Control tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="access-control"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="access-control"]').should('have.class', 'active');
+
         // <ds-item-access-control> tag must be loaded
         cy.get('ds-item-access-control').should('be.visible');
 
@@ -122,6 +143,9 @@ describe('Edit Item > Collection Mapper tab', () => {
     it('should pass accessibility tests', () => {
         cy.get('a[data-test="mapper"]').click();
 
+        // Our selected tab should be active
+        cy.get('a[data-test="mapper"]').should('have.class', 'active');
+
         // <ds-item-collection-mapper> tag must be loaded
         cy.get('ds-item-collection-mapper').should('be.visible');
 
diff --git a/cypress/e2e/login-modal.cy.ts b/cypress/e2e/login-modal.cy.ts
index 5ed6fed165..88c69d6dec 100644
--- a/cypress/e2e/login-modal.cy.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -67,7 +67,7 @@ describe('Login Modal', () => {
 
         // Login, and the <ds-log-in> tag should no longer exist
         page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-        cy.get('.form-login').should('not.exist');
+        cy.get('ds-log-in').should('not.exist');
 
         // Verify we are still on homepage
         cy.url().should('include', '/home');

From c6a3794a765a45318b2f65807a07b5278ba196b2 Mon Sep 17 00:00:00 2001
From: Arta Seyedian <arta.seyedian@gmail.com>
Date: Wed, 9 Oct 2024 13:55:39 -0400
Subject: [PATCH 0557/1286] Fixed #3399 - minor typo

---
 .../top-level-community-list.component.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 899d33483d..2a4325428f 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
@@ -11,5 +11,5 @@
     [hideGear]="true">
   </ds-viewable-collection>
 </div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
+<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
 <ds-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-loading></ng-container>

From 46f1d3677dc173043453d86bff2375b3174ac61c Mon Sep 17 00:00:00 2001
From: Arta Seyedian <arta.seyedian@gmail.com>
Date: Wed, 9 Oct 2024 13:55:39 -0400
Subject: [PATCH 0558/1286] Fixed #3399 - minor typo

(cherry picked from commit c6a3794a765a45318b2f65807a07b5278ba196b2)
---
 .../top-level-community-list.component.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 899d33483d..2a4325428f 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
@@ -11,5 +11,5 @@
     [hideGear]="true">
   </ds-viewable-collection>
 </div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
+<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
 <ds-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-loading></ng-container>

From 7be3f1fadacff3b35660f55b54613209f1ed0ed5 Mon Sep 17 00:00:00 2001
From: Arta Seyedian <arta.seyedian@gmail.com>
Date: Wed, 9 Oct 2024 13:55:39 -0400
Subject: [PATCH 0559/1286] Fixed #3399 - minor typo

---
 .../top-level-community-list.component.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b8dd7f8f76..a70baa3c54 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
@@ -11,5 +11,5 @@
     [hideGear]="true">
   </ds-viewable-collection>
 </div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
+<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
 <ds-themed-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-themed-loading></ng-container>

From cfc3269e5dd51bdb94f1152757b03df01b5c691d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 16:41:41 -0500
Subject: [PATCH 0560/1286] Bump send, express, browser-sync and serve-static

---
 package.json |   4 +-
 yarn.lock    | 163 ++++++++++++++-------------------------------------
 2 files changed, 47 insertions(+), 120 deletions(-)

diff --git a/package.json b/package.json
index d0d503d437..633fc19dcc 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.20.0",
+    "express": "^4.21.1",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
@@ -167,7 +167,7 @@
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",
     "axe-core": "^4.7.2",
-    "browser-sync": "^3.0.0",
+    "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
diff --git a/yarn.lock b/yarn.lock
index a25c90d17a..be53086e29 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4027,19 +4027,19 @@ braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browser-sync-client@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-3.0.2.tgz#6fbe9a7aada25cf14c824683e089ec9ace91cfe1"
-  integrity sha512-tBWdfn9L0wd2Pjuz/NWHtNEKthVb1Y67vg8/qyGNtCqetNz5lkDkFnrsx5UhPNPYUO8vci50IWC/BhYaQskDiQ==
+browser-sync-client@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-3.0.3.tgz#6805c6cb56762baabe2e0e2ba31b2476a552f665"
+  integrity sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
 
-browser-sync-ui@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-3.0.2.tgz#8136efcff4ec8cc55084b32b91be02094194f0c4"
-  integrity sha512-V3FwWAI+abVbFLTyJjXJlCMBwjc3GXf/BPGfwO2fMFACWbIGW9/4SrBOFYEOOtqzCjQE0Di+U3VIb7eES4omNA==
+browser-sync-ui@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz#c15ee62d8e9c91470a760fa360651e7b2ad842b3"
+  integrity sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==
   dependencies:
     async-each-series "0.1.1"
     chalk "4.1.2"
@@ -4049,13 +4049,13 @@ browser-sync-ui@^3.0.2:
     socket.io-client "^4.4.1"
     stream-throttle "^0.1.3"
 
-browser-sync@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-3.0.2.tgz#cc763cdbf4180193978fe16ebfc506b910225ae4"
-  integrity sha512-PC9c7aWJFVR4IFySrJxOqLwB9ENn3/TaXCXtAa0SzLwocLN3qMjN+IatbjvtCX92BjNXsY6YWg9Eb7F3Wy255g==
+browser-sync@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-3.0.3.tgz#e82d7a005b47cbf5e5f990bcbe099457eaee3b9a"
+  integrity sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==
   dependencies:
-    browser-sync-client "^3.0.2"
-    browser-sync-ui "^3.0.2"
+    browser-sync-client "^3.0.3"
+    browser-sync-ui "^3.0.3"
     bs-recipes "1.3.4"
     chalk "4.1.2"
     chokidar "^3.5.1"
@@ -4069,15 +4069,15 @@ browser-sync@^3.0.0:
     fs-extra "3.0.1"
     http-proxy "^1.18.1"
     immutable "^3"
-    micromatch "^4.0.2"
+    micromatch "^4.0.8"
     opn "5.3.0"
     portscanner "2.2.0"
     raw-body "^2.3.2"
     resp-modifier "6.0.2"
     rx "4.1.0"
-    send "0.16.2"
-    serve-index "1.9.1"
-    serve-static "1.13.2"
+    send "^0.19.0"
+    serve-index "^1.9.1"
+    serve-static "^1.16.2"
     server-destroy "1.0.1"
     socket.io "^4.4.1"
     ua-parser-js "^1.0.33"
@@ -4576,10 +4576,10 @@ cookie@0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
-  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+cookie@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
+  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
 cookie@~0.4.1:
   version "0.4.2"
@@ -5043,11 +5043,6 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -5909,24 +5904,24 @@ express-static-gzip@^2.1.7:
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.3, express@^4.20.0:
-  version "4.20.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
-  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
+express@^4.17.3, express@^4.21.1:
+  version "4.21.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
+  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
     body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.6.0"
+    cookie "0.7.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.2.0"
+    finalhandler "1.3.1"
     fresh "0.5.2"
     http-errors "2.0.0"
     merge-descriptors "1.0.3"
@@ -5935,11 +5930,11 @@ express@^4.17.3, express@^4.20.0:
     parseurl "~1.3.3"
     path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
-    qs "6.11.0"
+    qs "6.13.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.19.0"
-    serve-static "1.16.0"
+    serve-static "1.16.2"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -6109,13 +6104,13 @@ finalhandler@1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+finalhandler@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
+  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     on-finished "2.4.1"
     parseurl "~1.3.3"
@@ -8156,7 +8151,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8181,11 +8176,6 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
   dependencies:
     mime-db "1.52.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
 mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -9783,7 +9773,7 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
+range-parser@^1.2.1, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -10601,45 +10591,7 @@ semver@~7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-send@0.19.0:
+send@0.19.0, send@^0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
   integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
@@ -10672,7 +10624,7 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-index@1.9.1, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
@@ -10685,35 +10637,15 @@ serve-index@1.9.1, serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+serve-static@1.16.2, serve-static@^1.14.1, serve-static@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
+  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
   dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
-serve-static@1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
-  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
-  dependencies:
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.18.0"
-
-serve-static@^1.14.1:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
+    send "0.19.0"
 
 server-destroy@1.0.1:
   version "1.0.1"
@@ -11104,11 +11036,6 @@ statuses@~1.3.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
   integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
 stream-throttle@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"

From 9a7b2428277cd7b61fce5ebaaa110043982e0086 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 9 Oct 2024 16:55:38 -0500
Subject: [PATCH 0561/1286] Bump send, express and serve-static

---
 package.json |   2 +-
 yarn.lock    | 120 ++++++++++++++++++---------------------------------
 2 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/package.json b/package.json
index b21a1bb47b..3a27c26eb5 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.20.0",
+    "express": "^4.21.1",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index e358ab5834..ff64618397 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3735,19 +3735,19 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-sync-client@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.29.1.tgz"
-  integrity sha512-aESnjt3rU7CZpzjyqzhIC2UJ3MVhzRis7cPKkGbyYWDf/wnbxyRa3fFenF3Qx9061/guY3HHhD67uiTVV26DVg==
+browser-sync-client@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.29.3.tgz#9300b97f42abc2c4f95ca29b5a9781b5c492f14a"
+  integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
 
-browser-sync-ui@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.29.1.tgz"
-  integrity sha512-MB7SAiUgVUrhipO2xyO1sheC9H0+LKXPQ3L1tQWcZ3AgizBnUNKAqDZPSwe4grNSa8o8ImSAwJp7lMS6XYy1Dw==
+browser-sync-ui@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz#35e2ce3b470dce6b7219307cac7278bf324a0f16"
+  integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg==
   dependencies:
     async-each-series "0.1.1"
     chalk "4.1.2"
@@ -3758,14 +3758,13 @@ browser-sync-ui@^2.29.1:
     stream-throttle "^0.1.3"
 
 browser-sync@^2.27.10:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/browser-sync/-/browser-sync-2.29.1.tgz"
-  integrity sha512-WXy9HMJVQaNUTPjmai330E2fnDA6W84l/vBILGkYu9yHXIpWw1gJYjdQWDfEhLFljYUHNTN9jM3GCej2T55m+g==
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.29.3.tgz#c2a3ff00c659eb87a13cae9d7a427e1b4b580ee1"
+  integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg==
   dependencies:
-    browser-sync-client "^2.29.1"
-    browser-sync-ui "^2.29.1"
+    browser-sync-client "^2.29.3"
+    browser-sync-ui "^2.29.3"
     bs-recipes "1.3.4"
-    bs-snippet-injector "^2.0.1"
     chalk "4.1.2"
     chokidar "^3.5.1"
     connect "3.6.6"
@@ -3782,7 +3781,6 @@ browser-sync@^2.27.10:
     micromatch "^4.0.2"
     opn "5.3.0"
     portscanner "2.2.0"
-    qs "^6.11.0"
     raw-body "^2.3.2"
     resp-modifier "6.0.2"
     rx "4.1.0"
@@ -3809,11 +3807,6 @@ bs-recipes@1.3.4:
   resolved "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz"
   integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
 
-bs-snippet-injector@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz"
-  integrity sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
@@ -4365,14 +4358,14 @@ cookie@0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
-  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+cookie@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
+  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
 cookie@~0.4.1:
   version "0.4.2"
-  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
 copy-anything@^2.0.1:
@@ -5694,24 +5687,24 @@ express-static-gzip@^2.1.7:
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.3, express@^4.18.2, express@^4.20.0:
-  version "4.20.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
-  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
+express@^4.17.3, express@^4.18.2, express@^4.21.1:
+  version "4.21.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
+  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
     body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.6.0"
+    cookie "0.7.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.2.0"
+    finalhandler "1.3.1"
     fresh "0.5.2"
     http-errors "2.0.0"
     merge-descriptors "1.0.3"
@@ -5720,11 +5713,11 @@ express@^4.17.3, express@^4.18.2, express@^4.20.0:
     parseurl "~1.3.3"
     path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
-    qs "6.11.0"
+    qs "6.13.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.19.0"
-    serve-static "1.16.0"
+    serve-static "1.16.2"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -5882,7 +5875,7 @@ fill-range@^7.1.1:
 
 finalhandler@1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
   integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
   dependencies:
     debug "2.6.9"
@@ -5895,7 +5888,7 @@ finalhandler@1.1.0:
 
 finalhandler@1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
@@ -5906,13 +5899,13 @@ finalhandler@1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+finalhandler@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
+  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     on-finished "2.4.1"
     parseurl "~1.3.3"
@@ -9705,7 +9698,7 @@ qjobs@^1.2.0:
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.11.0, qs@^6.11.0:
+qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
@@ -10539,7 +10532,7 @@ semver@~7.0.0:
 
 send@0.16.2:
   version "0.16.2"
-  resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
   integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
@@ -10556,25 +10549,6 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -10623,7 +10597,7 @@ serve-index@1.9.1, serve-index@^1.9.1:
 
 serve-static@1.13.2:
   version "1.13.2"
-  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
@@ -10631,25 +10605,15 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
-  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
+serve-static@1.16.2, serve-static@^1.14.1:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
+  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
   dependencies:
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.18.0"
-
-serve-static@^1.14.1:
-  version "1.15.0"
-  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
+    send "0.19.0"
 
 server-destroy@1.0.1:
   version "1.0.1"

From 64855c9cf86345b4dd81379a0eab34c05b472595 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 19 Jul 2024 17:41:12 +0200
Subject: [PATCH 0562/1286] [CST-15592] add accessibility tests for following
 pages:

Metadata Import
Batch Import
Processes Overview
New Process
Quality Assurance Sources
---
 cypress/e2e/batch-import-page.cy.ts            | 17 +++++++++++++++++
 cypress/e2e/metadata-import-page.cy.ts         | 17 +++++++++++++++++
 cypress/e2e/new-process.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/processes-overview.cy.ts           | 18 ++++++++++++++++++
 .../e2e/quality-assurance-source-page.cy.ts    | 17 +++++++++++++++++
 5 files changed, 86 insertions(+)
 create mode 100644 cypress/e2e/batch-import-page.cy.ts
 create mode 100644 cypress/e2e/metadata-import-page.cy.ts
 create mode 100644 cypress/e2e/new-process.cy.ts
 create mode 100644 cypress/e2e/processes-overview.cy.ts
 create mode 100644 cypress/e2e/quality-assurance-source-page.cy.ts

diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
new file mode 100644
index 0000000000..82660e8e43
--- /dev/null
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Batch Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/batch-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Batch import form must first be visible
+    cy.get('ds-batch-import-page').should('be.visible');
+    // Analyze <ds-batch-import-page> for accessibility issues
+    testA11y('ds-batch-import-page');
+  });
+});
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
new file mode 100644
index 0000000000..3c1d1a91af
--- /dev/null
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Import Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/admin/metadata-import');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Metadata import form must first be visible
+    cy.get('ds-metadata-import-page').should('be.visible');
+    // Analyze <ds-metadata-import-page> for accessibility issues
+    testA11y('ds-metadata-import-page');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
new file mode 100644
index 0000000000..d2a6ab4731
--- /dev/null
+++ b/cypress/e2e/new-process.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('New Process', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes/new');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-new-process').should('be.visible');
+    // Analyze <ds-new-process> for accessibility issues
+    testA11y('ds-new-process');
+  });
+});
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
new file mode 100644
index 0000000000..f0e1ccc3fe
--- /dev/null
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Processes Overview', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/processes');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    // Process overview must first be visible
+    cy.get('ds-process-overview').should('be.visible');
+    // Analyze <ds-process-overview> for accessibility issues
+    testA11y('ds-process-overview');
+  });
+});
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
new file mode 100644
index 0000000000..beb797df41
--- /dev/null
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Quality Assurance Source Page', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/notifications/quality-assurance');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Source page must first be visible
+    cy.get('ds-quality-assurance-source-page-component').should('be.visible');
+    // Analyze <ds-quality-assurance-source-page-component> for accessibility issues
+    testA11y('ds-quality-assurance-source-page-component');
+  });
+});

From f904c0f67df0771634b5d053d9cc534828719960 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 11:17:34 +0200
Subject: [PATCH 0563/1286] [CST-15592] add accessibility tests for:

Edit Eperson
Edit Group
Create EPerson
Epeople Registry
Groups Registry
---
 cypress.config.ts                               |  3 +++
 cypress/e2e/create-eperson.cy.ts                | 17 +++++++++++++++++
 cypress/e2e/edit-eperson.cy.ts                  | 17 +++++++++++++++++
 cypress/e2e/edit-group.cy.ts                    | 17 +++++++++++++++++
 cypress/e2e/epeople-registry.cy.ts              | 17 +++++++++++++++++
 cypress/e2e/groups-registry.cy.ts               | 17 +++++++++++++++++
 .../context-help-toggle.component.html          |  2 +-
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 cypress/e2e/create-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-eperson.cy.ts
 create mode 100644 cypress/e2e/edit-group.cy.ts
 create mode 100644 cypress/e2e/epeople-registry.cy.ts
 create mode 100644 cypress/e2e/groups-registry.cy.ts

diff --git a/cypress.config.ts b/cypress.config.ts
index 8bf45db5f0..36d8120342 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -19,6 +19,7 @@ export default defineConfig({
 
     // Admin account used for administrative tests
     DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
     DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
     // Community/collection/publication used for view/edit tests
     DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
@@ -34,6 +35,8 @@ export default defineConfig({
     // Account used to test basic submission process
     DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+    // Administrator users group
+    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
   },
   e2e: {
     // Setup our plugins for e2e tests
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
new file mode 100644
index 0000000000..b1c5d27dc4
--- /dev/null
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
new file mode 100644
index 0000000000..0fc052472b
--- /dev/null
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Eperson', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-eperson-form').should('be.visible');
+    // Analyze <ds-eperson-form> for accessibility issues
+    testA11y('ds-eperson-form');
+  });
+});
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
new file mode 100644
index 0000000000..63a5af857b
--- /dev/null
+++ b/cypress/e2e/edit-group.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Edit Group', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
new file mode 100644
index 0000000000..b278350c10
--- /dev/null
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Epeople registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/epeople');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-epeople-registry').should('be.visible');
+    // Analyze <ds-epeople-registry> for accessibility issues
+    testA11y('ds-epeople-registry');
+  });
+});
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
new file mode 100644
index 0000000000..dc97e17c9f
--- /dev/null
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Groups registry', () => {
+  // NOTE: these tests currently assume this query will return results!
+  beforeEach(() => {
+    // Must login as an Admin to see processes
+    cy.visit('/access-control/groups');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Epeople registry page must first be visible
+    cy.get('ds-groups-registry').should('be.visible');
+    // Analyze <ds-groups-registry> for accessibility issues
+    testA11y('ds-groups-registry');
+  });
+});
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 1ec2050497..6f04326d56 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,6 +1,6 @@
 <div *ngIf="buttonVisible$ | async">
   <a href="javascript:void(0);"
-     role="button"
+     role="menuitem"
      (click)="onClick()"
      [attr.aria-label]="'nav.context-help-toggle' | translate"
      [title]="'nav.context-help-toggle' | translate"

From ecd2275e1bcfe3a84ff7c0dc513c1083ef77cd64 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 15:47:13 +0200
Subject: [PATCH 0564/1286] [CST-15592] add accessibility tests for:

Admin Notifications Publication Claim
Admin Search Page
Bulk Access
Create Group
Metadata Registry
---
 ...notifications-publication-claim-page.cy.ts | 17 +++++++++++++
 cypress/e2e/admin-search-page.cy.ts           | 18 ++++++++++++++
 cypress/e2e/batch-import-page.cy.ts           |  1 -
 cypress/e2e/bulk-access.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/create-eperson.cy.ts              |  3 +--
 cypress/e2e/create-group.cy.ts                | 16 +++++++++++++
 cypress/e2e/edit-eperson.cy.ts                |  3 +--
 cypress/e2e/edit-group.cy.ts                  |  3 +--
 cypress/e2e/epeople-registry.cy.ts            |  3 +--
 cypress/e2e/groups-registry.cy.ts             |  3 +--
 cypress/e2e/metadata-import-page.cy.ts        |  3 +--
 cypress/e2e/metadata-registry.cy.ts           | 16 +++++++++++++
 cypress/e2e/new-process.cy.ts                 |  3 +--
 cypress/e2e/processes-overview.cy.ts          |  3 +--
 .../e2e/quality-assurance-source-page.cy.ts   |  3 +--
 15 files changed, 100 insertions(+), 19 deletions(-)
 create mode 100644 cypress/e2e/admin-notifications-publication-claim-page.cy.ts
 create mode 100644 cypress/e2e/admin-search-page.cy.ts
 create mode 100644 cypress/e2e/bulk-access.cy.ts
 create mode 100644 cypress/e2e/create-group.cy.ts
 create mode 100644 cypress/e2e/metadata-registry.cy.ts

diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
new file mode 100644
index 0000000000..4d297f5c9d
--- /dev/null
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Notifications Publication Claim', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/notifications/publication-claim');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+
+    //Page must first be visible
+    cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
+    // Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
+    testA11y('ds-admin-notifications-publication-claim-page');
+  });
+});
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
new file mode 100644
index 0000000000..2e1d13aa13
--- /dev/null
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Search Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/search');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    //Page must first be visible
+    cy.get('ds-admin-search-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-search-page> for accessibility issues
+    testA11y('ds-admin-search-page');
+  });
+});
diff --git a/cypress/e2e/batch-import-page.cy.ts b/cypress/e2e/batch-import-page.cy.ts
index 82660e8e43..871b8644ce 100644
--- a/cypress/e2e/batch-import-page.cy.ts
+++ b/cypress/e2e/batch-import-page.cy.ts
@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Batch Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
     // Must login as an Admin to see processes
     cy.visit('/admin/batch-import');
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
new file mode 100644
index 0000000000..4d199f53f9
--- /dev/null
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Bulk Access', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/bulk-access');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bulk-access').should('be.visible');
+    // Analyze <ds-bulk-access> for accessibility issues
+    testA11y('ds-bulk-access', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/create-eperson.cy.ts b/cypress/e2e/create-eperson.cy.ts
index b1c5d27dc4..d23986ba29 100644
--- a/cypress/e2e/create-eperson.cy.ts
+++ b/cypress/e2e/create-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Create Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/create');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/create-group.cy.ts b/cypress/e2e/create-group.cy.ts
new file mode 100644
index 0000000000..135c041a8d
--- /dev/null
+++ b/cypress/e2e/create-group.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Create Group', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/access-control/groups/create');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Form must first be visible
+    cy.get('ds-group-form').should('be.visible');
+    // Analyze <ds-group-form> for accessibility issues
+    testA11y('ds-group-form');
+  });
+});
diff --git a/cypress/e2e/edit-eperson.cy.ts b/cypress/e2e/edit-eperson.cy.ts
index 0fc052472b..166c913b8c 100644
--- a/cypress/e2e/edit-eperson.cy.ts
+++ b/cypress/e2e/edit-eperson.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Eperson', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index 63a5af857b..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Edit Group', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/epeople-registry.cy.ts b/cypress/e2e/epeople-registry.cy.ts
index b278350c10..a6192f13d9 100644
--- a/cypress/e2e/epeople-registry.cy.ts
+++ b/cypress/e2e/epeople-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Epeople registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/epeople');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/groups-registry.cy.ts b/cypress/e2e/groups-registry.cy.ts
index dc97e17c9f..5c0099c2f1 100644
--- a/cypress/e2e/groups-registry.cy.ts
+++ b/cypress/e2e/groups-registry.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Groups registry', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/access-control/groups');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-import-page.cy.ts b/cypress/e2e/metadata-import-page.cy.ts
index 3c1d1a91af..a31c18e4eb 100644
--- a/cypress/e2e/metadata-import-page.cy.ts
+++ b/cypress/e2e/metadata-import-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Metadata Import Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/admin/metadata-import');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
new file mode 100644
index 0000000000..f0f3db48d3
--- /dev/null
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata registry', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-registry').should('be.visible');
+    // Analyze <ds-metadata-registry> for accessibility issues
+    testA11y('ds-metadata-registry');
+  });
+});
diff --git a/cypress/e2e/new-process.cy.ts b/cypress/e2e/new-process.cy.ts
index d2a6ab4731..d26da7cc4d 100644
--- a/cypress/e2e/new-process.cy.ts
+++ b/cypress/e2e/new-process.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('New Process', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes/new');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/processes-overview.cy.ts b/cypress/e2e/processes-overview.cy.ts
index f0e1ccc3fe..2be3bd4c18 100644
--- a/cypress/e2e/processes-overview.cy.ts
+++ b/cypress/e2e/processes-overview.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Processes Overview', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/processes');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
index beb797df41..722917ef16 100644
--- a/cypress/e2e/quality-assurance-source-page.cy.ts
+++ b/cypress/e2e/quality-assurance-source-page.cy.ts
@@ -1,9 +1,8 @@
 import { testA11y } from 'cypress/support/utils';
 
 describe('Quality Assurance Source Page', () => {
-  // NOTE: these tests currently assume this query will return results!
   beforeEach(() => {
-    // Must login as an Admin to see processes
+    // Must login as an Admin to see the page
     cy.visit('/notifications/quality-assurance');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
   });

From 2ad9a44b99cbaedf22a6133c816b4cb39fe7d67f Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 22 Jul 2024 17:53:03 +0200
Subject: [PATCH 0565/1286] [CST-15592] add accessibility tests for:

Admin Curation Task
Bitstream Format
Health Page
Metadata Schema
---
 cypress/e2e/admin-curation-tasks.cy.ts        | 16 +++++++++++++
 ...notifications-publication-claim-page.cy.ts |  2 +-
 cypress/e2e/bitstreams-format.cy.ts           | 16 +++++++++++++
 cypress/e2e/health-page.cy.ts                 | 24 +++++++++++++++++++
 cypress/e2e/metadata-registry.cy.ts           |  2 +-
 cypress/e2e/metadata-schema.cy.ts             | 16 +++++++++++++
 6 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 cypress/e2e/admin-curation-tasks.cy.ts
 create mode 100644 cypress/e2e/bitstreams-format.cy.ts
 create mode 100644 cypress/e2e/health-page.cy.ts
 create mode 100644 cypress/e2e/metadata-schema.cy.ts

diff --git a/cypress/e2e/admin-curation-tasks.cy.ts b/cypress/e2e/admin-curation-tasks.cy.ts
new file mode 100644
index 0000000000..e66f0ccaad
--- /dev/null
+++ b/cypress/e2e/admin-curation-tasks.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Curation Tasks', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/curation-tasks');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-curation-task').should('be.visible');
+    // Analyze <ds-admin-curation-task> for accessibility issues
+    testA11y('ds-admin-curation-task');
+  });
+});
diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
index 4d297f5c9d..877a0542e2 100644
--- a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
+++ b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Admin Notifications Publication Claim', () => {
+describe('Admin Notifications Publication Claim Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/notifications/publication-claim');
diff --git a/cypress/e2e/bitstreams-format.cy.ts b/cypress/e2e/bitstreams-format.cy.ts
new file mode 100644
index 0000000000..f113d45ebc
--- /dev/null
+++ b/cypress/e2e/bitstreams-format.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Bitstreams Formats', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/bitstream-formats');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-bitstream-formats').should('be.visible');
+    // Analyze <ds-bitstream-formats> for accessibility issues
+    testA11y('ds-bitstream-formats');
+  });
+});
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
new file mode 100644
index 0000000000..91c68638ea
--- /dev/null
+++ b/cypress/e2e/health-page.cy.ts
@@ -0,0 +1,24 @@
+import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
+
+describe('Health Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/health');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/cypress/e2e/metadata-registry.cy.ts b/cypress/e2e/metadata-registry.cy.ts
index f0f3db48d3..0402d33153 100644
--- a/cypress/e2e/metadata-registry.cy.ts
+++ b/cypress/e2e/metadata-registry.cy.ts
@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-describe('Metadata registry', () => {
+describe('Metadata Registry', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/registries/metadata');
diff --git a/cypress/e2e/metadata-schema.cy.ts b/cypress/e2e/metadata-schema.cy.ts
new file mode 100644
index 0000000000..9ff0db0714
--- /dev/null
+++ b/cypress/e2e/metadata-schema.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Metadata Schema', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/registries/metadata/dc');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-metadata-schema').should('be.visible');
+    // Analyze <ds-metadata-schema> for accessibility issues
+    testA11y('ds-metadata-schema');
+  });
+});

From 543cc42bf31e48d6ac28f4008c46eacbf2cf994e Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 11:50:47 +0200
Subject: [PATCH 0566/1286] [CST-15592] add accessibility tests for:

Admin Add New Modals
Admin Edit Modals
Admin Export Modals
Admin Workflow Page
End User Agreement
Feedback
Profile Page
System Wide Alert
---
 cypress/e2e/admin-add-new-modals.cy.ts        | 48 +++++++++++++++++++
 cypress/e2e/admin-edit-modals.cy.ts           | 48 +++++++++++++++++++
 cypress/e2e/admin-export-modals.cy.ts         | 35 ++++++++++++++
 cypress/e2e/admin-workflow-page.cy.ts         | 18 +++++++
 cypress/e2e/end-user-agreement.cy.ts          | 13 +++++
 cypress/e2e/feedback.cy.ts                    | 13 +++++
 cypress/e2e/privacy.cy.ts                     | 13 +++++
 cypress/e2e/profile-page.cy.ts                | 16 +++++++
 cypress/e2e/system-wide-alert.cy.ts           | 16 +++++++
 .../end-user-agreement-content.component.html |  4 +-
 .../privacy-content.component.html            |  4 +-
 .../dso-selector/dso-selector.component.html  |  1 +
 src/styles/_global-styles.scss                |  8 ++++
 13 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 cypress/e2e/admin-add-new-modals.cy.ts
 create mode 100644 cypress/e2e/admin-edit-modals.cy.ts
 create mode 100644 cypress/e2e/admin-export-modals.cy.ts
 create mode 100644 cypress/e2e/admin-workflow-page.cy.ts
 create mode 100644 cypress/e2e/end-user-agreement.cy.ts
 create mode 100644 cypress/e2e/feedback.cy.ts
 create mode 100644 cypress/e2e/privacy.cy.ts
 create mode 100644 cypress/e2e/profile-page.cy.ts
 create mode 100644 cypress/e2e/system-wide-alert.cy.ts

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
new file mode 100644
index 0000000000..6e2e8e6970
--- /dev/null
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Add New Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Add new Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_community"]').click();
+
+    // Analyze <ds-create-community-parent-selector> for accessibility
+    testA11y('ds-create-community-parent-selector');
+  });
+
+  it('Add new Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_collection"]').click();
+
+    // Analyze <ds-create-collection-parent-selector> for accessibility
+    testA11y('ds-create-collection-parent-selector');
+  });
+
+  it('Add new Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').click();
+
+    cy.get('a[title="menu.section.new_item"]').click();
+
+    // Analyze <ds-create-item-parent-selector> for accessibility
+    testA11y('ds-create-item-parent-selector');
+  });
+});
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
new file mode 100644
index 0000000000..256a6d89cb
--- /dev/null
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -0,0 +1,48 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Edit Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Edit Community modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_community"]').click();
+
+    // Analyze <ds-edit-community-selector> for accessibility
+    testA11y('ds-edit-community-selector');
+  });
+
+  it('Edit Collection modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_collection"]').click();
+
+    // Analyze <ds-edit-collection-selector> for accessibility
+    testA11y('ds-edit-collection-selector');
+  });
+
+  it('Edit Item modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').click();
+
+    cy.get('a[title="menu.section.edit_item"]').click();
+
+    // Analyze <ds-edit-item-selector> for accessibility
+    testA11y('ds-edit-item-selector');
+  });
+});
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
new file mode 100644
index 0000000000..b611bb8fd5
--- /dev/null
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -0,0 +1,35 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Export Modals', () => {
+  beforeEach(() => {
+    // Must login as an Admin for sidebar to appear
+    cy.visit('/login');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('Export metadata modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_metadata"]').click();
+
+    // Analyze <ds-export-metadata-selector> for accessibility
+    testA11y('ds-export-metadata-selector');
+  });
+
+  it('Export batch modal should pass accessibility tests', () => {
+    // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').click();
+
+    // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').click();
+
+    cy.get('a[title="menu.section.export_batch"]').click();
+
+    // Analyze <ds-export-batch-selector> for accessibility
+    testA11y('ds-export-batch-selector');
+  });
+});
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
new file mode 100644
index 0000000000..cd2275f584
--- /dev/null
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -0,0 +1,18 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Admin Workflow Page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/workflow');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-admin-workflow-page').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Analyze <ds-admin-workflow-page> for accessibility issues
+    testA11y('ds-admin-workflow-page');
+  });
+});
diff --git a/cypress/e2e/end-user-agreement.cy.ts b/cypress/e2e/end-user-agreement.cy.ts
new file mode 100644
index 0000000000..989d21ce60
--- /dev/null
+++ b/cypress/e2e/end-user-agreement.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('End User Agreement', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/end-user-agreement');
+
+    // Page must first be visible
+    cy.get('ds-end-user-agreement').should('be.visible');
+
+    // Analyze <ds-end-user-agreement> for accessibility
+    testA11y('ds-end-user-agreement');
+  });
+});
diff --git a/cypress/e2e/feedback.cy.ts b/cypress/e2e/feedback.cy.ts
new file mode 100644
index 0000000000..75fe1097c6
--- /dev/null
+++ b/cypress/e2e/feedback.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Feedback', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/feedback');
+
+    // Page must first be visible
+    cy.get('ds-feedback').should('be.visible');
+
+    // Analyze <ds-feedback> for accessibility
+    testA11y('ds-feedback');
+  });
+});
diff --git a/cypress/e2e/privacy.cy.ts b/cypress/e2e/privacy.cy.ts
new file mode 100644
index 0000000000..16e049f701
--- /dev/null
+++ b/cypress/e2e/privacy.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Privacy', () => {
+  it('should pass accessibility tests', () => {
+    cy.visit('/info/privacy');
+
+    // Page must first be visible
+    cy.get('ds-privacy').should('be.visible');
+
+    // Analyze <ds-privacy> for accessibility
+    testA11y('ds-privacy');
+  });
+});
diff --git a/cypress/e2e/profile-page.cy.ts b/cypress/e2e/profile-page.cy.ts
new file mode 100644
index 0000000000..911ef33ba5
--- /dev/null
+++ b/cypress/e2e/profile-page.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Profile page', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/profile');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Process form must first be visible
+    cy.get('ds-profile-page').should('be.visible');
+    // Analyze <ds-profile-page> for accessibility issues
+    testA11y('ds-profile-page');
+  });
+});
diff --git a/cypress/e2e/system-wide-alert.cy.ts b/cypress/e2e/system-wide-alert.cy.ts
new file mode 100644
index 0000000000..046bfe619f
--- /dev/null
+++ b/cypress/e2e/system-wide-alert.cy.ts
@@ -0,0 +1,16 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('System Wide Alert', () => {
+  beforeEach(() => {
+    // Must login as an Admin to see the page
+    cy.visit('/admin/system-wide-alert');
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  });
+
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-system-wide-alert-form').should('be.visible');
+    // Analyze <ds-system-wide-alert-form> for accessibility issues
+    testA11y('ds-system-wide-alert-form');
+  });
+});
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
index d5e6de85d4..79edebd35a 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.html
@@ -63,7 +63,7 @@
 <p>We reserve the right, but not the obligation, to: (1) monitor the Site for violations of these Terms of Use; (2) take appropriate legal action against anyone who, in our sole discretion, violates the law or these Terms of Use, including without limitation, reporting such user to law enforcement authorities; (3) in our sole discretion and without limitation, refuse, restrict access to, limit the availability of, or disable (to the extent technologically feasible) any of your Contributions or any portion thereof; (4) in our sole discretion and without limitation, notice, or liability, to remove from the Site or otherwise disable all files and content that are excessive in size or are in any way burdensome to our systems; and (5) otherwise manage the Site in a manner designed to protect our rights and property and to facilitate the proper functioning of the Site.</p>
 
 <h2>Privacy policy</h2>
-<p>We care about data privacy and security. Please review our <a [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
+<p>We care about data privacy and security. Please review our <a class="link-contrast" [routerLink]="['/info/privacy']" target="_blank" rel="noopener noreferrer">Privacy Policy</a>. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use.</p>
 <p>Please be advised the Site is hosted in {{ 'info.end-user-agreement.hosting-country' | translate }}. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in {{ 'info.end-user-agreement.hosting-country' | translate }}, then through your continued use of the Site, you are transferring your data to {{ 'info.end-user-agreement.hosting-country' | translate }}, and you agree to have your data transferred to and processed in {{ 'info.end-user-agreement.hosting-country' | translate }}.</p>
 
 <h2>Term and termination</h2>
@@ -92,4 +92,4 @@
 <h2>Miscellaneous</h2>
 <p>These Terms of Use and any policies or operating rules posted by us on the Site or in respect to the Site constitute the entire agreement and understanding between you and us. Our failure to exercise or enforce any right or provision of these Terms of Use shall not operate as a waiver of such right or provision. These Terms of Use operate to the fullest extent permissible by law. We may assign any or all of our rights and obligations to others at any time. We shall not be responsible or liable for any loss, damage, delay, or failure to act caused by any cause beyond our reasonable control. If any provision or part of a provision of these Terms of Use is determined to be unlawful, void, or unenforceable, that provision or part of the provision is deemed severable from these Terms of Use and does not affect the validity and enforceability of any remaining provisions. There is no joint venture, partnership, employment or agency relationship created between you and us as a result of these Terms of Use or use of the Site. You agree that these Terms of Use will not be construed against us by virtue of having drafted them. You hereby waive any and all defenses you may have based on the electronic form of these Terms of Use and the lack of signing by the parties hereto to execute these Terms of Use.</p>
 
-<p><a [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
\ No newline at end of file
+<p><a class="link-contrast" [routerLink]="'.'" fragment="ref-a" id="comment-a">[a]</a>&nbsp;The DSpace software used to run this site is open source. Options for reuse and reproduction of the DSpace software is governed by its open source license: <a class="link-contrast" href="https://github.com/DSpace/DSpace/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">https://github.com/DSpace/DSpace/blob/main/LICENSE</a></p>
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.html b/src/app/info/privacy/privacy-content/privacy-content.component.html
index 003e6b0d51..58ce7efb02 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -83,9 +83,9 @@
 <p>We may also disclose your personal information:</p>
 <ul>
   <li>To comply with any court order, law, or legal process, including to respond to any government or regulatory request.</li>
-  <li>To enforce or apply our <a [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
+  <li>To enforce or apply our <a class="link-contrast" [routerLink]="['/info/end-user-agreement']" target="_blank" rel="noopener noreferrer">End User Agreement</a> and other agreements, including for billing and collection purposes.</li>
   <li>If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of the Company, our customers, or others.</li>
 </ul>
 
 <h2>Changes to our privacy policy</h2>
-<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
\ No newline at end of file
+<p>It is our policy to post any changes we make to our privacy policy on this page. The date the privacy policy was last revised is identified at the top of the page. You are responsible for periodically visiting our Website and this privacy policy to check for any changes.</p>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 10cdd7cd3f..5ee43573f1 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -31,6 +31,7 @@
       </button>
     </ng-container>
     <button *ngIf="loading"
+            title="{{'loading.default' | translate}}"
             class="list-group-item list-group-item-action border-0 list-entry">
       <ds-themed-loading [showMessage]="false"></ds-themed-loading>
     </button>
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 765b50ae86..b3120c08cd 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -466,3 +466,11 @@ ngb-accordion {
 .mt-ncs { margin-top: calc(var(--ds-content-spacing) * -1); }
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
 .my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
+
+
+.link-contrast {
+  // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
+  color: darken($link-color, 5%);
+  // We use underline to discern link from text as we can't make color lighter on a white bg
+  text-decoration: underline;
+}

From db891f2f16103203a8b1cdab4bf363028bd4a820 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 17:13:20 +0200
Subject: [PATCH 0567/1286] [CST-15592] improve tests, add attributes for
 testing, fix wrong references

---
 cypress/e2e/admin-add-new-modals.cy.ts        |  6 ++--
 cypress/e2e/admin-edit-modals.cy.ts           |  6 ++--
 cypress/e2e/admin-export-modals.cy.ts         |  4 +--
 cypress/e2e/admin-search-page.cy.ts           |  3 ++
 cypress/e2e/admin-workflow-page.cy.ts         |  3 ++
 cypress/e2e/bulk-access.cy.ts                 |  7 +++++
 cypress/e2e/health-page.cy.ts                 | 31 +++++++++++++++----
 .../health-page/health-page.component.html    |  4 +--
 .../onclick-menu-item.component.html          |  3 +-
 9 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 6e2e8e6970..565ae154f1 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_community"]').click();
+    cy.get('a[data-test="menu.section.new_community"]').click();
 
     // Analyze <ds-create-community-parent-selector> for accessibility
     testA11y('ds-create-community-parent-selector');
@@ -27,7 +27,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_collection"]').click();
+    cy.get('a[data-test="menu.section.new_collection"]').click();
 
     // Analyze <ds-create-collection-parent-selector> for accessibility
     testA11y('ds-create-collection-parent-selector');
@@ -40,7 +40,7 @@ describe('Admin Add New Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-new-title').click();
 
-    cy.get('a[title="menu.section.new_item"]').click();
+    cy.get('a[data-test="menu.section.new_item"]').click();
 
     // Analyze <ds-create-item-parent-selector> for accessibility
     testA11y('ds-create-item-parent-selector');
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index 256a6d89cb..e96d6ce898 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_community"]').click();
+    cy.get('a[data-test="menu.section.edit_community"]').click();
 
     // Analyze <ds-edit-community-selector> for accessibility
     testA11y('ds-edit-community-selector');
@@ -27,7 +27,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_collection"]').click();
+    cy.get('a[data-test="menu.section.edit_collection"]').click();
 
     // Analyze <ds-edit-collection-selector> for accessibility
     testA11y('ds-edit-collection-selector');
@@ -40,7 +40,7 @@ describe('Admin Edit Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
 
-    cy.get('a[title="menu.section.edit_item"]').click();
+    cy.get('a[data-test="menu.section.edit_item"]').click();
 
     // Analyze <ds-edit-item-selector> for accessibility
     testA11y('ds-edit-item-selector');
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index b611bb8fd5..9f69764d19 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -14,7 +14,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_metadata"]').click();
+    cy.get('a[data-test="menu.section.export_metadata"]').click();
 
     // Analyze <ds-export-metadata-selector> for accessibility
     testA11y('ds-export-metadata-selector');
@@ -27,7 +27,7 @@ describe('Admin Export Modals', () => {
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[title="menu.section.export_batch"]').click();
+    cy.get('a[data-test="menu.section.export_batch"]').click();
 
     // Analyze <ds-export-batch-selector> for accessibility
     testA11y('ds-export-batch-selector');
diff --git a/cypress/e2e/admin-search-page.cy.ts b/cypress/e2e/admin-search-page.cy.ts
index 2e1d13aa13..4fbf8939fe 100644
--- a/cypress/e2e/admin-search-page.cy.ts
+++ b/cypress/e2e/admin-search-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Search Page', () => {
     cy.get('ds-admin-search-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-search-page> for accessibility issues
     testA11y('ds-admin-search-page');
   });
diff --git a/cypress/e2e/admin-workflow-page.cy.ts b/cypress/e2e/admin-workflow-page.cy.ts
index cd2275f584..c3c235e346 100644
--- a/cypress/e2e/admin-workflow-page.cy.ts
+++ b/cypress/e2e/admin-workflow-page.cy.ts
@@ -12,6 +12,9 @@ describe('Admin Workflow Page', () => {
     cy.get('ds-admin-workflow-page').should('be.visible');
     // At least one search result should be displayed
     cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-admin-workflow-page> for accessibility issues
     testA11y('ds-admin-workflow-page');
   });
diff --git a/cypress/e2e/bulk-access.cy.ts b/cypress/e2e/bulk-access.cy.ts
index 4d199f53f9..87033e13e4 100644
--- a/cypress/e2e/bulk-access.cy.ts
+++ b/cypress/e2e/bulk-access.cy.ts
@@ -11,6 +11,11 @@ describe('Bulk Access', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-bulk-access').should('be.visible');
+    // At least one search result should be displayed
+    cy.get('[data-test="list-object"]').should('be.visible');
+    // Click each filter toggle to open *every* filter
+    // (As we want to scan filter section for accessibility issues as well)
+    cy.get('[data-test="filter-toggle"]').click({ multiple: true });
     // Analyze <ds-bulk-access> for accessibility issues
     testA11y('ds-bulk-access', {
       rules: {
@@ -18,6 +23,8 @@ describe('Bulk Access', () => {
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },
+        // Card titles fail this test currently
+        'heading-order': { enabled: false },
       },
     } as Options);
   });
diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 91c68638ea..79ebf4bc04 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -1,13 +1,14 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-describe('Health Page', () => {
-  beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/health');
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-  });
 
+beforeEach(() => {
+  // Must login as an Admin to see the page
+  cy.visit('/health');
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+});
+
+describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -22,3 +23,21 @@ describe('Health Page', () => {
     } as Options);
   });
 });
+
+describe('Health Page > Info Tab', () => {
+  it('should pass accessibility tests', () => {
+    // Page must first be visible
+    cy.get('ds-health-page').should('be.visible');
+    cy.get('a[data-test="health-page.info-tab"]').click();
+
+    // Analyze <ds-health-page> for accessibility issues
+    testA11y('ds-health-page', {
+      rules: {
+        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
+        'aria-required-children': { enabled: false },
+        'nested-interactive': { enabled: false },
+      },
+    } as Options);
+  });
+});
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 14c577a8ee..209fd230ae 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -3,7 +3,7 @@
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
       <li [ngbNavItem]="'status'" role="presentation">
-        <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
             <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
@@ -11,7 +11,7 @@
         </ng-template>
       </li>
       <li [ngbNavItem]="'info'" role="presentation">
-        <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="info">
             <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 4e68b6c5bc..b8ee6ebe17 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -6,5 +6,6 @@
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
+   [attr.data-test]="item.text"
 >{{item.text | translate}}</a>
-<span *ngIf="item.disabled" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>

From 5479cc6274b57e6f9f69d72c174bd6d3ea0bf228 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 23 Jul 2024 18:03:26 +0200
Subject: [PATCH 0568/1286] [CST-15592] change health page test target for
 second tab

---
 cypress/e2e/health-page.cy.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 79ebf4bc04..8ae0ef8e97 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -30,8 +30,10 @@ describe('Health Page > Info Tab', () => {
     cy.get('ds-health-page').should('be.visible');
     cy.get('a[data-test="health-page.info-tab"]').click();
 
-    // Analyze <ds-health-page> for accessibility issues
-    testA11y('ds-health-page', {
+    cy.get('ds-health-info').should('be.visible');
+
+    // Analyze <ds-health-info> for accessibility issues
+    testA11y('ds-health-info', {
       rules: {
         // All panels are accordians & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216

From d0265eb3f6a99ad12ac523f0826a442b8240eb6e Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 24 Jul 2024 10:30:06 +0200
Subject: [PATCH 0569/1286] [CST-15592] refine health page tests

---
 cypress/e2e/health-page.cy.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index 8ae0ef8e97..f23b0bf4ad 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,8 +10,15 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
+    cy.get('ds-health-panel').should('be.visible');
+
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-component').should('be.visible');
+    });
     // Analyze <ds-health-page> for accessibility issues
     testA11y('ds-health-page', {
       rules: {
@@ -26,16 +33,21 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+
+    cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
-    cy.get('a[data-test="health-page.info-tab"]').click();
-
     cy.get('ds-health-info').should('be.visible');
 
+    // wait for all the ds-health-info-component components to be rendered
+    cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
+      cy.wrap($panel).find('ds-health-info-component').should('be.visible');
+    });
+
     // Analyze <ds-health-info> for accessibility issues
     testA11y('ds-health-info', {
       rules: {
-        // All panels are accordians & fail "aria-required-children" and "nested-interactive".
+        // All panels are accordions & fail "aria-required-children" and "nested-interactive".
         // Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
         'aria-required-children': { enabled: false },
         'nested-interactive': { enabled: false },

From be36175bb81773c674fb64a6471fe33bd531aa1b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 26 Jul 2024 17:12:15 +0200
Subject: [PATCH 0570/1286] [CST-15592] add interceptor to prevent sudden
 timeout failure

---
 cypress/e2e/health-page.cy.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cypress/e2e/health-page.cy.ts b/cypress/e2e/health-page.cy.ts
index f23b0bf4ad..c702fa72d7 100644
--- a/cypress/e2e/health-page.cy.ts
+++ b/cypress/e2e/health-page.cy.ts
@@ -10,6 +10,9 @@ beforeEach(() => {
 
 describe('Health Page > Status Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/health').as('status');
+    cy.wait('@status');
+
     cy.get('a[data-test="health-page.status-tab"]').click();
     // Page must first be visible
     cy.get('ds-health-page').should('be.visible');
@@ -33,6 +36,8 @@ describe('Health Page > Status Tab', () => {
 
 describe('Health Page > Info Tab', () => {
   it('should pass accessibility tests', () => {
+    cy.intercept('GET', '/server/actuator/info').as('info');
+    cy.wait('@info');
 
     cy.get('a[data-test="health-page.info-tab"]').click();
     // Page must first be visible

From 3df66e025770325ef6e10199a1732da9d2838cbf Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 13:15:07 +0200
Subject: [PATCH 0571/1286] [CST-15592] add interceptor for item edit page

---
 cypress/e2e/item-edit.cy.ts | 189 ++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 104 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 9d49cbf224..a0d49a7657 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -1,164 +1,145 @@
-import { Options } from 'cypress-axe';
 import { testA11y } from 'cypress/support/utils';
+import { Options } from 'cypress-axe';
 
 const ITEM_EDIT_PAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('/edit');
 
 beforeEach(() => {
-    // All tests start with visiting the Edit Item Page
-    cy.visit(ITEM_EDIT_PAGE);
+  // All tests start with visiting the Edit Item Page
+  cy.visit(ITEM_EDIT_PAGE);
 
-    // This page is restricted, so we will be shown the login form. Fill it out & submit.
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+  // This page is restricted, so we will be shown the login form. Fill it out & submit.
+  cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
+  // This because the edit item page causes often tests to fails due to timeout.
+  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
+  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="metadata"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="metadata"]').should('have.class', 'active');
+    // <ds-edit-item-page> tag must be loaded
+    cy.get('ds-edit-item-page').should('be.visible');
 
-        // <ds-edit-item-page> tag must be loaded
-        cy.get('ds-edit-item-page').should('be.visible');
-
-        // wait for all the ds-dso-edit-metadata-value components to be rendered
-        cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
-            cy.wrap($row).find('div[role="cell"]').should('be.visible');
-        });
-
-        // Analyze <ds-edit-item-page> for accessibility issues
-        testA11y('ds-edit-item-page');
+    // wait for all the ds-dso-edit-metadata-value components to be rendered
+    cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
+      cy.wrap($row).find('div[role="cell"]').should('be.visible');
     });
+
+    // Analyze <ds-edit-item-page> for accessibility issues
+    testA11y('ds-edit-item-page');
+  });
 });
 
 describe('Edit Item > Status tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="status"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="status"]').should('have.class', 'active');
+    // <ds-item-status> tag must be loaded
+    cy.get('ds-item-status').should('be.visible');
 
-        // <ds-item-status> tag must be loaded
-        cy.get('ds-item-status').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-status');
-    });
+    // Analyze for accessibility issues
+    testA11y('ds-item-status');
+  });
 });
 
 describe('Edit Item > Bitstreams tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="bitstreams"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+    // <ds-item-bitstreams> tag must be loaded
+    cy.get('ds-item-bitstreams').should('be.visible');
 
-        // <ds-item-bitstreams> tag must be loaded
-        cy.get('ds-item-bitstreams').should('be.visible');
+    // Table of item bitstreams must also be loaded
+    cy.get('div.item-bitstreams').should('be.visible');
 
-        // Table of item bitstreams must also be loaded
-        cy.get('div.item-bitstreams').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-bitstreams',
+    // Analyze for accessibility issues
+    testA11y('ds-item-bitstreams',
             {
-                rules: {
-                    // Currently Bitstreams page loads a pagination component per Bundle
-                    // and they all use the same 'id="p-dad"'.
-                    'duplicate-id': { enabled: false },
-                }
-            } as Options
-        );
-    });
+              rules: {
+                // Currently Bitstreams page loads a pagination component per Bundle
+                // and they all use the same 'id="p-dad"'.
+                'duplicate-id': { enabled: false },
+              },
+            } as Options,
+    );
+  });
 });
 
 describe('Edit Item > Curate tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="curate"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="curate"]').should('have.class', 'active');
+    // <ds-item-curate> tag must be loaded
+    cy.get('ds-item-curate').should('be.visible');
 
-        // <ds-item-curate> tag must be loaded
-        cy.get('ds-item-curate').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-curate');
-    });
+    // Analyze for accessibility issues
+    testA11y('ds-item-curate');
+  });
 });
 
 describe('Edit Item > Relationships tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="relationships"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="relationships"]').should('have.class', 'active');
+    // <ds-item-relationships> tag must be loaded
+    cy.get('ds-item-relationships').should('be.visible');
 
-        // <ds-item-relationships> tag must be loaded
-        cy.get('ds-item-relationships').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-relationships');
-    });
+    // Analyze for accessibility issues
+    testA11y('ds-item-relationships');
+  });
 });
 
 describe('Edit Item > Version History tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="versionhistory"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+    // <ds-item-version-history> tag must be loaded
+    cy.get('ds-item-version-history').should('be.visible');
 
-        // <ds-item-version-history> tag must be loaded
-        cy.get('ds-item-version-history').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-version-history');
-    });
+    // Analyze for accessibility issues
+    testA11y('ds-item-version-history');
+  });
 });
 
 describe('Edit Item > Access Control tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="access-control"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="access-control"]').should('have.class', 'active');
+    // <ds-item-access-control> tag must be loaded
+    cy.get('ds-item-access-control').should('be.visible');
 
-        // <ds-item-access-control> tag must be loaded
-        cy.get('ds-item-access-control').should('be.visible');
-
-        // Analyze for accessibility issues
-        testA11y('ds-item-access-control');
-    });
+    // Analyze for accessibility issues
+    testA11y('ds-item-access-control');
+  });
 });
 
 describe('Edit Item > Collection Mapper tab', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.get('a[data-test="mapper"]').click();
+  it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').click();
 
-        // Our selected tab should be active
-        cy.get('a[data-test="mapper"]').should('have.class', 'active');
+    // <ds-item-collection-mapper> tag must be loaded
+    cy.get('ds-item-collection-mapper').should('be.visible');
 
-        // <ds-item-collection-mapper> tag must be loaded
-        cy.get('ds-item-collection-mapper').should('be.visible');
+    // Analyze entire page for accessibility issues
+    testA11y('ds-item-collection-mapper');
 
-        // Analyze entire page for accessibility issues
-        testA11y('ds-item-collection-mapper');
+    // Click on the "Map new collections" tab
+    cy.get('li[data-test="mapTab"] a').click();
 
-        // Click on the "Map new collections" tab
-        cy.get('li[data-test="mapTab"] a').click();
+    // Make sure search form is now visible
+    cy.get('ds-search-form').should('be.visible');
 
-        // Make sure search form is now visible
-        cy.get('ds-search-form').should('be.visible');
-
-        // Analyze entire page (again) for accessibility issues
-        testA11y('ds-item-collection-mapper');
-    });
+    // Analyze entire page (again) for accessibility issues
+    testA11y('ds-item-collection-mapper');
+  });
 });

From 9079a968f03283e761dd3c0d4c5449b3393411a7 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 14:16:47 +0200
Subject: [PATCH 0572/1286] [CST-15592] add interceptor for edit group, fix
 landmark-unique accessibility issue in pagination component

---
 cypress/e2e/edit-group.cy.ts                        | 3 +++
 src/app/shared/pagination/pagination.component.html | 3 ++-
 src/assets/i18n/en.json5                            | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index e43ede978a..ef5adbb89d 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,6 +5,9 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    // Wait for all search components to be loaded
+    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
+    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 19e4cf9491..b05a3d1aa0 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -39,7 +39,8 @@
 
   <div *ngIf="shouldShowBottomPager | async">
     <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
+      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+                      [boundaryLinks]="paginationOptions.boundaryLinks"
                       [collectionSize]="collectionSize"
                       [disabled]="paginationOptions.disabled"
                       [ellipses]="paginationOptions.ellipses"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d00e16caa0..475e6437d6 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -832,6 +832,8 @@
 
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
+  "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   "browse.startsWith.choose_start": "(Choose start)",

From 5c0c559685553e8a23f9018424244bbcfde6c4bf Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 9 Oct 2024 15:13:14 +0200
Subject: [PATCH 0573/1286] [CST-15592] remove interceptor for edit group

---
 cypress/e2e/edit-group.cy.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cypress/e2e/edit-group.cy.ts b/cypress/e2e/edit-group.cy.ts
index ef5adbb89d..e43ede978a 100644
--- a/cypress/e2e/edit-group.cy.ts
+++ b/cypress/e2e/edit-group.cy.ts
@@ -5,9 +5,6 @@ describe('Edit Group', () => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    // Wait for all search components to be loaded
-    cy.intercept('GET', '/server/api/eperson/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP').concat('/subgroups*'))).as('subGroups');
-    cy.wait('@subGroups');
   });
 
   it('should pass accessibility tests', () => {

From caed26d191442ec4c5f6249e6269ce0137b125f1 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 10 Oct 2024 14:32:20 +0200
Subject: [PATCH 0574/1286] resolve differences with version 8

---
 cypress/e2e/admin-export-modals.cy.ts           |  2 +-
 ...n-notifications-publication-claim-page.cy.ts | 17 -----------------
 cypress/e2e/collection-edit.cy.ts               |  2 ++
 cypress/e2e/community-edit.cy.ts                |  2 ++
 cypress/e2e/community-statistics.cy.ts          |  2 +-
 cypress/e2e/homepage-statistics.cy.ts           |  2 +-
 cypress/e2e/item-edit.cy.ts                     |  6 ++----
 cypress/e2e/item-page.cy.ts                     |  1 +
 cypress/e2e/item-statistics.cy.ts               |  5 ++---
 cypress/e2e/quality-assurance-source-page.cy.ts | 16 ----------------
 10 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 cypress/e2e/admin-notifications-publication-claim-page.cy.ts
 delete mode 100644 cypress/e2e/quality-assurance-source-page.cy.ts

diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 9f69764d19..c5b0b0908f 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -30,6 +30,6 @@ describe('Admin Export Modals', () => {
     cy.get('a[data-test="menu.section.export_batch"]').click();
 
     // Analyze <ds-export-batch-selector> for accessibility
-    testA11y('ds-export-batch-selector');
+    testA11y('ds-export-metadata-selector');
   });
 });
diff --git a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts b/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
deleted file mode 100644
index 877a0542e2..0000000000
--- a/cypress/e2e/admin-notifications-publication-claim-page.cy.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { testA11y } from 'cypress/support/utils';
-
-describe('Admin Notifications Publication Claim Page', () => {
-  beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/admin/notifications/publication-claim');
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-  });
-
-  it('should pass accessibility tests', () => {
-
-    //Page must first be visible
-    cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
-    // Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
-    testA11y('ds-admin-notifications-publication-claim-page');
-  });
-});
diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
index 63d873db3e..a1e25ecf70 100644
--- a/cypress/e2e/collection-edit.cy.ts
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -8,6 +8,8 @@ beforeEach(() => {
 
     // This page is restricted, so we will be shown the login form. Fill it out & submit.
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    cy.intercept('/server/api/core/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('collection');
+    cy.wait('@collection')
 });
 
 describe('Edit Collection > Edit Metadata tab', () => {
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
index 8fc1a7733e..ed2dfc8f5e 100644
--- a/cypress/e2e/community-edit.cy.ts
+++ b/cypress/e2e/community-edit.cy.ts
@@ -8,6 +8,8 @@ beforeEach(() => {
 
     // This page is restricted, so we will be shown the login form. Fill it out & submit.
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    cy.intercept('/server/api/core/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'))).as('community');
+    cy.wait('@community')
 });
 
 describe('Edit Community > Edit Metadata tab', () => {
diff --git a/cypress/e2e/community-statistics.cy.ts b/cypress/e2e/community-statistics.cy.ts
index 6cafed0350..8122e68fbb 100644
--- a/cypress/e2e/community-statistics.cy.ts
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -6,7 +6,7 @@ describe('Community Statistics Page', () => {
 
     it('should load if you click on "Statistics" from a Community page', () => {
         cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
-        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
     });
 
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
index ece38686b9..88daeeb2b9 100644
--- a/cypress/e2e/homepage-statistics.cy.ts
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -5,7 +5,7 @@ import '../support/commands';
 describe('Site Statistics Page', () => {
     it('should load if you click on "Statistics" from homepage', () => {
         cy.visit('/');
-        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', '/statistics');
     });
 
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index a0d49a7657..7fa8aea95f 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -10,10 +10,8 @@ beforeEach(() => {
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
 
-  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
-  // This because the edit item page causes often tests to fails due to timeout.
-  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
-  cy.wait('@correctionTypes');
+  cy.intercept('GET', 'server/api/core/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))).as('item');
+  cy.wait('@item');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {
diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index a6a208e9f4..a7fac6e387 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -7,6 +7,7 @@ describe('Item  Page', () => {
     // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid]
     it('should redirect to the entity page when navigating to an item page', () => {
         cy.visit(ITEMPAGE);
+        cy.wait(1000);
         cy.location('pathname').should('eq', ENTITYPAGE);
     });
 
diff --git a/cypress/e2e/item-statistics.cy.ts b/cypress/e2e/item-statistics.cy.ts
index 6caeacae8e..3fdc2e7f9d 100644
--- a/cypress/e2e/item-statistics.cy.ts
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -6,7 +6,7 @@ describe('Item Statistics Page', () => {
 
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
         cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
-        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
 
@@ -23,8 +23,7 @@ describe('Item Statistics Page', () => {
 
     it('should contain a "Total visits per month" section', () => {
         cy.visit(ITEMSTATISTICSPAGE);
-        // Check just for existence because this table is empty in CI environment as it's historical data
-        cy.get('.'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('_TotalVisitsPerMonth')).should('exist');
+        cy.get('table[data-test="TotalVisitsPerMonth"]').should('be.visible');
     });
 
     it('should pass accessibility tests', () => {
diff --git a/cypress/e2e/quality-assurance-source-page.cy.ts b/cypress/e2e/quality-assurance-source-page.cy.ts
deleted file mode 100644
index 722917ef16..0000000000
--- a/cypress/e2e/quality-assurance-source-page.cy.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { testA11y } from 'cypress/support/utils';
-
-describe('Quality Assurance Source Page', () => {
-  beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/notifications/quality-assurance');
-    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-  });
-
-  it('should pass accessibility tests', () => {
-    // Source page must first be visible
-    cy.get('ds-quality-assurance-source-page-component').should('be.visible');
-    // Analyze <ds-quality-assurance-source-page-component> for accessibility issues
-    testA11y('ds-quality-assurance-source-page-component');
-  });
-});

From 7ac14daf469cb93e4de16f8cbd1d8085a1aff3a2 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 10 Oct 2024 15:42:47 +0200
Subject: [PATCH 0575/1286] remove interceptors

---
 cypress/e2e/collection-edit.cy.ts | 2 --
 cypress/e2e/community-edit.cy.ts  | 2 --
 cypress/e2e/item-edit.cy.ts       | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
index a1e25ecf70..63d873db3e 100644
--- a/cypress/e2e/collection-edit.cy.ts
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -8,8 +8,6 @@ beforeEach(() => {
 
     // This page is restricted, so we will be shown the login form. Fill it out & submit.
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    cy.intercept('/server/api/core/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('collection');
-    cy.wait('@collection')
 });
 
 describe('Edit Collection > Edit Metadata tab', () => {
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
index ed2dfc8f5e..8fc1a7733e 100644
--- a/cypress/e2e/community-edit.cy.ts
+++ b/cypress/e2e/community-edit.cy.ts
@@ -8,8 +8,6 @@ beforeEach(() => {
 
     // This page is restricted, so we will be shown the login form. Fill it out & submit.
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-    cy.intercept('/server/api/core/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'))).as('community');
-    cy.wait('@community')
 });
 
 describe('Edit Community > Edit Metadata tab', () => {
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 7fa8aea95f..60e1b924ee 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,9 +9,6 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-
-  cy.intercept('GET', 'server/api/core/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))).as('item');
-  cy.wait('@item');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {

From ba2570b83bb1631cd7799b6a04c57bb974ce0bc4 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 10 Oct 2024 16:18:01 +0200
Subject: [PATCH 0576/1286] Add interceptor for collection page to avoid
 timeout

---
 cypress/e2e/collection-page.cy.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index 55c10cc6e2..bec12e7d57 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -4,8 +4,9 @@ describe('Collection Page', () => {
 
     it('should pass accessibility tests', () => {
         cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
-
-        // <ds-collection-page> tag must be loaded
+        cy.intercept('GET','server/api/core/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('collection');
+        cy.wait('@collection');
+      // <ds-collection-page> tag must be loaded
         cy.get('ds-collection-page').should('be.visible');
 
         // Analyze <ds-collection-page> for accessibility issues

From 101a3d70ceef5df9dc481c377bdb01f50a0b2655 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:09:10 +0000
Subject: [PATCH 0577/1286] Bump cookie, cookie-parser and socket.io

Bumps [cookie](https://github.com/jshttp/cookie) to 0.7.2 and updates ancestor dependencies [cookie](https://github.com/jshttp/cookie), [cookie-parser](https://github.com/expressjs/cookie-parser) and [socket.io](https://github.com/socketio/socket.io). These dependencies need to be updated together.


Updates `cookie` from 0.4.1 to 0.7.2
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](https://github.com/jshttp/cookie/compare/v0.4.1...v0.7.2)

Updates `cookie-parser` from 1.4.6 to 1.4.7
- [Release notes](https://github.com/expressjs/cookie-parser/releases)
- [Changelog](https://github.com/expressjs/cookie-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/cookie-parser/compare/1.4.6...1.4.7)

Updates `socket.io` from 4.7.5 to 4.8.0
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/socket.io@4.7.5...socket.io@4.8.0)

---
updated-dependencies:
- dependency-name: cookie
  dependency-type: indirect
- dependency-name: cookie-parser
  dependency-type: direct:production
- dependency-name: socket.io
  dependency-type: indirect
...

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

diff --git a/package-lock.json b/package-lock.json
index a0bc0cc531..1f806222aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,7 @@
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
         "compression": "^1.7.4",
-        "cookie-parser": "1.4.6",
+        "cookie-parser": "1.4.7",
         "core-js": "^3.30.1",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
@@ -8510,20 +8510,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dependencies": {
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/bonjour-service": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
@@ -9527,19 +9513,19 @@
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "node_modules/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-parser": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
-      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+      "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
       "dependencies": {
-        "cookie": "0.4.1",
+        "cookie": "0.7.2",
         "cookie-signature": "1.0.6"
       },
       "engines": {
@@ -10991,9 +10977,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -11001,7 +10987,7 @@
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
@@ -12361,20 +12347,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dependencies": {
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/express/node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -19500,7 +19472,6 @@
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
       "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dev": true,
       "dependencies": {
         "side-channel": "^1.0.6"
       },
@@ -21315,16 +21286,16 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },
diff --git a/package.json b/package.json
index 82bec87e8e..59dce033db 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
     "compression": "^1.7.4",
-    "cookie-parser": "1.4.6",
+    "cookie-parser": "1.4.7",
     "core-js": "^3.30.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",

From 7cf7749367ce46fe9c9c7e3959f60e0f5aeec5ba Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 10 Oct 2024 17:32:46 +0200
Subject: [PATCH 0578/1286] correct intercept to dso resolved for route

---
 cypress/e2e/collection-page.cy.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index bec12e7d57..ff32dadb11 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -4,8 +4,8 @@ describe('Collection Page', () => {
 
     it('should pass accessibility tests', () => {
         cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
-        cy.intercept('GET','server/api/core/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('collection');
-        cy.wait('@collection');
+        cy.intercept('GET','/server/api/dso/find?uuid='.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('dso');
+        cy.wait('@dso');
       // <ds-collection-page> tag must be loaded
         cy.get('ds-collection-page').should('be.visible');
 

From 6388613948cb6d090ff459b0124541ac876707ae Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 10 Oct 2024 18:00:35 +0200
Subject: [PATCH 0579/1286] revert adding interceptor as not reliable on remote
 test

---
 cypress/e2e/collection-page.cy.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index ff32dadb11..d12536d332 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -2,14 +2,13 @@ import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
 
-    it('should pass accessibility tests', () => {
-        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
-        cy.intercept('GET','/server/api/dso/find?uuid='.concat(Cypress.env('DSPACE_TEST_COLLECTION'))).as('dso');
-        cy.wait('@dso');
-      // <ds-collection-page> tag must be loaded
-        cy.get('ds-collection-page').should('be.visible');
+  it('should pass accessibility tests', () => {
+    cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
-        // Analyze <ds-collection-page> for accessibility issues
-        testA11y('ds-collection-page');
-    });
+    // <ds-collection-page> tag must be loaded
+    cy.get('ds-collection-page').should('be.visible');
+
+    // Analyze <ds-collection-page> for accessibility issues
+    testA11y('ds-collection-page');
+  });
 });

From 7cd82e542bec81bf768124c20ea18162881cb56d Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 10 Oct 2024 18:13:34 +0200
Subject: [PATCH 0580/1286] [CST-17153] improve descriptive labels for
 show/hide more buttons on related items lists

---
 .../simple/related-items/related-items.component.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 02c207b332..0b3cf6c0ac 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -7,12 +7,12 @@
       <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
         </div>
         <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
         </div>
       </div>
     </ng-container>

From 169ae41d49b8ec3e175c021612ad0ba9776ddfd7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 10 Oct 2024 11:17:17 -0500
Subject: [PATCH 0581/1286] Bump cookie, cookie-parser and socket.io

---
 package.json |  2 +-
 yarn.lock    | 63 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 3a27c26eb5..cb8456501a 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
     "compression": "^1.7.4",
-    "cookie-parser": "1.4.6",
+    "cookie-parser": "1.4.7",
     "core-js": "^3.30.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
diff --git a/yarn.lock b/yarn.lock
index ff64618397..26f50cb912 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4340,12 +4340,12 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-cookie-parser@1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
-  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
+cookie-parser@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.7.tgz#e2125635dfd766888ffe90d60c286404fa0e7b26"
+  integrity sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==
   dependencies:
-    cookie "0.4.1"
+    cookie "0.7.2"
     cookie-signature "1.0.6"
 
 cookie-signature@1.0.6:
@@ -4353,20 +4353,15 @@ cookie-signature@1.0.6:
   resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
 cookie@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
   integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
-cookie@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.7.2, cookie@~0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
 copy-anything@^2.0.1:
   version "2.0.6"
@@ -5131,21 +5126,26 @@ engine.io-parser@~5.0.3:
   resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz"
   integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
-engine.io@~6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f"
-  integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==
+engine.io-parser@~5.2.1:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
+  integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
+
+engine.io@~6.6.0:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.2.tgz#32bd845b4db708f8c774a4edef4e5c8a98b3da72"
+  integrity sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
     "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "~0.4.1"
+    cookie "~0.7.2"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.11.0"
+    engine.io-parser "~5.2.1"
+    ws "~8.17.1"
 
 enhanced-resolve@^5.10.0:
   version "5.12.0"
@@ -10795,17 +10795,26 @@ socket.io-parser@~4.2.1:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+
 socket.io@^4.4.1:
-  version "4.6.1"
-  resolved "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz"
-  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1"
+  integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
+    cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.4.1"
+    engine.io "~6.6.0"
     socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.1"
+    socket.io-parser "~4.2.4"
 
 sockjs@^0.3.24:
   version "0.3.24"
@@ -12227,7 +12236,7 @@ ws@^7.3.1, ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.11.0, ws@^8.13.0, ws@^8.4.2:
+ws@^8.11.0, ws@^8.13.0, ws@^8.4.2, ws@~8.17.1:
   version "8.17.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
   integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==

From 8fee4e348cf8d9d5e87904025a0cbd86e8bac3e1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 10 Oct 2024 11:50:08 -0500
Subject: [PATCH 0582/1286] Bump cookie, cookie-parser and socket.io

---
 package.json |  2 +-
 yarn.lock    | 41 ++++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 633fc19dcc..ad82a8fcd0 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
     "compression": "^1.7.4",
-    "cookie-parser": "1.4.6",
+    "cookie-parser": "1.4.7",
     "core-js": "^3.30.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
diff --git a/yarn.lock b/yarn.lock
index be53086e29..368a89a5f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4558,12 +4558,12 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-parser@1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
-  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
+cookie-parser@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.7.tgz#e2125635dfd766888ffe90d60c286404fa0e7b26"
+  integrity sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==
   dependencies:
-    cookie "0.4.1"
+    cookie "0.7.2"
     cookie-signature "1.0.6"
 
 cookie-signature@1.0.6:
@@ -4571,20 +4571,15 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
 cookie@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
   integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
-cookie@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.7.2, cookie@~0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
 copy-anything@^2.0.1:
   version "2.0.6"
@@ -5284,17 +5279,17 @@ engine.io-parser@~5.2.1:
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
   integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
 
-engine.io@~6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.5.tgz#430b80d8840caab91a50e9e23cb551455195fc93"
-  integrity sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==
+engine.io@~6.6.0:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.2.tgz#32bd845b4db708f8c774a4edef4e5c8a98b3da72"
+  integrity sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
     "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "~0.4.1"
+    cookie "~0.7.2"
     cors "~2.8.5"
     debug "~4.3.1"
     engine.io-parser "~5.2.1"
@@ -10826,15 +10821,15 @@ socket.io-parser@~4.2.4:
     debug "~4.3.1"
 
 socket.io@^4.4.1, socket.io@^4.7.2:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
-  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1"
+  integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.5.2"
+    engine.io "~6.6.0"
     socket.io-adapter "~2.5.2"
     socket.io-parser "~4.2.4"
 

From e30bfffbf03fb1ac3cf0b943d87f8cf0708522cb Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 14 Aug 2024 23:43:44 +0200
Subject: [PATCH 0583/1286] 117287: Simplified the if conditions on the
 edit/save/discard buttons on item versions

(cherry picked from commit 04bbaf9cb930cc823668076e858b0ab4703f4568)
---
 .../versions/item-versions.component.html     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index d20dd70845..745f835492 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -49,38 +49,36 @@
               </ng-template>
             </div>
 
-            <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions">
-              <!--DISCARD EDIT -->
-              <ng-container *ngIf="(versionDTO.canEditVersion | async) && isThisBeingEdited(versionDTO.version)">
-                <button class="btn btn-sm"
-                        [ngClass]="isThisBeingEdited(versionDTO.version) ? 'btn-outline-warning' : 'btn-outline-primary'"
+            <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
+              <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
+                <!--DISCARD EDIT-->
+                <button class="btn btn-sm btn-outline-warning"
                         (click)="disableVersionEditing()"
                         title="{{'item.version.history.table.action.discardSummary' | translate}}">
                   <i class="fas fa-undo-alt fa-fw"></i>
                 </button>
-              </ng-container>
-              <!--EDIT / SAVE-->
-              <ng-container *ngIf="versionDTO.canEditVersion | async">
-                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                        *ngIf="!isThisBeingEdited(versionDTO.version)"
-                        [disabled]="isAnyBeingEdited()"
-                        (click)="enableVersionEditing(versionDTO.version)"
-                        title="{{'item.version.history.table.action.editSummary' | translate}}">
-                  <i class="fas fa-edit fa-fw"></i>
-                </button>
+                <!--SAVE-->
                 <button class="btn btn-outline-success btn-sm"
-                        *ngIf="isThisBeingEdited(versionDTO.version)"
                         (click)="onSummarySubmit()"
                         title="{{'item.version.history.table.action.saveSummary' | translate}}">
                   <i class="fas fa-check fa-fw"></i>
                 </button>
               </ng-container>
+              <ng-template #notThisBeingEdited>
+                <!--EDIT-->
+                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                        [disabled]="isAnyBeingEdited()"
+                        (click)="enableVersionEditing(versionDTO.version)"
+                        title="{{'item.version.history.table.action.editSummary' | translate}}">
+                  <i class="fas fa-edit fa-fw"></i>
+                </button>
+              </ng-template>
             </div>
           </td>
         </tr>
         </tbody>
       </table>
-      <div>*&nbsp;{{ "item.version.history.selected" | translate }}</div>
+      <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
     </ds-pagination>
   </div>
 </div>

From 5619d6bc4c7c259a9b72c2f37710c3bf3932d117 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 15 Apr 2024 09:43:38 +0200
Subject: [PATCH 0584/1286] [DURACOM-248] set function call result in a class
 attribute

(cherry picked from commit 87cff6c90792553b2170e6a9326fdabdd478456c)
---
 src/app/item-page/versions/item-versions.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 745f835492..6184b42aa8 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -15,7 +15,7 @@
         <thead>
         <tr>
           <th scope="col">{{ "item.version.history.table.version" | translate }}</th>
-          <th scope="col" *ngIf="(showSubmitter() | async)">{{ "item.version.history.table.editor" | translate }}</th>
+          <th scope="col" *ngIf="(showSubmitter$ | async)">{{ "item.version.history.table.editor" | translate }}</th>
           <th scope="col">{{ "item.version.history.table.date" | translate }}</th>
           <th scope="col">{{ "item.version.history.table.summary" | translate }}</th>
         </tr>
@@ -31,7 +31,7 @@
                                                   (versionsHistoryChange)="getAllVersions($event)"
             ></ds-item-versions-row-element-version>
           </td>
-          <td class="version-row-element-editor" *ngIf="(showSubmitter() | async)">
+          <td class="version-row-element-editor" *ngIf="(showSubmitter$ | async)">
             {{ versionDTO.version.submitterName }}
           </td>
           <td class="version-row-element-date">

From 704cc06f1647c29fadb0ba12f93fde5d190d8a7f Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 11 Oct 2024 09:59:10 +0200
Subject: [PATCH 0585/1286] 118944: Fix hasDraftVersion$ not working for
 embedded payloads with no content

---
 src/app/core/data/version-history-data.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index 8229083535..8ecfde0686 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -171,7 +171,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((versionRD: RemoteData<Version>) => {
-        if (versionRD.hasSucceeded && !versionRD.hasNoContent) {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent && hasValue(versionRD.payload)) {
           return versionRD.payload.versionhistory.pipe(
             getFirstCompletedRemoteData(),
             map((versionHistoryRD: RemoteData<VersionHistory>) => {

From 680d6c94166266d6195f13b92e3be916917ae8c0 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 11 Oct 2024 13:37:24 +0200
Subject: [PATCH 0586/1286] Fixed small cs localization mistakes

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

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 09dd023e8d..466e3475bf 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěvku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo:",
+  "iiif.page.issue": "Číslo: ",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",

From b709ee03000086cd52f5de9bc67d5619a64df29d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 11 Oct 2024 14:59:34 +0200
Subject: [PATCH 0587/1286] 118944: Embed the accessStatus link on collection,
 browse, recent item submissions & the item page related items & delete tab
 when enabled

---
 .../collection-page.component.ts              |  4 +--
 .../breadcrumbs/item-breadcrumb.resolver.ts   |  4 +--
 src/app/core/browse/browse.service.spec.ts    | 12 --------
 src/app/core/browse/browse.service.ts         | 19 ++++++++-----
 .../data/relationship-data.service.spec.ts    |  4 ++-
 .../core/data/relationship-data.service.ts    |  4 ++-
 .../recent-item-list.component.ts             |  3 ++
 .../abstract-item-update.component.ts         |  4 +--
 .../item-delete/item-delete.component.ts      |  4 +--
 .../edit-relationship-list.component.spec.ts  |  5 ++--
 .../edit-relationship-list.component.ts       |  2 +-
 src/app/item-page/item.resolver.ts            | 27 +++++++++++-------
 ...ynamic-form-control-container.component.ts |  2 +-
 src/app/shared/utils/relation-query.utils.ts  | 28 +++++++++++--------
 14 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 16704cef52..e74db09f24 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -28,7 +28,7 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
+import { getBrowseLinksToFollow } from '../core/browse/browse.service';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
 import { APP_CONFIG, AppConfig } from '../../../src/config/app-config.interface';
 
@@ -115,7 +115,7 @@ export class CollectionPageComponent implements OnInit {
               pagination: currentPagination,
               sort: currentSort,
               dsoTypes: [DSpaceObjectType.ITEM]
-            }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
+            }), null, true, true, ...getBrowseLinksToFollow())
             .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
         }),
         startWith(undefined) // Make sure switching pages shows loading component
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 3005b6f09a..f396fd08dd 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
+import { getItemPageLinksToFollow } from '../../item-page/item.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
@@ -23,6 +23,6 @@ export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
    * Requesting them as embeds will limit the number of requests
    */
   get followLinks(): FollowLinkConfig<Item>[] {
-    return ITEM_PAGE_LINKS_TO_FOLLOW;
+    return getItemPageLinksToFollow();
   }
 }
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 9f166e3d19..f7027fc91e 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -1,10 +1,8 @@
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
 import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 import { BrowseService } from './browse.service';
@@ -20,7 +18,6 @@ describe('BrowseService', () => {
   let scheduler: TestScheduler;
   let service: BrowseService;
   let requestService: RequestService;
-  let rdbService: RemoteDataBuildService;
 
   const browsesEndpointURL = 'https://rest.api/browses';
   const halService: any = new HALEndpointServiceStub(browsesEndpointURL);
@@ -118,7 +115,6 @@ describe('BrowseService', () => {
       halService,
       browseDefinitionDataService,
       hrefOnlyDataService,
-      rdbService
     );
   }
 
@@ -130,11 +126,9 @@ describe('BrowseService', () => {
 
     beforeEach(() => {
       requestService = getMockRequestService(getRequestEntry$(true));
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
       spyOn(halService, 'getEndpoint').and
         .returnValue(hot('--a-', { a: browsesEndpointURL }));
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     it('should call BrowseDefinitionDataService to create the RemoteData Observable', () => {
@@ -151,9 +145,7 @@ describe('BrowseService', () => {
 
     beforeEach(() => {
       requestService = getMockRequestService(getRequestEntry$(true));
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
@@ -204,7 +196,6 @@ describe('BrowseService', () => {
     describe('if getBrowseDefinitions fires', () => {
       beforeEach(() => {
         requestService = getMockRequestService(getRequestEntry$(true));
-        rdbService = getMockRemoteDataBuildService();
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('--a-', {
@@ -259,7 +250,6 @@ describe('BrowseService', () => {
     describe('if getBrowseDefinitions doesn\'t fire', () => {
       it('should return undefined', () => {
         requestService = getMockRequestService(getRequestEntry$(true));
-        rdbService = getMockRemoteDataBuildService();
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('----'));
@@ -277,9 +267,7 @@ describe('BrowseService', () => {
   describe('getFirstItemFor', () => {
     beforeEach(() => {
       requestService = getMockRequestService();
-      rdbService = getMockRemoteDataBuildService();
       service = initTestService();
-      spyOn(rdbService, 'buildList').and.callThrough();
     });
 
     describe('when getFirstItemFor is called with a valid browse definition id', () => {
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index b210b34949..2d8dd4b80f 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
 import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
@@ -24,11 +23,18 @@ import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { BrowseDefinitionDataService } from './browse-definition-data.service';
 import { SortDirection } from '../cache/models/sort-options.model';
+import { environment } from '../../../environments/environment';
 
 
-export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
-  followLink('thumbnail')
-];
+export function getBrowseLinksToFollow(): FollowLinkConfig<BrowseEntry | Item>[] {
+  const followLinks = [
+    followLink('thumbnail'),
+  ];
+  if (environment.item.showAccessStatuses) {
+    followLinks.push(followLink('accessStatus'));
+  }
+  return followLinks;
+}
 
 /**
  * The service handling all browse requests
@@ -55,7 +61,6 @@ export class BrowseService {
     protected halService: HALEndpointService,
     private browseDefinitionDataService: BrowseDefinitionDataService,
     private hrefOnlyDataService: HrefOnlyDataService,
-    private rdb: RemoteDataBuildService,
   ) {
   }
 
@@ -105,7 +110,7 @@ export class BrowseService {
       })
     );
     if (options.fetchThumbnail ) {
-      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...getBrowseLinksToFollow());
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
@@ -153,7 +158,7 @@ export class BrowseService {
       }),
     );
     if (options.fetchThumbnail) {
-      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<Item>(href$, {}, null, null, ...getBrowseLinksToFollow());
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 4432d5213a..fd24c0665b 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -23,6 +23,7 @@ import { FindListOptions } from './find-list-options.model';
 import { testSearchDataImplementation } from './base/search-data.spec';
 import { MetadataValue } from '../shared/metadata.models';
 import { MetadataRepresentationType } from '../shared/metadata-representation/metadata-representation.model';
+import { environment } from '../../../environments/environment.test';
 
 describe('RelationshipDataService', () => {
   let service: RelationshipDataService;
@@ -137,6 +138,7 @@ describe('RelationshipDataService', () => {
       itemService,
       null,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
+      environment,
     );
   }
 
@@ -152,7 +154,7 @@ describe('RelationshipDataService', () => {
   });
 
   describe('composition', () => {
-    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null);
+    const initService = () => new RelationshipDataService(null, null, null, null, null, null, null, environment);
 
     testSearchDataImplementation(initService);
   });
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 46a51a2d01..7620f8ab75 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -51,6 +51,7 @@ import { MetadataRepresentation } from '../shared/metadata-representation/metada
 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';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -92,6 +93,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     protected itemService: ItemDataService,
     protected appStore: Store<AppState>,
     @Inject(PAGINATED_RELATIONS_TO_ITEMS_OPERATOR) private paginatedRelationsToItems: (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>,
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
   ) {
     super('relationships', requestService, rdbService, objectCache, halService, 15 * 60 * 1000);
 
@@ -264,7 +266,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    * @param options
    */
   getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail, this.appConfig.item.showAccessStatuses);
     linksToFollow.push(followLink('relationshipType'));
 
     return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 9a8535d970..da7d8141e3 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -64,6 +64,9 @@ export class RecentItemListComponent implements OnInit {
     if (this.appConfig.browseBy.showThumbnails) {
       linksToFollow.push(followLink('thumbnail'));
     }
+    if (this.appConfig.item.showAccessStatuses) {
+      linksToFollow.push(followLink('accessStatus'));
+    }
 
     this.itemRD$ = this.searchService.search(
       new PaginatedSearchOptions({
diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 80002f614b..3a07632346 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -13,7 +13,7 @@ import { environment } from '../../../../environments/environment';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 import { getAllSucceededRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
+import { getItemPageLinksToFollow } from '../../item.resolver';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 
@@ -72,7 +72,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
           this.item = rd.payload;
         }),
         switchMap((rd: RemoteData<Item>) => {
-          return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...ITEM_PAGE_LINKS_TO_FOLLOW);
+          return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...getItemPageLinksToFollow());
         }),
         getAllSucceededRemoteData()
       ).subscribe((rd: RemoteData<Item>) => {
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 9012ebe7d7..8b26b71fef 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -236,8 +236,8 @@ export class ItemDeleteComponent
     this.linkService.resolveLinks(
       relationship,
       followLink('relationshipType'),
-      followLink('leftItem'),
-      followLink('rightItem'),
+      followLink('leftItem', undefined, followLink<Item>('accessStatus')),
+      followLink('rightItem', undefined, followLink<Item>('accessStatus')),
     );
     return relationship.relationshipType.pipe(
       getFirstSucceededRemoteData(),
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 4cd663f0fb..29851c9e93 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -32,6 +32,7 @@ import { ConfigurationProperty } from '../../../../core/shared/configuration-pro
 import { Router } from '@angular/router';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -202,11 +203,11 @@ describe('EditRelationshipListComponent', () => {
       }))
     });
 
-    const environmentUseThumbs = {
+    const environmentUseThumbs = Object.assign({}, environment, {
       browseBy: {
         showThumbnails: true
       }
-    };
+    });
 
     TestBed.configureTestingModule({
       imports: [SharedModule, TranslateModule.forRoot()],
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index b8542f5806..b27e57f773 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -493,7 +493,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     );
 
     // this adds thumbnail images when required by configuration
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
+    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses);
 
     this.subs.push(
       observableCombineLatest([
diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts
index ca6a6c5958..ffeef57ecb 100644
--- a/src/app/item-page/item.resolver.ts
+++ b/src/app/item-page/item.resolver.ts
@@ -8,20 +8,27 @@ import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { environment } from '../../environments/environment';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
  * Requesting them as embeds will limit the number of requests
  */
-export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
-  followLink('owningCollection', {},
-    followLink('parentCommunity', {},
-      followLink('parentCommunity'))
-  ),
-  followLink('relationships'),
-  followLink('version', {}, followLink('versionhistory')),
-  followLink('thumbnail')
-];
+export function getItemPageLinksToFollow(): FollowLinkConfig<Item>[] {
+  const followLinks: FollowLinkConfig<Item>[] = [
+    followLink('owningCollection', {},
+      followLink('parentCommunity', {},
+        followLink('parentCommunity'))
+    ),
+    followLink('relationships'),
+    followLink('version', {}, followLink('versionhistory')),
+    followLink('thumbnail'),
+  ];
+  if (environment.item.showAccessStatuses) {
+    followLinks.push(followLink('accessStatus'));
+  }
+  return followLinks;
+}
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -46,7 +53,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
       true,
       false,
-      ...ITEM_PAGE_LINKS_TO_FOLLOW
+      ...getItemPageLinksToFollow(),
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index ff5a119b6f..a04c10bf3a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -328,7 +328,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         const relationship$ = this.relationshipService.findById(this.value.virtualValue,
           true,
           true,
-          ... itemLinksToFollow(this.fetchThumbnail)).pipe(
+          ... itemLinksToFollow(this.fetchThumbnail, this.appConfig.item.showAccessStatuses)).pipe(
             getAllSucceededRemoteData(),
             getRemoteDataPayload());
         this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 62a69075fc..635ae946da 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -1,5 +1,6 @@
 import { followLink, FollowLinkConfig } from './follow-link-config.model';
 import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import { Item } from '../../core/shared/item.model';
 
 /**
  * Get the query for looking up items by relation type
@@ -21,19 +22,22 @@ export function getFilterByRelation(relationType: string, itemUUID: string): str
 }
 
 /**
- * Creates links to follow for the leftItem and rightItem. Links will include
- * @param showThumbnail thumbnail image configuration
- * @returns followLink array
+ * Creates links to follow for the leftItem and rightItem. Optionally additional links for `thumbnail` & `accessStatus`
+ * can be embedded as well.
+ *
+ * @param showThumbnail    Whether the `thumbnail` needs to be embedded on the {@link Item}
+ * @param showAccessStatus Whether the `accessStatus` needs to be embedded on the {@link Item}
  */
-export function itemLinksToFollow(showThumbnail: boolean):  FollowLinkConfig<Relationship>[] {
-  let linksToFollow: FollowLinkConfig<Relationship>[];
+export function itemLinksToFollow(showThumbnail: boolean, showAccessStatus: boolean):  FollowLinkConfig<Relationship>[] {
+  const conditionalLinksToFollow: FollowLinkConfig<Item>[] = [];
   if (showThumbnail) {
-    linksToFollow = [
-      followLink('leftItem',{}, followLink('thumbnail')),
-      followLink('rightItem',{}, followLink('thumbnail'))
-    ];
-  } else {
-    linksToFollow = [followLink('leftItem'), followLink('rightItem')];
+    conditionalLinksToFollow.push(followLink<Item>('thumbnail'));
   }
-  return linksToFollow;
+  if (showAccessStatus) {
+    conditionalLinksToFollow.push(followLink<Item>('accessStatus'));
+  }
+  return [
+    followLink('leftItem', undefined, ...conditionalLinksToFollow),
+    followLink('rightItem', undefined, ...conditionalLinksToFollow),
+  ];
 }

From 4de3c58e06daef1753645691782857b5b0c8cee2 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 10 Oct 2024 22:12:10 +0200
Subject: [PATCH 0588/1286] 119207: Reinitialize the BrowseByComponent's
 objectInjector when startsWithOptions don't exist yet OnInit

---
 .../browse-by/browse-by.component.spec.ts     |  2 ++
 .../shared/browse-by/browse-by.component.ts   | 30 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 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 9317a68007..260e27c8cb 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -142,6 +142,8 @@ describe('BrowseByComponent', () => {
         { provide: RouteService, useValue: routeServiceStub},
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        { provide: 'startsWithOptions', useValue: [] },
+        { provide: 'paginationId', useValue: 'bbm' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 0dc20033f8..0e4c8cdca9 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output, SimpleChanges, OnChanges } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
@@ -26,7 +26,7 @@ import { TranslateService } from '@ngx-translate/core';
 /**
  * Component to display a browse-by page for any ListableObject
  */
-export class BrowseByComponent implements OnInit, OnDestroy {
+export class BrowseByComponent implements OnInit, OnDestroy, OnChanges {
 
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
@@ -182,14 +182,7 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.objectInjector = Injector.create({
-      providers: [
-        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
-        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
-      ],
-      parent: this.injector
-    });
-
+    this.generateInjector();
     const startsWith$ = this.routeService.getQueryParameterValue('startsWith');
     const value$ = this.routeService.getQueryParameterValue('value');
 
@@ -199,9 +192,26 @@ export class BrowseByComponent implements OnInit, OnDestroy {
     this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.startsWithOptions || changes.paginationId) {
+      this.generateInjector();
+    }
+  }
+
   ngOnDestroy(): void {
     if (this.sub) {
       this.sub.unsubscribe();
     }
   }
+
+  generateInjector(): void {
+    this.objectInjector = Injector.create({
+      providers: [
+        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
+        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
+      ],
+      parent: this.injector
+    });
+  }
+
 }

From 0657517915cd1d81c542a31737e9dc2428ea0018 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:14:58 +0000
Subject: [PATCH 0589/1286] Bump body-parser from 1.20.2 to 1.20.3

Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.2 to 1.20.3.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index 368a89a5f0..3888a2384e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3946,7 +3946,7 @@ bluebird@^3.7.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.3:
+body-parser@1.20.3, body-parser@^1.19.0:
   version "1.20.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
   integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
@@ -3964,24 +3964,6 @@ body-parser@1.20.3:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@^1.19.0:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 bonjour-service@^1.0.11:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
@@ -5603,11 +5585,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -9727,13 +9707,6 @@ qjobs@^1.2.0:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"

From f9fa58606051bf8641e326e1a647d3143efe373f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 14 Oct 2024 12:08:33 -0500
Subject: [PATCH 0590/1286] Create dependabot.yml

Add configs for version dependency updates
---
 .github/dependabot.yml | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..bc91ec15f7
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,47 @@
+# Enable Dependabot NPM updates for all dependencies on a weekly basis
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+# Group together Angular package upgrades
+groups:
+  # Group together all minor/patch version updates for Angular in a single PR
+  angular:
+    applies-to: version-updates
+    patterns:
+    - "@angular*"
+    update-types:
+    - "minor"
+    - "patch"
+  # Group together all security updates for Angular. Only accept minor/patch types.
+  angular-security:
+    applies-to: security-updates
+    patterns:
+    - "@angular*"
+    update-types:
+    - "minor"
+    - "patch"
+  # Group together all minor/patch version updates for NgRx in a single PR
+  ngrx:
+    applies-to: version-updates
+    patterns:
+    - "@ngrx*"
+    update-types:
+    - "minor"
+    - "patch"
+  # Group together all security updates for NgRx. Only accept minor/patch types.
+  ngrx-security:
+    applies-to: security-updates
+    patterns:
+    - "@ngrx*"
+    update-types:
+    - "minor"
+    - "patch"
+ignore:
+  # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+  - dependency-name: "*"
+    update-types: ["version-update:semver-major"]

From 0d36bcec2e79945bccca4e4463be1466f208b711 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 14 Oct 2024 12:22:53 -0500
Subject: [PATCH 0591/1286] Fix yaml alignment

---
 .github/dependabot.yml | 76 +++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bc91ec15f7..e8ce97d1ae 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,41 +7,41 @@ updates:
       interval: "weekly"
     # Allow up to 10 open PRs for dependencies
     open-pull-requests-limit: 10
-# Group together Angular package upgrades
-groups:
-  # Group together all minor/patch version updates for Angular in a single PR
-  angular:
-    applies-to: version-updates
-    patterns:
-    - "@angular*"
-    update-types:
-    - "minor"
-    - "patch"
-  # Group together all security updates for Angular. Only accept minor/patch types.
-  angular-security:
-    applies-to: security-updates
-    patterns:
-    - "@angular*"
-    update-types:
-    - "minor"
-    - "patch"
-  # Group together all minor/patch version updates for NgRx in a single PR
-  ngrx:
-    applies-to: version-updates
-    patterns:
-    - "@ngrx*"
-    update-types:
-    - "minor"
-    - "patch"
-  # Group together all security updates for NgRx. Only accept minor/patch types.
-  ngrx-security:
-    applies-to: security-updates
-    patterns:
-    - "@ngrx*"
-    update-types:
-    - "minor"
-    - "patch"
-ignore:
-  # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
-  - dependency-name: "*"
-    update-types: ["version-update:semver-major"]
+    # Group together Angular package upgrades
+    groups:
+      # Group together all minor/patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for Angular. Only accept minor/patch types.
+      angular-security:
+        applies-to: security-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for NgRx. Only accept minor/patch types.
+      ngrx-security:
+        applies-to: security-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]

From 2cf36824730d78f3b1d2d3a02d1f025068f4090d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 14 Oct 2024 15:52:50 -0500
Subject: [PATCH 0592/1286] Enable dependabot on 7.x and 8.x maintenance
 branches.

---
 .github/dependabot.yml | 100 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e8ce97d1ae..f9e32a0190 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +1,108 @@
 # Enable Dependabot NPM updates for all dependencies on a weekly basis
 version: 2
 updates:
+  ###############
+  ## Main branch
+  ###############
   - package-ecosystem: "npm"
     directory: "/"
+    target-branch: main
+    schedule:
+      interval: "weekly"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all minor/patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for Angular. Only accept minor/patch types.
+      angular-security:
+        applies-to: security-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for NgRx. Only accept minor/patch types.
+      ngrx-security:
+        applies-to: security-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-8_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-8_x
+    schedule:
+      interval: "weekly"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together Angular package upgrades
+    groups:
+      # Group together all patch version updates for Angular in a single PR
+      angular:
+        applies-to: version-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for Angular. Only accept minor/patch types.
+      angular-security:
+        applies-to: security-updates
+        patterns:
+        - "@angular*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all minor/patch version updates for NgRx in a single PR
+      ngrx:
+        applies-to: version-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for NgRx. Only accept minor/patch types.
+      ngrx-security:
+        applies-to: security-updates
+        patterns:
+        - "@ngrx*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+  #####################
+  ## dspace-7_x branch
+  #####################
+  - package-ecosystem: "npm"
+    directory: "/"
+    target-branch: dspace-7_x
     schedule:
       interval: "weekly"
     # Allow up to 10 open PRs for dependencies

From aee7f0f89932e612ece5ee28c51e5c20050df79c Mon Sep 17 00:00:00 2001
From: Mohamed Ali <66433220+mohamedali654321@users.noreply.github.com>
Date: Wed, 26 Jun 2024 00:51:14 -0700
Subject: [PATCH 0593/1286] Update Arabic Translation

Update Arabic Translation

Update  ar.json5 translation

(cherry picked from commit f5f40c3dc75563bbd67ef98307e58ef33c8b2789)
---
 src/assets/i18n/ar.json5 | 11229 ++++++++++++++++++++++++++++++-------
 1 file changed, 9246 insertions(+), 1983 deletions(-)

diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index 6d97effb4c..cf7f7b05bd 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -1,3383 +1,10646 @@
 {
-  "401.help": "غير مصرح لك بالوصول إلى هذه الصفحة. ",
+
+  // "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": "غير مصرح لك بالوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "401.unauthorized": "بدون كمية كافية",
-  "403.help": "ليس لديك إمكانية الوصول إلى هذه الصفحة. ",
+
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "بدون تصريح",
+
+  // "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": "ليس لديك صلاحية الوصول إلى هذه الصفحة. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "اذهب إلى الصفحة الرئيسية",
+
+  // "403.forbidden": "Forbidden",
   "403.forbidden": "ممنوع",
-  "500.page-internal-server-error": "الخدمة غير دائمة",
-  "500.help": "خادم غير قادر على الرد على سؤالك بسبب توقف التوفير أو وجود مشاكل في السعة. ",
+
+  // "500.page-internal-server-error": "Service unavailable",
+  "500.page-internal-server-error": "الخدمة غير متاحة",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "الخادم غير قادر مؤقتًا على تلبية طلبك بسبب توقف الصيانة أو وجود مشاكل في السعة. يرجى إعادة المحاولة في وقت لاحق.",
+
+  // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "404.help": "يمكنك العثور على الصفحة التي تبحث عنها.   ",
+
+  // "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": "تعذر العثور على الصفحة التي تبحث عنها. ربما تمت إزالتها أو حذفها. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.  ",
+
+  // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "اذهب إلى الصفحة الرئيسية",
-  "404.page-not-found": "لم يتم العثور عليها على الصفحة",
-  "error-page.description.401": "بدون كمية كافية",
+
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "لم يتم العثور على الصفحة",
+
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "بدون تصريح",
+
+  // "error-page.description.403": "Forbidden",
   "error-page.description.403": "ممنوع",
-  "error-page.description.500": "الخدمة غير دائمة",
-  "error-page.description.404": "لم يتم العثور عليها على الصفحة",
-  "error-page.orcid.generic-error": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. ",
+
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "الخدمة غير متاحة",
+
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "لم يتم العثور على الصفحة",
+
+  // "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": "حدث خطأ أثناء تسجيل الدخول عبر أوركيد. يرجى التأكد من أنك قمت بمشاركة عنوان البريد الإلكتروني الخاص بحساب أوركيد الخاص بك مع دي سبيس. إذا استمر الخطأ، فاتصل بالمسؤول",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
   "access-status.embargo.listelement.badge": "حظر",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
   "access-status.metadata.only.listelement.badge": "ميتاداتا فقط",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
   "access-status.open.access.listelement.badge": "وصول حر",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
   "access-status.restricted.listelement.badge": "مقيد",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
   "access-status.unknown.listelement.badge": "غير معروف",
-  "admin.curation-tasks.breadcrumbs": "واجبات النظام",
-  "admin.curation-tasks.title": "واجبات النظام",
-  "admin.curation-tasks.header": "واجبات النظام",
-  "admin.registries.bitstream-formats.breadcrumbs": "قم بالتسجيل",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "مهام أكرتة النظام",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "مهام أكرتة النظام",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "مهام أكرتة النظام",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "سجل التنسيق",
+
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.create.breadcrumbs": "تنسيق تدفق البت",
-  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تدفق البت الجديد.",
+
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "حدث خطأ أثناء إنشاء تنسيق تدفق البت الجديد.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "فشل",
-  "admin.registries.bitstream-formats.create.head": "إنشاء تدفق بت",
-  "admin.registries.bitstream-formats.create.new": "تمت إضافة تدفق بت جديد",
-  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تدفق البت الجديد الفعال.",
+
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
+  "admin.registries.bitstream-formats.create.head": "إنشاء تنسيق تدفق بت",
+
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "إضافة تنسيق تدفق بت جديد",
+
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "تم إنشاء تنسيق تدفق البت الجديد بنجاح.",
+
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "نجاح",
-  "admin.registries.bitstream-formats.delete.failure.amount": "فشل في إزالة {{ amount }} تنسيقًا",
+
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "فشل إزالة {{ amount }} تنسيقًا",
+
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "فشل",
-  "admin.registries.bitstream-formats.delete.success.amount": "بعد إزالة {{ amount }} فعالة",
+
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "تمت إزالة {{ amount }} تنسيقًا بنجاح",
+
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "نجاح",
-  "admin.registries.bitstream-formats.description": "مطلوب قائمة تدفق المعلومات الأساسية حول ما هو مطلوب ومستوى دعمها.",
+
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "توفر قائمة تنسيقات تدفق البت معلومات حول التنسيقات المعروفة ومستوى دعمها.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.edit.breadcrumbs": "تنسيق تدفق البت",
+
+  // "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": "الوصف",
-  "admin.registries.bitstream-formats.edit.extensions.hint": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف الملفات المرفوعة الأصلية. ",
+
+  // "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": "الامتدادات هي امتدادات الملفات التي تستخدم لتعريف تنسيق الملفات المرفوعة تلقائيًا. يمكنك إدخال عدة امتدادات لكل تنسيق.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "امتدادات الملفات",
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بتوسعة ملف بدون النقطة",
-  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تدفق البت.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "قم بإدخال امتداد ملف بدون النقطة",
+
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "حدث خطأ أثناء تحرير تنسيق تدفق البت.",
+
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "فشل",
-  "admin.registries.bitstream-formats.edit.head": "تدفق البت: {{ format }}",
-  "admin.registries.bitstream-formats.edit.internal.hint": "لاغراض إدارية خالية من المستخدم، لأغراض إدارية.",
+
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "تنسيق تدفق البت: {{ 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": "التنسيقات الداخلية مخفية من المستخدم، وتستخدم لأغراض إدارية.",
+
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "داخلي",
-  "admin.registries.bitstream-formats.edit.mimetype.hint": "نوع الميمات المرغوبة لذلك، لا يجب أن يكون فريدًا.",
-  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع الميم",
-  "admin.registries.bitstream-formats.edit.shortDescription.hint": "اسم فريد لهذا الغرض، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
+
+  // "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": "نوع المايم المرتبط بهذا التنسيق، لا يجب أن يكون فريدًا.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "نوع المايم",
+
+  // "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": "اسم فريد لهذا التنسيق، (مثال: ميكروسوفت وورد إكس بي أو ميكروسوفت وورد 200)",
+
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "الاسم",
-  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير الجذر التدفق الفعال.",
+
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "تم تحرير تنسيق تدفق البت بنجاح.",
+
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "نجاح",
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم الذي تعهد به مؤسستك لهذا الغرض.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "مستوى الدعم التي تتعهد به مؤسستك لهذا التنسيق.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "مستوى الدعم",
-  "admin.registries.bitstream-formats.head": "سجل تدفق البت",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "سجل تنسيق تدفق البت",
+
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "لا توجد تنسيقات لتدفق البت.",
-  "admin.registries.bitstream-formats.table.delete": "حذف",
+
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "حذف المحدد",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "إلغاء تحديد الكل",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "داخلي",
-  "admin.registries.bitstream-formats.table.mimetype": "نوع الميم",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "نوع المايم",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "الاسم",
-  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البتات الأولية",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "تنسيقات تدفقات البت المحددة",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "المعرّف",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "رجوع",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "معروف",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "مدعوم",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "غير معروف",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "مستوى الدعم",
-  "admin.registries.bitstream-formats.title": "سجل تدفق البت",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "سجل تنسيق تدفق البت",
+
+  // "admin.registries.bitstream-formats.select": "Select",
   "admin.registries.bitstream-formats.select": "تحديد",
-  "admin.registries.bitstream-formats.deselect": "قم بإلغاء التحديد",
-  "admin.registries.metadata.breadcrumbs": "سجل المذكرات",
-  "admin.registries.metadata.description": "تدعو إلى تسجيل النداءات بقائمة شاملة لتغطية النداءات المتاحة في المستودع. ",
-  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاماتا",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "إلغاء تحديد",
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "سجل الميتاداتا",
+
+  // "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": "يحتفظ سجل الميتاداتا بقائمة بجميع حقول الميتاداتا المتاحة في المستودع. يمكن تقسيم تلك الحقول بين عدة تخطيطات، يتطلب دي سبيس مخطط دبلن كور المؤهل.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "إنشاء مخطط ميتاداتا",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "تحرير مخطط الميتاداتا",
+
+  // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "الاسم",
-  "admin.registries.metadata.form.namespace": "اسم بعيد",
-  "admin.registries.metadata.head": "سجل المذكرات",
-  "admin.registries.metadata.schemas.no-items": "لا يوجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "مسافة الاسم",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "سجل الميتاداتا",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "لا توجد مخططات ميتاداتا للعرض.",
+
+  // "admin.registries.metadata.schemas.select": "Select",
   "admin.registries.metadata.schemas.select": "تحديد",
-  "admin.registries.metadata.schemas.deselect": "قم بإلغاء التحديد",
-  "admin.registries.metadata.schemas.table.delete": "حذف",
-  "admin.registries.metadata.schemas.table.selected": "التصنيفات المحددة",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "إلغاء تحديد",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "حذف المحدد",
+
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "المخططات المحددة",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "المعرّف",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "الاسم",
-  "admin.registries.metadata.schemas.table.namespace": "اسم بعيد",
-  "admin.registries.metadata.title": "سجل المذكرات",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "مسافة الاسم",
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "سجل الميتاداتا",
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "مخطط الميتاداتا",
-  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ \"{{namespace}}\".",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "هذا هو مخطط الميتاداتا لـ  \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.select": "Select",
   "admin.registries.schema.fields.select": "تحديد",
-  "admin.registries.schema.fields.deselect": "قم بإلغاء التحديد",
-  "admin.registries.schema.fields.head": "يغطي مخطط الميتاداتا",
-  "admin.registries.schema.fields.no-items": "لا توجد مشكلة ميتاداتا للعرض.",
-  "admin.registries.schema.fields.table.delete": "حذف",
-  "admin.registries.schema.fields.table.field": "بحث متقدم",
-  "admin.registries.schema.fields.table.selected": "تكفير الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "إلغاء تحديد",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "حقول مخطط الميتاداتا",
+
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "لا توجد حقول ميتاداتا للعرض.",
+
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "حذف المحدد",
+
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "حقل",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "حقول الميتاداتا المحددة",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "المعرّف",
-  "admin.registries.schema.fields.table.scopenote": "لاحظ النطاق",
-  "admin.registries.schema.form.create": "إنشاء بحث ميتا",
-  "admin.registries.schema.form.edit": "تحرير البحث ميتا",
+
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "ملاحظة النطاق",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "إنشاء حقل ميتاداتا",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "تحرير حقل ميتاداتا",
+
+  // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "عنصر",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "مؤهل",
-  "admin.registries.schema.form.scopenote": "لاحظ النطاق",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "ملاحظة النطاق",
+
+  // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "مخطط الميتاداتا",
-  "admin.registries.schema.notification.created": "تم إنشاء مخطط الميتاداتا \"{{prefix}}\"",
-  "admin.registries.schema.notification.deleted.failure": "فشل الحذف {{amount}} مخططات ميتا",
-  "admin.registries.schema.notification.deleted.success": "تم الحذف {{amount}} مخططات ميتا فعالة",
-  "admin.registries.schema.notification.edited": "تم فعالية تحرير مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "تم بنجاح إنشاء مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "فشل حذف {{amount}} مخطط ميتاداتا",
+
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "تم حذف {{amount}} مخطط ميتاداتا بنجاح",
+
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "تم بنجاح تحرير مخطط الميتاداتا \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "خطأ",
-  "admin.registries.schema.notification.field.created": "تم إنشاء البحث العلمي \"{{field}}\"",
-  "admin.registries.schema.notification.field.deleted.failure": "فشل الحذف {{amount}} بحث ميتا",
-  "admin.registries.schema.notification.field.deleted.success": "تم الحذف {{amount}} بحثت عن نتائج ميتا فعالة",
-  "admin.registries.schema.notification.field.edited": "تم البحث الفعال عن البحث في الميتاداتا \"{{field}}\"",
+
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "تم بنجاح إنشاء حقل الميتاداتا  \"{{field}}\"",
+
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "فشل حذف {{amount}} حقل ميتاداتا",
+
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "تم حذف {{amount}} حقل ميتاداتا بنجاح",
+
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "تم بنجاح تحرير حقل الميتاداتا \"{{field}}\"",
+
+  // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "نجاح",
+
+  // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "رجوع",
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "سجل مخطط الميتاداتا",
+
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
   "admin.access-control.bulk-access.breadcrumbs": "إدارة الوصول بالجملة",
+
+  // "administrativeBulkAccess.search.results.head": "Search Results",
   "administrativeBulkAccess.search.results.head": "نتائج البحث",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "إدارة الوصول بالجملة",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
   "admin.access-control.bulk-access.title": "إدارة الوصول بالجملة",
-  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بإنشاء الكائنات الحية",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "الخطوة الأولى: قم بتحديد الكائنات",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
   "admin.access-control.bulk-access-browse.search.header": "بحث",
-  "admin.access-control.bulk-access-browse.selected.header": "التحديد الفعلي({{number}})",
-  "admin.access-control.bulk-access-settings.header": "الثانية: المراد بإجرائها",
-  "admin.access-control.epeople.actions.delete": "حذف الالكترونيات الشخصية",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "التحديد الحالي({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "الخطوة الثانية: العملية المراد إجراؤها",
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "حذف شخص إلكتروني",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "التصرف كشخص إلكتروني",
+
+  // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "إعادة تعيين كلمة المرور",
-  "admin.access-control.epeople.actions.stop-impersonating": "ضبط التصرف كشخص إلكتروني",
-  "admin.access-control.epeople.breadcrumbs": "يأتي إليكين",
-  "admin.access-control.epeople.title": "يأتي إليكين",
-  "admin.access-control.epeople.edit.breadcrumbs": "شخصي إلكتروني جديد",
-  "admin.access-control.epeople.edit.title": "شخصي إلكتروني جديد",
-  "admin.access-control.epeople.add.breadcrumbs": "إضافة خاصة إلكترونيات",
-  "admin.access-control.epeople.add.title": "إضافة خاصة إلكترونيات",
-  "admin.access-control.epeople.head": "يأتي إليكين",
+
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "شخص إلكتروني جديد",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "أشخاص إلكترونيين",
+
+  // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "بحث",
-  "admin.access-control.epeople.button.see-all": "مراجعة الكل",
-  "admin.access-control.epeople.search.scope.metadata": "ميداداتا",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "الميتاداتا",
+
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "البريد الإلكتروني (بالضبط)",
+
+  // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "بحث",
-  "admin.access-control.epeople.search.placeholder": "بحث الناس...",
-  "admin.access-control.epeople.button.add": "إضافة خاصة إلكترونيات",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "بحث الأشخاص...",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "إضافة شخص إلكتروني",
+
+  // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "المعرّف",
+
+  // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "الاسم",
+
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "البريد الإلكتروني (بالضبط)",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "تحرير",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "تحرير \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "غير مصرح لك لتحرير هذه المجموعة",
+
+  // "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": "غير مصرح لك بتحرير هذه المجموعة",
+
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "حذف \"{{name}}\"",
-  "admin.access-control.epeople.no-items": "لا يوجد رجل إلكترونين للعرض.",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "لا يوجد أشخاص إلكترونيين للعرض.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
   "admin.access-control.epeople.form.create": "إنشاء شخص إلكتروني",
-  "admin.access-control.epeople.form.edit": "تحرير الكمبيوتر الشخصي",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "تحرير شخص إلكتروني",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "الاسم الأول",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "اسم العائلة",
+
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "البريد الإلكتروني",
-  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد الإلكتروني صالح",
-  "admin.access-control.epeople.form.canLogIn": "يمكننا تسجيل الدخول",
-  "admin.access-control.epeople.form.requireCertificate": "أنا",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  "admin.access-control.epeople.form.emailHint": "يجب أن يكون عنوان بريد إلكتروني صالح",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "يمكنه تسجيل الدخول",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "يتطلب شهادة",
+
+  // "admin.access-control.epeople.form.return": "Back",
   "admin.access-control.epeople.form.return": "رجوع",
+
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "تم إنشاء الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "فشل إنشاء الشخص الإلكتروني \"{{name}}\"، البريد الإلكتروني \"{{email}}\"تعمل بالفعل.",
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "فشل في تحرير الشخص الإلكتروني \"{{name}}\"، البريد الإلكتروني \"{{email}}\"تعمل بالفعل.",
+
+  // "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": "فشل إنشاء الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
+
+  // "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": "فشل تحرير الشخص الإلكتروني \"{{name}}\", البريد الإلكتروني \"{{email}}\" قيد الاستخدام بالفعل.",
+
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "تم تحرير الشخص الإلكتروني \"{{name}}\"بنجاح",
-  "admin.access-control.epeople.form.notification.edited.failure": "فشل في تحرير الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "فشل تحرير الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "تم حذف الشخص الإلكتروني \"{{name}}\"بنجاح",
-  "admin.access-control.epeople.form.notification.deleted.failure": "فشل في حذف الهاتف الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "فشل حذف الشخص الإلكتروني \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "عضو في هذه المجموعات:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "المعرّف",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "الاسم",
-  "admin.access-control.epeople.form.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "حاوية/مجتمع",
+
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "هذا الشخص الإلكتروني ليس عضواً في أي مجموعة",
-  "admin.access-control.epeople.form.goToGroups": "إضافة إلى مجموعات",
-  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف الشخص الإلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "تم حذف البريد الإلكتروني الخاص بالشخص: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.title": "مجموعات",
-  "admin.access-control.groups.breadcrumbs": "مجموعات",
-  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير المجموعة",
-  "admin.access-control.groups.title.singleGroup": "تحرير المجموعة",
+
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "أضف إلى مجموعات",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "حدث خطأ عند محاولة حذف شخص إلكتروني بالمعرف \"{{id}}\" بالرمز: \"{{statusCode}}\" والرسالة: \"{{restResponse.errorMessage}}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "تم حذف الشخص الإلكتروني: \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "المجموعات",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "المجموعات",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "تحرير مجموعة",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "تحرير مجموعة",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
   "admin.access-control.groups.title.addGroup": "مجموعة جديدة",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
   "admin.access-control.groups.addGroup.breadcrumbs": "مجموعة جديدة",
-  "admin.access-control.groups.head": "مجموعات",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "المجموعات",
+
+  // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "إضافة مجموعة",
-  "admin.access-control.groups.search.head": "بحثت المجموعات",
-  "admin.access-control.groups.button.see-all": "مراجعة الكل",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "بحث المجموعات",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "بحث",
-  "admin.access-control.groups.search.placeholder": "بحث في المجموعات...",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "بحث المجموعات...",
+
+  // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "المعرّف",
+
+  // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "الاسم",
-  "admin.access-control.groups.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "حاوية/مجتمع",
+
+  // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "الأعضاء",
+
+  // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "تحرير",
+
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "تحرير \"{{name}}\"",
+
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "حذف \"{{name}}\"",
-  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات دي فيينا أو كمعرفي فريد",
+
+  // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
+  "admin.access-control.groups.no-items": "لم يتم العثور على أي مجموعات بهذا في اسمها أو كمعرف عمومي فريد",
+
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "تم حذف المجموعة \"{{name}}\"بنجاح",
-  "admin.access-control.groups.notification.deleted.failure.title": "فشل في حذف المجموعة \"{{name}}\"",
+
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "فشل حذف المجموعة \"{{name}}\"",
+
+  // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "السبب: \"{{cause}}\"",
-  "admin.access-control.groups.form.alert.permanent": "هذه المجموعة حقوق، حقوق لا يمكن تحريرها أو حذفها. ",
-  "admin.access-control.groups.form.alert.workflowGroup": "لا يمكن تعديل هذه المجموعة أو حذفها بشكل واضح مع دقة عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}.  <a href='{{comcolEditRolesRoute}}'>\"تعيين الضبط\"</a> في صفحة التحرير {{comcol}}. ",
+
+  // "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": "هذه المجموعة دائمة، لذا لا يمكن تحريرها أو حذفها. لكن لايزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة..",
+
+  // "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": "لا يمكن تعديل هذه المجموعة أو حذفها لأنها تتوافق مع دور في عملية التقديم وسير العمل في \"{{name}}\" {{comcol}}. يمكنك حذفها من تبويب <a href='{{comcolEditRolesRoute}}'>\"تعيين الأدوار\"</a> في صفحة تحرير {{comcol}}. لا يزال بإمكانك إضافة وإزالة أعضاء المجموعة باستخدام هذه الصفحة.",
+
+  // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "إنشاء مجموعة",
-  "admin.access-control.groups.form.head.edit": "تحرير المجموعة",
+
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "تحرير مجموعة",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "اسم المجموعة",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
   "admin.access-control.groups.form.groupCommunity": "مجتمع أو حاوية",
+
+  // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "الوصف",
+
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "تم إنشاء المجموعة \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "فشل إنشاء المجموعة \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "فشل في إنشاء المجموعة بالاسم: \"{{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": "فشل إنشاء المجموعة بالاسم: \"{{name}}\"، يرجى التأكد أن الاسم ليس قيد الاستخدام بالفعل.",
+
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "فشل تحرير المجموعة \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\"تعمل بالفعل!",
+
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "الاسم \"{{name}}\" قيد الاستخدام بالفعل!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "تم تحرير المجموعة \"{{name}}\"بنجاح",
+
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "حذف المجموعة",
+
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "حذف المجموعة \"{{ 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": "هل أنت متأكد من أنك ترغب في حذف المجموعة \"{{ dsoName }}\"",
+
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "إلغاء",
+
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "حذف",
+
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "تم حذف المجموعة \"{{ name }}\"بنجاح",
-  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل في حذف المجموعة \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "فشل حذف المجموعة \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "السبب: \"{{ cause }}\"",
-  "admin.access-control.groups.form.members-list.head": "يأتي إليكين",
-  "admin.access-control.groups.form.members-list.search.head": "إضافة المزيد من الإلكترونيات",
-  "admin.access-control.groups.form.members-list.button.see-all": "مراجعة الكل",
-  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحالية",
+
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "أشخاص إلكترونيين",
+
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "الأعضاء الحاليين",
+
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "بحث",
+
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "المعرّف",
+
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "الاسم",
-  "admin.access-control.groups.form.members-list.table.identity": "هوية",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "الهوية",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
   "admin.access-control.groups.form.members-list.table.email": "البريد الإلكتروني",
+
+  // "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": "إزالة / إضافة",
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف العضو باسم \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "أكمل إضافة العضو: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "فشل في إضافة الموضوع: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "حذف عضو باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "تمت إضافة العضو: \"{{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": "فشل إضافة العضو: \"{{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": "تم حذف العضو: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "فشل في حذف العضو: \"{{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": "فشل حذف العضو: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
   "admin.access-control.groups.form.members-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
+
+  // "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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "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": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
-  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي شخص إلكترونين في هذا البحث",
+
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "هناك خطأ ما: \"{{cause}}\"",
-  "admin.access-control.groups.form.subgroups-list.head": "مجموعات",
+
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "المجموعات",
+
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "إضافة مجموعة فرعية",
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "مراجعة الكل",
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الشكلية",
+
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "استعراض الكل",
+
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "المجموعات الفرعية الحالية",
+
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "بحث",
+
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "المعرّف",
+
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "الاسم",
-  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "ابدأ/المجتمع",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "الحاوية/المجتمع",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "إزالة / إضافة",
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة المجموعة الفرعية باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "إزالة مجموعة فرعية باسم \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "إضافة مجموعة فرعية باسم \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "متابعة إضافة المجموعة: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "فشل في إضافة المجموعة الفرعية: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "تم حذف المجموعة اليدوية: \"{{name}}\"بنجاح",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "فشل حذف المجموعة المصنوعة: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "هذه هي المجموعة الحالية، لا يمكن الاتصال بها.",
-  "admin.access-control.groups.form.subgroups-list.no-items": "لم يتم العثور على مجموعات بهذا الاسم في دارفور أو بكمعرفي فريد",
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "لا يوجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "تمت إضافة المجموعة الفرعية: \"{{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": "فشل إضافة مجموعة فرعية: \"{{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": "تم حذف المجموعة الفرعية: \"{{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": "فشل حذف المجموعة الفرعية: \"{{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": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "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": "هذه هي المجموعة الحالية، لا يمكن إضافتها.",
+
+  // "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": "لم يتم العثور على مجموعات بهذا في اسمها أو بهذا كمعرف عمومي فريد",
+
+  // "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": "لا توجد مجموعات فرعية في المجموعة حتى الآن.",
+
+  // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "رجوع",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
   "admin.quality-assurance.breadcrumbs": "ضمان الجودة",
-  "admin.notifications.event.breadcrumbs": "آلات ضمان الجودة",
-  "admin.notifications.event.page.title": "آلات ضمان الجودة",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "مقترحات ضمان الجودة",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "مقترحات ضمان الجودة",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
   "admin.quality-assurance.page.title": "ضمان الجودة",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
   "admin.notifications.source.breadcrumbs": "مصدر ضمان الجودة",
-  "admin.access-control.groups.form.tooltip.editGroupPage": "في هذه الصفحة، يمكنك تعديل مجموعة الخصائص وأعضائها. ",
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "وتفكر شخصياً في هذه المجموعة أو تأسيسها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المسدلة الموجودة على يسار شريط البحث ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ",
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "وبعد مجموعة فرعية إلى هذه المجموعة أو التغطية منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ",
-  "admin.reports.collections.title": "تقرير تصفية المجموعة",
-  "admin.reports.collections.breadcrumbs": "تقرير تصفية المجموعة",
-  "admin.reports.collections.head": "تقرير تصفية المجموعة",
-  "admin.reports.button.show-collections": "عرض المجموعات",
-  "admin.reports.collections.collections-report": "تقرير التحصيل",
-  "admin.reports.collections.item-results": "نتائج البند",
-  "admin.reports.collections.community": "مجتمع",
-  "admin.reports.collections.collection": "مجموعة",
-  "admin.reports.collections.nb_items": "ملحوظة. ",
-  "admin.reports.collections.match_all_selected_filters": "مطابقة جميع المرشحات المحددة",
-  "admin.reports.items.breadcrumbs": "تقرير استعلام بيانات التعريف",
-  "admin.reports.items.head": "تقرير استعلام بيانات التعريف",
-  "admin.reports.items.run": "تشغيل استعلام العنصر",
-  "admin.reports.items.section.collectionSelector": "محدد المجموعة",
-  "admin.reports.items.section.metadataFieldQueries": "استعلامات حقل بيانات التعريف",
-  "admin.reports.items.predefinedQueries": "الاستعلامات المحددة مسبقًا",
-  "admin.reports.items.section.limitPaginateQueries": "استعلامات الحد/الصفحات",
-  "admin.reports.items.limit": "حد/",
-  "admin.reports.items.offset": "عوض",
-  "admin.reports.items.wholeRepo": "المستودع كله",
-  "admin.reports.items.anyField": "أي مجال",
-  "admin.reports.items.predicate.exists": "موجود",
-  "admin.reports.items.predicate.doesNotExist": "غير موجود",
-  "admin.reports.items.predicate.equals": "يساوي",
-  "admin.reports.items.predicate.doesNotEqual": "لا يساوي",
-  "admin.reports.items.predicate.like": "يحب",
-  "admin.reports.items.predicate.notLike": "لا يشبه",
-  "admin.reports.items.predicate.contains": "يتضمن",
-  "admin.reports.items.predicate.doesNotContain": "لا يحتوي",
-  "admin.reports.items.predicate.matches": "اعواد الكبريت",
-  "admin.reports.items.predicate.doesNotMatch": "غير متطابق",
-  "admin.reports.items.preset.new": "استعلام جديد",
-  "admin.reports.items.preset.hasNoTitle": "لا يوجد لديه عنوان",
-  "admin.reports.items.preset.hasNoIdentifierUri": "لا يوجد لديه dc.identifier.uri",
-  "admin.reports.items.preset.hasCompoundSubject": "لديه موضوع مركب",
-  "admin.reports.items.preset.hasCompoundAuthor": "يحتوي على مركب dc.contributor.author",
-  "admin.reports.items.preset.hasCompoundCreator": "لديه مجمع DC.creator",
-  "admin.reports.items.preset.hasUrlInDescription": "لديه عنوان URL في dc.description",
-  "admin.reports.items.preset.hasFullTextInProvenance": "يحتوي على النص الكامل في dc.description.provenance",
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "يحتوي على نص غير كامل في dc.description.provenance",
-  "admin.reports.items.preset.hasEmptyMetadata": "تحتوي على بيانات وصفية فارغة",
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "يحتوي على بيانات وصفية غير منقطعة في الوصف",
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "يحتوي على كيان XML في بيانات التعريف",
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "يحتوي على حرف غير ascii في البيانات الوصفية",
-  "admin.reports.items.number": "لا.",
+
+  // "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.editGroupPage": "في هذه الصفحة، يمكنك تعديل خصائص المجموعة وأعضائها. في القسم العلوي، يمكنك تحرير اسم المجموعة ووصفها، ما لم تكن هذه مجموعة إدارية لحاوية أو مجتمع، وفي هذه الحالة يتم إنشاء اسم المجموعة ووصفها تلقائياً ولا يمكن تحريرهما. في الأقسام التالية، يمكنك تعديل عضوية المجموعة. انظر [الويكي](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) للمزيد من التفاصيل.",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "لإضافة شخص إلكتروني إلى هذه المجموعة أو إزالته منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المستخدمين (استخدم القائمة المنسدلة الموجودة على يسار شريط البحث لاختيار ما إذا كنت تريد البحث حسب الميتاداتا أو حسب البريد الإلكتروني). ثم قم بالنقر على أيقونة زائد لكل مستخدم ترغب في إضافته في القائمة أدناه، أو أيقونة سلة المهملات لكل مستخدم ترغب في إزالته. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "لإضافة مجموعة فرعية إلى هذه المجموعة أو إزالتها منها، قم بالنقر على زر 'استعراض الكل' أو قم باستخدام شريط البحث أدناه للبحث عن المجموعات. ثم قم بالنقر على أيقونة زائد لكل مجموعة ترغب في إضافتها في القائمة أدناه، أو أيقونة سلة المهملات لكل مجموعة ترغب في إزالتها. قد تحتوي القائمة أدناه على عدة صفحات: استخدم عناصر التحكم في الصفحة الموجودة أسفل القائمة للانتقال إلى الصفحات التالية.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
+
+  // "admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
+
+  // "admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // TODO New key - Add a translation
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
+
+  // "admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  // "admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
+
+  // "admin.reports.items.offset": "Offset",
+  // TODO New key - Add a translation
+  "admin.reports.items.offset": "Offset",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  // "admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  // "admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  // "admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  // "admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
+
+  // "admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
   "admin.reports.items.id": "UUID",
-  "admin.reports.items.collection": "مجموعة",
+
+  // "admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
+
+  // "admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
   "admin.reports.items.handle": "URI",
-  "admin.reports.items.title": "عنوان",
-  "admin.reports.commons.filters": "المرشحات",
-  "admin.reports.commons.additional-data": "بيانات إضافية للعودة",
-  "admin.reports.commons.previous-page": "الصفحة السابقة",
-  "admin.reports.commons.next-page": "الصفحة التالية",
-  "admin.reports.commons.page": "صفحة",
-  "admin.reports.commons.of": "ل",
-  "admin.reports.commons.export": "تصدير لتحديث بيانات التعريف",
-  "admin.reports.commons.filters.deselect_all": "قم بإلغاء تحديد جميع المرشحات",
-  "admin.reports.commons.filters.select_all": "حدد كافة المرشحات",
-  "admin.reports.commons.filters.matches_all": "يطابق جميع المرشحات المحددة",
-  "admin.reports.commons.filters.property": "عوامل تصفية خصائص العنصر",
-  "admin.reports.commons.filters.property.is_item": "هل البند - صحيح دائمًا",
-  "admin.reports.commons.filters.property.is_withdrawn": "العناصر المسحوبة",
-  "admin.reports.commons.filters.property.is_not_withdrawn": "العناصر المتوفرة - لم يتم سحبها",
-  "admin.reports.commons.filters.property.is_discoverable": "العناصر القابلة للاكتشاف - ليست خاصة",
-  "admin.reports.commons.filters.property.is_not_discoverable": "غير قابل للاكتشاف - عنصر خاص",
-  "admin.reports.commons.filters.bitstream": "مرشحات تيار البت الأساسية",
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "يحتوي العنصر على تدفقات بت أصلية متعددة",
-  "admin.reports.commons.filters.bitstream.has_no_originals": "لا يحتوي العنصر على تدفقات بت أصلية",
-  "admin.reports.commons.filters.bitstream.has_one_original": "يحتوي العنصر على تدفق بت أصلي واحد",
-  "admin.reports.commons.filters.bitstream_mime": "عوامل تصفية Bitstream حسب نوع MIME",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "يحتوي العنصر على Doc Original Bitstream (PDF، Office، Text، HTML، XML، إلخ)",
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "يحتوي العنصر على تدفق بت للصورة الأصلية",
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "يحتوي على أنواع Bitstream أخرى (ليست Doc أو Image)",
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "يحتوي العنصر على أنواع متعددة من تدفقات البت الأصلية (Doc، Image، Other)",
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "يحتوي العنصر على تدفق بت أصلي بتنسيق PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "يحتوي العنصر على JPG Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "يحتوي على ملف PDF صغير بشكل غير عادي",
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "يحتوي على ملف PDF كبير الحجم بشكل غير عادي",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "يحتوي على تدفق بت للمستند بدون عنصر TEXT",
-  "admin.reports.commons.filters.mime": "عوامل تصفية نوع MIME المدعومة",
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "يتم دعم تدفقات البت لصورة العنصر",
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "يحتوي العنصر على Image Bitstream غير مدعوم",
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "يتم دعم تدفقات بت مستند العنصر",
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "يحتوي العنصر على تدفق بت للمستند غير مدعوم",
-  "admin.reports.commons.filters.bundle": "مرشحات حزمة Bitstream",
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "يحتوي على تدفق بت في حزمة غير مدعومة",
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "لديه صورة مصغرة صغيرة بشكل غير عادي",
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "يحتوي على تدفق بت أصلي بدون صورة مصغرة",
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "يحتوي على اسم صورة مصغرة غير صالح (بافتراض صورة مصغرة واحدة لكل نسخة أصلية)",
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "تحتوي على صورة مصغرة لم يتم إنشاؤها",
-  "admin.reports.commons.filters.bundle.no_license": "ليس لديه ترخيص",
-  "admin.reports.commons.filters.bundle.has_license_documentation": "لديه وثائق في حزمة الترخيص",
-  "admin.reports.commons.filters.permission": "مرشحات الأذونات",
-  "admin.reports.commons.filters.permission.has_restricted_original": "يحتوي العنصر على تدفق بت أصلي مقيد",
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "يحتوي العنصر على تدفق بت أصلي واحد على الأقل لا يمكن للمستخدم المجهول الوصول إليه",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "يحتوي العنصر على صورة مصغرة مقيدة",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "يحتوي العنصر على صورة مصغرة واحدة على الأقل لا يمكن للمستخدم المجهول الوصول إليها",
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "يحتوي العنصر على بيانات وصفية مقيدة",
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "يحتوي العنصر على بيانات تعريف لا يمكن للمستخدم المجهول الوصول إليها",
+
+  // "admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
+
+  // "admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  // TODO New key - Add a translation
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
+
+  // "admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
+
+  // "admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+  // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "بحث إداري",
+
+  // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "تحرير",
+
+  // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "تحرير",
+
+  // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "حذف",
+
+  // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "تحرير",
-  "admin.search.item.make-private": "اجعله غير للاكتشاف",
-  "admin.search.item.make-public": "اجعله للاكتشاف",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "اجعله غير قابل للاكتشاف",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "اجعله قابل للاكتشاف",
+
+  // "admin.search.item.move": "Move",
   "admin.search.item.move": "نقل",
+
+  // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "إعادة تعيين",
-  "admin.search.item.withdraw": "يسحب",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "سحب",
+
+  // "admin.search.title": "Administrative Search",
   "admin.search.title": "بحث إداري",
+
+  // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "بحث إداري",
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "أدر سير العمل",
+
+  // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "أدر سير العمل",
+
+  // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "سير العمل",
+
+  // "admin.workflow.item.workspace": "Workspace",
   "admin.workflow.item.workspace": "مساحة العمل",
+
+  // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "حذف",
-  "admin.workflow.item.send-back": "إعادة الإرسال",
-  "admin.workflow.item.policies": "تماما",
-  "admin.workflow.item.supervision": "شاهد",
-  "admin.metadata-import.breadcrumbs": "قم باستيراد الميتاداتا",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "إعادة إرسال",
+
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "السياسات",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "الإشراف",
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "استيراد الميتاداتا",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
   "admin.batch-import.breadcrumbs": "استيراد الدفعة",
-  "admin.metadata-import.title": "قم باستيراد الميتاداتا",
+
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "استيراد الميتاداتا",
+
+  // "admin.batch-import.title": "Import Batch",
   "admin.batch-import.title": "استيراد الدفعة",
-  "admin.metadata-import.page.header": "قم باستيراد الميتاداتا",
+
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "استيراد الميتاداتا",
+
+  // "admin.batch-import.page.header": "Import Batch",
   "admin.batch-import.page.header": "استيراد الدفعة",
-  "admin.metadata-import.page.help": "يمكنك أن تحتوي أو تستعرض ملفات CSV التي تحتوي على عمليات ميتة بالدفع على الملفات من هنا",
-  "admin.batch-import.page.help": "حدد المراد الاستيراد منها. ",
-  "admin.batch-import.page.toggle.help": "من خلال إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم المزيد لتعيين مصدر الإدخال",
-  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا للاستيراده",
+
+  // "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": "يمكنك إفلات أو استعراض ملفات CSV التي تحتوي على عمليات ميتاداتا بالدفعة على الملفات من هنا",
+
+  // "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": "حدد الحاوية المراد الاستيراد إليها. بعد ذلك، قم بإسقاط أو تصفح ملف مضغوط بتنسيق أرشيف بسيط (SAF) يتضمن المواد المراد استيرادها",
+
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "من الممكن إجراء الاستيراد إما عن طريق تحميل الملف أو عبر عنوان URL، استخدم التبديل أعلاه لتعيين مصدر الإدخال",
+
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "قم بإسقاط ملف CSV للميتاداتا لاستيراده",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
   "admin.batch-import.page.dropMsg": "قم بإسقاط ZIP الدفعة المراد استيرادها",
-  "admin.metadata-import.page.dropMsgReplace": "قم بالمسح لاستبدال ملف CSV للميتاداتا المراد استيراده",
-  "admin.batch-import.page.dropMsgReplace": "قم بالمسح لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ملف CSV للميتاداتا المراد استيراده",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "قم بالإسقاط لاستبدال ZIP الدفعة المراد استيرادها",
+
+  // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "رجوع",
+
+  // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "متابعة",
-  "admin.metadata-import.page.button.select-collection": "حدد",
-  "admin.metadata-import.page.error.addFile": "حدد ملف الجديد!",
-  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف الجديد!",
-  "admin.batch-import.page.error.addFile": "حدد ملف ZIP الجديد!",
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "حدد الحاوية",
+
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "حدد ملف أولاً!",
+
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "أدخل عنوان URL للملف أولاً!",
+
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "حدد ملف ZIP أولاً!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload",
   "admin.metadata-import.page.toggle.upload": "تحميل",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
   "admin.metadata-import.page.toggle.url": "عنوان URL",
-  "admin.metadata-import.page.urlMsg": "قم بالضغط على عنوان url لملف ZIP الخاص بالدفعة للاستيراده",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "قم بإدخال عنوان url لملف ZIP الخاص بالدفعة لاستيراده",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "التحقق فقط",
-  "admin.metadata-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة ملف CSV الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
   "advanced-workflow-action.rating.form.rating.label": "التقييم",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
   "advanced-workflow-action.rating.form.rating.error": "يجب عليك تقييم هذه المادة",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
   "advanced-workflow-action.rating.form.review.label": "مراجعة",
-  "advanced-workflow-action.rating.form.review.error": "يجب عليك تفصيل تفاصيل لتقديم هذا التقييم",
-  "advanced-workflow-action.rating.description": "برجاء تحديد التقييم أدناه",
-  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم التفصيلي للمراجعة",
-  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مرشح واحد أدناه للمقدمة",
-  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مرشح واحد أو أكثر أدناه قبل التقديم",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "يأتي إليكين",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة المزيد من الإلكترونيات",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "مراجعة الكل",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحالية",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "يجب عليك إدخال مراجعة لتقديم هذا التقييم",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "يرجى تحديد التقييم أدناه",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "يرجى تحديد التقييم أدناه وإضافة مراجعة",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "يرجى اختيار مراجع واحد أدناه قبل التقديم",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "يرجى اختيار مراجع واحد أو أكثر أدناه قبل التقديم",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "إضافة أشخاص إلكترونيين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "استعراض الكل",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "الأعضاء الحاليين",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "بحث",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "المعرّف",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "الاسم",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "هوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "الهوية",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "البريد الإلكتروني",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "إزالة / إضافة",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "إزالة عضو باسم \"{{name}}\"",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "أكمل إضافة العضو: \"{{name}}\"بنجاح",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل في إضافة الموضوع: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "تمت إضافة العضو: \"{{name}}\"بنجاح",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "فشل إضافة العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "تم حذف العضو: \"{{name}}\"بنجاح",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل في حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "فشل حذف العضو: \"{{name}}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "إضافة عضو باسم \"{{name}}\"",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة حاليًا، سيتم تقديم الاسم الجديد.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "لا توجد مجموعة نشطة حالياً، قم بتقديم الاسم أولاً.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "لا يوجد أعضاء في المجموعة حتى الآن، قم بالبحث والإضافة.",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي شخص إلكترونين في هذا البحث",
-  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي زائر.",
-  "admin.batch-import.page.validateOnly.hint": "عند التحديد، سيتم التحقق من صحة الملف الموجود الذي تم تحميله. ",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "لم يتم العثور على أي أشخاص إلكترونيين في هذا البحث",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "لم يتم تحديد أي مراجع.",
+
+  // "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": "عند التحديد، سيتم التحقق من صحة الملف المضغوط الذي تم تحميله. ستتلقى تقريراً بالتغييرات التي تم اكتشافها، ولكن لن يتم حفظ أي تغييرات.",
+
+  // "admin.batch-import.page.remove": "remove",
   "admin.batch-import.page.remove": "إزالة",
-  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة مرور غير صالحة.",
-  "auth.messages.expired": "لقد تعلمت. ",
-  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. ",
+
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "عنوان البريد الإلكتروني أو كلمة المرور غير صالحة.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "لقد انتهت جلستك. يرجى تسجيل الدخول مرة أخرى.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "فشل تحديث الرمز المميز لجلستك. يرجى تسجيل الدخول مرة أخرى.",
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "جاري الآن تنزيل {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "رجوع",
-  "bitstream.edit.authorizations.link": "تحرير سياسة تدفق البت",
-  "bitstream.edit.authorizations.title": "تحرير سياسة تدفق البت",
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "تحرير سياسات تدفق البت",
+
+  // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "رجوع",
+
+  // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "تدفق البت: ",
-  "bitstream.edit.form.description.hint": "اختياريًا، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\"أو\"<i>قراءات بيانات الخبرة</i>\".",
+
+  // "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": "اختيارياً، قم بتقديم وصف مختصر للملف، على سبيل المثال \"<i>المقال الرئيسي</i>\" أو \"<i>قراءات بيانات التجربة</i>\".",
+
+  // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "الوصف",
-  "bitstream.edit.form.embargo.hint": "أول يوم يسمح له بالوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر تدفق بت، قم بالذهاب إلى كتلة <i> المادة</i>، كوك بالنقر على <i>...تصاريح</i>، إنشاء أو تحرير أبو <i>يقرأ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ الميلاد</i> حسب الطلب.",
-  "bitstream.edit.form.embargo.label": "الحظر حتى تاريخ المحدد",
-  "bitstream.edit.form.fileName.hint": "تغيير اسم الملف لتدفق البت. ",
+
+  // "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": "أول يوم يسمح منه الوصول. <b>لا يمكن تعديل هذا التاريخ في هذا النموذج.</b> لتعيين تاريخ حظر لتدفق بت، قم بالذهاب إلى تبويب <i> حالة المادة</i>، وقم بالنقر على <i>تصاريح...</i>، إنشاء أو تحرير سياسة <i>READ</i> الخاصة بتدفق البت، وتعيين <i> تاريخ البدء</i> حسب الرغبة.",
+
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "حظر حتى تاريخ محدد",
+
+  // "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": "تغيير اسم الملف لتدفق البت. لاحظ أن هذا سيؤدي إلى تغيير عنوان URL لدفق البت المعروض، لكن الروابط القديمة ستظل تحل طالما لم يتغير معرف التسلسل.",
+
+  // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "اسم الملف",
-  "bitstream.edit.form.newFormat.label": "وصفه محدده جديده",
+
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "وصف التنسيق الجديد",
+
+  // "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": "التطبيق الذي قمت باستخدامه لإنشاء الملف، ورقم الإصدار (على سبيل المثال: \"<i>ACMESoft SuperApp الإصدار 1.5</i>\").",
-  "bitstream.edit.form.primaryBitstream.label": "التدفق الرئيسي للبيت",
-  "bitstream.edit.form.selectedFormat.hint": "إذا لم يكن متاحًا في المستقبل، <b>يجب أن يطلب \"التنسيق غير موجود في المستند\" مسبقًا</b> مسموح لها \"وصف التنسيق الجديد\".",
-  "bitstream.edit.form.selectedFormat.label": "البحث عن أداة",
-  "bitstream.edit.form.selectedFormat.unknown": "في حالة عدم وجودها في القائمة",
-  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تدفق البت",
-  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ التدفق الأساسي",
-  "bitstream.edit.form.iiifLabel.label": "ملصق التسمية IIIF",
-  "bitstream.edit.form.iiifLabel.hint": "تسمية قماش لهذه الصورة. ",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "تدفق البت الرئيسي",
+
+  // "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": "إذا لم يكن التنسيق موجوداً في القائمة أعلاه، <b>قم بتحديد \"التنسيق غير موجود في القائمة\" أعلاه</b> وقم بوصفه أدنى  \"وصف تنسيق جديد\".",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "التنسيق المحدد",
+
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "التنسيق غير موجود في القائمة",
+
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "لقد حدث خطأ أثناء حفظ تنسيق تدفق البت",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "حدث خطأ أثناء حفظ تدفق البت الرئيسي",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "ملصق تسمية 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 لهذه الصورة. إذا لم يتم توفير التسمية الافتراضية سيتم استخدامها.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
   "bitstream.edit.form.iiifToc.label": "جدول محتويات IIIF",
-  "bitstream.edit.form.iiifToc.hint": "إن إضافة نص هنا تجعل هذا بداية لنطاق محتويات جديد.",
-  "bitstream.edit.form.iiifWidth.label": "عرض قماش IIIF",
-  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض القماش مع عرض الصورة.",
-  "bitstream.edit.form.iiifHeight.label": "ارتفاع قماش IIIF",
-  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع القماش مع ارتفاع الصورة.",
-  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أحبها على تدفق هذا.",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  "bitstream.edit.form.iiifToc.hint": "إن إضافة نص هنا تجعل هذا بداية لنطاق جدول محتويات جديد.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "عرض IIIF Canvas",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "يجب أن يتطابق عرض Canvas عادةً مع عرض الصورة.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "ارتفاع Canvas IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "يجب أن يتطابق ارتفاع Canvas عادةً مع ارتفاع الصورة.",
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على تدفق البت هذا.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "تم حفظ تدفق البت",
+
+  // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "تحرير تدفق البت",
-  "bitstream-request-a-copy.alert.canDownload1": "لقد بالفعل حق الوصول إلى هذا الملف.  ",
+
+  // "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": "لديك بالفعل حق الوصول إلى هذا الملف. إذا كنت تريد تنزيل الملف، انقر ",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
   "bitstream-request-a-copy.alert.canDownload2": "هنا",
-  "bitstream-request-a-copy.header": "نسخة الطلب من الملف",
-  "bitstream-request-a-copy.intro": "يرجى إعادة المعلومات التالية لطلب النسخة التالية: ",
-  "bitstream-request-a-copy.intro.bitstream.one": "جاري الطلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "طلب نسخة من الملف",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "قم بإدخال المعلومات التالية لطلب نسخة للمادة التالية: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "جاري طلب الملف التالي: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "طلب كل الملفات. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
   "bitstream-request-a-copy.name.label": "الاسم *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "الاسم مطلوب",
-  "bitstream-request-a-copy.email.label": "عنوان بريدك الإلكتروني *",
-  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان البريد الإلكتروني هذا الملف.",
-  "bitstream-request-a-copy.email.error": "يرجى الاتصال بعنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "عنوان بريدك  الإلكتروني *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "يتم استخدام عنوان هذا البريد الإلكتروني لإرسال الملف.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
   "bitstream-request-a-copy.allfiles.label": "ملفات",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
   "bitstream-request-a-copy.files-all-false.label": "الملف المطلوب فقط",
-  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المحدود",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "كل الملفات (لهذه المادة) في الوصول المقيد",
+
+  // "bitstream-request-a-copy.message.label": "Message",
   "bitstream-request-a-copy.message.label": "رسالة",
+
+  // "bitstream-request-a-copy.return": "Back",
   "bitstream-request-a-copy.return": "رجوع",
-  "bitstream-request-a-copy.submit": "نسخة الطلب",
-  "bitstream-request-a-copy.submit.success": "تم تقديم طلب فعال.",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "طلب نسخة",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "تم تقديم طلب المادة بنجاح.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "حدث خطأ ما أثناء تقديم طلب المادة.",
-  "browse.back.all-results": "جميع النتائج حدثت",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "جميع نتائج الاستعراض",
+
+  // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "حسب المؤلف",
+
+  // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "حسب تاريخ الإصدار",
+
+  // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "حسب الموضوع",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "حسب فئة الموضوع",
-  "browse.comcol.by.nsi": "حسب فرس العلوم النرويجي",
-  "browse.comcol.by.title": "عنوان حسب الطلب",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "حسب فهرس العلوم النرويجي",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "حسب العنوان",
+
+  // "browse.comcol.head": "Browse",
   "browse.comcol.head": "استعراض",
-  "browse.empty": "لا يوجد شيء للعرض.",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty": "لا توجد مواد للعرض.",
+
+  // "browse.metadata.author": "Author",
   "browse.metadata.author": "المؤلف",
+
+  // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "تاريخ الإصدار",
+
+  // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "الموضوع",
-  "browse.metadata.title": "عنوان العنوان",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "العنوان",
+
+  // "browse.metadata.srsc": "Subject Category",
   "browse.metadata.srsc": "فئة الموضوع",
-  "browse.metadata.author.breadcrumbs": "مراجعة حسب المؤلف",
-  "browse.metadata.dateissued.breadcrumbs": "تاريخ المراجعة حسب التاريخ",
-  "browse.metadata.subject.breadcrumbs": "مراجعة حسب الموضوع",
-  "browse.metadata.srsc.breadcrumbs": "مراجعة حسب فئة الموضوع",
-  "browse.metadata.nsi.breadcrumbs": "مراجعة حسب هرس العلوم النرويجي",
-  "browse.metadata.title.breadcrumbs": "قم باستعراض العنوان حسب الطلب",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "استعراض حسب المؤلف",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "استعراض حسب التاريخ",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "استعراض حسب الموضوع",
+
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "استعراض حسب فئة الموضوع",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "استعراض حسب فهرس العلوم النرويجي",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "استعراض حسب العنوان",
+
+  // "pagination.next.button": "Next",
   "pagination.next.button": "التالي",
-  "pagination.previous.button": "السابقة",
-  "pagination.next.button.disabled.tooltip": "لا تقرأ من الصفحات من النتائج",
-  "browse.startsWith": "، يبدأ بـ {{ startsWith }}",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "السابق",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "لا مزيد من الصفحات من النتائج",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", يبدأ بـ {{ startsWith }}",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(اختر الشهر)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(اختر السنة)",
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
   "browse.startsWith.choose_year.label": "اختر سنة الإصدار",
-  "browse.startsWith.jump": "تهذيب النتيجة حسب السنة أو الشهر",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "تنقيح النتائج حسب السنة أو الشهر",
+
+  // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "أبريل",
+
+  // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "أغسطس",
+
+  // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "ديسمبر",
+
+  // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "فبراير",
+
+  // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "يناير",
+
+  // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "يوليو",
+
+  // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "يونيو",
+
+  // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "مارس",
+
+  // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "مايو",
+
+  // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(اختر الشهر)",
-  "browse.startsWith.months.none.label": "تاريخ إنشاء الإصدار",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "اختر تاريخ الإصدار",
+
+  // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "نوفمبر",
+
+  // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "أكتوبر",
+
+  // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "سبتمبر",
+
+  // "browse.startsWith.submit": "Browse",
   "browse.startsWith.submit": "استعراض",
-  "browse.startsWith.type_date": "تأهيل النتائج حسب التاريخ",
-  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر المراجعة.",
-  "browse.startsWith.type_text": "تسهيل البحث عن طريق كتابة الرواية الأولى",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "تنقيح النتائج حسب التاريخ",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "أو قم بكتابة تاريخ (السنة - الشهر) والنقر على زر استعراض.",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
+
+  // "browse.startsWith.input": "Filter",
   "browse.startsWith.input": "منقح",
+
+  // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "استعراض",
-  "browse.title": "مراجعة حسب الطلب {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title.page": "مراجعة حسب الطلب {{ field }} {{ value }}",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "استعراض حسب {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "استعراض حسب {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "العودة إلى النتائج",
-  "chips.remove": "إزالة الجانب",
+
+  // "chips.remove": "Remove chip",
+  "chips.remove": "إزالة الشريحة",
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
   "claimed-approved-search-result-list-element.title": "مقبول",
-  "claimed-declined-search-result-list-element.title": "تم الرفض وتمت إعادة إنتاجه إلى مقدم الطلب",
-  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت إعادة العمل إلى سير عمل مدير المراجعة",
-  "collection.browse.logo": "تمت القراءة للحصول على شعار للصورة",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى مقدم الطلب",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "تم الرفض، وتمت الإعادة إلى سير عمل مدير المراجعة",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "استعراض للحصول على شعار للحاوية",
+
+  // "collection.create.head": "Create a Collection",
   "collection.create.head": "إنشاء حاوية",
-  "collection.create.notifications.success": "تم إنشاء فعال",
-  "collection.create.sub-head": "إنشاء خانة تمكين {{ parent }}",
+
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "تم إنشاء الحاوية بنجاح",
+
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "إنشاء حاوية للمجتمع {{ parent }}",
+
+  // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "أكرتة الحاوية: {{collection}}",
+
+  // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "إلغاء",
-  "collection.delete.confirm": "بالتأكيد",
-  "collection.delete.processing": "غاري الحذف",
-  "collection.delete.head": "تأكد من الحذف",
-  "collection.delete.notification.fail": "عذرا حف",
-  "collection.delete.notification.success": "تم الحذف الفعال",
-  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الهاتف \"{{ dso }}\"",
-  "collection.edit.delete": "حذف هذه الصورة",
-  "collection.edit.head": "تحرير",
-  "collection.edit.breadcrumbs": "تحرير",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "تأكيد",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "جاري الحذف",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "حذف الحاوية",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "تعذر حف الحاوية",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "تم حذف الحاوية بنجاح",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "هل أنت متأكد من أنك تريد حذف الحاوية \"{{ dso }}\"",
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "حذف هذه الحاوية",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "تحرير الحاوية",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "تحرير الحاوية",
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "مخطط المادة",
-  "collection.edit.tabs.item-mapper.title": "فتح المادة",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "تحرير الحاوية - مخطط المادة",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "إلغاء",
-  "collection.edit.item-mapper.collection": "التام: \"<b>{{name}}</b>\"",
+
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "الحاوية: \"<b>{{name}}</b>\"",
+
+  // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "تخطيط المواد المحددة",
-  "collection.edit.item-mapper.description": "هذه هي أداة المادة والتي بدأت لمديري في تخطيط المنتجات من كعكة صغيرة أخرى إلى هذه الثلاجة. ",
-  "collection.edit.item-mapper.head": "الخامة الأخرى - تخطيط مواد من توفيق",
-  "collection.edit.item-mapper.no-search": "يرجى الاتصال باستعلام للبحث",
-  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أثناء التخطيط {{amount}} مادة.",
+
+  // "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": "هذه هي أداة مخطط المادة والتي تتيح لمديري الحاوية بتخطيط مواد من حاويات أخرى إلى هذه الحاوية. يمكنك البحث عن مواد من حاويات أخرى وتخطيطها، أو استعراض قائمة بالمواد المخططة حاليًا.",
+
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "مخطط المادة - تخطيط مواد من حاويات أخرى",
+
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
+
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "حدثت أخطاء أثناء تخطيط {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "أخطاء التخطيط",
-  "collection.edit.item-mapper.notifications.map.success.content": "تم التخطيط {{amount}} مادة فعالة.",
+
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "تم تخطيط {{amount}} مادة بنجاح.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "اكتمل التخطيط",
-  "collection.edit.item-mapper.notifications.unmap.error.content": "حدث خطأ أثناء إزالة التخطيطات {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "حدثت أخطأ أثناء إزالة تخطيطات {{amount}} مادة.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "أخطاء إزالة التخطيط",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "بعد إزالة {{amount}} تخطيط فعّال.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "تمت إزالة {{amount}} تخطيط مادة بنجاح.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "اكتملت إزالة التخطيط",
-  "collection.edit.item-mapper.remove": "إزالة التخطيطات المحددة",
-  "collection.edit.item-mapper.search-form.placeholder": "المواد المدروسة...",
-  "collection.edit.item-mapper.tabs.browse": "فحص المواد الجيدة",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "إزالة تخطيطات المادة المحددة",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "بحث المواد...",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "استعراض المواد المخططة",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "تخطيط مواد جديدة",
+
+  // "collection.edit.logo.delete.title": "Delete logo",
   "collection.edit.logo.delete.title": "حذف الشعار",
-  "collection.edit.logo.delete-undo.title": "السماء عن الحذف",
-  "collection.edit.logo.label": "شعار تجاري",
-  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار التعليمات. ",
-  "collection.edit.logo.notifications.add.success": "تم تحميل فيتامين فعال.",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "التراجع عن الحذف",
+
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "شعار الحاوية",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "فشل تحميل شعار الحاوية. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "تم تحميل شعار الحاوية بنجاح.",
+
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
-  "collection.edit.logo.notifications.delete.success.content": "تم حذف الشعار الفعال",
+
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "تم حذف شعار الحاوية بنجاح",
+
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
-  "collection.edit.logo.upload": "قم بإسقاط شعار العلامة للتحميل",
-  "collection.edit.notifications.success": "تم تحرير فعال",
+
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "قم بإسقاط شعار الحاوية للتحميل",
+
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "تم تحرير الحاوية بنجاح",
+
+  // "collection.edit.return": "Back",
   "collection.edit.return": "رجوع",
+
+  // "collection.edit.tabs.access-control.head": "Access Control",
   "collection.edit.tabs.access-control.head": "التحكم في الوصول",
-  "collection.edit.tabs.access-control.title": "تحرير البدء - التحكم في الوصول",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "تحرير الحاوية - التحكم في الوصول",
+
+  // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "أكرتة",
-  "collection.edit.tabs.curate.title": "تحرير تحرير - كرتة",
-  "collection.edit.tabs.authorizations.head": ".تصاريح",
-  "collection.edit.tabs.authorizations.title": "تحرير - تصاريح",
+
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "تحرير الحاوية - أكرتة",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "تصاريح",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "تحرير الحاوية - تصاريح",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
   "collection.edit.item.authorizations.load-bundle-button": "تحميل المزيد من الحزم",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
   "collection.edit.item.authorizations.load-more-button": "تحميل المزيد",
-  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات التدفق الكامل",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "عرض سياسات تدفق البت للحزمة",
+
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "تحرير الميتاداتا",
-  "collection.edit.tabs.metadata.title": "تحرير تحرير - الميتاداتا",
-  "collection.edit.tabs.roles.head": "تم تعيينه",
-  "collection.edit.tabs.roles.title": "تحرير - التعديل",
-  "collection.edit.tabs.source.external": "لتتمكن من هذه بحصاد محتوياتها من مصدر خارجي",
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "يجب عليك تقديم معرف حزمة التفاصيل الخاصة.",
-  "collection.edit.tabs.source.form.harvestType": "استمرار المحتوى",
-  "collection.edit.tabs.source.form.head": "قوة مصدر خارجي",
-  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميثاداتا",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "تحرير الحاوية - الميتاداتا",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "تعيين الأدوار",
+
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "تحرير الحاوية - الأدوار",
+
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "تقوم هذه الحاوية بحصاد محتواها من مصدر خارجي",
+
+  // "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": "يجب عليك تقديم معرف حزمة للحاوية المستهدفة.",
+
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "المحتوى الجاري حصاده",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "تهيئة مصدر خارجي",
+
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "تنسيق الميتاداتا",
+
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "معرف حزمة محددة لمبادرة الأرشيفات المفتوحة",
-  "collection.edit.tabs.source.form.oaiSource": "مقدمة لخدمة المعلومات الأرشيفات المفتوحة",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "ميتاداتا وتدفقات البت (يتطلب دعم ORE)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "غاب الميتاداتا والمراجع إلى تدفقات البت (يطلب دعم ORE)",
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "موت الميتاتا فقط",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "مقدم خدمة مبادرة الأرشيفات المفتوحة",
+
+  // "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": "حصاد الميتاداتا وتدفقات البت (يتطلب دعم 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": "حصاد الميتاداتا والمراجع إلى تدفقات البت (يتطلب دعم ORE)",
+
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "حصاد الميتاداتا فقط",
+
+  // "collection.edit.tabs.source.head": "Content Source",
   "collection.edit.tabs.source.head": "مصدر المحتوى",
-  "collection.edit.tabs.source.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "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": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم النقر على زر 'تراجع'",
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "تم تجاهل التغييرات",
-  "collection.edit.tabs.source.notifications.invalid.content": "لم يتم الحفاظ على جديدك. ",
-  "collection.edit.tabs.source.notifications.invalid.title": "دياداتا غير صالحة",
-  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تفاصيلك على مصدر محتوى هذه الرسالة.",
+
+  // "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة كل الحقول قبل الحفظ.",
+
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "تم حفظ تغييراتك على مصدر محتوى هذه الحاوية.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "تم حفظ مصدر المحتوى",
-  "collection.edit.tabs.source.title": "تحرير - مصدر المحتوى",
+
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "تحرير الحاوية - مصدر المحتوى",
+
+  // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "إضافة",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "قالب المادة",
+
+  // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "إلغاء",
+
+  // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "حذف",
+
+  // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "تحرير",
-  "collection.edit.template.error": "حدث خطأ أثناء حذف التصميم الإلكتروني",
-  "collection.edit.template.head": "تحرير قالب القالب للعباوية \"{{ collection }}\"",
-  "collection.edit.template.label": "قالب",
-  "collection.edit.template.loading": "جاري تحميل التصميم المعماري...",
-  "collection.edit.template.notifications.delete.error": "فشل في حذف قالب المادة",
-  "collection.edit.template.notifications.delete.success": "تم حذف القالب الفعال",
-  "collection.edit.template.title": "تحرير النموذج على موقع الكتروني",
-  "collection.form.abstract": "وصف قصير",
-  "collection.form.description": "نص استعدادي (HTML)",
-  "collection.form.errors.title.required": "يرجى الإدخال اسم العلبة",
-  "collection.form.license": "com",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "حدث خطأ أثناء استرداد عنصر القالب",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "تحرير عنصر القالب للحاوية \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "عنصر القالب",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "جاري تحميل عنصر القالب...",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "فشل حذف قالب المادة",
+
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "تم حذف قالب المادة بنجاح",
+
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "تحرير عنصر القالب",
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "وصف مختصر",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "نص تمهيدي (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "يرجى إدخال اسم الحاوية",
+
+  // "collection.form.license": "License",
+  "collection.form.license": "الترخيص",
+
+  // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "المنشأ",
+
+  // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "نص حقوق النشر (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "الأخبار (HTML)",
+
+  // "collection.form.title": "Name",
   "collection.form.title": "الاسم",
+
+  // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "نوع الكينونة",
-  "collection.listelement.badge": "ابدأ",
-  "collection.logo": "شعار تجاري",
-  "collection.page.browse.search.head": "يبحث",
-  "collection.page.edit": "تحرير هذه الجزئية",
-  "collection.page.handle": "URI الجديد لهذه الكائنات",
-  "collection.page.license": "com",
+
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "الحاوية",
+
+  // "collection.logo": "Collection logo",
+  "collection.logo": "شعار الحاوية",
+
+  // "collection.page.browse.search.head": "Search",
+  // TODO New key - Add a translation
+  "collection.page.browse.search.head": "Search",
+
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "تحرير هذه الحاوية",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI الدائم لهذه الحاوية",
+
+  // "collection.page.license": "License",
+  "collection.page.license": "الترخيص",
+
+  // "collection.page.news": "News",
   "collection.page.news": "الأخبار",
-  "collection.search.results.head": "نتائج البحث",
-  "collection.select.confirm": "بالتأكيد",
-  "collection.select.empty": "لا يوجد شيء للعرض",
-  "collection.select.table.selected": "محدد المعالم",
-  "collection.select.table.select": "تحديد الحاوية",
-  "collection.select.table.deselect": "إلغاء تحديد الحاوية",
-  "collection.select.table.title": "عنوان العنوان",
-  "collection.source.controls.head": "إعدادات التحكم في",
-  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء الاختبار",
-  "collection.source.controls.test.failed": "فشل العناصر المكونة لها",
-  "collection.source.controls.test.completed": "كلمات بمعنى: أدى إلى النهاية",
-  "collection.source.controls.test.submit": "تم اختبار التهيئة",
+
+  // "collection.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "collection.search.results.head": "Search Results",
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "تأكيد المحدد",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "لا توجد حاويات للعرض",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "الحاويات المحددة",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "تحديد حاوية",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "إلغاء تحديد حاوية",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "العنوان",
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "إعدادات التحكم في الحصاد",
+
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "حدث خطأ ما أثناء بدء اختبار الإعدادات",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "فشل البرنامج النصي لاختبار الإعدادات",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "انتهى البرنامج النصي لاختبار الإعدادات بنجاح",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "اختبار التهيئة",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "جاري اختبار التهيئة...",
-  "collection.source.controls.import.submit.success": "تم البدء بالتنشيط الفعال",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "تم بدء الاستيراد بنجاح",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "حدث خطأ ما أثناء بدء الاستيراد",
+
+  // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "استيراد الآن",
+
+  // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "جاري الاستيراد...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "حدث خطأ أثناء الاستيراد",
+
+  // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "اكتمل الاستيراد",
-  "collection.source.controls.reset.submit.success": "تم البدء في البدء في المستقبل البعيد للاستيراد الفعال",
-  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء البدء في إعادة الاستيراد",
-  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة الاستيراد",
-  "collection.source.controls.reset.completed": "اكتملت العملية المتعلقة بإعادة الاستيراد",
-  "collection.source.controls.reset.submit": "أعد تعيينه لإعادة الاستيراد",
-  "collection.source.controls.reset.running": "جاري إعادة المركز للاستيراد...",
-  "collection.source.controls.harvest.status": "حالة:",
-  "collection.source.controls.harvest.start": "وقت البدء:",
-  "collection.source.controls.harvest.last": "تم آخر مرة:",
-  "collection.source.controls.harvest.message": "معلومات هناك:",
-  "collection.source.controls.harvest.no-information": "غير محتمل",
-  "collection.source.update.notifications.error.content": "تم اختبارها ولم لا تعمل ك.",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "تم بدء عملية إعادة التعيين وإعادة الاستيراد بنجاح",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "حدث خطأ ما أثناء بدء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "حدث خطأ أثناء إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "اكتملت عملية إعادة التعيين وإعادة الاستيراد",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "إعادة تعيين وإعادة استيراد",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "جاري إعادة التعيين وإعادة الاستيراد...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "حالة الحصاد:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "وقت بدء الحصاد:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "آخر مرة تم الحصاد:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "معلومات الحصاد:",
+
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "غير قابل للتطبيق",
+
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "تم اختبار الإعدادات المتوفرة ولم تعملk.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "خطأ في الخادم",
-  "communityList.breadcrumbs": "اجمعها",
-  "communityList.tabTitle": "اجمعها",
-  "communityList.title": "اجمعها",
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "قائمة المجتمعات",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "قائمة المجتمعات",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title": "قائمة المجتمعات",
+
+  // "communityList.showMore": "Show More",
   "communityList.showMore": "عرض المزيد",
-  "communityList.expand": "الأوقات {{ name }}",
-  "communityList.collapse": "طيء {{ name }}",
-  "community.browse.logo": "تم الحصول على معلومات حول شعار المجتمع",
-  "community.subcoms-cols.breadcrumbs": "المجتمعات الفرعية والمجموعات",
+
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "توسيع {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "طي {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "استعراض للحصول على شعار المجتمع",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  // TODO New key - Add a translation
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
+  // "community.create.head": "Create a Community",
   "community.create.head": "إنشاء مجتمع",
-  "community.create.notifications.success": "تم إنشاء المجتمع الفعال",
-  "community.create.sub-head": "إنشاء مجتمع فرعي متاح {{ parent }}",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "تم إنشاء المجتمع بنجاح",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "إنشاء مجتمع فرعي للمجتمع {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "أكرتة المجتمع: {{community}}",
+
+  // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "إلغاء",
-  "community.delete.confirm": "بالتأكيد",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "تأكيد",
+
+  // "community.delete.processing": "Deleting...",
   "community.delete.processing": "جاري الحذف...",
+
+  // "community.delete.head": "Delete Community",
   "community.delete.head": "حذف المجتمع",
-  "community.delete.notification.fail": "عذرًا لحذف المجتمع",
-  "community.delete.notification.success": "تم حذف المجتمع الفعال",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "تعذر حذف المجتمع",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "تم حذف المجتمع بنجاح",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "هل أنت متأكد من أنك تريد حذف المجتمع \"{{ dso }}\"",
+
+  // "community.edit.delete": "Delete this community",
   "community.edit.delete": "حذف هذا المجتمع",
+
+  // "community.edit.head": "Edit Community",
   "community.edit.head": "تحرير المجتمع",
+
+  // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "تحرير المجتمع",
+
+  // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "حذف الشعار",
-  "community.edit.logo.delete-undo.title": "السماء عن الحذف",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "التراجع عن الحذف",
+
+  // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "شعار المجتمع",
-  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. ",
-  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع الفعال.",
+
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "فشل تحميل شعار المجتمع. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "تم تحميل شعار المجتمع بنجاح.",
+
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "تم حذف الشعار",
-  "community.edit.logo.notifications.delete.success.content": "تم حذف العنصر الفعال",
+
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "تم حذف شعار المجتمع بنجاح",
+
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "حدث خطأ أثناء حذف الشعار",
+
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "قم بإسقاط شعار المجتمع للتحميل",
-  "community.edit.notifications.success": "تم تحرير المجتمع الفعال",
-  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لهذا الغد",
+
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "تم تحرير المجتمع بنجاح",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "ليس لديك امتيازات لإجراء هذا التغيير",
+
+  // "community.edit.notifications.error": "An error occured while editing the community",
   "community.edit.notifications.error": "حدث خطأ أثناء تحرير المجتمع",
+
+  // "community.edit.return": "Back",
   "community.edit.return": "رجوع",
+
+  // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "أكرتة",
-  "community.edit.tabs.curate.title": "تحرير المجتمع - كورة",
+
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "تحرير المجتمع - أكرتة",
+
+  // "community.edit.tabs.access-control.head": "Access Control",
   "community.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
   "community.edit.tabs.access-control.title": "تحرير المجتمع - التحكم في الوصول",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "تحرير الميتاداتا",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "تحرير المجتمع - الميتاداتا",
-  "community.edit.tabs.roles.head": "مواعيد محددة",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "تعيين أدوار",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "تحرير المجتمع - أدوار",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "التصاريح",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "تحرير المجتمع - التصاريح",
+
+  // "community.listelement.badge": "Community",
   "community.listelement.badge": "مجتمع",
+
+  // "community.logo": "Community logo",
   "community.logo": "شعار المجتمع",
+
+  // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "لا شيء",
+
+  // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "إنشاء",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
   "comcol-role.edit.create.error.title": "فشل إنشاء مجموعة لدور '{{ role }}'",
-  "comcol-role.edit.restrict": "انها",
+
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "تقييد",
+
+  // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "حذف",
-  "comcol-role.edit.delete.error.title": "فشل في حذف مجموعة الدور '{{ role }}'",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "فشل حذف مجموعة الدور '{{ role }}'",
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "المسؤولون",
+
+  // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "المسؤولون",
-  "comcol-role.edit.community-admin.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو العهد، وإدارة أو تعيين المديرين المجتمعيين أو المعتمدين. ",
-  "comcol-role.edit.collection-admin.description": "تحديد مديري يبدأ من البدء في المواد إلى هذه المشاركة، وتحرير ميتاداتا المادة (بعد الحضور)، بحضور (تخطيط) المواد يبدأ من الآخر إلى هذه المشاركة (ترغب في المشاركة في المشاركة).",
-  "comcol-role.edit.submitters.name": "شيرون",
-  "comcol-role.edit.submitters.description": "الأشخاص الإلكترونيين والمجموعات الذين يملكون القدرة على تقديم منتجات جديدة إلى هذه البسيطة.",
-  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضية",
-  "comcol-role.edit.item_read.description": "الأشخاص الإلكترونيون والمجموعات الذين يمكنهم قراءة المواد الجديدة تم تقديمها إلى هذه البسيطة. ",
-  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الإلكترونية للمواد حاليًا إلى معرف غير معرف.",
+
+  // "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": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
+
+  // "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": "يقرر مديري الحاوية من يمكنه تقديم المواد إلى الحاوية، وتحريرميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحاوية من الحاويات الأخرى إلى هذه الحاوية (تخضع للتصريح لتلك الحاوية).",
+
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "المقدمون",
+
+  // "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": "الأشخاص الإلكترونيين والمجموعات الذين يملكون صلاحية تقديم مواد جديدة إلى هذه الحاوية.",
+
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "وصول قراءة المادة الافتراضي",
+
+  // "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": "الأشخاص الإلكترونيون والمجموعات  الذين يمكنهم قراءة المواد الجديدة التي تم تقديمها إلى هذه الحاوية. التغييرات على هذا الدور ليست بأثر رجعي. ستظل المواد الحالية الموجودة في النظام قابلة للعرض بواسطة أولئك الذين يملكون الوصول للقراءة في وقت إضافتها.",
+
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+  "comcol-role.edit.item_read.anonymous-group": "تم تعيين القراءة الافتراضية للمواد الواردة حاليًا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "وصول قراءة تدفق البت الافتراضي",
-  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو العهد، وإدارة أو تعيين المديرين المجتمعيين أو المعتمدين. ",
-  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت حاليا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "يمكن لمديري المجتمع إنشاء مجتمعات فرعية أو حاويات، وإدارة أو تعيين الإدارة لتلك المجتمعات الفرعية أو الحاويات. بالإضافة إلى ذلك، يقومون بتقرير من يمكنه تقديم المواد إلى أي حاويات فرعية، وتحرير ميتاداتا المادة (بعد التقديم)، وإضافة (تخطيط) المواد الحالية من الحاويات الأخرى (تخضع للتصريح).",
+
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+  "comcol-role.edit.bitstream_read.anonymous-group": "تم تعيين القراءة الافتراضية لتدفقات البت الواردة حاليًا إلى غير معرف الهوية.",
+
+  // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "المحررون",
-  "comcol-role.edit.editor.description": "يمكن للمحررون تحرير ميتاداتا للعروض المقدمة، ثم قبولها أو رفضها.",
+
+  // "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": "يمكن للمحررون تحرير ميتاداتا التقديمات الواردة، ثم قبولها أو رفضها.",
+
+  // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "المحررون النهائيون",
-  "comcol-role.edit.finaleditor.description": "يمكن للمحرر النهائي لتحرير ميتاداتا التقديمات المقدمة، لكن لا يمكنهم رفضها.",
+
+  // "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": "يمكن للمحررون النهائيون تحرير ميتاداتا التقديمات الواردة، لكن لا يمكنهم رفضها.",
+
+  // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "المراجعون",
-  "comcol-role.edit.reviewer.description": "يمكن للمراجعين قبول أو رفض التقديم. ",
-  "comcol-role.edit.scorereviewers.name": "نقاط الضعفاء",
-  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين أن ترسل المشاركات إلينا، وهذا ما يحدد ما إذا كان الرفض أم لا.",
-  "community.form.abstract": "وصف قصير",
-  "community.form.description": "نص استعدادي (HTML)",
-  "community.form.errors.title.required": "الرجاء الاتصال باسم مجتمع",
+
+  // "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": "يمكن للمراجعين قبول أو رفض التقديمات الواردة. غير أنه لا يمكنهم تحرير ميتاداتا التقديم..",
+
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "نقاط المراجعين",
+
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "يمكن للمراجعين منح نقاط للمشاركات الواردة، وهذا سيحدد ما إذا كان سيتم رفض التقديم أم لا.",
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "وصف مختصر",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "نص تمهيدي (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "يرجى إدخال اسم مجتمع",
+
+  // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "نص حقوق النشر (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "الأخبار (HTML)",
+
+  // "community.form.title": "Name",
   "community.form.title": "الاسم",
+
+  // "community.page.edit": "Edit this community",
   "community.page.edit": "تحرير هذا المجتمع",
-  "community.page.handle": "URI الجديد لهذا المجتمع",
-  "community.page.license": "com",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "ال URI الدائم لهذا المجتمع",
+
+  // "community.page.license": "License",
+  "community.page.license": "الترخيص",
+
+  // "community.page.news": "News",
   "community.page.news": "الأخبار",
-  "community.all-lists.head": "الكونيات الحاويات",
-  "community.search.results.head": "نتائج البحث",
-  "community.sub-collection-list.head": "توفيق هذا المجتمع",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "المجتمعات الفرعية والحاويات",
+
+  // "community.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "community.search.results.head": "Search Results",
+
+  // "community.sub-collection-list.head": "Collections in this Community",
+  "community.sub-collection-list.head": "حاويات هذا المجتمع",
+
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "مجتمعات هذا المجتمع",
+
+  // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "قبول الكل",
-  "cookies.consent.accept-selected": "قبول البناء",
-  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك اختيار)",
+
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "قبول المحدد",
+
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "تم تحميل هذا التطبيق افتراضياً (لكن يمكنك الانسحاب)",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(انسحاب)",
-  "cookies.consent.app.purpose": "اللحوم",
-  "cookies.consent.app.required.description": "هذا التطبيق مطلوب تكرارا",
-  "cookies.consent.app.required.title": "(مطلوب مرة أخرى)",
-  "cookies.consent.app.disable-all.description": "استخدم هذا الزر لتفعيل جميع الخدمات أو جونسونها.",
-  "cookies.consent.app.disable-all.title": "تفعيل أو تفعيل كل الخدمات",
-  "cookies.consent.update": "لقد قمت بتغيير بعض التغييرات منذ الآن، يرجى تحديث موافقتك.",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "الغرض",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "هذا التطبيق مطلوب دائماً",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(مطلوب دائماً)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "استخدم هذا التبديل لتفعيل كل الخدمات أو تعطيلها.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "تفعيل أو تعطيل كل الخدمات",
+
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "لقد حدثت بعض التغييرات منذ زيارتك الأخيرة، يرجى تحديث موافقتك.",
+
+  // "cookies.consent.close": "Close",
   "cookies.consent.close": "إغلاق",
-  "cookies.consent.decline": "الرفض",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "رفض",
+
+  // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "لا بأس",
+
+  // "cookies.consent.save": "Save",
   "cookies.consent.save": "حفظ",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
   "cookies.consent.content-notice.title": "الموافقة على ملفات تعريف الارتباط",
-  "cookies.consent.content-notice.description": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>. <br/> لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
-  "cookies.consent.content-notice.description.no-privacy": "لإصلاح بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستثناء، والتفضيلات، والاستخلاص، والإحصاء</strong>.",
+
+  // "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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>. <br/> لمعرفة المزيد، يرجى قراءة {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": "نقوم بجمع ومعالجة معلوماتك الشخصية للأغراض التالية: <strong>الاستيثاق، والتفضيلات، والإقرار، والإحصائيات</strong>.",
+
+  // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "تخصيص",
-  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي تجمعها عنك.",
+
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "من هنا يمكنك رؤية وتخصيص المعلومات التي نقوم بجمعها عنك.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "سياسة الخصوصية",
+
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "لمعرفة المزيد، يرجى قراءة {privacyPolicy}.",
-  "cookies.consent.content-modal.title": "المعلومات التي بجمعها",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "المعلومات التي نقوم بجمعها",
+
+  // "cookies.consent.content-modal.services": "services",
   "cookies.consent.content-modal.services": "خدمات",
+
+  // "cookies.consent.content-modal.service": "service",
   "cookies.consent.content-modal.service": "خدمة",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "استيثاق",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "مطلوب لتسجيل دخولك",
+
+  // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "التفضيلات",
-  "cookies.consent.app.description.preferences": "مطلوب تحسين تفضيلاتك",
-  "cookies.consent.app.title.acknowledgement": "تأهيل",
-  "cookies.consent.app.description.acknowledgement": "مطلوب حفظك وموافقتك",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "مطلوب لحفظ تفضيلاتك",
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "إقرار",
+
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "مطلوب لحفظ إقراراتك وموافقاتك",
+
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "تحليلات جوجل",
-  "cookies.consent.app.description.google-analytics": "يسمح لنا بتتبع البيانات الإحصائية",
+
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+
+  // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
   "cookies.consent.app.title.google-recaptcha": "جوجل ريكابتشا",
-  "cookies.consent.app.description.google-recaptcha": "نحن نستخدم خدمة google reCAPTCHA أثناء التسجيل واستعادة كلمة المرور",
-  "cookies.consent.purpose.functional": "فعالة",
+
+  // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+  // TODO New key - Add a translation
+  "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "وظيفي",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "إحصائي",
-  "cookies.consent.purpose.registration-password-recovery": "التسجيل و استعادة كلمة المرور",
+
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "التسجيل واستعادة كلمة المرور",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "مشاركة",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "إنشاء صفحة الاقتباس",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "التحقق من الروابط في الميتاداتا",
+
+  // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "لا توجد مهمة",
+
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "تنسيقات تدفق بت البروفايل",
-  "curation-task.task.requiredmetadata.label": "التحقق من الميتاداتا المطلوبة",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "التحقق للميتاداتا المطلوبة",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "مترجم ميكروسوفت",
-  "curation-task.task.vscan.label": "حذف الفيروسات",
-  "curation-task.task.registerdoi.label": "تسجيل المعرفة الرقمية",
-  "curation.form.task-select.label": "مهم:",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "مسح الفيروسات",
+
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "تسجيل معرف الكائن الرقمي",
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "المهمة:",
+
+  // "curation.form.submit": "Start",
   "curation.form.submit": "بدء",
-  "curation.form.submit.success.head": "تم بدء مهمة فعالة فعالة",
-  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى السجن.",
-  "curation.form.submit.error.head": "فشل تشغيل مهمة أخرى",
+
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "تم بدء مهمة الأكرتة بنجاح",
+
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "ستتم إعادة توجيهك إلى صفحة العملية المقابلة.",
+
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "فشل تشغيل مهمة الأكرتة",
+
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "حدث خطأ أثناء محاولة بدء مهمة الأكرتة.",
-  "curation.form.submit.error.invalid-handle": "تعذر تحديد يد هذا",
-  "curation.form.handle.label": "مقبض:",
-  "curation.form.handle.hint": "تلميح: قم برجاء زيارة [your-handle-prefix]/0 لاستخدام مهمة عبر الموقع قادرة (قد لا تدعم جميع هذه الإمكانية)",
-  "deny-request-copy.email.message": "عزيزي {{ recipientName }},\n{{ itemUrl }}\"({{ itemName }})، والتي قمت بتأليفها.\n\n\n{{ authorName }} <{{ authorEmail }}>",
-  "deny-request-copy.email.subject": "طلب نسخة من الوثيقة",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "تعذر تحديد هاندل هذا الكائن",
+
+  // "curation.form.handle.label": "Handle:",
+  "curation.form.handle.label": "هاندل:",
+
+  // "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": "تلميح: قم بإدخال [your-handle-prefix]/0 لتشغيل مهمة عبر الموقع بأكمله (قد لا تدعم جميع المهام هذه الإمكانية)",
+
+  // "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": "عزيزي {{ recipientName }},\nردًا على طلبك، يؤسفني إبلاغك أنه لا يمكن إرسال نسخة من الملف الذي قمت بطلبه، فيما يتعلق بالوثيقة: \"{{ itemUrl }}\" ({{ itemName }}), والتي قمت بتأليفها.\n\nمع أطيب التحيات,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "deny-request-copy.error": "An error occurred",
   "deny-request-copy.error": "لقد حدث خطأ",
-  "deny-request-copy.header": "طلب طلب نسخة أوكلاند",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "رفض طلب نسخ الوثيقة",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
   "deny-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب",
-  "deny-request-copy.success": "تم الرفض للطلب الفعال",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "تم رفض طلب المادة بنجاح",
+
+  // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "بدون عنوان",
+
+  // "dso.name.unnamed": "Unnamed",
   "dso.name.unnamed": "بدون اسم",
+
+  // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "حاوية جديدة",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "إنشاء حاوية جديدة في",
+
+  // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "مجتمع جديد",
+
+  // "dso-selector.create.community.or-divider": "or",
   "dso-selector.create.community.or-divider": "أو",
+
+  // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "إنشاء مجتمع جديد في",
+
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "إنشاء مجتمع مستوى أعلى جديد",
+
+  // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "مادة جديدة",
+
+  // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "إنشاء مادة جديدة في",
+
+  // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "تقديم جديد",
-  "dso-selector.edit.collection.head": "تحرير",
+
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "تحرير الحاوية",
+
+  // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "تحرير المجتمع",
+
+  // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "تحرير المادة",
-  "dso-selector.error.title": "حدث خطأ أثناء البحث عنه {{ type }}",
-  "dso-selector.export-metadata.dspaceobject.head": "قم باستيراد بيانات ميتا من",
-  "dso-selector.export-batch.dspaceobject.head": "قم باستيراد دفعة (ZIP) من",
-  "dso-selector.import-batch.dspaceobject.head": "قم باستيراد دفعة من",
-  "dso-selector.no-results": "لم يتم العثور عليها {{ type }}",
-  "dso-selector.placeholder": "بحثت عن {{ type }}",
-  "dso-selector.select.collection.head": "تحديد الحاوية",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "حدث خطأ أثناء البحث عن {{ type }}",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "استيراد ميتاداتا من",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "استيراد دفعة (ZIP) من",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "استيراد دفعة من",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "لم يتم العثور على {{ type }}",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "بحث عن {{ type }}",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "تحديد حاوية",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
   "dso-selector.set-scope.community.head": "تحديد نطاق البحث",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "بحث دي سبيس بالكامل",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
   "dso-selector.set-scope.community.or-divider": "أو",
-  "dso-selector.set-scope.community.input-header": "ابحث عن حاوية أو مجتمع",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "البحث عن حاوية أو مجتمع",
+
+  // "dso-selector.claim.item.head": "Profile tips",
   "dso-selector.claim.item.head": "نصائح الملف الشخصي",
-  "dso-selector.claim.item.body": "هذه هي الملفات الشخصية التي قد تكون ذات صلة بك. ",
+
+  // "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": "هذه هي الملفات الشخصية الموجودة التي قد تكون ذات صلة بك. إذا تعرفت على نفسك في أحد هذه الملفات الشخصية، قم بتحديده وفي صفحة التفاصيل، من بين الخيارات، اختر المطالبة به. بخلاف ذلك، يمكنك إنشاء ملف شخصي جديد من البداية باستخدام الزر أدناه.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
   "dso-selector.claim.item.not-mine-label": "لا يعود أي من هذا لي",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "إنشاء واحد جديد",
-  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى تحديث مرة أخرى ↻",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "حدث خطأ ما، يرجى التحديث مرة أخرى ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
   "supervision-group-selector.header": "محدد مجموعة الإشراف",
-  "supervision-group-selector.select.type-of-order.label": "حدد نوع الصف",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "حدد نوع الرتبة",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
   "supervision-group-selector.select.type-of-order.option.none": "لا شيء",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
   "supervision-group-selector.select.type-of-order.option.editor": "محرر",
-  "supervision-group-selector.select.type-of-order.option.observer": "انتبه",
-  "supervision-group-selector.select.group.label": "حدد المجموعة",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "مراقب",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "حدد مجموعة",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
   "supervision-group-selector.button.cancel": "إلغاء",
+
+  // "supervision-group-selector.button.save": "Save",
   "supervision-group-selector.button.save": "حفظ",
-  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الطائرة",
-  "supervision-group-selector.select.group.error": "يرجى تحديد المجموعة",
-  "supervision-group-selector.notification.create.success.title": "تم إنشاء تشكيلة متنوعة فعالة {{ name }}",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "يرجى تحديد نوع الرتبة",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "يرجى تحديد مجموعة",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "تم إنشاء رتبة الإشراف للمجموعة بنجاح {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
   "supervision-group-selector.notification.create.failure.title": "خطأ",
-  "supervision-group-selector.notification.create.already-existing": "هناك بالفعل خيار البحث عن هذه المواد المحددة",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "يوجد بالفعل رتبة إشراف على هذه المادة للمجموعة المحددة",
+
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "تصدير الميتاداتا لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "هل أنت متأكد أنك تريد تصدير الميتاداتا لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "إلغاء",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "تصدير",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.header": "تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
   "confirmation-modal.export-batch.info": "هل أنت متأكد أنك تريد تصدير دفعة (ZIP) لـ {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
   "confirmation-modal.export-batch.cancel": "إلغاء",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
   "confirmation-modal.export-batch.confirm": "تصدير",
+
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "حذف الشخص الإلكتروني \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الهاتف الإلكتروني \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "هل أنت متأكد من أنك تريد حذف الشخص الإلكتروني \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "حذف",
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "حذف الملف الشخصي",
-  "confirmation-modal.delete-profile.info": "هل أنت متأكد من أنك تريد حذف ملفك الشخصي",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "هل أنت متأكد أنك تريد حذف ملف الشخصي الخاص بك",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
   "confirmation-modal.delete-profile.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "حذف",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
   "confirmation-modal.delete-subscription.header": "حذف الاشتراك",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
   "confirmation-modal.delete-subscription.info": "هل أنت متأكد من أنك تريد حذف الاشتراك لـ \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
   "confirmation-modal.delete-subscription.cancel": "إلغاء",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
   "confirmation-modal.delete-subscription.confirm": "حذف",
-  "error.bitstream": "حدث خطأ أثناء تدفق البالت",
-  "error.browse-by": "حدث خطأ أثناء المواد",
-  "error.collection": "حدث خطأ أثناء دخول",
-  "error.collections": "حدث خطأ أثناء فترة مقبولة",
-  "error.community": "حدث خطأ أثناء المجتمع",
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "حدث خطأ أثناء جلب تدفق البت",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "حدث خطأ أثناء جلب المواد",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection": "حدث خطأ أثناء جلب الحاوية",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections": "حدث خطأ أثناء جلب الحاويات",
+
+  // "error.community": "Error fetching community",
+  "error.community": "حدث خطأ أثناء جلب المجتمع",
+
+  // "error.identifier": "No item found for the identifier",
   "error.identifier": "لم يتم العثور على أي مادة للمعرف",
+
+  // "error.default": "Error",
   "error.default": "خطأ",
-  "error.item": "حدث خطأ أثناء حضور المادة",
-  "error.items": "حدث خطأ أثناء المواد",
-  "error.objects": "حدث خطأ أثناء إجراء الكائنات الفضائية",
-  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث العروض",
-  "error.search-results": "حدث خطأ أثناء نتائج البحث",
-  "error.invalid-search-query": "استعلام البحث غير صالح.  <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على قراءة المعلومات حول هذا الخطأ.",
-  "error.sub-collections": "حدث خطأ أثناء تقديم العرض",
-  "error.sub-communities": "حدث خطأ أثناء النظر في الجسد",
-  "error.submission.sections.init-form-error": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج العنصر الخاص بك.  <br> <br>",
-  "error.top-level-communities": "حدث خطأ خلال مجتمعات المستوى الأعلى",
-  "error.validation.license.notgranted": "يجب عليك أن تطلب من هذا الأمر التقديم الخاص بك. ",
+
+  // "error.item": "Error fetching item",
+  "error.item": "حدث خطأ أثناء جلب المادة",
+
+  // "error.items": "Error fetching items",
+  "error.items": "حدث خطأ أثناء جلب المواد",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects": "حدث خطأ أثناء جلب الكائنات",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "حدث خطأ أثناء جلب أحدث التقديمات",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "حدث خطأ أثناء جلب نتائج البحث",
+
+  // "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+  "error.invalid-search-query": "استعلام البحث غير صالح. يرجى مراجعة <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">بناء جملة استعلام Solr</a> أفضل الممارسات للحصول على مزيد من المعلومات حول هذا الخطأ.",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "حدث خطأ أثناء جلب الحاويات الفرعية",
+
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "حدث خطأ أثناء جلب المجتمعات الفرعية",
+
+  // "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": "حدث خطأ أثناء تهيئة القسم، يرجى التحقق من تهيئة نموذج الإدخال الخاص بك. التفاصيل أدناه : <br> <br>",
+
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "حدث خطأ أثناء جلب مجتمعات المستوى الأعلى",
+
+  // "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": "يجب عليك منح هذا الترخيص لإكمال عملية التقديم الخاصة بك. إذا لم تتمكن من منح هذا الترخيص في هذا الوقت، يمكنك حفظ عملك والعودة لاحقاً أو إزالة التقديم.",
+
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "هذا الإدخال مقيد بالنمط الحالي: {{ pattern }}.",
-  "error.validation.filerequired": "تحميل الملف المشروط",
-  "error.validation.required": "هذا مطلوب الحقل",
+
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "تحميل الملف إلزامي",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "هذا الحقل مطلوب",
+
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "البريد الإلكتروني غير صالح",
-  "error.validation.emailTaken": "هذا البريد الإلكتروني السؤال بالفعل",
+
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "هذا البريد الإلكتروني مأخوذ بالفعل",
+
+  // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "هذه المجموعة موجودة بالفعل",
-  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. ",
+
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقول العنصر والمؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
   "error.validation.metadata.name.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 32 حرفاً",
-  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاً",
-  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. ",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 256 حرفاًs",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات. يرجى استخدام حقل المؤهل بدلاً من ذلك",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
   "error.validation.metadata.element.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
   "error.validation.metadata.qualifier.invalid-pattern": "لا يمكن أن يحتوي هذا الحقل على نقاط أو فواصل أو مسافات",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
   "error.validation.metadata.qualifier.max-length": "يجب ألا يحتوي هذا الحقل على أكثر من 64 حرفاً",
-  "feed.description": " مشاركة التعليقات",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": " ملاحظات Syndication",
+
+  // "file-download-link.restricted": "Restricted bitstream",
   "file-download-link.restricted": "دفق البت المقيد",
-  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات هذه المادة",
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "حدث خطأ أثناء الحصول على ملفات لهذه المادة",
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "حقوق النشر © 2002-{{ year }}",
+
+  // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "برنامج دي سبيس",
+
+  // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "ليراسيس",
+
+  // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "إعدادات ملفات تعريف الارتباط",
+
+  // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "سياسة الخصوصية",
-  "footer.link.end-user-agreement": "الاستخدام النهائي",
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "اتفاقية المستخدم النهائي",
+
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "إرسال الملاحظات",
-  "footer.link.coar-notify-support": "إخطار COAR",
+
+  // "footer.link.coar-notify-support": "COAR Notify",
+  // TODO New key - Add a translation
+  "footer.link.coar-notify-support": "COAR Notify",
+
+  // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "هل نسيت كلمة المرور",
-  "forgot-email.form.info": "قم بالضغط على عنوان البريد الإلكتروني ليس بالحساب.",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "قم بإدخال عنوان البريد الإلكتروني المرتبط بالحساب.",
+
+  // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "عنوان البريد الإلكتروني *",
-  "forgot-email.form.email.error.required": "الرجاء ملء عنوان البريد الإلكتروني",
-  "forgot-email.form.email.error.not-email-form": "برجاء ملء عنوان بريد إلكتروني صالح",
-  "forgot-email.form.email.hint": "سيتم إرسال بريد الإلكتروني إلى هذا العنوان ويتضمن المزيد من التعليمات.",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "يرجى ملء عنوان البريد الإلكتروني",
+
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "يرجى ملء عنوان بريد إلكتروني صالح",
+
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "سيتم إرسال بريد إلكتروني إلى هذا العنوان يتضمن المزيد من التعليمات.",
+
+  // "forgot-email.form.submit": "Reset password",
   "forgot-email.form.submit": "إعادة تعيين كلمة المرور",
-  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني وإعادة تعيين كلمة المرور",
-  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL الخاص بالمزيد.",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "تم إرسال رسالة عبر البريد الإلكتروني لإعادة تعيين كلمة المرور",
+
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "تم إرسال بريد إلكتروني إلى {{ email }} يحتوي على عنوان URL خاص وتعليمات إضافية.",
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور",
-  "forgot-email.form.error.content": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب بالإضافة إلى عنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "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": "حدث خطأ أثناء محاولة إعادة تعيين كلمة المرور للحساب المرتبط بعنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "نسيت كلمة المرور",
+
+  // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "نسيت كلمة المرور",
-  "forgot-password.form.info": "قم بتأكيد كلمة المرور الجديدة في الشريط أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في الشريط الثاني.",
+
+  // "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": "قم بإدخال كلمة المرور الجديدة في المربع أدناه، وقم بتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
+
+  // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "الحماية والأمان",
+
+  // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "تعريف",
+
+  // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "عنوان البريد الإلكتروني: ",
+
+  // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "كلمة المرور",
-  "forgot-password.form.label.passwordrepeat": "إعادة الكتابة للتأكيد",
-  "forgot-password.form.error.empty-password": "يرجى الاتصال بكلمة المرور في المجالات السابقة.",
+
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "يرجى إدخال كلمة المرور في المربعات أعلاه.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
+
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "حدث خطأ أثناء محاولة تقديم كلمة المرور الجديدة",
-  "forgot-password.form.notification.success.content": "تمت إعادة تعيين كلمة فعالة. ",
+
+  // "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": "تمت إعادة تعيين كلمة المرور بنجاح. لقد قمت بتسجيل الدخول كمستخدم تم إنشاؤه.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "اكتملت إعادة تعيين كلمة المرور",
+
+  // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "تقديم كلمة المرور",
+
+  // "form.add": "Add more",
   "form.add": "إضافة المزيد",
-  "form.add-help": "انقر هنا لإدخال النص الحالي",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "انقر هنا لإضافة الإدخال الحالي وإضافة إدخال آخر",
+
+  // "form.cancel": "Cancel",
   "form.cancel": "إلغاء",
-  "form.clear": "تعديل التعديل",
-  "form.clear-help": "انقر هنا القيمة المحددة",
-  "form.discard": "لا",
-  "form.drag": "يسحب",
+
+  // "form.clear": "Clear",
+  "form.clear": "مسح",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "انقر هنا لإزالة القيمة المحددة",
+
+  // "form.discard": "Discard",
+  "form.discard": "تجاهل",
+
+  // "form.drag": "Drag",
+  "form.drag": "سحب",
+
+  // "form.edit": "Edit",
   "form.edit": "تحرير",
+
+  // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "انقر هنا لتحرير القيمة المحددة",
+
+  // "form.first-name": "First name",
   "form.first-name": "الاسم الأول",
-  "form.group-collapse": "طيء",
+
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "طي",
+
+  // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "انقر هنا للطي",
-  "form.group-expand": "الأوقات",
-  "form.group-expand-help": "انقر هنا للتوسيع ولم المزيد من العناصر",
+
+  // "form.group-expand": "Expand",
+  "form.group-expand": "توسيع",
+
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "انقر هنا للتوسيع وإضافة المزيد من العناصر",
+
+  // "form.last-name": "Last name",
   "form.last-name": "اسم العائلة",
+
+  // "form.loading": "Loading...",
   "form.loading": "جاري التحميل...",
-  "form.lookup": "هان عن",
-  "form.lookup-help": "انقر هنا للبحث عن علاقة حالة",
-  "form.no-results": "لم يتم العثور على النتائج",
-  "form.no-value": "لم يتم توفير أي قيمة",
+
+  // "form.lookup": "Lookup",
+  "form.lookup": "ابحث عن",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "انقر هنا للبحث عن علاقة حالية",
+
+  // "form.no-results": "No results found",
+  "form.no-results": "لم يتم العثور على نتائج",
+
+  // "form.no-value": "No value entered",
+  "form.no-value": "لم يتم إدخال أي قيمة",
+
+  // "form.other-information.email": "Email",
   "form.other-information.email": "البريد الإلكتروني",
+
+  // "form.other-information.first-name": "First Name",
   "form.other-information.first-name": "الاسم الأول",
+
+  // "form.other-information.insolr": "In Solr Index",
   "form.other-information.insolr": "في فهرس سولر",
+
+  // "form.other-information.institution": "Institution",
   "form.other-information.institution": "المؤسسة",
+
+  // "form.other-information.last-name": "Last Name",
   "form.other-information.last-name": "اسم العائلة",
+
+  // "form.other-information.orcid": "ORCID",
   "form.other-information.orcid": "أوركيد",
+
+  // "form.remove": "Remove",
   "form.remove": "إزالة",
+
+  // "form.save": "Save",
   "form.save": "حفظ",
+
+  // "form.save-help": "Save changes",
   "form.save-help": "حفظ التغييرات",
+
+  // "form.search": "Search",
   "form.search": "بحث",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "انقر هنا للبحث عن المراسلات الحالية",
+
+  // "form.submit": "Save",
   "form.submit": "حفظ",
+
+  // "form.create": "Create",
   "form.create": "إنشاء",
-  "form.number-picker.decrement": "إن.قاص {{field}}",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "إنقاص {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
   "form.number-picker.increment": "زيادة {{field}}",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "قم بإسقاط المادة في الموضع الجديد",
-  "grant-deny-request-copy.deny": "لا تهتم بقراءة",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "لا تقم بإرسال نسخة",
+
+  // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "رجوع",
+
+  // "grant-deny-request-copy.email.message": "Optional additional message",
   "grant-deny-request-copy.email.message": "رسالة إضافية اختيارية",
-  "grant-deny-request-copy.email.message.empty": "الرجاء إرسال الرسالة",
-  "grant-deny-request-copy.email.permissions.info": "يمكنك إلغاء هذه الطريقة لإلغاء النظر في الإلكترونيات للوصول إلى أكسفورد، وتقليل الاضطرار إلى الرد على هذه الطلبات. ",
-  "grant-deny-request-copy.email.permissions.label": "تغيير للوصول حر",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "يرجى إدخال رسالة",
+
+  // "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": "يمكنك استغلال هذه المناسبة لإعادة النظر في قيود الوصول على الوثيقة، لتجنب الاضطرار إلى الرد على هذه الطلبات. إذا كنت ترغب في مطالبة مديري المستودع بإزالة هذه القيود، فيرجى تحديد المربع أدناه.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "تغيير إلى وصول حر",
+
+  // "grant-deny-request-copy.email.send": "Send",
   "grant-deny-request-copy.email.send": "إرسال",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
   "grant-deny-request-copy.email.subject": "الموضوع",
-  "grant-deny-request-copy.email.subject.empty": "يرجى الإرسال موضوع",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "يرجى إدخال موضوع",
+
+  // "grant-deny-request-copy.grant": "Send copy",
   "grant-deny-request-copy.grant": "إرسال نسخة",
-  "grant-deny-request-copy.header": "نسخة الطلب من أوكسلي",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "طلب نسخة من الوثيقة",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
   "grant-deny-request-copy.home-page": "انتقل بي إلى الصفحة الرئيسية",
-  "grant-deny-request-copy.intro1": "إذا كنت أحد الكتبي في جامعة أكسفورد <a href='{{ url }}'>{{ name }}</a>، يرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
-  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد على آلية البريد الإلكتروني يمكنك تحريرها.",
-  "grant-deny-request-copy.processed": "تنفيذ هذا الطلب بالفعل. ",
-  "grant-request-copy.email.subject": "طلب نسخة من الوثيقة",
+
+  // "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": "إذا كنت أحد مؤلفي الوثيقة <a href='{{ url }}'>{{ name }}</a>, فيرجى استخدام أحد الخيارات أدناه للرد على طلب المستخدم.",
+
+  // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  "grant-deny-request-copy.intro2": "بعد اختيار أحد الخيارات، سيُعرض عليك رسالة رد مقترحة بالبريد الإلكتروني يمكنك تحريرها.",
+
+  // "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": "تمت معالجة هذا الطلب بالفعل. يمكنك استخدام الزر أدناه للعودة إلى الصفحة الرئيسية.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "طلب نسخة من وثيقة",
+
+  // "grant-request-copy.error": "An error occurred",
   "grant-request-copy.error": "لقد حدث خطأ",
-  "grant-request-copy.header": "طلب منح نسخة من أوسكار",
-  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. ",
-  "grant-request-copy.success": "تم تقديم المساعدة الفعالة",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "طلب منح نسخة من الوثيقة",
+
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "سيتم إرسال هذه الرسالة إلى مقدم الطلب. وسيتم إرفاق الوثيقة المطلوبة.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "تم منح طلب المادة بنجاح",
+
+  // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "كشف الصحة",
+
+  // "health-page.heading": "Health",
   "health-page.heading": "كشف الصحة",
+
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "معلومات",
+
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "الحالة",
-  "health-page.error.msg": "خدمة الكتاب العام غير المؤقت",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "خدمة الفحص الصحي غير متاحة مؤقتاً",
+
+  // "health-page.property.status": "Status code",
   "health-page.property.status": "رمز الحالة",
-  "health-page.section.db.title": "قاعدة بيانات البيانات",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "قاعدة البيانات",
+
+  // "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": "سولر: جوهر الاستناد",
-  "health-page.section.solrOaiCore.title": "سولر: جو أوي",
+
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "سولر: جوهر oai",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
   "health-page.section.solrSearchCore.title": "سولر: جوهر البحث",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
   "health-page.section.solrStatisticsCore.title": "سولر: جوهر الإحصائيات",
-  "health-page.section-info.app.title": "النهاية",
+
+  // "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "الواجهة الخلفية للتطبيق",
+
+  // "health-page.section-info.java.title": "Java",
   "health-page.section-info.java.title": "جافا",
+
+  // "health-page.status": "Status",
   "health-page.status": "الحالة",
+
+  // "health-page.status.ok.info": "Operational",
   "health-page.status.ok.info": "تشغيلي",
-  "health-page.status.error.info": "تم كشف المشاكل",
-  "health-page.status.warning.info": "تم الكشف عن المشاكل الصغيرة",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "تم الكشف عن مشاكل",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "تم الكشف عن مشاكل محتملة",
+
+  // "health-page.title": "Health",
   "health-page.title": "كشف الصحة",
-  "health-page.section.no-issues": "لم يتم اكتشاف أي شيء",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "لم يتم اكتشاف أي مشكلات",
+
+  // "home.description": "",
   "home.description": "",
+
+  // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "الرئيسية",
-  "home.search-form.placeholder": "بحث المستودع...",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "بحث المستودع ...",
+
+  // "home.title": "Home",
   "home.title": "الرئيسية",
+
+  // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "المجتمعات في دي سبيس",
-  "home.top-level-communities.help": "هيا مجتمع لاستعراض مستحضراته.",
-  "info.end-user-agreement.accept": "لقد قمت بقراءة المنتج النهائي ووافقت عليه",
-  "info.end-user-agreement.accept.error": "حدث خطأ أثناء استخدام الاستخدام النهائي",
-  "info.end-user-agreement.accept.success": "تم تحديث الاستخدام النهائي بشكل فعال",
-  "info.end-user-agreement.breadcrumbs": "الاستخدام النهائي",
+
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "قم بتحديد مجتمع لاستعراض حاوياته.",
+
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "لقد قمت بقراءة اتفاقية المستخدم النهائي وأوافق عليها",
+
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "حدث خطأ أثناء قبول اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "تم بنجاح تحديث اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "إلغاء",
+
+  // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "حفظ",
-  "info.end-user-agreement.head": "الاستخدام النهائي",
-  "info.end-user-agreement.title": "الاستخدام النهائي",
+
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "اتفاقية المستخدم النهائي",
+
+  // "info.end-user-agreement.hosting-country": "the United States",
   "info.end-user-agreement.hosting-country": "الولايات المتحدة",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "بيان الخصوصية",
+
+  // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "بيان الخصوصية",
+
+  // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "بيان الخصوصية",
-  "info.feedback.breadcrumbs": "مراجعة",
-  "info.feedback.head": "مراجعة",
-  "info.feedback.title": "مراجعة",
-  "info.feedback.info": "شكراً لمشاركتنا آراءك حول نظام دي سبيس. ",
-  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة بياناتك.",
-  "info.feedback.send": "قم بزيارة تعليقاتك",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "ملاحظات",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "ملاحظات",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "ملاحظات",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "شكراً لمشاركتنا ملاحظاتك حول نظام دي سبيس. نقدر تعليقاتكم!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "سيتم استخدام هذا البريد الالكتروني لمتابعة ملاحظاتك.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "قم بإرسال ملاحظاتك",
+
+  // "info.feedback.comments": "Comments",
   "info.feedback.comments": "تعليقات",
+
+  // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "البريد الإلكتروني الخاص بك",
-  "info.feedback.create.success": "تم تحفيزه بشكل فعال!",
-  "info.feedback.error.email.required": "مطلوب عنوان بريد الإلكتروني صالح",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "تم إرسال الملاحظات بنجاح!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "مطلوب عنوان بريد إلكتروني صالح",
+
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "مطلوب تعليق",
+
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "صفحة",
+
+  // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "الصفحة ذات الصلة بملاحظاتك",
-  "info.coar-notify-support.title": "COAR إخطار الدعم",
-  "info.coar-notify-support.breadcrumbs": "COAR إخطار الدعم",
+
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  // TODO New key - Add a translation
+  "info.coar-notify-support.title": "COAR Notify Support",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  // TODO New key - Add a translation
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "هذه المادة غير قابلة للاكتشاف",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "تم سحب هذه المادة",
-  "item.alerts.reinstate-request": "طلب إعادة",
-  "quality-assurance.event.table.person-who-requested": "بتوصية من",
-  "item.edit.authorizations.heading": "باستخدام هذا المحرر، يمكنك عرض تغيير سياساتنا، بالإضافة إلى تغيير سياسات عناصر العناصر: الحزم والبنية. ",
-  "item.edit.authorizations.title": "تحرير سياسة المادة",
-  "item.badge.private": "غير للاكتشاف",
+
+  // "item.alerts.reinstate-request": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.alerts.reinstate-request": "Request reinstate",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.person-who-requested": "Requested by",
+
+  // "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": "باستخدام هذا المحرر ، يمكنك عرض وتغيير سياسات مادة ما، بالإضافة إلى تغيير سياسات مكونات المادة الفردية: الحزم وتدفق البت. باختصار، المادة عبارة عن حاوية من الحزم، والحزم عبارة عن حاويات لتدفقات البت. للحاويات في المعتاد سياسات ADD/REMOVE/READ/WRITE ، بينما يكون لتدفقات البت سياسات READ/WRITE فقط.",
+
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "تحرير سياسات المادة",
+
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "غير قابل للاكتشاف",
+
+  // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "مسحوب",
+
+  // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "الحزمة",
-  "item.bitstreams.upload.bundle.placeholder": "قم بالضغط على حزمة أو تسجيل اسم حزمة جديدة",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "قم بتحديد حزمة أو إدخال اسم حزمة جديدة",
+
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "إنشاء حزمة",
-  "item.bitstreams.upload.bundles.empty": "لا تحتوي على هذه المادة على أي حزم لتحميل تدفقات البت لها.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "لا تحتوي هذه المادة على أية حزم لتحميل تدفقات البت لها.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "إلغاء",
-  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف PDFه",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "قم بإسقاط ملف لتحميله",
+
+  // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "المواد: ",
-  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة وفعالة.",
-  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم تحديدها",
-  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. ",
+
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "تم إنشاء حزمة جديدة بنجاح.",
+
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "الحزمة التي تم إنشاؤها",
+
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "فشل التحميل. يرجى التحقق من المحتوى قبل إعادة المحاولة.",
+
+  // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "تحميل تدفق البت",
+
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "تحميل",
-  "item.edit.bitstreams.bundle.displaying": "يتم العرض حاليًا {{ amount }} تدفقات بت من {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "يتم حالياً عرض {{ amount }} تدفقات بت من {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "تحميل الكل ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "تحميل المزيد",
-  "item.edit.bitstreams.bundle.name": "الصندوق: {{ name }}",
-  "item.edit.bitstreams.discard-button": "لا",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "الحزمة: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "تجاهل",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "تنزيل",
-  "item.edit.bitstreams.edit.buttons.drag": "يسحب",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "سحب",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "تحرير",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "إزالة",
-  "item.edit.bitstreams.edit.buttons.undo": "الحكمة عن التغييرات",
-  "item.edit.bitstreams.empty": "لا تحتوي على هذه المادة على أي تدفقات بت. ",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "التراجع عن التغييرات",
+
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "لا تحتوي هذه المادة على أية تدفقات بت. انقر على زر التحميل لإنشاء واحد.",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "إجراءات",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "الحزمة",
+
+  // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "الوصف",
-  "item.edit.bitstreams.headers.format": "حتى",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "التنسيق",
+
+  // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "الاسم",
-  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين تغييراتك قم بالنقر على زر 'تراجع'",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "خطأ أثناء نقل تدفقات البت",
-  "item.edit.bitstreams.notifications.move.saved.content": "تم حفظ التطورات الجديدة بك على حزم وتدفقات بت هذه المادة.",
-  "item.edit.bitstreams.notifications.move.saved.title": "تم الحفاظ على التطورات الجديدة",
-  "item.edit.bitstreams.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.bitstreams.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.bitstreams.notifications.remove.failed.title": "حدث خطأ أثناء حذف تدفق البت",
-  "item.edit.bitstreams.notifications.remove.saved.content": "تم حفظ التغييرات الخاصة بك على تدفقات بت هذه المادة.",
-  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ التغييرات الإزالة",
-  "item.edit.bitstreams.reinstate-button": "ديب",
+
+  // "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": "تم حفظ تغييرات النقل الخاصة بك على حزم وتدفقات بت هذه المادة.",
+
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "تم حفظ تغييرات النقل",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "خطأ أثناء حذف تدفق البت",
+
+  // "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": "تم حفظ تغييرات الإزالة الخاصة بك على تدفقات بت هذه المادة.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "تم حفظ تغييرات الإزالة",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "تراجع",
+
+  // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "حفظ",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "تحميل",
+
+  // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "إلغاء",
+
+  // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "حذف",
-  "item.edit.delete.description": "هل أنت متأكد من حذف هذه المادة التجارية؟ ",
+
+  // "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": "هل أنت متأكد من حذف هذه المادة تماماً؟ تحذير: في الوقت الحالي لن تتبقى أي آثار.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "حدث خطأ أثناء حذف المادة",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "حذف المادة: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "تم حذف هذه المادة",
+
+  // "item.edit.head": "Edit Item",
   "item.edit.head": "تحرير المادة",
+
+  // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "تحرير المادة",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "غير مصرح لك بالوصول إلى هذا التبويب",
-  "item.edit.tabs.mapper.head": "خطة مخططة",
-  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الغذاء",
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "مخطط الحاوية",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "تحرير المادة - مخطط الحاوية",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
   "item.edit.identifiers.doi.status.UNKNOWN": "غير معروف",
-  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتشغيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "في قائمة الانتظار للتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
   "item.edit.identifiers.doi.status.TO_BE_RESERVED": "في قائمة الانتظار للحجز",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
   "item.edit.identifiers.doi.status.IS_REGISTERED": "مسجل",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
   "item.edit.identifiers.doi.status.IS_RESERVED": "محجوز",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
   "item.edit.identifiers.doi.status.UPDATE_RESERVED": "محجوز (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
   "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "مسجل (تحديث قائمة الانتظار)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
   "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "في قائمة الانتظار للتحديث والتسجيل",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
   "item.edit.identifiers.doi.status.TO_BE_DELETED": "في قائمة الانتظار للحذف",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
   "item.edit.identifiers.doi.status.DELETED": "تم الحذف",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
   "item.edit.identifiers.doi.status.PENDING": "في الانتظار (غير مسجل)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
   "item.edit.identifiers.doi.status.MINTED": "مسكوك (غير مسجل)",
-  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل الكائن المعرفي الرقمي الجديد أو في الانتظار",
-  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل الهوية الرقمية...",
-  "item.edit.register-doi.header": "تسجيل الكائن المعرفي الرقمي الجديد أو في الانتظار",
-  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر المؤكد على متابعة تسجيل المعرفة الرقمية، أو إلغاء القفل للتراجع",
-  "item.edit.register-doi.confirm": "بالتأكيد",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "تسجيل معرف كائن رقمي...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "تسجيل معرف كائن رقمي جديد أو في الانتظار",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "قم بمراجعة أي معرفات في الانتظار وميتاداتا المادة أدناه والنقر على تأكيد لمتابعة تسجيل معرف الكائن الرقمي، أو إلغاء للتراجع",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "تأكيد",
+
+  // "item.edit.register-doi.cancel": "Cancel",
   "item.edit.register-doi.cancel": "إلغاء",
-  "item.edit.register-doi.success": "تم وضع الإعدادات الرقمية في قائمة الانتظار الفعالة.",
-  "item.edit.register-doi.error": "خطأ في تسجيل المدخلات الرقمية",
-  "item.edit.register-doi.to-update": "لقد تم بالفعل إنشاء المفتاح الرقمي التالي ووضعه في قائمة الانتظار للتشغيل عبر الإنترنت",
-  "item.edit.item-mapper.buttons.add": "تخطيط المادة إلى مادة محددة",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "تم وضع معرف الكائن الرقمي في قائمة الانتظار للتسجيل بنجاح.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "خطأ في تسجيل معرف الكائن الرقمي",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "لقد تم بالفعل سك معرف الكائن الرقمي التالي وسيتم وضعه في قائمة الانتظار للتسجيل عبر الإنترنت",
+
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "تخطيط مادة إلى حاويات محددة",
+
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "إزالة تحطيط مادة لحاويات محددة",
+
+  // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "إلغاء",
-  "item.edit.item-mapper.description": "هذه أداة مخططة للمادة التي بدأت لمديرين تخطيط هذه المادة لتوثيق أخرى. ",
-  "item.edit.item-mapper.head": "المادة - تخطيط المادة إلى مادة الفينيل",
+
+  // "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": "هذه أداة مخطط المادة التي تتيح للمديرين تخطيط هذه المادة إلى حاويات أخرى. يمكنك البحث عن الحاويات وتخطيطها، أو استعراض قائمة بالحاويات التي تم تخطيط هذه المادة لها حالياً.",
+
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "مخطط المادة - تخطيط مادة إلى حاويات",
+
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "المادة: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.no-search": "يرجى الاتصال باستعلام للبحث",
-  "item.edit.item-mapper.notifications.add.error.content": "أحدث الأخطاء أثناء تخطيط المادة إلى  {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "يرجى إدخال استعلام للبحث",
+
+  // "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": "حدثت أخطاء أثناء تخطيط مادة إلى  {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "أخطاء التخطيط",
-  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة {{amount}} حاوية فعالة.",
+
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "تم تخطيط المادة إلى {{amount}} حاوية بنجاح.",
+
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "اكتمل التخطيط",
-  "item.edit.item-mapper.notifications.remove.error.content": "أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
+
+  // "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": "حدثت أخطاء أثناء إزالة التخطيط إلى {{amount}} حاوية.",
+
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "أخطاء إزالة التخطيط",
-  "item.edit.item-mapper.notifications.remove.success.content": "بعد إزالة تخطيط المادة {{amount}} حاوية فعالة.",
+
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "تمت إزالة تخطيط المادة إلى {{amount}} حاوية بنجاح.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "اكتملت إزالة التخطيط",
-  "item.edit.item-mapper.search-form.placeholder": "بحث مقبول...",
-  "item.edit.item-mapper.tabs.browse": "تم الاسترجاع المؤجل",
-  "item.edit.item-mapper.tabs.map": "تخطيط وثيقة جديدة",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "بحث الحاويات...",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "استعراض الحاويات المخططة",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "تخطيط حاويات جديدة",
+
+  // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "إضافة",
-  "item.edit.metadata.discard-button": "لا",
+
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "تجاهل",
+
+  // "item.edit.metadata.edit.language": "Edit language",
   "item.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "item.edit.metadata.edit.value": "Edit value",
   "item.edit.metadata.edit.value": "تحرير القيمة",
-  "item.edit.metadata.edit.authority.key": "تحرير مفتاح السلطة",
-  "item.edit.metadata.edit.buttons.confirm": "بالتأكيد",
-  "item.edit.metadata.edit.buttons.drag": "احصل على إعادة الترتيب",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "اسحب لإعادة ترتيب",
+
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "إزالة",
-  "item.edit.metadata.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "توقف عن التحرير",
-  "item.edit.metadata.edit.buttons.virtual": "هذه القيمة ميتا افتراضية، أي قيمة موروثة من كينونة ذات صلة.  ",
-  "item.edit.metadata.empty": "لا تحتوي المادة حاليا على أي ميتاداتا. ",
+
+  // "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.edit.buttons.virtual": "هذه قيمة ميتاداتا افتراضية، أي قيمة موروثة من كينونة ذات صلة. ولا يمكن تعديلها مباشرة. إضافة أو إزالة العلاقة المقابلة في تبويب \"العلاقات\" ",
+
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "لا تحتوي المادة حاليًا على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "تحرير",
-  "item.edit.metadata.headers.field": "حقل",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "الحقل",
+
+  // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "اللغة",
+
+  // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "القيمة",
+
+  // "item.edit.metadata.metadatafield": "Edit field",
   "item.edit.metadata.metadatafield": "تحرير الحقل",
-  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة البحث في الميتاداتا",
-  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار البحث ميتاداتا صالح",
-  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من صحة حقل الميتاداتا",
+
+  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر 'تراجع'",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   "item.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "لقد حدث خطأ",
-  "item.edit.metadata.notifications.invalid.content": "لم يتم الحفاظ على جديدك. ",
-  "item.edit.metadata.notifications.invalid.title": "دياداتا غير صالحة",
-  "item.edit.metadata.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.metadata.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.metadata.notifications.saved.content": "تم الحفاظ على نقصانك في ميتاداتا لهذه المادة.",
+
+  // "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": "لم يتم حفظ تغييراتك. يرجى التأكد من صحة جميع الحقول قبل الحفظ.",
+
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "تم حفظ تغييراتك على ميتاداتا هذه المادة.",
+
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
-  "item.edit.metadata.reinstate-button": "ديب",
-  "item.edit.metadata.reset-order-button": "انعكاس عن إعادة الترتيب",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "تراجع",
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "تراجع عن إعادة الترتيب",
+
+  // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "حفظ",
-  "item.edit.metadata.authority.label": "سلطة: ",
-  "item.edit.metadata.edit.buttons.open-authority-edition": "افتح قيمة مفتاح السلطة للتحرير اليدوي",
-  "item.edit.metadata.edit.buttons.close-authority-edition": "قفل قيمة مفتاح السلطة للتحرير اليدوي",
-  "item.edit.modify.overview.field": "بحث متقدم",
+
+  // "item.edit.metadata.authority.label": "Authority: ",
+  // TODO New key - Add a translation
+  "item.edit.metadata.authority.label": "Authority: ",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "حقل",
+
+  // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "اللغة",
-  "item.edit.modify.overview.value": "القيمة",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "قيمة",
+
+  // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "رجوع",
+
+  // "item.edit.move.save-button": "Save",
   "item.edit.move.save-button": "حفظ",
-  "item.edit.move.discard-button": "لا",
-  "item.edit.move.description": "اختر ما تريد في نقل هذه المادة لها. ",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "تجاهل",
+
+  // "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": "اختر الحاوية التي ترغب في نقل هذه المادة لها. لتضييق قائمة الحاويات المعروضة، يمكنك إدخال استعلام بحث في المربع.",
+
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "حدث خطأ أثناء محاولة نقل المادة",
-  "item.edit.move.head": "المادة: {{id}}",
-  "item.edit.move.inheritpolicies.checkbox": "توريث",
-  "item.edit.move.inheritpolicies.description": "توريث خصيصاً للضوءية",
-  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، ستستبدل سيجروم الوصول للقراءة الخاصة بالمادة وأي ملفات لاستخدام بسياسة الوصول للقراءة افتراضية للغاوية. ",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "نقل المادة: {{id}}",
+
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "توريث السياسات",
+
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "توريث السياسات الافتراضية للحاوية المقصودة",
+
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "تحذير: عند التفعيل، سيتم استبدال سياسة الوصول للقراءة الخاصة بالمادة وأي ملفات مرتبطة بالمادة بسياسة الوصول للقراءة الافتراضية للحاوية. لا يمكن التراجع عنه هذا الإجراء.",
+
+  // "item.edit.move.move": "Move",
   "item.edit.move.move": "نقل",
+
+  // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "جاري النقل...",
-  "item.edit.move.search.placeholder": "قم برجاء التأكيد على البحث عن تيفين",
-  "item.edit.move.success": "تم نقل المادة الفعالة",
+
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "قم بإدخال استعلام بحث للبحث عن حاويات",
+
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "تم نقل المادة بنجاح",
+
+  // "item.edit.move.title": "Move item",
   "item.edit.move.title": "نقل المادة",
+
+  // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "إلغاء",
+
+  // "item.edit.private.confirm": "Make it non-discoverable",
   "item.edit.private.confirm": "اجعلها غير قابلة للاكتشاف",
+
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
   "item.edit.private.description": "هل أنت متأكد من أن هذه المادة يجب أن تكون غير قابلة للاكتشاف في الأرشيف؟",
-  "item.edit.private.error": "حدث خطأ أثناء وضع المادة غير قابلة للاكتشاف",
-  "item.edit.private.header": "المادة غير قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "حدث خطأ أثناء جعل المادة غير قابلة للاكتشاف",
+
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "اجعل المادة غير قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "المادة الآن غير قابلة للاكتشاف",
+
+  // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "إلغاء",
-  "item.edit.public.confirm": "اجعلها للاكتشاف",
-  "item.edit.public.description": "هل أنت متأكد من أنه يجب أن تمتلك هذه المادة القابلة للاكتشاف في الأرشيف؟",
-  "item.edit.public.error": "حدث خطأ أثناء المادة القابلة للاكتشاف",
-  "item.edit.public.header": "المادة قابلة للاكتشاف: {{ id }}",
-  "item.edit.public.success": "المادة الآن للاكتشاف",
+
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "اجعلها قابلة للاكتشاف",
+
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "هل أنت متأكد من أنه يجب جعل هذه المادة قابلة للاكتشاف في الأرشيف؟",
+
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "حدث خطأ أثناء جعل المادة قابلة للاكتشاف",
+
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "اجعل المادة قابلة للاكتشاف: {{ id }}",
+
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "المادة الآن قابلة للاكتشاف",
+
+  // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "إلغاء",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "إعادة تعيين",
+
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "هل أنت متأكد من إعادة تعيين هذه المادة إلى الأرشيف؟",
+
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "حدث خطأ أثناء إعادة تعيين المادة",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "إعادة تعيين المادة: {{ id }}",
-  "item.edit.reinstate.success": "إعادة تعيين المادة الفعالة",
-  "item.edit.relationships.discard-button": "لا",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "تمت إعادة تعيين المادة بنجاح",
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "تجاهل",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "إضافة",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "إزالة",
-  "item.edit.relationships.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "لا توجد علاقات",
-  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تجاهلك. ",
+
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "تم تجاهل تغييراتك. لإعادة تعيين التغييرات قم بالنقر على زر  'تراجع'",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "حدث خطأ أثناء تحرير العلاقات",
-  "item.edit.relationships.notifications.outdated.content": "المادة التي تعمل بها حاليًا تم تغييرها بواسطة مستخدم آخر. ",
-  "item.edit.relationships.notifications.outdated.title": "اختر التغييرات",
-  "item.edit.relationships.notifications.saved.content": "تم الحفاظ على أفكارك على علاقات هذه المادة.",
+
+  // "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": "المادة التي تعمل عليها حالياً تم تغييرها بواسطة مستخدم آخر. تم تجاهل تغييراتك الحالية لتجنب التعارض",
+
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "تم حفظ تغييراتك على علاقات هذه المادة.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "تم حفظ العلاقات",
-  "item.edit.relationships.reinstate-button": "ديب",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "تراجع",
+
+  // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "حفظ",
-  "item.edit.relationships.no-entity-type": "قم بإضافة ميتا 'dspace.entity.type' لتفعيل هذه العلاقات",
+
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "قم بإضافة ميتاداتا 'dspace.entity.type' لتفعيل العلاقات لهذه المادة",
+
+  // "item.edit.return": "Back",
   "item.edit.return": "رجوع",
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "تدفقات البت",
-  "item.edit.tabs.bitstreams.title": "المادة الخام - تدفقات البت",
+
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "تحرير المادة - تدفقات البت",
+
+  // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "أكرتة",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "تحرير المادة - أكرتة",
-  "item.edit.curate.title": "المادة المادة: {{item}}",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "أكرتة المادة: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
   "item.edit.tabs.access-control.head": "التحكم في الوصول",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
   "item.edit.tabs.access-control.title": "تحرير المادة - التحكم في الوصول",
-  "item.edit.tabs.metadata.head": "ميداداتا",
-  "item.edit.tabs.metadata.title": "تحرير المادة - الميتاداتا",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "الميتاداتا",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "تحرير المادة -  الميتاداتا",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "العلاقات",
+
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "تحرير الماة - العلاقات",
-  "item.edit.tabs.status.buttons.authorizations.button": "...تصاريح",
-  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات المادة",
-  "item.edit.tabs.status.buttons.delete.button": "حذف",
-  "item.edit.tabs.status.buttons.delete.label": "شطب المادة",
-  "item.edit.tabs.status.buttons.mappedCollections.button": "وثيقة الوثيقة",
-  "item.edit.tabs.status.buttons.mappedCollections.label": "غير متوقعة",
-  "item.edit.tabs.status.buttons.move.button": "قم بنقل هذه المادة إلى حاوية مختلفة",
-  "item.edit.tabs.status.buttons.move.label": "قم بنقل هذه المادة إلى حاوية مختلفة",
+
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "تصاريح...",
+
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "تحرير سياسات تصاريح المادة",
+
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "حذف نهائي",
+
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "شطب المادة تماماً",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "حاويات مخططة",
+
+  // "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 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": "نقل هذه المادة إلى حاوية مختلفة",
+
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
   "item.edit.tabs.status.buttons.private.button": "اجعلها غير قابلة للاكتشاف...",
-  "item.edit.tabs.status.buttons.private.label": "المادة غير قابلة للاكتشاف",
-  "item.edit.tabs.status.buttons.public.button": "اجعلها للاكتشاف...",
-  "item.edit.tabs.status.buttons.public.label": "المادة قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "اجعل المادة غير قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "اجعلها قابلة للاكتشاف...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "اجعل المادة قابلة للاكتشاف",
+
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "إعادة تعيين...",
+
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "إعادة تعيين المادة في المستودع",
-  "item.edit.tabs.status.buttons.unauthorized": "غير مصرح لك بهذا الاقتراح",
-  "item.edit.tabs.status.buttons.withdraw.button": "اسحب هذه المادة",
-  "item.edit.tabs.status.buttons.withdraw.label": "اسحب هذه المادة من المستودع",
-  "item.edit.tabs.status.description": "مرحبا بك في صفحة إدارة المادة. ",
+
+  // "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 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.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": "مرحباً بك في صفحة إدارة المادة. من هنا يمكنك سحب المادة، أو إعادة تعيينها، أو نقلها أو حذفها. كما يمكنك تحديث أو إضافة ميتاداتا/ تدفقات بت جديدة في التبويبات الأخرى.",
+
+  // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "الحالة",
-  "item.edit.tabs.status.labels.handle": "مقبض",
-  "item.edit.tabs.status.labels.id": "تم تعريف المادة داخليًا",
+
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "هاندل",
+
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "معرّف المادة الداخلي",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "صفحة المادة",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "آخر تعديل",
-  "item.edit.tabs.status.title": "تحرير المادة - الحالة",
-  "item.edit.tabs.versionhistory.head": "نسخة السجل",
-  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل النسخة",
-  "item.edit.tabs.versionhistory.under-construction": "تحرير أو إضافة إصدار جديد ليس ممكناً بعد في واجهة المستخدم هذه..",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "تحرير المادة -  الحالة",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "سجل الإصدارة",
+
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "تحرير المادة - سجل الإصدارة",
+
+  // "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": "تحرير أو إضافة إصدارات جديدة ليس ممكناً بعد في واجهة المستخدم هذه..",
+
+  // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "عرض المادة",
-  "item.edit.tabs.view.title": "تحرير المادة - عرض",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "تحرير المادة -  عرض",
+
+  // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "إلغاء",
-  "item.edit.withdraw.confirm": "يسحب",
-  "item.edit.withdraw.description": "هل أنت متأكد من أنك لا تستطيع سحب هذه المادة من الأرشيف؟",
-  "item.edit.withdraw.error": "حدث خطأ أثناء المادة",
-  "item.edit.withdraw.header": "المادة: {{ id }}",
-  "item.edit.withdraw.success": "تم سحب المادة الفعالة",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "سحب",
+
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "هل أنت متأكد من ضرورة سحب هذه المادة من الأرشيف؟",
+
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "حدث خطأ أثناء سحب المادة",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "سحب المادة: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "تم سحب المادة بنجاح",
+
+  // "item.orcid.return": "Back",
   "item.orcid.return": "رجوع",
+
+  // "item.listelement.badge": "Item",
   "item.listelement.badge": "المادة",
+
+  // "item.page.description": "Description",
   "item.page.description": "الوصف",
+
+  // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ردمد الدورية",
-  "item.page.journal-title": "عنوان الدوري",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "عنوان الدورية",
+
+  // "item.page.publisher": "Publisher",
   "item.page.publisher": "الناشر",
+
+  // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "المادة: ",
+
+  // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "عنوان المجلد",
-  "item.search.results.head": "نتائج بحثت المواد",
-  "item.search.title": "بحثت المواد",
+
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "نتائج بحث المواد",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "بحث المواد",
+
+  // "item.truncatable-part.show-more": "Show more",
   "item.truncatable-part.show-more": "عرض المواد",
-  "item.truncatable-part.show-less": "طيء",
-  "item.qa-event-notification.check.notification-info": "هناك {{num}} في انتظار الاقتراحات المتعلقة بحسابك",
-  "item.qa-event-notification-info.check.button": "منظر",
-  "mydspace.qa-event-notification.check.notification-info": "هناك {{num}} في انتظار الاقتراحات المتعلقة بحسابك",
-  "mydspace.qa-event-notification-info.check.button": "منظر",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "طي",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "item.qa-event-notification-info.check.button": "View",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "mydspace.qa-event-notification-info.check.button": "View",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "حذف أمر الإشراف",
-  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر مهم؟",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "هل أنت متأكد من أنك تريد حذف أمر الإشراف",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
   "workflow-item.search.result.delete-supervision.modal.cancel": "إلغاء",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
   "workflow-item.search.result.delete-supervision.modal.confirm": "حذف",
-  "workflow-item.search.result.notification.deleted.success": "تم الحذف أمر فعال فعال \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "تم حذف أمر الإشراف بنجاح \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
   "workflow-item.search.result.notification.deleted.failure": "فشل في حذف أمر الإشراف \"{{name}}\"",
-  "workflow-item.search.result.list.element.supervised-by": "تحت الضربة:",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "تحت إشراف:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "إزالة مجموعة الإشراف",
-  "confidence.indicator.help-text.accepted": "تم تأكيد دقة قيمة الاستناد هذه من قبل مستخدم تفاعلي",
-  "confidence.indicator.help-text.uncertain": "القيمة مفردة وصالحة ولكن لم يراها الإنسان ويقبلها، لذا فهي لا تزال غير مؤكدة",
-  "confidence.indicator.help-text.ambiguous": "هناك العديد من قيم السلطة المطابقة ذات الصلاحية المتساوية",
-  "confidence.indicator.help-text.notfound": "لا توجد إجابات مطابقة في السلطة",
-  "confidence.indicator.help-text.failed": "واجهت السلطة فشلا داخليا",
-  "confidence.indicator.help-text.rejected": "توصي الهيئة برفض هذا التقديم",
-  "confidence.indicator.help-text.novalue": "ولم يتم إرجاع أي قيمة ثقة معقولة من الهيئة",
-  "confidence.indicator.help-text.unset": "لم يتم تسجيل الثقة بهذه القيمة أبدًا",
-  "confidence.indicator.help-text.unknown": "قيمة ثقة غير معروفة",
-  "item.page.abstract": "أ",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  // TODO New key - Add a translation
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "خلاصة",
+
+  // "item.page.author": "Authors",
   "item.page.author": "المؤلفين",
-  "item.page.citation": "المرسل",
-  "item.page.collections": "مقبول",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation": "اقتباس",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections": "الحاويات",
+
+  // "item.page.collections.loading": "Loading...",
   "item.page.collections.loading": "جاري التحميل...",
+
+  // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "تحميل المزيد",
+
+  // "item.page.date": "Date",
   "item.page.date": "التاريخ",
+
+  // "item.page.edit": "Edit this item",
   "item.page.edit": "تحرير هذه المادة",
+
+  // "item.page.files": "Files",
   "item.page.files": "ملفات",
+
+  // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "الوصف:",
+
+  // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "تنزيل",
-  "item.page.filesection.format": "التنسيق:",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "تنسيق:",
+
+  // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "الاسم:",
+
+  // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "الحجم:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "مقالات في هذه الدورية",
-  "item.page.link.full": "صفحة المادة كاملة",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "صفحة المادة الكاملة",
+
+  // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "صفحة المادة البسيطة",
+
+  // "item.page.orcid.title": "ORCID",
   "item.page.orcid.title": "أوركيد",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
   "item.page.orcid.tooltip": "فتح صفحة إعداد أوركيد",
+
+  // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "مقالات بواسطة هذا المؤلف",
-  "item.page.related-items.view-more": "الإظهار {{ amount }} أكثر",
+
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "إظهار {{ amount }} أكثر",
+
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "إخفاء آخر {{ amount }}",
-  "item.page.relationships.isAuthorOfPublication": "منشورات",
-  "item.page.relationships.isJournalOfPublication": "منشورات",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "المنشورات",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "المنشورات",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "المؤلفين",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "مشاريع البحث",
-  "item.page.subject": "الكلمات الرئيسية",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "كلمات رئيسية",
+
+  // "item.page.uri": "URI",
   "item.page.uri": "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "عرض المزيد",
-  "item.page.bitstreams.collapse": "طيء",
-  "item.page.bitstreams.primary": "أساسي",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "طي",
+
+  // "item.page.bitstreams.primary": "Primary",
+  // TODO New key - Add a translation
+  "item.page.bitstreams.primary": "Primary",
+
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "الحزمة الرئيسية",
-  "item.page.filesection.license.bundle": "حزمة الحزمة",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "حزمة الترخيص",
+
+  // "item.page.return": "Back",
   "item.page.return": "رجوع",
-  "item.page.version.create": "إنشاء طبعة جديدة",
-  "item.page.withdrawn": "طلب سحب لهذا البند",
-  "item.page.reinstate": "طلب الإعادة",
-  "item.page.version.hasDraft": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
+
+  // "item.page.version.create": "Create new version",
+  "item.page.version.create": "إنشاء إصدارة جديدة",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  // TODO New key - Add a translation
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  // TODO New key - Add a translation
+  "item.page.reinstate": "Request reinstatement",
+
+  // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
+  "item.page.version.hasDraft": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.page.claim.button": "Claim",
   "item.page.claim.button": "مطالبة",
-  "item.page.claim.tooltip": "بسبب هذه المادة الشخصية",
-  "item.page.image.alt.ROR": "شعار ROR",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "المطالبة بهذه المادة كملف شخصي",
+
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR شعار",
+
+  // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "المعرف:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "المؤلفين:",
+
+  // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "تاريخ النشر:",
-  "item.preview.dc.description.abstract": "السرعة:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "مستخلص:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "معرف آخر:",
+
+  // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "اللغة:",
-  "item.preview.dc.subject": "الموضوع:",
-  "item.preview.dc.title": "عنوان العنوان:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "الموضوعات:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "العنوان:",
+
+  // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "النوع:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "العدد",
-  "item.preview.oaire.citation.volume": "مجلد",
-  "item.preview.dc.relation.issn": "الرقم الدولي الموحد للدوريات",
-  "item.preview.dc.identifier.isbn": "رقم ISBN",
+
+  // "item.preview.oaire.citation.volume": "Volume",
+  "item.preview.oaire.citation.volume": "المجلد",
+
+  // "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": "المعرف:",
-  "item.preview.dc.relation.ispartof": "الدوري",
-  "item.preview.dc.identifier.doi": "المعرفة الرقمية",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "الدورية",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "معرف الكائن الرقمي",
+
+  // "item.preview.dc.publisher": "Publisher:",
   "item.preview.dc.publisher": "الناشر:",
-  "item.preview.person.familyName": "يتمنى:",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "اللقب:",
+
+  // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "الاسم:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "أوركيد:",
+
+  // "item.preview.project.funder.name": "Funder:",
   "item.preview.project.funder.name": "الممول:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
   "item.preview.project.funder.identifier": "معرف الممول:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
   "item.preview.oaire.awardNumber": "معرف التمويل:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
   "item.preview.dc.title.alternative": "الحروف المختصرة:",
-  "item.preview.dc.coverage.spatial": "عدم التفويض:",
-  "item.preview.oaire.fundingStream": "التدفق:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "الاختصاص القضائي:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "تدفق التمويل:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
   "item.preview.oairecerif.identifier.url": "عنوان URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
   "item.preview.organization.address.addressCountry": "البلد",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
   "item.preview.organization.foundingDate": "تاريخ التأسيس",
-  "item.preview.organization.identifier.crossrefid": "معرف Crossref",
-  "item.preview.organization.identifier.isni": "إسني",
-  "item.preview.organization.identifier.ror": "معرف ROR",
-  "item.preview.organization.legalName": "الاسم الساقي",
-  "item.preview.dspace.entity.type": "نوع الكيان:",
-  "item.select.confirm": "بالتأكيد",
-  "item.select.empty": "لا يوجد شيء للعرض",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef معرف",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR معرف",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "الاسم القانوني",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  // TODO New key - Add a translation
+  "item.preview.dspace.entity.type": "Entity Type:",
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "تأكيد المحدد",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "لا توجد مواد للعرض",
+
+  // "item.select.table.selected": "Selected items",
   "item.select.table.selected": "المواد المحددة",
-  "item.select.table.select": "المادة المحددة",
-  "item.select.table.deselect": "قم بإلغاء تحديد المادة",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "تحديد المادة",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "إلغاء تحديد المادة",
+
+  // "item.select.table.author": "Author",
   "item.select.table.author": "المؤلف",
-  "item.select.table.collection": "ابدأ",
-  "item.select.table.title": "عنوان العنوان",
-  "item.version.history.empty": "لا توجد إصدارات أخرى من هذه الخامة حتى الآن.",
-  "item.version.history.head": "نسخة السجل",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "الحاوية",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "العنوان",
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "لا توجد إصدارات أخرى لهذه المادة حتى الآن.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "سجل الإصدارة",
+
+  // "item.version.history.return": "Back",
   "item.version.history.return": "رجوع",
+
+  // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "افصدارة المحددة",
-  "item.version.history.selected.alert": "أنت حاليا تقوم بعرض النسخة {{version}} لذلك.",
-  "item.version.history.table.version": "النسخة",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "أنت حالياً تقوم بعرض الإصدارة {{version}} للمادة.",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "الإصدارة",
+
+  // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "المادة",
+
+  // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "المحرر",
+
+  // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "التاريخ",
+
+  // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "الملخص",
-  "item.version.history.table.workspaceItem": "نطاق العمل",
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "مادة نطاق العمل",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
   "item.version.history.table.workflowItem": "مادة سير العمل",
+
+  // "item.version.history.table.actions": "Action",
   "item.version.history.table.actions": "الإجراء",
-  "item.version.history.table.action.editWorkspaceItem": "تحرير مساحة العمل",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "تحرير مادة نطاق العمل",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
   "item.version.history.table.action.editSummary": "تحرير الملخص",
-  "item.version.history.table.action.saveSummary": "حفظ الملخص",
-  "item.version.history.table.action.discardSummary": "أهمل الملخص",
-  "item.version.history.table.action.newVersion": "إنشاء نسخة جديدة من هذه النسخة",
-  "item.version.history.table.action.deleteVersion": "حذف النسخة",
-  "item.version.history.table.action.hasDraft": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
-  "item.version.notice": "هذه ليست آخر نسخة من هذه المادة.  <a href='{{destination}}'>هنا</a>.",
-  "item.version.create.modal.header": "نسخة جديدة",
-  "item.qa.withdrawn.modal.header": "طلب الانسحاب",
-  "item.qa.reinstate.modal.header": "طلب إعادة",
-  "item.qa.reinstate.create.modal.header": "نسخة جديدة",
-  "item.version.create.modal.text": "خلق نسخة جديدة لهذه المادة",
-  "item.version.create.modal.text.startingFrom": "البدء من النسخة {{version}}",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "حفظ تعديلات الملخص",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "تجاهل تعديلات الملخص",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "إنشاء إصدارة جديدة من هذه الإصدارة",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "حذف الإصدارة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "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": "هذه ليست آخر إصدارة من هذه المادة. يمكن العثور على آخر إصدارة من <a href='{{destination}}'>هنا</a>.",
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "إصدارة جديدة",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.modal.header": "Request reinstate",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.qa.reinstate.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "إنشاء إصدارة جديدة لهذه المادة",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "بدءاً من الإصدارة {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
   "item.version.create.modal.button.confirm": "إنشاء",
-  "item.version.create.modal.button.confirm.tooltip": "إنشاء طبعة جديدة",
-  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "ارسل طلب",
-  "qa-withdrown.create.modal.button.confirm": "ينسحب",
-  "qa-reinstate.create.modal.button.confirm": "إعادة",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "إنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  // TODO New key - Add a translation
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "إلغاء",
-  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "يلغي",
-  "item.version.create.modal.button.cancel.tooltip": "لا لتوقف عن الاصدار الجديد",
-  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "لا ترسل الطلب",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "لا تقم بإنشاء إصدارة جديدة",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "الملخص",
-  "qa-withdrawn.create.modal.form.summary.label": "أنت تطلب سحب هذا البند",
-  "qa-withdrawn.create.modal.form.summary2.label": "الرجاء إدخال سبب الانسحاب",
-  "qa-reinstate.create.modal.form.summary.label": "أنت تطلب إعادة هذا العنصر",
-  "qa-reinstate.create.modal.form.summary2.label": "الرجاء إدخال سبب الإعادة",
-  "item.version.create.modal.form.summary.placeholder": "قم بالضغط على النسخة الجديدة",
-  "qa-withdrown.modal.form.summary.placeholder": "أدخل سبب السحب",
-  "qa-reinstate.modal.form.summary.placeholder": "أدخل سبب الإعادة",
-  "item.version.create.modal.submitted.header": "إنشاء طبعة جديدة...",
-  "item.qa.withdrawn.modal.submitted.header": "جارٍ إرسال الطلب المسحوب...",
-  "correction-type.manage-relation.action.notification.reinstate": "تم إرسال طلب الاستعادة.",
-  "correction-type.manage-relation.action.notification.withdrawn": "تم إرسال طلب السحب.",
-  "item.version.create.modal.submitted.text": "جاري إنشاء نسخة جديدة. ",
-  "item.version.create.notification.success": "تم إنشاء نسخة جديدة برقم الإصدار {{version}}",
-  "item.version.create.notification.failure": "لم يتم إنشاء إصدار جديد",
-  "item.version.create.notification.inProgress": "لا يمكن إنشاء نسخة جديدة إذًا هناك تقديم قيد التقدم في نسخة النسخة",
-  "item.version.delete.modal.header": "حذف النسخة",
-  "item.version.delete.modal.text": "هل ترغب في حذف النسخة {{version}}؟",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  // TODO New key - Add a translation
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "قم بإدخال ملخص الإصدارة الجديدة",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  // TODO New key - Add a translation
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  // TODO New key - Add a translation
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "إنشاء إصدارة جديدة...",
+
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  // TODO New key - Add a translation
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  // TODO New key - Add a translation
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
+  // "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": "جاري إنشاء الإصدارة الجديدة. قد يستغرق هذا بعض الوقت إذا كان لهذه المادة الكثير من العلاقات.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "تم إنشاء إصدارة جديدة برقم الإصدار {{version}}",
+
+  // "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "لم يتم إنشاء إصدارة جديدة",
+
+  // "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": "لا يمكن إنشاء إصدارة جديدة نظراً لوجود تقديم قيد التقدم في سجل الإصدارة",
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "حذف الإصدارة",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "هل ترغب في حذف الإصدارة {{version}}؟",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "حذف",
-  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه النسخة",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "حذف هذه الإصدارة",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
   "item.version.delete.modal.button.cancel": "إلغاء",
-  "item.version.delete.modal.button.cancel.tooltip": "لا تنسى حذف هذه النسخة",
-  "item.version.delete.notification.success": "تم حذف النسخة رقم {{version}}",
-  "item.version.delete.notification.failure": "لن يتم حذف النسخة رقم {{version}}",
-  "item.version.edit.notification.success": "تم تغيير ملخص النسخة رقم {{version}}",
-  "item.version.edit.notification.failure": "لم يتم تغيير ملخص النسخة رقم {{version}}",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "لا تقم بحذف هذه الإصدارة",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "تم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "لم يتم حذف الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "تم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "لم يتم تغيير ملخص الإصدارة رقم {{version}}",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
   "itemtemplate.edit.metadata.add-button": "إضافة",
-  "itemtemplate.edit.metadata.discard-button": "لا",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "تجاهل",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
   "itemtemplate.edit.metadata.edit.language": "تحرير اللغة",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
   "itemtemplate.edit.metadata.edit.value": "تحرير القيمة",
-  "itemtemplate.edit.metadata.edit.buttons.confirm": "بالتأكيد",
-  "itemtemplate.edit.metadata.edit.buttons.drag": "قم بإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "تأكيد",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "اسحب لإعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
   "itemtemplate.edit.metadata.edit.buttons.edit": "تحرير",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
   "itemtemplate.edit.metadata.edit.buttons.remove": "إزالة",
-  "itemtemplate.edit.metadata.edit.buttons.undo": "انقلب عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "تراجع عن التغييرات",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
   "itemtemplate.edit.metadata.edit.buttons.unedit": "إيقاف التحرير",
-  "itemtemplate.edit.metadata.empty": "القالب الحالي لا يحتوي على أي ميتاداتا. ",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "قالب العنصر حاليًا لا يحتوي على أي ميتاداتا. انقر فوق إضافة لبدء إضافة قيمة ميتاداتا.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
   "itemtemplate.edit.metadata.headers.edit": "تحرير",
-  "itemtemplate.edit.metadata.headers.field": "حقل",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "الحقل",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
   "itemtemplate.edit.metadata.headers.language": "اللغة",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "القيمة",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
   "itemtemplate.edit.metadata.metadatafield": "تحرير الحقل",
-  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من البحث في الميتاداتا",
-  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار البحث ميتاداتا صالح",
-  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي اختارتها.  ",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "حدث خطأ أثناء التحقق من حقل الميتاداتا",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "يرجى اختيار حقل ميتاداتا صالح",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "تم تجاهل التغييرات التي أجريتها. لاستعادة التغييرات، قم بالنقر على زر 'تراجع' ",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
   "itemtemplate.edit.metadata.notifications.discarded.title": "تم تجاهل التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
   "itemtemplate.edit.metadata.notifications.error.title": "حدث خطأ",
-  "itemtemplate.edit.metadata.notifications.invalid.content": "لم يتم حفظ التغييرات. ",
-  "itemtemplate.edit.metadata.notifications.invalid.title": "دياداتا غير صالحة",
-  "itemtemplate.edit.metadata.notifications.outdated.content": "تم تغيير المادة التي تعمل حاليا بواسطة مستخدم آخر. ",
-  "itemtemplate.edit.metadata.notifications.outdated.title": "اختر التغييرات",
-  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي استخدمتها على الميتاداتا لقالب المادة هذه.",
+
+  // "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.content": "لم يتم حفظ التغييرات. يرجى التأكد من أن جميع الحقول صالحة قبل الحفظ.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "الميتاداتا غير صالحة",
+
+  // "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.content": "تم تغيير قالب المادة الذي تعمل عليه حالياً بواسطة مستخدم آخر. تم تجاهل التغييرات الحالية لمنع التعارضات",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "انتهت صلاحية التغييرات",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "تم حفظ التغييرات التي أجريتها على الميتاداتا لقالب المادة هذا.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
   "itemtemplate.edit.metadata.notifications.saved.title": "تم حفظ الميتاداتا",
-  "itemtemplate.edit.metadata.reinstate-button": "ديب",
-  "itemtemplate.edit.metadata.reset-order-button": "الادارة عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "تراجع",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "التراجع عن إعادة الترتيب",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
   "itemtemplate.edit.metadata.save-button": "حفظ",
-  "journal.listelement.badge": "الدوري",
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "الدورية",
+
+  // "journal.page.description": "Description",
   "journal.page.description": "الوصف",
+
+  // "journal.page.edit": "Edit this item",
   "journal.page.edit": "تحرير هذه المادة",
+
+  // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "رئيس التحرير",
-  "journal.page.issn": "الرقم الدولي الموحد للدوريات",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+
+  // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "الناشر",
-  "journal.page.titleprefix": "الدوري: ",
-  "journal.search.results.head": "نتائج الدورية التي بحثتها",
-  "journal-relationships.search.results.head": "نتائج الدورية التي بحثتها",
-  "journal.search.title": "الدورية الدورية",
-  "journalissue.listelement.badge": "عدد الدوري",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "الدورية: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "نتائج بحث الدورية",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "نتائج بحث الدورية",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "بحث الدورية",
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "عدد الدورية",
+
+  // "journalissue.page.description": "Description",
   "journalissue.page.description": "الوصف",
+
+  // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "تحرير هذه المادة",
+
+  // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "تاريخ العدد",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "ردمد الدورية",
-  "journalissue.page.journal-title": "عنوان الدوري",
-  "journalissue.page.keyword": "الكلمات الرئيسية",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "عنوان الدورية",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "كلمات رئيسية",
+
+  // "journalissue.page.number": "Number",
   "journalissue.page.number": "رقم",
-  "journalissue.page.titleprefix": "عدد الدوري: ",
-  "journalissue.search.results.head": "نتائج البحث عدد الدوري",
-  "journalvolume.listelement.badge": "سلسلة الدورية",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "عدد الدورية: ",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "نتائج بحث عدد الدورية",
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "مجلد الدورية",
+
+  // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "الوصف",
+
+  // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "تحرير هذه المادة",
+
+  // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "تاريخ الإصدار",
-  "journalvolume.page.titleprefix": "دورة دورية: ",
-  "journalvolume.page.volume": "مجلد",
-  "journalvolume.search.results.head": "نتائج البحث في الدوري",
-  "iiifsearchable.listelement.badge": "وسائط الوسائط",
-  "iiifsearchable.page.titleprefix": "أوكلاند: ",
-  "iiifsearchable.page.doi": "الرابط الجديد: ",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "مجلد دورية: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "المجلد",
+
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "نتائج بحث مجلد الدورية",
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "وسائط الوثائق",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "الوثيقة: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "الرابط الدائم: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
   "iiifsearchable.page.issue": "العدد: ",
+
+  // "iiifsearchable.page.description": "Description: ",
   "iiifsearchable.page.description": "الوصف: ",
-  "iiifviewer.fullscreen.notice": "استخدم الشاشة بالكامل لمشاهدة أفضل.",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "استخدم الشاشة الكاملة لمشاهدة أفضل.",
+
+  // "iiif.listelement.badge": "Image Media",
   "iiif.listelement.badge": "وسائط الصور",
+
+  // "iiif.page.titleprefix": "Image: ",
   "iiif.page.titleprefix": "الصورة: ",
-  "iiif.page.doi": "الرابط الجديد: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "الرابط الدائم: ",
+
+  // "iiif.page.issue": "Issue: ",
   "iiif.page.issue": "العدد: ",
+
+  // "iiif.page.description": "Description: ",
   "iiif.page.description": "الوصف: ",
+
+  // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "جاري تحميل تدفق البت...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "جاري تحميل تدفقات البت...",
+
+  // "loading.browse-by": "Loading items...",
   "loading.browse-by": "جاري تحميل المواد...",
+
+  // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "جاري تحميل الصفحة...",
-  "loading.collection": "جاري تحميل...",
-  "loading.collections": "جاري التحميل ...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "جاري تحميل الحاوية...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "جاري تحميل الحاويات...",
+
+  // "loading.content-source": "Loading content source...",
   "loading.content-source": "جاري تحميل مصدر المحتوى...",
+
+  // "loading.community": "Loading community...",
   "loading.community": "جاري تحميل المجتمع...",
+
+  // "loading.default": "Loading...",
   "loading.default": "جاري التحميل...",
+
+  // "loading.item": "Loading item...",
   "loading.item": "جاري تحميل المادة...",
+
+  // "loading.items": "Loading items...",
   "loading.items": "جاري تحميل المواد...",
+
+  // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "جاري تحميل المواد...",
+
+  // "loading.objects": "Loading...",
   "loading.objects": "جاري التحميل...",
-  "loading.recent-submissions": "جاري تحميل أحدث العروض...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "جاري تحميل أحدث التقديمات...",
+
+  // "loading.search-results": "Loading search results...",
   "loading.search-results": "جاري تحميل نتائج البحث...",
-  "loading.sub-collections": "جاري تحميل مؤقت...",
-  "loading.sub-communities": "جاري تحميل الكنيسة...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "جاري تحميل الحاويات الفرعية...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "جاري تحميل المجتمعات الفرعية...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "جاري تحميل مجتمعات المستوى الأعلى...",
+
+  // "login.form.email": "Email address",
   "login.form.email": "عنوان البريد الإلكتروني",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "هل نسيت كلمة المرور؟",
+
+  // "login.form.header": "Please log in to DSpace",
   "login.form.header": "يرجى تسجيل الدخول إلى دي سبيس",
-  "login.form.new-user": "مستخدم جديد؟ ",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "مستخدم جديد؟ اضغط هنا للتسجيل.",
+
+  // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.orcid": "Log in with ORCID",
   "login.form.orcid": "تسجيل الدخول باستخدام أوركيد",
+
+  // "login.form.password": "Password",
   "login.form.password": "كلمة المرور",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "تسجيل الدخول باستخدام Shibboleth",
+
+  // "login.form.submit": "Log in",
   "login.form.submit": "تسجيل الدخول",
+
+  // "login.title": "Login",
   "login.title": "تسجيل الدخول",
+
+  // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "تسجيل الدخول",
+
+  // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "تسجيل الخروج من دي سبيس",
+
+  // "logout.form.submit": "Log out",
   "logout.form.submit": "خروج",
+
+  // "logout.title": "Logout",
   "logout.title": "خروج",
-  "menu.header.nav.description": "شريط التنقل المشرف",
+
+  // "menu.header.nav.description": "Admin navigation bar",
+  // TODO New key - Add a translation
+  "menu.header.nav.description": "Admin navigation bar",
+
+  // "menu.header.admin": "Management",
   "menu.header.admin": "إدارة",
-  "menu.header.image.logo": "مستودع الشعار",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "شعار المستودع",
+
+  // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "قائمة الإدارة",
+
+  // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "التحكم في الوصول",
-  "menu.section.access_control_authorizations": ".تصاريح",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "تصاريح",
+
+  // "menu.section.access_control_bulk": "Bulk Access Management",
   "menu.section.access_control_bulk": "إدارة الوصول بالجملة",
+
+  // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "مجموعات",
-  "menu.section.access_control_people": "الأشخاص",
-  "menu.section.reports": "التقارير",
-  "menu.section.reports.collections": "المجموعات التي تمت تصفيتها",
-  "menu.section.reports.queries": "استعلام بيانات التعريف",
+
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "أشخاص",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
+
+  // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "بحث إداري",
+
+  // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "هذا المجتمع",
+
+  // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "حسب المؤلف",
+
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "حسب تاريخ الإصدار",
-  "menu.section.browse_community_by_title": "عنوان حسب الطلب",
+
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "حسب العنوان",
+
+  // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "كل دي سبيس",
+
+  // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "حسب المؤلف",
+
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "حسب تاريخ الإصدار",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "حسب الموضوع",
+
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
   "menu.section.browse_global_by_srsc": "حسب فئة الموضوع",
-  "menu.section.browse_global_by_nsi": "حسب فرس العلوم النرويجي",
-  "menu.section.browse_global_by_title": "عنوان حسب الطلب",
-  "menu.section.browse_global_communities_and_collections": "المجتمعات والاويات",
-  "menu.section.control_panel": "التحكم باللوحة",
-  "menu.section.curation_task": "مهمة اخرى",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "حسب فهرس العلوم النرويجي",
+
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "حسب العنوان",
+
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "المجتمعات والحاويات",
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "لوحة التحكم",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "مهمة الأكرتة",
+
+  // "menu.section.edit": "Edit",
   "menu.section.edit": "تحرير",
+
+  // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "حاوية",
+
+  // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "مجتمع",
+
+  // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "مادة",
+
+  // "menu.section.export": "Export",
   "menu.section.export": "تصدير",
+
+  // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "حاوية",
+
+  // "menu.section.export_community": "Community",
   "menu.section.export_community": "مجتمع",
+
+  // "menu.section.export_item": "Item",
   "menu.section.export_item": "مادة",
+
+  // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "ميتاداتا",
-  "menu.section.export_batch": "التصدير بالدفعة (ZIP)",
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "تصدير بالدفعة (ZIP)",
+
+  // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "قسم قائمة التحكم في الوصول",
-  "menu.section.icon.reports": "قسم قائمة التقارير",
-  "menu.section.icon.admin_search": "قسم قائمة البحث الإضافي",
+
+  // "menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "قسم قائمة البحث الإداري",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "قسم قائمة لوحة التحكم",
-  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الاخرة",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "قسم قائمة مهمة الأكرتة",
+
+  // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "قسم قائمة التحرير",
+
+  // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "قسم قائمة التصدير",
+
+  // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "قسم قائمة البحث",
+
+  // "menu.section.icon.health": "Health check menu section",
   "menu.section.icon.health": "قسم قائمة التحقق من الصحة",
+
+  // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "قسم قائمة الاستيراد",
-  "menu.section.icon.new": "قسم قائمة جديدة",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "قسم قائمة جديد",
+
+  // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "تدبيس الشريط الجانبي",
+
+  // "menu.section.icon.processes": "Processes Health",
   "menu.section.icon.processes": "قسم قائمة العمليات",
-  "menu.section.icon.registries": "قسم تسجيل التسجيل",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "قسم قائمة السجلات",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "قسم قائمة مهام الإحصائيات",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
   "menu.section.icon.workflow": "قسم قائمة إدارة عمليات سير العمل",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "إلغاء تدبيس الشريط الجانبي",
-  "menu.section.icon.notifications": "قسم قائمة الإخطارات",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "قسم قائمة الإشعارات",
+
+  // "menu.section.import": "Import",
   "menu.section.import": "استيراد",
-  "menu.section.import_batch": "اتصل بالدفعة (ملف صيفي)",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "استيراد بالدفعة (ملف مضغوط)",
+
+  // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "ميتاداتا",
+
+  // "menu.section.new": "New",
   "menu.section.new": "جديد",
+
+  // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "حاوية",
+
+  // "menu.section.new_community": "Community",
   "menu.section.new_community": "مجتمع",
+
+  // "menu.section.new_item": "Item",
   "menu.section.new_item": "مادة",
-  "menu.section.new_item_version": "المادة الإصدار",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "إصدارة المادة",
+
+  // "menu.section.new_process": "Process",
   "menu.section.new_process": "عملية",
+
+  // "menu.section.notifications": "Notifications",
   "menu.section.notifications": "الإشعارات",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
   "menu.section.quality-assurance": "ضمان الجودة",
-  "menu.section.notifications_publication-claim": "المطالبة بالنشر",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  // TODO New key - Add a translation
+  "menu.section.notifications_publication-claim": "Publication Claim",
+
+  // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "تدبيس الشريط الجانبي",
+
+  // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "إلغاء تدبيس الشريط الجانبي",
+
+  // "menu.section.processes": "Processes",
   "menu.section.processes": "العمليات",
+
+  // "menu.section.health": "Health",
   "menu.section.health": "كشف الصحة",
-  "menu.section.registries": "TI",
-  "menu.section.registries_format": "حتى",
-  "menu.section.registries_metadata": "ميداداتا",
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "السجلات",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "التنسيق",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "الميتاداتا",
+
+  // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "الإحصائيات",
+
+  // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "مهمة الإحصائيات",
+
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "قسم التحكم في الوصول للبدل",
-  "menu.section.toggle.reports": "تبديل قسم التقارير",
+
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "قسم لوحة التحكم في البدل",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "قسم مهمة أكرتة البدل",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "قسم تحرير البدل",
+
+  // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "قسم تصدير البدل",
+
+  // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "قسم بحث البدل",
+
+  // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "قسم استيراد البدل",
+
+  // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "قسم بدل جديد",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "قسم سجلات البدل",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "قسم مهمة إحصائيات البدل",
+
+  // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "أدر سير العمل",
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "تصدير نتائج البحث كملف CSV",
-  "metadata-export-search.submit.success": "تم تفعيل التنفيذ الفعال",
-  "metadata-export-search.submit.error": "فشل في إنشاء التصدير",
+
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "تم بدء التصدير بنجاح",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "فشل بدء التصدير",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "ماي دي سبيس",
+
+  // "mydspace.description": "",
   "mydspace.description": "",
-  "mydspace.messages.controller-help": "حدد هذا الخيار لإنشاء رسالة إلى مقدم المادة.",
-  "mydspace.messages.description-placeholder": "قم بتأكيد رسالتك هنا...",
-  "mydspace.messages.hide-msg": "استمرار الرسالة",
+
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "حدد هذا الخيار لإرسال رسالة إلى مقدم المادة.",
+
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "قم بإدخال رسالتك هنا...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "إخفاء الرسالة",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "حدد كمقروء",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "حدد كغير مقروء",
+
+  // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "لا يوجد محتوى.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "لا توجد رسائل بعد.",
+
+  // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "إرسال",
+
+  // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "عرض الرسالة",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "الموضوع...",
-  "mydspace.messages.submitter-help": "حدد هذا الخيار لرسالة إلى وحدة التحكم.",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "حدد هذا الخيار لإرسال رسالة إلى وحدة التحكم.",
+
+  // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "الرسائل",
+
+  // "mydspace.messages.to": "To",
   "mydspace.messages.to": "إلى",
+
+  // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "تقديم جديد",
-  "mydspace.new-submission-external": "استيراد الميتاداتا من المصدر الخارجي",
-  "mydspace.new-submission-external-short": "قم باستيراد الميتاداتا",
-  "mydspace.results.head": "تقديمك",
-  "mydspace.results.no-abstract": "لا يوجد روح",
-  "mydspace.results.no-authors": "لا يوجد كاتبين",
-  "mydspace.results.no-collections": "لا توجد الوثيقة",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "استيراد الميتاداتا من مصدر خارجي",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "استيراد الميتاداتا",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "تقديماتك",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "لا يوجد مستخلص",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "لا يوجد مؤلفين",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "لا توجد حاويات",
+
+  // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "لا يوجد تاريخ",
-  "mydspace.results.no-files": "لا يوجد ملفات",
-  "mydspace.results.no-results": "لا يوجد شيء للعرض",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "لا توجد ملفات",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "لا توجد مواد للعرض",
+
+  // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "لا يوجد عنوان",
-  "mydspace.results.no-uri": "لا يوجد أوري",
+
+  // "mydspace.results.no-uri": "No URI",
+  "mydspace.results.no-uri": "لا يوجد Uri",
+
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "بحث في ما دي سبيس...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "مهام سير العمل",
-  "mydspace.show.workspace": "تقديمك",
+
+  // "mydspace.show.workspace": "Your submissions",
+  "mydspace.show.workspace": "تقديماتك",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "مواد تحت الإشراف",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "في الأرشيف",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   "mydspace.status.mydspaceValidation": "تحقق",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   "mydspace.status.mydspaceWaitingController": "في انتظار المتحكم",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   "mydspace.status.mydspaceWorkflow": "سير العمل",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
   "mydspace.status.mydspaceWorkspace": "مساحة العمل",
+
+  // "mydspace.title": "MyDSpace",
   "mydspace.title": "ماي دي سبيس",
-  "mydspace.upload.upload-failed": "خطأ أثناء إنشاء نطاق عمل جديد. ",
-  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. ",
-  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. ",
-  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} نطاق عمل جديد.",
+
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "خطأ اثناء إنشاء نطاق عمل جديد. يرجى التأكد من المحتوى المرفوع قبل إعادة المحاولة.",
+
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "ملف غير قابل للمعالجة. تم اكتشاف عدد كبير جدًا من المدخلات ولكن تم السماح بإدخال واحد فقط للملف.",
+
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "طلب غير قابل للمعالجة. يسمح بملف واحد فقط.",
+
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "تم إنشاء {{qty}} مادة نطاق عمل جديدة.",
+
+  // "mydspace.view-btn": "View",
   "mydspace.view-btn": "عرض",
-  "nav.expandable-navbar-section-suffix": "(قائمة فرعية)",
-  "notification.suggestion": "وجدنا <b>{{count}} المنشورات</b> في ال {{source}} يبدو أن هذا مرتبط بملفك الشخصي.<br>",
-  "notification.suggestion.review": "مراجعة الاقتراحات",
-  "notification.suggestion.please": "لو سمحت",
+
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  // TODO New key - Add a translation
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  // TODO New key - Add a translation
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  // TODO New key - Add a translation
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  // TODO New key - Add a translation
+  "notification.suggestion.please": "Please",
+
+  // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "كل دي سبيس",
+
+  // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "حسب المجتمع",
-  "nav.context-help-toggle": "مساعدة تعطيل السياق",
-  "nav.language": "تغيير اللغة",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "مساعدة تبديل السياق",
+
+  // "nav.language": "Language switch",
+  "nav.language": "تبديل اللغة",
+
+  // "nav.login": "Log In",
   "nav.login": "تسجيل الدخول",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "قائمة ملف تعريف المستخدم وتسجيل الخروج",
+
+  // "nav.logout": "Log Out",
   "nav.logout": "خروج",
+
+  // "nav.main.description": "Main navigation bar",
   "nav.main.description": "شريط التصفح الرئيسي",
+
+  // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "ماي دي سبيس",
+
+  // "nav.profile": "Profile",
   "nav.profile": "الملف الشخصي",
+
+  // "nav.search": "Search",
   "nav.search": "بحث",
+
+  // "nav.search.button": "Submit search",
   "nav.search.button": "تقديم بحث",
+
+  // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "الإحصائيات",
-  "nav.stop-impersonating": "ضبط التصرف كشخص إلكتروني",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "التوقف عن التصرف كشخص إلكتروني",
+
+  // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "الاشتراكات",
-  "nav.toggle": "تغيير التصفح",
-  "nav.user.description": "شريط تعريف المستخدم",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "تبديل التصفح",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "شريط ملف تعريف المستخدم",
+
+  // "none.listelement.badge": "Item",
   "none.listelement.badge": "المادة",
+
+  // "quality-assurance.title": "Quality Assurance",
   "quality-assurance.title": "ضمان الجودة",
-  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع المرسلة من الاشتراكات في {{source}}.",
-  "quality-assurance.source.description": "فيما يلي يمكنك رؤية جميع مصادر التنبيهات.",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "أدناه يمكنك رؤية جميع مصادر الإشعارات.",
+
+  // "quality-assurance.topics": "Current Topics",
   "quality-assurance.topics": "المواضيع الحالية",
-  "quality-assurance.source": "المصدر الحالي",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "المصادر الحالية",
+
+  // "quality-assurance.table.topic": "Topic",
   "quality-assurance.table.topic": "الموضوع",
+
+  // "quality-assurance.table.source": "Source",
   "quality-assurance.table.source": "المصدر",
-  "quality-assurance.table.last-event": "نهاية المطاف فعالة",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "آخر فعالية",
+
+  // "quality-assurance.table.actions": "Actions",
   "quality-assurance.table.actions": "إجراءات",
-  "quality-assurance.source-list.button.detail": "عرض المواضيع ل {{param}}",
-  "quality-assurance.topics-list.button.detail": "عرض اقتراحات ل {{param}}",
-  "quality-assurance.noTopics": "لم يتم توفيرها على المواضيع.",
-  "quality-assurance.noSource": "لم يتم العثور على المصادر.",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  // TODO New key - Add a translation
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "لم يتم العثور على مواضيع.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "لم يتم العثور على مصادر.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
   "notifications.events.title": "اقتراحات ضمان الجودة",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
   "quality-assurance.topic.error.service.retrieve": "حدث خطأ أثناء تحميل موضوعات ضمان الجودة",
-  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل ضمان الجودة",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "حدث خطأ أثناء تحميل مصدر ضمان الجودة",
+
+  // "quality-assurance.loading": "Loading ...",
   "quality-assurance.loading": "جاري التحميل ...",
+
+  // "quality-assurance.events.topic": "Topic:",
   "quality-assurance.events.topic": "الموضوع:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
   "quality-assurance.noEvents": "لم يتم العثور على أي اقتراحات.",
-  "quality-assurance.event.table.trust": "ثا",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "ثقة",
+
+  // "quality-assurance.event.table.publication": "Publication",
   "quality-assurance.event.table.publication": "النشر",
+
+  // "quality-assurance.event.table.details": "Details",
   "quality-assurance.event.table.details": "تفاصيل",
+
+  // "quality-assurance.event.table.project-details": "Project details",
   "quality-assurance.event.table.project-details": "تفاصيل المشروع",
-  "quality-assurance.event.table.reasons": "الأسباب",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
   "quality-assurance.event.table.actions": "إجراءات",
-  "quality-assurance.event.action.accept": "قبول الاقتراحات",
-  "quality-assurance.event.action.ignore": "تجاهل الاقتراحات",
-  "quality-assurance.event.action.undo": "يمسح",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "قبول الاقتراح",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "تجاهل الاقتراح",
+
+  // "quality-assurance.event.action.undo": "DELETE",
+  // TODO New key - Add a translation
+  "quality-assurance.event.action.undo": "DELETE",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
   "quality-assurance.event.action.reject": "رفض الاقتراح",
-  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراحات",
-  "quality-assurance.event.table.pidtype": "نوع معرف المنتج:",
-  "quality-assurance.event.table.pidvalue": "قيمة معرف المنتج:",
-  "quality-assurance.event.table.subjectValue": "موضوع القيمة:",
-  "quality-assurance.event.table.abstract": "أخيرًا:",
-  "quality-assurance.event.table.suggestedProject": "بيانات المشروع من OpenAIRE",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "استيراد المشروع وقبول الاقتراح",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "PID نوع:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "PID قيمة:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "قيمة الموضوع:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "خلاصة:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "بيانات المشروع المقترحة من OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
   "quality-assurance.event.table.project": "عنوان المشروع:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
   "quality-assurance.event.table.acronym": "حروف مختصرة:",
+
+  // "quality-assurance.event.table.code": "Code:",
   "quality-assurance.event.table.code": "رمز:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
   "quality-assurance.event.table.funder": "الممول:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
   "quality-assurance.event.table.fundingProgram": "برنامج التمويل:",
-  "quality-assurance.event.table.jurisdiction": "عدم التفويض:",
-  "quality-assurance.events.back": "العودة إلى المواضيع",
-  "quality-assurance.events.back-to-sources": "العودة إلى المصادر",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "الاختصاص القضائي:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "رجوع إلى المواضيع",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  // TODO New key - Add a translation
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
   "quality-assurance.event.table.less": "عرض أقل",
+
+  // "quality-assurance.event.table.more": "Show more",
   "quality-assurance.event.table.more": "عرض المزيد",
-  "quality-assurance.event.project.found": "الارتباط المحلي:",
-  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيل محلي",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "لم يتم العثور على تسجيلة محلية",
+
+  // "quality-assurance.event.sure": "Are you sure?",
   "quality-assurance.event.sure": "هل أنت متأكد؟",
-  "quality-assurance.event.ignore.description": "لا يمكن السماء عن هذه الطريقة. ",
-  "quality-assurance.event.undo.description": "لا يمكن التراجع عن هذه العملية!",
-  "quality-assurance.event.reject.description": "لا يمكن السماء عن هذه الطريقة. ",
-  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع من التجسس. ",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "لا يمكن التراجع عن هذه العملية. تجاهل هذا الاقتراح؟",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  // TODO New key - Add a translation
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "لا يمكن التراجع عن هذه العملية. هل ترفض هذا الاقتراح؟",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "لم يتم تحديد أي مشروع دي سبيس. سيتم إنشاء مشروع جديد بناءً على بيانات الاقتراح.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
   "quality-assurance.event.action.cancel": "إلغاء",
-  "quality-assurance.event.action.saved": "لقد تم حفظك الفعال.",
-  "quality-assurance.event.action.error": "حدث خطأ. ",
-  "quality-assurance.event.modal.project.title": "قم بإنشاء مشروعاً للربط",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "لقد تم حفظ قرارك بنجاح.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "حدث خطأ. لم يتم حفظ قرارك.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "اختر مشروعاً للربط",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
   "quality-assurance.event.modal.project.publication": "النشر:",
-  "quality-assurance.event.modal.project.bountToLocal": "الارتباط المحلي:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "ربط بالتسجيلة المحلية:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
   "quality-assurance.event.modal.project.select": "بحث المشروع",
+
+  // "quality-assurance.event.modal.project.search": "Search",
   "quality-assurance.event.modal.project.search": "بحث",
-  "quality-assurance.event.modal.project.clear": "تعديل التعديل",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "مسح",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
   "quality-assurance.event.modal.project.cancel": "إلغاء",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
   "quality-assurance.event.modal.project.bound": "ربط المشروع",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
   "quality-assurance.event.modal.project.remove": "إزالة",
-  "quality-assurance.event.modal.project.placeholder": "قم بتأكيد اسم المشروع",
-  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على المشروع.",
-  "quality-assurance.event.project.bounded": "تم التركيب الفعال.",
-  "quality-assurance.event.project.removed": "تم إلغاء الربط الفعال.",
-  "quality-assurance.event.project.error": "حدث خطأ. ",
-  "quality-assurance.event.reason": "هذا",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "قم بإدخال اسم المشروع",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "لم يتم العثور على مشروع.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "تم ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "تم إلغاء ربط المشروع بنجاح.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "حدث خطأ. لم يتم تنفيذ أي عملية.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "السبب",
+
+  // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "وحدة مؤسسية",
+
+  // "orgunit.listelement.no-title": "Untitled",
   "orgunit.listelement.no-title": "بدون عنوان",
+
+  // "orgunit.page.city": "City",
   "orgunit.page.city": "المدينة",
+
+  // "orgunit.page.country": "Country",
   "orgunit.page.country": "البلد",
+
+  // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "تاريخ التأسيس",
+
+  // "orgunit.page.description": "Description",
   "orgunit.page.description": "الوصف",
+
+  // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "تحرير هذه المادة",
+
+  // "orgunit.page.id": "ID",
   "orgunit.page.id": "المعرف",
-  "orgunit.page.titleprefix": "الوحدة الوطنية: ",
-  "orgunit.page.ror": "معرف ROR",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "الوحدة المؤسسية: ",
+
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "ROR معرف",
+
+  // "pagination.options.description": "Pagination options",
   "pagination.options.description": "خيارات ترقيم الصفحات",
+
+  // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "النتائج لكل صفحة",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} من {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "يظهر الآن  ",
+
+  // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "خيارات الفرز",
-  "person.listelement.badge": "شخصي",
-  "person.listelement.no-title": "لم يتم العثور على الأسماء",
-  "person.page.birthdate": "تاريخ ميلادي",
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "شخص",
+
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "لم يتم العثور على أسماء",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "تاريخ الميلاد الميلادي",
+
+  // "person.page.edit": "Edit this item",
   "person.page.edit": "تحرير هذه المادة",
+
+  // "person.page.email": "Email Address",
   "person.page.email": "عنوان البريد الإلكتروني",
-  "person.page.firstname": "الاسم الأول",
-  "person.page.jobtitle": "مسؤول وظيفي",
+
+  // "person.page.firstname": "First Name",
+  // TODO New key - Add a translation
+  "person.page.firstname": "First Name",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "المسمي الوظيفي",
+
+  // "person.page.lastname": "Last Name",
   "person.page.lastname": "اسم العائلة",
+
+  // "person.page.name": "Name",
   "person.page.name": "الاسم",
-  "person.page.link.full": "عرض كل الدعوات",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "عرض كل الميتاداتا",
+
+  // "person.page.orcid": "ORCID",
   "person.page.orcid": "أوركيد",
+
+  // "person.page.staffid": "Staff ID",
   "person.page.staffid": "معرف الموظف",
+
+  // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "الشخص: ",
+
+  // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "نتائج بحث الشخص",
+
+  // "person-relationships.search.results.head": "Person Search Results",
   "person-relationships.search.results.head": "نتائج بحث الشخص",
+
+  // "person.search.title": "Person Search",
   "person.search.title": "بحث الشخص",
-  "process.new.select-parameters": "لا تزال",
-  "process.new.select-parameter": "تحديد النص",
-  "process.new.add-parameter": "إضافة نصوص...",
-  "process.new.delete-parameter": "حذف التقليد",
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "المتغيرات",
+
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "تحديد متغير",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "إضافة متغير...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "حذف متغير",
+
+  // "process.new.parameter.label": "Parameter value",
   "process.new.parameter.label": "قيمة المتغير",
+
+  // "process.new.cancel": "Cancel",
   "process.new.cancel": "إلغاء",
+
+  // "process.new.submit": "Save",
   "process.new.submit": "حفظ",
+
+  // "process.new.select-script": "Script",
   "process.new.select-script": "نص",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "اختر نص...",
+
+  // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "النص مطلوب",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "اختر ملف...",
-  "process.new.parameter.file.required": "يرجى تحديد الملف",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "يرجى تحديد ملف",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "قيمة المتغير مطلوبة",
+
+  // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "القيمة",
+
+  // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "ملف",
-  "process.new.parameter.required.missing": "التالية مطلوبة ولكنها لا تزال ناقصة:",
+
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "المتغيرات التالية مطلوبة ولكنها لا تزال ناقصة:",
+
+  // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "نجاح",
-  "process.new.notification.success.content": "تم إنشاء فعال",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "تم إنشاء العملية بنجاح",
+
+  // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "خطأ",
-  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء الطريق",
-  "process.new.notification.error.max-upload.content": "السماح بالملف الأقصى لحجم التحميل",
-  "process.new.header": "إنشاء إنشاءات جديدة",
-  "process.new.title": "إنشاء إنشاءات جديدة",
-  "process.new.breadcrumbs": "إنشاء إنشاءات جديدة",
-  "process.detail.arguments": "لماذا",
-  "process.detail.arguments.empty": "لا تحتوي هذه الطريقة على أي أسباب",
+
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "حدث خطأ أثناء إنشاء العملية",
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "يتجاوز الملف الحد الأقصى لحجم التحميل",
+
+  // "process.new.header": "Create a new process",
+  "process.new.header": "إنشاء عملية جديدة",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title": "إنشاء عملية جديدة",
+
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "إنشاء عملية جديدة",
+
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "حجج",
+
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "لا تحتوي هذه العملية على أي حجج",
+
+  // "process.detail.back": "Back",
   "process.detail.back": "رجوع",
-  "process.detail.output": "مخرجات الطريقة",
-  "process.detail.logs.button": "استرجاع مخرجات الحرارة",
+
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "مخرجات العملية",
+
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "استرجاع مخرجات العملية",
+
+  // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "استرجاع",
-  "process.detail.logs.none": "ولا يوجد مخرجات لهذه الغاية",
-  "process.detail.output-files": "ملفات المنتج",
-  "process.detail.output-files.empty": "لا تحتوي على هذه الطريقة على أي من المواد التي تم إخراجها",
+
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "لا توجد مخرجات لهذه العملية",
+
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "ملفات الإخراج",
+
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "لا تحتوي هذه العملية على أي ملفات إخراج",
+
+  // "process.detail.script": "Script",
   "process.detail.script": "النص",
-  "process.detail.title": "الطريقة: {{ id }} - {{ name }}",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "العملية: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "وقت البدء",
-  "process.detail.end-time": "انتهى الوقت",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "وقت الانتهاء",
+
+  // "process.detail.status": "Status",
   "process.detail.status": "الحالة",
-  "process.detail.create": "إنشاء طريقة مماثلة",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "إنشاء عملية مماثلة",
+
+  // "process.detail.actions": "Actions",
   "process.detail.actions": "إجراءات",
-  "process.detail.delete.button": "حذف المعاملة",
-  "process.detail.delete.header": "حذف المعاملة",
-  "process.detail.delete.body": "هل أنت متأكد من أنك ترغب في الحذف الصحيح؟",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "حذف العملية",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "حذف العملية",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "هل أنت متأكد من أنك تريد حذف العملية الحالية؟",
+
+  // "process.detail.delete.cancel": "Cancel",
   "process.detail.delete.cancel": "إلغاء",
-  "process.detail.delete.confirm": "حذف المعاملة",
-  "process.detail.delete.success": "تم الحذف الفعال.",
-  "process.detail.delete.error": "حدث خطأ ما أثناء الحذف",
-  "process.detail.refreshing": "التحديث التلقائي…",
-  "process.overview.table.completed.info": "وقت الانتهاء (التوقيت العالمي المنسق)",
-  "process.overview.table.completed.title": "العمليات الناجحة",
-  "process.overview.table.empty": "لم يتم العثور على عمليات مطابقة.",
-  "process.overview.table.failed.info": "وقت الانتهاء (التوقيت العالمي المنسق)",
-  "process.overview.table.failed.title": "العمليات الفاشلة",
-  "process.overview.table.finish": "انتهى الوقت (التوقيت العالمي)",
-  "process.overview.table.id": "معرف الطريقة",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "حذف العملية",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "تم حذف العملية بنجاح.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "حدث خطأ ما أثناء حذف العملية",
+
+  // "process.detail.refreshing": "Auto-refreshing…",
+  // TODO New key - Add a translation
+  "process.detail.refreshing": "Auto-refreshing…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.completed.info": "Finish time (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  // TODO New key - Add a translation
+  "process.overview.table.completed.title": "Succeeded processes",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  // TODO New key - Add a translation
+  "process.overview.table.empty": "No matching processes found.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.failed.info": "Finish time (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  // TODO New key - Add a translation
+  "process.overview.table.failed.title": "Failed processes",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "وقت الانتهاء (التوقيت العالمي)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "معرف العملية",
+
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "الاسم",
-  "process.overview.table.running.info": "وقت البدء (التوقيت العالمي المنسق)",
-  "process.overview.table.running.title": "ادارة العمليات",
-  "process.overview.table.scheduled.info": "وقت الإنشاء (التوقيت العالمي المنسق)",
-  "process.overview.table.scheduled.title": "العمليات المجدولة",
-  "process.overview.table.start": "التوقيت (التوقيت العالمي)",
+
+  // "process.overview.table.running.info": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  // TODO New key - Add a translation
+  "process.overview.table.running.title": "Running processes",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  // TODO New key - Add a translation
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "وقت البدء (التوقيت العالمي)",
+
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "الحالة",
+
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "المستخدم",
+
+  // "process.overview.title": "Processes Overview",
   "process.overview.title": "نظرة عامة على العمليات",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "نظرة عامة على العمليات",
+
+  // "process.overview.new": "New",
   "process.overview.new": "جديد",
+
+  // "process.overview.table.actions": "Actions",
   "process.overview.table.actions": "إجراءات",
+
+  // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "حذف {{count}} عملية",
-  "process.overview.delete-process": "حذف المعاملة",
-  "process.overview.delete.clear": "حذف التحديد والحذف",
-  "process.overview.delete.processing": "سيتم حذفه {{count}} عملية. ",
-  "process.overview.delete.body": "هل أنت متأكد أنك تريد الحذف {{count}} العملية؟",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "حذف العملية",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "مسح تحديد الحذف",
+
+  // "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": "يجري حذف {{count}} عملية. يرجى الانتظار حتى يكتمل الحذف بالكامل. لاحظ أن ذلك قد يستغرق بعض الوقت.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "هل أنت متأكد أنك تريد حذف {{count}} عملية؟",
+
+  // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "حذف العمليات",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "خطأ في عملية الحذف",
-  "process.bulk.delete.error.body": "لا يمكن حذف الطريقة ذات المعرفة {{processId}}.  ",
-  "process.bulk.delete.success": "تم الحذف {{count}} فعالية فعالة",
+
+  // "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": "لا يمكن حذف العملية ذات المعرف {{processId}}. وسيستمر حذف العمليات المتبقية. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "تم حذف {{count}} عملية بنجاح",
+
+  // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "تحديث الملف الشخصي",
+
+  // "profile.card.identify": "Identify",
   "profile.card.identify": "تعريف",
+
+  // "profile.card.security": "Security",
   "profile.card.security": "الحماية والأمان",
+
+  // "profile.form.submit": "Save",
   "profile.form.submit": "حفظ",
-  "profile.groups.head": "المجموعات التي تقترحها",
-  "profile.special.groups.head": "المجموعات التي تقترحها",
+
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "مجموعات التفويض التي تنتمي إليها",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "مجموعات التفويض الخاصة التي تنتمي إليها",
+
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "الاسم الأول مطلوب",
+
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
   "profile.metadata.form.error.lastname.required": "اسم العائلة مطلوب",
+
+  // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "عنوان البريد الإلكتروني",
+
+  // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "الاسم الأول",
+
+  // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "اللغة",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "اسم العائلة",
-  "profile.metadata.form.label.phone": "هاتف",
-  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي استخدمتها على الملف الشخصي.",
+
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "هاتف الاتصال",
+
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على الملف الشخصي.",
+
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "تم حفظ الملف الشخصي",
-  "profile.notifications.warning.no-changes.content": "لم يتم عمل أي تغييرات على الملف الشخصي.",
+
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "لم يتم إجراء أي تغييرات على الملف الشخصي.",
+
+  // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "لا توجد تغييرات",
+
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "كلمات المرور غير متطابقة.",
-  "profile.security.form.info": "اختياريًا، يمكنك تسجيل كلمة مرور في القسم السفلي، وتأكيدها عن طريق كتابتها مرة أخرى في الشريط الثاني.",
+
+  // "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": "اختيارياً، يمكنك إدخال كلمة مرور جديدة في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني.",
+
+  // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "كلمة المرور",
-  "profile.security.form.label.passwordrepeat": "إعادة الكتابة للتأكيد",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "أعد الكتابة للتأكيد",
+
+  // "profile.security.form.label.current-password": "Current password",
   "profile.security.form.label.current-password": "كلمة المرور الحالية",
-  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي جربتها على كلمة المرور.",
+
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "تم حفظ التغييرات التي أجريتها على كلمة المرور.",
+
+  // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "تم حفظ كلمة المرور",
+
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "حدث خطأ أثناء تغيير كلمات المرور",
-  "profile.security.form.notifications.error.change-failed": "حدث خطأ أثناء محاولة تغيير كلمة المرور. ",
-  "profile.security.form.notifications.error.not-same": "كلمات الترويج المختلفة.",
-  "profile.security.form.notifications.error.general": "يرجى استخدام الأغراض المتعددة في نموذج الحماية والأمان.",
+
+  // "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": "حدث خطأ أثناء محاولة تغيير كلمة المرور. يرجى التحقق مما إذا كانت كلمة المرور الحالية صحيحة.",
+
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "كلمات المرور المقدمة مختلفة.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "يرجى ملء الحقول المطلوبة في نموذج الحماية والأمان.",
+
+  // "profile.title": "Update Profile",
   "profile.title": "تحديث الملف الشخصي",
-  "profile.card.researcher": "الملف للباحث الشخصي",
-  "project.listelement.badge": "مشروع باحث",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "الملف الشخصي للباحث",
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "مشروع الباحث",
+
+  // "project.page.contributor": "Contributors",
   "project.page.contributor": "المساهمون",
+
+  // "project.page.description": "Description",
   "project.page.description": "الوصف",
+
+  // "project.page.edit": "Edit this item",
   "project.page.edit": "تحرير هذه المادة",
-  "project.page.expectedcompletion": "الاكمال المصيبة",
-  "project.page.funder": "الأمولين",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "الإكمال المتوقع",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder": "الممولين",
+
+  // "project.page.id": "ID",
   "project.page.id": "المعرف",
-  "project.page.keyword": "الكلمات الرئيسية",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "كلمات رئيسية",
+
+  // "project.page.status": "Status",
   "project.page.status": "الحالة",
+
+  // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "مشورع البحث: ",
-  "project.search.results.head": "نتائج البحث في المشروع",
-  "project-relationships.search.results.head": "نتائج البحث في المشروع",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "نتائج بحث المشروع",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "نتائج بحث المشروع",
+
+  // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "النشر",
+
+  // "publication.page.description": "Description",
   "publication.page.description": "الوصف",
+
+  // "publication.page.edit": "Edit this item",
   "publication.page.edit": "تحرير هذه المادة",
+
+  // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "ردمد الدورية",
-  "publication.page.journal-title": "عنوان الدوري",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "عنوان الدورية",
+
+  // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "الناشر",
-  "publication.page.titleprefix": "النشر: ",
+
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "المنشور: ",
+
+  // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "عنوان المجلد",
+
+  // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "نتائج بحث المنشور",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
   "publication-relationships.search.results.head": "نتائج بحث المنشور",
-  "publication.search.title": "بحثت في المنشور",
+
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "بحث المنشور",
+
+  // "media-viewer.next": "Next",
   "media-viewer.next": "التالي",
-  "media-viewer.previous": "السابقة",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "السابق",
+
+  // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "قائمة التشغيل",
-  "suggestion.loading": "تحميل ...",
-  "suggestion.title": "المطالبة بالنشر",
-  "suggestion.title.breadcrumbs": "المطالبة بالنشر",
-  "suggestion.targets.description": "أدناه يمكنك رؤية جميع الاقتراحات ",
-  "suggestion.targets": "الاقتراحات الحالية",
-  "suggestion.table.name": "اسم الباحث",
-  "suggestion.table.actions": "أجراءات",
-  "suggestion.button.review": "مراجعة {{ total }} اقتراحات)",
-  "suggestion.button.review.title": "مراجعة {{ total }} اقتراح (اقتراحات) ل ",
-  "suggestion.noTargets": "لم يتم العثور على هدف.",
-  "suggestion.target.error.service.retrieve": "حدث خطأ أثناء تحميل أهداف الاقتراح",
-  "suggestion.evidence.type": "يكتب",
-  "suggestion.evidence.score": "نتيجة",
-  "suggestion.evidence.notes": "ملحوظات",
-  "suggestion.approveAndImport": "الموافقة والاستيراد",
-  "suggestion.approveAndImport.success": "تم استيراد الاقتراح بنجاح. <a href='{{ url }}'>منظر.</a>",
-  "suggestion.approveAndImport.bulk": "الموافقة والاستيراد المحدد",
-  "suggestion.approveAndImport.bulk.success": "{{ count }} تم استيراد الاقتراحات بنجاح ",
-  "suggestion.approveAndImport.bulk.error": "{{ count }} لم يتم استيراد الاقتراحات بسبب حدوث أخطاء غير متوقعة في الخادم",
-  "suggestion.ignoreSuggestion": "تجاهل الاقتراح",
-  "suggestion.ignoreSuggestion.success": "لقد تم تجاهل الاقتراح",
-  "suggestion.ignoreSuggestion.bulk": "تجاهل الاقتراح المحدد",
-  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} لقد تم تجاهل الاقتراحات ",
-  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} لم يتم تجاهل الاقتراحات بسبب أخطاء غير متوقعة في الخادم",
-  "suggestion.seeEvidence": "انظر الأدلة",
-  "suggestion.hideEvidence": "إخفاء الأدلة",
-  "suggestion.suggestionFor": "اقتراحات ل",
-  "suggestion.suggestionFor.breadcrumb": "اقتراحات ل {{ name }}",
-  "suggestion.source.openaire": "الرسم البياني أوبن إير",
-  "suggestion.from.source": "من ",
-  "suggestion.count.missing": "لم يتبق لديك أي مطالبات بالنشر",
-  "suggestion.totalScore": "مجموع النقاط",
-  "suggestion.type.openaire": "أوبن إير",
+
+  // "suggestion.loading": "Loading ...",
+  // TODO New key - Add a translation
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  // TODO New key - Add a translation
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  // TODO New key - Add a translation
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  // TODO New key - Add a translation
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  // TODO New key - Add a translation
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  // TODO New key - Add a translation
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  // TODO New key - Add a translation
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  // TODO New key - Add a translation
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  // TODO New key - Add a translation
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  // TODO New key - Add a translation
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  // TODO New key - Add a translation
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  // TODO New key - Add a translation
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  // TODO New key - Add a translation
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  // TODO New key - Add a translation
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  // TODO New key - Add a translation
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  // TODO New key - Add a translation
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  // TODO New key - Add a translation
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  // TODO New key - Add a translation
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  // TODO New key - Add a translation
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  // TODO New key - Add a translation
+  "suggestion.type.openaire": "OpenAIRE",
+
+  // "register-email.title": "New user registration",
   "register-email.title": "تسجيل مستخدم جديد",
+
+  // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "إنشاء ملف شخصي",
+
+  // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "تعريف",
+
+  // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "عنوان البريد الإلكتروني",
+
+  // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "الاسم الأول *",
-  "register-page.create-profile.identification.first-name.error": "يرجى الاتصال بالاسم الأول",
+
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "يرجى إدخال الاسم الأول",
+
+  // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "اسم العائلة *",
-  "register-page.create-profile.identification.last-name.error": "يرجى الاتصال باسم العائلة",
+
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "يرجى إدخال اسم العائلة",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "الهاتف",
+
+  // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "اللغة",
+
+  // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "الحماية والأمان",
-  "register-page.create-profile.security.info": "يرجى الاتصال برقم المرور في الشريط أدناه، وتأكيدها عن طريق كتابها مرة أخرى في الشريط الثاني. ",
+
+  // "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": "يرجى إدخال كلمة المرور في المربع أدناه، وتأكيدها عن طريق كتابتها مرة أخرى في المربع الثاني. يجب أن تتكون من ستة أحرف على الأقل.",
+
+  // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "كلمة المرور *",
-  "register-page.create-profile.security.label.passwordrepeat": "خطة إعادة الكتابة للتأكيد *",
-  "register-page.create-profile.security.error.empty-password": "الرجاء الاتصال بكلمة المرور في النطاق أدناه.",
-  "register-page.create-profile.security.error.matching-passwords": "كلمتي الطلب التي قمت بتأكيدها غير متطابقتين.",
+
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "أعد الكتابة للتأكيد *",
+
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "يرجى إدخال كلمة المرور في المربع أدناه.",
+
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "كلمتي المرور التي قمت بإدخالهما غير متطابقتين.",
+
+  // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "اكتمل التسجيل",
+
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
   "register-page.create-profile.submit.error.content": "حدث خطأ ما أثناء تسجيل مستخدم جديد.",
+
+  // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "فشل التسجيل",
-  "register-page.create-profile.submit.success.content": "تم التسجيل الفعال. ",
+
+  // "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": "تم التسجيل بنجاح. لقد قمت بتسجيل الدخول كالمستخدم الذي تم إنشاؤه.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "اكتمل التسجيل",
+
+  // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "تسجيل مستخدم جديد",
-  "register-page.registration.info": "قام بتسجيل حساب للاشتراك في Vitten لتحديثات البريد الإلكتروني، المساهمة في منتجات جديدة إلى دي سبيس.",
+
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "قم بتسجيل حساب للاشتراك في حاويات لتحديثات البريد الإلكتروني، وتقديم مواد جديدة إلى دي سبيس.",
+
+  // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "عنوان البريد الإلكتروني *",
-  "register-page.registration.email.error.required": "يرجى الاتصال بعنوان البريد الإلكتروني",
-  "register-page.registration.email.error.not-email-form": "يرجى الاتصال بعنوان بريد إلكتروني صالح.",
-  "register-page.registration.email.error.not-valid-domain": "استخدام البريد الإلكتروني بالنطاقات المخصصة: {{ domains }}",
-  "register-page.registration.email.hint": "تم التحقق من هذا العنوان نيكوله كاسم تسجيل الدخول الخاص بك.",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "يرجى إدخال عنوان البريد الإلكتروني",
+
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "يرجى إدخال عنوان بريد إلكتروني صالح.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "استخدم البريد الإلكتروني بالنطاقات المسموح بها: {{ domains }}",
+
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "سيتم التحقق من هذا العنوان واستخدامه كاسم تسجيل الدخول الخاص بك.",
+
+  // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "تسجيل",
-  "register-page.registration.success.head": "إرسال رسالة بريد إلكتروني مؤكدة",
-  "register-page.registration.success.content": "يتم إرسال رسالة بريد الإلكتروني إلى {{ email }} تحتوي على عنوان URL خاص ومتزايد من التعلميات.",
-  "register-page.registration.error.head": "حدث خطأ أثناء محاولة تسجيل البريد الإلكتروني",
+
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "تم إرسال رسالة تأكيد البريد الإلكتروني",
+
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "تم إرسال رسالة بريد إلكتروني إلى {{ email }} تحتوي على عنوان URL خاص والمزيد من التعلميات.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "خطأ أثناء محاولة تسجيل البريد الإلكتروني",
+
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "حدث خطأ أثناء تسجيل عنوان البريد الإلكتروني التالي: {{ email }}",
+
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
   "register-page.registration.error.recaptcha": "حدث خطأ أثناء محاولة الاستيثاق باستخدام recaptcha",
-  "register-page.registration.google-recaptcha.must-accept-cookies": "للتسجيل، يجب عليك قبول ملفات تعريف الارتباط <b>التسجيل و استعادة كلمة المرور</b> (جوجل reCaptcha).",
-  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي تناسب التسجيل.  {{ domains }}",
+
+  // "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": "للتسجيل، يجب عليك قبول ملفات تعريف ارتباط <b>التسجيل واستعادة كلمة المرور</b> (جوجل reCaptcha).",
+
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "عنوان البريد الإلكتروني غير موجود في قائمة النطاقات التي يمكنها التسجيل. النطاقات المسموح بها هي {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
   "register-page.registration.google-recaptcha.open-cookie-settings": "فتح إعدادات ملفات تعريف الارتباط",
-  "register-page.registration.google-recaptcha.notification.title": "جوجل ريكابتشا",
+
+  // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "جوجل reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
   "register-page.registration.google-recaptcha.notification.message.error": "حدث خطأ أثناء التحقق من reCaptcha",
-  "register-page.registration.google-recaptcha.notification.message.expired": "صلاحية التحقق. ",
-  "register-page.registration.info.maildomain": "يمكن تسجيل عقود لناوين البريد للنطاقات",
-  "relationships.add.error.relationship-type.content": "لا يمكن العثور على تطابق مناسب لنوع التوافق {{ type }} بين المادتين",
-  "relationships.add.error.server.content": "لقد ساعدت في خطأ",
-  "relationships.add.error.title": "غير قادر على الانضمام إلى إيران",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "انتهت صلاحية التحقق. يرجى التحقق مرة أخرى.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "يمكن تسجيل الحسابات لعناوين البريد للنطاقات",
+
+  // "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": "لا يمكن العثور على تطابق مناسب لنوع العلاقة {{ type }} بين المادتين",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "لقد أعاد الخادم خطأ",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "غير قادر على إضافة العلاقة",
+
+  // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "المؤلفين",
-  "relationships.isAuthorOf.Person": "المؤلفين (الأشخاص)",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "المؤلفين (أشخاص)",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "المؤلفين (وحدات مؤسسية)",
-  "relationships.isIssueOf": "سجل الدوري",
-  "relationships.isIssueOf.JournalIssue": "عدد الدوري",
-  "relationships.isJournalIssueOf": "عدد الدوري",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "أعداد الدورية",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "عدد الدورية",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "عدد الدورية",
+
+  // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "الدوريات",
-  "relationships.isJournalVolumeOf": "سلسلة الدورية",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "مجلد الدورية",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "وحدات مؤسسية",
+
+  // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "المؤلفين",
-  "relationships.isProjectOf": "مشاريع البحث",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "مشروعات البحث",
+
+  // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "منشورات",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "مقالات",
-  "relationships.isSingleJournalOf": "الدوري",
-  "relationships.isSingleVolumeOf": "سلسلة الدورية",
-  "relationships.isVolumeOf": "سلسلة الدوريات",
-  "relationships.isVolumeOf.JournalVolume": "سلسلة الدورية",
-  "relationships.isContributorOf": "خذ",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "الدورية",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "مجلد الدورية",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "مجلدات الدورية",
+
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "مجلد الدورية",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "المساهمين",
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
   "relationships.isContributorOf.OrgUnit": "المساهم (وحدة مؤسسية)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
   "relationships.isContributorOf.Person": "المساهم",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "الممول",
-  "repository.image.logo": "مستودع الشعار",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "شعار المستودع",
+
+  // "repository.title": "DSpace Repository",
   "repository.title": "مستودع دي سبيس",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
   "repository.title.prefix": "مستودع دي سبيس :: ",
+
+  // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "إضافة",
-  "resource-policies.add.for.": "إضافة جديدة",
-  "resource-policies.add.for.bitstream": "إضافة لمزيد من التدفق بت جديدة",
-  "resource-policies.add.for.bundle": "إضافة حزمة جديدة",
-  "resource-policies.add.for.item": "إضافة مادة جديدة",
-  "resource-policies.add.for.community": "اضافة الى مجتمع جديد",
-  "resource-policies.add.for.collection": "إضافة ابي كوبين جديدة",
-  "resource-policies.create.page.heading": "إنشاء أشياء جديدة لـ ",
-  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء الموارد.",
-  "resource-policies.create.page.success.content": "فعال",
-  "resource-policies.create.page.title": "إنشاء أشياء جديدة",
-  "resource-policies.delete.btn": "حذف",
-  "resource-policies.delete.btn.title": "حذف الموارد المحددة",
-  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد الهامة.",
-  "resource-policies.delete.success.content": "عملية",
-  "resource-policies.edit.page.heading": "تحرير بولي المورد ",
-  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير المورد.",
+
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "إضافة سياسة جديدة",
+
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "إضافة سياسة تدفق بت جديدة",
+
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "إضافة سياسة حزمة جديدة",
+
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "إضافة سياسة مادة جديدة",
+
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "إضافة سياسة مجتمع جديدة",
+
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "إضافة سياسة حاوية جديدة",
+
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "إنشاء سياسة موارد جديدة لـ ",
+
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "حدث خطأ أثناء إنشاء سياسة الموارد.",
+
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "تمت العملية بنجاح",
+
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "إنشاء سياسة موارد جديدة",
+
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "حذف المحدد",
+
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "حذف سياسات الموارد المحددة",
+
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "حدث خطأ أثناء حذف سياسات المورد المحددة.",
+
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "عملية ناجحة",
+
+  // "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "تحرير سياسة المورد ",
+
+  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "حدث خطأ أثناء تحرير سياسة المورد.",
+
+  // "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": "حدث خطأ أثناء تحرير الهدف (الشخص الإلكتروني أو المجموعة) لسياسة الموارد.",
-  "resource-policies.edit.page.other-failure.content": "حدث خطأ أثناء تحرير الموارد. ",
-  "resource-policies.edit.page.success.content": "عملية",
-  "resource-policies.edit.page.title": "تحرير بولي المورد",
+
+  // "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": "حدث خطأ أثناء تحرير سياسة الموارد. تم تحديث الهدف (الشخص الإلكتروني أو المجموعة) بنجاح.",
+
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "عملية ناجحة",
+
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "تحرير سياسة المورد",
+
+  // "resource-policies.form.action-type.label": "Select the action type",
   "resource-policies.form.action-type.label": "تحديد نوع الإجراء",
-  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء إجراء المورد.",
-  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي يستفيد منها من هذه الامتيازات",
+
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "يجب عليك تحديد إجراء سياسة المورد.",
+
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "الشخص الإلكتروني أو المجموعة التي سيتم منحها هذه الصلاحية",
+
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "تحديد",
+
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
   "resource-policies.form.eperson-group-list.tab.eperson": "بحث عن شخص إلكتروني",
-  "resource-policies.form.eperson-group-list.tab.group": "بحثت عن مجموعة",
-  "resource-policies.form.eperson-group-list.table.headers.action": "صنع",
+
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "بحث عن مجموعة",
+
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "إجراء",
+
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "المعرف",
+
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "الاسم",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
   "resource-policies.form.eperson-group-list.modal.header": "لا يمكن تغيير النوع",
-  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "لا يمكن استبدال الشخص الحياتي.",
-  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "لا يمكن استبدال مجموعة الإلكترونيات الشخصية.",
-  "resource-policies.form.eperson-group-list.modal.text2": "قم بحذف طلبات الموارد الحالية ونقلها بالنوع المطلوب.",
-  "resource-policies.form.eperson-group-list.modal.close": "حسنًا",
+
+  // "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": "لا يمكن استبدال الشخص الإلكتروني بمجموعة.",
+
+  // "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": "لا يمكن استبدال مجموعة بشخص إلكتروني.",
+
+  // "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": "قم بحذف سياسة الموارد الحالية وإنشاء سياسة جديدة بالنوع المطلوب.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "موافق",
+
+  // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "تاريخ الانتهاء",
-  "resource-policies.form.date.start.label": "تاريخ الميلاد",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "تاريخ البدء",
+
+  // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "الوصف",
+
+  // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "الاسم",
+
+  // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "حدد نوع السياسة",
-  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع أبو الموارد.",
-  "resource-policies.table.headers.action": "صنع",
+
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "يجب عليك تحديد نوع سياسة الموارد.",
+
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "إجراء",
+
+  // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "تاريخ الانتهاء",
-  "resource-policies.table.headers.date.start": "تاريخ الميلاد",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "تاريخ البدء",
+
+  // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "تحرير",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "تحرير المجموعة",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "تحرير السياسة",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "شخص إلكتروني",
+
+  // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "المجموعة",
+
+  // "resource-policies.table.headers.select-all": "Select all",
   "resource-policies.table.headers.select-all": "تحديد الكل",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
   "resource-policies.table.headers.deselect-all": "إلغاء تحديد الكل",
+
+  // "resource-policies.table.headers.select": "Select",
   "resource-policies.table.headers.select": "تحديد",
-  "resource-policies.table.headers.deselect": "قم بإلغاء التحديد",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "إلغاء تحديد",
+
+  // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "المعرف",
+
+  // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "الاسم",
+
+  // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "النوع",
-  "resource-policies.table.headers.title.for.bitstream": "سياسة تدفق البت",
+
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "سياسات تدفق البت",
+
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
   "resource-policies.table.headers.title.for.bundle": "سياسات الحزمة",
-  "resource-policies.table.headers.title.for.item": "هذه المادة",
-  "resource-policies.table.headers.title.for.community": "سياسة المجتمع",
-  "resource-policies.table.headers.title.for.collection": "تمام",
+
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "سياسات المادة",
+
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "سياسات المجتمع",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "سياسات الحاوية",
+
+  // "root.skip-to-content": "Skip to main content",
   "root.skip-to-content": "انتقل إلى المحتوى الرئيسي",
+
+  // "search.description": "",
   "search.description": "",
+
+  // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "عرض",
+
+  // "search.title": "Search",
   "search.title": "بحث",
+
+  // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "بحث",
-  "search.search-form.placeholder": "بحث المستودع...",
-  "search.filters.remove": "إزالة المنقح من النوع {{ type }} د {{ value }}",
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "بحث المستودع ...",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "إزالة المنقح من النوع {{ type }} بقيمة {{ value }}",
+
+  // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "المؤلف",
+
+  // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "تاريخ الانتهاء",
-  "search.filters.applied.f.dateIssued.min": "تاريخ الميلاد",
-  "search.filters.applied.f.dateSubmitted": "التاريخ",
-  "search.filters.applied.f.discoverable": "غير للاكتشاف",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "تاريخ البدء",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "تاريخ التقديم",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "غير قابل للاكتشاف",
+
+  // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "نوع المادة",
+
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "بها ملفات",
+
+  // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "النوع",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "الحالة",
-  "search.filters.applied.f.subject": "بدلا",
-  "search.filters.applied.f.submitter": "شير",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "الموضع",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "المقدم",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "المسمى الوظيفي",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "نهاية تاريخ الميلاد",
+
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "بداية تاريخ الميلاد",
-  "search.filters.applied.f.supervisedBy": "تحت النار",
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "تحت إشراف",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "مسحوب",
+
+  // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "المؤلف",
+
+  // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "اسم المؤلف",
-  "search.filters.filter.author.label": "بحثت باسم المؤلف",
-  "search.filters.filter.birthDate.head": "تاريخ",
-  "search.filters.filter.birthDate.placeholder": "تاريخ",
-  "search.filters.filter.birthDate.label": "تمت مناقشة تاريخ الميلاد",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "بحث اسم المؤلف",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "تاريخ الميلاد",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "بحث تاريخ الميلاد",
+
+  // "search.filters.filter.collapse": "Collapse filter",
   "search.filters.filter.collapse": "طي المنقح",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "تاريخ النشر",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
   "search.filters.filter.creativeDatePublished.label": "بحث تاريخ النشر",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "المحرر",
-  "search.filters.filter.creativeWorkEditor.label": "المحرر المحرر",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "بحث المحرر",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "الموضوع",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "الموضوع",
-  "search.filters.filter.creativeWorkKeywords.label": "موضوع البحث",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "بحث الموضوع",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "الناشر",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "بحث الناشر",
+
+  // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "التاريخ",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.max.placeholder": "الحد الأقصى للتاريخ",
-  "search.filters.filter.dateIssued.max.label": "تنتهي",
-  "search.filters.filter.dateIssued.min.placeholder": "الحد للتاريخ",
-  "search.filters.filter.dateIssued.min.label": "المبتدئ",
-  "search.filters.filter.dateSubmitted.head": "التاريخ",
-  "search.filters.filter.dateSubmitted.placeholder": "التاريخ",
-  "search.filters.filter.dateSubmitted.label": "تاريخ العرض",
-  "search.filters.filter.discoverable.head": "غير للاكتشاف",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "انتهاء",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "الحد الأدنى للتاريخ",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "البدء",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "تاريخ التقديم",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "تاريخ التقديم",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "بحث تاريخ التقديم",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "غير قابل للاكتشاف",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "مسحوب",
+
+  // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "نوع المادة",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "نوع المادة",
-  "search.filters.filter.entityType.label": "تمت مناقشة نوع المادة",
-  "search.filters.filter.expand": "الأوقات المنقحة",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "بحث نوع المادة",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "توسيع المنقح",
+
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "بها ملفات",
+
+  // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "النوع",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "النوع",
+
+  // "search.filters.filter.itemtype.label": "Search type",
   "search.filters.filter.itemtype.label": "بحث النوع",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "المسمى الوظيفي",
-  "search.filters.filter.jobTitle.label": "بحث في المسمى الوظيفي",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "بحث المسمى الوظيفي",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "لغة معروفة",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "لغة معروفة",
-  "search.filters.filter.knowsLanguage.label": "اتصل بـ اسم معروف",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "بحث لغة معروفة",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "الحالة",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "الحالة",
-  "search.filters.filter.namedresourcetype.label": "الحالة المدروسة",
-  "search.filters.filter.objectpeople.head": "الأشخاص",
-  "search.filters.filter.objectpeople.placeholder": "الأشخاص",
-  "search.filters.filter.objectpeople.label": "بحث الناس",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "بحث الحالة",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "أشخاص",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "أشخاص",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "بحث الأشخاص",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "البلد",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
   "search.filters.filter.organizationAddressCountry.label": "بحث البلد",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "المدينة",
-  "search.filters.filter.organizationAddressLocality.label": "بحثت المدينة",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "بحث المدينة",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "تاريخ التأسيس",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "تاريخ التأسيس",
-  "search.filters.filter.organizationFoundingDate.label": "بحثت في تاريخها",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "بحث تاريخ التأسيس",
+
+  // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "النطاق",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "منقح النطاق",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
   "search.filters.filter.scope.label": "منقح نطاق البحث",
-  "search.filters.filter.show-less": "طيء",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "طي",
+
+  // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "عرض المزيد",
+
+  // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "الموضوع",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "الموضوع",
-  "search.filters.filter.subject.label": "موضوع البحث",
-  "search.filters.filter.submitter.head": "شير",
-  "search.filters.filter.submitter.placeholder": "شير",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "بحث الموضوع",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "المقدم",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "المقدم",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "مقدم البحث",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "استعراض شجرة {{ name }}",
-  "search.filters.filter.funding.head": "تمويل",
-  "search.filters.filter.funding.placeholder": "تمويل",
-  "search.filters.filter.supervisedBy.head": "تحت النار",
-  "search.filters.filter.supervisedBy.placeholder": "تحت النار",
-  "search.filters.filter.supervisedBy.label": "ابحث تحت البحث",
-  "search.filters.entityType.JournalIssue": "عدد الدوري",
-  "search.filters.entityType.JournalVolume": "سلسلة الدورية",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "التمويل",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "التمويل",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "تحت إشراف",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "البحث تحت إشراف",
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "عدد الدورية",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "مجلد الدورية",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "وحدة مؤسسية",
-  "search.filters.entityType.Person": "شخص",
-  "search.filters.entityType.Project": "مشروع",
-  "search.filters.entityType.Publication": "النشر",
+
+  // "search.filters.entityType.Person": "Person",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Person": "Person",
+
+  // "search.filters.entityType.Project": "Project",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Project": "Project",
+
+  // "search.filters.entityType.Publication": "Publication",
+  // TODO New key - Add a translation
+  "search.filters.entityType.Publication": "Publication",
+
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "نعم",
+
+  // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "لا",
+
+  // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "لا",
+
+  // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "نعم",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
   "search.filters.namedresourcetype.Archived": "مؤرشف",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
   "search.filters.namedresourcetype.Validation": "التحقق من الصحة",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
   "search.filters.namedresourcetype.Waiting for Controller": "في انتظار المراجع",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
   "search.filters.namedresourcetype.Workflow": "سير العمل",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
   "search.filters.namedresourcetype.Workspace": "مساحة العمل",
+
+  // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "نعم",
+
+  // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "لا",
+
+  // "search.filters.head": "Filters",
   "search.filters.head": "المنقحات",
-  "search.filters.reset": "إعادة تعيين المقحات",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "إعادة تعيين المنقحات",
+
+  // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "تقديم",
+
+  // "search.form.search": "Search",
   "search.form.search": "بحث",
+
+  // "search.form.search_dspace": "All repository",
   "search.form.search_dspace": "كل المستودع",
+
+  // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "كل دي سبيس",
+
+  // "search.results.head": "Search Results",
   "search.results.head": "نتائج البحث",
-  "search.results.no-results": "لم أسافر لبحثك عن أي نتائج. ",
-  "search.results.no-results-link": "راسي نص حوله",
-  "search.results.empty": "لم أسافر لبحثك عن أي نتائج.",
+
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "لم يسفر بحثك عن أي نتائج. هل تجد صعوبة في العثور على ما تبحث عنه؟ جرب وضع",
+
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "قوسي نص حوله",
+
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "لم يسفر بحثك عن أي نتائج.",
+
+  // "search.results.view-result": "View",
   "search.results.view-result": "عرض",
-  "search.results.response.500": "حدث خطأ أثناء التخطيط، يرجى إعادة محاولة مرة أخرى لاحقاً",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "حدث خطأ أثناء تنفيذ الاستعلام، يرجى إعادة المحاولة مرة أخرى لاحقاً",
+
+  // "default.search.results.head": "Search Results",
   "default.search.results.head": "نتائج البحث",
-  "default-relationships.search.results.head": "نتائج البحث",
+
+  // "default-relationships.search.results.head": "Search Results",
+  // TODO New key - Add a translation
+  "default-relationships.search.results.head": "Search Results",
+
+  // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "العودة إلى النتائج",
+
+  // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "المنقحات",
+
+  // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "أدوات البحث",
+
+  // "search.sidebar.results": "results",
   "search.sidebar.results": "النتائج",
+
+  // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "النتائج لكل صفحة",
-  "search.sidebar.settings.sort-by": "فرز حسب الطلب",
-  "search.sidebar.settings.title": "عد",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "فرز حسب",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "الإعدادات",
+
+  // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "عرض التفاصل",
+
+  // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "عرض كشبكة",
-  "search.view-switch.show-list": "عرض القائمة",
-  "selectable-list-item-control.deselect": "قم بإلغاء تحديد المادة",
-  "selectable-list-item-control.select": "المادة المحددة",
-  "sorting.ASC": "تقييمياً",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "عرض كقائمة",
+
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "إلغاء تحديد المادة",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "تحديد المادة",
+
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "تصاعدياً",
+
+  // "sorting.DESC": "Descending",
   "sorting.DESC": "تنازلياً",
-  "sorting.dc.title.ASC": "العنوان تقييمياً",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "العنوان تصاعدياً",
+
+  // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "العنوان تنازلياً",
-  "sorting.score.ASC": "أقل صلة",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "الأقل صلة",
+
+  // "sorting.score.DESC": "Most Relevant",
   "sorting.score.DESC": "الأكثر صلة",
-  "sorting.dc.date.issued.ASC": "تاريخ الإصدار التقييمي",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "تاريخ الإصدار تصاعدياً",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
   "sorting.dc.date.issued.DESC": "تاريخ الإصدار تنازلياً",
-  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تقييميًا",
-  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع التنازلي",
-  "sorting.lastModified.ASC": "آخر تعديل تقييمياً",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "تاريخ الإيداع تصاعدياً",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "تاريخ الإيداع تنازلياً",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "آخر تعديل تصاعدياً",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "آخر تعديل تنازلياً",
-  "sorting.person.familyName.ASC": "اللقب تصاعدي",
-  "sorting.person.familyName.DESC": "اللقب تنازلي",
-  "sorting.person.givenName.ASC": "الاسم تصاعدي",
-  "sorting.person.givenName.DESC": "اسم تنازلي",
-  "sorting.person.birthDate.ASC": "تاريخ الميلاد تصاعدي",
-  "sorting.person.birthDate.DESC": "تاريخ الميلاد تنازلي",
+
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.ASC": "Surname Ascending",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  // TODO New key - Add a translation
+  "sorting.person.familyName.DESC": "Surname Descending",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.ASC": "Name Ascending",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  // TODO New key - Add a translation
+  "sorting.person.givenName.DESC": "Name Descending",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.ASC": "Birth Date Ascending",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  // TODO New key - Add a translation
+  "sorting.person.birthDate.DESC": "Birth Date Descending",
+
+  // "statistics.title": "Statistics",
   "statistics.title": "الاحصائيات",
-  "statistics.header": "إحصائيات لـ {{ scope }}",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "احصائيات لـ {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "الاحصائيات",
-  "statistics.page.no-data": "لا توفر أي بيانات",
-  "statistics.table.no-data": "لا توفر أي بيانات",
-  "statistics.table.title.TotalVisits": "زيارة إجمالية",
+
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "لا تتوافر أي بيانات",
+
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "لا تتوافر أي بيانات",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "إجمالي الزيارات",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "إجمالي الزيارات لكل شهر",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "زيارات الملف",
-  "statistics.table.title.TopCountries": "أعلى المشاهدات على مستوى البلد",
-  "statistics.table.title.TopCities": "أعلى المشاهدات على مستوى المدينة",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "أعلى مشاهدات على مستوى البلد",
+
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "أعلى مشاهدات على مستوى المدينة",
+
+  // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "المشاهدات",
-  "statistics.table.no-name": "(تعذر تحميل اسم سميث)",
-  "submission.edit.breadcrumbs": "تحرير.التقديم",
-  "submission.edit.title": "تحرير.التقديم",
+
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(تعذر تحميل اسم الكائن)",
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "تحرير التقديم",
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "تحرير التقديم",
+
+  // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "إلغاء",
-  "submission.general.cannot_submit": "ليس لديك القدرة على تقديم الجديد.",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "ليس لديك صلاحية القيام بتقديم جديد.",
+
+  // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "إيداع",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "إلغاء",
-  "submission.general.discard.confirm.info": "لا يمكن السماء عن هذه الطريقة. ",
-  "submission.general.discard.confirm.submit": "نعم، بالتأكيد",
-  "submission.general.discard.confirm.title": "تجاهل",
-  "submission.general.discard.submit": "لا",
-  "submission.general.back.submit": "خلف",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "نعم، متأكد",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "تجاهل التقديم",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "تجاهل",
+
+  // "submission.general.back.submit": "Back",
+  // TODO New key - Add a translation
+  "submission.general.back.submit": "Back",
+
+  // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "محفوظ",
-  "submission.general.info.pending-changes": "أخبار غير محفوظة",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "تغييرات غير محفوظة",
+
+  // "submission.general.save": "Save",
   "submission.general.save": "حفظ",
-  "submission.general.save-later": "لوقت لاحق",
-  "submission.import-external.page.title": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.title": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.title.Journal": "استيراد دورية من المصدر الخارجي",
-  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من المصدر الخارجي",
-  "submission.import-external.title.JournalVolume": "استيراد دورية من المصدر الخارجي",
-  "submission.import-external.title.OrgUnit": "استيراد ناشر من المصدر الخارجي",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "حفظ لوقت لاحق",
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "استيراد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "استيراد عدد دورية من مصدر خارجيe",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "استيراد مجلد دورية من مصدر خارجي",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "استيراد ناشر من مصدر خارجي",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
   "submission.import-external.title.Person": "استيراد شخص من مصدر خارجي",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
   "submission.import-external.title.Project": "استيراد مشروع من مصدر خارجي",
-  "submission.import-external.title.Publication": "استيراد منشور من المصدر الخارجي",
-  "submission.import-external.title.none": "استيراد ميتا من المصدر الخارجي",
-  "submission.import-external.page.hint": "قم دائمًا بالاستعلام عن بعد لاستيراد البيانات إلى دي سبيس.",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "استيراد منشور من مصدر خارجي",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "استيراد ميتاداتا من مصدر خارجي",
+
+  // "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": "قم بإدخال استعلام أعلاه للعثور على مواد من الويب لاستيرادها إلى دي سبيس.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "العودة إلى ماي سبيس",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "بحث المصدر الخارجي",
+
+  // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "بحث",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "اكتب بعض الكلمات للبحث",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "اختر مصدراً خارجياً",
+
+  // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
+
+  // "submission.import-external.source.ads": "NASA/ADS",
   "submission.import-external.source.ads": "ناسا/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
   "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
   "submission.import-external.source.crossref": "كروس ريف",
+
+  // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "داتاسايت",
+
+  // "submission.import-external.source.doi": "DOI",
+  // TODO New key - Add a translation
   "submission.import-external.source.doi": "DOI",
-  "submission.import-external.source.scielo": "سيلو",
+
+  // "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
   "submission.import-external.source.scopus": "سكوبس",
+
+  // "submission.import-external.source.vufind": "VuFind",
   "submission.import-external.source.vufind": "فيوفايند",
+
+  // "submission.import-external.source.wos": "Web Of Science",
   "submission.import-external.source.wos": "شبكة العلوم",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
   "submission.import-external.source.orcidWorks": "أوركيد",
-  "submission.import-external.source.epo": "مكتب براءات الاصدار الأوروبي (EPO)",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "مكتب براءات الاختراع الأوروبي (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "جاري التحميل ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "دوريات شيربا",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
   "submission.import-external.source.sherpaJournalIssn": "دوريات شيربا بواسطة الردمد",
-  "submission.import-external.source.sherpaPublisher": "نشري شيربا",
-  "submission.import-external.source.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "ناشري شيربا",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "أوركيد",
-  "submission.import-external.source.pubmed": "نشر",
-  "submission.import-external.source.pubmedeu": "أوروبا المنشورة",
-  "submission.import-external.source.lcname": "اسماء مكتبة الكونجرس",
-  "submission.import-external.source.ror": "سجل المنظمات البحثية (ROR)",
-  "submission.import-external.preview.title": "عرض المادة",
-  "submission.import-external.preview.title.Publication": "قم بمراجعة المنشور",
-  "submission.import-external.preview.title.none": "عرض المادة",
-  "submission.import-external.preview.title.Journal": "مراجعة الدورية",
-  "submission.import-external.preview.title.OrgUnit": "نظرة عامة على الوحدة الوطنية",
-  "submission.import-external.preview.title.Person": "نظرة على الشخص",
-  "submission.import-external.preview.title.Project": "نظرة على المشروع",
-  "submission.import-external.preview.subtitle": "تم استيراد الميتاداتا أدناه من المصدر الخارجي. ",
-  "submission.import-external.preview.button.import": "البدء",
+
+  // "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": "أسماء مكتبة الكونجرس",
+
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "سجل المؤسسات البحثية (ROR)",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "معاينة المنشور",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "معاينة المادة",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "معاينة الدورية",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "معاينة الوحدة المؤسسية",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "معاينة الشخص",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "معاينة المشروع",
+
+  // "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": "تم استيراد الميتاداتا أدناه من مصدر خارجي. ستتم تعبئتها بشكل مسبق عند بدء التقديم.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "بدء التقديم",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
   "submission.import-external.preview.error.import.title": "خطأ في التقديم",
-  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد المصدر الخارجي.",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "حدث خطأ أثناء عملية استيراد مدخل المصدر الخارجي.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "إغلاق",
-  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي الفعال إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "استيراد الكاتب البعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "تمت إضافة المدخل المحلي بنجاح إلى التحديد",
+
+  // "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": "استيراد مؤلف بعيد",
+
+  // "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": "استيراد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "استيراد عدد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "استيراد دورية بعيدة",
+
+  // "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": "استيراد عدد دورية بعيد",
+
+  // "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": "استيراد مجلد دورية بعيد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "المشروع",
+
+  // "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": "استيراد مادة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "زراعة فعالة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "استيراد المنتج البعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "استيراد المعدات البعيدة",
+
+  // "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": "استيراد فعالية بعيدة",
+
+  // "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": "استيراد منتج بعيد",
+
+  // "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": "استيراد معدات بعيدة",
+
+  // "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": "استيراد وحدة مؤسسية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "استيراد التمويل البعيد",
+
+  // "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": "استيراد تمويل بعيد",
+
+  // "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": "استيراد شخص بعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "استيراد اختراع طويل",
+
+  // "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": "استيراد براءة اختراع بعيدة",
+
+  // "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": "استيراد مشروع بعيد",
+
+  // "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": "استيراد منشور بعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "أكمل إضافة كينونة جديدة!",
+
+  // "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": "تمت إضافة كينونة جديدة!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "مشروع",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "استيراد الكاتب البعيد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "تمت إضافة المؤلف المحلي الفعال إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "تم استيراد المصنع الخارجي بفعالية إلى التحديد",
+
+  // "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": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "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": "استيراد مؤلف بعيد",
+
+  // "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": "تمت إضافة المؤلف المحلي بنجاح إلى التحديد",
+
+  // "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": "تم استيراد وإضافة المؤلف الخارجي بنجاح إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "الاستناد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "أدخل كإستنباط محلي جديد",
+
+  // "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": "استيراد كإدخال استناد محلي جديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "إلغاء",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "اختر حاوية استيراد الإدخالات الجديدة الخاصة بها",
+
+  // "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": "حدد حاوية لاستيراد الإدخالات الجديدة إليها",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "الكينونات",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "استيراد كيكونة محلية جديدة",
+
+  // "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": "استيراد ككينونة محلية جديدة",
+
+  // "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": "استيراد من اسم مكتبة الكونجرس",
+
+  // "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": "استيراد من أوركيد",
+
+  // "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": "استيراد من دورية شيربا",
+
+  // "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": "استيراد من ناشر شيربا",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "استيراد من PubMed",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "استيراد من arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "استيراد من ROR",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "استيراد",
+
+  // "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": "استيراد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "أكمل إضافة الدورية الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "تم الانتهاء من حذف دورية خارجية إلى التحديد",
+
+  // "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": "تمت إضافة الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم بنجاح استيراد وإضافة دورية خارجية إلى التحديد",
+
+  // "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": "استيراد عدد دورية بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "تمت إضافة المزيد من الدوريات الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "تم استيراد عدد الدوريات الخارجية وإضافتها الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "استيراد دورة طويلة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "أكمل إضافة الدورية الفعالة إلى التحديد",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "تم استيراد سلسلة الدوري الخارجية وإضافتها الفعالة إلى التحديد",
+
+  // "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": "تمت إضافة عدد الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم استيراد عدد الدورية الخارجية وإضافته بنجاح إلى التحديد",
+
+  // "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": "استيراد مجلد دورية بعيدة",
+
+  // "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": "تمت إضافة مجلد الدورية المحلية بنجاح إلى التحديد",
+
+  // "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": "تم استيراد مجلد الدورية الخارجية وإضافته بنجاح إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "تحديد تطابق محلي:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "استيراد مؤسسة بعيدة",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد الفعال",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم التخلص من المصنع الخارجي إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "تمت إضافة المؤسسة المحلية إلى التحديد بنجاح",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "تم بنجاح استيراد وإضافة مؤسسة خارجية إلى التحديد",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "إلغاء تحديد الكل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "إلغاء تحديد الصفحة",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
   "submission.sections.describe.relationship-lookup.search-tab.loading": "جاري التحميل...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "استعلام البحث",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "اذهب",
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحثت...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "بحث...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "تحديد الكل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "تحديد الصفحة",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "{{ size }} مادة محددة",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "المؤلفين المحليين ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "الدوريات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "المشاريع المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "المنشورات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "الوحدات الوطنية المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "المؤلفين المحليين ({{ 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": "الوحدات المؤسسية المحلية ({{ 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": "حزم البيانات المحلية ({{ 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": "ملفات البيانات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "سجل الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "سجل الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "خطوط الدوريات المحلية ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "خطوط الدوريات المحلية ({{ 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": "أعداد الدوريات المحلية ({{ 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": "أعداد الدوريات المحلية ({{ 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": "مجلدات الدوريات المحلية ({{ 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": "مجلدات الدوريات المحلية ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "دوريات شيربا ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "ناشري شيربا ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.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": "أسماء مكتبة الكونجرس ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "مجلات ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "أرخايف ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "معدل العائد ({{ 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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "أوركيد ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "كروسريف ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "سكوبس ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Funding OpenAIRE ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "تمويل OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "دوريات شيربا حسب ISSN ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "ابحث عن وكالات ممولة",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن التمويل",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات الوطنية",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "البحث عن وكالات ممولة",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "البحث عن تمويل",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "البحث عن الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "المشاريع",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "مول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "منشورات المؤلف",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة التنظيمية",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "الوحدة المؤسسية للمشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "تمويل واجهة برمجة تطبيقات OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "المشروع",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "المشاريع",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "مول المشروع",
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحثت...",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الفعلي ({{ count }})",
-  "submission.sections.describe.relationship-lookup.title.Journal": "الدوري",
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "سجل الدوري",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "سجل الدوري",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "سلسلة الدوريات",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "سلسلة الدوريات",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "ممول المشروع",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "بحث...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "التحديد الحالي ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "أعداد الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "أعداد الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "مجلدات الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "مجلدات الدورية",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "الدوريات",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "المؤلفين",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "الوكالة الممولة",
-  "submission.sections.describe.relationship-lookup.title.Project": "المشاريع",
-  "submission.sections.describe.relationship-lookup.title.Publication": "منشورات",
+
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "المشروعات",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "المنشورات",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "المؤلفين",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات الوطنية",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "الوحدات المؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "حزم البيانات",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات بيانات البيانات",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "ملفات البيانات",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "الوكالة الممولة",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "تمويل",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المحلية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "الوحدة المؤسسية الأصلية",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "النشر",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
   "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "وحدة مؤسسية",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "قائمة التبديل المنسدلة",
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "عد",
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك بالكامل.",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "الإعدادات",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "تحديدك فارغ حالياً.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "المؤلفين المحددين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "الدوريات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "دليل البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "مجلد الدورية المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "المشاريع المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "المنشورات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات الوطنية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "المؤلفين المحددين",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "الوحدات المؤسسية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "حزم البيانات المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ملفات البيانات المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "الدوريات المحددة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العثور على نتيجة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "دليل البحث",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل للبحث",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العثور على نتيجة",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة الوطنية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "العدد المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "مجلد الدورية المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "الوكالة الممولة المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "التمويل المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "العدد المحدد",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "الوحدة المؤسسية المحددة",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "نتائج البحث",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "نتائج البحث",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "هل ترغب في حفظ \"{{ value }}\" كمتغير اسم هذا الشخص حتى بدأت بالفعل في إعادة استخدامه بنجاح بنجاح؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدام هذا التقديم.",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ اسم جديد",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط هذا التقديم",
-  "submission.sections.ccLicense.type": "نوع الحكم",
-  "submission.sections.ccLicense.select": "قم بتحديد نوع الأمر…",
-  "submission.sections.ccLicense.change": "قم بتغيير نوع النظام…",
-  "submission.sections.ccLicense.none": "لا تتوفر أي تراخيص",
-  "submission.sections.ccLicense.option.select": "قم باختيار الخيار…",
-  "submission.sections.ccLicense.link": "لقد قمت بإلغاء الأمر التالي:",
-  "submission.sections.ccLicense.confirmation": "زيادة على ذلك",
+
+  // "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": "هل ترغب في حفظe \"{{ value }}\" كمتغير اسم لهذا الشخص حتى تتمكن أنت والآخرون من إعادة استخدامه لعمليات التقديم المستقبلية؟ إذا لم تقم بذلك، فلا يزال بإمكانك استخدامه لهذا التقديم.",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "حفظ متغير اسم جديد",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "استخدم فقط لهذا التقديم",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "نوع الترخيص",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "قم بتحديد نوع الترخيص…",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "قم بتغيير نوع الترخيص…",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "لا تتوافر أي تراخيص",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "قم بتحديد خيار…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "لقد قمت بتحديد الترخيص التالي:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "أمنحك الترخيص أعلاه",
+
+  // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "إضافة المزيد",
-  "submission.sections.general.cannot_deposit": "لا يمكن تجاوز الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى تعبئة جميع الأغراض المطلوبة لجميع الإيداع.",
+
+  // "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": "لا يمكن إتمام الإيداع بسبب وجود أخطاء في النموذج.<br>يرجى ملء جميع الحقول المطلوبة لإتمام الإيداع.",
+
+  // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "حاوية",
-  "submission.sections.general.deposit_error_notice": "تجربة تقديم المادة أثناء تقديم المادة، يرجى إعادة محاولة مرة أخرى لاحقاً.",
-  "submission.sections.general.deposit_success_notice": "تم تقديم التقديم الفعال.",
-  "submission.sections.general.discard_error_notice": "لا تتجاهل المشكلة، يرجى إعادة محاولة مرة أخرى لاحقًا.",
-  "submission.sections.general.discard_success_notice": "تم التقليل من التأثير.",
-  "submission.sections.general.metadata-extracted": "تم الانتهاء من ميتاداتا جديدة وإضافتها إلى القسم <strong>{{sectionId}}</strong>.",
-  "submission.sections.general.metadata-extracted-new-section": "أكمل إضافة قسم <strong>{{sectionId}}</strong> الجديد في التقديم.",
-  "submission.sections.general.no-collection": "لم يتم العثور على الوثيقة",
+
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "حدثت مشكلة أثناء تقديم المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "تم إيداع التقديم بنجاح.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "حدثت مشكلة أثناء تجاهل المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "تم تجاهل التقديم بنجاح.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "تم استخلاص ميتاداتا جديدة وإضافتها إلى قسم <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": "تمت إضافة قسم <strong>{{sectionId}}</strong> جديد إلى التقديم.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "لم يتم العثور على حاويات",
+
+  // "submission.sections.general.no-entity": "No entity types found",
   "submission.sections.general.no-entity": "لم يتم العثور على أنواع كينونات",
-  "submission.sections.general.no-sections": "لا تتوفر أي خيارات",
-  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة محاولة مرة أخرى لاحقًا.",
-  "submission.sections.general.save_success_notice": "تم دعم الفعال.",
-  "submission.sections.general.search-collection": "ابحث عن الحاوية",
+
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "لا تتوافر أي خيارات",
+
+  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "حدثت مشكلة أثناء حفظ المادة، يرجى إعادة المحاولة مرة أخرى لاحقاً.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "تم حفظ التقديم بنجاح.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "البحث عن حاوية",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "هناك أقسام غير مكتملة.",
-  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية الجديدة بك:",
-  "submission.sections.identifiers.no_handle": "ولم يتم استخدام أي يد لهذه المادة.",
-  "submission.sections.identifiers.no_doi": "ولم يتم البحث عن أي معرفات كائنية رقمية لهذه المادة.",
-  "submission.sections.identifiers.handle_label": "مقبض: ",
-  "submission.sections.identifiers.doi_label": "المعرفة الرقمية: ",
+
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "سيتم إنشاء المعرفات التالية للمادة الخاصة بك:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "لم يتم سك أي هاندل لهذه المادة.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "لم يتم سك أي معرفات كائنات رقمية لهذه المادة.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "هاندل: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "معرف الكائن الرقمي: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
   "submission.sections.identifiers.otherIdentifiers_label": "معرفات أخرى: ",
-  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول إلى أبعد",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "شروط الوصول للمادة",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "الإبداعية العامة",
-  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير رياضي",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "إعادة تدوير",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "وصف",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "وصف",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "وصف",
-  "submission.sections.submit.progressbar.duplicates": "التكرارات المحتملة",
+
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "المعرفات",
-  "submission.sections.submit.progressbar.license": "ترخيص الإيداع",
-  "submission.sections.submit.progressbar.sherpapolicy": "سياسة شيربا",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "رخصة الإيداع",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "سياسات شيربا",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "تحميل الملفات",
-  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات عن الوصول الحر للناشر",
-  "submission.sections.sherpa-policy.title-empty": "لا اختيار معلومات حول الناشر. ",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "معلومات سياسة الوصول الحر للناشر",
+
+  // "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": "لا تتوفر معلومات حول سياسة الناشر. إذا كان لعملك رقم ISSN مرتبط، يرجى إدخاله أعلاه للاطلاع على أي سياسة وصول حر للناشرين ذوي الصلة.",
+
+  // "submission.sections.status.errors.title": "Errors",
   "submission.sections.status.errors.title": "أخطاء",
+
+  // "submission.sections.status.valid.title": "Valid",
   "submission.sections.status.valid.title": "صالح",
+
+  // "submission.sections.status.warnings.title": "Warnings",
   "submission.sections.status.warnings.title": "تحذيرات",
-  "submission.sections.status.errors.aria": "بسبب الأخطاء",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "به أخطاء",
+
+  // "submission.sections.status.valid.aria": "is valid",
   "submission.sections.status.valid.aria": "صالح",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
   "submission.sections.status.warnings.aria": "ذو تحذيرات",
-  "submission.sections.status.info.title": "معلومات اضافية",
-  "submission.sections.status.info.aria": "معلومات اضافية",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "معلومات إضافية",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "معلومات إضافية",
+
+  // "submission.sections.toggle.open": "Open section",
   "submission.sections.toggle.open": "فتح القسم",
+
+  // "submission.sections.toggle.close": "Close section",
   "submission.sections.toggle.close": "إغلاق القسم",
-  "submission.sections.toggle.aria.open": "قسم النهائي {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "توسيع قسم {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "طي قسم {{sectionHeader}}",
-  "submission.sections.upload.primary.make": "يصنع {{fileName}} تيار البت الأساسي",
-  "submission.sections.upload.primary.remove": "يزيل {{fileName}} باعتباره دفق البت الأساسي",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "إلغاء",
-  "submission.sections.upload.delete.confirm.info": "لا يمكن السماء عن هذه الطريقة. ",
-  "submission.sections.upload.delete.confirm.submit": "نعم، بالتأكيد",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "لا يمكن التراجع عن هذه العملية. هل أنت متأكد؟",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "نعم، متأكد",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "حذف تدفق البت",
+
+  // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "حذف",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
   "submission.sections.upload.download.title": "تحميل تدفق البت",
-  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإختفاءها بالمادة",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "قم بإسقاط الملفات لإرفاقها بالمادة",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
   "submission.sections.upload.edit.title": "تحرير دفق البت",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "نوع شرط الوصول",
-  "submission.sections.upload.form.access-condition-hint": "حدد شرط الوصول إليه على تدفق المادة بمجرد إيداعها",
+
+  // "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": "حدد شرط الوصول لتطبيقه على تدفقات البت بمجرد إيداع المادة",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "التاريخ مطلوب.",
-  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول قبل مطلوب.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
   "submission.sections.upload.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
-  "submission.sections.upload.form.from-label": "أمنح من الوصول",
-  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة منذ البداية",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "منح الوصول من",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة منذ بلوغه",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "من",
+
+  // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "المجموعة",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "المجموعة مطلوبة.",
-  "submission.sections.upload.form.until-label": "أمنح حتى الوصول",
-  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة حتى المضي قدمًا",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "حتى",
-  "submission.sections.upload.header.policy.default.nolist": "ستكون الإجراءات المرفوعة في الكائنات الحية {{collectionName}} لا يمكن الوصول إلى المجموعات التالية:",
-  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في الحاوية {{collectionName}} ستكون قادرة على الوصول، بالإضافة إلى ما يقرر بوضوح للملف المفرد، مع المجموعات التالية:",
-  "submission.sections.upload.info": "مساهمة هنا في كل القضايا الموجودة في المادة حاليا.  <strong> تحميل الملفات الإضافية عن طريق سحبها وتسجيلها في أي مكان في الصفحة</strong>",
+
+  // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
+  "submission.sections.upload.header.policy.default.nolist": "ستكون الملفات المرفوعة في الحاوية {{collectionName}} قابلة للوصول وفقًا للمجموعات التالية:",
+
+  // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
+  "submission.sections.upload.header.policy.default.withlist": "يرجى ملاحظة أن الملفات المرفوعة في حاوية {{collectionName}} ستكون قابلة للوصول، بالإضافة إلى ما تقرر بوضوح للملف المفرد، مع المجموعات التالية:",
+
+  // "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 by dragging & dropping them anywhere on the page.</strong>",
+  "submission.sections.upload.info": "ستجد هنا كل الملفات الموجودة في المادة حاليًا. يمكنك تحديث ميتاداتا الملف وشروط الوصول أو <strong> تحميل ملفات إضافية عن طريق سحبها وإسقاطها في أي مكان في الصفحة</strong>",
+
+  // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "لا",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "لم يتم تحميل أي ملف حتى الآن.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "حفظ الميتاداتا",
+
+  // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "إلغاء",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "فشل التحميل",
-  "submission.sections.upload.upload-successful": "بدأ التحميل",
-  "submission.sections.accesses.form.discoverable-description": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. ",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "نجح التحميل",
+
+  // "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": "عند التحديد، ستكون هذه المادة قابلة للاكتشاف في البحث/الاستعراض. عند إلغاء التحديد، ستكون المادة متاحة فقط عبر رابط مباشر ولن تظهر أبدًا في البحث/الاستعراض.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
   "submission.sections.accesses.form.discoverable-label": "قابل للاكتشاف",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "نوع شرط الوصول",
-  "submission.sections.accesses.form.access-condition-hint": "حدد شرط الوصول إلى المادة بمجرد إيداعها",
+
+  // "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": "حدد شرط الوصول لتطبيقه على المادة بمجرد إيداعها",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
   "submission.sections.accesses.form.date-required": "التاريخ مطلوب.",
-  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول قبل مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "تاريخ منح الوصول منذ مطلوب.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
   "submission.sections.accesses.form.date-required-until": "تاريخ منح الوصول حتى مطلوب.",
-  "submission.sections.accesses.form.from-label": "منح قبل الوصول",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "منح الوصول منذ",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
   "submission.sections.accesses.form.from-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
   "submission.sections.accesses.form.from-placeholder": "من",
+
+  // "submission.sections.accesses.form.group-label": "Group",
   "submission.sections.accesses.form.group-label": "المجموعة",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
   "submission.sections.accesses.form.group-required": "المجموعة مطلوبة.",
-  "submission.sections.accesses.form.until-label": "أمنح حتى الوصول",
-  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم فيه تطبيق شرط الوصول ذي الصلة حتى المضي قدمًا",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "منح الوصول حتى",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "حدد التاريخ الذي يتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "حتى",
-  "submission.sections.duplicates.none": "لم يتم اكتشاف أي تكرارات.",
-  "submission.sections.duplicates.detected": "تم الكشف عن التكرارات المحتملة. ",
-  "submission.sections.duplicates.in-workspace": "هذا العنصر موجود في مساحة العمل",
-  "submission.sections.duplicates.in-workflow": "هذا العنصر في سير العمل",
-  "submission.sections.license.granted-label": "وأرجح ذلك",
-  "submission.sections.license.required": "يجب عليك معارضة",
-  "submission.sections.license.notgranted": "يجب عليك معارضة",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.none": "No duplicates were detected.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  // TODO New key - Add a translation
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "أؤكد الترخيص أعلاه",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "يجب عليك قبول الترخيص",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "معلومات الناشر",
-  "submission.sections.sherpa.publication.information.title": "عنوان العنوان",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "العنوان",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
   "submission.sections.sherpa.publication.information.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": "الناشر",
-  "submission.sections.sherpa.publication.information.romeoPub": "حانة روميو",
-  "submission.sections.sherpa.publication.information.zetoPub": "حانة زيتو",
-  "submission.sections.sherpa.publisher.policy": "للناشر",
-  "submission.sections.sherpa.publisher.policy.description": "تم العثور على المعلومات أدناه عبر شيربا روميو. ",
-  "submission.sections.sherpa.publisher.policy.openaccess": "مسارات الوصول الحر التي تتيح لها هذه الدورية المدرجة أدناه حسب إصدار المقال. ",
-  "submission.sections.sherpa.publisher.policy.more.information": "لمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
-  "submission.sections.sherpa.publisher.policy.version": "النسخة",
+
+  // "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": "سياسة الناشر",
+
+  // "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": "تم العثور على المعلومات أدناه عبر شيربا روميو. وبناءً على سياسات الناشر الخاص بك، فإنه يقدم النصائح بشأن ما إذا كان الحظر ضروريًا أو الملفات المسموح لك بتحميلها. إذا كانت لديك أسئلة، يرجى الاتصال بمسؤول موقعك عبر نموذج التعليقات الموجود في التذييل.",
+
+  // "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": "مسارات الوصول الحر التي تسمح بها سياسة هذه الدورية مدرجة أدناه حسب إصدار المقال. انقر على المسار للحصول على عرض أكثر تفصيلاً",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "للمزيد من المعلومات، يرجى الاطلاع على الروابط التالية:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "الإصدارة",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
   "submission.sections.sherpa.publisher.policy.embargo": "حظر",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
   "submission.sections.sherpa.publisher.policy.noembargo": "بلا حظر",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
   "submission.sections.sherpa.publisher.policy.nolocation": "لا شيء",
-  "submission.sections.sherpa.publisher.policy.license": "com",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "الترخيص",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
   "submission.sections.sherpa.publisher.policy.prerequisites": "المتطلبات الأساسية",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
   "submission.sections.sherpa.publisher.policy.location": "الموقع",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
   "submission.sections.sherpa.publisher.policy.conditions": "الشروط",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
   "submission.sections.sherpa.publisher.policy.refresh": "تحديث",
-  "submission.sections.sherpa.record.information": "تسجيل المعلومات",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "معلومات التسجيلة",
+
+  // "submission.sections.sherpa.record.information.id": "ID",
   "submission.sections.sherpa.record.information.id": "المعرّف",
+
+  // "submission.sections.sherpa.record.information.date.created": "Date Created",
   "submission.sections.sherpa.record.information.date.created": "تاريخ الإنشاء",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
   "submission.sections.sherpa.record.information.date.modified": "آخر تعديل",
+
+  // "submission.sections.sherpa.record.information.uri": "URI",
   "submission.sections.sherpa.record.information.uri": "URI",
-  "submission.sections.sherpa.error.message": "حدث خطأ أثناء حذف معلومات شيربا",
+
+  // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
+  "submission.sections.sherpa.error.message": "حدث خطأ أثناء استرداد معلومات شيربا",
+
+  // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "تقديم جديد",
+
+  // "submission.submit.title": "New submission",
   "submission.submit.title": "تقديم جديد",
+
+  // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "حذف",
-  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. ",
+
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "حدد هذا الخيار لتجاهل هذه المادة. سيُطلب منك بعد ذلك تأكيد ذلك.",
+
+  // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "تحرير",
-  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتكوين المادة.",
+
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "حدد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "عرض",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
+
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
   "submission.workflow.generic.submit_select_reviewer": "حدد المراجع",
+
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
   "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
   "submission.workflow.generic.submit_score": "تقييم",
+
+  // "submission.workflow.generic.submit_score-help": "",
   "submission.workflow.generic.submit_score-help": "",
-  "submission.workflow.tasks.claimed.approve": "أوافق",
-  "submission.workflow.tasks.claimed.approve_help": "إذا قمت بمراجعة المادة الداخلية للاستهلاك الغذائي، اختر \"قبول\".",
+
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "قبول",
+
+  // "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": "إذا قمت بمراجعة المادة وكانت ملائمة للإدراج في الحاوية، اختر  \"قبول\".",
+
+  // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "تحرير",
-  "submission.workflow.tasks.claimed.edit_help": "سيقوم هذا الخيار بتغيير المادة.",
-  "submission.workflow.tasks.claimed.decline": "الرفض",
+
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "قم بتحديد هذا الخيار لتغيير ميتاداتا المادة.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "رفض",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
   "submission.workflow.tasks.claimed.decline_help": "",
-  "submission.workflow.tasks.claimed.reject.reason.info": "يرجي التسجيل سبب الرفض في القسم أدناه، وقم بتوضيح ما إذا كان بإمكانه تصحيح المشكلة لتقديم الطلب.",
+
+  // "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": "يرجي إدخال سبب رفض التقديم في المربع أدناه، وقم بتوضيح ما إذا كان بإمكان المقدم تصحيح المشكلة وإعادة التقديم.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "قم بوصف سبب الرفض",
-  "submission.workflow.tasks.claimed.reject.reason.submit": "الموافقة على المادة",
-  "submission.workflow.tasks.claimed.reject.reason.title": "هذا",
-  "submission.workflow.tasks.claimed.reject.submit": "الرفض",
-  "submission.workflow.tasks.claimed.reject_help": "إذا قمت بمراجعة المادة وجدتها <strong>غير</strong> وجزء للإدراج في الصغار، اختر \"رفض\". ",
+
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "رفض المادة",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "السبب",
+
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "رفض",
+
+  // "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": "إذا قمت بمراجعة المادة ووجدتها <strong>غير</strong> ملائمة للإدراج في الحاوية، اختر \"رفض\". سيُطلب منك إدخال رسالة لتوضيح سبب عدم ملاءمة المادة، وما إذا كان يجب على المقدم إجراء بعض التغييرات وإعادة التقديم.",
+
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "إعادة إلى الصحن",
-  "submission.workflow.tasks.claimed.return_help": "إعادة مهمة إلى السخن لكي يقوم مستخدم آخر المهرج.",
-  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء...",
-  "submission.workflow.tasks.generic.processing": "جاريب...",
-  "submission.workflow.tasks.generic.submitter": "شير",
-  "submission.workflow.tasks.generic.success": "فعال",
+
+  // "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": "إعادة المهمة إلى الصحن لكي يقوم مستخدم آخر بأداء المهمة.",
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "حدث خطأ أثناء العملية...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "جاري المعالجة...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "المقدم",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "تمت العملية بنجاح",
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "مطالبة",
-  "submission.workflow.tasks.pool.claim_help": "قم بهذه المهمة لأجلك.",
-  "submission.workflow.tasks.pool.hide-detail": "حفظ التفاصيل",
+
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "قم بتعيين هذه المهمة لنفسك.",
+
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "إخفاء التفاصيل",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "عرض التفاصيل",
-  "submission.workflow.tasks.duplicates": "تم الكشف عن التكرارات المحتملة لهذا العنصر. ",
+
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  // TODO New key - Add a translation
+  "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+
+  // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "عرض",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "حدد هذا الخيار لعرض ميتاداتا المادة.",
-  "submitter.empty": "غير محتمل",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "غير قابل للتطبيق",
+
+  // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "الاشتراكات",
-  "subscriptions.item": "الاشتراكات للمواد",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "اشتراكات للمواد",
+
+  // "subscriptions.collection": "Subscriptions for collections",
   "subscriptions.collection": "اشتراكات للحاويات",
-  "subscriptions.community": "الاشتراكات المتاحة",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "اشتراكات للمجتمعات",
+
+  // "subscriptions.subscription_type": "Subscription type",
   "subscriptions.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.frequency": "Subscription frequency",
   "subscriptions.frequency": "تواتر الاشتراك",
+
+  // "subscriptions.frequency.D": "Daily",
   "subscriptions.frequency.D": "يومي",
+
+  // "subscriptions.frequency.M": "Monthly",
   "subscriptions.frequency.M": "شهري",
+
+  // "subscriptions.frequency.W": "Weekly",
   "subscriptions.frequency.W": "أسبوعي",
+
+  // "subscriptions.tooltip": "Subscribe",
   "subscriptions.tooltip": "اشتراك",
+
+  // "subscriptions.modal.title": "Subscriptions",
   "subscriptions.modal.title": "الاشتراكات",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
   "subscriptions.modal.type-frequency": "النوع والتواتر",
+
+  // "subscriptions.modal.close": "Close",
   "subscriptions.modal.close": "إغلاق",
-  "subscriptions.modal.delete-info": "إزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
-  "subscriptions.modal.new-subscription-form.type.content": "ال",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "لإزالة هذا الاشتراك، يرجى زيارة صفحة \"الاشتراكات\" أدنى ملف تعريف المستخدم الخاص بك",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "المحتوى",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
   "subscriptions.modal.new-subscription-form.frequency.D": "يومي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
   "subscriptions.modal.new-subscription-form.frequency.W": "أسبوعي",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
   "subscriptions.modal.new-subscription-form.frequency.M": "شهري",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
   "subscriptions.modal.new-subscription-form.submit": "تقديم",
-  "subscriptions.modal.new-subscription-form.processing": "جاريب...",
-  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} فعالية.",
-  "subscriptions.modal.delete.success": "تم حذف الاشتراك الفعال",
-  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} فعالية",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "جاري المعالجة...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "تم الاشتراك في {{type}} بنجاح.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "تم حذف الاشتراك بنجاح",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "تم تحديث الاشتراك في {{type}} بنجاح",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
   "subscriptions.modal.create.error": "حدث خطأ أثناء إنشاء الاشتراك",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
   "subscriptions.modal.delete.error": "حدث خطأ أثناء حذف الاشتراك",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
   "subscriptions.modal.update.error": "حدث خطأ أثناء تحديث الاشتراك",
+
+  // "subscriptions.table.dso": "Subject",
   "subscriptions.table.dso": "الموضوع",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
   "subscriptions.table.subscription_type": "نوع الاشتراك",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
   "subscriptions.table.subscription_frequency": "تواتر الاشتراك",
-  "subscriptions.table.action": "صنع",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "إجراء",
+
+  // "subscriptions.table.edit": "Edit",
   "subscriptions.table.edit": "تحرير",
+
+  // "subscriptions.table.delete": "Delete",
   "subscriptions.table.delete": "حذف",
+
+  // "subscriptions.table.not-available": "Not available",
   "subscriptions.table.not-available": "غير متاح",
-  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حاليا لمشاهدتها",
-  "subscriptions.table.empty.message": "ليس لديك أي اشتراك في هذا الوقت. ",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "تم حذف مادة الاشتراك، أو ليس لديك صلاحية حالياً لمشاهدتها",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "ليس لديك أي اشتراكات في هذا الوقت. للاشتراك في تحديثات البريد الإلكتروني لمجتمع أو حاوية، استخدم زر الاشتراك الموجود في صفحة الكائن.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "صورة مصغرة",
-  "thumbnail.default.placeholder": "لا اختيار صورة مصغرة",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "لا تتوفر صورة مصغرة",
+
+  // "thumbnail.project.alt": "Project Logo",
   "thumbnail.project.alt": "شعار المشروع",
-  "thumbnail.project.placeholder": "صورة كمساهمة في المساهمة",
-  "thumbnail.orgunit.alt": "الشعار الوطني الوطني",
-  "thumbnail.orgunit.placeholder": "صورة الكارب النائي للوحدة الوطنية",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "صورة العنصر النائب للمشروع",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "شعار الوحدة المؤسسية",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "صورة العنصر النائي للوحدة المؤسسية",
+
+  // "thumbnail.person.alt": "Profile Picture",
   "thumbnail.person.alt": "صورة الملف الشخصي",
-  "thumbnail.person.placeholder": "عدم توفر صورة للملف الشخصي",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "لا تتوافر صورة للملف الشخصي",
+
+  // "title": "DSpace",
   "title": "دي سبيس",
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "عرض الشجرة الهرمية",
+
+  // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "تحميل المزيد",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "إعادة تعيين",
+
+  // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "بحث",
-  "vocabulary-treeview.search.form.search-placeholder": "تسهيل البحث عن طريق كتابة الرواية الأولى",
+
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "تنقيح النتائج عن طريق كتابة الأحرف الأولى",
+
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "لم تكن هناك مواد للعرض",
-  "vocabulary-treeview.tree.description.nsi": "فرس العلوم النرويجي",
-  "vocabulary-treeview.tree.description.srsc": "موضوع البحث",
-  "vocabulary-treeview.info": "قم بزيارة موضوع لإضافته كمنقح بحثه",
+
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "فهرس العلوم النرويجي",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "فئات موضوع البحث",
+
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "قم بتحديد موضوع لإضافته كمنقح بحث",
+
+  // "uploader.browse": "browse",
   "uploader.browse": "استعراض",
-  "uploader.drag-message": "قم بسحب وتسجيل ملفاتك هنا",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "قم بسحب وإسقاط ملفاتك هنا",
+
+  // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "حذف",
+
+  // "uploader.or": ", or ",
   "uploader.or": ", أو ",
-  "uploader.processing": "الملفات الجارية التي تم تحميلها... (أصبح من الآن ينتهك هذه الصفحة)",
+
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "جاري معالجة الملفات التي تم تحميلها... (أصبح من الآمن الآن إغلاق هذه الصفحة)",
+
+  // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "طول الصف",
-  "virtual-metadata.delete-item.info": "قم باختيار الأنواع التي تريد حفظ الميتاداتا لاستخدامها كميتاداتا فعلية",
-  "virtual-metadata.delete-item.modal-head": "استخدامات مفيدة لهذه المصالح",
-  "virtual-metadata.delete-relationship.modal-head": "قم بشراء المواد التي تريد حفظ الميتاداتا لاستخدامها كميتاداتا فعلية",
-  "supervisedWorkspace.search.results.head": "منتج للإشراف",
+
+  // "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": "قم بتحديد الأنواع التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "الميتاداتا الافتراضية لهذه العلاقة",
+
+  // "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": "قم بتحديد المواد التي تريد حفظ الميتاداتا الافتراضية لها كميتاداتا فعلية",
+
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "مواد خاضعة للإشراف",
+
+  // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "تقديمات",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "أدر سير العمل",
+
+  // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "مهام سير العمل",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "مهام سير العمل ومساحة العمل",
-  "orgunit.search.results.head": "نتائج البحث الوطني",
-  "workflow-item.edit.breadcrumbs": "تحرير سير العمل",
-  "workflow-item.edit.title": "تحرير سير العمل",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "نتائج بحث الوحدات المؤسسية",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "تحرير مادة سير العمل",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "تحرير مادة سير العمل",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "تم الحذف",
-  "workflow-item.delete.notification.success.content": "تم حذف المادة سير العمل هذه فعالة",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "تم حذف مادة سير العمل هذه بنجاح",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "لقد حدث خطأ ما",
-  "workflow-item.delete.notification.error.content": "عذر حذف سير العمل",
-  "workflow-item.delete.title": "حذف سير العمل",
-  "workflow-item.delete.header": "حذف سير العمل",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "تعذر حذف مادة سير العمل",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "حذف مادة سير العمل",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "حذف مادة سير العمل",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "إلغاء",
+
+  // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "حذف",
-  "workflow-item.send-back.notification.success.title": "إرسال إعادة إلى الأمام",
-  "workflow-item.send-back.notification.success.content": "أكمل إعادة صياغة سير العمل إلى هذه الإجراءات الفعالة",
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "إعادة إرسال إلى المقدم",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "تمت إعادة إرسال مادة سير العمل هذه إلى المقدم بنجاح",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "لقد حدث خطأ ما",
-  "workflow-item.send-back.notification.error.content": "تعذر إعادة إرسال المادة سير العمل إلى الأمام",
-  "workflow-item.send-back.title": "إرسال إعادة مادة سير العمل إلى شير",
-  "workflow-item.send-back.header": "إرسال إعادة مادة سير العمل إلى شير",
+
+  // "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": "تعذر إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "إعادة إرسال مادة سير العمل إلى المقدم",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "إلغاء",
-  "workflow-item.send-back.button.confirm": "إعادة الإرسال",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "إعادة إرسال",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
   "workflow-item.view.breadcrumbs": "عرض سير العمل",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
   "workspace-item.view.breadcrumbs": "عرض مساحة العمل",
+
+  // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "عرض مساحة العمل",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
   "workspace-item.delete.breadcrumbs": "حذف مساحة العمل",
-  "workspace-item.delete.header": "حذف مساحة العمل",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "حذف مادة مساحة العمل",
+
+  // "workspace-item.delete.button.confirm": "Delete",
   "workspace-item.delete.button.confirm": "حذف",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
   "workspace-item.delete.button.cancel": "إلغاء",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
   "workspace-item.delete.notification.success.title": "تم الحذف",
-  "workspace-item.delete.title": "تم حذف المساحة الفعالة",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "تم حذف مادة مساحة العمل بنجاح",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
   "workspace-item.delete.notification.error.title": "هناك خطأ ما",
-  "workspace-item.delete.notification.error.content": "عذر حذف مساحة العمل",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "تعذر حذف مادة مساحة العمل",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
   "workflow-item.advanced.title": "سير العمل المتقدم",
-  "workflow-item.selectrevieweraction.notification.success.title": "المراجع للبحث",
-  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاصة بما في ذلك سير العمل الفعال",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "المراجع المحدد",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "تم اختيار المراجع الخاص بمادة سير العمل هذه بنجاح",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
   "workflow-item.selectrevieweraction.notification.error.title": "هناك خطأ ما",
-  "workflow-item.selectrevieweraction.notification.error.content": "عذر تحديد المراجع لعنصر سير العمل هذا",
-  "workflow-item.selectrevieweraction.title": "تحديد الزائر",
-  "workflow-item.selectrevieweraction.header": "تحديد الزائر",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "تعذر تحديد المراجع لعنصر سير العمل هذا",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "تحديد مراجع",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
   "workflow-item.selectrevieweraction.button.cancel": "إلغاء",
-  "workflow-item.selectrevieweraction.button.confirm": "بالتأكيد",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "تأكيد",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
   "workflow-item.scorereviewaction.notification.success.title": "مراجعة التقييم",
-  "workflow-item.scorereviewaction.notification.success.content": "تم تقديم التقييم الخاص بعنصر سير العمل الفعال",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "تم إرسال التقييم الخاص بعنصر سير عمل هذه المادة بنجاح",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
   "workflow-item.scorereviewaction.notification.error.title": "هناك خطأ ما",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
   "workflow-item.scorereviewaction.notification.error.content": "تعذر تقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
   "workflow-item.scorereviewaction.title": "قم بتقيم هذه المادة",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
   "workflow-item.scorereviewaction.header": "قم بتقييم هذه المادة",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
   "workflow-item.scorereviewaction.button.cancel": "إلغاء",
-  "workflow-item.scorereviewaction.button.confirm": "بالتأكيد",
-  "idle-modal.header": "ستنتهي بعد قليل",
-  "idle-modal.info": "النهاية، انتهاء الجلسات المستخدمة بعد ذلك {{ timeToExpire }} دقيقة من عدم النشاط. ",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "تأكيد",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "ستنتهي الجلسة بعد قليل",
+
+  // "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": "لأسباب أمنية، تنتهي جلسات المستخدم بعد {{ timeToExpire }} دقيقة من عدم النشاط. ستنتهي جلستك بعد قليل. هل ترغب في تمديدها أم تسجيل الخروج؟",
+
+  // "idle-modal.log-out": "Log out",
   "idle-modal.log-out": "خروج",
+
+  // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "تمديد الجلسة",
-  "researcher.profile.action.processing": "جاريب...",
-  "researcher.profile.associated": "الملف للباحثين الشخصيين",
-  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير الملف الشخصي",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "جاري المعالجة...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "الملف الشخصي للباحث المرتبط",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "حدث خطأ غير متوقع أثناء تغيير رؤية الملف الشخصي",
+
+  // "researcher.profile.create.new": "Create new",
   "researcher.profile.create.new": "إنشاء جديد",
-  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث الفعال",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "تم إنشاء الملف الشخصي للباحث بنجاح",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
   "researcher.profile.create.fail": "حدث خطأ أثناء إنشاء الملف الشخصي للباحث",
+
+  // "researcher.profile.delete": "Delete",
   "researcher.profile.delete": "حذف",
+
+  // "researcher.profile.expose": "Expose",
   "researcher.profile.expose": "عرض",
+
+  // "researcher.profile.hide": "Hide",
   "researcher.profile.hide": "إخفاء",
-  "researcher.profile.not.associated": "الملف للباحث شخصي غير مرتبط بعد",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "الملف الشخصي للباحث غير مرتبط بعد",
+
+  // "researcher.profile.view": "View",
   "researcher.profile.view": "عرض",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "خاص",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "عام",
+
+  // "researcher.profile.status": "Status:",
   "researcher.profile.status": "الحالة:",
-  "researcherprofile.claim.not-authorized": "لا غير لك هذه المادة. ",
-  "researcherprofile.error.claim.body": "حدث خطأ أثناء استخدام الملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "لا يحق لك المطالبة بهذه المادة. لمزيد من التفاصيل يرجى الاتصال بالمسؤول.",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "حدث خطأ أثناء المطالبة بالملف الشخصي، يرجى المحاولة مرة أخرى لاحقاً",
+
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "خطأ",
-  "researcherprofile.success.claim.body": "أكمل بالملف الكامل الفعال",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "تمت المطالبة بالملف الشخصي بنجاح",
+
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "نجاح",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
   "person.page.orcid.create": "إنشاء معرف أوركيد",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "التصاريح الممنوحة",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "منح التصاريح",
-  "person.page.orcid.link": "الاتصال بمعرفة أوركيد",
-  "person.page.orcid.link.processing": "غاري الملف الشخصي بيوركيد...",
-  "person.page.orcid.link.error.message": "حدث ما حدث خطأ أثناء ربط الملف الشخصي بوركيد. ",
-  "person.page.orcid.orcid-not-linked-message": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم الاتصال به بعد بحسابك في سجل أوركيد أو صلاحية الاتصال.",
-  "person.page.orcid.unlink": "قطعة الاتصال بأوركيد",
-  "person.page.orcid.unlink.processing": "جاريب...",
-  "person.page.orcid.missing-authorizations": "لقد فقدت التصاريح",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "الاتصال بمعرف أوركيد",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "جاري ربط الملف الشخصي بأوركيد...",
+
+  // "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": "حدث خطأ ما أثناء ربط الملف الشخصي بأوركيد. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول.",
+
+  // "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": "معرف أوركيد لهذا الملف الشخصي ({{ orcid }}) لم يتم ربطه بعد بحساب في سجل أوركيد أو انتهت صلاحية الاتصال.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "قطع الاتصال بأوركيد",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "جاري المعالجة...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "تصاريح مفقودة",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
   "person.page.orcid.missing-authorizations-message": "التصاريح التالية مفقودة:",
-  "person.page.orcid.no-missing-authorizations-message": "عظيم! ",
-  "person.page.orcid.no-orcid-message": "لا يوجد معرف أوركيد مرتبط حتى الآن. ",
+
+  // "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": "عظيم! هذا المربع فارغ، لذا فقد قمت بمنح جميع حقوق الوصول لاستخدام جميع الوظائف التي تقدمها مؤسستك.",
+
+  // "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": "لا يوجد معرف أوركيد مرتبط حتى الآن. بالنقر على الزر أدناه من الممكن ربط هذا الملف الشخصي بحساب أوركيد.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
   "person.page.orcid.profile-preferences": "تفضيلات الملف الشخصي",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
   "person.page.orcid.funding-preferences": "تفضيلات التمويل",
-  "person.page.orcid.publications-preferences": "مفضلات النشر",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "تفضيلات النشر",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
   "person.page.orcid.remove-orcid-message": "إذا كنت بحاجة إلى إزالة أوركيد الخاص بك، يرجى الاتصال بمسؤول المستودع",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "تحديث الإعدادات",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "الانتسابات",
-  "person.page.orcid.sync-profile.biographical": "بيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "البيانات الشخصية",
+
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "التعليم",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "المعرفات",
-  "person.page.orcid.sync-fundings.all": "كل التمويل",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "كل التمويلات",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "تمويلاتي",
-  "person.page.orcid.sync-fundings.my_selected": "التمويل المحدد",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "التمويلات المحددة",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "معطلة",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "كل المنشورات",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "منشوراتي",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "المنشورات المحددة",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "معطلة",
-  "person.page.orcid.sync-queue.discard": "لا ننسى ولا ننسى مع سجل أوركيد",
-  "person.page.orcid.sync-queue.discard.error": "فشلت في تجاهل تسجيل قائمة انتظار أوركيد",
-  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيل قائمة انتظار أوركيد الفعالة",
-  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد الكاملة",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "تجاهل التغيير ولا تقم بالمزامنة مع سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "فشل تجاهل تسجيلة قائمة انتظار أوركيد",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "تم تجاهل تسجيلة قائمة انتظار أوركيد بنجاح",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "سجل قائمة انتظار أوركيد فارغ",
+
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "النوع",
+
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "الوصف",
-  "person.page.orcid.sync-queue.table.header.action": "صنع",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "إجراء",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
   "person.page.orcid.sync-queue.description.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
   "person.page.orcid.sync-queue.description.country": "البلد",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
   "person.page.orcid.sync-queue.description.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
   "person.page.orcid.sync-queue.description.external_ids": "معرفات خارجية",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
   "person.page.orcid.sync-queue.description.other_names": "أسماء أخرى",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
   "person.page.orcid.sync-queue.description.qualification": "المؤهلات",
-  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحثين",
-  "person.page.orcid.sync-queue.description.keywords": "الكلمات الرئيسية",
-  "person.page.orcid.sync-queue.tooltip.insert": "إضافة حجم جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "عناوين URL للباحث",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "كلمات رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "إضافة إدخال جديد في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.update": "تحديث هذا الإدخال في سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.delete": "إزالة هذا الإدخال من سجل أوركيد",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
   "person.page.orcid.sync-queue.tooltip.publication": "النشر",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
   "person.page.orcid.sync-queue.tooltip.project": "المشروع",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
   "person.page.orcid.sync-queue.tooltip.affiliation": "الانتسابات",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
   "person.page.orcid.sync-queue.tooltip.education": "التعليم",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
   "person.page.orcid.sync-queue.tooltip.qualification": "المؤهل",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
   "person.page.orcid.sync-queue.tooltip.other_names": "اسم آخر",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
   "person.page.orcid.sync-queue.tooltip.country": "البلد",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
   "person.page.orcid.sync-queue.tooltip.keywords": "كلمة رئيسية",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
   "person.page.orcid.sync-queue.tooltip.external_ids": "معرف خارجي",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "عنوان URL للباحث",
-  "person.page.orcid.sync-queue.send": "النت مع سجل أوركيد",
-  "person.page.orcid.sync-queue.send.unauthorized-error.title": "فشل تقديم أوركيد بسبب عيوب التراخيص.",
-  "person.page.orcid.sync-queue.send.unauthorized-error.content": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. ",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "المزامنة مع سجل أوركيد",
+
+  // "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": "فشل التقديم إلى أوركيد بسبب نقص تصاريح.",
+
+  // "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": "انقر <a href='{{orcid}}'>هنا</a> لمنح الصلاحيات المطلوبة مرة أخرى. إذا استمرت المشكلة، يرجى الاتصال بالمسؤول",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد الذي تم إرساله إلى سجل أوركيد غير صالح",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
   "person.page.orcid.sync-queue.send.error": "فشل التقديم إلى أوركيد",
-  "person.page.orcid.sync-queue.send.conflict-error": "فشل تقديم أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
-  "person.page.orcid.sync-queue.send.not-found-warning": "لم يعد موردًا موجودًا في سجل أوركيد.",
-  "person.page.orcid.sync-queue.send.success": "تم التقديم إلى أوركيد الفعال",
+
+  // "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": "فشل التقديم إلى أوركيد لأن المورد موجود بالفعل في سجل أوركيد",
+
+  // "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": "لم يعد المورد موجودًا في سجل أوركيد.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "تم اكتمال التقديم إلى أوركيد بنجاح",
+
+  // "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": "البيانات التي تريد مزامنتها مع أوركيد غير صالحة",
-  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "العملة الورقية المطلوبة",
-  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "يلزم المورد إرساله معرفًا جديدًا على الأقل",
+
+  // "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": "عملة المبلغ مطلوبة",
+
+  // "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": "يتطلب المورد المراد إرساله معرفًا واحدًا على الأقل",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
   "person.page.orcid.sync-queue.send.validation-error.title.required": "العنوان مطلوب",
+
+  // "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": "dc.type مطلوب",
-  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "تاريخ البدلة مطلوب",
+
+  // "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": "تاريخ البد مطلوب",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
   "person.page.orcid.sync-queue.send.validation-error.funder.required": "الممول مطلوب",
+
+  // "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": "كود البلد المكون من رقمين ISO 3166 غير صالح",
-  "person.page.orcid.sync-queue.send.validation-error.organization.required": "مؤسسة مطلوبة",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "المؤسسة مطلوبة",
+
+  // "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": "اسم المؤسسة مطلوب",
+
+  // "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": "يجب أن يكون تاريخ النشر بعد سنة واحدة من عام 1900",
-  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "الطلبات التي تقوم المؤسسة بإرسالها عنواناً",
-  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "مطلوب عنوان المؤسسة المراد نقلها لمدينة",
-  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "يلزم عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "مطلوب معرف لتوضيح المنظمة. ",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "المتطلبات المعرفية للهيئة",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "المتطلبات المعرفية المؤسسة مصدراً",
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "مصدر أحد المؤسسات المعرفية غير الصالحة. ",
-  "person.page.orcid.synchronization-mode": "وضع النوارس",
+
+  // "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": "تتطلب المؤسسة التي سيتم إرسالها عنواناً",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها مدينة",
+
+  // "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": "يتطلب عنوان المؤسسة المراد إرسالها رقمين صالحين وفقًا لمعايير ISO 3166",
+
+  // "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": "مطلوب معرف لتوضيح المؤسسات. المعرفات المدعومة هي GRID وRinggold ومعرفات الكينونات القانونية (LEIs) ومعرفات سجل Crossref Funder",
+
+  // "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": "تتطلب معرفات المؤسسة قيمة",
+
+  // "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": "تتطلب معرفات المؤسسة مصدراً",
+
+  // "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": "مصدر أحد معرفات المؤسسة غير صالح. المصادر المدعومة هي RINGGOLD وGRID وLEI وFUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "وضع المزامنة",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
   "person.page.orcid.synchronization-mode.batch": "دفعة",
-  "person.page.orcid.synchronization-mode.label": "وضع النوارس",
-  "person.page.orcid.synchronization-mode-message": "يرجى تحديد الطريقة التي تريد أن تتم من خلالها تشغيل النت مع أوركيد. ",
-  "person.page.orcid.synchronization-mode-funding-message": "حدد ما إذا كنت ترغب في استكمال الدراسة في كينونات المشروع، ثم قم بإدراج المعلومات الخاصة بالتمويل الخاص بشركة أوركيد الخاصة بك.",
-  "person.page.orcid.synchronization-mode-publication-message": "حدد ما إذا كنت ترغب في ترك كينونات ترغب في قائمة أعمال تسجيل أوركيد الخاصة بك.",
-  "person.page.orcid.synchronization-mode-profile-message": "حدد ما إذا كنت تريد إرسال بياناتك الشخصية أو معرفاتك الشخصية إلى تسجيل أوركيد الخاص بك.",
-  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات الروبوت الفعالة",
-  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات الناقلات",
-  "person.page.orcid.synchronization-mode.manual": "يدويا",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "وضع المزامنة",
+
+  // "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": "يرجى تحديد الطريقة التي تريد أن تتم بها المزامنة مع أوركيد. تتضمن الخيارات \"يدوي\" (يجب عليك إرسال بياناتك إلى أوركيد يدوياً)، أو \"بالدفعة\" (سيقوم النظام بإرسال بياناتك إلى أوركيد عبر برنامج نصي مجدول).",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات المشروع المرتبطة إلى قائمة معلومات التمويل الخاصة بتسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال كينونات النشر المرتبطة إلى قائمة أعمال تسجيلة أوركيد الخاصة بك.",
+
+  // "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": "حدد ما إذا كنت تريد إرسال بياناتات الشخصية أو معرفاتك الشخصية إلى تسجيلة أوركيد الخاصة بك.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "تم تحديث إعدادات المزامنة بنجاح",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "فشل تحديث إعدادات المزامنة",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "يدوي",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
   "person.page.orcid.scope.authenticate": "احصل على معرف أوركيد الخاص بك",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
   "person.page.orcid.scope.read-limited": "اقرأ معلوماتك مع ضبط مستوى الرؤية للأطراف الموثوقة",
-  "person.page.orcid.scope.activities-update": "إضافة/تحديث الدراسات الخاصة بك",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "إضافة/تحديث الأنشطة البحثية الخاصة بك",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
   "person.page.orcid.scope.person-update": "إضافة/تحديث معلومات أخرى عنك",
-  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وأوركيد فعال",
-  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وأوركيد. ",
-  "person.orcid.sync.setting": "إعدادات نوبات أوركيد",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "تم قطع الاتصال بين الملف الشخصي وسجل أوركيد بنجاح",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "حدث خطأ أثناء قطع الاتصال بين الملف الشخصي وسجل أوركيد. يرجى إعادة المحاولة",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "إعدادات مزامنة أوركيد",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
   "person.orcid.registry.queue": "قائمة انتظار سجل أوركيد",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "تصاريح أوركيد",
-  "home.recent-submissions.head": "أحدث العروض",
-  "listable-notification-object.default-message": "تعذر على تجديد هذا",
-  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء حذف التنبيه على النظام",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "أحدث التقديمات",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "تعذر استرداد هذا الكائن",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "حدث خطأ أثناء استرداد شعار التنبيه على مستوى النظام",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
   "system-wide-alert-banner.countdown.prefix": "خلال",
-  "system-wide-alert-banner.countdown.days": "{{days}} يوما,",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} يوماً,",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
   "system-wide-alert-banner.countdown.hours": "{{hours}} ساعة و",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} دقيقة:",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "تنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
   "system-wide-alert.form.header": "تنبيه على مستوى النظام",
-  "system-wide-alert-form.retrieval.error": "حدث ما خطأ أثناء تحديث التنبيه على النظام",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "حدث خطأ ما أثناء استرداد التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.cancel": "Cancel",
   "system-wide-alert.form.cancel": "إلغاء",
+
+  // "system-wide-alert.form.save": "Save",
   "system-wide-alert.form.save": "حفظ",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
   "system-wide-alert.form.label.active": "نشط",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
   "system-wide-alert.form.label.inactive": "غير نشط",
-  "system-wide-alert.form.error.message": "يجب أن يحتوي على تنبيه على النظام على رسالة",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "يجب أن يحتوي التنبيه على مستوى النظام على رسالة",
+
+  // "system-wide-alert.form.label.message": "Alert message",
   "system-wide-alert.form.label.message": "رسالة تنبيه",
-  "system-wide-alert.form.label.countdownTo.enable": "تفعيل تقويم التاريخ",
-  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط توقيت تقويم التقويم. ",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "تفعيل مؤقت العد التنازلي",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "تلميح: قم بضبط مؤقت العد التنازلي. عند التفعيل، يمكن تعيين تاريخ في المستقبل وسيقوم شعار التنبيه على مستوى النظام بإجراء العد التنازلي للتاريخ المحدد. عندما ينتهي هذا المؤقت، سوف يختفي من التنبيه. لن يتم إيقاف الخادم تلقائياً.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
   "system-wide-alert-form.select-date-by-calendar": "حدد التاريخ باستخدام التقويم",
-  "system-wide-alert.form.label.preview": "معاينة التنبيه على النظام",
-  "system-wide-alert.form.update.success": "تم تحديث التنبيه على النظام الفعال",
-  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على النظام",
-  "system-wide-alert.form.create.success": "تم إنشاء تنبيه على النظام الفعال",
-  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء تنبيه على النظام",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "معاينة التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "تم تحديث التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "حدث خطأ ما أثناء تحديث التنبيه على مستوى النظام",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "تم إنشاء التنبيه على مستوى النظام بنجاح",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "حدث خطأ ما أثناء إنشاء التنبيه على مستوى النظام",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
   "admin.system-wide-alert.breadcrumbs": "تنبيهات على مستوى النظام",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "تنبيهات على مستوى النظام",
-  "discover.filters.head": "يكتشف",
-  "item-access-control-title": "يتيح لك هذا النموذج عمل التغيرات في شروط الوصول إلى مادة ميتا أو تدفقات محددة خاصة بها.",
-  "collection-access-control-title": "يتيح لك هذا النموذج إجراء التغيرات في شروط الوصول لكل المواد المملوكة لهذه المجموعة. ",
-  "community-access-control-title": "يتيح لك هذا النموذج إجراء التغيرات في شروط الوصول لكل المواد المملوكة للمجموعة ضمن هذا المجتمع. ",
-  "access-control-item-header-toggle": "مادة ميتاداتا",
-  "access-control-item-toggle.enable": "تفعيل خيار عمل الخيارات على ميتاداتا المادة",
-  "access-control-item-toggle.disable": "السؤال الآن هو: القدرة على إحداث تغييرات على مادة ميتابادتا",
+
+  // "discover.filters.head": "Discover",
+  // TODO New key - Add a translation
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول إلى ميتاداتا المادة أو تدفقات البت الخاصة بها.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لهذه المجموعة. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "يتيح لك هذا النموذج إجراء تغييرات على شروط الوصول لكل المواد المملوكة لأي مجموعة ضمن هذا المجتمع. قد يتم إجراء التغييرات إما على كل ميتاداتا المادة أو على المحتوى بأكمله (تدفقات البت).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "ميتاداتا المادة",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "تفعيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "تعطيل خيار إجراء تغييرات على ميتاداتا المادة",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
   "access-control-bitstream-header-toggle": "تدفقات البت",
-  "access-control-bitstream-toggle.enable": "تفعيل خيار خيارات على تدفقات البت",
-  "access-control-bitstream-toggle.disable": "مطلوب خيار إجراء تغييرات على تدفقات البت",
-  "access-control-mode": "وضع",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "تفعيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "تعطيل خيار إجراء تغييرات على تدفقات البت",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
   "access-control-access-conditions": "شروط الوصول",
-  "access-control-no-access-conditions-warning-message": "في الوقت الحالي، لم يتم تحديد أي شروط الوصول أدناه. ",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "في الوقت الراهن، لم يتم تحديد أي شروط وصول أدناه. عند التنفيذ، سيتم استبدال شروط الوصول الحالية بشروط الوصول الافتراضية الموروثة من المجموعة المالكة.",
+
+  // "access-control-replace-all": "Replace access conditions",
   "access-control-replace-all": "استبدل شروط الوصول",
+
+  // "access-control-add-to-existing": "Add to existing ones",
   "access-control-add-to-existing": "إضافة إلى الموجود",
-  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بتجميلة",
-  "access-control-process-all-bitstreams": "تحديد كل التدفقات الواضحة في المادة",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "قصر التغييرات على تدفقات بت معينة",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "تحديد كل تدفقات البت في المادة",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
   "access-control-bitstreams-selected": "تم تحديد تدفقات البت",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
   "access-control-bitstreams-select": "حدد تدفقات البت",
+
+  // "access-control-cancel": "Cancel",
   "access-control-cancel": "إلغاء",
+
+  // "access-control-execute": "Execute",
   "access-control-execute": "تنفيذ",
+
+  // "access-control-add-more": "Add more",
   "access-control-add-more": "إضافة المزيد",
+
+  // "access-control-remove": "Remove access condition",
   "access-control-remove": "إزالة شرط الوصول",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
   "access-control-select-bitstreams-modal.title": "حدد تدفقات البت",
-  "access-control-select-bitstreams-modal.no-items": "لا يوجد شيء.",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "لا توجد مواد.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
   "access-control-select-bitstreams-modal.close": "إلغاء",
+
+  // "access-control-option-label": "Access condition type",
   "access-control-option-label": "نوع شرط الوصول",
-  "access-control-option-note": "اختر شرط وصول لتطبيقه على المواد المحددة.",
-  "access-control-option-start-date": "أمنح من الوصول",
-  "access-control-option-start-date-note": "قم بتسجيل التاريخ الذي يبدأ منه تطبيق شرط ذي الوصول ذي الصلة",
-  "access-control-option-end-date": "أمنح حتى الوصول",
-  "access-control-option-end-date-note": "يجب البدء بالتاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى أوله",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "اختر شرط وصول لتطبيقه على الكائنات المحددة.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "منح الوصول من",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "قم بتحديد التاريخ الذي يبدأ منه تطبيق شرط الوصول ذي الصلة",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "منح الوصول حتى",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "قم بتحديد التاريخ الذي سيتم تطبيق شرط الوصول ذي الصلة حتى بلوغه",
+
+  // "vocabulary-treeview.search.form.add": "Add",
   "vocabulary-treeview.search.form.add": "إضافة",
-  "admin.notifications.publicationclaim.breadcrumbs": "لكي بالنشر",
-  "admin.notifications.publicationclaim.page.title": "لكي بالنشر",
-  "filter.search.operator.placeholder": "لها",
-  "search.filters.filter.entityType.text": "نوع الفرن",
-  "search.filters.operator.equals.text": "يساوي",
-  "search.filters.operator.notequals.text": "لا يساوي",
-  "search.filters.operator.notcontains.text": "لا يحتوي على",
-  "search.filters.operator.contains.text": "يحتوي على",
-  "search.filters.filter.title.text": "عنوان العنوان",
-  "search.filters.applied.f.title": "عنوان العنوان",
-  "search.filters.filter.author.text": "المؤلف",
-  "coar-notify-support.title": "COAR التمهيدي",
-  "coar-notify-support-title.content": "هنا، نحن ندعم بشكل كامل بروتوكول COAR Notify، المصمم لتعزيز الاتصال بين المستودعات.  <a href=\\\"https://notify.coar-repositories.org/\\\">موقع إخطار COAR</a>.",
-  "coar-notify-support.ldn-inbox.title": "صندوق LDN بريد",
-  "coar-notify-support.ldn-inbox.content": "من أجل راحتك، يمكن الوصول بسهولة إلى صندوق الوارد الخاص بـ LDN (إشعارات البيانات المرتبطة) على {ldnInboxUrl}. ",
-  "coar-notify-support.message-moderation.title": "الإشراف على الرسالة",
-  "coar-notify-support.message-moderation.content": "ولتوفير بيئة آمنة ومنتجة، يتم مراقبة جميع الرسائل. ",
-  "coar-notify-support.message-moderation.feedback-form": " دفتر نموذج.",
-  "service.overview.delete.header": "حذف الخدمة",
-  "ldn-registered-services.title": "الخدمات المميزة",
-  "ldn-registered-services.table.name": "الاسم",
-  "ldn-registered-services.table.description": "الوصف",
-  "ldn-registered-services.table.status": "الحالة",
-  "ldn-registered-services.table.action": "فعل",
-  "ldn-registered-services.new": "جديد",
-  "ldn-registered-services.new.breadcrumbs": "الخدمات المميزة",
-  "ldn-service.overview.table.enabled": "ممكن",
-  "ldn-service.overview.table.disabled": "ه",
-  "ldn-service.overview.table.clickToEnable": "انقر للتمكين",
-  "ldn-service.overview.table.clickToDisable": "انقر للتعطيل",
-  "ldn-edit-registered-service.title": "تحرير الخدمة",
-  "ldn-create-service.title": "إنشاء الخدمة",
-  "service.overview.create.modal": "إنشاء الخدمة",
-  "service.overview.create.body": "الرجاء التأكيد على إنشاء هذه الخدمة.",
-  "ldn-service-status": "الحالة",
-  "service.confirm.create": "إنشاء",
-  "service.refuse.create": "إلغاء",
-  "ldn-register-new-service.title": "تسجيل خدمة جديدة",
-  "ldn-new-service.form.label.submit": "حفظ",
-  "ldn-new-service.form.label.name": "اسم",
-  "ldn-new-service.form.label.description": "الوصف",
-  "ldn-new-service.form.label.url": "عنوان URL للخدمة",
-  "ldn-new-service.form.label.ip-range": "لخدمة نطاق IP",
-  "ldn-new-service.form.label.score": "مستوى الثقة",
-  "ldn-new-service.form.label.ldnUrl": "عنوان URL لصندوق بريد LDN",
-  "ldn-new-service.form.placeholder.name": "يرجى تقديم اسم الخدمة",
-  "ldn-new-service.form.placeholder.description": "يرجى تقديم وصف بخصوص خدمتك",
-  "ldn-new-service.form.placeholder.url": "يرجى إدخال عنوان URL للمستخدمين للتحقق من مزيد من المعلومات حول الخدمة",
-  "ldn-new-service.form.placeholder.lowerIp": "نطاق IPv4 الحد الأدنى",
-  "ldn-new-service.form.placeholder.upperIp": "نطاق IPv4 الحد الأعلى",
-  "ldn-new-service.form.placeholder.ldnUrl": "يرجى تحديد عنوان URL لصندوق LDN الوارد",
-  "ldn-new-service.form.placeholder.score": "الرجاء إدخال قيمة بين 0 و1. استخدم \".\" ",
-  "ldn-service.form.label.placeholder.default-select": "حدد نمطًا",
-  "ldn-service.form.pattern.ack-accept.label": "الاعتراف والقبول",
-  "ldn-service.form.pattern.ack-accept.description": "يستخدم هذا النمط للإقرار بالطلب (العرض) وقبوله. ",
-  "ldn-service.form.pattern.ack-accept.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-reject.label": "الاعتراف والرفض",
-  "ldn-service.form.pattern.ack-reject.description": "يستخدم هذا النمط للإقرار بالطلب (العرض) ورفضه. ",
-  "ldn-service.form.pattern.ack-reject.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-tentative-accept.label": "الإقرار والقبول مبدئيا",
-  "ldn-service.form.pattern.ack-tentative-accept.description": "يُستخدم هذا النمط للإقرار بالطلب (العرض) وقبوله مبدئيًا. ",
-  "ldn-service.form.pattern.ack-tentative-accept.category": "شكر وتقدير",
-  "ldn-service.form.pattern.ack-tentative-reject.label": "الاعتراف والرفض مبدئيا",
-  "ldn-service.form.pattern.ack-tentative-reject.description": "يُستخدم هذا النمط للإقرار بالطلب (العرض) ورفضه مبدئيًا. ",
-  "ldn-service.form.pattern.ack-tentative-reject.category": "شكر وتقدير",
-  "ldn-service.form.pattern.announce-endorsement.label": "إعلان المصادقة",
-  "ldn-service.form.pattern.announce-endorsement.description": "يُستخدم هذا النمط للإعلان عن وجود تأييد، مع الإشارة إلى المورد المعتمد.",
-  "ldn-service.form.pattern.announce-endorsement.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-ingest.label": "أعلن عن استيعاب",
-  "ldn-service.form.pattern.announce-ingest.description": "يُستخدم هذا النمط للإعلان عن استيعاب أحد الموارد.",
-  "ldn-service.form.pattern.announce-ingest.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-relationship.label": "أعلن عن العلاقة",
-  "ldn-service.form.pattern.announce-relationship.description": "يُستخدم هذا النمط للإعلان عن وجود علاقة بين مصدرين.",
-  "ldn-service.form.pattern.announce-relationship.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-review.label": "الإعلان عن المراجعة",
-  "ldn-service.form.pattern.announce-review.description": "يُستخدم هذا النمط للإعلان عن وجود مراجعة، مع الإشارة إلى المورد الذي تمت مراجعته.",
-  "ldn-service.form.pattern.announce-review.category": "الإعلانات",
-  "ldn-service.form.pattern.announce-service-result.label": "الإعلان عن نتيجة الخدمة",
-  "ldn-service.form.pattern.announce-service-result.description": "يُستخدم هذا النمط للإعلان عن وجود \"نتيجة خدمة\"، مع الإشارة إلى المورد ذي الصلة.",
-  "ldn-service.form.pattern.announce-service-result.category": "الإعلانات",
-  "ldn-service.form.pattern.request-endorsement.label": "طلب المصادقة",
-  "ldn-service.form.pattern.request-endorsement.description": "يُستخدم هذا النمط لطلب المصادقة على مورد مملوك للنظام الأصلي.",
-  "ldn-service.form.pattern.request-endorsement.category": "الطلبات",
-  "ldn-service.form.pattern.request-ingest.label": "طلب استيعاب",
-  "ldn-service.form.pattern.request-ingest.description": "يُستخدم هذا النمط لمطالبة النظام المستهدف باستيعاب أحد الموارد.",
-  "ldn-service.form.pattern.request-ingest.category": "الطلبات",
-  "ldn-service.form.pattern.request-review.label": "طلب مراجعة",
-  "ldn-service.form.pattern.request-review.description": "يُستخدم هذا النمط لطلب مراجعة أحد الموارد المملوكة للنظام الأصلي.",
-  "ldn-service.form.pattern.request-review.category": "الطلبات",
-  "ldn-service.form.pattern.undo-offer.label": "التراجع عن العرض",
-  "ldn-service.form.pattern.undo-offer.description": "يُستخدم هذا النمط للتراجع عن (سحب) عرض تم تقديمه مسبقًا.",
-  "ldn-service.form.pattern.undo-offer.category": "الغاء التحميل",
-  "ldn-new-service.form.label.placeholder.selectedItemFilter": "لم يتم تحديد أي عنصر تصفية",
-  "ldn-new-service.form.label.ItemFilter": "عامل تصفية العنصر",
-  "ldn-new-service.form.label.automatic": "تلقائي",
-  "ldn-new-service.form.error.name": "مطلوب اسم",
-  "ldn-new-service.form.error.url": "عنوان URL مطلوب",
-  "ldn-new-service.form.error.ipRange": "الرجاء إدخال نطاق IP صالح",
-  "ldn-new-service.form.hint.ipRange": "الرجاء إدخال IPV4 صالح في كلا النطاقين (ملاحظة: بالنسبة لعنوان IP واحد، يرجى إدخال نفس القيمة في كلا الحقلين)",
-  "ldn-new-service.form.error.ldnurl": "عنوان URL لـ LDN مطلوب",
-  "ldn-new-service.form.error.patterns": "مطلوب نمط على الأقل",
-  "ldn-new-service.form.error.score": "الرجاء إدخال نتيجة صحيحة (بين 0 و1). ",
-  "ldn-new-service.form.label.inboundPattern": "النمط الوارد",
-  "ldn-new-service.form.label.addPattern": "+ أضف المزيد",
-  "ldn-new-service.form.label.removeItemFilter": "يزيل",
-  "ldn-register-new-service.breadcrumbs": "خدمة جديدة",
-  "service.overview.delete.body": "هل أنت متأكد أنك تريد حذف هذه الخدمة؟",
-  "service.overview.edit.body": "هل تؤكد التغييرات؟",
-  "service.overview.edit.modal": "تحرير الخدمة",
-  "service.detail.update": "يتأكد",
-  "service.detail.return": "يلغي",
-  "service.overview.reset-form.body": "هل أنت متأكد أنك تريد تجاهل التغييرات والمغادرة؟",
-  "service.overview.reset-form.modal": "تجاهل التغييرات",
-  "service.overview.reset-form.reset-confirm": "ينبذ",
-  "admin.registries.services-formats.modify.success.head": "تحرير ناجح",
-  "admin.registries.services-formats.modify.success.content": "تم تعديل الخدمة",
-  "admin.registries.services-formats.modify.failure.head": "فشل التحرير",
-  "admin.registries.services-formats.modify.failure.content": "لم يتم تحرير الخدمة",
-  "ldn-service-notification.created.success.title": "إنشاء ناجح",
-  "ldn-service-notification.created.success.body": "تم إنشاء الخدمة",
-  "ldn-service-notification.created.failure.title": "فشل الإنشاء",
-  "ldn-service-notification.created.failure.body": "لم يتم إنشاء الخدمة",
-  "ldn-service-notification.created.warning.title": "الرجاء تحديد نمط وارد واحد على الأقل",
-  "ldn-enable-service.notification.success.title": "تم تحديث الحالة بنجاح",
-  "ldn-enable-service.notification.success.content": "تم تحديث حالة الخدمة",
-  "ldn-service-delete.notification.success.title": "تم الحذف بنجاح",
-  "ldn-service-delete.notification.success.content": "تم حذف الخدمة",
-  "ldn-service-delete.notification.error.title": "فشل الحذف",
-  "ldn-service-delete.notification.error.content": "لم يتم حذف الخدمة",
-  "service.overview.reset-form.reset-return": "يلغي",
-  "service.overview.delete": "حذف الخدمة",
-  "ldn-edit-service.title": "تحرير الخدمة",
-  "ldn-edit-service.form.label.name": "اسم",
-  "ldn-edit-service.form.label.description": "وصف",
-  "ldn-edit-service.form.label.url": "عنوان URL للخدمة",
-  "ldn-edit-service.form.label.ldnUrl": "عنوان URL لصندوق بريد LDN",
-  "ldn-edit-service.form.label.inboundPattern": "النمط الوارد",
-  "ldn-edit-service.form.label.noInboundPatternSelected": "لا يوجد نمط وارد",
-  "ldn-edit-service.form.label.selectedItemFilter": "عامل تصفية العنصر المحدد",
-  "ldn-edit-service.form.label.selectItemFilter": "لا يوجد عامل تصفية للعناصر",
-  "ldn-edit-service.form.label.automatic": "تلقائي",
-  "ldn-edit-service.form.label.addInboundPattern": "+ أضف المزيد",
-  "ldn-edit-service.form.label.submit": "يحفظ",
-  "ldn-edit-service.breadcrumbs": "تحرير الخدمة",
-  "ldn-service.control-constaint-select-none": "لا تختر شيء",
-  "ldn-register-new-service.notification.error.title": "خطأ",
-  "ldn-register-new-service.notification.error.content": "حدث خطأ أثناء إنشاء هذه العملية",
-  "ldn-register-new-service.notification.success.title": "نجاح",
-  "ldn-register-new-service.notification.success.content": "تم إنشاء العملية بنجاح",
-  "submission.sections.notify.info": "الخدمة المحددة متوافقة مع العنصر وفقًا لحالته الحالية. {{ service.name }}: {{ service.description }}",
-  "item.page.endorsement": "تَأيِيد",
-  "item.page.review": "مراجعة",
-  "item.page.dataset": "مجموعة البيانات",
-  "menu.section.icon.ldn_services": "نظرة عامة على خدمات LDN",
-  "menu.section.services": "خدمات LDN",
-  "menu.section.services_new": "خدمة LDN",
-  "quality-assurance.topics.description-with-target": "أدناه يمكنك رؤية جميع المواضيع الواردة من الاشتراكات في {{source}} فيما يتعلق ب",
-  "quality-assurance.events.description": "هناك أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع للبحث.",
-  "quality-assurance.events.description-with-topic-and-target": "أسفل القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد <b>{{topic}}</b>، متعلق ب <b>{{source}}</b> و ",
-  "quality-assurance.event.table.event.message.serviceUrl": "عنوان الخدمة:",
-  "quality-assurance.event.table.event.message.link": "وصلة:",
-  "service.detail.delete.cancel": "يلغي",
-  "service.detail.delete.button": "حذف الخدمة",
-  "service.detail.delete.header": "حذف الخدمة",
-  "service.detail.delete.body": "هل أنت متأكد أنك تريد حذف الخدمة الحالية؟",
-  "service.detail.delete.confirm": "حذف الخدمة",
-  "service.detail.delete.success": "تم حذف الخدمة بنجاح.",
-  "service.detail.delete.error": "حدث خطأ ما عند حذف الخدمة",
-  "service.overview.table.id": "معرف الخدمات",
-  "service.overview.table.name": "اسم",
-  "service.overview.table.start": "وقت البدء (التوقيت العالمي المنسق)",
-  "service.overview.table.status": "حالة",
-  "service.overview.table.user": "مستخدم",
-  "service.overview.title": "نظرة عامة للخدمات",
-  "service.overview.breadcrumbs": "نظرة عامة للخدمات",
-  "service.overview.table.actions": "أجراءات",
-  "service.overview.table.description": "وصف",
-  "submission.sections.submit.progressbar.coarnotify": "إخطار COAR",
-  "submission.section.section-coar-notify.control.request-review.label": "يمكنك طلب مراجعة لإحدى الخدمات التالية",
-  "submission.section.section-coar-notify.control.request-endorsement.label": "يمكنك طلب المصادقة على إحدى المجلات المتراكبة التالية",
-  "submission.section.section-coar-notify.control.request-ingest.label": "يمكنك طلب استيعاب نسخة من طلبك إلى إحدى الخدمات التالية",
-  "submission.section.section-coar-notify.dropdown.no-data": "لا تتوافر بيانات",
-  "submission.section.section-coar-notify.dropdown.select-none": "لا تختر شيء",
-  "submission.section.section-coar-notify.small.notification": "اختر خدمة ل {{ pattern }} من هذا البند",
-  "submission.section.section-coar-notify.selection.description": "وصف الخدمة المختارة:",
-  "submission.section.section-coar-notify.selection.no-description": "لا تتوفر المزيد من المعلومات",
-  "submission.section.section-coar-notify.notification.error": "الخدمة المحددة غير مناسبة للعنصر الحالي. ",
-  "submission.section.section-coar-notify.info.no-pattern": "لم يتم العثور على أنماط قابلة للتكوين.",
-  "error.validation.coarnotify.invalidfilter": "عامل التصفية غير صالح، حاول تحديد خدمة أخرى أو لا شيء.",
-  "request-status-alert-box.accepted": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> وقد تم توليه المسؤولية.",
-  "request-status-alert-box.rejected": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> وقد رفض.",
-  "request-status-alert-box.requested": "المطلوب {{ offerType }} ل <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> معلق.",
-  "ldn-service-button-mark-inbound-deletion": "وضع علامة على النمط الوارد للحذف",
-  "ldn-service-button-unmark-inbound-deletion": "قم بإلغاء تحديد النمط الوارد للحذف",
-  "ldn-service-input-inbound-item-filter-dropdown": "حدد عامل تصفية العنصر للنمط الوارد",
-  "ldn-service-input-inbound-pattern-dropdown": "حدد النمط الوارد للخدمة",
-  "ldn-service-overview-select-delete": "اختر الخدمة للحذف",
-  "ldn-service-overview-select-edit": "تحرير خدمة LDN",
-  "ldn-service-overview-close-modal": "إغلاق مشروط",
-  "a-common-or_statement.label": "نوع العنصر هو مقالة يومية أو مجموعة بيانات",
-  "always_true_filter.label": "دائما صحيح او صادق",
-  "automatic_processing_collection_filter_16.label": "المعالجة التلقائية",
-  "dc-identifier-uri-contains-doi_condition.label": "يحتوي URI على DOI",
-  "doi-filter.label": "مرشح DOI",
-  "driver-document-type_condition.label": "نوع المستند يساوي السائق",
-  "has-at-least-one-bitstream_condition.label": "يحتوي على Bitstream واحد على الأقل",
-  "has-bitstream_filter.label": "لديه تيار البت",
-  "has-one-bitstream_condition.label": "لديه Bitstream واحد",
-  "is-archived_condition.label": "تمت أرشفته",
-  "is-withdrawn_condition.label": "تم سحبه",
-  "item-is-public_condition.label": "العنصر عام",
-  "journals_ingest_suggestion_collection_filter_18.label": "استيعاب المجلات",
-  "title-starts-with-pattern_condition.label": "يبدأ العنوان بالنمط",
-  "type-equals-dataset_condition.label": "النوع يساوي مجموعة البيانات",
-  "type-equals-journal-article_condition.label": "النوع يساوي مقالة يومية",
-  "search.filters.filter.subject.text": "موضوع",
-  "search.advanced.filters.head": "البحث المتقدم",
-  "filter.search.text.placeholder": "بحث في النص",
-  "advancesearch.form.submit": "يضيف",
-  "ldn.no-filter.label": "لا أحد",
-  "admin.notify.dashboard": "لوحة القيادة",
-  "menu.section.notify_dashboard": "لوحة القيادة",
-  "menu.section.coar_notify": "إخطار COAR",
-  "admin-notify-dashboard.title": "لوحة الإخطار",
-  "admin-notify-dashboard.description": "تراقب لوحة معلومات Notify الاستخدام العام لبروتوكول COAR Notify عبر المستودع. ",
-  "admin-notify-dashboard.metrics": "المقاييس",
-  "admin-notify-dashboard.received-ldn": "عدد LDN المستلم",
-  "admin-notify-dashboard.generated-ldn": "عدد LDN الذي تم إنشاؤه",
-  "admin-notify-dashboard.NOTIFY.incoming.accepted": "قبلت",
-  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "الإخطارات الواردة المقبولة",
-  "admin-notify-logs.NOTIFY.incoming.accepted": "يعرض حاليا: الإخطارات المقبولة",
-  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN المعالجة",
-  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "معالجة الإخطارات الواردة",
-  "admin-notify-logs.NOTIFY.incoming.processed": "المعروض حاليا: LDN المعالج",
-  "admin-notify-logs.NOTIFY.incoming.failure": "المعروض حاليًا: الإشعارات الفاشلة",
-  "admin-notify-dashboard.NOTIFY.incoming.failure": "فشل",
-  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "فشل الإخطارات الواردة",
-  "admin-notify-logs.NOTIFY.outgoing.failure": "المعروض حاليًا: الإشعارات الفاشلة",
-  "admin-notify-dashboard.NOTIFY.outgoing.failure": "فشل",
-  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "فشل الإخطارات الصادرة",
-  "admin-notify-logs.NOTIFY.incoming.untrusted": "المعروض حاليًا: إشعارات غير موثوقة",
-  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "غير موثوق به",
-  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "الإخطارات الواردة غير موثوق بها",
-  "admin-notify-logs.NOTIFY.incoming.delivered": "المعروض حاليًا: الإخطارات التي تم تسليمها",
-  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "تم تسليم الإشعارات الواردة بنجاح",
-  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "تم التوصيل",
-  "admin-notify-logs.NOTIFY.outgoing.delivered": "المعروض حاليًا: الإخطارات التي تم تسليمها",
-  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "تم تسليم الإخطارات الصادرة بنجاح",
-  "admin-notify-logs.NOTIFY.outgoing.queued": "المعروض حاليًا: الإشعارات في قائمة الانتظار",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "الإخطارات في قائمة الانتظار حاليا",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued": "في قائمة الانتظار",
-  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "يتم العرض حاليًا: في قائمة الانتظار لإعادة محاولة الإشعارات",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "في قائمة الانتظار لإعادة المحاولة",
-  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "الإخطارات في قائمة الانتظار حاليا لإعادة المحاولة",
-  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "العناصر المعنية",
-  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "العناصر المتعلقة بالإخطارات الواردة",
-  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "العناصر المعنية",
-  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "العناصر المتعلقة بالإخطارات الصادرة",
-  "admin.notify.dashboard.breadcrumbs": "لوحة القيادة",
-  "admin.notify.dashboard.inbound": "الرسائل الواردة",
-  "admin.notify.dashboard.inbound-logs": "السجلات/الواردة",
-  "admin.notify.dashboard.filter": "منقي: ",
-  "search.filters.applied.f.relateditem": "الأصناف المتعلقة",
-  "search.filters.applied.f.ldn_service": "خدمة LDN",
-  "search.filters.applied.f.notifyReview": "إخطار المراجعة",
-  "search.filters.applied.f.notifyEndorsement": "إخطار المصادقة",
-  "search.filters.applied.f.notifyRelation": "إخطار العلاقة",
-  "search.filters.filter.queue_last_start_time.head": "آخر وقت للمعالجة ",
-  "search.filters.filter.queue_last_start_time.min.label": "نطاق الحد الأدنى",
-  "search.filters.filter.queue_last_start_time.max.label": "أقصى مدى",
-  "search.filters.applied.f.queue_last_start_time.min": "نطاق الحد الأدنى",
-  "search.filters.applied.f.queue_last_start_time.max": "أقصى مدى",
-  "admin.notify.dashboard.outbound": "الرسائل الصادرة",
-  "admin.notify.dashboard.outbound-logs": "السجلات/الصادرة",
-  "NOTIFY.incoming.search.results.head": "وارد",
-  "search.filters.filter.relateditem.head": "البند ذو الصلة",
-  "search.filters.filter.origin.head": "أصل",
-  "search.filters.filter.ldn_service.head": "خدمة LDN",
-  "search.filters.filter.target.head": "هدف",
-  "search.filters.filter.queue_status.head": "حالة قائمة الانتظار",
-  "search.filters.filter.activity_stream_type.head": "نوع تيار النشاط",
-  "search.filters.filter.coar_notify_type.head": "نوع الإخطار COAR",
-  "search.filters.filter.notification_type.head": "نوع إعلام",
-  "search.filters.filter.relateditem.label": "البحث عن العناصر ذات الصلة",
-  "search.filters.filter.queue_status.label": "حالة قائمة انتظار البحث",
-  "search.filters.filter.target.label": "هدف البحث",
-  "search.filters.filter.activity_stream_type.label": "نوع دفق نشاط البحث",
-  "search.filters.applied.f.queue_status": "حالة قائمة الانتظار",
-  "search.filters.queue_status.0,authority": "IP غير موثوق به",
-  "search.filters.queue_status.1,authority": "في قائمة الانتظار",
-  "search.filters.queue_status.2,authority": "يعالج",
-  "search.filters.queue_status.3,authority": "تمت معالجتها",
-  "search.filters.queue_status.4,authority": "فشل",
-  "search.filters.queue_status.5,authority": "غير موثوق به",
-  "search.filters.queue_status.6,authority": "عمل غير محدد",
-  "search.filters.queue_status.7,authority": "في قائمة الانتظار لإعادة المحاولة",
-  "search.filters.applied.f.activity_stream_type": "نوع تيار النشاط",
-  "search.filters.applied.f.coar_notify_type": "نوع الإخطار COAR",
-  "search.filters.applied.f.notification_type": "نوع إعلام",
-  "search.filters.filter.coar_notify_type.label": "بحث COAR نوع الإخطار",
-  "search.filters.filter.notification_type.label": "بحث نوع الإخطار",
-  "search.filters.filter.relateditem.placeholder": "الأصناف المتعلقة",
-  "search.filters.filter.target.placeholder": "هدف",
-  "search.filters.filter.origin.label": "مصدر البحث",
-  "search.filters.filter.origin.placeholder": "مصدر",
-  "search.filters.filter.ldn_service.label": "ابحث في خدمة LDN",
-  "search.filters.filter.ldn_service.placeholder": "خدمة LDN",
-  "search.filters.filter.queue_status.placeholder": "حالة قائمة الانتظار",
-  "search.filters.filter.activity_stream_type.placeholder": "نوع تيار النشاط",
-  "search.filters.filter.coar_notify_type.placeholder": "نوع الإخطار COAR",
-  "search.filters.filter.notification_type.placeholder": "إشعار",
-  "search.filters.filter.notifyRelation.head": "إخطار العلاقة",
-  "search.filters.filter.notifyRelation.label": "بحث إخطار العلاقة",
-  "search.filters.filter.notifyRelation.placeholder": "إخطار العلاقة",
-  "search.filters.filter.notifyReview.head": "إخطار المراجعة",
-  "search.filters.filter.notifyReview.label": "بحث إخطار المراجعة",
-  "search.filters.filter.notifyReview.placeholder": "إخطار المراجعة",
-  "search.filters.coar_notify_type.coar-notify:ReviewAction": "إجراء المراجعة",
-  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "إجراء المراجعة",
-  "notify-detail-modal.coar-notify:ReviewAction": "إجراء المراجعة",
-  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "إجراء الإقرار",
-  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "إجراء الإقرار",
-  "notify-detail-modal.coar-notify:EndorsementAction": "إجراء الإقرار",
-  "search.filters.coar_notify_type.coar-notify:IngestAction": "استيعاب العمل",
-  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "استيعاب العمل",
-  "notify-detail-modal.coar-notify:IngestAction": "استيعاب العمل",
-  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "عمل العلاقة",
-  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "عمل العلاقة",
-  "notify-detail-modal.coar-notify:RelationshipAction": "عمل العلاقة",
-  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "في قائمة الانتظار",
-  "notify-detail-modal.QUEUE_STATUS_QUEUED": "في قائمة الانتظار",
-  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "في قائمة الانتظار لإعادة المحاولة",
-  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "في قائمة الانتظار لإعادة المحاولة",
-  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "يعالج",
-  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "يعالج",
-  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "تمت معالجتها",
-  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "تمت معالجتها",
-  "search.filters.queue_status.QUEUE_STATUS_FAILED": "فشل",
-  "notify-detail-modal.QUEUE_STATUS_FAILED": "فشل",
-  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "غير موثوق به",
-  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP غير موثوق به",
-  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "غير موثوق به",
-  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP غير موثوق به",
-  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "عمل غير محدد",
-  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "عمل غير محدد",
-  "sorting.queue_last_start_time.DESC": "آخر قائمة انتظار بدأت تنازليًا",
-  "sorting.queue_last_start_time.ASC": "آخر قائمة انتظار بدأت تصاعديًا",
-  "sorting.queue_attempts.DESC": "حاولت قائمة الانتظار التنازلي",
-  "sorting.queue_attempts.ASC": "حاولت قائمة الانتظار التصاعدي",
-  "NOTIFY.incoming.involvedItems.search.results.head": "العناصر المشاركة في LDN الوارد",
-  "NOTIFY.outgoing.involvedItems.search.results.head": "العناصر المشاركة في LDN الصادرة",
-  "type.notify-detail-modal": "يكتب",
-  "id.notify-detail-modal": "بطاقة تعريف",
-  "coarNotifyType.notify-detail-modal": "نوع الإخطار COAR",
-  "activityStreamType.notify-detail-modal": "نوع تيار النشاط",
-  "inReplyTo.notify-detail-modal": "ردا على",
-  "object.notify-detail-modal": "عنصر المستودع",
-  "context.notify-detail-modal": "عنصر المستودع",
-  "queueAttempts.notify-detail-modal": "محاولات قائمة الانتظار",
-  "queueLastStartTime.notify-detail-modal": "بدأت قائمة الانتظار آخر مرة",
-  "origin.notify-detail-modal": "خدمة LDN",
-  "target.notify-detail-modal": "خدمة LDN",
-  "queueStatusLabel.notify-detail-modal": "حالة قائمة الانتظار",
-  "queueTimeout.notify-detail-modal": "مهلة قائمة الانتظار",
-  "notify-message-modal.title": "تفاصيل الرسالة",
-  "notify-message-modal.show-message": "اظهر الرسالة",
-  "notify-message-result.timestamp": "الطابع الزمني",
-  "notify-message-result.repositoryItem": "عنصر المستودع",
-  "notify-message-result.ldnService": "خدمة LDN",
-  "notify-message-result.type": "يكتب",
-  "notify-message-result.status": "حالة",
-  "notify-message-result.action": "فعل",
-  "notify-message-result.detail": "التفاصيل",
-  "notify-message-result.reprocess": "إعادة المعالجة",
-  "notify-queue-status.processed": "تمت معالجتها",
-  "notify-queue-status.failed": "فشل",
-  "notify-queue-status.queue_retry": "في قائمة الانتظار لإعادة المحاولة",
-  "notify-queue-status.unmapped_action": "عمل غير معين",
-  "notify-queue-status.processing": "يعالج",
-  "notify-queue-status.queued": "في قائمة الانتظار",
-  "notify-queue-status.untrusted": "غير موثوق به",
-  "ldnService.notify-detail-modal": "خدمة LDN",
-  "relatedItem.notify-detail-modal": "البند ذو الصلة",
-  "search.filters.filter.notifyEndorsement.head": "إخطار المصادقة",
-  "search.filters.filter.notifyEndorsement.placeholder": "إخطار المصادقة",
-  "search.filters.filter.notifyEndorsement.label": "بحث الإخطار بالمصادقة",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  // TODO New key - Add a translation
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "filter.search.operator.placeholder": "Operator",
+  // TODO New key - Add a translation
+  "filter.search.operator.placeholder": "Operator",
+
+  // "search.filters.filter.entityType.text": "Item Type",
+  // TODO New key - Add a translation
+  "search.filters.filter.entityType.text": "Item Type",
+
+  // "search.filters.operator.equals.text": "Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.equals.text": "Equals",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  // TODO New key - Add a translation
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  // "search.filters.operator.contains.text": "Contains",
+  // TODO New key - Add a translation
+  "search.filters.operator.contains.text": "Contains",
+
+  // "search.filters.filter.title.text": "Title",
+  // TODO New key - Add a translation
+  "search.filters.filter.title.text": "Title",
+
+  // "search.filters.applied.f.title": "Title",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.title": "Title",
+
+  // "search.filters.filter.author.text": "Author",
+  // TODO New key - Add a translation
+  "search.filters.filter.author.text": "Author",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  // TODO New key - Add a translation
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+  // TODO New key - Add a translation
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\\\"https://notify.coar-repositories.org/\\\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  // TODO New key - Add a translation
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  // TODO New key - Add a translation
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  // TODO New key - Add a translation
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.title": "Registered Services",
+  // "ldn-registered-services.table.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.name": "Name",
+  // "ldn-registered-services.table.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.description": "Description",
+  // "ldn-registered-services.table.status": "Status",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.status": "Status",
+  // "ldn-registered-services.table.action": "Action",
+  // TODO New key - Add a translation
+  "ldn-registered-services.table.action": "Action",
+  // "ldn-registered-services.new": "NEW",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new": "NEW",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  // TODO New key - Add a translation
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.enabled": "Enabled",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.disabled": "Disabled",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  // TODO New key - Add a translation
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-registered-service.title": "Edit Service",
+  // "ldn-create-service.title": "Create service",
+  // TODO New key - Add a translation
+  "ldn-create-service.title": "Create service",
+  // "service.overview.create.modal": "Create Service",
+  // TODO New key - Add a translation
+  "service.overview.create.modal": "Create Service",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  // TODO New key - Add a translation
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  // "ldn-service-status": "Status",
+  // TODO New key - Add a translation
+  "ldn-service-status": "Status",
+  // "service.confirm.create": "Create",
+  // TODO New key - Add a translation
+  "service.confirm.create": "Create",
+  // "service.refuse.create": "Cancel",
+  // TODO New key - Add a translation
+  "service.refuse.create": "Cancel",
+  // "ldn-register-new-service.title": "Register a new service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.title": "Register a new service",
+  // "ldn-new-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.submit": "Save",
+  // "ldn-new-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.name": "Name",
+  // "ldn-new-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.description": "Description",
+  // "ldn-new-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.url": "Service URL",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.score": "Level of trust",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  // TODO New key - Add a translation
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  // TODO New key - Add a translation
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.automatic": "Automatic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.name": "Name is required",
+  // "ldn-new-service.form.error.url": "URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.url": "URL is required",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // TODO New key - Add a translation
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // TODO New key - Add a translation
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  // TODO New key - Add a translation
+  "service.overview.edit.body": "Do you confirm the changes?",
+  // "service.overview.edit.modal": "Edit Service",
+  // TODO New key - Add a translation
+  "service.overview.edit.modal": "Edit Service",
+  // "service.detail.update": "Confirm",
+  // TODO New key - Add a translation
+  "service.detail.update": "Confirm",
+  // "service.detail.return": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.return": "Cancel",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.modal": "Discard Changes",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-confirm": "Discard",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // TODO New key - Add a translation
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.title": "Successful Create",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.success.body": "The service has been created",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // TODO New key - Add a translation
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // TODO New key - Add a translation
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  // TODO New key - Add a translation
+  "service.overview.reset-form.reset-return": "Cancel",
+  // "service.overview.delete": "Delete service",
+  // TODO New key - Add a translation
+  "service.overview.delete": "Delete service",
+  // "ldn-edit-service.title": "Edit service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.title": "Edit service",
+  // "ldn-edit-service.form.label.name": "Name",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.name": "Name",
+  // "ldn-edit-service.form.label.description": "Description",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.description": "Description",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.url": "Service URL",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  // "ldn-edit-service.form.label.submit": "Save",
+  // TODO New key - Add a translation
+  "ldn-edit-service.form.label.submit": "Save",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  // TODO New key - Add a translation
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  // TODO New key - Add a translation
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.title": "Success",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  // TODO New key - Add a translation
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  // TODO New key - Add a translation
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  // TODO New key - Add a translation
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  // TODO New key - Add a translation
+  "item.page.review": "Review",
+
+  // "item.page.dataset": "Dataset",
+  // TODO New key - Add a translation
+  "item.page.dataset": "Dataset",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  // TODO New key - Add a translation
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  // "menu.section.services": "LDN Services",
+  // TODO New key - Add a translation
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  // TODO New key - Add a translation
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // TODO New key - Add a translation
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "توجد أدناه القائمة التي تحتوي على كافة الاقتراحات للموضوع المحدد.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  // TODO New key - Add a translation
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  // TODO New key - Add a translation
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "service.detail.delete.cancel": "Cancel",
+
+  // "service.detail.delete.button": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  // TODO New key - Add a translation
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  // TODO New key - Add a translation
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  // TODO New key - Add a translation
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  // TODO New key - Add a translation
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  // TODO New key - Add a translation
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  // TODO New key - Add a translation
+  "service.overview.table.name": "Name",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  // TODO New key - Add a translation
+  "service.overview.table.start": "Start time (UTC)",
+
+  // "service.overview.table.status": "Status",
+  // TODO New key - Add a translation
+  "service.overview.table.status": "Status",
+
+  // "service.overview.table.user": "User",
+  // TODO New key - Add a translation
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  // TODO New key - Add a translation
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  // TODO New key - Add a translation
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  // TODO New key - Add a translation
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  // TODO New key - Add a translation
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  // TODO New key - Add a translation
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+  // TODO New key - Add a translation
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  // TODO New key - Add a translation
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  // TODO New key - Add a translation
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  // TODO New key - Add a translation
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  // TODO New key - Add a translation
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  // TODO New key - Add a translation
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  // TODO New key - Add a translation
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  // TODO New key - Add a translation
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  // TODO New key - Add a translation
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  // TODO New key - Add a translation
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  // TODO New key - Add a translation
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  // TODO New key - Add a translation
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  // TODO New key - Add a translation
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  // TODO New key - Add a translation
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  // TODO New key - Add a translation
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  // TODO New key - Add a translation
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  // TODO New key - Add a translation
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  // TODO New key - Add a translation
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  // TODO New key - Add a translation
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "search.filters.filter.subject.text": "Subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.subject.text": "Subject",
+
+  // "search.advanced.filters.head": "Advanced Search",
+  // TODO New key - Add a translation
+  "search.advanced.filters.head": "Advanced Search",
+
+  // "filter.search.text.placeholder": "Search text",
+  // TODO New key - Add a translation
+  "filter.search.text.placeholder": "Search text",
+
+  // "advancesearch.form.submit": "Add",
+  // TODO New key - Add a translation
+  "advancesearch.form.submit": "Add",
+
+  // "ldn.no-filter.label": "None",
+  // TODO New key - Add a translation
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  // TODO New key - Add a translation
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  // TODO New key - Add a translation
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  // TODO New key - Add a translation
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  // TODO New key - Add a translation
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  // TODO New key - Add a translation
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  // TODO New key - Add a translation
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  // TODO New key - Add a translation
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  // TODO New key - Add a translation
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  // TODO New key - Add a translation
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  // TODO New key - Add a translation
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  // TODO New key - Add a translation
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  // TODO New key - Add a translation
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  // TODO New key - Add a translation
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  // TODO New key - Add a translation
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  // TODO New key - Add a translation
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  // TODO New key - Add a translation
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  // TODO New key - Add a translation
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  // TODO New key - Add a translation
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  // TODO New key - Add a translation
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  // TODO New key - Add a translation
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  // TODO New key - Add a translation
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  // TODO New key - Add a translation
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  // TODO New key - Add a translation
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  // TODO New key - Add a translation
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  // TODO New key - Add a translation
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  // TODO New key - Add a translation
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  // TODO New key - Add a translation
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  // TODO New key - Add a translation
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  // TODO New key - Add a translation
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  // TODO New key - Add a translation
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  // TODO New key - Add a translation
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  // TODO New key - Add a translation
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  // TODO New key - Add a translation
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  // TODO New key - Add a translation
+  "notify-message-result.status": "Status",
+
+  // "notify-message-result.action": "Action",
+  // TODO New key - Add a translation
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  // TODO New key - Add a translation
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  // TODO New key - Add a translation
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  // TODO New key - Add a translation
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  // TODO New key - Add a translation
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  // TODO New key - Add a translation
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  // TODO New key - Add a translation
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  // TODO New key - Add a translation
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  // TODO New key - Add a translation
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  // TODO New key - Add a translation
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  // TODO New key - Add a translation
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  // TODO New key - Add a translation
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  // TODO New key - Add a translation
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+
 }

From 533da6624f1140fb182505ca5b3cf69ceb1e9a67 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:56:06 +0200
Subject: [PATCH 0594/1286] add missing German translations

(cherry picked from commit 2af168bd5423e6917adc18990aeda8ee9f5da962)
---
 src/assets/i18n/de.json5 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 36b092178c..82420d691b 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4815,6 +4815,12 @@
   // "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": "Zeitschriftenband importieren",
 
+  // "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": "Item importieren",
+
+  // "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": "Metadaten der Publikation importieren",
+
   // "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": "Importiere Autor:innen-Metadaten",
 

From 26e02639d0df25825dfe6464c41b313d6aab1e97 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:56:06 +0200
Subject: [PATCH 0595/1286] add missing German translations

(cherry picked from commit 2af168bd5423e6917adc18990aeda8ee9f5da962)
---
 src/assets/i18n/de.json5 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index e1ebb489cf..640352c4fa 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5226,6 +5226,12 @@
   // "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": "Zeitschriftenband importieren",
 
+  // "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": "Item importieren",
+
+  // "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": "Metadaten der Publikation importieren",
+
   // "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": "Importiere Autor:innen-Metadaten",
 

From dac4d4a71321dd776d1af384535815b3ac63e53e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:57:17 +0000
Subject: [PATCH 0596/1286] Bump the angular group with 10 updates

Bumps the angular group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [@angular/localize](https://github.com/angular/angular) | `17.3.11` | `17.3.12` |
| [@angular/ssr](https://github.com/angular/angular-cli) | `17.3.9` | `17.3.10` |
| [@angular-devkit/build-angular](https://github.com/angular/angular-cli) | `17.3.9` | `17.3.10` |
| [@angular-eslint/builder](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/builder) | `17.2.1` | `17.5.3` |
| [@angular-eslint/bundled-angular-compiler](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/bundled-angular-compiler) | `17.2.1` | `17.5.3` |
| [@angular-eslint/eslint-plugin](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin) | `17.2.1` | `17.5.3` |
| [@angular-eslint/eslint-plugin-template](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin-template) | `17.2.1` | `17.5.3` |
| [@angular-eslint/schematics](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/schematics) | `17.2.1` | `17.5.3` |
| [@angular-eslint/template-parser](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/template-parser) | `17.2.1` | `17.5.3` |
| [@angular/cli](https://github.com/angular/angular-cli) | `17.3.9` | `17.3.10` |


Updates `@angular/localize` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/compare/17.3.11...17.3.12)

Updates `@angular/ssr` from 17.3.9 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.9...17.3.10)

Updates `@angular-devkit/build-angular` from 17.3.9 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.9...17.3.10)

Updates `@angular-eslint/builder` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/builder/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/builder)

Updates `@angular-eslint/bundled-angular-compiler` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/bundled-angular-compiler/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/bundled-angular-compiler)

Updates `@angular-eslint/eslint-plugin` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/eslint-plugin)

Updates `@angular-eslint/eslint-plugin-template` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/eslint-plugin-template)

Updates `@angular-eslint/schematics` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/schematics/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/schematics)

Updates `@angular-eslint/template-parser` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/template-parser/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/template-parser)

Updates `@angular/cli` from 17.3.9 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.9...17.3.10)

---
updated-dependencies:
- dependency-name: "@angular/localize"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/ssr"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-eslint/builder"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/bundled-angular-compiler"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/eslint-plugin-template"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/template-parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

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

diff --git a/package.json b/package.json
index ad82a8fcd0..c67f948ed0 100644
--- a/package.json
+++ b/package.json
@@ -67,12 +67,12 @@
     "@angular/compiler": "^17.3.11",
     "@angular/core": "^17.3.11",
     "@angular/forms": "^17.3.11",
-    "@angular/localize": "17.3.11",
+    "@angular/localize": "17.3.12",
     "@angular/platform-browser": "^17.3.11",
     "@angular/platform-browser-dynamic": "^17.3.11",
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.8",
+    "@angular/ssr": "^17.3.10",
     "@babel/runtime": "7.21.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
@@ -140,14 +140,14 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.8",
-    "@angular-eslint/builder": "17.2.1",
-    "@angular-eslint/bundled-angular-compiler": "17.2.1",
-    "@angular-eslint/eslint-plugin": "17.2.1",
-    "@angular-eslint/eslint-plugin-template": "17.2.1",
-    "@angular-eslint/schematics": "17.2.1",
-    "@angular-eslint/template-parser": "17.2.1",
-    "@angular/cli": "^17.3.8",
+    "@angular-devkit/build-angular": "^17.3.10",
+    "@angular-eslint/builder": "17.5.3",
+    "@angular-eslint/bundled-angular-compiler": "17.5.3",
+    "@angular-eslint/eslint-plugin": "17.5.3",
+    "@angular-eslint/eslint-plugin-template": "17.5.3",
+    "@angular-eslint/schematics": "17.5.3",
+    "@angular-eslint/template-parser": "17.5.3",
+    "@angular/cli": "^17.3.10",
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.11",
     "@cypress/schematic": "^1.5.0",
diff --git a/yarn.lock b/yarn.lock
index 3888a2384e..0753b822a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,12 +31,12 @@
     lodash "^4.17.15"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1703.9", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
-  version "0.1703.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.9.tgz#f99d01a704407c5467841c49654f5c3ac930f143"
-  integrity sha512-kEPfTOVnzrJxPGTvaXy8653HU9Fucxttx9gVfQR1yafs+yIEGx3fKGKe89YPmaEay32bIm7ZUpxDF1FO14nkdQ==
+"@angular-devkit/architect@0.1703.10", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
+  version "0.1703.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.10.tgz#c70a59f6dcc5228ac41713a14582253d5e348b40"
+  integrity sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==
   dependencies:
-    "@angular-devkit/core" "17.3.9"
+    "@angular-devkit/core" "17.3.10"
     rxjs "7.8.1"
 
 "@angular-devkit/architect@^0.1202.10":
@@ -47,15 +47,15 @@
     "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@^17.0.0", "@angular-devkit/build-angular@^17.3.8":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.9.tgz#54d55052be3fcc9034a1a0659acd6dcd664cf034"
-  integrity sha512-EuAPSC4c2DSJLlL4ieviKLx1faTyY+ymWycq6KFwoxu1FgWly/dqBeWyXccYinLhPVZmoh6+A/5S4YWXlOGSnA==
+"@angular-devkit/build-angular@^17.0.0", "@angular-devkit/build-angular@^17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.10.tgz#68c34b2922991f22369e912e080ddc5a0b112ca4"
+  integrity sha512-syz7xgzmp8/0tPJWwQIKZt7KNJfp9U7hkqNacXz4XTYz6YM0oyBXlqk2claSxywWBEkc0eJVSMD9e2ArusZBuA==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.9"
-    "@angular-devkit/build-webpack" "0.1703.9"
-    "@angular-devkit/core" "17.3.9"
+    "@angular-devkit/architect" "0.1703.10"
+    "@angular-devkit/build-webpack" "0.1703.10"
+    "@angular-devkit/core" "17.3.10"
     "@babel/core" "7.24.0"
     "@babel/generator" "7.23.6"
     "@babel/helper-annotate-as-pure" "7.22.5"
@@ -66,7 +66,7 @@
     "@babel/preset-env" "7.24.0"
     "@babel/runtime" "7.24.0"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.9"
+    "@ngtools/webpack" "17.3.10"
     "@vitejs/plugin-basic-ssl" "1.1.0"
     ansi-colors "4.1.3"
     autoprefixer "10.4.18"
@@ -108,7 +108,7 @@
     tree-kill "1.2.2"
     tslib "2.6.2"
     undici "6.11.1"
-    vite "5.1.7"
+    vite "5.1.8"
     watchpack "2.4.0"
     webpack "5.94.0"
     webpack-dev-middleware "6.1.2"
@@ -118,12 +118,12 @@
   optionalDependencies:
     esbuild "0.20.1"
 
-"@angular-devkit/build-webpack@0.1703.9":
-  version "0.1703.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.9.tgz#9eff5c69638d6cbb083b5c406e6dfca369e8641b"
-  integrity sha512-3b0LND39Nc+DwCQ0N7Tbsd7RAFWTeIc4VDwk/7RO8EMYTP5Kfgr/TK66nwTBypHsjmD69IMKHZZaZuiDfGfx2A==
+"@angular-devkit/build-webpack@0.1703.10":
+  version "0.1703.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz#235760406246594b9c898eecef9e8703ad20769a"
+  integrity sha512-m6dDgzKLW+c3z9/TUxYmbJEtEhrdYNQ4ogdtAgEYA/FRrKueDU0WztLNr+dVbvwNP99Skovtr8sAQfN6twproQ==
   dependencies:
-    "@angular-devkit/architect" "0.1703.9"
+    "@angular-devkit/architect" "0.1703.10"
     rxjs "7.8.1"
 
 "@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
@@ -138,10 +138,10 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@17.3.9", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.9.tgz#68b72e775195f07742f84b6ebd60b241eee98a72"
-  integrity sha512-/iKyn5YT7NW5ylrg9yufUydS8byExeQ2HHIwFC4Ebwb/JYYCz+k4tBf2LdP+zXpemDpLznXTQGWia0/yJjG8Vg==
+"@angular-devkit/core@17.3.10", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.10.tgz#c259052a891ad0bd1a7708d1081571683b3fa814"
+  integrity sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -159,78 +159,74 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@17.3.9":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.9.tgz#0fcf22d51f49fd23eeb88620134f2cb622094b7b"
-  integrity sha512-9qg+uWywgAtaQlvbnCQv47hcL6ZuA+d9ucgZ0upZftBllZ2vp5WIthCPb2mB0uBkj84Csmtz9MsErFjOQtTj4g==
+"@angular-devkit/schematics@17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.10.tgz#a3d62b33f82fd1fa51246d00ada92efe82a00ae7"
+  integrity sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==
   dependencies:
-    "@angular-devkit/core" "17.3.9"
+    "@angular-devkit/core" "17.3.10"
     jsonc-parser "3.2.1"
     magic-string "0.30.8"
     ora "5.4.1"
     rxjs "7.8.1"
 
-"@angular-eslint/builder@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-17.2.1.tgz#c7ba17e3a9de3a65d010f101b0c6cd3d5e9c26a8"
-  integrity sha512-O30eaR0wCPiP+zKWvXj2JM8hVq30Wok2rp7zJMFm3PurjF9nWIIyexXkE5fa538DYZYxu8N3gQRqhpv5jvTXCg==
-  dependencies:
-    "@nx/devkit" "17.2.8"
-    nx "17.2.8"
+"@angular-eslint/builder@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-17.5.3.tgz#d04756dc2e6d70108100445aae206051d115ab1f"
+  integrity sha512-DoPCwt8qp5oMkfxY8V3wygf6/E7zzgXkPCwTRhIelklfpB3nYwLnbRSD8G5hueAU4eyASKiIuhR79E996AuUSw==
 
-"@angular-eslint/bundled-angular-compiler@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.2.1.tgz#d849b0845371b41856b9f598af81ce5bf799bca0"
-  integrity sha512-puC0itsZv2QlrDOCcWtq1KZH+DvfrpV+mV78HHhi6+h25R5iIhr8ARKcl3EQxFjvrFq34jhG8pSupxKvFbHVfA==
+"@angular-eslint/bundled-angular-compiler@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.5.3.tgz#6bdeb55881b2be796196cc3e0c684250923dd89f"
+  integrity sha512-x9jZ6mME9wxumErPGonWERXX/9TJ7mzEkQhOKt3BxBFm0sy9XQqLMAenp1PBSg3RF3rH7EEVdB2+jb75RtHp0g==
 
-"@angular-eslint/eslint-plugin-template@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.2.1.tgz#226a623219375a2344112c1c896fefef0dae4df6"
-  integrity sha512-hl1hcHtcm90wyVL1OQGTz16oA0KHon+FFb3Qg0fLXObaXxA495Ecefd9ub5Xxg4JEOPRDi29bF1Y3YKpwflgeg==
+"@angular-eslint/eslint-plugin-template@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.5.3.tgz#fa4f91cf028c64d38d0bcb5087cf8546811f5694"
+  integrity sha512-RkRFagxqBPV2xdNyeQQROUm6I1Izto1Z3Wy73lCk2zq1RhVgbznniH/epmOIE8PMkHmMKmZ765FV++J/90p4Ig==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
-    "@angular-eslint/utils" "17.2.1"
-    "@typescript-eslint/type-utils" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
+    "@angular-eslint/bundled-angular-compiler" "17.5.3"
+    "@angular-eslint/utils" "17.5.3"
+    "@typescript-eslint/type-utils" "7.11.0"
+    "@typescript-eslint/utils" "7.11.0"
     aria-query "5.3.0"
     axobject-query "4.0.0"
 
-"@angular-eslint/eslint-plugin@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-17.2.1.tgz#2be51ead1785950feb8351001e0683eae42f4c29"
-  integrity sha512-9yA81BHpsaCUKRBtHGN3ieAy8HpIoffzPQMu34lYqZFT4yGHGhYmhQjNSQGBRbV2LD9dVv2U35rMHNmUcozXpw==
+"@angular-eslint/eslint-plugin@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-17.5.3.tgz#56c6bf09262089dd10a27b22ac1de979b6bc805b"
+  integrity sha512-2gMRZ+SkiygrPDtCJwMfjmwIFOcvxxC4NRX/MqRo6udsa0gtqPrc8acRbwrmAXlullmhzmaeUfkHpGDSzW8pFw==
   dependencies:
-    "@angular-eslint/utils" "17.2.1"
-    "@typescript-eslint/utils" "6.19.0"
+    "@angular-eslint/bundled-angular-compiler" "17.5.3"
+    "@angular-eslint/utils" "17.5.3"
+    "@typescript-eslint/utils" "7.11.0"
 
-"@angular-eslint/schematics@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-17.2.1.tgz#8c0c15f106afe9fc9f89dd6573e6325afd2bf1e1"
-  integrity sha512-7ldtIePI4ZTp/TBpeOZkzfv30HSAn//4TgtFuqvojudI8n8batV5FqQ0VNm1e0zitl75t8Zwtr0KYT4I6vh59g==
+"@angular-eslint/schematics@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-17.5.3.tgz#8957d5b47eb89b6c962628056d192fceb877fc81"
+  integrity sha512-a0MlOjNLIM18l/66S+CzhANQR3QH3jDUa1MC50E4KBf1mwjQyfqd6RdfbOTMDjgFlPrfB+5JvoWOHHGj7FFM1A==
   dependencies:
-    "@angular-eslint/eslint-plugin" "17.2.1"
-    "@angular-eslint/eslint-plugin-template" "17.2.1"
-    "@nx/devkit" "17.2.8"
-    ignore "5.3.0"
-    nx "17.2.8"
+    "@angular-eslint/eslint-plugin" "17.5.3"
+    "@angular-eslint/eslint-plugin-template" "17.5.3"
+    ignore "5.3.1"
     strip-json-comments "3.1.1"
-    tmp "0.2.1"
+    tmp "0.2.3"
 
-"@angular-eslint/template-parser@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-17.2.1.tgz#005f997346eb17c6dbca5fffc41da51b7e755013"
-  integrity sha512-WPQYFvRju0tCDXQ/pwrzC911pE07JvpeDgcN2elhzV6lxDHJEZpA5O9pnW9qgNA6J6XM9Q7dBkJ22ztAzC4WFw==
+"@angular-eslint/template-parser@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-17.5.3.tgz#5bfb6558a131bf54a67e3bd00bcf493d21f94e20"
+  integrity sha512-NYybOsMkJUtFOW2JWALicipq0kK5+jGwA1MYyRoXjdbDlXltHUb9qkXj7p0fE6uRutBGXDl4288s8g/fZCnAIA==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
+    "@angular-eslint/bundled-angular-compiler" "17.5.3"
     eslint-scope "^8.0.0"
 
-"@angular-eslint/utils@17.2.1":
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-17.2.1.tgz#3d4217775d86479348fdd0e1ad83014c9d8339f2"
-  integrity sha512-qQYTBXy90dWM7fhhpa5i9lTtqqhJisvRa+naCrQx9kBgR458JScLdkVIdcZ9D/rPiDCmKiVUfgcDISnjUeqTqg==
+"@angular-eslint/utils@17.5.3":
+  version "17.5.3"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-17.5.3.tgz#0b162a84e6f6af4e9ac5a3de95d95ee1df360232"
+  integrity sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "17.2.1"
-    "@typescript-eslint/utils" "6.19.0"
+    "@angular-eslint/bundled-angular-compiler" "17.5.3"
+    "@typescript-eslint/utils" "7.11.0"
 
 "@angular/animations@^17.3.11":
   version "17.3.12"
@@ -248,15 +244,15 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^17.3.8":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.9.tgz#cd571d288be3b3eb80acd25b54dd8a5008af417a"
-  integrity sha512-b5RGu5RO4VKZlMQDatwABAn1qocgD9u4IrGN2dvHDcrz5apTKYftUdGyG42vngyDNBCg1mWkSDQEWK4f2HfuGg==
+"@angular/cli@^17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.10.tgz#15156dc511a6c43a798f5015e0345d7678691418"
+  integrity sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==
   dependencies:
-    "@angular-devkit/architect" "0.1703.9"
-    "@angular-devkit/core" "17.3.9"
-    "@angular-devkit/schematics" "17.3.9"
-    "@schematics/angular" "17.3.9"
+    "@angular-devkit/architect" "0.1703.10"
+    "@angular-devkit/core" "17.3.10"
+    "@angular-devkit/schematics" "17.3.10"
+    "@schematics/angular" "17.3.10"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "4.1.2"
@@ -319,10 +315,10 @@
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.3.12.tgz#87a3d71e94ee7442eac046ca64be73a6a31a0027"
   integrity sha512-MVmEXonXwdhFtIpU4q8qbXHsrAsdTjZcPPuWCU0zXVQ+VaB/y6oF7BVpmBtfyBcBCums1guEncPP+AZVvulXmQ==
 
-"@angular/localize@17.3.11":
-  version "17.3.11"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.11.tgz#2eaec8c8126caaa7bad7cc7433ea91882fbe4885"
-  integrity sha512-uc38JfGpIEb13rDZu7wZfEvLxBpWbhfsOR+yI21M4zIiKYQxI7RGgtH9GbCKZDEZmeTUSz/idA4zwRiiX8wNvQ==
+"@angular/localize@17.3.12":
+  version "17.3.12"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-17.3.12.tgz#e38fbb595b6e045d49488afb0ad3e276da6721e3"
+  integrity sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==
   dependencies:
     "@babel/core" "7.23.9"
     "@types/babel__core" "7.20.5"
@@ -358,10 +354,10 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/ssr@^17.3.8":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.9.tgz#69422608b9756c3e46f0489bc43433d8a90c4afe"
-  integrity sha512-AbS3tsHUVOqwC3XI4B8hQDWThfrOyv8Qhe1N9a712nJKcqmfrMO0gtvdhI//VxYz0X08/l97Yh5D61WqF7+CQw==
+"@angular/ssr@^17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.10.tgz#bf13834e3115ca7779834820dcb5b3b9659056bf"
+  integrity sha512-t+NX1HufU38c0u+8mDg31cqrXZo5SEUxjBuXwdu3mOvYbkanjhbtyIgIMYr9Vru8pqncasgHLJv2RVWDvAjlEw==
   dependencies:
     critters "0.0.22"
     tslib "^2.3.0"
@@ -1922,13 +1918,6 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
-  dependencies:
-    "@sinclair/typebox" "^0.27.8"
-
 "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -2127,10 +2116,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@17.3.9":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.9.tgz#cfb27add90a1bb522ecbf869b79369145d4d9e6e"
-  integrity sha512-2+NvEQuYKRWdZaJbRJWEnR48tpW0uYbhwfHBHLDI9Kazb3mb0oAwYBVXdq+TtDLBypXnMsFpCewjRHTvkVx4/A==
+"@ngtools/webpack@17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.10.tgz#6f077ef3d1fa4363cffcfee66f9b2e52164069b2"
+  integrity sha512-yPKmdbTJzxROAl2NS8P8eHB2mU0BqV2I0ZiKmX6oTetY2Ea4i2WzlTK39pPpG7atmdF2NPWYLXdJWAup+JxSyw==
 
 "@ngtools/webpack@^16.2.12":
   version "16.2.15"
@@ -2277,84 +2266,6 @@
     node-gyp "^10.0.0"
     which "^4.0.0"
 
-"@nrwl/devkit@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-17.2.8.tgz#dd3467b484c4611454a45541ffb29e4de5b2ebe7"
-  integrity sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==
-  dependencies:
-    "@nx/devkit" "17.2.8"
-
-"@nrwl/tao@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-17.2.8.tgz#41ff3d715a0763e95cf5c35e7f79cd3be358dc5f"
-  integrity sha512-Qpk5YKeJ+LppPL/wtoDyNGbJs2MsTi6qyX/RdRrEc8lc4bk6Cw3Oul1qTXCI6jT0KzTz+dZtd0zYD/G7okkzvg==
-  dependencies:
-    nx "17.2.8"
-    tslib "^2.3.0"
-
-"@nx/devkit@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.2.8.tgz#49b6c94a3c12fba63eae6514fb37a468d0570e2e"
-  integrity sha512-6LtiQihtZwqz4hSrtT5cCG5XMCWppG6/B8c1kNksg97JuomELlWyUyVF+sxmeERkcLYFaKPTZytP0L3dmCFXaw==
-  dependencies:
-    "@nrwl/devkit" "17.2.8"
-    ejs "^3.1.7"
-    enquirer "~2.3.6"
-    ignore "^5.0.4"
-    semver "7.5.3"
-    tmp "~0.2.1"
-    tslib "^2.3.0"
-
-"@nx/nx-darwin-arm64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.8.tgz#26645c9548d5e387b43c06fccfa18e2c1f08055e"
-  integrity sha512-dMb0uxug4hM7tusISAU1TfkDK3ixYmzc1zhHSZwpR7yKJIyKLtUpBTbryt8nyso37AS1yH+dmfh2Fj2WxfBHTg==
-
-"@nx/nx-darwin-x64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.8.tgz#5143d6d01d24e338cb3d39076fe2af95146cb538"
-  integrity sha512-0cXzp1tGr7/6lJel102QiLA4NkaLCkQJj6VzwbwuvmuCDxPbpmbz7HC1tUteijKBtOcdXit1/MEoEU007To8Bw==
-
-"@nx/nx-freebsd-x64@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.8.tgz#82a018a1855170e0243b8fe7b0032af279c3fb83"
-  integrity sha512-YFMgx5Qpp2btCgvaniDGdu7Ctj56bfFvbbaHQWmOeBPK1krNDp2mqp8HK6ZKOfEuDJGOYAp7HDtCLvdZKvJxzA==
-
-"@nx/nx-linux-arm-gnueabihf@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.8.tgz#18b9c324221ff6a30589f3fc272a843aca57b70f"
-  integrity sha512-iN2my6MrhLRkVDtdivQHugK8YmR7URo1wU9UDuHQ55z3tEcny7LV3W9NSsY9UYPK/FrxdDfevj0r2hgSSdhnzA==
-
-"@nx/nx-linux-arm64-gnu@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.8.tgz#54a08640a2babe78bcf3283565b00eb487db595e"
-  integrity sha512-Iy8BjoW6mOKrSMiTGujUcNdv+xSM1DALTH6y3iLvNDkGbjGK1Re6QNnJAzqcXyDpv32Q4Fc57PmuexyysZxIGg==
-
-"@nx/nx-linux-arm64-musl@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.8.tgz#cd7b673bb9f45fec7aa1b6c880a0d23d658e927f"
-  integrity sha512-9wkAxWzknjpzdofL1xjtU6qPFF1PHlvKCZI3hgEYJDo4mQiatGI+7Ttko+lx/ZMP6v4+Umjtgq7+qWrApeKamQ==
-
-"@nx/nx-linux-x64-gnu@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.8.tgz#009eb75c77bf075bc9c13ec4f9caf77821eee639"
-  integrity sha512-sjG1bwGsjLxToasZ3lShildFsF0eyeGu+pOQZIp9+gjFbeIkd19cTlCnHrOV9hoF364GuKSXQyUlwtFYFR4VTQ==
-
-"@nx/nx-linux-x64-musl@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.8.tgz#8ee2324068732a135ca4b01081942d5956885167"
-  integrity sha512-QiakXZ1xBCIptmkGEouLHQbcM4klQkcr+kEaz2PlNwy/sW3gH1b/1c0Ed5J1AN9xgQxWspriAONpScYBRgxdhA==
-
-"@nx/nx-win32-arm64-msvc@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.8.tgz#9bdce5b4d1f9cec7ef326eaf43b99e68576398b0"
-  integrity sha512-XBWUY/F/GU3vKN9CAxeI15gM4kr3GOBqnzFZzoZC4qJt2hKSSUEWsMgeZtsMgeqEClbi4ZyCCkY7YJgU32WUGA==
-
-"@nx/nx-win32-x64-msvc@17.2.8":
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.8.tgz#8a86ff250021ad47686b58f1840b348a209b1158"
-  integrity sha512-HTqDv+JThlLzbcEm/3f+LbS5/wYQWzb5YDXbP1wi7nlCTihNZOLNqGOkEmwlrR5tAdNHPRpHSmkYg4305W0CtA==
-
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -2513,13 +2424,13 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@schematics/angular@17.3.9":
-  version "17.3.9"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.9.tgz#38ad60fea904592ea5d39be6581b22fb16f1baf1"
-  integrity sha512-q6N8mbcYC6cgPyjTrMH7ehULQoUUwEYN4g7uo4ylZ/PFklSLJvpSp4BuuxANgW449qHSBvQfdIoui9ayAUXQzA==
+"@schematics/angular@17.3.10":
+  version "17.3.10"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.10.tgz#87c77ae2eb917f391d654df3c908f4a00d3d9443"
+  integrity sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==
   dependencies:
-    "@angular-devkit/core" "17.3.9"
-    "@angular-devkit/schematics" "17.3.9"
+    "@angular-devkit/core" "17.3.10"
+    "@angular-devkit/schematics" "17.3.10"
     jsonc-parser "3.2.1"
 
 "@schematics/angular@^12.2.17":
@@ -2577,11 +2488,6 @@
     "@sigstore/core" "^1.1.0"
     "@sigstore/protobuf-specs" "^0.3.2"
 
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
-
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
@@ -3001,14 +2907,6 @@
     "@typescript-eslint/types" "5.62.0"
     "@typescript-eslint/visitor-keys" "5.62.0"
 
-"@typescript-eslint/scope-manager@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
-  integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-
 "@typescript-eslint/scope-manager@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
@@ -3017,6 +2915,14 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
+"@typescript-eslint/scope-manager@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz#cf5619b01de62a226a59add15a02bde457335d1d"
+  integrity sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==
+  dependencies:
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
+
 "@typescript-eslint/scope-manager@7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
@@ -3025,15 +2931,15 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/type-utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
-  integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==
+"@typescript-eslint/type-utils@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz#ac216697d649084fedf4a910347b9642bd0ff099"
+  integrity sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
+    "@typescript-eslint/typescript-estree" "7.11.0"
+    "@typescript-eslint/utils" "7.11.0"
     debug "^4.3.4"
-    ts-api-utils "^1.0.1"
+    ts-api-utils "^1.3.0"
 
 "@typescript-eslint/type-utils@7.18.0":
   version "7.18.0"
@@ -3050,16 +2956,16 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/types@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
-  integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
-
 "@typescript-eslint/types@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
+"@typescript-eslint/types@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.11.0.tgz#5e9702a5e8b424b7fc690e338d359939257d6722"
+  integrity sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==
+
 "@typescript-eslint/types@7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
@@ -3078,20 +2984,6 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
-  integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
@@ -3106,6 +2998,20 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz#7cbc569bc7336c3a494ceaf8204fdee5d5dbb7fa"
+  integrity sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==
+  dependencies:
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
 "@typescript-eslint/typescript-estree@7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
@@ -3134,18 +3040,15 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
-  integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==
+"@typescript-eslint/utils@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.11.0.tgz#524f047f2209959424c3ef689b0d83b3bc09919c"
+  integrity sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.19.0"
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    semver "^7.5.4"
+    "@typescript-eslint/scope-manager" "7.11.0"
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/typescript-estree" "7.11.0"
 
 "@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.2.0":
   version "7.18.0"
@@ -3178,14 +3081,6 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
-  integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
@@ -3194,6 +3089,14 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz#2c50cd292e67645eec05ac0830757071b4a4d597"
+  integrity sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==
+  dependencies:
+    "@typescript-eslint/types" "7.11.0"
+    eslint-visitor-keys "^3.4.3"
+
 "@typescript-eslint/visitor-keys@7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
@@ -3358,26 +3261,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0":
+"@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-"@yarnpkg/parsers@3.0.0-rc.46":
-  version "3.0.0-rc.46"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01"
-  integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==
-  dependencies:
-    js-yaml "^3.10.0"
-    tslib "^2.4.0"
-
-"@zkochan/js-yaml@0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
-  integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
-  dependencies:
-    argparse "^2.0.1"
-
 abbrev@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
@@ -3575,11 +3463,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
 ansi-styles@^6.1.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
@@ -3810,7 +3693,7 @@ axe-core@^4.7.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59"
   integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==
 
-axios@^1.5.1, axios@^1.7.4:
+axios@^1.7.4:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
   integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
@@ -3927,7 +3810,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bl@^4.0.3, bl@^4.1.0:
+bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -4291,7 +4174,7 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-cursor@3.1.0, cli-cursor@^3.1.0:
+cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
@@ -4305,11 +4188,6 @@ cli-progress@^3.12.0:
   dependencies:
     string-width "^4.2.3"
 
-cli-spinners@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
-  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
-
 cli-spinners@^2.5.0:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
@@ -5035,11 +4913,6 @@ di@^0.0.1:
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
   integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
 
-diff-sequences@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
-  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -5140,17 +5013,7 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
-dotenv-expand@~10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-10.0.0.tgz#12605d00fb0af6d0a592e6558585784032e4ef37"
-  integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==
-
-dotenv@~16.3.1:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.2.tgz#3cb611ce5a63002dbabf7c281bc331f69d28f03f"
-  integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==
-
-duplexer@^0.1.1, duplexer@^0.1.2:
+duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -5187,7 +5050,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.10, ejs@^3.1.7:
+ejs@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
   integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
@@ -5238,7 +5101,7 @@ encoding@^0.1.13:
   dependencies:
     iconv-lite "^0.6.2"
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -5293,13 +5156,6 @@ enquirer@^2.3.6:
     ansi-colors "^4.1.1"
     strip-ansi "^6.0.1"
 
-enquirer@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 ent@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.1.tgz#68dc99a002f115792c26239baedaaea9e70c0ca2"
@@ -6020,7 +5876,7 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-figures@3.2.0, figures@^3.2.0:
+figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -6210,11 +6066,6 @@ fresh@0.5.2, fresh@^0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
 fs-extra@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
@@ -6224,15 +6075,6 @@ fs-extra@3.0.1:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -6386,18 +6228,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^10.2.2, glob@^10.3.10:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
@@ -6814,12 +6644,12 @@ ignore-walk@^6.0.4:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
-  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
+ignore@5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
@@ -7372,21 +7202,6 @@ jasmine@^3.8.0:
     glob "^7.1.6"
     jasmine-core "~3.99.0"
 
-jest-diff@^29.4.1:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
-jest-get-type@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
-  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
-
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -7411,14 +7226,7 @@ js-cookie@2.2.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@4.1.0, js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-js-yaml@^3.10.0, js-yaml@^3.13.1:
+js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -7426,6 +7234,13 @@ js-yaml@^3.10.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
@@ -7518,11 +7333,6 @@ jsonc-parser@3.0.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
-jsonc-parser@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
 jsonc-parser@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
@@ -7837,11 +7647,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-lines-and-columns@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
-  integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
-
 linkify-it@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
@@ -8179,13 +7984,6 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
-  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -8534,11 +8332,6 @@ node-gyp@^10.0.0:
     tar "^6.2.1"
     which "^4.0.0"
 
-node-machine-id@1.1.12:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
-  integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
-
 node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
@@ -8690,57 +8483,6 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-nx@17.2.8:
-  version "17.2.8"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-17.2.8.tgz#09482acd5d9b64c115d5ccf12417f1af2787d4d1"
-  integrity sha512-rM5zXbuXLEuqQqcjVjClyvHwRJwt+NVImR2A6KFNG40Z60HP6X12wAxxeLHF5kXXTDRU0PFhf/yACibrpbPrAw==
-  dependencies:
-    "@nrwl/tao" "17.2.8"
-    "@yarnpkg/lockfile" "^1.1.0"
-    "@yarnpkg/parsers" "3.0.0-rc.46"
-    "@zkochan/js-yaml" "0.0.6"
-    axios "^1.5.1"
-    chalk "^4.1.0"
-    cli-cursor "3.1.0"
-    cli-spinners "2.6.1"
-    cliui "^8.0.1"
-    dotenv "~16.3.1"
-    dotenv-expand "~10.0.0"
-    enquirer "~2.3.6"
-    figures "3.2.0"
-    flat "^5.0.2"
-    fs-extra "^11.1.0"
-    glob "7.1.4"
-    ignore "^5.0.4"
-    jest-diff "^29.4.1"
-    js-yaml "4.1.0"
-    jsonc-parser "3.2.0"
-    lines-and-columns "~2.0.3"
-    minimatch "3.0.5"
-    node-machine-id "1.1.12"
-    npm-run-path "^4.0.1"
-    open "^8.4.0"
-    semver "7.5.3"
-    string-width "^4.2.3"
-    strong-log-transformer "^2.1.0"
-    tar-stream "~2.2.0"
-    tmp "~0.2.1"
-    tsconfig-paths "^4.1.2"
-    tslib "^2.3.0"
-    yargs "^17.6.2"
-    yargs-parser "21.1.1"
-  optionalDependencies:
-    "@nx/nx-darwin-arm64" "17.2.8"
-    "@nx/nx-darwin-x64" "17.2.8"
-    "@nx/nx-freebsd-x64" "17.2.8"
-    "@nx/nx-linux-arm-gnueabihf" "17.2.8"
-    "@nx/nx-linux-arm64-gnu" "17.2.8"
-    "@nx/nx-linux-arm64-musl" "17.2.8"
-    "@nx/nx-linux-x64-gnu" "17.2.8"
-    "@nx/nx-linux-x64-musl" "17.2.8"
-    "@nx/nx-win32-arm64-msvc" "17.2.8"
-    "@nx/nx-win32-x64-msvc" "17.2.8"
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -8837,7 +8579,7 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@8.4.2, open@^8.0.9, open@^8.4.0:
+open@8.4.2, open@^8.0.9:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -9587,15 +9329,6 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-format@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
-  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
 proc-log@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
@@ -9884,11 +9617,6 @@ react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-is@^18.0.0:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
 react-mosaic-component@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz#48a34e5e5c16654075212666c2aebeb488bab9f2"
@@ -10010,7 +9738,7 @@ readable-stream@^2.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
+readable-stream@^3.0.6, readable-stream@^3.4.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -10268,7 +9996,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -10525,13 +10253,6 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-semver@7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
-  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
@@ -11140,15 +10861,6 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strong-log-transformer@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
-  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
-  dependencies:
-    duplexer "^0.1.1"
-    minimist "^1.2.0"
-    through "^2.3.4"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -11197,17 +10909,6 @@ tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar-stream@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
 tar@^6.0.2, tar@^6.1.11, tar@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
@@ -11275,7 +10976,7 @@ throttleit@^1.0.0:
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5"
   integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==
 
-through@^2.3.4, through@^2.3.8:
+through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -11295,12 +10996,10 @@ tiny-warning@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
+tmp@0.2.3, tmp@^0.2.1, tmp@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -11309,11 +11008,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.1, tmp@~0.2.1, tmp@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -11418,7 +11112,7 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tsconfig-paths@^4.1.0, tsconfig-paths@^4.1.2:
+tsconfig-paths@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
   integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
@@ -11437,7 +11131,7 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0:
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
   integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
@@ -11782,10 +11476,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.7.tgz#9f685a2c4c70707fef6d37341b0e809c366da619"
-  integrity sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==
+vite@5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.8.tgz#f728feda90c3f30b0ab530c0981e5aa7745b8aee"
+  integrity sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==
   dependencies:
     esbuild "^0.19.3"
     postcss "^8.4.35"
@@ -12223,17 +11917,17 @@ yaml@^1.10.0:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@21.1.1, yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.3.1, yargs@^17.6.2:
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.3.1:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==

From e6ce7512790384d7f737061c66f32ad9c6b15160 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:57:36 +0000
Subject: [PATCH 0597/1286] Bump @types/lodash from 4.17.7 to 4.17.10

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.7 to 4.17.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 ad82a8fcd0..c848a14e2e 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.17.10",
     "@types/node": "^14.14.9",
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 3888a2384e..87236afd2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2785,10 +2785,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.194":
-  version "4.17.7"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.7.tgz#2f776bcb53adc9e13b2c0dfd493dfcbd7de43612"
-  integrity sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==
+"@types/lodash@^4.17.10":
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.10.tgz#64f3edf656af2fe59e7278b73d3e62404144a6e6"
+  integrity sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==
 
 "@types/mime@^1":
   version "1.3.5"

From 3352a966f3c6d727ed250259c0c78d32d05659e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:57:49 +0000
Subject: [PATCH 0598/1286] Bump @types/deep-freeze from 0.1.2 to 0.1.5

Bumps [@types/deep-freeze](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/deep-freeze) from 0.1.2 to 0.1.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/deep-freeze)

---
updated-dependencies:
- dependency-name: "@types/deep-freeze"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 ad82a8fcd0..279cab3fc2 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@ngrx/store-devtools": "^17.1.1",
     "@ngtools/webpack": "^16.2.12",
-    "@types/deep-freeze": "0.1.2",
+    "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
diff --git a/yarn.lock b/yarn.lock
index 3888a2384e..926db0ca4b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2700,10 +2700,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/deep-freeze@0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.2.tgz#68e5379291910e82c2f0d1629732163c2aa662cc"
-  integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
+"@types/deep-freeze@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.5.tgz#ae94f37ca134b4e34facb55f52ed90921192f764"
+  integrity sha512-KZtR+jtmgkCpgE0f+We/QEI2Fi0towBV/tTkvHVhMzx+qhUVGXMx7pWvAtDp6vEWIjdKLTKpqbI/sORRCo8TKg==
 
 "@types/ejs@^3.1.2":
   version "3.1.5"

From 1321b7b8a950340f1aa2edbd30d3229d784bf2d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:59:10 +0000
Subject: [PATCH 0599/1286] Bump reflect-metadata from 0.1.14 to 0.2.2

Bumps [reflect-metadata](https://github.com/rbuckton/reflect-metadata) from 0.1.14 to 0.2.2.
- [Release notes](https://github.com/rbuckton/reflect-metadata/releases)
- [Changelog](https://github.com/rbuckton/reflect-metadata/blob/main/tsconfig-release.json)
- [Commits](https://github.com/rbuckton/reflect-metadata/commits)

---
updated-dependencies:
- dependency-name: reflect-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index ad82a8fcd0..1460ec17f3 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.0",
diff --git a/yarn.lock b/yarn.lock
index 3888a2384e..9a55237ed5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10057,12 +10057,7 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-reflect-metadata@^0.1.13:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
-  integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
-
-reflect-metadata@^0.2.0:
+reflect-metadata@^0.2.0, reflect-metadata@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
   integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==

From 2044f7b2d547079f837a975243470d9e04ee9e1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:03:00 +0000
Subject: [PATCH 0600/1286] Bump axe-core from 4.9.1 to 4.10.0

Bumps [axe-core](https://github.com/dequelabs/axe-core) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/dequelabs/axe-core/releases)
- [Changelog](https://github.com/dequelabs/axe-core/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core/compare/v4.9.1...v4.10.0)

---
updated-dependencies:
- dependency-name: axe-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 1f806222aa..96f5301bcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,7 +110,7 @@
         "@typescript-eslint/parser": "^7.2.0",
         "@typescript-eslint/rule-tester": "^7.2.0",
         "@typescript-eslint/utils": "^7.2.0",
-        "axe-core": "^4.7.2",
+        "axe-core": "^4.10.0",
         "browser-sync": "^3.0.3",
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
@@ -8206,9 +8206,9 @@
       "dev": true
     },
     "node_modules/axe-core": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.9.1.tgz",
-      "integrity": "sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz",
+      "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==",
       "dev": true,
       "engines": {
         "node": ">=4"
diff --git a/package.json b/package.json
index 59dce033db..1bd7cd2350 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
     "@typescript-eslint/parser": "^7.2.0",
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",
-    "axe-core": "^4.7.2",
+    "axe-core": "^4.10.0",
     "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",

From 68d27e59bbe4bce85b7bf7159596a2d6173ac7d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:03:34 +0000
Subject: [PATCH 0601/1286] Bump eslint-plugin-import from 2.29.1 to 2.31.0

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.1 to 2.31.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.1...v2.31.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 1f806222aa..b8ae748b34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,7 +122,7 @@
         "eslint-plugin-deprecation": "^1.4.1",
         "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
         "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
         "eslint-plugin-jsonc": "^2.6.0",
@@ -6256,6 +6256,12 @@
         "win32"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true
+    },
     "node_modules/@schematics/angular": {
       "version": "17.3.8",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.8.tgz",
@@ -11448,9 +11454,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7"
@@ -11619,34 +11625,36 @@
       "link": true
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
         "array.prototype.flat": "^1.3.2",
         "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
         "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
       }
     },
     "node_modules/eslint-plugin-import-newlines": {
@@ -13884,9 +13892,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
-      "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
diff --git a/package.json b/package.json
index 59dce033db..12ebf2524e 100644
--- a/package.json
+++ b/package.json
@@ -209,7 +209,7 @@
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-dspace-angular-html": "file:./lint/dist/src/rules/html",
     "eslint-plugin-dspace-angular-ts": "file:./lint/dist/src/rules/ts",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.6.0",

From 9033e020ee5b0c544279b91121a9932df5598bac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:04:47 +0000
Subject: [PATCH 0602/1286] Bump @typescript-eslint/eslint-plugin from 7.15.0
 to 7.18.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 7.15.0 to 7.18.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.18.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 1f806222aa..4d48d5fffa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,7 +106,7 @@
         "@types/lodash": "^4.14.194",
         "@types/node": "^14.14.9",
         "@types/sanitize-html": "^2.9.0",
-        "@typescript-eslint/eslint-plugin": "^7.2.0",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.2.0",
         "@typescript-eslint/rule-tester": "^7.2.0",
         "@typescript-eslint/utils": "^7.2.0",
@@ -6828,16 +6828,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz",
-      "integrity": "sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/type-utils": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -6860,14 +6860,31 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz",
-      "integrity": "sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -6887,6 +6904,86 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
diff --git a/package.json b/package.json
index 59dce033db..75b62d3986 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "@types/lodash": "^4.14.194",
     "@types/node": "^14.14.9",
     "@types/sanitize-html": "^2.9.0",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.2.0",
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",

From 4bb1baf638816cbb41460c334ba45ff8f5319ba4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:05:24 +0000
Subject: [PATCH 0603/1286] Bump ng-mocks from 14.13.0 to 14.13.1

Bumps [ng-mocks](https://github.com/help-me-mom/ng-mocks) from 14.13.0 to 14.13.1.
- [Release notes](https://github.com/help-me-mom/ng-mocks/releases)
- [Changelog](https://github.com/help-me-mom/ng-mocks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/help-me-mom/ng-mocks/compare/v14.13.0...v14.13.1)

---
updated-dependencies:
- dependency-name: ng-mocks
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 1f806222aa..60ffa84a93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.11.0",
         "morgan": "^1.10.0",
-        "ng-mocks": "^14.10.0",
+        "ng-mocks": "^14.13.1",
         "ng2-file-upload": "5.0.0",
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^16.0.0",
@@ -16717,9 +16717,9 @@
       "dev": true
     },
     "node_modules/ng-mocks": {
-      "version": "14.13.0",
-      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.0.tgz",
-      "integrity": "sha512-cQ6nUj/P+v7X52gYU6bAj/03iDKl2pzbPy2V0tx/d5lxME063Vxc190p6UPlJkbRIxcB+OqSALPgQvy83efzjw==",
+      "version": "14.13.1",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
+      "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
diff --git a/package.json b/package.json
index 59dce033db..6c55eafd00 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.11.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.10.0",
+    "ng-mocks": "^14.13.1",
     "ng2-file-upload": "5.0.0",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",

From 3ad1f6e69c2e06c1180a887a2f1079c5bca8e7f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 14:05:44 +0000
Subject: [PATCH 0604/1286] Bump reflect-metadata from 0.1.14 to 0.2.2

Bumps [reflect-metadata](https://github.com/rbuckton/reflect-metadata) from 0.1.14 to 0.2.2.
- [Release notes](https://github.com/rbuckton/reflect-metadata/releases)
- [Changelog](https://github.com/rbuckton/reflect-metadata/blob/main/tsconfig-release.json)
- [Commits](https://github.com/rbuckton/reflect-metadata/commits)

---
updated-dependencies:
- dependency-name: reflect-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 1f806222aa..a4878ed18f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -74,7 +74,7 @@
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
         "pem": "1.14.7",
-        "reflect-metadata": "^0.1.13",
+        "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
         "sanitize-html": "^2.12.1",
         "sortablejs": "1.15.0",
@@ -1595,11 +1595,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/reflect-metadata": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
-      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
-    },
     "node_modules/@angular/core": {
       "version": "17.3.11",
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.11.tgz",
@@ -20047,9 +20042,9 @@
       }
     },
     "node_modules/reflect-metadata": {
-      "version": "0.1.14",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz",
-      "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A=="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
+      "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
diff --git a/package.json b/package.json
index 59dce033db..b2fbccc4a4 100644
--- a/package.json
+++ b/package.json
@@ -161,7 +161,7 @@
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.7",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.0",

From 9a2b794c8e0005aab7fddf44ee2a7f8d2d45f765 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 15 Oct 2024 16:41:11 -0500
Subject: [PATCH 0605/1286] Update all @typescript-eslint dependencies to
 7.18.0

---
 package-lock.json | 173 ++++++++++------------------------------------
 package.json      |   6 +-
 2 files changed, 41 insertions(+), 138 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 237f8b010f..f464086afe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,9 +107,9 @@
         "@types/node": "^14.14.9",
         "@types/sanitize-html": "^2.9.0",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
-        "@typescript-eslint/parser": "^7.2.0",
-        "@typescript-eslint/rule-tester": "^7.2.0",
-        "@typescript-eslint/utils": "^7.2.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "@typescript-eslint/rule-tester": "^7.18.0",
+        "@typescript-eslint/utils": "^7.18.0",
         "axe-core": "^4.10.0",
         "browser-sync": "^3.0.3",
         "compression-webpack-plugin": "^9.2.0",
@@ -6860,23 +6860,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
-      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
@@ -6904,86 +6887,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
-      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
-      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/visitor-keys": "7.18.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
-      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.18.0",
-        "@typescript-eslint/types": "7.18.0",
-        "@typescript-eslint/typescript-estree": "7.18.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
-      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.18.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
@@ -7135,15 +7038,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.15.0.tgz",
-      "integrity": "sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -7163,13 +7066,13 @@
       }
     },
     "node_modules/@typescript-eslint/rule-tester": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.15.0.tgz",
-      "integrity": "sha512-QyBNG3gTpUJKb+Kx0hMbfZk9K7a3VnWEcWygZyKbw6ihTt/pf7c7AaR7JNbdnrFYc0q3JOgCXdKq8JM4RsAeaA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.18.0.tgz",
+      "integrity": "sha512-ClrFQlwen9pJcYPIBLuarzBpONQAwjmJ0+YUjAo1TGzoZFJPyUK/A7bb4Mps0u+SMJJnFXbfMN8I9feQDf0O5A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "ajv": "^6.12.6",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "lodash.merge": "4.6.2",
@@ -7210,13 +7113,13 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz",
-      "integrity": "sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -7369,9 +7272,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -7382,13 +7285,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz",
-      "integrity": "sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -7410,15 +7313,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.15.0.tgz",
-      "integrity": "sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -7432,12 +7335,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz",
-      "integrity": "sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
diff --git a/package.json b/package.json
index e0ed12a497..5ff97dec31 100644
--- a/package.json
+++ b/package.json
@@ -194,9 +194,9 @@
     "@types/node": "^14.14.9",
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@typescript-eslint/rule-tester": "^7.2.0",
-    "@typescript-eslint/utils": "^7.2.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/rule-tester": "^7.18.0",
+    "@typescript-eslint/utils": "^7.18.0",
     "axe-core": "^4.10.0",
     "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",

From 77c245ae5366f1d2507c928d3da88b13c35e0a7c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 15 Oct 2024 16:44:50 -0500
Subject: [PATCH 0606/1286] Ensure @typescript-eslint dependency updates are
 grouped by dependabot

---
 .github/dependabot.yml | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f9e32a0190..fc964ee3cf 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -45,6 +45,22 @@ updates:
         update-types:
         - "minor"
         - "patch"
+      # Group together all patch version updates for @typescript-eslint in a single PR
+      typescript-eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for @typescript-eslint.
+      typescript-eslint-security:
+        applies-to: security-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
     ignore:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
@@ -93,6 +109,22 @@ updates:
         update-types:
         - "minor"
         - "patch"
+      # Group together all patch version updates for @typescript-eslint in a single PR
+      typescript-eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for @typescript-eslint.
+      typescript-eslint-security:
+        applies-to: security-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
     ignore:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
@@ -141,6 +173,22 @@ updates:
         update-types:
         - "minor"
         - "patch"
+      # Group together all patch version updates for @typescript-eslint in a single PR
+      typescript-eslint:
+        applies-to: version-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all security updates for @typescript-eslint.
+      typescript-eslint-security:
+        applies-to: security-updates
+        patterns:
+        - "@typescript-eslint*"
+        update-types:
+        - "minor"
+        - "patch"
     ignore:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"

From 63a5217f6b171014733522b30826836418ce8d39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 22:31:55 +0000
Subject: [PATCH 0607/1286] Bump express-static-gzip from 2.1.7 to 2.1.8

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.7 to 2.1.8.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.7...v2.1.8)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index f464086afe..2504202104 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.2.0",
-        "express-static-gzip": "^2.1.7",
+        "express-static-gzip": "^2.1.8",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
@@ -12293,12 +12293,12 @@
       "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
     },
     "node_modules/express-static-gzip": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.7.tgz",
-      "integrity": "sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
+      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
       "dev": true,
       "dependencies": {
-        "serve-static": "^1.14.1"
+        "serve-static": "^1.16.2"
       }
     },
     "node_modules/express/node_modules/cookie": {
diff --git a/package.json b/package.json
index 5ff97dec31..ee44c74372 100644
--- a/package.json
+++ b/package.json
@@ -217,7 +217,7 @@
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "express-static-gzip": "^2.1.7",
+    "express-static-gzip": "^2.1.8",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",

From 696ce32ab4f536233602caf23d4a71c8bd076b32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 22:37:54 +0000
Subject: [PATCH 0608/1286] Bump the angular group with 21 updates

Bumps the angular group with 21 updates:

| Package | From | To |
| --- | --- | --- |
| [@angular/animations](https://github.com/angular/angular/tree/HEAD/packages/animations) | `17.3.11` | `17.3.12` |
| [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) | `17.3.11` | `17.3.12` |
| [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) | `17.3.11` | `17.3.12` |
| [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) | `17.3.11` | `17.3.12` |
| [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) | `17.3.11` | `17.3.12` |
| [@angular/localize](https://github.com/angular/angular) | `17.3.11` | `17.3.12` |
| [@angular/platform-browser](https://github.com/angular/angular/tree/HEAD/packages/platform-browser) | `17.3.11` | `17.3.12` |
| [@angular/platform-browser-dynamic](https://github.com/angular/angular/tree/HEAD/packages/platform-browser-dynamic) | `17.3.11` | `17.3.12` |
| [@angular/platform-server](https://github.com/angular/angular/tree/HEAD/packages/platform-server) | `17.3.11` | `17.3.12` |
| [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) | `17.3.11` | `17.3.12` |
| [@angular/ssr](https://github.com/angular/angular-cli) | `17.3.8` | `17.3.10` |
| [@angular-devkit/build-angular](https://github.com/angular/angular-cli) | `17.3.8` | `17.3.10` |
| [@angular-eslint/builder](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/builder) | `17.2.1` | `17.5.3` |
| [@angular-eslint/bundled-angular-compiler](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/bundled-angular-compiler) | `17.2.1` | `17.5.3` |
| [@angular-eslint/eslint-plugin](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin) | `17.2.1` | `17.5.3` |
| [@angular-eslint/eslint-plugin-template](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/eslint-plugin-template) | `17.2.1` | `17.5.3` |
| [@angular-eslint/schematics](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/schematics) | `17.2.1` | `17.5.3` |
| [@angular-eslint/template-parser](https://github.com/angular-eslint/angular-eslint/tree/HEAD/packages/template-parser) | `17.2.1` | `17.5.3` |
| [@angular/cli](https://github.com/angular/angular-cli) | `17.3.8` | `17.3.10` |
| [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) | `17.3.11` | `17.3.12` |
| [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) | `17.3.11` | `17.3.12` |


Updates `@angular/animations` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/animations)

Updates `@angular/common` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/common)

Updates `@angular/compiler` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/compiler)

Updates `@angular/core` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/core)

Updates `@angular/forms` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/forms)

Updates `@angular/localize` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/compare/17.3.11...17.3.12)

Updates `@angular/platform-browser` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/platform-browser)

Updates `@angular/platform-browser-dynamic` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/platform-browser-dynamic)

Updates `@angular/platform-server` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/platform-server)

Updates `@angular/router` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/router)

Updates `@angular/ssr` from 17.3.8 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.8...17.3.10)

Updates `@angular-devkit/build-angular` from 17.3.8 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.8...17.3.10)

Updates `@angular-eslint/builder` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/builder/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/builder)

Updates `@angular-eslint/bundled-angular-compiler` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/bundled-angular-compiler/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/bundled-angular-compiler)

Updates `@angular-eslint/eslint-plugin` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/eslint-plugin)

Updates `@angular-eslint/eslint-plugin-template` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/eslint-plugin-template)

Updates `@angular-eslint/schematics` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/schematics/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/schematics)

Updates `@angular-eslint/template-parser` from 17.2.1 to 17.5.3
- [Release notes](https://github.com/angular-eslint/angular-eslint/releases)
- [Changelog](https://github.com/angular-eslint/angular-eslint/blob/main/packages/template-parser/CHANGELOG.md)
- [Commits](https://github.com/angular-eslint/angular-eslint/commits/HEAD/packages/template-parser)

Updates `@angular/cli` from 17.3.8 to 17.3.10
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.8...17.3.10)

Updates `@angular/compiler-cli` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/compiler-cli)

Updates `@angular/language-service` from 17.3.11 to 17.3.12
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/17.3.12/packages/language-service)

---
updated-dependencies:
- dependency-name: "@angular/animations"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/compiler"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/forms"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/localize"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-browser-dynamic"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-server"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/router"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/ssr"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-eslint/builder"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/bundled-angular-compiler"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/eslint-plugin-template"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/schematics"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular-eslint/template-parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: angular
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/compiler-cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/language-service"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

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

diff --git a/package-lock.json b/package-lock.json
index f464086afe..1d0f3ee08c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,18 +9,18 @@
       "version": "9.0.0-next",
       "hasInstallScript": true,
       "dependencies": {
-        "@angular/animations": "^17.3.11",
+        "@angular/animations": "^17.3.12",
         "@angular/cdk": "^17.3.10",
-        "@angular/common": "^17.3.11",
-        "@angular/compiler": "^17.3.11",
-        "@angular/core": "^17.3.11",
-        "@angular/forms": "^17.3.11",
-        "@angular/localize": "^17.3.11",
-        "@angular/platform-browser": "^17.3.11",
-        "@angular/platform-browser-dynamic": "^17.3.11",
-        "@angular/platform-server": "^17.3.11",
-        "@angular/router": "^17.3.11",
-        "@angular/ssr": "^17.3.8",
+        "@angular/common": "^17.3.12",
+        "@angular/compiler": "^17.3.12",
+        "@angular/core": "^17.3.12",
+        "@angular/forms": "^17.3.12",
+        "@angular/localize": "^17.3.12",
+        "@angular/platform-browser": "^17.3.12",
+        "@angular/platform-browser-dynamic": "^17.3.12",
+        "@angular/platform-server": "^17.3.12",
+        "@angular/router": "^17.3.12",
+        "@angular/ssr": "^17.3.10",
         "@babel/runtime": "7.21.0",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -85,15 +85,15 @@
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
         "@angular-devkit/build-angular": "^17.3.8",
-        "@angular-eslint/builder": "17.2.1",
-        "@angular-eslint/bundled-angular-compiler": "17.2.1",
-        "@angular-eslint/eslint-plugin": "17.2.1",
-        "@angular-eslint/eslint-plugin-template": "17.2.1",
-        "@angular-eslint/schematics": "17.2.1",
-        "@angular-eslint/template-parser": "17.2.1",
-        "@angular/cli": "^17.3.8",
+        "@angular-eslint/builder": "17.5.3",
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@angular-eslint/eslint-plugin": "17.5.3",
+        "@angular-eslint/eslint-plugin-template": "17.5.3",
+        "@angular-eslint/schematics": "17.5.3",
+        "@angular-eslint/template-parser": "17.5.3",
+        "@angular/cli": "^17.3.10",
         "@angular/compiler-cli": "^17.3.11",
-        "@angular/language-service": "^17.3.11",
+        "@angular/language-service": "^17.3.12",
         "@cypress/schematic": "^1.5.0",
         "@fortawesome/fontawesome-free": "^6.4.0",
         "@ngrx/store-devtools": "^17.1.1",
@@ -263,12 +263,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.8.tgz",
-      "integrity": "sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==",
+      "version": "0.1703.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.10.tgz",
+      "integrity": "sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.8",
+        "@angular-devkit/core": "17.3.10",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -278,15 +278,15 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.8.tgz",
-      "integrity": "sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.10.tgz",
+      "integrity": "sha512-syz7xgzmp8/0tPJWwQIKZt7KNJfp9U7hkqNacXz4XTYz6YM0oyBXlqk2claSxywWBEkc0eJVSMD9e2ArusZBuA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1703.8",
-        "@angular-devkit/build-webpack": "0.1703.8",
-        "@angular-devkit/core": "17.3.8",
+        "@angular-devkit/architect": "0.1703.10",
+        "@angular-devkit/build-webpack": "0.1703.10",
+        "@angular-devkit/core": "17.3.10",
         "@babel/core": "7.24.0",
         "@babel/generator": "7.23.6",
         "@babel/helper-annotate-as-pure": "7.22.5",
@@ -297,7 +297,7 @@
         "@babel/preset-env": "7.24.0",
         "@babel/runtime": "7.24.0",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "17.3.8",
+        "@ngtools/webpack": "17.3.10",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.18",
@@ -339,9 +339,9 @@
         "tree-kill": "1.2.2",
         "tslib": "2.6.2",
         "undici": "6.11.1",
-        "vite": "5.1.7",
+        "vite": "5.1.8",
         "watchpack": "2.4.0",
-        "webpack": "5.90.3",
+        "webpack": "5.94.0",
         "webpack-dev-middleware": "6.1.2",
         "webpack-dev-server": "4.15.1",
         "webpack-merge": "5.10.0",
@@ -418,10 +418,378 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.8.tgz",
-      "integrity": "sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.10.tgz",
+      "integrity": "sha512-yPKmdbTJzxROAl2NS8P8eHB2mU0BqV2I0ZiKmX6oTetY2Ea4i2WzlTK39pPpG7atmdF2NPWYLXdJWAup+JxSyw==",
       "dev": true,
       "engines": {
         "node": "^18.13.0 || >=20.9.0",
@@ -434,31 +802,27 @@
         "webpack": "^5.54.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "undici-types": "~6.19.2"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "node_modules/@angular-devkit/build-angular/node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
+      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
       "dev": true,
-      "license": "MIT",
+      "engines": {
+        "node": ">=14.6.0"
+      },
       "peerDependencies": {
-        "ajv": "^6.9.1"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
@@ -520,30 +884,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -600,9 +940,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
     "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": {
@@ -614,20 +954,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
       "version": "8.4.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
@@ -762,54 +1088,99 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
-      "version": "5.90.3",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
-      "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==",
+    "node_modules/@angular-devkit/build-angular/node_modules/vite": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.8.tgz",
+      "integrity": "sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.11.5",
-        "@webassemblyjs/wasm-edit": "^1.11.5",
-        "@webassemblyjs/wasm-parser": "^1.11.5",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
-        "browserslist": "^4.21.10",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.15.0",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.0",
-        "webpack-sources": "^3.2.3"
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.35",
+        "rollup": "^4.2.0"
       },
       "bin": {
-        "webpack": "bin/webpack.js"
+        "vite": "bin/vite.js"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
       },
       "peerDependenciesMeta": {
-        "webpack-cli": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
           "optional": true
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/esbuild": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
+      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.19.12",
+        "@esbuild/android-arm": "0.19.12",
+        "@esbuild/android-arm64": "0.19.12",
+        "@esbuild/android-x64": "0.19.12",
+        "@esbuild/darwin-arm64": "0.19.12",
+        "@esbuild/darwin-x64": "0.19.12",
+        "@esbuild/freebsd-arm64": "0.19.12",
+        "@esbuild/freebsd-x64": "0.19.12",
+        "@esbuild/linux-arm": "0.19.12",
+        "@esbuild/linux-arm64": "0.19.12",
+        "@esbuild/linux-ia32": "0.19.12",
+        "@esbuild/linux-loong64": "0.19.12",
+        "@esbuild/linux-mips64el": "0.19.12",
+        "@esbuild/linux-ppc64": "0.19.12",
+        "@esbuild/linux-riscv64": "0.19.12",
+        "@esbuild/linux-s390x": "0.19.12",
+        "@esbuild/linux-x64": "0.19.12",
+        "@esbuild/netbsd-x64": "0.19.12",
+        "@esbuild/openbsd-x64": "0.19.12",
+        "@esbuild/sunos-x64": "0.19.12",
+        "@esbuild/win32-arm64": "0.19.12",
+        "@esbuild/win32-ia32": "0.19.12",
+        "@esbuild/win32-x64": "0.19.12"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
       "version": "4.15.1",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
@@ -892,42 +1263,13 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1703.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.8.tgz",
-      "integrity": "sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==",
+      "version": "0.1703.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz",
+      "integrity": "sha512-m6dDgzKLW+c3z9/TUxYmbJEtEhrdYNQ4ogdtAgEYA/FRrKueDU0WztLNr+dVbvwNP99Skovtr8sAQfN6twproQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.8",
+        "@angular-devkit/architect": "0.1703.10",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -941,9 +1283,9 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.8.tgz",
-      "integrity": "sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
+      "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
       "dev": true,
       "dependencies": {
         "ajv": "8.12.0",
@@ -968,12 +1310,12 @@
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.8.tgz",
-      "integrity": "sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.10.tgz",
+      "integrity": "sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.8",
+        "@angular-devkit/core": "17.3.10",
         "jsonc-parser": "3.2.1",
         "magic-string": "0.30.8",
         "ora": "5.4.1",
@@ -986,33 +1328,30 @@
       }
     },
     "node_modules/@angular-eslint/builder": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.2.1.tgz",
-      "integrity": "sha512-O30eaR0wCPiP+zKWvXj2JM8hVq30Wok2rp7zJMFm3PurjF9nWIIyexXkE5fa538DYZYxu8N3gQRqhpv5jvTXCg==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.5.3.tgz",
+      "integrity": "sha512-DoPCwt8qp5oMkfxY8V3wygf6/E7zzgXkPCwTRhIelklfpB3nYwLnbRSD8G5hueAU4eyASKiIuhR79E996AuUSw==",
       "dev": true,
-      "dependencies": {
-        "@nx/devkit": "17.2.8",
-        "nx": "17.2.8"
-      },
       "peerDependencies": {
         "eslint": "^7.20.0 || ^8.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.2.1.tgz",
-      "integrity": "sha512-puC0itsZv2QlrDOCcWtq1KZH+DvfrpV+mV78HHhi6+h25R5iIhr8ARKcl3EQxFjvrFq34jhG8pSupxKvFbHVfA==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.5.3.tgz",
+      "integrity": "sha512-x9jZ6mME9wxumErPGonWERXX/9TJ7mzEkQhOKt3BxBFm0sy9XQqLMAenp1PBSg3RF3rH7EEVdB2+jb75RtHp0g==",
       "dev": true
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.2.1.tgz",
-      "integrity": "sha512-9yA81BHpsaCUKRBtHGN3ieAy8HpIoffzPQMu34lYqZFT4yGHGhYmhQjNSQGBRbV2LD9dVv2U35rMHNmUcozXpw==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.5.3.tgz",
+      "integrity": "sha512-2gMRZ+SkiygrPDtCJwMfjmwIFOcvxxC4NRX/MqRo6udsa0gtqPrc8acRbwrmAXlullmhzmaeUfkHpGDSzW8pFw==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/utils": "17.2.1",
-        "@typescript-eslint/utils": "6.19.0"
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@angular-eslint/utils": "17.5.3",
+        "@typescript-eslint/utils": "7.11.0"
       },
       "peerDependencies": {
         "eslint": "^7.20.0 || ^8.0.0",
@@ -1020,15 +1359,15 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.2.1.tgz",
-      "integrity": "sha512-hl1hcHtcm90wyVL1OQGTz16oA0KHon+FFb3Qg0fLXObaXxA495Ecefd9ub5Xxg4JEOPRDi29bF1Y3YKpwflgeg==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.5.3.tgz",
+      "integrity": "sha512-RkRFagxqBPV2xdNyeQQROUm6I1Izto1Z3Wy73lCk2zq1RhVgbznniH/epmOIE8PMkHmMKmZ765FV++J/90p4Ig==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.2.1",
-        "@angular-eslint/utils": "17.2.1",
-        "@typescript-eslint/type-utils": "6.19.0",
-        "@typescript-eslint/utils": "6.19.0",
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@angular-eslint/utils": "17.5.3",
+        "@typescript-eslint/type-utils": "7.11.0",
+        "@typescript-eslint/utils": "7.11.0",
         "aria-query": "5.3.0",
         "axobject-query": "4.0.0"
       },
@@ -1037,17 +1376,31 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/utils": {
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
+      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0"
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@typescript-eslint/utils": "7.11.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1055,12 +1408,12 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1068,22 +1421,22 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1096,73 +1449,69 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "semver": "^7.5.4"
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "7.11.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+    "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": {
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
+      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@typescript-eslint/utils": "7.11.0"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0"
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1170,12 +1519,12 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1183,22 +1532,22 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1211,87 +1560,67 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "semver": "^7.5.4"
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
       }
     },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "7.11.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@angular-eslint/schematics": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.2.1.tgz",
-      "integrity": "sha512-7ldtIePI4ZTp/TBpeOZkzfv30HSAn//4TgtFuqvojudI8n8batV5FqQ0VNm1e0zitl75t8Zwtr0KYT4I6vh59g==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.5.3.tgz",
+      "integrity": "sha512-a0MlOjNLIM18l/66S+CzhANQR3QH3jDUa1MC50E4KBf1mwjQyfqd6RdfbOTMDjgFlPrfB+5JvoWOHHGj7FFM1A==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "17.2.1",
-        "@angular-eslint/eslint-plugin-template": "17.2.1",
-        "@nx/devkit": "17.2.8",
-        "ignore": "5.3.0",
-        "nx": "17.2.8",
+        "@angular-eslint/eslint-plugin": "17.5.3",
+        "@angular-eslint/eslint-plugin-template": "17.5.3",
+        "ignore": "5.3.1",
         "strip-json-comments": "3.1.1",
-        "tmp": "0.2.1"
+        "tmp": "0.2.3"
       },
       "peerDependencies": {
         "@angular/cli": ">= 17.0.0 < 18.0.0"
       }
     },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.2.1.tgz",
-      "integrity": "sha512-WPQYFvRju0tCDXQ/pwrzC911pE07JvpeDgcN2elhzV6lxDHJEZpA5O9pnW9qgNA6J6XM9Q7dBkJ22ztAzC4WFw==",
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.5.3.tgz",
+      "integrity": "sha512-NYybOsMkJUtFOW2JWALicipq0kK5+jGwA1MYyRoXjdbDlXltHUb9qkXj7p0fE6uRutBGXDl4288s8g/fZCnAIA==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.2.1",
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
         "eslint-scope": "^8.0.0"
       },
       "peerDependencies": {
@@ -1299,139 +1628,10 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/utils": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.2.1.tgz",
-      "integrity": "sha512-qQYTBXy90dWM7fhhpa5i9lTtqqhJisvRa+naCrQx9kBgR458JScLdkVIdcZ9D/rPiDCmKiVUfgcDISnjUeqTqg==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.2.1",
-        "@typescript-eslint/utils": "6.19.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
-        "typescript": "*"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@angular/animations": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.11.tgz",
-      "integrity": "sha512-1y1Egag5jbdUSUWVK+KA39N9VFDrzq9ObjbAhrXFlXKa0npBRw5bprEEeLFQMETMP9Mpjbmj2PoASfl4vqj/Iw==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
+      "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1439,7 +1639,7 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.11"
+        "@angular/core": "17.3.12"
       }
     },
     "node_modules/@angular/cdk": {
@@ -1459,15 +1659,15 @@
       }
     },
     "node_modules/@angular/cli": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.8.tgz",
-      "integrity": "sha512-X5ZOQ6ZTKVHjhIsfl32ZRqbs+FUoeHLbT7x4fh2Os/8ObDDwrUcCJPqxe2b2RB5E2d0vepYigknHeLE7gwzlNQ==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.10.tgz",
+      "integrity": "sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.8",
-        "@angular-devkit/core": "17.3.8",
-        "@angular-devkit/schematics": "17.3.8",
-        "@schematics/angular": "17.3.8",
+        "@angular-devkit/architect": "0.1703.10",
+        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/schematics": "17.3.10",
+        "@schematics/angular": "17.3.10",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "4.1.2",
@@ -1493,9 +1693,9 @@
       }
     },
     "node_modules/@angular/common": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.11.tgz",
-      "integrity": "sha512-WG+HQjUaQziYLGdbcv2aW+G73uroN5VF9yk4qWYcolW+VB8SV/DOAol8uFVgCF21cIOl5+wfJZvA4r5oG3dYaw==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
+      "integrity": "sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1503,14 +1703,14 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.11",
+        "@angular/core": "17.3.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.11.tgz",
-      "integrity": "sha512-ingRoREDPkeZGSa13DlztSjZgGArNcmsAWjj+f+vQgQekTjkfQD/N+Bix/LSt5ZdbSjHMtrkDMyRPwbNyk5Keg==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.12.tgz",
+      "integrity": "sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1518,7 +1718,7 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.11"
+        "@angular/core": "17.3.12"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -1527,9 +1727,9 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.11.tgz",
-      "integrity": "sha512-O44H/BKGw0TYq0aNTOKYZfQiTrfjbmcTl8y4UX6C9Xey8hXvijzZOAsjA0TGvvDJxeLR+sxaRF4i9Ihoatnd8g==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.12.tgz",
+      "integrity": "sha512-1F8M7nWfChzurb7obbvuE7mJXlHtY1UG58pcwcomVtpPb+kPavgAO8OEvJHYBMV+bzSxkXt5UIwL9lt9jHUxZA==",
       "dependencies": {
         "@babel/core": "7.23.9",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -1549,7 +1749,7 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.11",
+        "@angular/compiler": "17.3.12",
         "typescript": ">=5.2 <5.5"
       }
     },
@@ -1601,9 +1801,9 @@
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
     },
     "node_modules/@angular/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-2wPZwXFei3kVxK2ylIH6CdGebrC4kvooFx7qoX+250OITAEFMODJGdh/e3x0DpFUjlRvQtIFQ+YpQlfC5JnL4g==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.12.tgz",
+      "integrity": "sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1616,9 +1816,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.11.tgz",
-      "integrity": "sha512-719flo/1L64YOAxL3pzszTK+7bczVVOQDXT1khnjb48GVZdBUBwW2D+cFbqSW1VMuWWr2Amwy1lL4YM5S7qPJQ==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.12.tgz",
+      "integrity": "sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1626,25 +1826,25 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/platform-browser": "17.3.11",
+        "@angular/common": "17.3.12",
+        "@angular/core": "17.3.12",
+        "@angular/platform-browser": "17.3.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.11.tgz",
-      "integrity": "sha512-C93TH34vG6Un8G0C75TU0aeTppJWUUbRcnR/3I6/ZmTirjIspXEAcmUr2LssFnULTYqA0npNn8cfDtsoLeoGog==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.12.tgz",
+      "integrity": "sha512-MVmEXonXwdhFtIpU4q8qbXHsrAsdTjZcPPuWCU0zXVQ+VaB/y6oF7BVpmBtfyBcBCums1guEncPP+AZVvulXmQ==",
       "dev": true,
       "engines": {
         "node": "^18.13.0 || >=20.9.0"
       }
     },
     "node_modules/@angular/localize": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.11.tgz",
-      "integrity": "sha512-uc38JfGpIEb13rDZu7wZfEvLxBpWbhfsOR+yI21M4zIiKYQxI7RGgtH9GbCKZDEZmeTUSz/idA4zwRiiX8wNvQ==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.12.tgz",
+      "integrity": "sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==",
       "dependencies": {
         "@babel/core": "7.23.9",
         "@types/babel__core": "7.20.5",
@@ -1660,8 +1860,8 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.11",
-        "@angular/compiler-cli": "17.3.11"
+        "@angular/compiler": "17.3.12",
+        "@angular/compiler-cli": "17.3.12"
       }
     },
     "node_modules/@angular/localize/node_modules/@babel/core": {
@@ -1707,9 +1907,9 @@
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.11.tgz",
-      "integrity": "sha512-sWjMy8qKH6AOt5YV4OMoPhExCbGdRIPjNSwUrxCm8a8Zz5DamoX3Sib9yRk1etjBuRj+oJySSxISJim2OYXJQQ==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz",
+      "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1717,9 +1917,9 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.11",
-        "@angular/common": "17.3.11",
-        "@angular/core": "17.3.11"
+        "@angular/animations": "17.3.12",
+        "@angular/common": "17.3.12",
+        "@angular/core": "17.3.12"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -1728,9 +1928,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.11.tgz",
-      "integrity": "sha512-JPA0enJyJQ5H340WQ2wfXbCCHzjBiAljEDMr/Siw/CzSe0XI8aQYDqKMLUMtRyCdYhNCEYjnBWgXBi9Za9blZg==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz",
+      "integrity": "sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1738,16 +1938,16 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.11",
-        "@angular/compiler": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/platform-browser": "17.3.11"
+        "@angular/common": "17.3.12",
+        "@angular/compiler": "17.3.12",
+        "@angular/core": "17.3.12",
+        "@angular/platform-browser": "17.3.12"
       }
     },
     "node_modules/@angular/platform-server": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.11.tgz",
-      "integrity": "sha512-xytV4+5gTCECUORniXBTE1lvJ3qf3IWlawmm3eZylvJMqH2W3ApZrrwLM7umL8BOU9ISEhjolbwfGXornKL+5A==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz",
+      "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==",
       "dependencies": {
         "tslib": "^2.3.0",
         "xhr2": "^0.2.0"
@@ -1756,17 +1956,17 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.11",
-        "@angular/common": "17.3.11",
-        "@angular/compiler": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/platform-browser": "17.3.11"
+        "@angular/animations": "17.3.12",
+        "@angular/common": "17.3.12",
+        "@angular/compiler": "17.3.12",
+        "@angular/core": "17.3.12",
+        "@angular/platform-browser": "17.3.12"
       }
     },
     "node_modules/@angular/router": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.11.tgz",
-      "integrity": "sha512-A3aU6uHAeJfsfCw1dgNXHn2Kjw/UieRMnFwENkzz96YFCvFPCEZjy/mODuE3zHludMuqVsJhM/uUxWu8ATRTcA==",
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz",
+      "integrity": "sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1774,16 +1974,16 @@
         "node": "^18.13.0 || >=20.9.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/platform-browser": "17.3.11",
+        "@angular/common": "17.3.12",
+        "@angular/core": "17.3.12",
+        "@angular/platform-browser": "17.3.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/ssr": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.8.tgz",
-      "integrity": "sha512-qsCMMR7wEOlbPbqTOrcr/1hEoQjIQOGqq6stbK9J52IebTyzC+rZNzDjJcL9e39nSmvbIeCUaN1XquebQ12/pw==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.10.tgz",
+      "integrity": "sha512-t+NX1HufU38c0u+8mDg31cqrXZo5SEUxjBuXwdu3mOvYbkanjhbtyIgIMYr9Vru8pqncasgHLJv2RVWDvAjlEw==",
       "dependencies": {
         "critters": "0.0.22",
         "tslib": "^2.3.0"
@@ -1794,11 +1994,11 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
+      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/highlight": "^7.25.7",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -1806,9 +2006,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
-      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
+      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1915,26 +2115,26 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
-      "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
+      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
-      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
+      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
       "dependencies": {
-        "@babel/compat-data": "^7.24.7",
-        "@babel/helper-validator-option": "^7.24.7",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -1964,19 +2164,17 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
+      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1987,24 +2185,12 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2020,13 +2206,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz",
-      "integrity": "sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
+      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "regexpu-core": "^6.1.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2037,12 +2223,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2077,29 +2263,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
       "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
-      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
-      "dependencies": {
-        "@babel/template": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
-      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
+      "dev": true,
       "dependencies": {
         "@babel/types": "^7.24.7"
       },
@@ -2108,40 +2272,39 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz",
-      "integrity": "sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
+      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
+      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
-      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
+      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2150,47 +2313,36 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz",
-      "integrity": "sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
+      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
-      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
+      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz",
-      "integrity": "sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
+      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-wrap-function": "^7.24.7"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-wrap-function": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2200,26 +2352,26 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz",
-      "integrity": "sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
+      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-member-expression-to-functions": "^7.24.7",
-        "@babel/helper-optimise-call-expression": "^7.24.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.7",
+        "@babel/helper-optimise-call-expression": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2229,25 +2381,25 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
+      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz",
-      "integrity": "sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
+      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2266,39 +2418,38 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
-      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
-      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
+      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz",
-      "integrity": "sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
+      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/template": "^7.24.7",
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/template": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2317,11 +2468,11 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -2331,9 +2482,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
-      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
+      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "dependencies": {
+        "@babel/types": "^7.25.8"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -2342,12 +2496,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz",
-      "integrity": "sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
+      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2357,14 +2511,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
+      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-transform-optional-chaining": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
+        "@babel/plugin-transform-optional-chaining": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2374,13 +2528,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz",
-      "integrity": "sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
+      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2465,12 +2619,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-      "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
+      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2480,12 +2634,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
-      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
+      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2637,12 +2791,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz",
-      "integrity": "sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
+      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2687,12 +2841,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
-      "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
+      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2702,12 +2856,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz",
-      "integrity": "sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
+      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2717,13 +2871,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-      "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
+      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2733,14 +2887,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
-      "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
+      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2750,18 +2903,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz",
-      "integrity": "sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
+      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -2772,37 +2923,25 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz",
-      "integrity": "sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
+      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/template": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/template": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2812,12 +2951,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz",
-      "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
+      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2827,13 +2966,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
-      "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
+      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2843,12 +2982,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
-      "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
+      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2858,13 +2997,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
-      "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
+      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2874,13 +3012,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
-      "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
+      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2890,13 +3028,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz",
-      "integrity": "sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
+      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2906,13 +3043,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz",
-      "integrity": "sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
+      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2922,14 +3059,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz",
-      "integrity": "sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
+      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2939,13 +3076,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
-      "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
+      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2955,12 +3091,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz",
-      "integrity": "sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
+      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2970,13 +3106,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz",
-      "integrity": "sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
+      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2986,12 +3121,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
-      "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
+      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3001,13 +3136,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
-      "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
+      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3017,14 +3152,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz",
-      "integrity": "sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
+      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3034,15 +3169,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz",
-      "integrity": "sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
+      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3052,13 +3187,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
-      "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
+      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3068,13 +3203,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz",
-      "integrity": "sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
+      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3084,12 +3219,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
-      "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
+      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3099,13 +3234,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz",
-      "integrity": "sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
+      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3115,13 +3249,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz",
-      "integrity": "sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
+      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3131,15 +3264,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz",
-      "integrity": "sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
+      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.7"
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/plugin-transform-parameters": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3149,13 +3281,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
-      "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
+      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-replace-supers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-replace-supers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3165,13 +3297,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz",
-      "integrity": "sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
+      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3181,14 +3312,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz",
-      "integrity": "sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
+      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3198,12 +3328,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz",
-      "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
+      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3213,13 +3343,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-      "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
+      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3229,15 +3359,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz",
-      "integrity": "sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
+      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.24.7",
-        "@babel/helper-create-class-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-create-class-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3247,24 +3376,24 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
-      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
+      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.7"
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
-      "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
+      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3274,12 +3403,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz",
-      "integrity": "sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
+      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.25.7",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -3290,12 +3419,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
-      "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
+      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3334,12 +3463,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz",
-      "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
+      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3349,13 +3478,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz",
-      "integrity": "sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
+      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3365,12 +3494,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz",
-      "integrity": "sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
+      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3380,12 +3509,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz",
-      "integrity": "sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
+      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3395,12 +3524,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz",
-      "integrity": "sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
+      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3410,12 +3539,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
-      "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
+      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3425,13 +3554,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
-      "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
+      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3441,13 +3570,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz",
-      "integrity": "sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
+      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3457,13 +3586,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-      "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
+      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3589,12 +3718,6 @@
         "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
     "node_modules/@babel/runtime": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
@@ -3607,31 +3730,28 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
-      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
+      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/code-frame": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
-      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.24.7",
-        "@babel/helper-environment-visitor": "^7.24.7",
-        "@babel/helper-function-name": "^7.24.7",
-        "@babel/helper-hoist-variables": "^7.24.7",
-        "@babel/helper-split-export-declaration": "^7.24.7",
-        "@babel/parser": "^7.24.7",
-        "@babel/types": "^7.24.7",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -3640,37 +3760,37 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
+      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
       "dependencies": {
-        "@babel/types": "^7.24.7",
+        "@babel/types": "^7.25.7",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
-      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
-      "dependencies": {
-        "@babel/types": "^7.24.7"
+    "node_modules/@babel/traverse/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
-      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
+      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-string-parser": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -4949,18 +5069,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -5728,233 +5836,6 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/@nrwl/devkit": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-17.2.8.tgz",
-      "integrity": "sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==",
-      "dev": true,
-      "dependencies": {
-        "@nx/devkit": "17.2.8"
-      }
-    },
-    "node_modules/@nrwl/tao": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-17.2.8.tgz",
-      "integrity": "sha512-Qpk5YKeJ+LppPL/wtoDyNGbJs2MsTi6qyX/RdRrEc8lc4bk6Cw3Oul1qTXCI6jT0KzTz+dZtd0zYD/G7okkzvg==",
-      "dev": true,
-      "dependencies": {
-        "nx": "17.2.8",
-        "tslib": "^2.3.0"
-      },
-      "bin": {
-        "tao": "index.js"
-      }
-    },
-    "node_modules/@nx/devkit": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-17.2.8.tgz",
-      "integrity": "sha512-6LtiQihtZwqz4hSrtT5cCG5XMCWppG6/B8c1kNksg97JuomELlWyUyVF+sxmeERkcLYFaKPTZytP0L3dmCFXaw==",
-      "dev": true,
-      "dependencies": {
-        "@nrwl/devkit": "17.2.8",
-        "ejs": "^3.1.7",
-        "enquirer": "~2.3.6",
-        "ignore": "^5.0.4",
-        "semver": "7.5.3",
-        "tmp": "~0.2.1",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "nx": ">= 16 <= 18"
-      }
-    },
-    "node_modules/@nx/devkit/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@nx/devkit/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@nx/nx-darwin-arm64": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.8.tgz",
-      "integrity": "sha512-dMb0uxug4hM7tusISAU1TfkDK3ixYmzc1zhHSZwpR7yKJIyKLtUpBTbryt8nyso37AS1yH+dmfh2Fj2WxfBHTg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-darwin-x64": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.8.tgz",
-      "integrity": "sha512-0cXzp1tGr7/6lJel102QiLA4NkaLCkQJj6VzwbwuvmuCDxPbpmbz7HC1tUteijKBtOcdXit1/MEoEU007To8Bw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-freebsd-x64": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.8.tgz",
-      "integrity": "sha512-YFMgx5Qpp2btCgvaniDGdu7Ctj56bfFvbbaHQWmOeBPK1krNDp2mqp8HK6ZKOfEuDJGOYAp7HDtCLvdZKvJxzA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.8.tgz",
-      "integrity": "sha512-iN2my6MrhLRkVDtdivQHugK8YmR7URo1wU9UDuHQ55z3tEcny7LV3W9NSsY9UYPK/FrxdDfevj0r2hgSSdhnzA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.8.tgz",
-      "integrity": "sha512-Iy8BjoW6mOKrSMiTGujUcNdv+xSM1DALTH6y3iLvNDkGbjGK1Re6QNnJAzqcXyDpv32Q4Fc57PmuexyysZxIGg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.8.tgz",
-      "integrity": "sha512-9wkAxWzknjpzdofL1xjtU6qPFF1PHlvKCZI3hgEYJDo4mQiatGI+7Ttko+lx/ZMP6v4+Umjtgq7+qWrApeKamQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.8.tgz",
-      "integrity": "sha512-sjG1bwGsjLxToasZ3lShildFsF0eyeGu+pOQZIp9+gjFbeIkd19cTlCnHrOV9hoF364GuKSXQyUlwtFYFR4VTQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.8.tgz",
-      "integrity": "sha512-QiakXZ1xBCIptmkGEouLHQbcM4klQkcr+kEaz2PlNwy/sW3gH1b/1c0Ed5J1AN9xgQxWspriAONpScYBRgxdhA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.8.tgz",
-      "integrity": "sha512-XBWUY/F/GU3vKN9CAxeI15gM4kr3GOBqnzFZzoZC4qJt2hKSSUEWsMgeZtsMgeqEClbi4ZyCCkY7YJgU32WUGA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.8.tgz",
-      "integrity": "sha512-HTqDv+JThlLzbcEm/3f+LbS5/wYQWzb5YDXbP1wi7nlCTihNZOLNqGOkEmwlrR5tAdNHPRpHSmkYg4305W0CtA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -6257,13 +6138,13 @@
       ]
     },
     "node_modules/@schematics/angular": {
-      "version": "17.3.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.8.tgz",
-      "integrity": "sha512-2g4OmSyE9YGq50Uj7fNI26P/TSAFJ7ZuirwTF2O7Xc4XRQ29/tYIIqhezpNlTb6rlYblcQuMcUZBrMfWJHcqJw==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.10.tgz",
+      "integrity": "sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.8",
-        "@angular-devkit/schematics": "17.3.8",
+        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/schematics": "17.3.10",
         "jsonc-parser": "3.2.1"
       },
       "engines": {
@@ -6355,12 +6236,6 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
@@ -6521,28 +6396,6 @@
       "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
       "dev": true
     },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -6887,15 +6740,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@typescript-eslint/experimental-utils": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
@@ -7130,25 +6974,25 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz",
-      "integrity": "sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz",
+      "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "@typescript-eslint/utils": "6.19.0",
+        "@typescript-eslint/typescript-estree": "7.11.0",
+        "@typescript-eslint/utils": "7.11.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -7157,16 +7001,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0"
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7174,12 +7018,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7187,22 +7031,22 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7215,62 +7059,44 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "semver": "^7.5.4"
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^8.56.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "7.11.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
@@ -7356,18 +7182,6 @@
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
       "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
-    "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
-      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.6.0"
-      },
-      "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
@@ -7576,59 +7390,6 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
-    "node_modules/@yarnpkg/parsers": {
-      "version": "3.0.0-rc.46",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
-      "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
-      "dev": true,
-      "dependencies": {
-        "js-yaml": "^3.10.0",
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/@zkochan/js-yaml": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz",
-      "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
@@ -7661,16 +7422,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-import-attributes": {
       "version": "1.9.5",
       "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
@@ -8780,9 +8531,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
-      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
       "funding": [
         {
           "type": "opencollective",
@@ -8798,10 +8549,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001629",
-        "electron-to-chromium": "^1.4.796",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.16"
+        "caniuse-lite": "^1.0.30001663",
+        "electron-to-chromium": "^1.5.28",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -8955,9 +8706,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001640",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
-      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
+      "version": "1.0.30001668",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
+      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
       "funding": [
         {
           "type": "opencollective",
@@ -9722,12 +9473,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.37.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz",
-      "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
+      "version": "3.38.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+      "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.23.0"
+        "browserslist": "^4.23.3"
       },
       "funding": {
         "type": "opencollective",
@@ -10248,15 +9999,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
     "node_modules/cypress/node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -10608,15 +10350,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -10749,27 +10482,6 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/dotenv": {
-      "version": "16.3.2",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz",
-      "integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
-      }
-    },
-    "node_modules/dotenv-expand": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
-      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -10912,9 +10624,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.818",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.818.tgz",
-      "integrity": "sha512-eGvIk2V0dGImV9gWLq8fDfTTsCAeMDwZqEPMr+jMInxZdnp9Us8UpovYpRCf9NQ7VOFgrN2doNSgvISbsbNpxA=="
+      "version": "1.5.38",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
+      "integrity": "sha512-VbeVexmZ1IFh+5EfrYz1I0HTzHVIlJa112UEWhciPyeOcKJGeTv6N8WnG4wsQB81DGCaVEGhpSb6o6a8WYFXXg=="
     },
     "node_modules/element-resize-detector": {
       "version": "1.2.4",
@@ -12791,12 +12503,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
     "node_modules/fs-extra": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
@@ -13545,9 +13251,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "engines": {
         "node": ">= 4"
       }
@@ -14577,100 +14283,6 @@
         "rxjs": "^7.0.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -15600,15 +15212,6 @@
       "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
       "dev": true
     },
-    "node_modules/lines-and-columns": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
-      "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
     "node_modules/linkify-it": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
@@ -16882,9 +16485,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -16949,16 +16552,10 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/node-machine-id": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-      "dev": true
-    },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
     },
     "node_modules/nodemon": {
       "version": "2.0.22",
@@ -17222,255 +16819,6 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/nx": {
-      "version": "17.2.8",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-17.2.8.tgz",
-      "integrity": "sha512-rM5zXbuXLEuqQqcjVjClyvHwRJwt+NVImR2A6KFNG40Z60HP6X12wAxxeLHF5kXXTDRU0PFhf/yACibrpbPrAw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@nrwl/tao": "17.2.8",
-        "@yarnpkg/lockfile": "^1.1.0",
-        "@yarnpkg/parsers": "3.0.0-rc.46",
-        "@zkochan/js-yaml": "0.0.6",
-        "axios": "^1.5.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "3.1.0",
-        "cli-spinners": "2.6.1",
-        "cliui": "^8.0.1",
-        "dotenv": "~16.3.1",
-        "dotenv-expand": "~10.0.0",
-        "enquirer": "~2.3.6",
-        "figures": "3.2.0",
-        "flat": "^5.0.2",
-        "fs-extra": "^11.1.0",
-        "glob": "7.1.4",
-        "ignore": "^5.0.4",
-        "jest-diff": "^29.4.1",
-        "js-yaml": "4.1.0",
-        "jsonc-parser": "3.2.0",
-        "lines-and-columns": "~2.0.3",
-        "minimatch": "3.0.5",
-        "node-machine-id": "1.1.12",
-        "npm-run-path": "^4.0.1",
-        "open": "^8.4.0",
-        "semver": "7.5.3",
-        "string-width": "^4.2.3",
-        "strong-log-transformer": "^2.1.0",
-        "tar-stream": "~2.2.0",
-        "tmp": "~0.2.1",
-        "tsconfig-paths": "^4.1.2",
-        "tslib": "^2.3.0",
-        "yargs": "^17.6.2",
-        "yargs-parser": "21.1.1"
-      },
-      "bin": {
-        "nx": "bin/nx.js",
-        "nx-cloud": "bin/nx-cloud.js"
-      },
-      "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "17.2.8",
-        "@nx/nx-darwin-x64": "17.2.8",
-        "@nx/nx-freebsd-x64": "17.2.8",
-        "@nx/nx-linux-arm-gnueabihf": "17.2.8",
-        "@nx/nx-linux-arm64-gnu": "17.2.8",
-        "@nx/nx-linux-arm64-musl": "17.2.8",
-        "@nx/nx-linux-x64-gnu": "17.2.8",
-        "@nx/nx-linux-x64-musl": "17.2.8",
-        "@nx/nx-win32-arm64-msvc": "17.2.8",
-        "@nx/nx-win32-x64-msvc": "17.2.8"
-      },
-      "peerDependencies": {
-        "@swc-node/register": "^1.6.7",
-        "@swc/core": "^1.3.85"
-      },
-      "peerDependenciesMeta": {
-        "@swc-node/register": {
-          "optional": true
-        },
-        "@swc/core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/nx/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/nx/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/nx/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/nx/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/nx/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/nx/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/nx/node_modules/glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/nx/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nx/node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
-    },
-    "node_modules/nx/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/nx/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/nx/node_modules/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/nx/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/nx/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nx/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -19304,38 +18652,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
-    },
     "node_modules/proc-log": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
@@ -20058,9 +19374,9 @@
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -20108,15 +19424,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
+      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
       "dev": true,
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.11.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -20124,25 +19440,34 @@
         "node": ">=4"
       }
     },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true
+    },
     "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
+      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
       "dev": true,
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/request-progress": {
@@ -21828,23 +21153,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strong-log-transformer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-      "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
-      "dev": true,
-      "dependencies": {
-        "duplexer": "^0.1.1",
-        "minimist": "^1.2.0",
-        "through": "^2.3.4"
-      },
-      "bin": {
-        "sl-log-transformer": "bin/sl-log-transformer.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -21915,22 +21223,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/tar/node_modules/minipass": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
@@ -22128,15 +21420,12 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
     "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
       "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/to-fast-properties": {
@@ -22567,15 +21856,23 @@
         "node": ">=18.0"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/unfetch": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
       "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -22595,9 +21892,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -22788,467 +22085,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "node_modules/vite": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.7.tgz",
-      "integrity": "sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.35",
-        "rollup": "^4.2.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
-      }
-    },
     "node_modules/void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
diff --git a/package.json b/package.json
index 5ff97dec31..4d0c6d3813 100644
--- a/package.json
+++ b/package.json
@@ -96,18 +96,18 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "^17.3.11",
+    "@angular/animations": "^17.3.12",
     "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.11",
-    "@angular/compiler": "^17.3.11",
-    "@angular/core": "^17.3.11",
-    "@angular/forms": "^17.3.11",
-    "@angular/localize": "^17.3.11",
-    "@angular/platform-browser": "^17.3.11",
-    "@angular/platform-browser-dynamic": "^17.3.11",
-    "@angular/platform-server": "^17.3.11",
-    "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.8",
+    "@angular/common": "^17.3.12",
+    "@angular/compiler": "^17.3.12",
+    "@angular/core": "^17.3.12",
+    "@angular/forms": "^17.3.12",
+    "@angular/localize": "^17.3.12",
+    "@angular/platform-browser": "^17.3.12",
+    "@angular/platform-browser-dynamic": "^17.3.12",
+    "@angular/platform-server": "^17.3.12",
+    "@angular/router": "^17.3.12",
+    "@angular/ssr": "^17.3.10",
     "@babel/runtime": "7.21.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -172,15 +172,15 @@
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
     "@angular-devkit/build-angular": "^17.3.8",
-    "@angular-eslint/builder": "17.2.1",
-    "@angular-eslint/bundled-angular-compiler": "17.2.1",
-    "@angular-eslint/eslint-plugin": "17.2.1",
-    "@angular-eslint/eslint-plugin-template": "17.2.1",
-    "@angular-eslint/schematics": "17.2.1",
-    "@angular-eslint/template-parser": "17.2.1",
-    "@angular/cli": "^17.3.8",
+    "@angular-eslint/builder": "17.5.3",
+    "@angular-eslint/bundled-angular-compiler": "17.5.3",
+    "@angular-eslint/eslint-plugin": "17.5.3",
+    "@angular-eslint/eslint-plugin-template": "17.5.3",
+    "@angular-eslint/schematics": "17.5.3",
+    "@angular-eslint/template-parser": "17.5.3",
+    "@angular/cli": "^17.3.10",
     "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.11",
+    "@angular/language-service": "^17.3.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@ngrx/store-devtools": "^17.1.1",

From 479e1be216b3511f3bc8288e789a4028bbf8a7e6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 10:18:55 -0500
Subject: [PATCH 0609/1286] Add missing @angular-eslint/utils dependency.
 Update all @angular-eslint deps to use caret versioning

---
 package-lock.json | 152 +++++++++++++++++++++++++++++++++++-----------
 package.json      |  13 ++--
 2 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1d0f3ee08c..6e6422a140 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -85,12 +85,13 @@
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
         "@angular-devkit/build-angular": "^17.3.8",
-        "@angular-eslint/builder": "17.5.3",
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@angular-eslint/eslint-plugin": "17.5.3",
-        "@angular-eslint/eslint-plugin-template": "17.5.3",
-        "@angular-eslint/schematics": "17.5.3",
-        "@angular-eslint/template-parser": "17.5.3",
+        "@angular-eslint/builder": "^17.5.3",
+        "@angular-eslint/bundled-angular-compiler": "^17.5.3",
+        "@angular-eslint/eslint-plugin": "^17.5.3",
+        "@angular-eslint/eslint-plugin-template": "^17.5.3",
+        "@angular-eslint/schematics": "^17.5.3",
+        "@angular-eslint/template-parser": "^17.5.3",
+        "@angular-eslint/utils": "^17.5.3",
         "@angular/cli": "^17.3.10",
         "@angular/compiler-cli": "^17.3.11",
         "@angular/language-service": "^17.3.12",
@@ -1376,20 +1377,6 @@
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/utils": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
-      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
-        "typescript": "*"
-      }
-    },
     "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
@@ -1487,20 +1474,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
-      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
-        "typescript": "*"
-      }
-    },
     "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
       "version": "7.11.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
@@ -1628,6 +1601,117 @@
         "typescript": "*"
       }
     },
+    "node_modules/@angular-eslint/utils": {
+      "version": "17.5.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
+      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-eslint/bundled-angular-compiler": "17.5.3",
+        "@typescript-eslint/utils": "7.11.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "typescript": "*"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
+      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
+      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/visitor-keys": "7.11.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
+      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.11.0",
+        "@typescript-eslint/types": "7.11.0",
+        "@typescript-eslint/typescript-estree": "7.11.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      }
+    },
+    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
+      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.11.0",
+        "eslint-visitor-keys": "^3.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@angular/animations": {
       "version": "17.3.12",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
diff --git a/package.json b/package.json
index 4d0c6d3813..0834316052 100644
--- a/package.json
+++ b/package.json
@@ -172,12 +172,13 @@
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
     "@angular-devkit/build-angular": "^17.3.8",
-    "@angular-eslint/builder": "17.5.3",
-    "@angular-eslint/bundled-angular-compiler": "17.5.3",
-    "@angular-eslint/eslint-plugin": "17.5.3",
-    "@angular-eslint/eslint-plugin-template": "17.5.3",
-    "@angular-eslint/schematics": "17.5.3",
-    "@angular-eslint/template-parser": "17.5.3",
+    "@angular-eslint/builder": "^17.5.3",
+    "@angular-eslint/bundled-angular-compiler": "^17.5.3",
+    "@angular-eslint/eslint-plugin": "^17.5.3",
+    "@angular-eslint/eslint-plugin-template": "^17.5.3",
+    "@angular-eslint/schematics": "^17.5.3",
+    "@angular-eslint/template-parser": "^17.5.3",
+    "@angular-eslint/utils": "^17.5.3",
     "@angular/cli": "^17.3.10",
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.12",

From 9c2b12ead822aa2e25b7848b0e87731774780c6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:03:14 +0000
Subject: [PATCH 0610/1286] Bump @babel/runtime from 7.21.0 to 7.25.7

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.21.0 to 7.25.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.7/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 6e6422a140..48d4ddad6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/platform-server": "^17.3.12",
         "@angular/router": "^17.3.12",
         "@angular/ssr": "^17.3.10",
-        "@babel/runtime": "7.21.0",
+        "@babel/runtime": "7.25.7",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
@@ -1014,12 +1014,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/sass": {
       "version": "1.71.1",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
@@ -3803,11 +3797,11 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -19470,9 +19464,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
diff --git a/package.json b/package.json
index 0834316052..c058d5cbe7 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@angular/platform-server": "^17.3.12",
     "@angular/router": "^17.3.12",
     "@angular/ssr": "^17.3.10",
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.25.7",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",

From 72246bdc60cc4e8a22142809c8c1ef34f5153bb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:03:28 +0000
Subject: [PATCH 0611/1286] Bump @fortawesome/fontawesome-free from 6.5.2 to
 6.6.0

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.5.2 to 6.6.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.5.2...6.6.0)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 6e6422a140..f46fbd813f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "@angular/compiler-cli": "^17.3.11",
         "@angular/language-service": "^17.3.12",
         "@cypress/schematic": "^1.5.0",
-        "@fortawesome/fontawesome-free": "^6.4.0",
+        "@fortawesome/fontawesome-free": "^6.6.0",
         "@ngrx/store-devtools": "^17.1.1",
         "@ngtools/webpack": "^16.2.12",
         "@types/deep-freeze": "0.1.2",
@@ -4932,11 +4932,10 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
-      "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
+      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
       "dev": true,
-      "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
diff --git a/package.json b/package.json
index 0834316052..9e0b579ad1 100644
--- a/package.json
+++ b/package.json
@@ -183,7 +183,7 @@
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.12",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.6.0",
     "@ngrx/store-devtools": "^17.1.1",
     "@ngtools/webpack": "^16.2.12",
     "@types/deep-freeze": "0.1.2",

From a8115b7201ad41765a9a1795c3241fe16c946b7a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 13:37:32 -0500
Subject: [PATCH 0612/1286] Move ng-mocks to dev dependencies. It's only for
 testing

---
 package-lock.json | 3 ++-
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 60ffa84a93..7740e49e6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,6 @@
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.11.0",
         "morgan": "^1.10.0",
-        "ng-mocks": "^14.13.1",
         "ng2-file-upload": "5.0.0",
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^16.0.0",
@@ -140,6 +139,7 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
+        "ng-mocks": "^14.13.1",
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
         "postcss": "^8.4",
@@ -16720,6 +16720,7 @@
       "version": "14.13.1",
       "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
       "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
diff --git a/package.json b/package.json
index 6c55eafd00..9e8562f383 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,6 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.11.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.13.1",
     "ng2-file-upload": "5.0.0",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",
@@ -227,6 +226,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
+    "ng-mocks": "^14.13.1",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",

From 8c88f7052a65bbabde3a19223e967feddb186008 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 14:15:11 -0500
Subject: [PATCH 0613/1286] Wait on viewevent to trigger before checking
 Collection Page in e2e tests. This ensures Collection page is fully loaded
 because viewevent triggers upon loading.

---
 cypress/e2e/collection-page.cy.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cypress/e2e/collection-page.cy.ts b/cypress/e2e/collection-page.cy.ts
index d12536d332..373da07888 100644
--- a/cypress/e2e/collection-page.cy.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -3,8 +3,15 @@ import { testA11y } from 'cypress/support/utils';
 describe('Collection Page', () => {
 
   it('should pass accessibility tests', () => {
+    cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
+
+    // Visit Collections page
     cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
+    // Wait for the "viewevent" to trigger on the Collection page.
+    // This ensures our <ds-collection-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+    cy.wait('@viewevent');
+
     // <ds-collection-page> tag must be loaded
     cy.get('ds-collection-page').should('be.visible');
 

From dfe2d4580ebcd305080a67cd44283286b5dda0ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:43:58 +0000
Subject: [PATCH 0614/1286] Bump nouislider from 15.7.1 to 15.8.1

Bumps [nouislider](https://github.com/leongersen/noUiSlider) from 15.7.1 to 15.8.1.
- [Release notes](https://github.com/leongersen/noUiSlider/releases)
- [Changelog](https://github.com/leongersen/noUiSlider/blob/master/CHANGELOG.MD)
- [Commits](https://github.com/leongersen/noUiSlider/compare/15.7.1...15.8.1)

---
updated-dependencies:
- dependency-name: nouislider
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 cb8456501a..ba2dbd1c62 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
     "ngx-ui-switch": "^14.1.0",
-    "nouislider": "^15.7.1",
+    "nouislider": "^15.8.1",
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
diff --git a/yarn.lock b/yarn.lock
index 26f50cb912..b584dd5181 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8644,10 +8644,10 @@ normalize-url@^4.5.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-nouislider@^15.7.1:
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.7.1.tgz#77d55e47d9b4cd771728515713df43b489db9705"
-  integrity sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w==
+nouislider@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.8.1.tgz#18729ed29738d2d328a1b5e0429d38eb8be8a696"
+  integrity sha512-93TweAi8kqntHJSPiSWQ1o/uZ29VWOmal9YKb6KKGGlCkugaNfAupT7o1qTHqdJvNQ7S0su5rO6qRFCjP8fxtw==
 
 npm-bundled@^3.0.0:
   version "3.0.0"

From a74cd848feeabe380026f504f0e70f6de134fd65 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 16:33:20 -0500
Subject: [PATCH 0615/1286] Add basic e2e testing for i18n

---
 cypress/e2e/header.cy.ts                      | 25 +++++++++++++++++++
 .../lang-switch/lang-switch.component.html    |  1 +
 2 files changed, 26 insertions(+)

diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 043d67dd2b..1471e5ae6c 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -10,4 +10,29 @@ describe('Header', () => {
     // Analyze <ds-header> for accessibility
     testA11y('ds-header');
   });
+
+  it('should allow for changing language to German (for example)', () => {
+    cy.visit('/');
+
+    // Click the language switcher (globe) in header
+    cy.get('a[data-test="lang-switch"]').click();
+    // Click on the "Deusch" language in dropdown
+    cy.get('#language-menu-list li').contains('Deutsch').click();
+
+    // HTML "lang" attribute should switch to "de"
+    cy.get('html').invoke('attr', 'lang').should('eq', 'de');
+
+    // Login menu should now be in German
+    cy.get('a[data-test="login-menu"]').contains('Anmelden');
+
+    // Change back to English from language switcher
+    cy.get('a[data-test="lang-switch"]').click();
+    cy.get('#language-menu-list li').contains('English').click();
+
+    // HTML "lang" attribute should switch to "en"
+    cy.get('html').invoke('attr', 'lang').should('eq', 'en');
+
+    // Login menu should now be in English
+    cy.get('a[data-test="login-menu"]').contains('Log In');
+  });
 });
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 9be622099b..6d1727cfe7 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -5,6 +5,7 @@
      aria-haspopup="menu"
      [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+     data-test="lang-switch"
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>

From ad8dd8b648d3cdbb3d3ce61f652051ce3d6c4a3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:45:45 +0000
Subject: [PATCH 0616/1286] Bump core-js from 3.30.1 to 3.38.1

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.30.1 to 3.38.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.38.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 cb8456501a..1a866c2909 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.4",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.30.1",
+    "core-js": "^3.38.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index 26f50cb912..c12d67a67f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4413,10 +4413,10 @@ core-js-compat@^3.25.1:
   dependencies:
     browserslist "^4.21.5"
 
-core-js@^3.30.1:
-  version "3.30.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba"
-  integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==
+core-js@^3.38.1:
+  version "3.38.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e"
+  integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
 
 core-util-is@1.0.2:
   version "1.0.2"

From e181e854cc6d911021500fac7c8321592077a212 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:47:00 +0000
Subject: [PATCH 0617/1286] Bump @types/node from 14.18.42 to 14.18.63

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.18.42 to 14.18.63.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 cb8456501a..8418678f90 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.14.194",
-    "@types/node": "^14.14.9",
+    "@types/node": "^14.18.63",
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^5.59.1",
     "@typescript-eslint/parser": "^5.59.1",
diff --git a/yarn.lock b/yarn.lock
index 26f50cb912..0883a4816f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2593,10 +2593,10 @@
   resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.14.9":
-  version "14.18.42"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz"
-  integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^14.18.63":
+  version "14.18.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"

From d674bcc3908c4cf8469853778fc167295320a51c Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 16 Sep 2024 15:47:42 +0200
Subject: [PATCH 0618/1286] 118220: Integrate live-region component into
 item-edit-bitsream page

---
 .../item-edit-bitstream-bundle.component.html |  2 +-
 .../item-edit-bitstream-bundle.component.ts   | 21 ++++++++++++-------
 src/assets/i18n/en.json5                      |  4 ++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 0338055df5..d530fb38d1 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -68,7 +68,7 @@
 
         <ng-container *ngFor="let entry of (tableEntries$ | async)">
           <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row" cdkDrag
-          (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
+          (cdkDragStarted)="dragStart(entry.name)" (cdkDragEnded)="dragEnd(entry.name)">
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index bd99fc1a09..24319f4a83 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -30,6 +30,8 @@ import { RequestService } from '../../../../core/data/request.service';
 import { ItemBitstreamsService } from '../item-bitstreams.service';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { hasValue } from '../../../../shared/empty.util';
+import { LiveRegionService } from '../../../../shared/live-region/live-region.service';
+import { TranslateService } from '@ngx-translate/core';
 
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
@@ -166,11 +168,6 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   pageSize$: BehaviorSubject<number>;
 
-  /**
-   * Whether the table has multiple pages
-   */
-  hasMultiplePages = false;
-
   /**
    * The self url of the bundle, also used when retrieving fieldUpdates
    */
@@ -190,6 +187,8 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     protected paginationService: PaginationService,
     protected requestService: RequestService,
     protected itemBitstreamsService: ItemBitstreamsService,
+    protected liveRegionService: LiveRegionService,
+    protected translateService: TranslateService,
   ) {
   }
 
@@ -301,7 +300,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.paginationComponent.doPageSizeChange(pageSize);
   }
 
-  dragStart() {
+  dragStart(bitstreamName: string) {
     // Only open the drag tooltip when there are multiple pages
     this.paginationComponent.shouldShowBottomPager.pipe(
       take(1),
@@ -309,10 +308,18 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     ).subscribe(() => {
       this.dragTooltip.open();
     });
+
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.drag',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
   }
 
-  dragEnd() {
+  dragEnd(bitstreamName: string) {
     this.dragTooltip.close();
+
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.drop',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
   }
 
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f2dbf9b2d1..48fd581bdf 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1950,6 +1950,10 @@
 
   "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
 
+  "item.edit.bitstreams.edit.live.drag": "{{ bitstream }} grabbed",
+
+  "item.edit.bitstreams.edit.live.drop": "{{ bitstream }} dropped",
+
   "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
 
   "item.edit.bitstreams.headers.actions": "Actions",

From 1f909dc6ea0d84859fbeef690c9bd212417c7a99 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 17 Sep 2024 13:34:08 +0200
Subject: [PATCH 0619/1286] 118223: Add instructive alert to item-bitstreams
 edit page

---
 .../item-bitstreams/item-bitstreams.component.html         | 7 ++++++-
 .../item-bitstreams/item-bitstreams.component.ts           | 4 ++++
 src/assets/i18n/en.json5                                   | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 3527f2f5b8..1c13154bfa 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,4 +1,8 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
+  <div class="mt-2" id="reorder-description">
+    <ds-alert [content]="'item.edit.bitstreams.info-alert'" [type]="AlertType.Info"></ds-alert>
+  </div>
+
   <div class="button-row top d-flex mt-2 space-children-mr">
     <button class="mr-auto btn btn-success"
             [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
@@ -29,7 +33,8 @@
                                    [item]="item"
                                    [columnSizes]="columnSizes"
                                    [isFirstTable]="isFirst"
-                                   (dropObject)="dropBitstream(bundle, $event)">
+                                   (dropObject)="dropBitstream(bundle, $event)"
+                                   aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
   </div>
   <div *ngIf="bundles?.length === 0"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index e7c846b5da..7757170f4e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -25,6 +25,7 @@ import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/res
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { Operation } from 'fast-json-patch';
 import { ItemBitstreamsService } from './item-bitstreams.service';
+import { AlertType } from '../../../shared/alert/aletr-type';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -36,6 +37,9 @@ import { ItemBitstreamsService } from './item-bitstreams.service';
  */
 export class ItemBitstreamsComponent extends AbstractItemUpdateComponent implements OnDestroy {
 
+  // Declared for use in template
+  protected readonly AlertType = AlertType;
+
   /**
    * The currently listed bundles
    */
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 48fd581bdf..ab6f3792ca 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1956,6 +1956,8 @@
 
   "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
 
+  "item.edit.bitstreams.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+
   "item.edit.bitstreams.headers.actions": "Actions",
 
   "item.edit.bitstreams.headers.bundle": "Bundle",

From 181ea6d7c99a6133d327833ac41a0a2b4254502b Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 18 Sep 2024 11:57:41 +0200
Subject: [PATCH 0620/1286] 118223: Implement bitstream reordering with
 keyboard

---
 .../item-bitstreams.component.html            |   1 -
 .../item-bitstreams.component.spec.ts         |  43 +-
 .../item-bitstreams.component.ts              |  87 ++--
 .../item-bitstreams.service.spec.ts           |  19 +
 .../item-bitstreams.service.ts                | 303 ++++++++++++-
 .../item-edit-bitstream-bundle.component.html |  33 +-
 ...em-edit-bitstream-bundle.component.spec.ts |   1 +
 .../item-edit-bitstream-bundle.component.ts   | 405 ++++++++++++------
 .../live-region/live-region.service.stub.ts   |  30 ++
 src/assets/i18n/en.json5                      |   8 +-
 10 files changed, 727 insertions(+), 203 deletions(-)
 create mode 100644 src/app/shared/live-region/live-region.service.stub.ts

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 1c13154bfa..b9af2a7d18 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -33,7 +33,6 @@
                                    [item]="item"
                                    [columnSizes]="columnSizes"
                                    [isFirstTable]="isFirst"
-                                   (dropObject)="dropBitstream(bundle, $event)"
                                    aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
   </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 6ce7394473..a5549a6ba0 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -25,6 +25,10 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } f
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { ItemBitstreamsService } from './item-bitstreams.service';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -76,6 +80,7 @@ let objectCache: ObjectCacheService;
 let requestService: RequestService;
 let searchConfig: SearchConfigurationService;
 let bundleService: BundleDataService;
+let itemBitstreamsService: ItemBitstreamsService;
 
 describe('ItemBitstreamsComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -147,6 +152,19 @@ describe('ItemBitstreamsComponent', () => {
       patch: createSuccessfulRemoteDataObject$({}),
     });
 
+    itemBitstreamsService = jasmine.createSpyObj('itemBitstreamsService', {
+      getColumnSizes: new ResponsiveTableSizes([
+        new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+        new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+        new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+        new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+      ]),
+      getSelectedBitstream$: observableOf({}),
+      getInitialBundlesPaginationOptions: new PaginationComponentOptions(),
+      removeMarkedBitstreams: createSuccessfulRemoteDataObject$({}),
+      displayNotifications: undefined,
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemBitstreamsComponent, ObjectValuesPipe, VarDirective],
@@ -161,6 +179,7 @@ describe('ItemBitstreamsComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: SearchConfigurationService, useValue: searchConfig },
         { provide: BundleDataService, useValue: bundleService },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
         ChangeDetectorRef
       ], schemas: [
         NO_ERRORS_SCHEMA
@@ -181,28 +200,8 @@ describe('ItemBitstreamsComponent', () => {
       comp.submit();
     });
 
-    it('should call removeMultiple on the bitstreamService for the marked field', () => {
-      expect(bitstreamService.removeMultiple).toHaveBeenCalledWith([bitstream2]);
-    });
-
-    it('should not call removeMultiple on the bitstreamService for the unmarked field', () => {
-      expect(bitstreamService.removeMultiple).not.toHaveBeenCalledWith([bitstream1]);
-    });
-  });
-
-  describe('when dropBitstream is called', () => {
-    beforeEach((done) => {
-      comp.dropBitstream(bundle, {
-        fromIndex: 0,
-        toIndex: 50,
-        finish: () => {
-          done();
-        }
-      });
-    });
-
-    it('should send out a patch for the move operation', () => {
-      expect(bundleService.patch).toHaveBeenCalled();
+    it('should call removeMarkedBitstreams on the itemBitstreamsService', () => {
+      expect(itemBitstreamsService.removeMarkedBitstreams).toHaveBeenCalled();
     });
   });
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 7757170f4e..4ced3dd649 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, NgZone, OnDestroy, HostListener } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { map, switchMap, take } from 'rxjs/operators';
 import { Observable, Subscription, zip as observableZip } from 'rxjs';
@@ -8,13 +8,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue } from '../../../shared/empty.util';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
 import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
-  getFirstCompletedRemoteData
 } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
@@ -23,7 +21,6 @@ import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { NoContent } from '../../../core/shared/NoContent.model';
-import { Operation } from 'fast-json-patch';
 import { ItemBitstreamsService } from './item-bitstreams.service';
 import { AlertType } from '../../../shared/alert/aletr-type';
 
@@ -88,13 +85,63 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   postItemInit(): void {
     const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
 
-    this. bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: bundlesOptions})).pipe(
+    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: bundlesOptions})).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
     );
   }
 
+  /**
+   * Handles keyboard events that should move the currently selected bitstream up
+   */
+  @HostListener('document:keydown.arrowUp', ['$event'])
+  moveUp(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamUp();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should move the currently selected bitstream down
+   */
+  @HostListener('document:keydown.arrowDown', ['$event'])
+  moveDown(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamDown();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should cancel the currently selected bitstream.
+   * A cancel means that the selected bitstream is returned to its original position and is no longer selected.
+   * @param event
+   */
+  @HostListener('document:keyup.escape', ['$event'])
+  cancelSelection(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.cancelSelection();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should clear the currently selected bitstream.
+   * A clear means that the selected bitstream remains in its current position but is no longer selected.
+   */
+  @HostListener('document:keydown.enter', ['$event'])
+  @HostListener('document:keydown.space', ['$event'])
+  clearSelection(event: KeyboardEvent) {
+    // Only when no specific element is in focus do we want to clear the currently selected bitstream
+    // Otherwise we might clear the selection when a different action was intended, e.g. clicking a button or selecting
+    // a different bitstream.
+    if (event.target instanceof Element && event.target.tagName === 'BODY') {
+      this.itemBitstreamsService.clearSelection();
+    }
+  }
+
   /**
    * Initialize the notification messages prefix
    */
@@ -120,36 +167,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     });
   }
 
-  /**
-   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
-   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
-   * navigate the user to the correct page)
-   * @param bundle  The bundle to send patch requests to
-   * @param event   The event containing the index the bitstream came from and was dropped to
-   */
-  dropBitstream(bundle: Bundle, event: any) {
-    this.zone.runOutsideAngular(() => {
-      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
-        const moveOperation = {
-          op: 'move',
-          from: `/_links/bitstreams/${event.fromIndex}/href`,
-          path: `/_links/bitstreams/${event.toIndex}/href`
-        } as Operation;
-        this.bundleService.patch(bundle, [moveOperation]).pipe(
-          getFirstCompletedRemoteData(),
-        ).subscribe((response: RemoteData<Bundle>) => {
-          this.zone.run(() => {
-            this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
-            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
-            this.requestService.setStaleByHrefSubstring(bundle.self).pipe(
-              take(1)
-            ).subscribe(() => event.finish());
-          });
-        });
-      }
-    });
-  }
-
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
index 89ecfb518f..e144e81ec7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -16,6 +16,12 @@ import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject
 } from '../../../shared/remote-data.utils';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { of } from 'rxjs';
+import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub';
 
 describe('ItemBitstreamsService', () => {
   let service: ItemBitstreamsService;
@@ -23,21 +29,34 @@ describe('ItemBitstreamsService', () => {
   let translateService: TranslateService;
   let objectUpdatesService: ObjectUpdatesService;
   let bitstreamDataService: BitstreamDataService;
+  let bundleDataService: BundleDataService;
   let dsoNameService: DSONameService;
+  let requestService: RequestService;
+  let liveRegionService: LiveRegionService;
 
   beforeEach(() => {
     notificationsService = new NotificationsServiceStub() as any;
     translateService = getMockTranslateService();
     objectUpdatesService = new ObjectUpdatesServiceStub() as any;
     bitstreamDataService = new BitstreamDataServiceStub() as any;
+    bundleDataService = jasmine.createSpyObj('bundleDataService', {
+      patch: createSuccessfulRemoteDataObject$(new Bundle()),
+    });
     dsoNameService = new DSONameServiceMock() as any;
+    requestService = jasmine.createSpyObj('requestService', {
+      setStaleByHrefSubstring: of(true),
+    });
+    liveRegionService = getLiveRegionServiceStub();
 
     service = new ItemBitstreamsService(
       notificationsService,
       translateService,
       objectUpdatesService,
       bitstreamDataService,
+      bundleDataService,
       dsoNameService,
+      requestService,
+      liveRegionService,
     );
   });
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index 487df77b28..21dc415198 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -3,38 +3,277 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { RemoteData } from '../../../core/data/remote-data';
-import { isNotEmpty, hasValue } from '../../../shared/empty.util';
+import { isNotEmpty, hasValue, hasNoValue } from '../../../shared/empty.util';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, zip as observableZip } from 'rxjs';
+import { Observable, zip as observableZip, BehaviorSubject } from 'rxjs';
 import { NoContent } from '../../../core/shared/NoContent.model';
-import { take, switchMap, map } from 'rxjs/operators';
+import { take, switchMap, map, tap } from 'rxjs/operators';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { BitstreamTableEntry } from './item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { getFirstSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { getBitstreamDownloadRoute } from '../../../app-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { MoveOperation } from 'fast-json-patch';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
 
+/**
+ * Interface storing all the information necessary to create a row in the bitstream edit table
+ */
+export interface BitstreamTableEntry {
+  /**
+   * The bitstream
+   */
+  bitstream: Bitstream,
+  /**
+   * The uuid of the Bitstream
+   */
+  id: string,
+  /**
+   * The name of the Bitstream
+   */
+  name: string,
+  /**
+   * The name of the Bitstream with all whitespace removed
+   */
+  nameStripped: string,
+  /**
+   * The description of the Bitstream
+   */
+  description: string,
+  /**
+   * Observable emitting the Format of the Bitstream
+   */
+  format: Observable<BitstreamFormat>,
+  /**
+   * The download url of the Bitstream
+   */
+  downloadUrl: string,
+}
+
+/**
+ * Interface storing information necessary to highlight and reorder the selected bitstream entry
+ */
+export interface SelectedBitstreamTableEntry {
+  /**
+   * The selected entry
+   */
+  bitstream: BitstreamTableEntry,
+  /**
+   * The bundle the bitstream belongs to
+   */
+  bundle: Bundle,
+  /**
+   * The total number of bitstreams in the bundle
+   */
+  bundleSize: number,
+  /**
+   * The original position of the bitstream within the bundle.
+   */
+  originalPosition: number,
+  /**
+   * The current position of the bitstream within the bundle.
+   */
+  currentPosition: number,
+}
+
+/**
+ * This service handles the selection and updating of the bitstreams and their order on the
+ * 'Edit Item' -> 'Bitstreams' page.
+ */
 @Injectable(
   { providedIn: 'root' },
 )
 export class ItemBitstreamsService {
 
+  /**
+   * BehaviorSubject which emits every time the selected bitstream changes.
+   */
+  protected selectedBitstream$: BehaviorSubject<SelectedBitstreamTableEntry> = new BehaviorSubject(null);
+
+  protected isPerformingMoveRequest = false;
+
   constructor(
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
     protected objectUpdatesService: ObjectUpdatesService,
     protected bitstreamService: BitstreamDataService,
+    protected bundleService: BundleDataService,
     protected dsoNameService: DSONameService,
+    protected requestService: RequestService,
+    protected liveRegionService: LiveRegionService,
   ) {
   }
 
+  /**
+   * Returns the observable emitting the currently selected bitstream
+   */
+  getSelectedBitstream$(): Observable<SelectedBitstreamTableEntry> {
+    return this.selectedBitstream$;
+  }
+
+  /**
+   * Returns a copy of the currently selected bitstream
+   */
+  getSelectedBitstream(): SelectedBitstreamTableEntry {
+    const selected = this.selectedBitstream$.getValue();
+
+    if (hasNoValue(selected)) {
+      return selected;
+    }
+
+    return Object.assign({}, selected);
+  }
+
+  hasSelectedBitstream(): boolean {
+    return hasValue(this.getSelectedBitstream());
+  }
+
+  /**
+   * Select the provided entry
+   */
+  selectBitstreamEntry(entry: SelectedBitstreamTableEntry) {
+    if (entry !== this.selectedBitstream$.getValue()) {
+      this.announceSelect(entry.bitstream.name);
+      this.updateSelectedBitstream(entry);
+    }
+  }
+
+  /**
+   * Makes the {@link selectedBitstream$} observable emit the provided {@link SelectedBitstreamTableEntry}.
+   * @protected
+   */
+  protected updateSelectedBitstream(entry: SelectedBitstreamTableEntry) {
+    this.selectedBitstream$.next(entry);
+  }
+
+  /**
+   * Unselects the selected bitstream. Does nothing if no bitstream is selected.
+   */
+  clearSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasValue(selected)) {
+      this.updateSelectedBitstream(null);
+      this.announceClear(selected.bitstream.name);
+    }
+  }
+
+  /**
+   * Returns the currently selected bitstream to its original position and unselects the bitstream.
+   * Does nothing if no bitstream is selected.
+   */
+  cancelSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+      return;
+    }
+
+    this.selectedBitstream$.next(null);
+
+    const originalPosition = selected.originalPosition;
+    const currentPosition = selected.currentPosition;
+
+    // If the selected bitstream has not moved, there is no need to return it to its original position
+    if (currentPosition === originalPosition) {
+      this.announceClear(selected.bitstream.name);
+    } else {
+      this.announceCancel(selected.bitstream.name, originalPosition);
+      this.performBitstreamMoveRequest(selected.bundle, currentPosition, originalPosition);
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position up in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the beginning of the bundle.
+   */
+  moveSelectedBitstreamUp() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition > 0) {
+      const newPosition = originalPosition - 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectedBitstream(selected);
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position down in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the end of the bundle.
+   */
+  moveSelectedBitstreamDown() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition < selected.bundleSize - 1) {
+      const newPosition = originalPosition + 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectedBitstream(selected);
+    }
+  }
+
+  /**
+   * Sends out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload)
+   * @param bundle The bundle to send patch requests to
+   * @param fromIndex The index to move from
+   * @param toIndex The index to move to
+   * @param finish Optional: Function to execute once the response has been received
+   */
+  performBitstreamMoveRequest(bundle: Bundle, fromIndex: number, toIndex: number, finish?: () => void) {
+    if (this.isPerformingMoveRequest) {
+      console.warn('Attempted to perform move request while previous request has not completed yet');
+      return;
+    }
+
+    const moveOperation: MoveOperation = {
+      op: 'move',
+      from: `/_links/bitstreams/${fromIndex}/href`,
+      path: `/_links/bitstreams/${toIndex}/href`,
+    };
+
+    this.isPerformingMoveRequest = true;
+    this.bundleService.patch(bundle, [moveOperation]).pipe(
+      getFirstCompletedRemoteData(),
+      tap((response: RemoteData<Bundle>) => this.displayNotifications('item.edit.bitstreams.notifications.move', [response])),
+      switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
+      take(1),
+    ).subscribe(() => {
+      this.isPerformingMoveRequest = false;
+      finish?.();
+    });
+  }
+
   /**
    * Returns the pagination options to use when fetching the bundles
    */
@@ -46,6 +285,10 @@ export class ItemBitstreamsService {
     });
   }
 
+  /**
+   * Returns the initial pagination options to use when fetching the bitstreams
+   * @param bundleName The name of the bundle, will be as pagination id.
+   */
   getInitialBitstreamsPaginationOptions(bundleName: string): PaginationComponentOptions {
     return Object.assign(new PaginationComponentOptions(),{
       id: bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
@@ -118,6 +361,10 @@ export class ItemBitstreamsService {
     );
   }
 
+  /**
+   * Creates an array of {@link BitstreamTableEntry}s from an array of {@link Bitstream}s
+   * @param bitstreams The bitstreams array to map to table entries
+   */
   mapBitstreamsToTableEntries(bitstreams: Bitstream[]): BitstreamTableEntry[] {
     return bitstreams.map((bitstream) => {
       const name = this.dsoNameService.getName(bitstream);
@@ -143,7 +390,7 @@ export class ItemBitstreamsService {
     // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
     // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
     // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
-    // ID can not contain strings itself.
+    // ID can not contain spaces itself.
     return this.stripWhiteSpace(name);
   }
 
@@ -155,4 +402,48 @@ export class ItemBitstreamsService {
     // '/\s+/g' matches all occurrences of any amount of whitespace characters
     return str.replace(/\s+/g, '');
   }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was selected.
+   * @param bitstreamName The name of the bitstream that was selected.
+   */
+  announceSelect(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.select',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was moved to the provided
+   * position.
+   * @param bitstreamName The name of the bitstream that moved.
+   * @param toPosition The zero-indexed position that the bitstream moved to.
+   */
+  announceMove(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.move',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected and
+   * was returned to the provided position.
+   * @param bitstreamName The name of the bitstream that is no longer selected
+   * @param toPosition The zero-indexed position the bitstream returned to.
+   */
+  announceCancel(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.cancel',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected.
+   * @param bitstreamName The name of the bitstream that is no longer selected.
+   */
+  announceClear(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.clear',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index d530fb38d1..06fb571ce4 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -5,7 +5,8 @@
                  [hidePagerWhenSinglePage]="true"
                  [hidePaginationDetail]="true"
                  [paginationOptions]="paginationOptions"
-                 [collectionSize]="bitstreamsList.totalElements">
+                 [collectionSize]="bitstreamsList.totalElements"
+                 [retainScrollPosition]="true">
     <ng-container *ngIf="(updates$ | async) as updates">
 
       <table class="table" [class.mt-n1]="!isFirstTable"
@@ -43,18 +44,26 @@
                       title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
                 <i class="fas fa-upload fa-fw"></i>
               </button>
-              <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0" placement="bottom-right">
-                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false">
+              <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
+                   placement="bottom-right">
+                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                        [title]="'pagination.options.description' | translate"
+                        [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
+                        aria-expanded="false">
                   <i class="fas fa-cog" aria-hidden="true"></i>
                 </button>
 
-                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
+                    ngbDropdownMenu>
                   <li role="menuitem">
-                    <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                    <span class="dropdown-header" id="pagination-control_results-per-page"
+                          role="heading">{{ 'pagination.results-per-page' | translate}}</span>
                     <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
-                      <li *ngFor="let size of pageSizeOptions" role="option" [attr.aria-selected]="size === (pageSize$ | async)">
+                      <li *ngFor="let size of paginationOptions.pageSizeOptions" role="option"
+                          [attr.aria-selected]="size === (pageSize$ | async)">
                         <button (click)="doPageSizeChange(size)" class="dropdown-item">
-                          <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{size}}
+                          <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
+                             aria-hidden="true"></i> {{size}}
                         </button>
                       </li>
                     </ul>
@@ -67,13 +76,15 @@
         </tr>
 
         <ng-container *ngFor="let entry of (tableEntries$ | async)">
-          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update)" class="bitstream-row" cdkDrag
-          (cdkDragStarted)="dragStart(entry.name)" (cdkDragEnded)="dragEnd(entry.name)">
+          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update, entry)" class="bitstream-row" cdkDrag
+              (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
-              <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle>
-                <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
+              <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
+                   (keyup.enter)="select(entry)" (keyup.space)="select(entry)" (click)="select(entry)">
+                <i class="fas fa-grip-vertical fa-fw"
+                   [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
               </div>
               {{ entry.name }}
             </th>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index 1502ad2311..25274b8941 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -58,6 +58,7 @@ describe('ItemEditBitstreamBundleComponent', () => {
       currentPage: 1,
       pageSize: 9999
     }),
+    getSelectedBitstream$: observableOf({}),
   });
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 24319f4a83..7d2a519baf 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,4 +1,10 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+  ViewChild,
+  ViewContainerRef, OnDestroy,
+} from '@angular/core';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
@@ -8,7 +14,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from 'src/app/core/data/remote-data';
 import { PaginatedList } from 'src/app/core/data/paginated-list.model';
 import { Bitstream } from 'src/app/core/shared/bitstream.model';
-import { Observable, BehaviorSubject, switchMap } from 'rxjs';
+import { Observable, BehaviorSubject, switchMap, shareReplay, Subscription } from 'rxjs';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
 import { PaginatedSearchOptions } from '../../../../shared/search/models/paginated-search-options.model';
@@ -17,55 +23,17 @@ import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import {
   getAllSucceededRemoteData,
   paginatedListToArray,
-  getFirstSucceededRemoteData
 } from '../../../../core/shared/operators';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { map, take, filter } from 'rxjs/operators';
+import { map, take, filter, tap, pairwise } from 'rxjs/operators';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { RequestService } from '../../../../core/data/request.service';
-import { ItemBitstreamsService } from '../item-bitstreams.service';
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
-import { hasValue } from '../../../../shared/empty.util';
-import { LiveRegionService } from '../../../../shared/live-region/live-region.service';
-import { TranslateService } from '@ngx-translate/core';
-
-/**
- * Interface storing all the information necessary to create a row in the bitstream edit table
- */
-export interface BitstreamTableEntry {
-  /**
-   * The bitstream
-   */
-  bitstream: Bitstream,
-  /**
-   * The uuid of the Bitstream
-   */
-  id: string,
-  /**
-   * The name of the Bitstream
-   */
-  name: string,
-  /**
-   * The name of the Bitstream with all whitespace removed
-   */
-  nameStripped: string,
-  /**
-   * The description of the Bitstream
-   */
-  description: string,
-  /**
-   * Observable emitting the Format of the Bitstream
-   */
-  format: Observable<BitstreamFormat>,
-  /**
-   * The download url of the Bitstream
-   */
-  downloadUrl: string,
-}
+import { ItemBitstreamsService, BitstreamTableEntry, SelectedBitstreamTableEntry } from '../item-bitstreams.service';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { hasValue, hasNoValue } from '../../../../shared/empty.util';
 
 @Component({
   selector: 'ds-item-edit-bitstream-bundle',
@@ -77,7 +45,7 @@ export interface BitstreamTableEntry {
  * Creates an embedded view of the contents. This is to ensure the table structure won't break.
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-bundle element)
  */
-export class ItemEditBitstreamBundleComponent implements OnInit {
+export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
   protected readonly FieldChangeType = FieldChangeType;
 
   /**
@@ -115,13 +83,6 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @Input() isFirstTable = false;
 
-  /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
-   */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
-
   /**
    * The bootstrap sizes used for the Bundle Name column
    * This column stretches over the first 3 columns and thus is a combination of their sizes processed in ngOnInit
@@ -138,6 +99,11 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   bundleName: string;
 
+  /**
+   * The number of bitstreams in the bundle
+   */
+  bundleSize: number;
+
   /**
    * The bitstreams to show in the table
    */
@@ -146,7 +112,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
   /**
    * The data to show in the table
    */
-  tableEntries$: BehaviorSubject<BitstreamTableEntry[]> = new BehaviorSubject(null);
+  tableEntries$: BehaviorSubject<BitstreamTableEntry[]> = new BehaviorSubject([]);
 
   /**
    * The initial page options to use for fetching the bitstreams
@@ -158,11 +124,6 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   currentPaginationOptions$: BehaviorSubject<PaginationComponentOptions>;
 
-  /**
-   * The available page size options
-   */
-  pageSizeOptions: number[];
-
   /**
    * The currently selected page size
    */
@@ -178,6 +139,11 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   updates$: BehaviorSubject<FieldUpdates> = new BehaviorSubject(null);
 
+  /**
+   * Array containing all subscriptions created by this component
+   */
+  subscriptions: Subscription[] = [];
+
 
   constructor(
     protected viewContainerRef: ViewContainerRef,
@@ -187,8 +153,6 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     protected paginationService: PaginationService,
     protected requestService: RequestService,
     protected itemBitstreamsService: ItemBitstreamsService,
-    protected liveRegionService: LiveRegionService,
-    protected translateService: TranslateService,
   ) {
   }
 
@@ -201,23 +165,27 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
 
     this.initializePagination();
     this.initializeBitstreams();
+    this.initializeSelectionActions();
+  }
 
-    // this.bitstreamsRD = this.
+  ngOnDestroy() {
+    this.subscriptions.forEach(sub => sub?.unsubscribe());
   }
 
   protected initializePagination() {
     this.paginationOptions = this.itemBitstreamsService.getInitialBitstreamsPaginationOptions(this.bundleName);
 
-    this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
-
     this.currentPaginationOptions$ = new BehaviorSubject(this.paginationOptions);
     this.pageSize$ = new BehaviorSubject(this.paginationOptions.pageSize);
 
-    this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
-      .subscribe((pagination) => {
-        this.currentPaginationOptions$.next(pagination);
-        this.pageSize$.next(pagination.pageSize);
-    });
+    this.subscriptions.push(
+      this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
+        .subscribe((pagination) => {
+          this.currentPaginationOptions$.next(pagination);
+          this.pageSize$.next(pagination.pageSize);
+        })
+    );
+
   }
 
   protected initializeBitstreams() {
@@ -233,26 +201,88 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
           ))
         );
       }),
+      getAllSucceededRemoteData(),
+      shareReplay(1),
     );
 
-    this.bitstreamsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      paginatedListToArray(),
-    ).subscribe((bitstreams) => {
-      this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
-    });
+    this.subscriptions.push(
+      this.bitstreamsRD$.pipe(
+        take(1),
+        tap(bitstreamsRD => this.bundleSize = bitstreamsRD.payload.totalElements),
+        paginatedListToArray(),
+      ).subscribe((bitstreams) => {
+        this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
+      }),
 
-    this.bitstreamsRD$.pipe(
-      getAllSucceededRemoteData(),
-      paginatedListToArray(),
-      switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams))
-    ).subscribe((updates) => this.updates$.next(updates));
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams))
+      ).subscribe((updates) => this.updates$.next(updates)),
 
-    this.bitstreamsRD$.pipe(
-      getAllSucceededRemoteData(),
-      paginatedListToArray(),
-      map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
-    ).subscribe((tableEntries) => this.tableEntries$.next(tableEntries));
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
+      ).subscribe((tableEntries) => this.tableEntries$.next(tableEntries)),
+    );
+  }
+
+  protected initializeSelectionActions() {
+    this.subscriptions.push(
+      this.itemBitstreamsService.getSelectedBitstream$().pipe(pairwise()).subscribe(
+        ([previousSelection, currentSelection]) =>
+          this.handleSelectedEntryChange(previousSelection, currentSelection))
+    );
+  }
+
+  /**
+   * Handles a change in selected bitstream by changing the pagination if the change happened on a different page
+   * @param previousSelectedEntry The previously selected entry
+   * @param currentSelectedEntry  The currently selected entry
+   * @protected
+   */
+  protected handleSelectedEntryChange(
+    previousSelectedEntry: SelectedBitstreamTableEntry,
+    currentSelectedEntry: SelectedBitstreamTableEntry
+  ) {
+    if (hasValue(currentSelectedEntry) && currentSelectedEntry.bundle === this.bundle) {
+      // If the currently selected bitstream belongs to this bundle, it has possibly moved to a different page.
+      // In that case we want to change the pagination to the new page.
+      this.redirectToCurrentPage(currentSelectedEntry);
+    }
+
+    // If the selection is cancelled or cleared, it is possible the selected bitstream is currently on a different page
+    // In that case we want to change the pagination to the place where the bitstream was returned to
+    if (hasNoValue(currentSelectedEntry) && hasValue(previousSelectedEntry) && previousSelectedEntry.bundle === this.bundle) {
+      this.redirectToOriginalPage(previousSelectedEntry);
+    }
+  }
+
+  /**
+   * Redirect the user to the current page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the current position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToCurrentPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const selectedEntryPage = this.bundleIndexToPage(bitstreamEntry.currentPosition);
+
+    if (currentPage !== selectedEntryPage) {
+      this.changeToPage(selectedEntryPage);
+    }
+  }
+
+  /**
+   * Redirect the user to the original page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the original position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToOriginalPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const originPage = this.bundleIndexToPage(bitstreamEntry.originalPosition);
+
+    if (currentPage !== originPage) {
+      this.changeToPage(originPage);
+    }
   }
 
   /**
@@ -283,7 +313,18 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, bitstream.uuid);
   }
 
-  getRowClass(update: FieldUpdate): string {
+  /**
+   * Returns the css class for a table row depending on the state of the table entry.
+   * @param update
+   * @param bitstream
+   */
+  getRowClass(update: FieldUpdate, bitstream: BitstreamTableEntry): string {
+    const selected = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selected) && bitstream.id === selected.bitstream.id) {
+      return 'table-info';
+    }
+
     switch (update.changeType) {
       case FieldChangeType.UPDATE:
         return 'table-warning';
@@ -296,11 +337,19 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     }
   }
 
+  /**
+   * Changes the page size to the provided page size.
+   * @param pageSize
+   */
   public doPageSizeChange(pageSize: number) {
     this.paginationComponent.doPageSizeChange(pageSize);
   }
 
-  dragStart(bitstreamName: string) {
+  /**
+   * Handles start of dragging by opening the tooltip mentioning that it is possible to drag a bitstream to a different
+   * page by dropping it on the page number, only if there are multiple pages.
+   */
+  dragStart() {
     // Only open the drag tooltip when there are multiple pages
     this.paginationComponent.shouldShowBottomPager.pipe(
       take(1),
@@ -308,66 +357,170 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     ).subscribe(() => {
       this.dragTooltip.open();
     });
-
-    const message = this.translateService.instant('item.edit.bitstreams.edit.live.drag',
-      { bitstream: bitstreamName });
-    this.liveRegionService.addMessage(message);
   }
 
-  dragEnd(bitstreamName: string) {
+  /**
+   * Handles end of dragging by closing the tooltip.
+   */
+  dragEnd() {
     this.dragTooltip.close();
-
-    const message = this.translateService.instant('item.edit.bitstreams.edit.live.drop',
-      { bitstream: bitstreamName });
-    this.liveRegionService.addMessage(message);
   }
 
-
+  /**
+   * Handles dropping by calculation the target position, and changing the page if the bitstream was dropped on a
+   * different page.
+   * @param event
+   */
   drop(event: CdkDragDrop<any>) {
     const dragIndex = event.previousIndex;
     let dropIndex = event.currentIndex;
-    const dragPage = this.currentPaginationOptions$.value.currentPage - 1;
-    let dropPage = this.currentPaginationOptions$.value.currentPage - 1;
+    const dragPage = this.getCurrentPage();
+    let dropPage = this.getCurrentPage();
 
     // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
     const droppedOnElement = document.elementFromPoint(event.dropPoint.x, event.dropPoint.y);
     if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent) && droppedOnElement.classList.contains('page-link')) {
       // The user is hovering over a page, fetch the page's number from the element
-      const droppedPage = Number(droppedOnElement.textContent);
+      let droppedPage = Number(droppedOnElement.textContent);
       if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
-        dropPage = droppedPage - 1;
-        dropIndex = 0;
+        droppedPage -= 1;
+
+        if (droppedPage !== dragPage) {
+          dropPage = droppedPage;
+
+          if (dropPage > dragPage) {
+            // When moving to later page, place bitstream at the top
+            dropIndex = 0;
+          } else {
+            // When moving to earlier page, place bitstream at the bottom
+            dropIndex = this.getCurrentPageSize() - 1;
+          }
+        }
       }
     }
 
-    const isNewPage = dragPage !== dropPage;
-    // Move the object in the custom order array if the drop happened within the same page
-    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
-    if (!isNewPage && dragIndex !== dropIndex) {
-      const currentEntries = [...this.tableEntries$.value];
-      moveItemInArray(currentEntries, dragIndex, dropIndex);
-      this.tableEntries$.next(currentEntries);
+    const fromIndex = this.pageIndexToBundleIndex(dragIndex, dragPage);
+    const toIndex = this.pageIndexToBundleIndex(dropIndex, dropPage);
+
+    if (fromIndex === toIndex) {
+      return;
     }
 
-    const pageSize = this.currentPaginationOptions$.value.pageSize;
-    const redirectPage = dropPage + 1;
-    const fromIndex = (dragPage * pageSize) + dragIndex;
-    const toIndex = (dropPage * pageSize) + dropIndex;
-    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
-    if (fromIndex !== toIndex) {
-      // if (isNewPage) {
-      //   this.loading$.next(true);
-      // }
-      this.dropObject.emit(Object.assign({
-        fromIndex,
-        toIndex,
-        finish: () => {
-          if (isNewPage) {
-            this.paginationComponent.doPageChange(redirectPage);
-          }
-        }
-      }));
+    const selectedBitstream = this.tableEntries$.value[dragIndex];
+
+    const finish = () => {
+      this.itemBitstreamsService.announceMove(selectedBitstream.name, toIndex);
+
+      if (dropPage !== this.getCurrentPage()) {
+        this.changeToPage(dropPage);
+      }
+    };
+
+    this.itemBitstreamsService.performBitstreamMoveRequest(this.bundle, fromIndex, toIndex, finish);
+  }
+
+  /**
+   * Handles a select action for the provided bitstream entry.
+   * If the selected bitstream is currently selected, the selection is cleared.
+   * If no, or a different bitstream, is selected, the provided bitstream becomes the selected bitstream.
+   * @param bitstream
+   */
+  select(bitstream: BitstreamTableEntry) {
+    const selectedBitstream = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selectedBitstream) && selectedBitstream.bitstream === bitstream) {
+      this.itemBitstreamsService.cancelSelection();
+    } else {
+      const selectionObject = this.createBitstreamSelectionObject(bitstream);
+
+      if (hasNoValue(selectionObject)) {
+        console.warn('Failed to create selection object');
+        return;
+      }
+
+      this.itemBitstreamsService.selectBitstreamEntry(selectionObject);
     }
   }
 
+  /**
+   * Creates a {@link SelectedBitstreamTableEntry} from the provided {@link BitstreamTableEntry} so it can be given
+   * to the {@link ItemBitstreamsService} to select the table entry.
+   * @param bitstream The table entry to create the selection object from.
+   * @protected
+   */
+  protected createBitstreamSelectionObject(bitstream: BitstreamTableEntry): SelectedBitstreamTableEntry {
+    const pageIndex = this.findBitstreamPageIndex(bitstream);
+
+    if (pageIndex === -1) {
+      return null;
+    }
+
+    const position = this.pageIndexToBundleIndex(pageIndex, this.getCurrentPage());
+
+    return {
+      bitstream: bitstream,
+      bundle: this.bundle,
+      bundleSize: this.bundleSize,
+      currentPosition: position,
+      originalPosition: position,
+    };
+  }
+
+  /**
+   * Returns the index of the provided {@link BitstreamTableEntry} relative to the current page
+   * If the current page size is 10, it will return a value from 0 to 9 (inclusive)
+   * Returns -1 if the provided bitstream could not be found
+   * @protected
+   */
+  protected findBitstreamPageIndex(bitstream: BitstreamTableEntry): number {
+    const entries = this.tableEntries$.value;
+    return entries.findIndex(entry => entry === bitstream);
+  }
+
+  /**
+   * Returns the current zero-indexed page
+   * @protected
+   */
+  protected getCurrentPage(): number {
+    // The pagination component uses one-based numbering while zero-based numbering is more convenient for calculations
+    return this.currentPaginationOptions$.value.currentPage - 1;
+  }
+
+  /**
+   * Returns the current page size
+   * @protected
+   */
+  protected getCurrentPageSize(): number {
+    return this.currentPaginationOptions$.value.pageSize;
+  }
+
+  /**
+   * Converts an index relative to the page to an index relative to the bundle
+   * @param index The index relative to the page
+   * @param page  The zero-indexed page number
+   * @protected
+   */
+  protected pageIndexToBundleIndex(index: number, page: number) {
+    return page * this.getCurrentPageSize() + index;
+  }
+
+  /**
+   * Calculates the zero-indexed page number from the index relative to the bundle
+   * @param index The index relative to the bundle
+   * @protected
+   */
+  protected bundleIndexToPage(index: number) {
+    return Math.floor(index / this.getCurrentPageSize());
+  }
+
+  /**
+   * Change the pagination for this bundle to the provided zero-indexed page
+   * @param page The zero-indexed page to change to
+   * @protected
+   */
+  protected changeToPage(page: number) {
+    // Increments page by one because zero-indexing is way easier for calculations but the pagination component
+    // uses one-indexing.
+    this.paginationComponent.doPageChange(page + 1);
+  }
 }
diff --git a/src/app/shared/live-region/live-region.service.stub.ts b/src/app/shared/live-region/live-region.service.stub.ts
new file mode 100644
index 0000000000..4f10b46a4c
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.stub.ts
@@ -0,0 +1,30 @@
+import { of } from 'rxjs';
+import { LiveRegionService } from './live-region.service';
+
+export function getLiveRegionServiceStub(): LiveRegionService {
+  return new LiveRegionServiceStub() as unknown as LiveRegionService;
+}
+
+export class LiveRegionServiceStub {
+  getMessages = jasmine.createSpy('getMessages').and.returnValue(
+    ['Message One', 'Message Two']
+  );
+
+  getMessages$ = jasmine.createSpy('getMessages$').and.returnValue(
+    of(['Message One', 'Message Two'])
+  );
+
+  addMessage = jasmine.createSpy('addMessage').and.returnValue('messageId');
+
+  clear = jasmine.createSpy('clear');
+
+  clearMessageByUUID = jasmine.createSpy('clearMessageByUUID');
+
+  getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(false);
+
+  setLiveRegionVisibility = jasmine.createSpy('setLiveRegionVisibility');
+
+  getMessageTimeOutMs = jasmine.createSpy('getMessageTimeOutMs').and.returnValue(30000);
+
+  setMessageTimeOutMs = jasmine.createSpy('setMessageTimeOutMs');
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ab6f3792ca..519189ed69 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1950,9 +1950,13 @@
 
   "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
 
-  "item.edit.bitstreams.edit.live.drag": "{{ bitstream }} grabbed",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
 
-  "item.edit.bitstreams.edit.live.drop": "{{ bitstream }} dropped",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
 
   "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
 

From 2e1b1489b65c6c6715774ef482242e8f14d990f0 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 4 Oct 2024 09:40:20 +0200
Subject: [PATCH 0621/1286] 118223: Stop space from scrolling down page

---
 .../item-bitstreams/item-bitstreams.component.ts     |  1 +
 .../item-edit-bitstream-bundle.component.html        |  2 +-
 .../item-edit-bitstream-bundle.component.ts          | 12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 4ced3dd649..f77eda02fb 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -138,6 +138,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // Otherwise we might clear the selection when a different action was intended, e.g. clicking a button or selecting
     // a different bitstream.
     if (event.target instanceof Element && event.target.tagName === 'BODY') {
+      event.preventDefault();
       this.itemBitstreamsService.clearSelection();
     }
   }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 06fb571ce4..9afdd2d41c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -82,7 +82,7 @@
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
               <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
-                   (keyup.enter)="select(entry)" (keyup.space)="select(entry)" (click)="select(entry)">
+                   (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
                 <i class="fas fa-grip-vertical fa-fw"
                    [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
               </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 7d2a519baf..e2dff2f018 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -423,9 +423,17 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
    * Handles a select action for the provided bitstream entry.
    * If the selected bitstream is currently selected, the selection is cleared.
    * If no, or a different bitstream, is selected, the provided bitstream becomes the selected bitstream.
-   * @param bitstream
+   * @param event The event that triggered the select action
+   * @param bitstream The bitstream that is the target of the select action
    */
-  select(bitstream: BitstreamTableEntry) {
+  select(event: UIEvent, bitstream: BitstreamTableEntry) {
+    event.preventDefault();
+
+    if (event instanceof KeyboardEvent && event.repeat) {
+      // Don't handle hold events, otherwise it would change rapidly between being selected and unselected
+      return;
+    }
+
     const selectedBitstream = this.itemBitstreamsService.getSelectedBitstream();
 
     if (hasValue(selectedBitstream) && selectedBitstream.bitstream === bitstream) {

From 0920a218762a4aa547c8b9bf72e795e8321e73ff Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 4 Oct 2024 10:53:42 +0200
Subject: [PATCH 0622/1286] 118223: Stop sending success notificiations on
 every move

---
 .../item-bitstreams.service.ts                | 60 +++++++++++++++----
 .../item-edit-bitstream-bundle.component.ts   |  9 ++-
 2 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index 21dc415198..f8091d616a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -3,7 +3,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { RemoteData } from '../../../core/data/remote-data';
-import { isNotEmpty, hasValue, hasNoValue } from '../../../shared/empty.util';
+import { hasValue, hasNoValue } from '../../../shared/empty.util';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -25,6 +25,8 @@ import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { RequestService } from '../../../core/data/request.service';
 import { LiveRegionService } from '../../../shared/live-region/live-region.service';
 
+export const MOVE_KEY = 'item.edit.bitstreams.notifications.move';
+
 /**
  * Interface storing all the information necessary to create a row in the bitstream edit table
  */
@@ -164,6 +166,10 @@ export class ItemBitstreamsService {
     if (hasValue(selected)) {
       this.updateSelectedBitstream(null);
       this.announceClear(selected.bitstream.name);
+
+      if (selected.currentPosition !== selected.originalPosition) {
+        this.displaySuccessNotification(MOVE_KEY);
+      }
     }
   }
 
@@ -265,7 +271,7 @@ export class ItemBitstreamsService {
     this.isPerformingMoveRequest = true;
     this.bundleService.patch(bundle, [moveOperation]).pipe(
       getFirstCompletedRemoteData(),
-      tap((response: RemoteData<Bundle>) => this.displayNotifications('item.edit.bitstreams.notifications.move', [response])),
+      tap((response: RemoteData<Bundle>) => this.displayFailedResponseNotifications(MOVE_KEY, [response])),
       switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
       take(1),
     ).subscribe(() => {
@@ -321,19 +327,51 @@ export class ItemBitstreamsService {
    * @param responses The returned responses to display notifications for
    */
   displayNotifications(key: string, responses: RemoteData<any>[]) {
-    if (isNotEmpty(responses)) {
-      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
-      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+    this.displayFailedResponseNotifications(key, responses);
+    this.displaySuccessFulResponseNotifications(key, responses);
+  }
 
-      failedResponses.forEach((response: RemoteData<Bundle>) => {
-        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
-      });
-      if (successfulResponses.length > 0) {
-        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
-      }
+  /**
+   * Display an error notification for each failed response with their message
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayFailedResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+    failedResponses.forEach((response: RemoteData<Bundle>) => {
+      this.displayErrorNotification(key, response.errorMessage);
+    });
+  }
+
+  /**
+   * Display an error notification with the provided key and message
+   * @param key          The i18n key for the notification messages
+   * @param errorMessage The error message to display
+   */
+  displayErrorNotification(key: string, errorMessage: string) {
+    this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), errorMessage);
+  }
+
+  /**
+   * Display a success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displaySuccessFulResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+    if (successfulResponses.length > 0) {
+      this.displaySuccessNotification(key);
     }
   }
 
+  /**
+   * Display a success notification with the provided key
+   * @param key          The i18n key for the notification messages
+   */
+  displaySuccessNotification(key: string) {
+    this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+  }
+
   /**
    * Removes the bitstreams marked for deletion from the Bundles emitted by the provided observable.
    * @param bundles$
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index e2dff2f018..4079ad225b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -31,7 +31,12 @@ import { FieldUpdate } from '../../../../core/data/object-updates/field-update.m
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { RequestService } from '../../../../core/data/request.service';
-import { ItemBitstreamsService, BitstreamTableEntry, SelectedBitstreamTableEntry } from '../item-bitstreams.service';
+import {
+  ItemBitstreamsService,
+  BitstreamTableEntry,
+  SelectedBitstreamTableEntry,
+  MOVE_KEY
+} from '../item-bitstreams.service';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { hasValue, hasNoValue } from '../../../../shared/empty.util';
 
@@ -414,6 +419,8 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
       if (dropPage !== this.getCurrentPage()) {
         this.changeToPage(dropPage);
       }
+
+      this.itemBitstreamsService.displaySuccessNotification(MOVE_KEY);
     };
 
     this.itemBitstreamsService.performBitstreamMoveRequest(this.bundle, fromIndex, toIndex, finish);

From b158c5c2a275ff64108229c37083da7e7f78720e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 4 Oct 2024 10:58:52 +0200
Subject: [PATCH 0623/1286] 118223: Move drag tooltip to center of pagination
 numbers

---
 .../item-edit-bitstream-bundle.component.html             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 9afdd2d41c..efbdd8c69b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -6,7 +6,9 @@
                  [hidePaginationDetail]="true"
                  [paginationOptions]="paginationOptions"
                  [collectionSize]="bitstreamsList.totalElements"
-                 [retainScrollPosition]="true">
+                 [retainScrollPosition]="true"
+                 [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom"
+                 [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
     <ng-container *ngIf="(updates$ | async) as updates">
 
       <table class="table" [class.mt-n1]="!isFirstTable"
@@ -28,9 +30,7 @@
         </tr>
         </thead>
 
-        <tbody cdkDropList (cdkDropListDropped)="drop($event)"
-               [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom-left"
-               [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
+        <tbody cdkDropList (cdkDropListDropped)="drop($event)">
         <tr class="bundle-row">
           <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
             {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}

From 1dcc5d1ec5a21667e90322fb2a6dc4528d8f5c0b Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 4 Oct 2024 15:16:16 +0200
Subject: [PATCH 0624/1286] 118223: Add ItemBitstreams service tests

---
 .../item-bitstreams.service.spec.ts           | 443 +++++++++++++++++-
 .../item-bitstreams.service.ts                |   4 +-
 2 files changed, 444 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
index e144e81ec7..94adb5f23a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -1,4 +1,4 @@
-import { ItemBitstreamsService } from './item-bitstreams.service';
+import { ItemBitstreamsService, SelectedBitstreamTableEntry } from './item-bitstreams.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
 import { ObjectUpdatesServiceStub } from '../../../core/data/object-updates/object-updates.service.stub';
@@ -22,6 +22,9 @@ import { LiveRegionService } from '../../../shared/live-region/live-region.servi
 import { Bundle } from '../../../core/shared/bundle.model';
 import { of } from 'rxjs';
 import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub';
+import { fakeAsync, tick } from '@angular/core/testing';
+import createSpy = jasmine.createSpy;
+import { MoveOperation } from 'fast-json-patch';
 
 describe('ItemBitstreamsService', () => {
   let service: ItemBitstreamsService;
@@ -60,6 +63,444 @@ describe('ItemBitstreamsService', () => {
     );
   });
 
+  const defaultEntry: SelectedBitstreamTableEntry = {
+    bitstream: {
+      name: 'bitstream name',
+    } as any,
+    bundle: Object.assign(new Bundle(), {
+      _links: { self: { href: 'self_link' }},
+    }),
+    bundleSize: 10,
+    currentPosition: 0,
+    originalPosition: 0,
+  };
+
+  describe('selectBitstreamEntry', () => {
+    it('should correctly make getSelectedBitstream$ emit', fakeAsync(() => {
+      const emittedEntries = [];
+
+      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedEntries.length).toBe(2);
+      expect(emittedEntries[1]).toEqual(entry);
+    }));
+
+    it('should correctly make getSelectedBitstream return the bitstream', () => {
+      expect(service.getSelectedBitstream()).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.getSelectedBitstream()).toEqual(entry);
+    });
+
+    it('should correctly make hasSelectedBitstream return', () => {
+      expect(service.hasSelectedBitstream()).toBeFalse();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.hasSelectedBitstream()).toBeTrue();
+    });
+
+    it('should do nothing if no entry was provided', fakeAsync(() => {
+      const emittedEntries = [];
+
+      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedEntries.length).toBe(2);
+      expect(emittedEntries[1]).toEqual(entry);
+
+      service.selectBitstreamEntry(null);
+      tick();
+
+      expect(emittedEntries.length).toBe(2);
+      expect(emittedEntries[1]).toEqual(entry);
+    }));
+
+    it('should announce the selected bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceSelect');
+
+      service.selectBitstreamEntry(entry);
+      expect(service.announceSelect).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selected bitstream', fakeAsync(() => {
+      const emittedEntries = [];
+
+      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedEntries.length).toBe(2);
+      expect(emittedEntries[1]).toEqual(entry);
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedEntries.length).toBe(3);
+      expect(emittedEntries[2]).toBeNull();
+    }));
+
+    it('should not do anything if there is no selected bitstream', fakeAsync(() => {
+      const emittedEntries = [];
+
+      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+    }));
+
+    it('should announce the cleared bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceClear');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+
+    it('should display a notification if the selected bitstream was moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).toHaveBeenCalled();
+    });
+
+    it('should not display a notification if the selected bitstream is in its original position', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should clear the selected bitstream', fakeAsync(() => {
+      const emittedEntries = [];
+
+      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+
+      expect(emittedEntries.length).toBe(1);
+      expect(emittedEntries[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedEntries.length).toBe(2);
+      expect(emittedEntries[1]).toEqual(entry);
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedEntries.length).toBe(3);
+      expect(emittedEntries[2]).toBeNull();
+    }));
+
+    it('should announce a clear if the bitstream has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+      expect(service.announceCancel).not.toHaveBeenCalled();
+    });
+
+    it('should announce a cancel if the bitstream has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).toHaveBeenCalledWith(entry.bitstream.name, entry.originalPosition);
+    });
+
+    it('should return the bitstream to its original position if it has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, entry.currentPosition, entry.originalPosition);
+    });
+
+    it('should not move the bitstream if it has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        }
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if there is no selected bitstream', () => {
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).not.toHaveBeenCalled();
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveSelectedBitstream', () => {
+    beforeEach(() => {
+      spyOn(service, 'performBitstreamMoveRequest').and.callThrough();
+    });
+
+    describe('up', () => {
+      it('should move the selected bitstream one position up', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the top', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 0,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('down', () => {
+      it('should move the selected bitstream one position down', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the bottom of the bundle', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 9,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('performBitstreamMoveRequest', () => {
+    const bundle: Bundle = defaultEntry.bundle;
+    const from = 5;
+    const to = 7;
+    const callback = createSpy('callbackFunction');
+
+    console.log('bundle:', bundle);
+
+    it('should correctly create the Move request', () => {
+      const expectedOperation: MoveOperation = {
+        op: 'move',
+        from: `/_links/bitstreams/${from}/href`,
+        path: `/_links/bitstreams/${to}/href`,
+      };
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(bundleDataService.patch).toHaveBeenCalledWith(bundle, [expectedOperation]);
+    });
+
+    it('should correctly make the bundle\'s self link stale', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith(bundle._links.self.href);
+    });
+
+    it('should attempt to show a message should the request have failed', () => {
+      spyOn(service, 'displayFailedResponseNotifications');
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(service.displayFailedResponseNotifications).toHaveBeenCalled();
+    });
+
+    it('should correctly call the provided function once the request has finished', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(callback).toHaveBeenCalled();
+    });
+  });
+
   describe('displayNotifications', () => {
     it('should display an error notification if a response failed', () => {
       const responses = [
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index f8091d616a..5b5fb7d63c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -143,7 +143,7 @@ export class ItemBitstreamsService {
    * Select the provided entry
    */
   selectBitstreamEntry(entry: SelectedBitstreamTableEntry) {
-    if (entry !== this.selectedBitstream$.getValue()) {
+    if (hasValue(entry) && entry !== this.selectedBitstream$.getValue()) {
       this.announceSelect(entry.bitstream.name);
       this.updateSelectedBitstream(entry);
     }
@@ -184,7 +184,7 @@ export class ItemBitstreamsService {
       return;
     }
 
-    this.selectedBitstream$.next(null);
+    this.updateSelectedBitstream(null);
 
     const originalPosition = selected.originalPosition;
     const currentPosition = selected.currentPosition;

From 0bdb5742e064ca35325aa03530506012e36b1dc4 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Fri, 4 Oct 2024 15:22:43 +0200
Subject: [PATCH 0625/1286] 118223: Remove unused item-edit-bitstream component

---
 .../edit-item-page/edit-item-page.module.ts   |   2 -
 .../item-edit-bitstream.component.html        |  51 ------
 .../item-edit-bitstream.component.spec.ts     | 145 ------------------
 .../item-edit-bitstream.component.ts          | 117 --------------
 4 files changed, 315 deletions(-)
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
 delete mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts

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 4ae5ebe666..c38b480622 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
@@ -15,7 +15,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 { 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';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
@@ -78,7 +77,6 @@ import {
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
-    ItemEditBitstreamComponent,
     ItemEditBitstreamBundleComponent,
     EditRelationshipComponent,
     EditRelationshipListComponent,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
deleted file mode 100644
index 0f0fad2199..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<ng-template #bitstreamView>
-  <div class="{{columnSizes.columns[0].buildClasses()}} row-element d-flex">
-    <ng-content select="[slot=drag-handle]"></ng-content>
-    <div class="float-left d-flex align-items-center overflow-hidden">
-      <span class="text-truncate">
-        {{ bitstreamName }}
-      </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[1].buildClasses()}} row-element d-flex align-items-center">
-    <div class="w-100">
-      <div class="text-truncate" [tooltipClass]="'larger-tooltip'" placement="bottom"
-           [ngbTooltip]="bitstream?.firstMetadataValue('dc.description')">
-        {{ bitstream?.firstMetadataValue('dc.description') }}
-      </div>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[2].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-        <span class="text-truncate">
-            {{ (format$ | async)?.shortDescription }}
-        </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-      <div class="btn-group relationship-action-buttons">
-        <a *ngIf="bitstreamDownloadUrl != null" [href]="bitstreamDownloadUrl"
-                class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-                [attr.data-test]="'download-button' | dsBrowserOnly">
-          <i class="fas fa-download fa-fw"></i>
-        </a>
-        <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
-          <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
-                class="btn btn-outline-danger btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
-          <i class="fas fa-trash-alt fa-fw"></i>
-        </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
-                class="btn btn-outline-warning btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
-          <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
deleted file mode 100644
index aafa5a4fe4..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../../shared/utils/var.directive';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-import { By } from '@angular/platform-browser';
-import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
-
-let comp: ItemEditBitstreamComponent;
-let fixture: ComponentFixture<ItemEditBitstreamComponent>;
-
-const columnSizes = new ResponsiveTableSizes([
-  new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-  new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-  new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-  new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-]);
-
-const format = Object.assign(new BitstreamFormat(), {
-  shortDescription: 'PDF'
-});
-const bitstream = Object.assign(new Bitstream(), {
-  uuid: 'bitstreamUUID',
-  name: 'Fake Bitstream',
-  bundleName: 'ORIGINAL',
-  description: 'Description',
-  _links: {
-    content: { href: 'content-link' }
-  },
-
-  format: createSuccessfulRemoteDataObject$(format)
-});
-const fieldUpdate = {
-  field: bitstream,
-  changeType: undefined
-};
-const date = new Date();
-const url = 'thisUrl';
-
-let objectUpdatesService: ObjectUpdatesService;
-
-describe('ItemEditBitstreamComponent', () => {
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
-    );
-
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [
-        ItemEditBitstreamComponent,
-        VarDirective,
-        BrowserOnlyMockPipe,
-      ],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService }
-      ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemEditBitstreamComponent);
-    comp = fixture.componentInstance;
-    comp.fieldUpdate = fieldUpdate;
-    comp.bundleUrl = url;
-    comp.columnSizes = columnSizes;
-    comp.ngOnChanges(undefined);
-    fixture.detectChanges();
-  });
-
-  describe('when remove is called', () => {
-    beforeEach(() => {
-      comp.remove();
-    });
-
-    it('should call saveRemoveFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, bitstream);
-    });
-  });
-
-  describe('when undo is called', () => {
-    beforeEach(() => {
-      comp.undo();
-    });
-
-    it('should call removeSingleFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, bitstream.uuid);
-    });
-  });
-
-  describe('when canRemove is called', () => {
-    it('should return true', () => {
-      expect(comp.canRemove()).toEqual(true);
-    });
-  });
-
-  describe('when canUndo is called', () => {
-    it('should return false', () => {
-      expect(comp.canUndo()).toEqual(false);
-    });
-  });
-
-  describe('when the component loads', () => {
-    it('should contain download button with a valid link to the bitstreams download page', () => {
-      fixture.detectChanges();
-      const downloadBtnHref = fixture.debugElement.query(By.css('[data-test="download-button"]')).nativeElement.getAttribute('href');
-      expect(downloadBtnHref).toEqual(comp.bitstreamDownloadUrl);
-    });
-  });
-
-  describe('when the bitstreamDownloadUrl property gets populated', () => {
-    it('should contain the bitstream download page route', () => {
-      expect(comp.bitstreamDownloadUrl).not.toEqual(bitstream._links.content.href);
-      expect(comp.bitstreamDownloadUrl).toEqual(getBitstreamDownloadRoute(bitstream));
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
deleted file mode 100644
index fcb5c706ac..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild, ViewContainerRef } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import cloneDeep from 'lodash/cloneDeep';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { Observable } from 'rxjs';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../core/shared/operators';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-
-@Component({
-  selector: 'ds-item-edit-bitstream',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream.component.html',
-})
-/**
- * Component that displays a single bitstream of an item on the edit page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream element)
- */
-export class ItemEditBitstreamComponent implements OnChanges, OnInit {
-
-  /**
-   * The view on the bitstream
-   */
-  @ViewChild('bitstreamView', {static: true}) bitstreamView;
-
-  /**
-   * The current field, value and state of the bitstream
-   */
-  @Input() fieldUpdate: FieldUpdate;
-
-  /**
-   * The url of the bundle
-   */
-  @Input() bundleUrl: string;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  /**
-   * The bitstream of this field
-   */
-  bitstream: Bitstream;
-
-  /**
-   * The bitstream's name
-   */
-  bitstreamName: string;
-
-  /**
-   * The bitstream's download url
-   */
-  bitstreamDownloadUrl: string;
-
-  /**
-   * The format of the bitstream
-   */
-  format$: Observable<BitstreamFormat>;
-
-  constructor(private objectUpdatesService: ObjectUpdatesService,
-              private dsoNameService: DSONameService,
-              private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.bitstreamView);
-  }
-
-  /**
-   * Update the current bitstream and its format on changes
-   * @param changes
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    this.bitstream = cloneDeep(this.fieldUpdate.field) as Bitstream;
-    this.bitstreamName = this.dsoNameService.getName(this.bitstream);
-    this.bitstreamDownloadUrl = getBitstreamDownloadRoute(this.bitstream);
-    this.format$ = this.bitstream.format.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
-    );
-  }
-
-  /**
-   * Sends a new remove update for this field to the object updates service
-   */
-  remove(): void {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, this.bitstream);
-  }
-
-  /**
-   * Cancels the current update for this field in the object updates service
-   */
-  undo(): void {
-    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, this.bitstream.uuid);
-  }
-
-  /**
-   * Check if a user should be allowed to remove this field
-   */
-  canRemove(): boolean {
-    return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
-  }
-
-  /**
-   * Check if a user should be allowed to cancel the update to this field
-   */
-  canUndo(): boolean {
-    return this.fieldUpdate.changeType >= 0;
-  }
-
-}

From e8379db987317c5cb892989a21297ab5edce8669 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 7 Oct 2024 11:49:54 +0200
Subject: [PATCH 0626/1286] 118223: Add item-bitstreams component tests

---
 .../item-bitstreams.component.spec.ts         | 129 +++++++++++++++---
 .../item-bitstreams.component.ts              |   6 +-
 .../item-bitstreams.service.stub.ts           |  74 ++++++++++
 3 files changed, 192 insertions(+), 17 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index a5549a6ba0..d26f815316 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -26,9 +26,7 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
 import { ItemBitstreamsService } from './item-bitstreams.service';
-import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { getItemBitstreamsServiceStub, ItemBitstreamsServiceStub } from './item-bitstreams.service.stub';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -80,7 +78,7 @@ let objectCache: ObjectCacheService;
 let requestService: RequestService;
 let searchConfig: SearchConfigurationService;
 let bundleService: BundleDataService;
-let itemBitstreamsService: ItemBitstreamsService;
+let itemBitstreamsService: ItemBitstreamsServiceStub;
 
 describe('ItemBitstreamsComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -152,18 +150,7 @@ describe('ItemBitstreamsComponent', () => {
       patch: createSuccessfulRemoteDataObject$({}),
     });
 
-    itemBitstreamsService = jasmine.createSpyObj('itemBitstreamsService', {
-      getColumnSizes: new ResponsiveTableSizes([
-        new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-        new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-        new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-        new ResponsiveColumnSizes(6, 5, 4, 3, 3)
-      ]),
-      getSelectedBitstream$: observableOf({}),
-      getInitialBundlesPaginationOptions: new PaginationComponentOptions(),
-      removeMarkedBitstreams: createSuccessfulRemoteDataObject$({}),
-      displayNotifications: undefined,
-    });
+    itemBitstreamsService = getItemBitstreamsServiceStub();
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
@@ -218,4 +205,114 @@ describe('ItemBitstreamsComponent', () => {
       expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(bundle.self);
     });
   });
+
+  describe('moveUp', () => {
+    it('should move the selected bitstream up', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveDown', () => {
+    it('should move the selected bitstream down', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should cancel the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if the event target is not \'BODY\'', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('NOT-BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index f77eda02fb..6ee5dcb545 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -137,7 +137,11 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // Only when no specific element is in focus do we want to clear the currently selected bitstream
     // Otherwise we might clear the selection when a different action was intended, e.g. clicking a button or selecting
     // a different bitstream.
-    if (event.target instanceof Element && event.target.tagName === 'BODY') {
+    if (
+      this.itemBitstreamsService.hasSelectedBitstream() &&
+      event.target instanceof Element &&
+      event.target.tagName === 'BODY'
+    ) {
       event.preventDefault();
       this.itemBitstreamsService.clearSelection();
     }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
new file mode 100644
index 0000000000..0521bf47f6
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
@@ -0,0 +1,74 @@
+import { of } from 'rxjs';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+
+export function getItemBitstreamsServiceStub(): ItemBitstreamsServiceStub {
+  return new ItemBitstreamsServiceStub();
+}
+
+export class ItemBitstreamsServiceStub {
+  getSelectedBitstream$ = jasmine.createSpy('getSelectedBitstream$').and
+    .returnValue(of(null));
+
+  getSelectedBitstream = jasmine.createSpy('getSelectedBitstream').and
+    .returnValue(null);
+
+  hasSelectedBitstream = jasmine.createSpy('hasSelectedBitstream').and
+    .returnValue(false);
+
+  selectBitstreamEntry = jasmine.createSpy('selectBitstreamEntry');
+
+  clearSelection = jasmine.createSpy('clearSelection');
+
+  cancelSelection = jasmine.createSpy('cancelSelection');
+
+  moveSelectedBitstreamUp = jasmine.createSpy('moveSelectedBitstreamUp');
+
+  moveSelectedBitstreamDown = jasmine.createSpy('moveSelectedBitstreamDown');
+
+  performBitstreamMoveRequest = jasmine.createSpy('performBitstreamMoveRequest');
+
+  getInitialBundlesPaginationOptions = jasmine.createSpy('getInitialBundlesPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getInitialBitstreamsPaginationOptions = jasmine.createSpy('getInitialBitstreamsPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getColumnSizes = jasmine.createSpy('getColumnSizes').and
+    .returnValue(
+      new ResponsiveTableSizes([
+        new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+        new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+        new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+        new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+      ])
+    );
+
+  displayNotifications = jasmine.createSpy('displayNotifications');
+
+  displayFailedResponseNotifications = jasmine.createSpy('displayFailedResponseNotifications');
+
+  displayErrorNotification = jasmine.createSpy('displayErrorNotification');
+
+  displaySuccessFulResponseNotifications = jasmine.createSpy('displaySuccessFulResponseNotifications');
+
+  displaySuccessNotification = jasmine.createSpy('displaySuccessNotification');
+
+  removeMarkedBitstreams = jasmine.createSpy('removeMarkedBitstreams').and
+    .returnValue(createSuccessfulRemoteDataObject$({}));
+
+  mapBitstreamsToTableEntries = jasmine.createSpy('mapBitstreamsToTableEntries').and
+    .returnValue([]);
+
+  nameToHeader = jasmine.createSpy('nameToHeader').and.returnValue('header');
+
+  stripWhiteSpace = jasmine.createSpy('stripWhiteSpace').and.returnValue('string');
+
+  announceSelect = jasmine.createSpy('announceSelect');
+
+  announceMove = jasmine.createSpy('announceMove');
+
+  announceCancel = jasmine.createSpy('announceCancel');
+}

From 7fb4755abaa1759f175ea2d2cff6d93af00d946e Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 8 Oct 2024 15:51:00 +0200
Subject: [PATCH 0627/1286] 118223: Add item-edit-bitstream-bundle component
 tests

---
 ...em-edit-bitstream-bundle.component.spec.ts | 302 ++++++++++++++++--
 .../item-edit-bitstream-bundle.component.ts   |   3 +-
 2 files changed, 285 insertions(+), 20 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index 25274b8941..6008b5431f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -7,14 +7,19 @@ import { Bundle } from '../../../../core/shared/bundle.model';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { BundleDataService } from '../../../../core/data/bundle-data.service';
-import { of as observableOf } from 'rxjs';
+import { of as observableOf, of, Subject } from 'rxjs';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { RequestService } from '../../../../core/data/request.service';
 import { getMockRequestService } from '../../../../shared/mocks/request.service.mock';
-import { ItemBitstreamsService } from '../item-bitstreams.service';
+import { ItemBitstreamsService, BitstreamTableEntry, SelectedBitstreamTableEntry } from '../item-bitstreams.service';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { getItemBitstreamsServiceStub, ItemBitstreamsServiceStub } from '../item-bitstreams.service.stub';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
 
 describe('ItemEditBitstreamBundleComponent', () => {
   let comp: ItemEditBitstreamBundleComponent;
@@ -43,25 +48,20 @@ describe('ItemEditBitstreamBundleComponent', () => {
   const restEndpoint = 'fake-rest-endpoint';
   const bundleService = jasmine.createSpyObj('bundleService', {
     getBitstreamsEndpoint: observableOf(restEndpoint),
-    getBitstreams: null,
+    getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   });
 
-  const objectUpdatesService = {
-    initialize: () => {
-      // do nothing
-    },
-  };
-
-  const itemBitstreamsService = jasmine.createSpyObj('itemBitstreamsService', {
-    getInitialBitstreamsPaginationOptions: Object.assign(new PaginationComponentOptions(), {
-      id: 'bundles-pagination-options',
-      currentPage: 1,
-      pageSize: 9999
-    }),
-    getSelectedBitstream$: observableOf({}),
-  });
+  let objectUpdatesService: any;
+  let itemBitstreamsService: ItemBitstreamsServiceStub;
 
   beforeEach(waitForAsync(() => {
+    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
+      initialize: undefined,
+      getFieldUpdatesExclusive: of(null),
+    });
+
+    itemBitstreamsService = getItemBitstreamsServiceStub();
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [ItemEditBitstreamBundleComponent],
@@ -92,4 +92,270 @@ describe('ItemEditBitstreamBundleComponent', () => {
   it('should create an embedded view of the component', () => {
     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalled();
   });
+
+  describe('on selected entry change', () => {
+    let paginationComponent: any;
+    let testSubject: Subject<SelectedBitstreamTableEntry> = new Subject();
+
+    beforeEach(() => {
+      paginationComponent = jasmine.createSpyObj('paginationComponent', {
+        doPageChange: undefined,
+      });
+      comp.paginationComponent = paginationComponent;
+
+      spyOn<any>(comp, 'getCurrentPageSize').and.returnValue(2);
+    });
+
+    it('should move to the page the selected entry is on if were not on that page', () => {
+      const selectedA: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 1,
+        currentPosition: 1,
+      };
+
+      const selectedB: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 1,
+        currentPosition: 2,
+      };
+
+      comp.handleSelectedEntryChange(selectedA, selectedB);
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page', () => {
+      const selectedA: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 0,
+      };
+
+      const selectedB: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 1,
+      };
+
+      comp.handleSelectedEntryChange(selectedA, selectedB);
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+
+    it('should change to the original page when cancelling', () => {
+      const selectedA: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 3,
+        currentPosition: 0,
+      };
+
+      const selectedB = null;
+
+      comp.handleSelectedEntryChange(selectedA, selectedB);
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page when cancelling', () => {
+      const selectedA: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 3,
+      };
+
+      const selectedB = null;
+
+      comp.handleSelectedEntryChange(selectedA, selectedB);
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getRowClass', () => {
+    it('should return \'table-info\' when the bitstream is the selected bitstream', () => {
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({
+        bitstream: { id: 'bitstream-id'}
+      });
+
+      const bitstreamEntry = {
+        id: 'bitstream-id',
+      } as BitstreamTableEntry;
+
+      expect(comp.getRowClass(undefined, bitstreamEntry)).toEqual('table-info');
+    });
+
+    it('should return \'table-warning\' when the update is of type \'UPDATE\'', () => {
+      const update = {
+        changeType: FieldChangeType.UPDATE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-warning');
+    });
+
+    it('should return \'table-success\' when the update is of type \'ADD\'', () => {
+      const update = {
+        changeType: FieldChangeType.ADD,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-success');
+    });
+
+    it('should return \'table-danger\' when the update is of type \'REMOVE\'', () => {
+      const update = {
+        changeType: FieldChangeType.REMOVE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-danger');
+    });
+
+    it('should return \'bg-white\' in any other case', () => {
+      const update = {
+        changeType: undefined,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('bg-white');
+    });
+  });
+
+  describe('drag', () => {
+    let dragTooltip;
+    let paginationComponent;
+
+    beforeEach(() => {
+      dragTooltip = jasmine.createSpyObj('dragTooltip', {
+        open: undefined,
+        close: undefined,
+      });
+      comp.dragTooltip = dragTooltip;
+    });
+
+    describe('Start', () => {
+      it('should open the tooltip when there are multiple pages', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(true),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).toHaveBeenCalled();
+      });
+
+      it('should not open the tooltip when there is only a single page', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('end', () => {
+      it('should always close the tooltip', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragEnd();
+        expect(dragTooltip.close).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('drop', () => {
+    it('should correctly move the bitstream on drop', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 8,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 8, jasmine.any(Function));
+    });
+
+    it('should not move the bitstream if dropped in the same place', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should move to a different page if dropped on a page number', () => {
+      spyOn(document, 'elementFromPoint').and.returnValue({
+        textContent: '2',
+        classList: { contains: (token: string) => true },
+      } as Element);
+
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 20, jasmine.any(Function));
+    });
+  });
+
+  describe('select', () => {
+    it('should select the bitstream', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).toHaveBeenCalledWith(jasmine.objectContaining({ bitstream: entry }));
+    });
+
+    it('should cancel the selection if the bitstream already is selected', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if the user is holding down the select key', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(true);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 4079ad225b..7a70ba80dd 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -243,9 +243,8 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
    * Handles a change in selected bitstream by changing the pagination if the change happened on a different page
    * @param previousSelectedEntry The previously selected entry
    * @param currentSelectedEntry  The currently selected entry
-   * @protected
    */
-  protected handleSelectedEntryChange(
+  handleSelectedEntryChange(
     previousSelectedEntry: SelectedBitstreamTableEntry,
     currentSelectedEntry: SelectedBitstreamTableEntry
   ) {

From 2b1b9d83d7d2e58a8f26b9843202f1705110fea5 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 9 Oct 2024 11:14:28 +0200
Subject: [PATCH 0628/1286] 118223: Include selection action with selection

---
 .../item-bitstreams.service.spec.ts           | 176 ++++++++++++++----
 .../item-bitstreams.service.stub.ts           |   2 +-
 .../item-bitstreams.service.ts                |  86 ++++++---
 ...em-edit-bitstream-bundle.component.spec.ts |  35 +---
 .../item-edit-bitstream-bundle.component.ts   |  44 +++--
 5 files changed, 237 insertions(+), 106 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
index 94adb5f23a..f2af25f22f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -77,20 +77,20 @@ describe('ItemBitstreamsService', () => {
 
   describe('selectBitstreamEntry', () => {
     it('should correctly make getSelectedBitstream$ emit', fakeAsync(() => {
-      const emittedEntries = [];
+      const emittedActions = [];
 
-      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
 
       const entry = Object.assign({}, defaultEntry);
 
       service.selectBitstreamEntry(entry);
       tick();
 
-      expect(emittedEntries.length).toBe(2);
-      expect(emittedEntries[1]).toEqual(entry);
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
     }));
 
     it('should correctly make getSelectedBitstream return the bitstream', () => {
@@ -112,26 +112,26 @@ describe('ItemBitstreamsService', () => {
     });
 
     it('should do nothing if no entry was provided', fakeAsync(() => {
-      const emittedEntries = [];
+      const emittedActions = [];
 
-      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
 
       const entry = Object.assign({}, defaultEntry);
 
       service.selectBitstreamEntry(entry);
       tick();
 
-      expect(emittedEntries.length).toBe(2);
-      expect(emittedEntries[1]).toEqual(entry);
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
 
       service.selectBitstreamEntry(null);
       tick();
 
-      expect(emittedEntries.length).toBe(2);
-      expect(emittedEntries[1]).toEqual(entry);
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
     }));
 
     it('should announce the selected bitstream', () => {
@@ -146,41 +146,41 @@ describe('ItemBitstreamsService', () => {
 
   describe('clearSelection', () => {
     it('should clear the selected bitstream', fakeAsync(() => {
-      const emittedEntries = [];
+      const emittedActions = [];
 
-      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
 
       const entry = Object.assign({}, defaultEntry);
 
       service.selectBitstreamEntry(entry);
       tick();
 
-      expect(emittedEntries.length).toBe(2);
-      expect(emittedEntries[1]).toEqual(entry);
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
 
       service.clearSelection();
       tick();
 
-      expect(emittedEntries.length).toBe(3);
-      expect(emittedEntries[2]).toBeNull();
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
     }));
 
     it('should not do anything if there is no selected bitstream', fakeAsync(() => {
-      const emittedEntries = [];
+      const emittedActions = [];
 
-      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
 
       service.clearSelection();
       tick();
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
     }));
 
     it('should announce the cleared bitstream', () => {
@@ -225,27 +225,53 @@ describe('ItemBitstreamsService', () => {
   });
 
   describe('cancelSelection', () => {
-    it('should clear the selected bitstream', fakeAsync(() => {
-      const emittedEntries = [];
+    it('should clear the selected bitstream if it has not moved', fakeAsync(() => {
+      const emittedActions = [];
 
-      service.getSelectedBitstream$().subscribe(selected => emittedEntries.push(selected));
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
 
-      expect(emittedEntries.length).toBe(1);
-      expect(emittedEntries[0]).toBeNull();
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
 
       const entry = Object.assign({}, defaultEntry);
 
       service.selectBitstreamEntry(entry);
       tick();
 
-      expect(emittedEntries.length).toBe(2);
-      expect(emittedEntries[1]).toEqual(entry);
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
 
       service.cancelSelection();
       tick();
 
-      expect(emittedEntries.length).toBe(3);
-      expect(emittedEntries[2]).toBeNull();
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
+    }));
+
+    it('should cancel the selected bitstream if it has moved', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry, {
+        originalPosition: 0,
+        currentPosition: 3,
+      });
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cancelled', selectedEntry: entry });
     }));
 
     it('should announce a clear if the bitstream has not moved', () => {
@@ -359,6 +385,44 @@ describe('ItemBitstreamsService', () => {
         expect(service.getSelectedBitstream()).toEqual(movedEntry);
       });
 
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamUp();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
       it('should announce the move', () => {
         const startPosition = 7;
         const endPosition = startPosition - 1;
@@ -424,6 +488,44 @@ describe('ItemBitstreamsService', () => {
         expect(service.getSelectedBitstream()).toEqual(movedEntry);
       });
 
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          }
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          }
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamDown();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
       it('should announce the move', () => {
         const startPosition = 7;
         const endPosition = startPosition + 1;
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
index 0521bf47f6..7aac79fe69 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
@@ -9,7 +9,7 @@ export function getItemBitstreamsServiceStub(): ItemBitstreamsServiceStub {
 }
 
 export class ItemBitstreamsServiceStub {
-  getSelectedBitstream$ = jasmine.createSpy('getSelectedBitstream$').and
+  getSelectionAction$ = jasmine.createSpy('getSelectedBitstream$').and
     .returnValue(of(null));
 
   getSelectedBitstream = jasmine.createSpy('getSelectedBitstream').and
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index 5b5fb7d63c..2329107c29 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -87,6 +87,24 @@ export interface SelectedBitstreamTableEntry {
   currentPosition: number,
 }
 
+/**
+ * Interface storing data regarding a change in selected bitstream
+ */
+export interface SelectionAction {
+  /**
+   * The different types of actions:
+   *  - Selected: Bitstream was selected
+   *  - Moved: Bitstream was moved
+   *  - Cleared: Selection was cleared, bitstream remains at its current position
+   *  - Cancelled: Selection was cancelled, bitstream returns to its original position
+   */
+  action: 'Selected' | 'Moved' | 'Cleared' | 'Cancelled'
+  /**
+   * The table entry to which the selection action applies
+   */
+  selectedEntry: SelectedBitstreamTableEntry,
+}
+
 /**
  * This service handles the selection and updating of the bitstreams and their order on the
  * 'Edit Item' -> 'Bitstreams' page.
@@ -99,7 +117,7 @@ export class ItemBitstreamsService {
   /**
    * BehaviorSubject which emits every time the selected bitstream changes.
    */
-  protected selectedBitstream$: BehaviorSubject<SelectedBitstreamTableEntry> = new BehaviorSubject(null);
+  protected selectionAction$: BehaviorSubject<SelectionAction> = new BehaviorSubject(null);
 
   protected isPerformingMoveRequest = false;
 
@@ -116,45 +134,68 @@ export class ItemBitstreamsService {
   }
 
   /**
-   * Returns the observable emitting the currently selected bitstream
+   * Returns the observable emitting the selection actions
    */
-  getSelectedBitstream$(): Observable<SelectedBitstreamTableEntry> {
-    return this.selectedBitstream$;
+  getSelectionAction$(): Observable<SelectionAction> {
+    return this.selectionAction$;
+  }
+
+  /**
+   * Returns the latest selection action
+   */
+  getSelectionAction(): SelectionAction {
+    const action = this.selectionAction$.value;
+
+    if (hasNoValue(action)) {
+      return null;
+    }
+
+    return Object.assign({}, action);
+  }
+
+  /**
+   * Returns true if there currently is a selected bitstream
+   */
+  hasSelectedBitstream(): boolean {
+    const selectionAction = this.getSelectionAction();
+
+    if (hasNoValue(selectionAction)) {
+      return false;
+    }
+
+    const action = selectionAction.action;
+
+    return action === 'Selected' || action === 'Moved';
   }
 
   /**
    * Returns a copy of the currently selected bitstream
    */
   getSelectedBitstream(): SelectedBitstreamTableEntry {
-    const selected = this.selectedBitstream$.getValue();
-
-    if (hasNoValue(selected)) {
-      return selected;
+    if (!this.hasSelectedBitstream()) {
+      return null;
     }
 
-    return Object.assign({}, selected);
-  }
-
-  hasSelectedBitstream(): boolean {
-    return hasValue(this.getSelectedBitstream());
+    const selectionAction = this.getSelectionAction();
+    return Object.assign({}, selectionAction.selectedEntry);
   }
 
   /**
    * Select the provided entry
    */
   selectBitstreamEntry(entry: SelectedBitstreamTableEntry) {
-    if (hasValue(entry) && entry !== this.selectedBitstream$.getValue()) {
+    if (hasValue(entry) && entry.bitstream !== this.getSelectedBitstream()?.bitstream) {
       this.announceSelect(entry.bitstream.name);
-      this.updateSelectedBitstream(entry);
+      this.updateSelectionAction({ action: 'Selected', selectedEntry: entry });
     }
   }
 
   /**
-   * Makes the {@link selectedBitstream$} observable emit the provided {@link SelectedBitstreamTableEntry}.
+   * Makes the {@link selectionAction$} observable emit the provided {@link SelectedBitstreamTableEntry}.
    * @protected
    */
-  protected updateSelectedBitstream(entry: SelectedBitstreamTableEntry) {
-    this.selectedBitstream$.next(entry);
+  protected updateSelectionAction(action: SelectionAction) {
+    this.selectionAction$.next(action);
   }
 
   /**
@@ -164,7 +205,7 @@ export class ItemBitstreamsService {
     const selected = this.getSelectedBitstream();
 
     if (hasValue(selected)) {
-      this.updateSelectedBitstream(null);
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
       this.announceClear(selected.bitstream.name);
 
       if (selected.currentPosition !== selected.originalPosition) {
@@ -184,7 +225,6 @@ export class ItemBitstreamsService {
       return;
     }
 
-    this.updateSelectedBitstream(null);
 
     const originalPosition = selected.originalPosition;
     const currentPosition = selected.currentPosition;
@@ -192,9 +232,11 @@ export class ItemBitstreamsService {
     // If the selected bitstream has not moved, there is no need to return it to its original position
     if (currentPosition === originalPosition) {
       this.announceClear(selected.bitstream.name);
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
     } else {
       this.announceCancel(selected.bitstream.name, originalPosition);
       this.performBitstreamMoveRequest(selected.bundle, currentPosition, originalPosition);
+      this.updateSelectionAction({ action: 'Cancelled', selectedEntry: selected });
     }
   }
 
@@ -219,7 +261,7 @@ export class ItemBitstreamsService {
       };
 
       this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
-      this.updateSelectedBitstream(selected);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
     }
   }
 
@@ -244,7 +286,7 @@ export class ItemBitstreamsService {
       };
 
       this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
-      this.updateSelectedBitstream(selected);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
     }
   }
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index 6008b5431f..26a1b0e913 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -107,15 +107,8 @@ describe('ItemEditBitstreamBundleComponent', () => {
     });
 
     it('should move to the page the selected entry is on if were not on that page', () => {
-      const selectedA: SelectedBitstreamTableEntry = {
-        bitstream: null,
-        bundle: bundle,
-        bundleSize: 5,
-        originalPosition: 1,
-        currentPosition: 1,
-      };
 
-      const selectedB: SelectedBitstreamTableEntry = {
+      const entry: SelectedBitstreamTableEntry = {
         bitstream: null,
         bundle: bundle,
         bundleSize: 5,
@@ -123,20 +116,12 @@ describe('ItemEditBitstreamBundleComponent', () => {
         currentPosition: 2,
       };
 
-      comp.handleSelectedEntryChange(selectedA, selectedB);
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
       expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
     });
 
     it('should not change page when we are already on the correct page', () => {
-      const selectedA: SelectedBitstreamTableEntry = {
-        bitstream: null,
-        bundle: bundle,
-        bundleSize: 5,
-        originalPosition: 0,
-        currentPosition: 0,
-      };
-
-      const selectedB: SelectedBitstreamTableEntry = {
+      const entry: SelectedBitstreamTableEntry = {
         bitstream: null,
         bundle: bundle,
         bundleSize: 5,
@@ -144,12 +129,12 @@ describe('ItemEditBitstreamBundleComponent', () => {
         currentPosition: 1,
       };
 
-      comp.handleSelectedEntryChange(selectedA, selectedB);
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
       expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
     });
 
     it('should change to the original page when cancelling', () => {
-      const selectedA: SelectedBitstreamTableEntry = {
+      const entry: SelectedBitstreamTableEntry = {
         bitstream: null,
         bundle: bundle,
         bundleSize: 5,
@@ -157,14 +142,12 @@ describe('ItemEditBitstreamBundleComponent', () => {
         currentPosition: 0,
       };
 
-      const selectedB = null;
-
-      comp.handleSelectedEntryChange(selectedA, selectedB);
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
       expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
     });
 
     it('should not change page when we are already on the correct page when cancelling', () => {
-      const selectedA: SelectedBitstreamTableEntry = {
+      const entry: SelectedBitstreamTableEntry = {
         bitstream: null,
         bundle: bundle,
         bundleSize: 5,
@@ -172,9 +155,7 @@ describe('ItemEditBitstreamBundleComponent', () => {
         currentPosition: 3,
       };
 
-      const selectedB = null;
-
-      comp.handleSelectedEntryChange(selectedA, selectedB);
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
       expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
     });
   });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 7a70ba80dd..2c7d8ca60f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -25,7 +25,7 @@ import {
   paginatedListToArray,
 } from '../../../../core/shared/operators';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { map, take, filter, tap, pairwise } from 'rxjs/operators';
+import { map, take, filter, tap } from 'rxjs/operators';
 import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
@@ -35,7 +35,7 @@ import {
   ItemBitstreamsService,
   BitstreamTableEntry,
   SelectedBitstreamTableEntry,
-  MOVE_KEY
+  MOVE_KEY, SelectionAction
 } from '../item-bitstreams.service';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { hasValue, hasNoValue } from '../../../../shared/empty.util';
@@ -233,31 +233,37 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
 
   protected initializeSelectionActions() {
     this.subscriptions.push(
-      this.itemBitstreamsService.getSelectedBitstream$().pipe(pairwise()).subscribe(
-        ([previousSelection, currentSelection]) =>
-          this.handleSelectedEntryChange(previousSelection, currentSelection))
+      this.itemBitstreamsService.getSelectionAction$().subscribe(
+        selectionAction => this.handleSelectionAction(selectionAction))
     );
   }
 
   /**
    * Handles a change in selected bitstream by changing the pagination if the change happened on a different page
-   * @param previousSelectedEntry The previously selected entry
-   * @param currentSelectedEntry  The currently selected entry
+   * @param selectionAction
    */
-  handleSelectedEntryChange(
-    previousSelectedEntry: SelectedBitstreamTableEntry,
-    currentSelectedEntry: SelectedBitstreamTableEntry
-  ) {
-    if (hasValue(currentSelectedEntry) && currentSelectedEntry.bundle === this.bundle) {
-      // If the currently selected bitstream belongs to this bundle, it has possibly moved to a different page.
-      // In that case we want to change the pagination to the new page.
-      this.redirectToCurrentPage(currentSelectedEntry);
+  handleSelectionAction(selectionAction: SelectionAction) {
+    if (hasNoValue(selectionAction) || selectionAction.selectedEntry.bundle !== this.bundle) {
+      return;
     }
 
-    // If the selection is cancelled or cleared, it is possible the selected bitstream is currently on a different page
-    // In that case we want to change the pagination to the place where the bitstream was returned to
-    if (hasNoValue(currentSelectedEntry) && hasValue(previousSelectedEntry) && previousSelectedEntry.bundle === this.bundle) {
-      this.redirectToOriginalPage(previousSelectedEntry);
+    if (selectionAction.action === 'Moved') {
+      // If the currently selected bitstream belongs to this bundle, it has possibly moved to a different page.
+      // In that case we want to change the pagination to the new page.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cancelled') {
+      // If the selection is cancelled (and returned to its original position), it is possible the previously selected
+      // bitstream is returned to a different page. In that case we want to change the pagination to the place where
+      // the bitstream was returned to.
+      this.redirectToOriginalPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cleared') {
+      // If the selection is cleared, it is possible the previously selected bitstream is on a different page. In that
+      // case we want to change the pagination to the place where the bitstream is.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
     }
   }
 

From 8d93f22767edbf18396edc49b16629967f04c287 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 9 Oct 2024 12:01:33 +0200
Subject: [PATCH 0629/1286] 119176: Make table horizontally scrollable

For most screen sizes, the ResponsiveTableSizes is enough to resize the
table columns. On very small screens, or when zoomed in a lot, even the
smallest column sizes are too big. To make it possible to view the
rest of the content even in these situations, the ability to scroll
horizontally is added.
---
 .../item-bitstreams/item-bitstreams.component.html            | 2 +-
 .../item-bitstreams/item-bitstreams.component.scss            | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index b9af2a7d18..7789b68278 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -27,7 +27,7 @@
     </button>
   </div>
 
-  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border">
+  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border scrollable-table">
     <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles; first as isFirst"
                                    [bundle]="bundle"
                                    [item]="item"
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 0ee56fe67e..985516ab12 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -39,3 +39,7 @@
 :host ::ng-deep .pagination {
   padding-top: 0.5rem;
 }
+
+.scrollable-table {
+  overflow-x: auto;
+}

From 5bb6f6d34c6b8f170a337762c61db3ecec7facbe Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 14 Oct 2024 11:30:48 +0200
Subject: [PATCH 0630/1286] 119176: Announce notification content in live
 region

---
 .../models/notification-options.model.ts      | 12 +++-
 .../notifications-board.component.spec.ts     | 49 ++++++++++++++-
 .../notifications-board.component.ts          | 60 +++++++++++++------
 3 files changed, 97 insertions(+), 24 deletions(-)

diff --git a/src/app/shared/notifications/models/notification-options.model.ts b/src/app/shared/notifications/models/notification-options.model.ts
index 65011496b3..c891781d9d 100644
--- a/src/app/shared/notifications/models/notification-options.model.ts
+++ b/src/app/shared/notifications/models/notification-options.model.ts
@@ -4,19 +4,25 @@ export interface INotificationOptions {
   timeOut: number;
   clickToClose: boolean;
   animate: NotificationAnimationsType | string;
+  announceContentInLiveRegion: boolean;
 }
 
 export class NotificationOptions implements INotificationOptions {
   public timeOut: number;
   public clickToClose: boolean;
   public animate: any;
+  public announceContentInLiveRegion: boolean;
 
-  constructor(timeOut = 5000,
-              clickToClose = true,
-              animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
 
+  constructor(
+    timeOut = 5000,
+    clickToClose = true,
+    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale,
+    announceContentInLiveRegion: boolean = true,
+  ) {
     this.timeOut = timeOut;
     this.clickToClose = clickToClose;
     this.animate = animate;
+    this.announceContentInLiveRegion = announceContentInLiveRegion;
   }
 }
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
index 08b9585a8c..73f4e6b1b1 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, inject, TestBed, waitForAsync, fakeAsync, flush } from '@angular/core/testing';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { ChangeDetectorRef } from '@angular/core';
 
@@ -15,14 +15,20 @@ import uniqueId from 'lodash/uniqueId';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { cold } from 'jasmine-marbles';
+import { LiveRegionService } from '../../live-region/live-region.service';
+import { LiveRegionServiceStub } from '../../live-region/live-region.service.stub';
+import { NotificationOptions } from '../models/notification-options.model';
 
 export const bools = { f: false, t: true };
 
 describe('NotificationsBoardComponent', () => {
   let comp: NotificationsBoardComponent;
   let fixture: ComponentFixture<NotificationsBoardComponent>;
+  let liveRegionService: LiveRegionServiceStub;
 
   beforeEach(waitForAsync(() => {
+    liveRegionService = new LiveRegionServiceStub();
+
     TestBed.configureTestingModule({
       imports: [
         BrowserModule,
@@ -36,7 +42,9 @@ describe('NotificationsBoardComponent', () => {
       declarations: [NotificationsBoardComponent, NotificationComponent], // declare the test component
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        ChangeDetectorRef]
+        { provide: LiveRegionService, useValue: liveRegionService },
+        ChangeDetectorRef,
+      ]
     }).compileComponents();  // compile template and css
   }));
 
@@ -106,5 +114,42 @@ describe('NotificationsBoardComponent', () => {
     });
   });
 
+  describe('add', () => {
+    beforeEach(() => {
+      liveRegionService.addMessage.calls.reset();
+    });
+
+    it('should announce content to the live region', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).toHaveBeenCalledWith('content');
+    }));
+
+    it('should not announce anything if there is no content', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+
+    it('should not announce the content if disabled', fakeAsync(() => {
+      const options = new NotificationOptions();
+      options.announceContentInLiveRegion = false;
+
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      notification.options = options;
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+  });
+
 })
 ;
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 97ae09c1a6..eaba659678 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { select, Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription, of as observableOf } from 'rxjs';
 import difference from 'lodash/difference';
 
 import { NotificationsService } from '../notifications.service';
@@ -18,6 +18,9 @@ import { notificationsStateSelector } from '../selectors';
 import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
+import { LiveRegionService } from '../../live-region/live-region.service';
+import { hasNoValue, isNotEmptyOperator } from '../../empty.util';
+import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-notifications-board',
@@ -49,9 +52,12 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
    */
   public isPaused$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-  constructor(private service: NotificationsService,
-              private store: Store<AppState>,
-              private cdr: ChangeDetectorRef) {
+  constructor(
+    private service: NotificationsService,
+    private store: Store<AppState>,
+    private cdr: ChangeDetectorRef,
+    protected liveRegionService: LiveRegionService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -85,6 +91,7 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
         this.notifications.splice(this.notifications.length - 1, 1);
       }
       this.notifications.splice(0, 0, item);
+      this.addContentToLiveRegion(item);
     } else {
       // Remove the notification from the store
       // This notification was in the store, but not in this.notifications
@@ -93,29 +100,44 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Adds the content of the notification (if any) to the live region, so it can be announced by screen readers.
+   */
+  private addContentToLiveRegion(item: INotification) {
+    let content = item.content;
+
+    if (!item.options.announceContentInLiveRegion || hasNoValue(content)) {
+      return;
+    }
+
+    if (typeof content === 'string') {
+      content = observableOf(content);
+    }
+
+    content.pipe(
+      isNotEmptyOperator(),
+      take(1),
+    ).subscribe(contentStr => this.liveRegionService.addMessage(contentStr));
+  }
+
+  /**
+   * Whether to block the provided item because a duplicate notification with the exact same information already
+   * exists within the notifications array.
+   * @param item The item to check
+   * @return true if the notifications array already contains a notification with the exact same information as the
+   * provided item. false otherwise.
+   * @private
+   */
   private block(item: INotification): boolean {
     const toCheck = item.html ? this.checkHtml : this.checkStandard;
+
     this.notifications.forEach((notification) => {
       if (toCheck(notification, item)) {
         return true;
       }
     });
 
-    if (this.notifications.length > 0) {
-      this.notifications.forEach((notification) => {
-        if (toCheck(notification, item)) {
-          return true;
-        }
-      });
-    }
-
-    let comp: INotification;
-    if (this.notifications.length > 0) {
-      comp = this.notifications[0];
-    } else {
-      return false;
-    }
-    return toCheck(comp, item);
+    return false;
   }
 
   private checkStandard(checker: INotification, item: INotification): boolean {

From 93f9341387755efc14d3272f7f9cca452ab91996 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 16 Oct 2024 14:11:01 +0200
Subject: [PATCH 0631/1286] 119176: Add aria-labels to buttons

---
 .../item-edit-bitstream-bundle.component.html                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index efbdd8c69b..06201b1cbe 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -40,6 +40,7 @@
             <div class="btn-group">
               <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                       [queryParams]="{bundle: bundle.id}"
+                      [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
                       class="btn btn-outline-success btn-sm"
                       title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
                 <i class="fas fa-upload fa-fw"></i>
@@ -101,21 +102,25 @@
               <div class="text-center w-100">
                 <div class="btn-group relationship-action-buttons">
                   <a [href]="entry.downloadUrl"
+                     [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
                      class="btn btn-outline-primary btn-sm"
                      title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
                      [attr.data-test]="'download-button' | dsBrowserOnly">
                     <i class="fas fa-download fa-fw"></i>
                   </a>
                   <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
                   </button>
                   <button [disabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                          [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
                           class="btn btn-outline-danger btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
                   <button [disabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                           class="btn btn-outline-warning btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
                     <i class="fas fa-undo-alt fa-fw"></i>

From 6644714bb7c2108e4afe66a34b8de28b5726d65a Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 16 Oct 2024 15:56:35 +0200
Subject: [PATCH 0632/1286] 119176: clear viewContainerRef on destroy

---
 .../item-edit-bitstream-bundle.component.ts                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 2c7d8ca60f..a751a89e1b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -174,6 +174,7 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
+    this.viewContainerRef.clear();
     this.subscriptions.forEach(sub => sub?.unsubscribe());
   }
 

From b29a12dce3ad6c92c24f6370f27715cccc20f989 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 16:33:20 -0500
Subject: [PATCH 0633/1286] Add basic e2e testing for i18n

(cherry picked from commit a74cd848feeabe380026f504f0e70f6de134fd65)
---
 cypress/e2e/header.cy.ts                      | 25 +++++++++++++++++++
 .../lang-switch/lang-switch.component.html    |  1 +
 2 files changed, 26 insertions(+)

diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 043d67dd2b..1471e5ae6c 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -10,4 +10,29 @@ describe('Header', () => {
     // Analyze <ds-header> for accessibility
     testA11y('ds-header');
   });
+
+  it('should allow for changing language to German (for example)', () => {
+    cy.visit('/');
+
+    // Click the language switcher (globe) in header
+    cy.get('a[data-test="lang-switch"]').click();
+    // Click on the "Deusch" language in dropdown
+    cy.get('#language-menu-list li').contains('Deutsch').click();
+
+    // HTML "lang" attribute should switch to "de"
+    cy.get('html').invoke('attr', 'lang').should('eq', 'de');
+
+    // Login menu should now be in German
+    cy.get('a[data-test="login-menu"]').contains('Anmelden');
+
+    // Change back to English from language switcher
+    cy.get('a[data-test="lang-switch"]').click();
+    cy.get('#language-menu-list li').contains('English').click();
+
+    // HTML "lang" attribute should switch to "en"
+    cy.get('html').invoke('attr', 'lang').should('eq', 'en');
+
+    // Login menu should now be in English
+    cy.get('a[data-test="login-menu"]').contains('Log In');
+  });
 });
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 9be622099b..6d1727cfe7 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -5,6 +5,7 @@
      aria-haspopup="menu"
      [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+     data-test="lang-switch"
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>

From 946a3afde86f4f5158875cc3528712fc0916b73f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Oct 2024 16:33:20 -0500
Subject: [PATCH 0634/1286] Add basic e2e testing for i18n

---
 cypress/e2e/header.cy.ts                      | 25 +++++++++++++++++++
 .../lang-switch/lang-switch.component.html    |  1 +
 2 files changed, 26 insertions(+)

diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
index 9852216e43..c86fd39f1f 100644
--- a/cypress/e2e/header.cy.ts
+++ b/cypress/e2e/header.cy.ts
@@ -10,4 +10,29 @@ describe('Header', () => {
         // Analyze <ds-header> for accessibility
         testA11y('ds-header');
     });
+
+    it('should allow for changing language to German (for example)', () => {
+        cy.visit('/');
+
+        // Click the language switcher (globe) in header
+        cy.get('a[data-test="lang-switch"]').click();
+        // Click on the "Deusch" language in dropdown
+        cy.get('#language-menu-list li').contains('Deutsch').click();
+
+        // HTML "lang" attribute should switch to "de"
+        cy.get('html').invoke('attr', 'lang').should('eq', 'de');
+
+        // Login menu should now be in German
+        cy.get('a[data-test="login-menu"]').contains('Anmelden');
+
+        // Change back to English from language switcher
+        cy.get('a[data-test="lang-switch"]').click();
+        cy.get('#language-menu-list li').contains('English').click();
+
+        // HTML "lang" attribute should switch to "en"
+        cy.get('html').invoke('attr', 'lang').should('eq', 'en');
+
+        // Login menu should now be in English
+        cy.get('a[data-test="login-menu"]').contains('Log In');
+    });
 });
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 9be622099b..6d1727cfe7 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -5,6 +5,7 @@
      aria-haspopup="menu"
      [title]="'nav.language' | translate"
      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+     data-test="lang-switch"
      tabindex="0">
     <i class="fas fa-globe-asia fa-lg fa-fw"></i>
   </a>

From bcb70d54dda205b8ff64aab33f9a99e3cb097054 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:52:32 +0000
Subject: [PATCH 0635/1286] Bump @babel/runtime from 7.21.0 to 7.25.7

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.21.0 to 7.25.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.7/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 09bd580a26..cd4b25b07a 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
     "@angular/ssr": "^17.3.10",
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.25.7",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.3",
diff --git a/yarn.lock b/yarn.lock
index 37c00d87ed..be637b90e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1351,13 +1351,6 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
 "@babel/runtime@7.24.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
@@ -1365,10 +1358,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
-  integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
+"@babel/runtime@7.25.7", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.7.tgz#7ffb53c37a8f247c8c4d335e89cdf16a2e0d0fb6"
+  integrity sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -9802,11 +9795,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"

From ab7bded22114f8b2b4563bd5de5be8fccf836547 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:56:44 +0000
Subject: [PATCH 0636/1286] Bump express-static-gzip from 2.1.7 to 2.1.8

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.7 to 2.1.8.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.7...v2.1.8)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index cb8456501a..33a0765cd2 100644
--- a/package.json
+++ b/package.json
@@ -174,7 +174,7 @@
     "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "express-static-gzip": "^2.1.7",
+    "express-static-gzip": "^2.1.8",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
     "karma": "^6.4.2",
diff --git a/yarn.lock b/yarn.lock
index 26f50cb912..d38dd6db8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5680,12 +5680,12 @@ express-rate-limit@^5.1.3:
   resolved "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.7.tgz#5904824a07950ba741ec3a23a21839dd04c63506"
-  integrity sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==
+express-static-gzip@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.8.tgz#f37f0fe9e8113e56cfac63a98c0197ee6bd6458f"
+  integrity sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==
   dependencies:
-    serve-static "^1.14.1"
+    serve-static "^1.16.2"
 
 express@^4.17.3, express@^4.18.2, express@^4.21.1:
   version "4.21.1"
@@ -10605,7 +10605,7 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.16.2, serve-static@^1.14.1:
+serve-static@1.16.2, serve-static@^1.16.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
   integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==

From 3459bf68cba0f6d09b0f7a6008bf4087a67c2573 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:59:07 +0000
Subject: [PATCH 0637/1286] Bump the angular group with 15 updates

Bumps the angular group with 15 updates:

| Package | From | To |
| --- | --- | --- |
| [@angular/animations](https://github.com/angular/angular/tree/HEAD/packages/animations) | `15.2.8` | `15.2.10` |
| [@angular/cdk](https://github.com/angular/components) | `15.2.8` | `15.2.9` |
| [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) | `15.2.8` | `15.2.10` |
| [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) | `15.2.8` | `15.2.10` |
| [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) | `15.2.8` | `15.2.10` |
| [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) | `15.2.8` | `15.2.10` |
| [@angular/localize](https://github.com/angular/angular) | `15.2.8` | `15.2.10` |
| [@angular/platform-browser](https://github.com/angular/angular/tree/HEAD/packages/platform-browser) | `15.2.8` | `15.2.10` |
| [@angular/platform-browser-dynamic](https://github.com/angular/angular/tree/HEAD/packages/platform-browser-dynamic) | `15.2.8` | `15.2.10` |
| [@angular/platform-server](https://github.com/angular/angular/tree/HEAD/packages/platform-server) | `15.2.8` | `15.2.10` |
| [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) | `15.2.8` | `15.2.10` |
| [@angular-devkit/build-angular](https://github.com/angular/angular-cli) | `15.2.6` | `15.2.11` |
| [@angular/cli](https://github.com/angular/angular-cli) | `16.2.12` | `16.2.16` |
| [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) | `15.2.8` | `15.2.10` |
| [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) | `15.2.8` | `15.2.10` |


Updates `@angular/animations` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/animations)

Updates `@angular/cdk` from 15.2.8 to 15.2.9
- [Release notes](https://github.com/angular/components/releases)
- [Changelog](https://github.com/angular/components/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/components/compare/15.2.8...15.2.9)

Updates `@angular/common` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/common)

Updates `@angular/compiler` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/compiler)

Updates `@angular/core` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/core)

Updates `@angular/forms` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/forms)

Updates `@angular/localize` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/compare/15.2.8...15.2.10)

Updates `@angular/platform-browser` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/platform-browser)

Updates `@angular/platform-browser-dynamic` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/platform-browser-dynamic)

Updates `@angular/platform-server` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/platform-server)

Updates `@angular/router` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/router)

Updates `@angular-devkit/build-angular` from 15.2.6 to 15.2.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/15.2.6...15.2.11)

Updates `@angular/cli` from 16.2.12 to 16.2.16
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/16.2.12...16.2.16)

Updates `@angular/compiler-cli` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/compiler-cli)

Updates `@angular/language-service` from 15.2.8 to 15.2.10
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/15.2.10/packages/language-service)

---
updated-dependencies:
- dependency-name: "@angular/animations"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/cdk"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/common"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/compiler"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/forms"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/localize"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-browser"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-browser-dynamic"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/platform-server"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/router"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/compiler-cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/language-service"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

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

diff --git a/package.json b/package.json
index cb8456501a..24d9f461e0 100644
--- a/package.json
+++ b/package.json
@@ -55,17 +55,17 @@
     "ts-node": "10.2.1"
   },
   "dependencies": {
-    "@angular/animations": "^15.2.8",
-    "@angular/cdk": "^15.2.8",
-    "@angular/common": "^15.2.8",
-    "@angular/compiler": "^15.2.8",
-    "@angular/core": "^15.2.8",
-    "@angular/forms": "^15.2.8",
-    "@angular/localize": "15.2.8",
-    "@angular/platform-browser": "^15.2.8",
-    "@angular/platform-browser-dynamic": "^15.2.8",
-    "@angular/platform-server": "^15.2.8",
-    "@angular/router": "^15.2.8",
+    "@angular/animations": "^15.2.10",
+    "@angular/cdk": "^15.2.9",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
+    "@angular/forms": "^15.2.10",
+    "@angular/localize": "15.2.10",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-server": "^15.2.10",
+    "@angular/router": "^15.2.10",
     "@babel/runtime": "7.21.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
@@ -136,15 +136,15 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.6",
+    "@angular-devkit/build-angular": "^15.2.11",
     "@angular-eslint/builder": "15.2.1",
     "@angular-eslint/eslint-plugin": "15.2.1",
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^16.0.4",
-    "@angular/compiler-cli": "^15.2.8",
-    "@angular/language-service": "^15.2.8",
+    "@angular/cli": "^16.2.16",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@ngrx/store-devtools": "^15.4.0",
diff --git a/yarn.lock b/yarn.lock
index 26f50cb912..63296d7ded 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,28 +31,20 @@
     tsconfig-paths "^4.1.0"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1502.5", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0", "@angular-devkit/architect@~0.1502.0":
-  version "0.1502.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.5.tgz"
-  integrity sha512-6KVrXQ/X7W88WSJvYe69ed/2QzQNlObKpj3BWzmcKnA+IvJB37/mvw8VaGFP9y+pDa/b1D1yCDtAJLeP5QY3xg==
+"@angular-devkit/architect@0.1502.11", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0", "@angular-devkit/architect@~0.1502.0":
+  version "0.1502.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.11.tgz#841a25eaed0c463329726644fbb3bb06a8617f0e"
+  integrity sha512-+hkG5UjIaKMRdo6SFLNQs+Cv7yAVeN8ijfDwI2z/mp7/otowuSEy+H3Tii195jfJ8TQ+y1B7svnx2D6O7oOYbQ==
   dependencies:
-    "@angular-devkit/core" "15.2.5"
+    "@angular-devkit/core" "15.2.11"
     rxjs "6.6.7"
 
-"@angular-devkit/architect@0.1502.6":
-  version "0.1502.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.6.tgz#bf9452610f128ee312ee836510700152993a2447"
-  integrity sha512-n4oJ9vzFWwabf+AfgqqevVzdJhNKNCav7ytefjD/Y01vkNwlXqWnHcvyyHCLkVibJ6WR8J9lK4t77j/HFlDvWQ==
+"@angular-devkit/architect@0.1602.16":
+  version "0.1602.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.16.tgz#7ffcaa5840037682d8205054c2c3bb84a053aeb7"
+  integrity sha512-aWEeGU4UlbrSKpcAZsldVNxNXAWEeu9hM2BPk77GftbRC8PBMWpgYyrJWTz2ryn8aSmGKT3T8OyBH4gZA/667w==
   dependencies:
-    "@angular-devkit/core" "15.2.6"
-    rxjs "6.6.7"
-
-"@angular-devkit/architect@0.1602.12":
-  version "0.1602.12"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.12.tgz#a430970acd4ad9f7cc23d41facc2c04ea5770f65"
-  integrity sha512-19Fwwfx+KvJ01SyI6cstRgqT9+cwer8Ro1T27t1JqlGyOX8tY3pV78ulwxy2+wCzPjR18V6W7cb7Cv6fyK4xog==
-  dependencies:
-    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/core" "16.2.16"
     rxjs "7.8.1"
 
 "@angular-devkit/architect@^0.1202.10":
@@ -63,15 +55,15 @@
     "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@^15.0.0":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.5.tgz"
-  integrity sha512-D2LxjBtUlgJnPxybOIN0XsENEGkVkqCGBBii5oK84HvgBHXO/EyP1WXpOdb2lOYSUZyjhOOs0q42LCobJoaxUw==
+"@angular-devkit/build-angular@^15.0.0", "@angular-devkit/build-angular@^15.2.11":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.11.tgz#1235d45c6d417912d01ef3fbcad1465fcb8a81d2"
+  integrity sha512-MnpVCJdk5jHuK7CH/cTcRT0JQkkKkRTEV3WTyOUhTm0O3PlKwvTM6/Sner+zyuhKyw5VFBBMypHh59aTUDEZ1A==
   dependencies:
     "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.5"
-    "@angular-devkit/build-webpack" "0.1502.5"
-    "@angular-devkit/core" "15.2.5"
+    "@angular-devkit/architect" "0.1502.11"
+    "@angular-devkit/build-webpack" "0.1502.11"
+    "@angular-devkit/core" "15.2.11"
     "@babel/core" "7.20.12"
     "@babel/generator" "7.20.14"
     "@babel/helper-annotate-as-pure" "7.18.6"
@@ -83,7 +75,7 @@
     "@babel/runtime" "7.20.13"
     "@babel/template" "7.20.7"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.5"
+    "@ngtools/webpack" "15.2.11"
     ansi-colors "4.1.3"
     autoprefixer "10.4.13"
     babel-loader "9.1.2"
@@ -110,13 +102,13 @@
     ora "5.4.1"
     parse5-html-rewriting-stream "7.0.0"
     piscina "3.2.0"
-    postcss "8.4.21"
+    postcss "8.4.31"
     postcss-loader "7.0.2"
     resolve-url-loader "5.0.0"
     rxjs "6.6.7"
     sass "1.58.1"
     sass-loader "13.2.0"
-    semver "7.3.8"
+    semver "7.5.3"
     source-map-loader "4.0.1"
     source-map-support "0.5.21"
     terser "5.16.3"
@@ -124,95 +116,19 @@
     tree-kill "1.2.2"
     tslib "2.5.0"
     webpack "5.76.1"
-    webpack-dev-middleware "6.0.1"
+    webpack-dev-middleware "6.1.2"
     webpack-dev-server "4.11.1"
     webpack-merge "5.8.0"
     webpack-subresource-integrity "5.1.0"
   optionalDependencies:
     esbuild "0.17.8"
 
-"@angular-devkit/build-angular@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.6.tgz#15f15c27eed465c8becc7a313d4909a7ee66f959"
-  integrity sha512-OmMcdXXUrAdZNxwxDE8SUx1FMcq9FyMnrSv1PmP9sHPBoxAdBVc/qNdGA9V7C5yHvWHGgzsx7ZK5TDuvifzS5g==
+"@angular-devkit/build-webpack@0.1502.11":
+  version "0.1502.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.11.tgz#eec4dcd783557401305dc57778ad5f1f09cd6df3"
+  integrity sha512-OTONIRp770Jfems4+cULmtoeSzjnpx5UjV2EazojnhRXXBSJMWRMPvwD2QvQl9UO/6eOV3d2mgmP2xOZgc/D6w==
   dependencies:
-    "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.6"
-    "@angular-devkit/build-webpack" "0.1502.6"
-    "@angular-devkit/core" "15.2.6"
-    "@babel/core" "7.20.12"
-    "@babel/generator" "7.20.14"
-    "@babel/helper-annotate-as-pure" "7.18.6"
-    "@babel/helper-split-export-declaration" "7.18.6"
-    "@babel/plugin-proposal-async-generator-functions" "7.20.7"
-    "@babel/plugin-transform-async-to-generator" "7.20.7"
-    "@babel/plugin-transform-runtime" "7.19.6"
-    "@babel/preset-env" "7.20.2"
-    "@babel/runtime" "7.20.13"
-    "@babel/template" "7.20.7"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.6"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.13"
-    babel-loader "9.1.2"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "4.21.5"
-    cacache "17.0.4"
-    chokidar "3.5.3"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.16"
-    css-loader "6.7.3"
-    esbuild-wasm "0.17.8"
-    glob "8.1.0"
-    https-proxy-agent "5.0.1"
-    inquirer "8.2.4"
-    jsonc-parser "3.2.0"
-    karma-source-map-support "1.4.0"
-    less "4.1.3"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.29.0"
-    mini-css-extract-plugin "2.7.2"
-    open "8.4.1"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    piscina "3.2.0"
-    postcss "8.4.21"
-    postcss-loader "7.0.2"
-    resolve-url-loader "5.0.0"
-    rxjs "6.6.7"
-    sass "1.58.1"
-    sass-loader "13.2.0"
-    semver "7.3.8"
-    source-map-loader "4.0.1"
-    source-map-support "0.5.21"
-    terser "5.16.3"
-    text-table "0.2.0"
-    tree-kill "1.2.2"
-    tslib "2.5.0"
-    webpack "5.76.1"
-    webpack-dev-middleware "6.0.1"
-    webpack-dev-server "4.11.1"
-    webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.17.8"
-
-"@angular-devkit/build-webpack@0.1502.5":
-  version "0.1502.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.5.tgz"
-  integrity sha512-gPkAa4AvQ7BxU+jmVJqrAO18kw/6iks+VUQ+2BVPyHCdqhroANHYdGbZ/pFlZdPmZVzSpusjd6VIbLhbHr/Ohw==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.5"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-webpack@0.1502.6":
-  version "0.1502.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.6.tgz#5fb444fc54d816e57458d36f3c280b522e5f5cfc"
-  integrity sha512-X7XQ11QDz2Bs5qpJ3a5glIytvI+S74ORQxdzvT6a6KB8ayW0SgZEhTwD+GF7pa5My8draIaXBGzzQR1qmpWK5Q==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.6"
+    "@angular-devkit/architect" "0.1502.11"
     rxjs "6.6.7"
 
 "@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
@@ -227,10 +143,10 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@15.2.5", "@angular-devkit/core@^15.0.0", "@angular-devkit/core@~15.2.0":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.5.tgz"
-  integrity sha512-ZfjEkAe2yYeekc3xjZ/U4pK9nb+w6BFwAEjou6mE8PWZH7iYskm0YCCXkmu+B+zViEcCLhAkJAxu9MwX4efd8g==
+"@angular-devkit/core@15.2.11", "@angular-devkit/core@^15.0.0", "@angular-devkit/core@~15.2.0":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.11.tgz#23ed023cf4066816d910cb341dd8ac2461cdf40f"
+  integrity sha512-zd6QelJ8pOPvz6TsehR0JqixjDjzgEOkKywBJBuwNXY+Nw3MJGayJeWS0UgC+Gk+LoTkpI21RoyaYELkAmD/tw==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -238,21 +154,10 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
-"@angular-devkit/core@15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.6.tgz#9118faadbc5e3613283da1774826d2b41883330f"
-  integrity sha512-YVTWZ+M+xNKdFX4EnY9QX49PZraawiaA0iTd2CUW8ZoTUvU7yOGMKZLSdz6aokTMRVfm0449wt6YL994ibOo1g==
-  dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.0"
-    rxjs "6.6.7"
-    source-map "0.7.4"
-
-"@angular-devkit/core@16.2.12":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.12.tgz#5d40e8414d5da14a4281af519d32e1241b002c89"
-  integrity sha512-o6ziQs+EcEonFezrsA46jbZqkQrs4ckS1bAQj93g5ZjGtieUz8l/U3lclvKpL/iEzWkGVViSYuP2KyW2oqTDiQ==
+"@angular-devkit/core@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.16.tgz#078c48790c7b2b87eb5f78c6b724c4d28cbe26a1"
+  integrity sha512-5xHs9JFmp78sydrOAg0UGErxfMVv5c2f3RXoikS7eBOOXTWEi5pmnOkOvSJ3loQFGVs3Y7i+u02G3VrF5ZxOrA==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -270,12 +175,12 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@16.2.12":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.12.tgz#9dbf287b2343059792c97bbfc60a3b52253c66f1"
-  integrity sha512-lf/Nz2o875pllxGNUcI2by4rctfRsOZOxvaLq2UaH6XG6Re9tqeNfn40a8qXrr9/IYntXnlvEid/pd9e8gFBIw==
+"@angular-devkit/schematics@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.16.tgz#7f8dbf16fe440f0a9d2b5b25d0dbe16b73356216"
+  integrity sha512-pF6fdtJh6yLmgA7Gs45JIdxPl2MsTAhYcZIMrX1a6ID64dfwtF0MP8fDE6vrWInV1zXbzzf7l7PeKuqVtTSzKg==
   dependencies:
-    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/core" "16.2.16"
     jsonc-parser "3.2.0"
     magic-string "0.30.1"
     ora "5.4.1"
@@ -338,31 +243,31 @@
     "@angular-eslint/bundled-angular-compiler" "15.2.1"
     "@typescript-eslint/utils" "5.48.2"
 
-"@angular/animations@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.8.tgz#11de2b0e7fc50918056bdc6d7545ea1864a8592d"
-  integrity sha512-I3xh8EASQ04s3qXQYpIORI0jFiFmvBQERBqS70TieTCIML7banOf9R3K7sAWB9frG5J0CEUwr+wtF47DCs/7eQ==
+"@angular/animations@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.10.tgz#c9194ba9a2b9b4e466e9c76e18591cde096a28e8"
+  integrity sha512-yxfN8qQpMaukRU5LjFkJBmy85rqrOp86tYVCsf+hmPEFRiXBMUj6xYLeCMcpk3Mt1JtnWGBR34ivGx+7bNeAow==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.8.tgz#f7da13abd6fb6a1355c02f5c02dc32bc679c4b1d"
-  integrity sha512-jiCoxfBFMH29IZIiPmVUzIWetfUNpMIvC20xYVF8RMM819vPogoObzwK4DN/sXcp/6oVbBzZFaYdijhhIt9soQ==
+"@angular/cdk@^15.2.9":
+  version "15.2.9"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-15.2.9.tgz#e22df07b296fec6dccf66d569c3acc3c504c2058"
+  integrity sha512-koaM07N1AIQ5oHU27l0/FoQSSoYAwlAYwVZ4Di3bYrJsTBNCN2Xsby7wI8gZxdepMnV4Fe9si382BDBov+oO4Q==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^16.0.4":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.12.tgz#f5ce4eea5409f708963a59a4ab787d6c08196fe3"
-  integrity sha512-Pcbiraoqdw4rR2Ey5Ooy0ESLS1Ffbjkb6sPfinKRkHmAvyqsmlvkfbB/qK8GrzDSFSWvAKMMXRw9l8nbjvQEXg==
+"@angular/cli@^16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.16.tgz#8886e63c75bbce91c5a550eeaf3b283eaef89533"
+  integrity sha512-aqfNYZ45ndrf36i+7AhQ9R8BCm025j7TtYaUmvvjT4LwiUg6f6KtlZPB/ivBlXmd1g9oXqW4advL0AIi8A/Ozg==
   dependencies:
-    "@angular-devkit/architect" "0.1602.12"
-    "@angular-devkit/core" "16.2.12"
-    "@angular-devkit/schematics" "16.2.12"
-    "@schematics/angular" "16.2.12"
+    "@angular-devkit/architect" "0.1602.16"
+    "@angular-devkit/core" "16.2.16"
+    "@angular-devkit/schematics" "16.2.16"
+    "@schematics/angular" "16.2.16"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "4.1.1"
@@ -378,17 +283,17 @@
     symbol-observable "4.0.0"
     yargs "17.7.2"
 
-"@angular/common@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.8.tgz#7d60a4d906b41a852f31c63116ede1b87c84a7ad"
-  integrity sha512-yLDQihiRcVl38HrWMPbqgzOaSUw85AQH5BsGdjbS6BpoBQj3EXOpccCMFsuxOKxPG4toatgawNqrEnK0Jpv9Mw==
+"@angular/common@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.10.tgz#897923023c8ca4a361ce218bdee9a3f09060df75"
+  integrity sha512-jdBn3fctkqoNrJn9VLsUHpcCEhCxWSczdsR+BBbD6T0oLl6vMrAVNjPwfBejnlgfWN1KoRU9kgOYsMxa5apIWQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.8.tgz#6535a34b51d143970aa046593d5289883a40fea8"
-  integrity sha512-fFxaDlbILo0t2t662qA0cjgn+kWItGlc1tFYKU6X7bvYb3t2e0cd9FzrFPLXUQVboGis83ULcJ2zkDxScnuPuQ==
+"@angular/compiler-cli@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.10.tgz#e51013aa0f3da303fc74f8e1948c550d8e74ead5"
+  integrity sha512-mCFIxrs60XicKfA2o42hA7LrQvhybi9BQveWuZn/2iIEOXx7R62Iemz8E21pLWftAZHGxEW3NECfBrY1d3gVmA==
   dependencies:
     "@babel/core" "7.19.3"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -401,68 +306,68 @@
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.8.tgz#7d8f3274e9f011b7b972ba616cd536a66d1e52ea"
-  integrity sha512-+dvspIDvuGoYqdL7r/3o9ojkR3fH1zevgC0ISJivcIrMi+WcJ0FV2JmJdnm8V52oNsHy+sMF9eEZGEbCbACE/A==
+"@angular/compiler@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.10.tgz#bd78f327d12eb5978f9dd05440aa23d4b5b925a9"
+  integrity sha512-M0XkeU0O73UlJZwDvOyp8/apetz9UKj78eTFDseMYJDLcxe6MpkbkxqpsGZnKYDj7LIep8PmCAKEkhtenE82zw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.8.tgz#6d7f8afa61be44b91e4b8737b39d7fdcb256a6ae"
-  integrity sha512-NDs+g4uM4EhyCvluf8a0YBCFXsDAEfCMHOD5cS00Bl+liTQ7JwtmepkWXMyjLB92irC9JaR79kdy4BoIKOh8WA==
+"@angular/core@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.10.tgz#93c1e0d460d21711654c578d2709a402e1822023"
+  integrity sha512-meGGidnitQJGDxYd9/LrqYiVlId+vGaLoiLgJdKBz+o2ZO6OmXQGuNw2VBqf17/Cc0/UjzrOY7+kILNFKkk/WQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.8.tgz#f62a3ede067ddac24ed1b7dc5cefe9b4b0370be7"
-  integrity sha512-VyevVj20DdQWjAQUyiFTe+DAzqG9GqfAOWn376Y/lhPcwxAojXePTGNgtQud566/urDrNrP5haaLD6O36/3n+w==
+"@angular/forms@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.10.tgz#09308e887df2fa4d349300c9d1f05cadfb3872b3"
+  integrity sha512-NIntGsNcN6o8L1txsbWXOf6f3K/CUBizdKsxsYVYGJIXEW5qU6UnWmfAZffNNXsT/XvbgUCjgDwT0cAwcqZPuQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.8.tgz#f37fb8b020c9d0fccf1bb5b46db525b67084cc9c"
-  integrity sha512-3wlaJrpxe8ZLe7ZGIOs/Z++kgJMOHZCUvdXLyp/4t1ejULgUgW9yi7nGsemWnSzsUCjf7595BP1Cp1gA/J/1QQ==
+"@angular/language-service@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.10.tgz#829a802aaf40bfab21d71463023a3b517500ffa9"
+  integrity sha512-G0g0teF4pBqLTgfyLcoBl55g91sCZvBK+V4VgTD/hXGpXyMNlNpOsgECSMliGQoJlsRLEugFsSlBNqy7CRoBtw==
 
-"@angular/localize@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-15.2.8.tgz#fa44efa7d3f84d4767b3b3ca586e7d36929aff54"
-  integrity sha512-wJLBp0MUnET9kHzBtqIlZ3RQ56JFItXSgmBXagQq+MU+uJZmGvuw6fez0i5wkgv9Rgnr25oCULVtpTF+T5RGYA==
+"@angular/localize@15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-15.2.10.tgz#9ca7ddcb6f51fc77b3000ec6a2b10b1bed005ce9"
+  integrity sha512-RHN+mUR4H34c/LLnNPAyQbfuZME4i9JgodK5YRRX8cSAFPafYLT0SspSuLsKtcCCEDadAZNDHzb8qv5MBtzJtg==
   dependencies:
     "@babel/core" "7.19.3"
     glob "8.1.0"
     yargs "^17.2.1"
 
-"@angular/platform-browser-dynamic@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.8.tgz#158d28298a6f38dc8a17c416eb2779afcafc16a7"
-  integrity sha512-75HyoZNibA3u/FvdK4Aw5KMzUmS/nDk5N8s7gfM09fe1resSPgFiW8JJEkr1xiUdA2WtSRbHs34y5rHLDe7n1Q==
+"@angular/platform-browser-dynamic@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.10.tgz#cc9ad3dcded6cb945ee8c4eef14db081dc6c3dfd"
+  integrity sha512-JHP6W+FX715Qv7DhqvfZLuBZXSDJrboiQsR06gUAgDSjAUyhbqmpVg/2YOtgeWpPkzNDtXdPU2PhcRdIv5J3Yg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.8.tgz#2400f732a020d59f17b9bf8c6c3f1fb065147328"
-  integrity sha512-8sKFUld54inj0FnQ1ydhFxnDgsbbf43W9FALye/5uEtLgwwE/ZvkNYMaQ7hq1JPuQRMDj3gJkFqaLeFjplpHDA==
+"@angular/platform-browser@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.10.tgz#ca5a904b4da9e0cf719414db89514ee4221cb93d"
+  integrity sha512-9tbgVGSJqwfrOzT8aA/kWBLNhJSQ9gUg0CJxwFBSJm8VkBUJrszoBlDsnSvlxx8/W2ejNULKHFTXeUzq0O/+RQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-server@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-15.2.8.tgz#b850cd70baabd986e0d94f27bff1dc44f958f3af"
-  integrity sha512-YfPAoK2zp3mTO6ubDe0C9Vzg9Vi4BxXkxHCPG0k8IM3Ivjedkv5PZ+vC0a+GjV2xR/0YqiVE3FCwXk4X6m6LuQ==
+"@angular/platform-server@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-15.2.10.tgz#521bcbd39a58fa5bb9649754cfceb99fe0d06f1b"
+  integrity sha512-fniyZJI59CFQaVeKnDvXZg/TW6EltzXO0WnozSG58ZNehJQF5g3ZjmPYsnmzb5VYNRXgve2itudNXmd6NeOoYg==
   dependencies:
     domino "^2.1.2"
     tslib "^2.3.0"
     xhr2 "^0.2.0"
 
-"@angular/router@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.8.tgz#99ebf83d34dae3ebe61097b43aded3743b49c5db"
-  integrity sha512-C62QBEeJSBTNTrQHZiklPrxwJwuENoZzWX22MMJ7dxl+7VjRgnmj8J7mcX9fLjHlL+mC3RvesMlX7sGZRQV1cg==
+"@angular/router@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.10.tgz#a5d32d769b930e905582ed6c7aa8122e63655738"
+  integrity sha512-LmuqEg0iIXSw7bli6HKJ19cbxP91v37GtRwbGKswyLihqzTgvjBYpvcfMnB5FRQ5LWkTwq5JclkX03dZw290Yg==
   dependencies:
     tslib "^2.3.0"
 
@@ -512,7 +417,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@7.20.12":
+"@babel/core@7.20.12", "@babel/core@^7.12.3":
   version "7.20.12"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"
   integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
@@ -533,28 +438,7 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@^7.12.3":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/generator@7.20.14", "@babel/generator@^7.20.7":
+"@babel/generator@7.20.14":
   version "7.20.14"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"
   integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
@@ -563,17 +447,7 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.18.9", "@babel/generator@^7.19.3":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
-  dependencies:
-    "@babel/types" "^7.21.4"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.23.0":
+"@babel/generator@^7.19.3", "@babel/generator@^7.20.7", "@babel/generator@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
   integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
@@ -704,7 +578,7 @@
   dependencies:
     "@babel/types" "^7.21.4"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
   version "7.21.2"
   resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"
   integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
@@ -766,14 +640,14 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@7.18.6", "@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
@@ -815,7 +689,7 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.18.9", "@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7":
+"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7":
   version "7.21.0"
   resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"
   integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
@@ -842,7 +716,7 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.18.9", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
+"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
@@ -1469,21 +1343,14 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.21.0":
+"@babel/runtime@7.21.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
   integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.17.2"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"
-  integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@7.20.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7":
+"@babel/template@7.20.7":
   version "7.20.7"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -1492,7 +1359,7 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/template@^7.22.15":
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -1501,7 +1368,7 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
+"@babel/traverse@^7.10.3", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
   integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
@@ -2119,15 +1986,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@15.2.5":
-  version "15.2.5"
-  resolved "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.5.tgz"
-  integrity sha512-wD6GY4xghVK+SQL0dy/M3saGx5pqi7+1VHEr+BBI7IUNYGSqPNzylKNxLBgQiTzfkzvbrZ6MhfaMNkhvSCYr5w==
-
-"@ngtools/webpack@15.2.6", "@ngtools/webpack@^15.2.6":
-  version "15.2.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.6.tgz#9000eafbcb74508ad8300d4f92cc3640f86f0810"
-  integrity sha512-I+kekKItfsCLdX+ZjjmsWqd0AyoYGTQPjlbQAiPtmdH73/rfPOF4Q/3AU4tzTdn0n0GXqZWv6VOs91w99ydi0A==
+"@ngtools/webpack@15.2.11", "@ngtools/webpack@^15.2.6":
+  version "15.2.11"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.11.tgz#c30f7af978bc512b874624ce0f7be5d22ae39e6d"
+  integrity sha512-yqp+FziuJ+wIVij4eTqfhuiTPNaG1PU8ukeGOdqkVH4nQMlmzs9UldXy1iYC/6swzn6XO/pkqisU3m/jxemMzA==
 
 "@nguniversal/builders@^15.2.1":
   version "15.2.1"
@@ -2351,13 +2213,13 @@
   resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@schematics/angular@16.2.12":
-  version "16.2.12"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.12.tgz#13e00e7390903cfc00eb8d5c2e74986262aff6ec"
-  integrity sha512-rc6Dxo7yLnNhECxZyvwv3qL40GvMHw/gMeme8DUGN7zgcUdBJ7LOCURp7EZqOBghMVeeJvLrohitEbs9NhRLBA==
+"@schematics/angular@16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.16.tgz#3f077f398fc7ff88654fd477790af8270585c3af"
+  integrity sha512-V4cE4R5MbusKaNW9DWsisiSRUoQzbAaBIeJh42yCkg5H/lUdf18hUB7DG6Pl7yH6/tjzzz4SqIVD7N64uCDC2A==
   dependencies:
-    "@angular-devkit/core" "16.2.12"
-    "@angular-devkit/schematics" "16.2.12"
+    "@angular-devkit/core" "16.2.16"
+    "@angular-devkit/schematics" "16.2.16"
     jsonc-parser "3.2.0"
 
 "@schematics/angular@^12.2.17":
@@ -6209,7 +6071,7 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^7.0.3:
+glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6221,18 +6083,6 @@ glob@^7.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^9.3.0, glob@^9.3.1:
   version "9.3.5"
   resolved "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz"
@@ -7455,12 +7305,12 @@ jsonc-eslint-parser@^2.0.4:
     espree "^9.0.0"
     semver "^7.3.5"
 
-jsonc-parser@3.0.0, jsonc-parser@^3.0.0:
+jsonc-parser@3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
-jsonc-parser@3.2.0:
+jsonc-parser@3.2.0, jsonc-parser@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
@@ -8445,12 +8295,7 @@ mute-stream@0.0.8:
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.4:
-  version "3.3.6"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
-
-nanoid@^3.3.7:
+nanoid@^3.3.6, nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
@@ -8841,7 +8686,7 @@ open@8.4.1:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-open@8.4.2:
+open@8.4.2, open@^8.0.9:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -8850,15 +8695,6 @@ open@8.4.2:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-open@^8.0.9:
-  version "8.4.0"
-  resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
-  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
 opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
@@ -9547,12 +9383,12 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.21:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+postcss@8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -10079,7 +9915,7 @@ regenerate@^1.4.2:
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.11:
   version "0.13.11"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
@@ -10332,20 +10168,13 @@ rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@7.8.1:
+rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
-rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
@@ -10494,14 +10323,14 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-semver@7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+semver@7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -10518,7 +10347,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.1:
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -11918,10 +11747,10 @@ webpack-cli@^4.2.0:
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz"
-  integrity sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==
+webpack-dev-middleware@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz#0463232e59b7d7330fa154121528d484d36eb973"
+  integrity sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.12"
@@ -12332,7 +12161,7 @@ yargs@17.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@17.7.2:
+yargs@17.7.2, yargs@^17.2.1, yargs@^17.3.1:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -12358,19 +12187,6 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.2.1, yargs@^17.3.1:
-  version "17.7.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"

From 1ffb0f94a2f1dd3ab387fda282c336c09a80b3a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:10:48 +0000
Subject: [PATCH 0638/1286] Bump sass from 1.62.1 to 1.80.2

Bumps [sass](https://github.com/sass/dart-sass) from 1.62.1 to 1.80.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.62.1...1.80.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..0183451521 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "react-dom": "^16.14.0",
         "rimraf": "^3.0.2",
         "rxjs-spy": "^8.0.2",
-        "sass": "~1.62.0",
+        "sass": "~1.80.2",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -5908,6 +5908,271 @@
         "node": "^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
+      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.4.1",
+        "@parcel/watcher-darwin-arm64": "2.4.1",
+        "@parcel/watcher-darwin-x64": "2.4.1",
+        "@parcel/watcher-freebsd-x64": "2.4.1",
+        "@parcel/watcher-linux-arm-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-musl": "2.4.1",
+        "@parcel/watcher-linux-x64-glibc": "2.4.1",
+        "@parcel/watcher-linux-x64-musl": "2.4.1",
+        "@parcel/watcher-win32-arm64": "2.4.1",
+        "@parcel/watcher-win32-ia32": "2.4.1",
+        "@parcel/watcher-win32-x64": "2.4.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
+      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
+      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
+      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
+      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
+      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
+      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
+      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
+      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
+      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
+      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
+      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
+      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -10395,6 +10660,17 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
@@ -20059,11 +20335,12 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.62.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
-      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "version": "1.80.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.2.tgz",
+      "integrity": "sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
+        "@parcel/watcher": "^2.4.1",
+        "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
@@ -20208,11 +20485,37 @@
         "node": ">=8"
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/sass/node_modules/immutable": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
       "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="
     },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/sax": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
diff --git a/package.json b/package.json
index dfc967ae56..34a7da0338 100644
--- a/package.json
+++ b/package.json
@@ -240,7 +240,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.62.0",
+    "sass": "~1.80.2",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From 5275f8d13fa3944a7fca9858a7cd7099174ad363 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 18 Oct 2024 14:01:19 -0500
Subject: [PATCH 0639/1286] Fix flakey Item page accessibility tests by waiting
 for pages to fully load.

---
 cypress/e2e/item-edit.cy.ts |  5 +++++
 cypress/e2e/item-page.cy.ts | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 60e1b924ee..25c63bea81 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -18,6 +18,11 @@ describe('Edit Item > Edit Metadata tab', () => {
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
+    // wait for all the Edit Item tabs to be rendered
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLDivElement) => {
+      cy.wrap($row).find('li[role="presentation"]').should('be.visible');
+    });
+
     // wait for all the ds-dso-edit-metadata-value components to be rendered
     cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
       cy.wrap($row).find('div[role="cell"]').should('be.visible');
diff --git a/cypress/e2e/item-page.cy.ts b/cypress/e2e/item-page.cy.ts
index a7fac6e387..7d42126b82 100644
--- a/cypress/e2e/item-page.cy.ts
+++ b/cypress/e2e/item-page.cy.ts
@@ -12,8 +12,14 @@ describe('Item  Page', () => {
     });
 
     it('should pass accessibility tests', () => {
+        cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
+
         cy.visit(ENTITYPAGE);
 
+        // Wait for the "viewevent" to trigger on the Item page.
+        // This ensures our <ds-item-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+        cy.wait('@viewevent');
+
         // <ds-item-page> tag must be loaded
         cy.get('ds-item-page').should('be.visible');
 
@@ -22,8 +28,14 @@ describe('Item  Page', () => {
     });
 
     it('should pass accessibility tests on full item page', () => {
+        cy.intercept('POST', '/server/api/statistics/viewevents').as('viewevent');
+
         cy.visit(ENTITYPAGE + '/full');
 
+        // Wait for the "viewevent" to trigger on the Item page.
+        // This ensures our <ds-item-page> tag  is fully loaded, as the <ds-view-event> tag is contained within it.
+        cy.wait('@viewevent');
+
         // <ds-full-item-page> tag must be loaded
         cy.get('ds-full-item-page').should('be.visible');
 

From acd8cbed506e0043003fa226bb2ba4404250ce08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:23:27 +0000
Subject: [PATCH 0640/1286] Bump pem from 1.14.7 to 1.14.8

Bumps [pem](https://github.com/Dexus/pem) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/Dexus/pem/releases)
- [Changelog](https://github.com/Dexus/pem/blob/master/HISTORY.md)
- [Commits](https://github.com/Dexus/pem/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: pem
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..0516757490 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,7 +72,7 @@
         "ngx-pagination": "6.0.3",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
-        "pem": "1.14.7",
+        "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
         "sanitize-html": "^2.12.1",
@@ -17692,9 +17692,9 @@
       }
     },
     "node_modules/pem": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/pem/-/pem-1.14.7.tgz",
-      "integrity": "sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/pem/-/pem-1.14.8.tgz",
+      "integrity": "sha512-ZpbOf4dj9/fQg5tQzTqv4jSKJQsK7tPl0pm4/pvPcZVjZcJg7TMfr3PBk6gJH97lnpJDu4e4v8UUqEz5daipCg==",
       "dependencies": {
         "es6-promisify": "^7.0.0",
         "md5": "^2.3.0",
diff --git a/package.json b/package.json
index dfc967ae56..b49de207f9 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "ngx-pagination": "6.0.3",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
-    "pem": "1.14.7",
+    "pem": "1.14.8",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",

From 9e79c42a9efbe53cb219f3e3d91ca5e70d62e99b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:23:47 +0000
Subject: [PATCH 0641/1286] Bump core-js from 3.37.1 to 3.38.1

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.37.1 to 3.38.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.38.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..0d78d82530 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "colors": "^1.4.0",
         "compression": "^1.7.4",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.30.1",
+        "core-js": "^3.38.1",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
@@ -9541,9 +9541,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.37.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
-      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
+      "version": "3.38.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
diff --git a/package.json b/package.json
index dfc967ae56..8c45034d8c 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.4",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.30.1",
+    "core-js": "^3.38.1",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",

From 20e67030a937d57cbfff294b715742590ea3ff06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:24:26 +0000
Subject: [PATCH 0642/1286] Bump @ngtools/webpack from 16.2.14 to 16.2.16

Bumps [@ngtools/webpack](https://github.com/angular/angular-cli) from 16.2.14 to 16.2.16.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/16.2.14...16.2.16)

---
updated-dependencies:
- dependency-name: "@ngtools/webpack"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..ff84d5baa0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -97,7 +97,7 @@
         "@cypress/schematic": "^1.5.0",
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@ngrx/store-devtools": "^17.1.1",
-        "@ngtools/webpack": "^16.2.12",
+        "@ngtools/webpack": "^16.2.16",
         "@types/deep-freeze": "0.1.2",
         "@types/ejs": "^3.1.2",
         "@types/express": "^4.17.17",
@@ -5526,9 +5526,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.2.14",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.14.tgz",
-      "integrity": "sha512-3+zPP3Wir46qrZ3FEiTz5/emSoVHYUCH+WgBmJ57mZCx1qBOYh2VgllnPr/Yusl1sc/jUZjdwq/es/9ZNw+zDQ==",
+      "version": "16.2.16",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.16.tgz",
+      "integrity": "sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==",
       "dev": true,
       "engines": {
         "node": "^16.14.0 || >=18.10.0",
diff --git a/package.json b/package.json
index dfc967ae56..0a9a244a54 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@ngrx/store-devtools": "^17.1.1",
-    "@ngtools/webpack": "^16.2.12",
+    "@ngtools/webpack": "^16.2.16",
     "@types/deep-freeze": "0.1.2",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",

From 9e3c02e1f3b84499e18176715a9c5de8258bb67f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:24:43 +0000
Subject: [PATCH 0643/1286] Bump mirador-share-plugin from 0.11.0 to 0.16.0

Bumps [mirador-share-plugin]() from 0.11.0 to 0.16.0.

---
updated-dependencies:
- dependency-name: mirador-share-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..cb75c83aab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "markdown-it": "^13.0.1",
         "mirador": "^3.3.0",
         "mirador-dl-plugin": "^0.13.0",
-        "mirador-share-plugin": "^0.11.0",
+        "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
         "ng2-file-upload": "5.0.0",
         "ng2-nouislider": "^2.0.0",
@@ -16227,9 +16227,12 @@
       }
     },
     "node_modules/mirador-share-plugin": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz",
-      "integrity": "sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/mirador-share-plugin/-/mirador-share-plugin-0.16.0.tgz",
+      "integrity": "sha512-Rlywq/06nXf4/BUc2LTBD6jf+Q5VO97NK+MTd4VPMfY50Fb8NMr6L0edZXZETcTML1qh11GDEVrHx/csxMSlMA==",
+      "dependencies": {
+        "notistack": "^3.0.1"
+      },
       "peerDependencies": {
         "@material-ui/core": "^4.7.2",
         "@material-ui/icons": "^4.5.1",
@@ -16760,6 +16763,41 @@
         "node": ">=8"
       }
     },
+    "node_modules/notistack": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/notistack/-/notistack-3.0.1.tgz",
+      "integrity": "sha512-ntVZXXgSQH5WYfyU+3HfcXuKaapzAJ8fBLQ/G618rn3yvSzEbnOB8ZSOwhX+dAORy/lw+GC2N061JA0+gYWTVA==",
+      "dependencies": {
+        "clsx": "^1.1.0",
+        "goober": "^2.0.33"
+      },
+      "engines": {
+        "node": ">=12.0.0",
+        "npm": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/notistack"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/notistack/node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "peer": true
+    },
+    "node_modules/notistack/node_modules/goober": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.16.tgz",
+      "integrity": "sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
     "node_modules/nouislider": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.8.1.tgz",
diff --git a/package.json b/package.json
index dfc967ae56..c83761418c 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "markdown-it": "^13.0.1",
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
-    "mirador-share-plugin": "^0.11.0",
+    "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
     "ng2-file-upload": "5.0.0",
     "ng2-nouislider": "^2.0.0",

From 372444c50ac28a6c7f68b20695bea616a3ab8b7f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 18 Oct 2024 14:26:48 -0500
Subject: [PATCH 0644/1286] Fix code scanning alert no. 6: Incomplete string
 escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 src/app/core/shared/metadata.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 1ad10356fb..f0290eac39 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -163,7 +163,7 @@ export class Metadata {
     const outputKeys: string[] = [];
     for (const inputKey of inputKeys) {
       if (inputKey.includes('*')) {
-        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
+        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\\/g, '\\\\').replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
         for (const mapKey of Object.keys(mdMap)) {
           if (!outputKeys.includes(mapKey) && inputKeyRegex.test(mapKey)) {
             outputKeys.push(mapKey);

From 047b4629bff717c71a68420e83b5f031b6635a3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 19:35:07 +0000
Subject: [PATCH 0645/1286] Bump karma from 6.4.2 to 6.4.4

Bumps [karma](https://github.com/karma-runner/karma) from 6.4.2 to 6.4.4.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.4.2...v6.4.4)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 591323352b..a601592419 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
     "express-static-gzip": "^2.1.8",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
-    "karma": "^6.4.2",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 6c5726c73d..97619f48f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3509,7 +3509,7 @@ bluebird@^3.7.2:
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.3:
+body-parser@1.20.3, body-parser@^1.19.0:
   version "1.20.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
   integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
@@ -3527,24 +3527,6 @@ body-parser@1.20.3:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@^1.19.0:
-  version "1.20.1"
-  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
 bonjour-service@^1.0.11:
   version "1.1.1"
   resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
@@ -7507,10 +7489,10 @@ karma-source-map-support@1.4.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@^6.4.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e"
-  integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==
+karma@^6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -7531,7 +7513,7 @@ karma@^6.4.2:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^4.4.1"
+    socket.io "^4.7.2"
     source-map "^0.6.1"
     tmp "^0.2.1"
     ua-parser-js "^0.7.30"
@@ -9534,13 +9516,6 @@ qjobs@^1.2.0:
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
@@ -9580,20 +9555,20 @@ range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1, raw-body@^2.3.2:
-  version "2.5.1"
-  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@^2.3.2:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
@@ -10632,7 +10607,7 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@^4.4.1:
+socket.io@^4.4.1, socket.io@^4.7.2:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1"
   integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==
@@ -11123,7 +11098,7 @@ tiny-warning@^1.0.2:
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@0.2.1, tmp@^0.2.1:
+tmp@0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -11137,7 +11112,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@~0.2.3:
+tmp@^0.2.1, tmp@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==

From f750259c504f9af8ddc6791730e945d3cbe07244 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 18 Oct 2024 15:09:55 -0500
Subject: [PATCH 0646/1286] Update dependabot.yml with new groups for eslint,
 testing, postcss, sass, webpack

---
 .github/dependabot.yml | 294 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 282 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fc964ee3cf..d19f2df227 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -45,19 +45,109 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all patch version updates for @typescript-eslint in a single PR
-      typescript-eslint:
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
         applies-to: version-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for @typescript-eslint.
-      typescript-eslint-security:
+      # Group together all security updates for eslint.
+      eslint-security:
         applies-to: security-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types version updates
+      types:
+        applies-to: version-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types security updates
+      types:
+        applies-to: security-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related security updates
+      testing:
+        applies-to: security-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related security updates
+      postcss:
+        applies-to: security-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related security updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related seurity updates
+      webpack:
+        applies-to: security-updates
+        patterns:
+        - "webpack*"
         update-types:
         - "minor"
         - "patch"
@@ -109,19 +199,109 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all patch version updates for @typescript-eslint in a single PR
-      typescript-eslint:
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
         applies-to: version-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for @typescript-eslint.
-      typescript-eslint-security:
+      # Group together all security updates for eslint.
+      eslint-security:
         applies-to: security-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types version updates
+      types:
+        applies-to: version-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types security updates
+      types:
+        applies-to: security-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related security updates
+      testing:
+        applies-to: security-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related security updates
+      postcss:
+        applies-to: security-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related security updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related seurity updates
+      webpack:
+        applies-to: security-updates
+        patterns:
+        - "webpack*"
         update-types:
         - "minor"
         - "patch"
@@ -173,19 +353,109 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all patch version updates for @typescript-eslint in a single PR
-      typescript-eslint:
+      # Group together all patch version updates for eslint in a single PR
+      eslint:
         applies-to: version-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for @typescript-eslint.
-      typescript-eslint-security:
+      # Group together all security updates for eslint.
+      eslint-security:
         applies-to: security-updates
         patterns:
         - "@typescript-eslint*"
+        - "eslint*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types version updates
+      types:
+        applies-to: version-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any @types security updates
+      types:
+        applies-to: security-updates
+        patterns:
+        - "@types/*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related version updates
+      testing:
+        applies-to: version-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any testing related security updates
+      testing:
+        applies-to: security-updates
+        patterns:
+        - "@cypress*"
+        - "cypress*"
+        - "jasmine*"
+        - "karma*"
+        - "ng-mocks"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related version updates
+      postcss:
+        applies-to: version-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any postcss related security updates
+      postcss:
+        applies-to: security-updates
+        patterns:
+        - "postcss*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related version updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any sass related security updates
+      sass:
+        applies-to: version-updates
+        patterns:
+        - "sass*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related version updates
+      webpack:
+        applies-to: version-updates
+        patterns:
+        - "webpack*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together any webpack related seurity updates
+      webpack:
+        applies-to: security-updates
+        patterns:
+        - "webpack*"
         update-types:
         - "minor"
         - "patch"

From 9a686b36f1296e331e47708d6f991c23a3211cb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:01 +0000
Subject: [PATCH 0647/1286] Bump sass from 1.62.1 to 1.80.2 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.62.1 to 1.80.2
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.62.1...1.80.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index acbd95d26b..4ade3c177b 100644
--- a/package.json
+++ b/package.json
@@ -208,7 +208,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.62.0",
+    "sass": "~1.80.2",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..d2488d977a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2259,6 +2259,89 @@
     node-gyp "^10.0.0"
     which "^4.0.0"
 
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -4137,6 +4220,13 @@ check-more-types@^2.24.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -4891,6 +4981,11 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -7924,7 +8019,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8292,6 +8387,11 @@ node-addon-api@^3.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
 node-fetch@^2.6.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
@@ -9740,6 +9840,11 @@ readable-stream@^3.0.6, readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -10168,21 +10273,13 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0:
-  version "1.78.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.78.0.tgz#cef369b2f9dc21ea1d2cf22c979f52365da60841"
-  integrity sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==
+sass@^1.25.0, sass@~1.80.2:
+  version "1.80.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.2.tgz#9d13d85a4f81bb17e09d1dc3e1c0944f7fd7315e"
+  integrity sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==
   dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
-sass@~1.62.0:
-  version "1.62.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029"
-  integrity sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
+    "@parcel/watcher" "^2.4.1"
+    chokidar "^4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 

From 98ad7a84d515944811f6f8a30ecaceffa3c46834 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:13 +0000
Subject: [PATCH 0648/1286] Bump pem from 1.14.7 to 1.14.8

Bumps [pem](https://github.com/Dexus/pem) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/Dexus/pem/releases)
- [Changelog](https://github.com/Dexus/pem/blob/master/HISTORY.md)
- [Commits](https://github.com/Dexus/pem/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: pem
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 acbd95d26b..253b427245 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "ngx-pagination": "6.0.3",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
-    "pem": "1.14.7",
+    "pem": "1.14.8",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.2.2",
diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..f47ac2ef03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8848,10 +8848,10 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pem@1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.7.tgz#dae9831ee5fa7c88547327fb7738898cd76412c6"
-  integrity sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==
+pem@1.14.8:
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.8.tgz#9c414bee991b138a24617f423059e809d01aa720"
+  integrity sha512-ZpbOf4dj9/fQg5tQzTqv4jSKJQsK7tPl0pm4/pvPcZVjZcJg7TMfr3PBk6gJH97lnpJDu4e4v8UUqEz5daipCg==
   dependencies:
     es6-promisify "^7.0.0"
     md5 "^2.3.0"

From 2c152e632b51656151eaa34b21c12017314fcd22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:26 +0000
Subject: [PATCH 0649/1286] Bump sass from 1.62.0 to 1.80.2 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.62.0 to 1.80.2
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.62.0...1.80.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index 591323352b..1613d9d1cf 100644
--- a/package.json
+++ b/package.json
@@ -195,7 +195,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.62.0",
+    "sass": "~1.80.2",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 6c5726c73d..c899a31c62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2144,6 +2144,89 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.21"
   resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"
@@ -3928,6 +4011,13 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, cho
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
@@ -4716,6 +4806,11 @@ destroy@~1.0.4:
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
   integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
@@ -7995,7 +8090,7 @@ mhchemparser@^4.1.0:
   resolved "https://registry.npmjs.org/mhchemparser/-/mhchemparser-4.1.1.tgz"
   integrity sha512-R75CUN6O6e1t8bgailrF1qPq+HhVeFTM3XQ0uzI+mXTybmphy3b6h4NbLOYhemViQ3lUs+6CKRkC3Ws1TlYREA==
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8396,6 +8491,11 @@ node-addon-api@^3.0.0:
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
 node-fetch@^2.6.0, node-fetch@^2.6.1:
   version "2.6.9"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"
@@ -9860,6 +9960,11 @@ readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -10251,12 +10356,13 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@~1.62.0:
-  version "1.62.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.0.tgz#3686b2195b93295d20765135e562366b33ece37d"
-  integrity sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==
+sass@~1.80.2:
+  version "1.80.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.2.tgz#9d13d85a4f81bb17e09d1dc3e1c0944f7fd7315e"
+  integrity sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==
   dependencies:
-    chokidar ">=3.0.0 <4.0.0"
+    "@parcel/watcher" "^2.4.1"
+    chokidar "^4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
@@ -10681,12 +10787,7 @@ source-list-map@^2.0.0:
   resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-js@^1.2.0:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==

From 43f7586564e6dd14baa2b6245bf5993eae4b6593 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:26 +0000
Subject: [PATCH 0650/1286] Bump express-static-gzip from 2.1.7 to 2.1.8

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.7 to 2.1.8.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.7...v2.1.8)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index acbd95d26b..d46057de08 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "express-static-gzip": "^2.1.7",
+    "express-static-gzip": "^2.1.8",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..3a956ab055 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5721,12 +5721,12 @@ express-rate-limit@^5.1.3:
   resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.7.tgz#5904824a07950ba741ec3a23a21839dd04c63506"
-  integrity sha512-QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw==
+express-static-gzip@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.8.tgz#f37f0fe9e8113e56cfac63a98c0197ee6bd6458f"
+  integrity sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==
   dependencies:
-    serve-static "^1.14.1"
+    serve-static "^1.16.2"
 
 express@^4.17.3, express@^4.21.1:
   version "4.21.1"
@@ -10309,7 +10309,7 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.2, serve-static@^1.14.1, serve-static@^1.16.2:
+serve-static@1.16.2, serve-static@^1.16.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
   integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==

From 6eb407ff3be0713251f240906804e03dd648e122 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:37 +0000
Subject: [PATCH 0651/1286] Bump pem from 1.14.7 to 1.14.8

Bumps [pem](https://github.com/Dexus/pem) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/Dexus/pem/releases)
- [Changelog](https://github.com/Dexus/pem/blob/master/HISTORY.md)
- [Commits](https://github.com/Dexus/pem/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: pem
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 591323352b..a6c44b230c 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "ngx-sortablejs": "^11.1.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.8.1",
-    "pem": "1.14.7",
+    "pem": "1.14.8",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
diff --git a/yarn.lock b/yarn.lock
index 6c5726c73d..e7bb5ff3bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8972,10 +8972,10 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pem@1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.7.tgz#dae9831ee5fa7c88547327fb7738898cd76412c6"
-  integrity sha512-tN5+bp2/Yh/2yuv/JFXXHXrd5RVfsEBwlV7BshuYPX0OJWbR/MeAr89CKWcIp/W0cEnaTPT44haXyaEz1T6XeA==
+pem@1.14.8:
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.8.tgz#9c414bee991b138a24617f423059e809d01aa720"
+  integrity sha512-ZpbOf4dj9/fQg5tQzTqv4jSKJQsK7tPl0pm4/pvPcZVjZcJg7TMfr3PBk6gJH97lnpJDu4e4v8UUqEz5daipCg==
   dependencies:
     es6-promisify "^7.0.0"
     md5 "^2.3.0"

From 6fd8d4eef4c14b5cb44165e7f21122c9d9124274 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:18:37 +0000
Subject: [PATCH 0652/1286] Bump mirador-share-plugin from 0.11.0 to 0.16.0

Bumps [mirador-share-plugin]() from 0.11.0 to 0.16.0.

---
updated-dependencies:
- dependency-name: mirador-share-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index acbd95d26b..f552538f91 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "markdown-it": "^13.0.1",
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
-    "mirador-share-plugin": "^0.11.0",
+    "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
     "ng-mocks": "^14.10.0",
     "ng2-file-upload": "5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..708da07112 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4240,7 +4240,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^1.0.4, clsx@^1.1.1:
+clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -6307,6 +6307,11 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+goober@^2.0.33:
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95"
+  integrity sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -8094,10 +8099,12 @@ mirador-dl-plugin@^0.13.0:
   resolved "https://registry.yarnpkg.com/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz#9a6cb0fa3c566a2a1ebe1ad9caa1ff590ff22689"
   integrity sha512-I/6etIvpTtO1zgjxx2uEUFoyB9NxQ43JWg8CMkKmZqblW7AAeFqRn1/zUlQH7N8KFZft9Rah6D8qxtuNAo9jmA==
 
-mirador-share-plugin@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz#13e2f654e38839044382acad42d9329e91a8cd5e"
-  integrity sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==
+mirador-share-plugin@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.16.0.tgz#736c575dea17f0f846a6c6a4770d87a1275557fc"
+  integrity sha512-Rlywq/06nXf4/BUc2LTBD6jf+Q5VO97NK+MTd4VPMfY50Fb8NMr6L0edZXZETcTML1qh11GDEVrHx/csxMSlMA==
+  dependencies:
+    notistack "^3.0.1"
 
 mirador@^3.3.0:
   version "3.3.0"
@@ -8377,6 +8384,14 @@ normalize-url@^4.5.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
+notistack@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-3.0.1.tgz#daf59888ab7e2c30a1fa8f71f9cba2978773236e"
+  integrity sha512-ntVZXXgSQH5WYfyU+3HfcXuKaapzAJ8fBLQ/G618rn3yvSzEbnOB8ZSOwhX+dAORy/lw+GC2N061JA0+gYWTVA==
+  dependencies:
+    clsx "^1.1.0"
+    goober "^2.0.33"
+
 nouislider@^15.7.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.8.1.tgz#18729ed29738d2d328a1b5e0429d38eb8be8a696"

From ac1adefeec18ec7540a35bf10cb5edfb33bfecf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:19:00 +0000
Subject: [PATCH 0653/1286] Bump @types/ejs from 3.1.2 to 3.1.5

Bumps [@types/ejs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ejs) from 3.1.2 to 3.1.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ejs)

---
updated-dependencies:
- dependency-name: "@types/ejs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 591323352b..41e3bb96d8 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "@ngtools/webpack": "^15.2.6",
     "@nguniversal/builders": "^15.2.1",
     "@types/deep-freeze": "0.1.2",
-    "@types/ejs": "^3.1.2",
+    "@types/ejs": "^3.1.5",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
diff --git a/yarn.lock b/yarn.lock
index 6c5726c73d..b9ac735b0a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2360,10 +2360,10 @@
   resolved "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz"
   integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
 
-"@types/ejs@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9"
-  integrity sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g==
+"@types/ejs@^3.1.5":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
+  integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"

From e5748dd7a46c28cffdfe5788dec2d5120ea3be71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:19:02 +0000
Subject: [PATCH 0654/1286] Bump @ngtools/webpack from 16.2.15 to 16.2.16

Bumps [@ngtools/webpack](https://github.com/angular/angular-cli) from 16.2.15 to 16.2.16.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/16.2.15...16.2.16)

---
updated-dependencies:
- dependency-name: "@ngtools/webpack"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 acbd95d26b..d431389a76 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@ngrx/store-devtools": "^17.1.1",
-    "@ngtools/webpack": "^16.2.12",
+    "@ngtools/webpack": "^16.2.16",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..4275e91e97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2114,10 +2114,10 @@
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.10.tgz#6f077ef3d1fa4363cffcfee66f9b2e52164069b2"
   integrity sha512-yPKmdbTJzxROAl2NS8P8eHB2mU0BqV2I0ZiKmX6oTetY2Ea4i2WzlTK39pPpG7atmdF2NPWYLXdJWAup+JxSyw==
 
-"@ngtools/webpack@^16.2.12":
-  version "16.2.15"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.2.15.tgz#5c5c7b123b1e1d7e972a8d13d9ea2d6fc628b909"
-  integrity sha512-rD4IHt3nS6PdIKvmoqwIadMIGKsemBSz412kD8Deetl0TiCVhD/Tn1M00dxXzMSHSFCQcOKxdZAeD53yRwTOOA==
+"@ngtools/webpack@^16.2.16":
+  version "16.2.16"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-16.2.16.tgz#512da8f3459faafd0cc1f7f7cbec96b678377be6"
+  integrity sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==
 
 "@ngx-translate/core@^14.0.0":
   version "14.0.0"

From dc73f85458f1154d147bfca216d99c4e20566c94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:19:21 +0000
Subject: [PATCH 0655/1286] Bump @types/grecaptcha from 3.0.4 to 3.0.9

Bumps [@types/grecaptcha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/grecaptcha) from 3.0.4 to 3.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/grecaptcha)

---
updated-dependencies:
- dependency-name: "@types/grecaptcha"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 591323352b..80218fe5e5 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "@nguniversal/express-engine": "^15.2.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "@types/grecaptcha": "^3.0.4",
+    "@types/grecaptcha": "^3.0.9",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.4",
diff --git a/yarn.lock b/yarn.lock
index 6c5726c73d..8bf7ea5a0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2405,10 +2405,10 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/grecaptcha@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.4.tgz"
-  integrity sha512-7l1Y8DTGXkx/r4pwU1nMVAR+yD/QC+MCHKXAyEX/7JZhwcN1IED09aZ9vCjjkcGdhSQiu/eJqcXInpl6eEEEwg==
+"@types/grecaptcha@^3.0.9":
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.9.tgz#9f3b07ec06c8fff221aa6fc124fe5b8a0e2c3349"
+  integrity sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.1"

From 5abba52204fa9cc6b752db145daffe611704c746 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:19:38 +0000
Subject: [PATCH 0656/1286] Bump postcss from 8.4.45 to 8.4.47

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.45 to 8.4.47.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.45...8.4.47)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/yarn.lock b/yarn.lock
index 29ec97a646..bff0db3e7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8873,10 +8873,10 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0, picocolors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
-  integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@4.0.1:
   version "4.0.1"
@@ -9304,13 +9304,13 @@ postcss@^7.0.14:
     source-map "^0.6.1"
 
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
-  version "8.4.45"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603"
-  integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==
+  version "8.4.47"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
+  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.1"
-    source-map-js "^1.2.0"
+    picocolors "^1.1.0"
+    source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -10546,7 +10546,7 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.0:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==

From 16bda200c0b6ecd05ab4e2f98bcc0901d70b1ef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:02:22 +0000
Subject: [PATCH 0657/1286] Bump @types/deep-freeze from 0.1.2 to 0.1.5

Bumps [@types/deep-freeze](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/deep-freeze) from 0.1.2 to 0.1.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/deep-freeze)

---
updated-dependencies:
- dependency-name: "@types/deep-freeze"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 18980f1211..5d3534c46a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,7 +98,7 @@
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@ngrx/store-devtools": "^17.1.1",
         "@ngtools/webpack": "^16.2.16",
-        "@types/deep-freeze": "0.1.2",
+        "@types/deep-freeze": "0.1.5",
         "@types/ejs": "^3.1.2",
         "@types/express": "^4.17.17",
         "@types/jasmine": "~3.6.0",
@@ -6463,9 +6463,9 @@
       }
     },
     "node_modules/@types/deep-freeze": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz",
-      "integrity": "sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.5.tgz",
+      "integrity": "sha512-KZtR+jtmgkCpgE0f+We/QEI2Fi0towBV/tTkvHVhMzx+qhUVGXMx7pWvAtDp6vEWIjdKLTKpqbI/sORRCo8TKg==",
       "dev": true
     },
     "node_modules/@types/ejs": {
diff --git a/package.json b/package.json
index fcfa42c248..1760c516e6 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@ngrx/store-devtools": "^17.1.1",
     "@ngtools/webpack": "^16.2.16",
-    "@types/deep-freeze": "0.1.2",
+    "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",

From ac3bccc67d464c88c3861cececc167450ad6606c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:53:59 +0000
Subject: [PATCH 0658/1286] Bump klaro from 0.7.18 to 0.7.21

Bumps [klaro](https://github.com/kiprotect/klaro) from 0.7.18 to 0.7.21.
- [Changelog](https://github.com/klaro-org/klaro-js/blob/master/releases.json)
- [Commits](https://github.com/kiprotect/klaro/compare/v0.7.18...v0.7.21)

---
updated-dependencies:
- dependency-name: klaro
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 017b1ec10e..d891f70f0b 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "json5": "^2.2.3",
     "jsonschema": "1.4.1",
     "jwt-decode": "^3.1.2",
-    "klaro": "^0.7.18",
+    "klaro": "^0.7.21",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
diff --git a/yarn.lock b/yarn.lock
index cacf90489e..68f95a9878 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -438,6 +438,15 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
+"@babel/eslint-parser@^7.23.10":
+  version "7.25.8"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.8.tgz#0119dec46be547d7a339978dedb9d29e517c2443"
+  integrity sha512-Po3VLMN7fJtv0nsOjBDSbO1J71UhzShE9MuOSkWEV9IZQXzhZklYtzKZ8ZD/Ij3a0JBv1AG3Ny2L3jvAHQVOGg==
+  dependencies:
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.1"
+
 "@babel/generator@7.20.14":
   version "7.20.14"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"
@@ -2039,6 +2048,13 @@
   dependencies:
     tslib "^2.3.0"
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
@@ -5448,7 +5464,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^2.0.0:
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
@@ -5884,6 +5900,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^3.1.0, flatted@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
@@ -7619,10 +7640,14 @@ kind-of@^6.0.2:
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaro@^0.7.18:
-  version "0.7.18"
-  resolved "https://registry.npmjs.org/klaro/-/klaro-0.7.18.tgz"
-  integrity sha512-Q5nehkGeZuFerisW4oeeB1ax6dHDszWckR70EcxKvhFiJQ61CM0WBSo20yLbdvz8N9MFsOFu4RNCO9JsbkCxgQ==
+klaro@^0.7.21:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.21.tgz#2ecaccb058ef7660fe21563b80a0c367d80b9c8a"
+  integrity sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==
+  dependencies:
+    "@babel/eslint-parser" "^7.23.10"
+    sass "^1.25.0"
+    webpack-merge "^5.10.0"
 
 kleur@^3.0.3:
   version "3.0.3"
@@ -10331,7 +10356,7 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@~1.80.2:
+sass@^1.25.0, sass@~1.80.2:
   version "1.80.2"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.2.tgz#9d13d85a4f81bb17e09d1dc3e1c0944f7fd7315e"
   integrity sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==
@@ -10423,7 +10448,7 @@ semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -11916,7 +11941,7 @@ webpack-dev-server@^4.13.3:
     webpack-dev-middleware "^5.3.1"
     ws "^8.13.0"
 
-webpack-merge@5.8.0, webpack-merge@^5.7.3:
+webpack-merge@5.8.0:
   version "5.8.0"
   resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"
   integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
@@ -11924,6 +11949,15 @@ webpack-merge@5.8.0, webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
+webpack-merge@^5.10.0, webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.0"
+
 webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"

From e3be0cd794ffe8f14eed4371d44cc396eca93d79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:54:22 +0000
Subject: [PATCH 0659/1286] Bump postcss from 8.4.38 to 8.4.47

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.38 to 8.4.47.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.38...8.4.47)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/yarn.lock b/yarn.lock
index cacf90489e..34a896dcbf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9079,10 +9079,10 @@ picocolors@^0.2.1:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
@@ -9492,13 +9492,13 @@ postcss@^7.0.14:
     source-map "^0.6.1"
 
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  version "8.4.47"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
+  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.2.0"
+    picocolors "^1.1.0"
+    source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -10762,10 +10762,10 @@ source-list-map@^2.0.0:
   resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
 source-map-loader@4.0.1:
   version "4.0.1"

From e1619e6a6bebd80fd5212931223a710728c40b54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 02:31:33 +0000
Subject: [PATCH 0660/1286] Bump @types/lodash from 4.14.194 to 4.17.12

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.194 to 4.17.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 017b1ec10e..0e427f2b4d 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.17.12",
     "@types/node": "^14.18.63",
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^5.59.1",
diff --git a/yarn.lock b/yarn.lock
index cacf90489e..290b35b18d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2528,10 +2528,10 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.194":
-  version "4.14.194"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.194.tgz#b71eb6f7a0ff11bff59fc987134a093029258a76"
-  integrity sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==
+"@types/lodash@^4.17.12":
+  version "4.17.12"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.12.tgz#25d71312bf66512105d71e55d42e22c36bcfc689"
+  integrity sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==
 
 "@types/mime@*":
   version "3.0.1"

From d0daf9cf49209d256165dc4beebce8ffd27c412f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 03:14:33 +0000
Subject: [PATCH 0661/1286] Bump @types/lodash from 4.17.6 to 4.17.12

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.6 to 4.17.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 7d10e7265b..eda8bf053d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,7 +103,7 @@
         "@types/express": "^4.17.17",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.14.194",
+        "@types/lodash": "^4.17.12",
         "@types/node": "^14.14.9",
         "@types/sanitize-html": "^2.9.0",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
@@ -6822,9 +6822,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz",
-      "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==",
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
+      "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
       "dev": true
     },
     "node_modules/@types/mime": {
diff --git a/package.json b/package.json
index c3cdbe530a..a9a0eee4f3 100644
--- a/package.json
+++ b/package.json
@@ -190,7 +190,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.17.12",
     "@types/node": "^14.14.9",
     "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^7.18.0",

From 95d07671376af9be1983ae38e48b84b8f1068869 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 03:15:12 +0000
Subject: [PATCH 0662/1286] Bump karma from 6.4.3 to 6.4.4

Bumps [karma](https://github.com/karma-runner/karma) from 6.4.3 to 6.4.4.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.4.3...v6.4.4)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 7d10e7265b..5254711855 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,7 +134,7 @@
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
-        "karma": "^6.4.2",
+        "karma": "^6.4.4",
         "karma-chrome-launcher": "~3.2.0",
         "karma-coverage-istanbul-reporter": "~3.0.3",
         "karma-jasmine": "~4.0.0",
@@ -14957,9 +14957,9 @@
       "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
     },
     "node_modules/karma": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz",
-      "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==",
+      "version": "6.4.4",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz",
+      "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==",
       "dev": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
diff --git a/package.json b/package.json
index c3cdbe530a..2a131840dd 100644
--- a/package.json
+++ b/package.json
@@ -221,7 +221,7 @@
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
-    "karma": "^6.4.2",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.0",

From 74c0c3ad3792a1ce08d90671fc3faef57b03605d Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:06:48 +0100
Subject: [PATCH 0663/1286] Update pt-PT.json5

Extensive revision of i18n pt-PT with the news translation strings introduced by DSpace v8.0 and other improvements > last updated 18th of july 2024.

(cherry picked from commit 2c20833410864509927a78d65dfdfff8269ac161)
---
 src/assets/i18n/pt-PT.json5 | 4245 +++++++++++++++++++++++++----------
 1 file changed, 3073 insertions(+), 1172 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 414b70448d..2a795ccb9b 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,6 +1,6 @@
 {
 
-  // Dspace v7.x > i18n pt-PT > last updated 14th of May 2024
+  // Dspace v8.x > i18n pt-PT > last updated 4th of july 2024
 
   // "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": "Não está autorizado a aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
@@ -8,7 +8,7 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Voltar à página de início",
 
-  // "401.unauthorized": "unauthorized",
+  // "401.unauthorized": "Unauthorized",
   "401.unauthorized": "Não 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.",
@@ -17,11 +17,11 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Voltar à página de início",
 
-  // "403.forbidden": "forbidden",
+  // "403.forbidden": "Forbidden",
   "403.forbidden": "Proibido",
 
-  // "500.page-internal-server-error": "Service Unavailable",
-  "500.page-internal-server-error": "Serviço indisponível",
+  // "500.page-internal-server-error": "Service unavailable",
+ "500.page-internal-server-error": "Serviço indisponível",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
   "500.help": "O servidor encontra-se temporariamete indisponível para responder ao seu pedido, devido a processos de manutenção em curso ou capacidade de resposta. Por favor tente mais tarde.",
@@ -29,41 +29,41 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Voltar à página de início",
 
-  // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início. ",
+  // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Voltar à página de início",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "página não encontrada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Página não encontrada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "Não autorizado",
+  // "error-page.description.401": "Unauthorized",
+ "error-page.description.401": "Não autorizado",
 
-  // "error-page.description.403": "forbidden",
+  // "error-page.description.403": "Forbidden",
   "error-page.description.403": "Proibido",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Serviço indisponível",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "página não encontrada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Página não encontrada",
 
   // "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": "Ocorreu um erro com a sua autenticação via ORCID. Certifique-se que partilhou o seu endereço de email associado à sua conta ORCID com o repositório. Se o erro persistir, por favor contacte o administrador do sistema.",
 
   // "access-status.embargo.listelement.badge": "Embargo",
-  "access-status.embargo.listelement.badge": "Embargado",
+  "access-status.embargo.listelement.badge": "Acesso embargado",
 
   // "access-status.metadata.only.listelement.badge": "Metadata only",
-  "access-status.metadata.only.listelement.badge": "Apenas Metadados",
+  "access-status.metadata.only.listelement.badge": "Apenas metadados",
 
   // "access-status.open.access.listelement.badge": "Open Access",
-  "access-status.open.access.listelement.badge": "Acesso Aberto",
+  "access-status.open.access.listelement.badge": "Acesso aberto",
 
   // "access-status.restricted.listelement.badge": "Restricted",
-  "access-status.restricted.listelement.badge": "Acesso Restrito",
+  "access-status.restricted.listelement.badge": "Acesso restrito",
 
   // "access-status.unknown.listelement.badge": "Unknown",
   "access-status.unknown.listelement.badge": "Desconhecido",
@@ -89,7 +89,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Falha",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Criar formato de ficheiro",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -150,10 +150,10 @@
   "admin.registries.bitstream-formats.edit.internal.label": "Interno",
 
   // "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": "O MIME type associado a este formato não tem que ser único.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "O tipo MIME associado a este formato não tem que ser único.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
   "admin.registries.bitstream-formats.edit.shortDescription.hint": "Um nome único para este formato (exemplo. Microsoft Word XP ou Microsoft Word 2000)",
@@ -189,11 +189,14 @@
   "admin.registries.bitstream-formats.table.internal": "Interno",
 
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME",
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
 
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formatos de ficheiros selecionados",
+
   // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
@@ -215,8 +218,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
 
-  // "admin.registries.bitstream-formats.select": "Select bitstream format",
-  "admin.registries.bitstream-formats.select": "Selecionar formato de ficheiro",
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Selecionar",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deselecionar",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registo de metadados",
@@ -242,9 +248,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Nenhum esquema de metadados para mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Selecionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deselecionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Apagar selecionado(s)",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemas selecionados",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -263,6 +278,12 @@
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Este é o esquema de metadados para \"{{namespace}}\".",
 
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Selecionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deselecionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Campos do esquema de metadados",
 
@@ -275,6 +296,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Campos de metadados selecionados",
+
   // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
@@ -300,7 +324,7 @@
   "admin.registries.schema.head": "Esquema de metadados",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.created": "Criou o esquema de metadados \"{{prefix}}\" com sucesso",
+  "admin.registries.schema.notification.created": "Criou o esquema de metadados \"{{prefix}}\"com sucesso",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Falhou ao apagar {{amount}} esquema(s) de metadados",
@@ -309,13 +333,13 @@
   "admin.registries.schema.notification.deleted.success": "Apagou {{amount}} esquema(s) de metadados com sucesso",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Editou o esquema de metadados \"{{prefix}}\" com sucesso",
+  "admin.registries.schema.notification.edited": "Editou o esquema de metadados \"{{prefix}}\"com sucesso",
 
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Erro",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.created": "Criou o campo de metadado \"{{field}}\" com sucesso",
+  "admin.registries.schema.notification.field.created": "Criou o campo de metadado \"{{field}}\"com sucesso",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "Falhou ao apagar {{amount}} campo(s) de metadados",
@@ -324,7 +348,7 @@
   "admin.registries.schema.notification.field.deleted.success": "Apagou {{amount}} campo(s) de metadados com sucesso",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Editou o campo de metadado \"{{field}}\" com sucesso",
+  "admin.registries.schema.notification.field.edited": "Editou o campo de metadado \"{{field}}\"com sucesso",
 
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Sucesso",
@@ -353,8 +377,8 @@
   // "admin.access-control.bulk-access-browse.search.header": "Search",
   "admin.access-control.bulk-access-browse.search.header": "Pesquisa",
 
-  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
-  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual({{number}})",
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection ({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecção atual ({{number}})",
 
   // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
   "admin.access-control.bulk-access-settings.header": "Passo 2: Operação a realizar",
@@ -401,7 +425,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadados",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Email (exato)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -419,7 +443,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nome",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Email (exato)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -449,10 +473,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apelido",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Email",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Deve conter um email válido",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -470,11 +494,11 @@
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "Falha ao criar o Utilizador \"{{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": "Falha ao criar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
+  // "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": "Falha ao criar o Utilizador \"{{name}}\", o email \"{{email}}\"já está registado no repositório.",
 
-  // "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": "Falha ao editar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
+  // "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": "Falha ao editar o Utilizador \"{{name}}\", o email \"{{email}}\"já está registado no repositório.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "Utilizador editado com successo \"{{name}}\"",
@@ -506,8 +530,8 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Adicionar a grupos",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\" e mensagem: \"{{restResponse.errorMessage}}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\"with code: \"{{statusCode}}\"and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocorreu um erro ao tentar eliminar a 'EPessoa' com o id \"{{id}}\", com o código: \"{{statusCode}}\"e mensagem: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Utilizador removido com sucesso: \"{{name}}\"",
@@ -584,8 +608,8 @@
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Este grupo é permanente, não pode ser editado ou apagado. Pode adicionar ou remover membros deste grupo nesta 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 não pode ser editado ou apagado porque corresponde a um papel no 'workflow' de depósito em \"{{name}}\" {{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta 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 não pode ser editado ou apagado porque corresponde a um papel no 'workflow' de depósito em \"{{name}}\"{{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta página.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Criar grupo",
@@ -614,8 +638,8 @@
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "Falha ao editar 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": "Nome \"{{name}}\" já utilizado!",
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\"already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\"já utilizado!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "Grupo editado com sucesso \"{{name}}\"",
@@ -656,12 +680,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Membros atuais",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadados",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (completo)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Pesquisar",
 
@@ -746,9 +764,6 @@
   // "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": "Adicionar subgrupo com o nome \"{{name}}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo atual",
-
   // "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 adicionado com sucesso: \"{{name}}\"",
 
@@ -776,408 +791,20 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Controlo de qualidade",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugestões para controlo de qualidade",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugestões para controlo de qualidade",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Controlo de qualidade",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
-
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
-
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
-
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
-
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
-
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
-
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
-
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
-
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
-
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
-
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
-
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
-
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
-
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.exists": "exists",
-
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotExist": "does not exist",
-
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.equals": "equals",
-
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotEqual": "does not equal",
-
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.like": "like",
-
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.notLike": "not like",
-
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.contains": "contains",
-
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotContain": "does not contain",
-
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.matches": "matches",
-
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotMatch": "does not match",
-
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
-
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
-
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
-  "admin.reports.items.number": "No.",
-
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
-  "admin.reports.items.id": "UUID",
-
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
-
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
-  "admin.reports.items.handle": "URI",
-
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
-
-
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
-  "admin.reports.commons.additional-data": "Additional data to return",
-
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
-
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
-
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
-
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
-  "admin.reports.commons.of": "of",
-
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
-
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
-
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
-
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
-
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property": "Item Property Filters",
-
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
-
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Controlo de qualidade",
 
   // "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.editGroupPage": "Nesta página, pode modificar as propriedades e os membros de um grupo. Na secção superior, pode editar o nome e a descrição do grupo, a menos que se trate de um grupo administrativo para uma coleção ou comunidade, em que o nome e a descrição do grupo são auto-gerados e não podem ser editados. Nas seções seguintes, pode editar o nome e a descrição do grupo. Ver [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+ou+gerir+a+utilizador+grupo) para mais detalhes.",
@@ -1188,6 +815,309 @@
   // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
   "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para adicionar ou remover um sub-grupo de/para grupo, clique no botão 'Procurar Tudo' ou use a barra de pesquisa em baixo para procurar grupos. Depois clique no ícone 'mais' para cada grupo que deseja adicionar lista em baixo, ou no ícone 'lixo' para cada grupo que deseja remover. A lista pode conter várias páginas: utilize os controlos de página no final da lista para navegar para as páginas seguintes.",
 
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Relatório de coleção filtrado",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Relatório de coleção filtrado",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Relatório de coleção filtrado",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar coleções",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Relatório de coleção",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultados de item",
+
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunidade",
+
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Coleção",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "N.º itens",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Correspondência com todos os filtros seleccionados",
+
+  // "admin.reports.items.title": "Metadata Query Report",
+  "admin.reports.items.title": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Relatório de consulta de metadados",
+
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Executar consulta de item",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Seletor de coleção",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultas de campos de metadados",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultas predefinidas",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar consultas",
+
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Limitar/",
+
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desvio (Offset)",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Todo o repositório",
+
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Qualquer campo",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "não existe",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "igual a",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "não é igual",
+
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "como",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "não é como",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contém",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "não contém",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "corresponde",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "não corresponde",
+
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nova consulta",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Não tem título",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Não tem 'dc.identifier.uri'",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Tem composto 'subject'",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Tem composto 'dc.contributor.author'",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Tem composto 'dc.creator'",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Tem um URL em 'dc.description'",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "Tem 'texto integral' referido em 'dc.description.provenance'",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Não tem 'texto integral' referido em 'dc.description.provenance'",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Tem metadados vazios",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Tem metadados inquebrados na descrição",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Tem uma entidade XML nos metadados",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Tem caractere não-ascii nos metadados",
+
+  // "admin.reports.items.number": "No.",
+  "admin.reports.items.number": "N.º",
+
+  // "admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Coleção",
+
+  // "admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Título",
+
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtros",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Dados adicionais para devolver",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Página anterior",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Próxima página",
+
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Página",
+
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar para atualização de metadados",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Anular a seleção de todos os filtros",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Selecionar todos os filtros",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Corresponde a todos os filtros especificados",
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtros de propriedades do item",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "É Item - sempre verdadeiro",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Itens retirados",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Itens disponíveis - Não retirados",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Itens detectáveis - Não privados",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Não detetável - Item privado",
+
+  // "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  "admin.reports.commons.filters.property.all_filters.tooltip": "Este filtro inclui todos os itens que correspondem a TODOS os filtros especificados",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtros básicos de ficheiros",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "O item tem vários ficheiros",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "O item não tem ficheiros originais",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "O item tem um ficheiro original",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtros de ficheiros por tipo MIME",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "O item tem um ficheiro 'documental' original (PDF, Office, Text, HTML, XML, etc)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "O item tem um ficheiro 'imagem' original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tem outros tipos de ficheiros (não 'documentais' ou 'imagem')",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "O item tem vários tipos de ficheiros originais (Documento, Imagem, Outros)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "O item tem um ficheiro PDF original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "O item tem um ficheiro JPG original",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tem um PDF invulgarmente pequeno",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tem um PDF invulgarmente grande",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tem ficheiro 'documental' sem item 'TEXT'",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtros de tipos MIME suportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Itens com ficheiro 'imagem' são suportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "O item tem ficheiro de 'imagem' que não é suportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Itens com ficheiros 'documentais' são suportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "O item tem ficheiro 'documental' que não é suportado",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtros de pacotes de ficheiros",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tem ficheiro num pacote não suportado",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tem uma miniatura invulgarmente pequena",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tem ficheiro original sem miniatura",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tem miniatura com nome inválido (assume uma miniatura para cada original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tem uma miniatura não gerada",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "Não tem licença",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Tem documentação no pacote de licenças",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtros de permissões",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "O item tem um ficheiro original restrito",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "O item tem pelo menos um ficheiro original que não é acessível a utilizadores anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "O item tem uma miniatura restrita",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "O item tem pelo menos uma miniatura que não é acessível a utilizadores anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "O item tem metadados restritos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "O item tem metadados que não são acessíveis ao utilizadores anónimos",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa administrativa",
 
@@ -1299,10 +1229,10 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Selecione um ficheiro!",
 
-  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
   "admin.metadata-import.page.error.addFileUrl": "Insira primeiro o URL do ficheiro!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
   "admin.batch-import.page.error.addFile": "Selecione primeiro o ficheiro .zip!",
 
   // "admin.metadata-import.page.toggle.upload": "Upload",
@@ -1443,11 +1373,11 @@
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Voltar",
 
-  // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Ficheiros: ",
+  // "bitstream.edit.bitstream": "Bitstream:",
+  "bitstream.edit.bitstream": "Ficheiros:",
 
-  // "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, pode indicar uma breve descrição do ficheiro, por exemplo \"<i>Texto Principal</i>\" ou \"<i>Dados da experiência</i>\".",
+  // "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, pode indicar uma breve descrição do ficheiro, por exemplo \"<i>Texto Principal</i>\"ou \"<i>Dados da experiência</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Descrição",
@@ -1470,11 +1400,11 @@
   // "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": "A aplicação usada para criar o ficheiro e a respetiva versão (por exemplo, \"<i>ACMESoft SuperApp versão 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "bitstream.edit.form.primaryBitstream.label": "Ficheiro primário",
 
-  // "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": "Se o formato não se encontrar listado, selecione por favor a opção <b> \"Formato não está na lista\" </b> e faculte detalhes em \"Descreva o novo formato\".",
+  // "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": "Se o formato não se encontrar listado, selecione por favor a opção <b> \"Formato não está na lista\"</b> e faculte detalhes em \"Descreva o novo formato\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Formato selecionado",
@@ -1501,13 +1431,13 @@
   "bitstream.edit.form.iiifToc.hint": "Ao acrescentar texto aqui dá início a uma tabela de conteúdos.",
 
   // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
-  "bitstream.edit.form.iiifWidth.label": "Largura do canvas IIIF",
+  "bitstream.edit.form.iiifWidth.label": "Largura Canvas IIIF",
 
   // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
   "bitstream.edit.form.iiifWidth.hint": "A largura do canvas normalmente deve corresponder à largura da imagem.",
 
   // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
-  "bitstream.edit.form.iiifHeight.label": "Altura do canvas IIIF",
+  "bitstream.edit.form.iiifHeight.label": "Altura Canvas IIIF",
 
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "A altura do canvas normalmente deve corresponder à altura da imagem.",
@@ -1521,8 +1451,8 @@
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Editar ficheiro",
 
-  // "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": "Já tem acesso a este ficheiro. Se quiser descarregar o ficheiro, clique ",
+  // "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": "Já tem acesso a este ficheiro. Se quiser descarregar o ficheiro, clique",
 
   // "bitstream-request-a-copy.alert.canDownload2": "here",
   "bitstream-request-a-copy.alert.canDownload2": "aqui",
@@ -1530,14 +1460,14 @@
   // "bitstream-request-a-copy.header": "Request a copy of the file",
   "bitstream-request-a-copy.header": "Solicitar cópia ao autor",
 
-  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
-  "bitstream-request-a-copy.intro": "Preencha a seguinte informação para solicitar uma cópia do ficheiro: ",
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item:",
+  "bitstream-request-a-copy.intro": "Preencha a seguinte informação para solicitar uma cópia do ficheiro:",
 
-  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
-  "bitstream-request-a-copy.intro.bitstream.one": "Solicitar o seguinte ficheiro: ",
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file:",
+  "bitstream-request-a-copy.intro.bitstream.one": "Solicitar o seguinte ficheiro:",
 
-  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
-  "bitstream-request-a-copy.intro.bitstream.all": "Solicitar todos os ficheiros. ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files.",
+  "bitstream-request-a-copy.intro.bitstream.all": "Solicitar todos os ficheiros.",
 
   // "bitstream-request-a-copy.name.label": "Name *",
   "bitstream-request-a-copy.name.label": "O seu nome *",
@@ -1545,7 +1475,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "O preenchimento do nome é um elemento obrigatório!",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "O seu endereço de correio eletrónico *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1617,6 +1547,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "título",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "vocabulário controlado (SRSC)",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Percorrer por autor",
 
@@ -1629,9 +1562,15 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Percorrer por vocabulário controlado",
 
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Selecionar um assunto para adicionar como filtro de pesquisa",
+
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
+  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.descrption": "Selecionar um índice para adicionar como filtro de pesquisa",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",
 
@@ -1722,11 +1661,11 @@
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Pesquisar",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Percorrer {{ collection }} por {{ field }}{{ startsWith }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Percorrer por {{ field }}{{ startsWith }} {{ value }}",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Percorrer {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Percorrer por {{ field }} {{ value }}",
 
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Voltar aos resultados",
@@ -1743,6 +1682,12 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, reenviado para a área de trabalho do gestor de revisão",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Criar coleção",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Procurar um logótipo de coleção",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Criar uma coleção",
 
@@ -2037,11 +1982,17 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Coleção",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logótipo coleção",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Pesquisa",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Entradas recentes",
 
   // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "Nenhum item a exibir",
+  "collection.page.browse.recent.empty": "Nenhum item para exibir",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta coleção",
@@ -2055,17 +2006,23 @@
   // "collection.page.news": "News",
   "collection.page.news": "Notícias",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultados da pesquisa",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleção",
 
   // "collection.select.empty": "No collections to show",
-  "collection.select.empty": "Nenhuma coleção a mostrar",
+  "collection.select.empty": "Nenhuma coleção para mostrar",
+
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Coleções selecionadas",
 
   // "collection.select.table.select": "Select collection",
   "collection.select.table.select": "Selecionar coleção",
 
   // "collection.select.table.deselect": "Deselect collection",
-  "collection.select.table.deselect": "Desmarcar coleção",
+  "collection.select.table.deselect": "Desselecionar coleção",
 
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
@@ -2157,6 +2114,21 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Expandir",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Colapsar {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Procurar um logótipo de comunidade",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunidades e Coleções",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Criar comunidade",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Criar uma comunidade",
 
@@ -2176,22 +2148,22 @@
   "community.delete.confirm": "Confirmar",
 
   // "community.delete.processing": "Deleting...",
-  "community.delete.processing": "A apagar...",
+  "community.delete.processing": "A eliminar...",
 
   // "community.delete.head": "Delete Community",
-  "community.delete.head": "Apagar comunidade",
+  "community.delete.head": "Eliminar comunidade",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Não foi possível apagar a comunidade",
+  "community.delete.notification.fail": "Não foi possível eliminar a comunidade",
 
   // "community.delete.notification.success": "Successfully deleted community",
-  "community.delete.notification.success": "Comunidade apagada com sucesso",
+  "community.delete.notification.success": "Comunidade eliminada com sucesso",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  "community.delete.text": "Você tem certeza que quer apagar a comunidade \"{{ dso }}\"?",
+  "community.delete.text": "Você tem certeza que quer eliminar a comunidade \"{{ dso }}\"?",
 
   // "community.edit.delete": "Delete this community",
-  "community.edit.delete": "Apagar esta comunidade",
+  "community.edit.delete": "Eliminar esta comunidade",
 
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Editar comunidade",
@@ -2200,18 +2172,24 @@
   "community.edit.breadcrumbs": "Editar Comunidade",
 
   // "community.edit.logo.delete.title": "Delete logo",
-  "community.edit.logo.delete.title": "Apagar logótipo",
+  "community.edit.logo.delete.title": "Eliminar logótipo",
+
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar a eliminação",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
-  "community.edit.logo.delete-undo.title": "Não apagar logótipo",
+  "community.edit.logo.delete-undo.title": "Não eliminar logótipo",
+
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Não eliminar logótipo",
 
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logótipo da comunidade",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Falha ao carregar o logótipo da comunidade. Verifique o conteúdo antes de tentar de novo.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
   "community.edit.logo.notifications.add.success": "Logótipo da comunindade carregado com sucesso.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
@@ -2223,7 +2201,7 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Erro ao apagar o logótipo",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Arraste um logótipo da comunidade para carregar",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
@@ -2232,7 +2210,7 @@
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Não tem os privilégios necessários para efetuar esta alteração",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occured while editing the community",
   "community.edit.notifications.error": "Ocorreu um erro ao editar a comunidade",
 
   // "community.edit.return": "Back",
@@ -2271,6 +2249,9 @@
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidade",
 
+  // "community.logo": "Community logo",
+  "community.logo": "Logótipo comunidade",
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Nenhum",
 
@@ -2385,6 +2366,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sub-comunidade e coleções",
 
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultados da pesquisa",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Coleções desta comunidade",
 
@@ -2574,6 +2558,12 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Pedido de cópia recusado com sucesso!",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Limpar seleção",
+
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Limpar a opção selecionada",
+
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sem título",
 
@@ -2634,6 +2624,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Pesquisar por um(a) {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidade",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "coleção",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "item",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Selecione uma coleção",
 
@@ -2650,7 +2649,7 @@
   "dso-selector.set-scope.community.input-header": "Pesquisar por uma comunidade ou coleção",
 
   // "dso-selector.claim.item.head": "Profile tips",
-  "dso-selector.claim.item.head": "Dicas de Perfil",
+  "dso-selector.claim.item.head": "Dicas 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": "Estes são os perfis existentes que poderão estar relacionados consigo. Se se identificar num destes perfis, selecione-o e na página de detalhes, entre as opções, pode reivindicá-lo. Caso contrário, pode criar um novo perfil de raiz, selecionando o botão em baixo.",
@@ -2739,6 +2738,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Apagar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Tem a certeza de que pretende apagar o logótipo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Apagar perfil",
 
@@ -2764,7 +2766,7 @@
   "confirmation-modal.delete-subscription.confirm": "Apagar",
 
   // "error.bitstream": "Error fetching bitstream",
-  "error.bitstream": "Erro ao aceder ao ficheiro!",
+  "error.bitstream": "Erro ao carregar ficheiro!",
 
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Erro ao carregar itens!",
@@ -2799,8 +2801,8 @@
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Erro ao carregar os resultados da pesquisa!",
 
-  // "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": "A query da pesquisa não é válida! Por favor verifique <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": "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": "A query da pesquisa não é válida! Por favor verifique <a href='https://solr.apache.org/guide/query-syntax-and-parsing.html' target=\'_blank\'>Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções!",
@@ -2826,10 +2828,10 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Este campo é de preenchimento obrigatório!",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Este endereço de correio electrónico não é válido!",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Este endereço de correio electrónico já se encontra atribuido!",
 
   // "error.validation.groupExists": "This group already exists",
@@ -2859,13 +2861,13 @@
   "feed.description": "Feed",
 
   // "file-download-link.restricted": "Restricted bitstream",
-  "file-download-link.restricted": "'Bitstream' restrito",
+  "file-download-link.restricted": "Ficheiro restrito",
 
   // "file-section.error.header": "Error obtaining files for this item",
-  "file-section.error.header": "Erro na obteção de ficheiros para este item!",
+  "file-section.error.header": "Erro na obtenção de ficheiros para este item!",
 
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  "footer.copyright": "Copyright © 2003-{{ year }}",
+  "footer.copyright": "Copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "Powered by DSpace",
@@ -2885,6 +2887,9 @@
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Contacte-nos",
 
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Esqueci a senha",
 
@@ -2933,8 +2938,8 @@
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Identificação",
 
-  // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "Endereço de correio eletrónico: ",
+  // "forgot-password.form.identification.email": "Email address:",
+  "forgot-password.form.identification.email": "Endereço de correio eletrónico:",
 
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Palavra-chave",
@@ -2942,8 +2947,8 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Insira a senha novamente para confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  "forgot-password.form.error.empty-password": "Indique uma senha na caixa abaixo.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "Indique uma senha nas caixas em cima.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "As palavras de acesso não coincidem.",
@@ -3027,7 +3032,7 @@
   "form.other-information.first-name": "Nome",
 
   // "form.other-information.insolr": "In Solr Index",
-  "form.other-information.insolr": "No índice SOLR",
+  "form.other-information.insolr": "No índice Solr",
 
   // "form.other-information.institution": "Institution",
   "form.other-information.institution": "Instituição",
@@ -3059,6 +3064,12 @@
   // "form.create": "Create",
   "form.create": "Criar",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrescer {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Largue o item na nova posição",
 
@@ -3159,7 +3170,7 @@
   "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   // "health-page.section-info.app.title": "Application Backend",
-  "health-page.section-info.app.title": "Aplicação Backend",
+  "health-page.section-info.app.title": "Aplicação de Backend",
 
   // "health-page.section-info.java.title": "Java",
   "health-page.section-info.java.title": "Java",
@@ -3188,7 +3199,7 @@
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Página inicial",
 
-  //"home.search-form.placeholder": "Search the repository...",
+  // "home.search-form.placeholder": "Search the repository...",
   "home.search-form.placeholder": "pesquisar no repositório...",
 
   // "home.title": "Home",
@@ -3224,7 +3235,7 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Termos de Uso",
 
-  //  "info.end-user-agreement.hosting-country": "the United States",
+  // "info.end-user-agreement.hosting-country": "the United States",
   "info.end-user-agreement.hosting-country": "Portugal",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
@@ -3275,12 +3286,24 @@
   // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "Esta é a página/URL que contextualiza o seu contacto.",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Suporte COAR Notify",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Suporte COAR Notify",
+
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este item é privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este item foi retirado",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Requer reposição",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Requerido por",
+
   // "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": "Com este editor pode ver e alterar as políticas de um item, bem como alterar políticas de componentes individuais do item: 'pacotes' (bundles) e 'ficheiros' (bitstreams). Em resumo, um item contém 'pacotes' e os pacotes contêm 'ficheiros'. Os pacotes usualmente possuem políticas de ADICIONAR/REMOVER/LER/ESCREVER, por outro lado, os ficheiros apenas possuem políticas de LER/ESCREVER.",
 
@@ -3311,8 +3334,8 @@
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Arraste um ficheiro para carregar",
 
-  // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Item: ",
+  // "item.bitstreams.upload.item": "Item:",
+  "item.bitstreams.upload.item": "Item:",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "O pacote foi criado com sucesso.",
@@ -3332,8 +3355,8 @@
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "Atualmente a mostrar {{ amount }} ficheiros de {{ total }}.",
 
-  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  "item.edit.bitstreams.bundle.load.all": "Carregar todos ({{ total }})",
+  // "item.edit.bitstreams.bundle.load.all": "Load all  ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Carregar todos  ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Carregar mais",
@@ -3543,7 +3566,7 @@
   "item.edit.item-mapper.notifications.add.success.content": "Mapeou o item em {{amount}} coleções com sucesso.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  "item.edit.item-mapper.notifications.add.success.head": "Mapeamento complesto",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapeamento completo",
 
   // "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": "Ocorreram erros ao remover mapeamento do item em {{amount}} coleções.",
@@ -3578,6 +3601,9 @@
   // "item.edit.metadata.edit.value": "Edit value",
   "item.edit.metadata.edit.value": "Editar valor",
 
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar valor de autoridade",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3596,7 +3622,7 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Parar edição",
 
-  // "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.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.edit.buttons.virtual": "Este é um valor de metadados virtual, ou seja, um valor herdado de uma entidade relacionada. Não pode ser modificado diretamente. Adicionar ou remover a relação correspondente no separador 'Relacionamentos'",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
@@ -3606,7 +3632,7 @@
   "item.edit.metadata.headers.edit": "Editar",
 
   // "item.edit.metadata.headers.field": "Field",
-  "item.edit.metadata.headers.field": "Campo (metadado)",
+  "item.edit.metadata.headers.field": "Campo",
 
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Idioma",
@@ -3614,11 +3640,14 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar campo",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "item.edit.metadata.metadatafield.error": "Ocorreu um erro ao validar o campo de metadados",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  "item.edit.metadata.metadatafield.invalid": "Por favor escolha um campo de metadados válido",
+  "item.edit.metadata.metadatafield.invalid": "Por favor, escolha um campo de metadados válido",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "As suas alterações foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
@@ -3656,6 +3685,15 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority:",
+  "item.edit.metadata.authority.label": "Autoridade:",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquear o valor da chave de autoridade para edição manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquear o valor da chave de autoridade para edição manual",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3684,13 +3722,13 @@
   "item.edit.move.head": "Mover item: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
-  "item.edit.move.inheritpolicies.checkbox": "Herdar politicas",
+  "item.edit.move.inheritpolicies.checkbox": "Herdar políticas",
 
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Herdar as politicas padrões da coleção destino",
 
   // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
-  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando activada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
+  "item.edit.move.inheritpolicies.tooltip": "Aviso: Quando ativada, a política de acesso de leitura para o item e quaisquer ficheiros associados ao item, serão substituídos pela política de acesso de leitura predefinida da coleção. Isto não pode ser anulado.",
 
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
@@ -3720,7 +3758,7 @@
   "item.edit.private.error": "Ocorreu um erro ao tornar o item privado",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  "item.edit.private.header": "Tornar privado o item: {{ id }}",
+  "item.edit.private.header": "Tornar o item privado: {{ id }}",
 
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "O item agora é privado",
@@ -3873,10 +3911,10 @@
   "item.edit.tabs.status.buttons.private.label": "Tornar o item privado",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
-  "item.edit.tabs.status.buttons.public.button": "Tornar público o item...",
+  "item.edit.tabs.status.buttons.public.button": "Tornar o item público...",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
-  "item.edit.tabs.status.buttons.public.label": "Tornar público o item",
+  "item.edit.tabs.status.buttons.public.label": "Tornar o item público",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Restabelecer...",
@@ -3965,8 +4003,8 @@
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Editora",
 
-  // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Item: ",
+  // "item.page.titleprefix": "Item:",
+  "item.page.titleprefix": "Item:",
 
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Título do volume",
@@ -3983,6 +4021,18 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Colapsar",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Existem {{num}} sugestões pendentes relacionadas com a sua conta",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Ver",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Existem {{num}} sugestões pendentes relacionadas com a sua conta",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Ver",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordem de supervisão",
 
@@ -4007,6 +4057,33 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remover grupo de supervisão",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Este valor de autoridade foi confirmado como exato por um utilizador interativo",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "O valor é singular e válido, mas não foi visto e aceite por um ser humano, pelo que ainda é incerto",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Existem vários valores de autoridade correspondentes com a mesma validade",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "Não há respostas correspondentes na autoridade",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "A autoridade deparou-se com uma falha interna",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "A autoridade recomenda que esta proposta seja rejeitada",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "Não foi devolvido qualquer valor de confiança razoável pela autoridade",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Nunca foi registada confiança para este valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confiança desconhecido",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumo",
 
@@ -4038,7 +4115,7 @@
   "item.page.filesection.description": "Descrição:",
 
   // "item.page.filesection.download": "Download",
-  "item.page.filesection.download": "Ver/Abrir",
+  "item.page.filesection.download": "Descarregar",
 
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Formato:",
@@ -4092,16 +4169,19 @@
   "item.page.uri": "URI",
 
   // "item.page.bitstreams.view-more": "Show more",
-  "item.page.bitstreams.view-more": "Ver mais",
+  "item.page.bitstreams.view-more": "Mostrar mais",
 
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
 
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Primário",
+
   // "item.page.filesection.original.bundle": "Original bundle",
-  "item.page.filesection.original.bundle": "Principais",
+  "item.page.filesection.original.bundle": "Pacote original",
 
   // "item.page.filesection.license.bundle": "License bundle",
-  "item.page.filesection.license.bundle": "Licença",
+  "item.page.filesection.license.bundle": "Licença do pacote",
 
   // "item.page.return": "Back",
   "item.page.return": "Voltar",
@@ -4109,6 +4189,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Criar nova versão",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Solicitar a retirada deste item",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Solicitar reintegração",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Um nova versão não pode ser criada porque já se encontra uma submisão em curso no histórico de versões.",
 
@@ -4118,6 +4204,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reivindicar este item como perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "Logótipo ROR",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -4146,7 +4235,7 @@
   "item.preview.dc.type": "Tipo:",
 
   // "item.preview.oaire.citation.issue": "Issue",
-  "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Número",
 
   // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volume",
@@ -4158,7 +4247,7 @@
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
-  "itemm.preview.dc.identifier": "Identificador:",
+  "item.preview.dc.identifier": "Identificador:",
 
   // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista ou Série",
@@ -4194,7 +4283,31 @@
   "item.preview.dc.coverage.spatial": "Jurisdição:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
-  "item.preview.oaire.fundingStream": "Linha de financiamento:",
+  "item.preview.oaire.fundingStream": "Programa de financiamento:",
+
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Data de fundação",
+
+  // "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nome legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipo de entidade:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleção",
@@ -4202,6 +4315,9 @@
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nenhum item para mostrar.",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Itens selecionados",
+
   // "item.select.table.select": "Select item",
   "item.select.table.select": "Selecionar item",
 
@@ -4283,6 +4399,15 @@
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nova versão",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Solicitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Solicitar reintegração",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nova versão",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Criar uma nova versão para este item",
 
@@ -4295,21 +4420,63 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Criar uma nova versão",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar pedido",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancelar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "Não criar uma nova versão",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Não enviar pedido",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Sumário",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Está a solicitar a retirada deste item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Por favor indique a razão para a sua retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Está a solicitar reintegração deste item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Por favor indique o motivo para a sua reintegração",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
   "item.version.create.modal.form.summary.placeholder": "Inserir o sumário para a nova versão",
 
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Indique o motivo para a sua reintegração",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Criar uma nova versão...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "A enviar o pedido de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Pedido de reintegração enviado.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Pedido de retirada enviado.",
+
   // "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": "A nova versão está a ser criada. Isto pode demorar algum tempo se o item tiver muitas relações.",
 
@@ -4397,6 +4564,9 @@
   // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "Valor",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar campo",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "itemtemplate.edit.metadata.metadatafield.error": "ocorreu um erro ao validar o campo de metadados",
 
@@ -4457,8 +4627,8 @@
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Editora",
 
-  // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Revista: ",
+  // "journal.page.titleprefix": "Journal:",
+  "journal.page.titleprefix": "Revista:",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Resultado da pesquisa de revistas",
@@ -4493,11 +4663,14 @@
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Número de páginas",
 
-  // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Número de revista: ",
+  // "journalissue.page.titleprefix": "Journal Issue:",
+  "journalissue.page.titleprefix": "Número de revista:",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados da pesquisa de números da revista",
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Volume de revista",
+  "journalvolume.listelement.badge": "Volume da revista",
 
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Descrição",
@@ -4508,26 +4681,29 @@
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Data de publicação",
 
-  // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume de revista: ",
+  // "journalvolume.page.titleprefix": "Journal Volume:",
+  "journalvolume.page.titleprefix": "Volume da revista:",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultados da pesquisa de volumes da revista",
+
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Media do documeo",
 
-  // "iiifsearchable.page.titleprefix": "Document: ",
-  "iiifsearchable.page.titleprefix": "Documento: ",
+  // "iiifsearchable.page.titleprefix": "Document:",
+  "iiifsearchable.page.titleprefix": "Documento:",
 
-  // "iiifsearchable.page.doi": "Permanent Link: ",
-  "iiifsearchable.page.doi": "URI permanete: ",
+  // "iiifsearchable.page.doi": "Permanent Link:",
+  "iiifsearchable.page.doi": "URI permanente:",
 
-  // "iiifsearchable.page.issue": "Issue: ",
-  "iiifsearchable.page.issue": "Núemero: ",
+  // "iiifsearchable.page.issue": "Issue:",
+  "iiifsearchable.page.issue": "Número:",
 
-  // "iiifsearchable.page.description": "Description: ",
-  "iiifsearchable.page.description": "Descrição: ",
+  // "iiifsearchable.page.description": "Description:",
+  "iiifsearchable.page.description": "Descrição:",
 
   // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
   "iiifviewer.fullscreen.notice": "Utilize o ecrã completo para melhor visualização .",
@@ -4535,17 +4711,17 @@
   // "iiif.listelement.badge": "Image Media",
   "iiif.listelement.badge": "Media da imagem",
 
-  // "iiif.page.titleprefix": "Image: ",
-  "iiif.page.titleprefix": "Imagem: ",
+  // "iiif.page.titleprefix": "Image:",
+  "iiif.page.titleprefix": "Imagem:",
 
-  // "iiif.page.doi": "Permanent Link: ",
-  "iiif.page.doi": "URI permanente: ",
+  // "iiif.page.doi": "Permanent Link:",
+  "iiif.page.doi": "URI permanente:",
 
-  // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Número: ",
+  // "iiif.page.issue": "Issue:",
+  "iiif.page.issue": "Número:",
 
-  // "iiif.page.description": "Description: ",
-  "iiif.page.description": "Description: ",
+  // "iiif.page.description": "Description:",
+  "iiif.page.description": "Description:",
 
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "A carregar ficheiro...",
@@ -4646,6 +4822,9 @@
   // "logout.title": "Logout",
   "logout.title": "Sair",
 
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegação de administração",
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "Administração",
 
@@ -4670,8 +4849,6 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
 
-
-
   // "menu.section.reports": "Reports",
   "menu.section.reports": "Relatórios",
 
@@ -4759,8 +4936,7 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secção do menu controle de acesso",
 
-  //"menu.section.icon.reports": "Reports menu section",
-  // TODO New key - Add a translation
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -4808,6 +4984,9 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Soltar barra lateral",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Secção do menu de notificações",
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4835,6 +5014,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processos",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificações",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Controlo de qualidade",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reivindicação de publicação",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Fixar barra lateral",
 
@@ -4862,16 +5050,12 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarefas de Estatísticas",
 
-
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
-  "menu.section.statistics_task": "Tarefa de estatísticas",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secção controle de acesso",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar secção painel de controle",
 
@@ -4989,16 +5173,16 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sem título",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sem URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Pesquisar na área pessoal...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Todas as tarefas",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Meus depósitos",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
@@ -5037,6 +5221,18 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Encontramos <b>{{count}} publicações</b> em {{source}} que parecem estar relacionadas com o perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "reveja as sugestões",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tudo no repositório",
 
@@ -5052,7 +5248,7 @@
   // "nav.login": "Log In",
   "nav.login": "Entrar",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "Menu perfil do utilizador e sair",
 
   // "nav.logout": "Log Out",
@@ -5091,6 +5287,216 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Item",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Controlo de Qualidade",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "Em Abaixo pode ver todos os tópicos recebidos das subscrições de {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "Em baixo pode ver todas as fontes da notificação.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Tópicos atuais",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fontes atuais",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tópico",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fonte",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último evento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Ações",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar tópicos para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugestões para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "Não foram encontrados tópicos.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "Não foram encontradas fontes.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugestões para controlo de qualidade",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Ocorreu um erro ao carregar os tópicos de controlo de qualidade",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Ocorreu um erro ao carregar a fonte de controlo de qualidade",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "A carregar...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tópico:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "Não foram encontradas sugestões.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confiança",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicação",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalhes",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalhes do projeto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razões",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Ações",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceitar sugestão",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugestão",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Apagar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rejeitar sugestão",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar projeto e aceitar sugestão",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor do PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor do assunto:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumo:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Dados do projeto sugeridos pelo OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título do projeto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiamento:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdição:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Voltar aos tópicos",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Voltar às fontes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar mais",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado ao registo local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "Não foi encontrado nenhum registo local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Tem a certeza?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operação não pode ser anulada. Ignorar esta sugestão?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "Esta operação não pode ser anulada!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operação não pode ser anulada. Rejeitar esta sugestão?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "Não foi selecionado nenhum projeto DSpace. Será criado um novo projeto com base nos dados da sugestão.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "A sua decisão foi guardada com sucesso.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Ocorreu um erro. A sua decisão não foi guardada.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Escolher um projeto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicação:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vincular ao registo local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Pesquisar project",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Pesquisar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Vincular projeto",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Remover",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduza um nome de projeto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "Nenhum projecto encontrado.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "O projeto foi ligado com êxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "O projeto foi desvinculado com êxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Ocorreu um erro. Não foi efectuada nenhuma operação.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Razão",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organização",
 
@@ -5115,8 +5521,14 @@
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
 
-  // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Organização: ",
+  // "orgunit.page.titleprefix": "Organizational Unit:",
+  "orgunit.page.titleprefix": "Organização:",
+
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados da pesquisa de organizações",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opções de paginação",
@@ -5127,8 +5539,8 @@
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
-  // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "A mostrar ",
+  // "pagination.showing.label": "Now showing",
+  "pagination.showing.label": "A mostrar",
 
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opções de ordenação",
@@ -5167,10 +5579,10 @@
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "ID",
+  "person.page.staffid": "ID interno",
 
-  // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Pessoa: ",
+  // "person.page.titleprefix": "Person:",
+  "person.page.titleprefix": "Pessoa:",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Resultados da pesquisa de pessoas",
@@ -5263,22 +5675,22 @@
   "process.detail.back": "Voltar",
 
   // "process.detail.output": "Process Output",
-  "process.detail.output": "Output do Processo",
+  "process.detail.output": "Saída do Processo",
 
   // "process.detail.logs.button": "Retrieve process output",
-  "process.detail.logs.button": "Recuperar output do processo",
+  "process.detail.logs.button": "Recuperar a saída do processo",
 
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "A recuperar",
 
   // "process.detail.logs.none": "This process has no output",
-  "process.detail.logs.none": "Este processo não tem output",
+  "process.detail.logs.none": "Este processo não tem saída",
 
   // "process.detail.output-files": "Output Files",
-  "process.detail.output-files": "Ficheiros do Output",
+  "process.detail.output-files": "Ficheiros de saída",
 
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
-  "process.detail.output-files.empty": "Este processo não possui nenhum ficheiro de output",
+  "process.detail.output-files.empty": "Este processo não possui nenhum ficheiro de saída",
 
   // "process.detail.script": "Script",
   "process.detail.script": "Script",
@@ -5322,6 +5734,24 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Ocorreu algum erro ao remover o processo",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Atualização automática…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de conclusão (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processos bem sucedidos",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "Não foram encontrados processos correspondentes.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de conclusão (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processos falhados",
+
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de término (UTC)",
 
@@ -5331,6 +5761,18 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nome",
 
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora de início (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processos em execução",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de criação (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processos agendados",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de início (UTC)",
 
@@ -5370,10 +5812,13 @@
   // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "Apagar processos",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconhecido",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Ocorreu um erro ao apagar os processos",
 
-  // "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": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted.",
   "process.bulk.delete.error.body": "O processo com  o ID {{{processId}} não pôde ser removido. Os restantes processos continuarão a ser removidos.",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
@@ -5499,8 +5944,8 @@
   // "project.page.status": "Status",
   "project.page.status": "Estado",
 
-  // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Projeto de investigação: ",
+  // "project.page.titleprefix": "Research Project:",
+  "project.page.titleprefix": "Projeto de investigação:",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Resultados da pesquisa de projetos",
@@ -5526,8 +5971,8 @@
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Editora",
 
-  // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publicação: ",
+  // "publication.page.titleprefix": "Publication:",
+  "publication.page.titleprefix": "Publicação:",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Título do Volume",
@@ -5548,7 +5993,106 @@
   "media-viewer.previous": "Anterior",
 
   // "media-viewer.playlist": "Playlist",
-  "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Lista de reprodução",
+
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "A carregar...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reivindicar publicação",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reivindicar publicação",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions",
+  "suggestion.targets.description": "Em baixo pode ver todas as sugestões",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugestões atuais",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nome do investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Ações",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Rever {{ total }} sugestão(ões)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for",
+  "suggestion.button.review.title": "Rever {{ total }} sugestão(ões) para",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Nenhum alvo encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Ocorreu um erro ao carregar os alvos sugeridos",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Pontuação",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprovar & importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "A sugestão foi importada com sucesso. <a href='{{ url }}'>Ver</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprovar & importar selecionados",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} sugestões foram importadas com sucesso",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} sugestões não foram importadas devido a erros inesperados do servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugestão",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "A sugestão foi descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugestão selecionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugestões foram rejeitadas",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} sugestões não foram descartadas devido a erros inesperados do servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver evidências",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar evidências",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugestões para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugestões para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the",
+  "suggestion.from.source": "do",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Não tem mais reivindicações de publicações",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Pontuação total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Registo de novo utilizador",
@@ -5608,7 +6152,7 @@
   "register-page.create-profile.submit.error.head": "Falha no registo",
 
   // "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": "O registo foi criado com sucesso. Foi iniciada sessão com o Utilizador criado.",
+  "register-page.create-profile.submit.success.content": "O registo foi criado com sucesso. Foi iniciada sessão com o utilizador criado.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registo finalizado com sucesso",
@@ -5656,19 +6200,19 @@
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registar deve aceitar o <b>registo e a senha de recuperação</b> (Google reCaptcha) cookies.",
 
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
-  "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
+ "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
-  "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
+ "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
-  "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": "Ocorreu um erro na verificação do reCaptcha",
+ "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro na verificação do reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
-  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
+ "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
 
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "As contas podem ser registadas para os endereços de email os domínios",
@@ -5692,13 +6236,19 @@
   "relationships.isAuthorOf.OrgUnit": "Autores (Unidades organizacionais)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Fascículo",
+  "relationships.isIssueOf": "Fascículos da revista",
+
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Fascículo da revista",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf": "Fascículo",
+  "relationships.isJournalIssueOf": "Fascículo da revista",
 
   // "relationships.isJournalOf": "Journals",
-  "relationships.isJournalOf": "Periódicos",
+  "relationships.isJournalOf": "Revistas",
+
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volume da revista",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unidades organizacionais",
@@ -5724,11 +6274,14 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volumes da revista",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volume da revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Contribuidores",
 
-  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
-  "relationships.isContributorOf.OrgUnit": "Colaborador (Unidade organizacional)",
+  // "relationships.isContributorOf.OrgUnit": "Contributor(Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Colaborador(Unidade organizacional)",
 
   // "relationships.isContributorOf.Person": "Contributor",
   "relationships.isContributorOf.Person": "Contribuidor",
@@ -5740,206 +6293,205 @@
   "repository.image.logo": "Logótipo do repositório",
 
   // "repository.title": "DSpace Repository",
-  "repository.title": "Repositório :: ",
+  "repository.title": "Repositório::",
 
-  // "repository.title.prefix": "DSpace Repository :: ",
-  "repository.title.prefix": "Repositório :: ",
+  // "repository.title.prefix": "DSpace Repository::",
+  "repository.title.prefix": "Repositório::",
 
-  // "resource-policies.add.button": "Add",
-  "resource-policies.add.button": "Adicionar",
+  // "resource - policies.add.button": "Add",
+  "resource - policies.add.button": "Adicionar",
 
-  // "resource-policies.add.for.": "Add a new policy",
-  "resource-policies.add.for.": "Adicionar nova política",
+  // "resource - policies.add.for.": "Add a new policy",
+  "resource - policies.add.for.": "Adicionar nova política",
 
-  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  "resource-policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
+  // "resource - policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource - policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
 
-  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  "resource-policies.add.for.bundle": "Adicionar uma nova política de pacote",
+  // "resource - policies.add.for.bundle": "Add a new Bundle policy",
+  "resource - policies.add.for.bundle": "Adicionar uma nova política de pacote",
 
-  // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Adicionar uma nova política de Item",
+  // "resource - policies.add.for.item": "Add a new Item policy",
+  "resource - policies.add.for.item": "Adicionar uma nova política de Item",
 
-  // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Adicionar uma nova política de Comunidade",
+  // "resource - policies.add.for.community": "Add a new Community policy",
+  "resource - policies.add.for.community": "Adicionar uma nova política de Comunidade",
 
-  // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Adicionar uma nova política de Coleção",
+  // "resource - policies.add.for.collection": "Add a new Collection policy",
+  "resource - policies.add.for.collection": "Adicionar uma nova política de Coleção",
 
-  // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Criar uma nova política de recursos para ",
+  // "resource - policies.create.page.heading": "Create new resource policy for",
+  "resource - policies.create.page.heading": "Criar uma nova 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": "Ocorreu um erro ao criar uma política de recursos.",
+  // "resource - policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource - policies.create.page.failure.content": "Ocorreu um erro ao criar uma política de recursos.",
 
-  // "resource-policies.create.page.success.content": "Operation successful",
-  "resource-policies.create.page.success.content": "Operação bem sucedida",
+  // "resource - policies.create.page.success.content": "Operation successful",
+  "resource - policies.create.page.success.content": "Operação bem sucedida",
 
-  // "resource-policies.create.page.title": "Create new resource policy",
-  "resource-policies.create.page.title": "Criar uma nova política de recursos",
+  // "resource - policies.create.page.title": "Create new resource policy",
+  "resource - policies.create.page.title": "Criar uma nova política de recursos",
 
-  // "resource-policies.delete.btn": "Delete selected",
-  "resource-policies.delete.btn": "Apagar selecionado",
+  // "resource - policies.delete.btn": "Delete selected",
+  "resource - policies.delete.btn": "Apagar selecionado",
 
-  // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  "resource-policies.delete.btn.title": "Apagar política de recurso selecionada",
+  // "resource - policies.delete.btn.title": "Delete selected resource policies",
+  "resource - policies.delete.btn.title": "Apagar política de recurso selecionada",
 
-  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  "resource-policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
+  // "resource - policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource - policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
 
-  // "resource-policies.delete.success.content": "Operation successful",
-  "resource-policies.delete.success.content": "Operação bem sucedida",
+  // "resource - policies.delete.success.content": "Operation successful",
+  "resource - policies.delete.success.content": "Operação bem sucedida",
 
-  // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Editar política de recurso ",
+  // "resource - policies.edit.page.heading": "Edit resource policy",
+  "resource - policies.edit.page.heading": "Editar política de recurso",
 
-  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
+  // "resource - policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource - policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
 
-  // "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": "Ocorreu um erro durante a edição da (ePerson ou grupo) da 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": "Ocorreu um erro durante a edição da(ePerson ou grupo)da 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": "Ocorreu um erro durante a edição da política de recursos. A (ePerson ou grupo) foi actualizado com sucesso.",
+  // "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": "Ocorreu um erro durante a edição da política de recursos.A(ePerson ou grupo)foi actualizado com sucesso.",
 
-  // "resource-policies.edit.page.success.content": "Operation successful",
-  "resource-policies.edit.page.success.content": "Operação bem sucedida",
+  // "resource - policies.edit.page.success.content": "Operation successful",
+  "resource - policies.edit.page.success.content": "Operação bem sucedida",
 
-  // "resource-policies.edit.page.title": "Edit resource policy",
-  "resource-policies.edit.page.title": "Editar política de recurso",
+  // "resource - policies.edit.page.title": "Edit resource policy",
+  "resource - policies.edit.page.title": "Editar política de recurso",
 
-  // "resource-policies.form.action-type.label": "Select the action type",
-  "resource-policies.form.action-type.label": "Selecione o tipo de ação",
+  // "resource - policies.form.action - type.label": "Select the action type",
+  "resource - policies.form.action - type.label": "Selecione o tipo de ação",
 
-  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  "resource-policies.form.action-type.required": "Deve selecionar a ação da política de recurso.",
+  // "resource - policies.form.action - type.required": "You must select the resource policy action.",
+  "resource - policies.form.action - type.required": "Deve selecionar a ação da política de recurso.",
 
-  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  "resource-policies.form.eperson-group-list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
+  // "resource - policies.form.eperson - group - list.label": "The eperson or group that will be granted the permission",
+  "resource - policies.form.eperson - group - list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
 
-  // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
+  // "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": "Pesquisar um utilizador",
+  // "resource - policies.form.eperson - group - list.tab.eperson": "Search for a ePerson",
+  "resource - policies.form.eperson - group - list.tab.eperson": "Pesquisar um utilizador",
 
-  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  "resource-policies.form.eperson-group-list.tab.group": "Pesquisar um grupo",
+  // "resource - policies.form.eperson - group - list.tab.group": "Search for a group",
+  "resource - policies.form.eperson - group - list.tab.group": "Pesquisar um grupo",
 
-  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  "resource-policies.form.eperson-group-list.table.headers.action": "Ação",
+  // "resource - policies.form.eperson - group - list.table.headers.action": "Action",
+  "resource - policies.form.eperson - group - list.table.headers.action": "Ação",
 
-  // "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.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": "Nome",
+  // "resource - policies.form.eperson - group - list.table.headers.name": "Name",
+  "resource - policies.form.eperson - group - list.table.headers.name": "Nome",
 
-  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
-  "resource-policies.form.eperson-group-list.modal.header": "Não pode mudar de tipo",
+  // "resource - policies.form.eperson - group - list.modal.header": "Cannot change type",
+  "resource - policies.form.eperson - group - list.modal.header": "Não pode mudar de 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": "Não é possível substituir um utilizador por um grupo.",
+  // "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": "Não é possível substituir um utilizador por um 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": "Não é possível substituir um grupo por uma ePerson.",
+  // "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": "Não é possível substituir um grupo por uma ePerson.",
 
-  // "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": "Eliminar a  política actual de recursos e criar uma nova política com o tipo desejado.",
+  // "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": "Eliminar a política actual de recursos e criar uma nova política com o tipo desejado.",
 
-  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
-  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  // "resource - policies.form.eperson - group - list.modal.close": "Ok",
+  "resource - policies.form.eperson - group - list.modal.close": "Ok",
 
-  // "resource-policies.form.date.end.label": "End Date",
-  "resource-policies.form.date.end.label": "Data de fim",
+  // "resource - policies.form.date.end.label": "End Date",
+  "resource - policies.form.date.end.label": "Data de término",
 
-  // "resource-policies.form.date.start.label": "Start Date",
-  "resource-policies.form.date.start.label": "Data de início",
+  // "resource - policies.form.date.start.label": "Start Date",
+  "resource - policies.form.date.start.label": "Data de início",
 
-  // "resource-policies.form.description.label": "Description",
-  "resource-policies.form.description.label": "Descrição",
+  // "resource - policies.form.description.label": "Description",
+  "resource - policies.form.description.label": "Descrição",
 
-  // "resource-policies.form.name.label": "Name",
-  "resource-policies.form.name.label": "Nome",
+  // "resource - policies.form.name.label": "Name",
+  "resource - policies.form.name.label": "Nome",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.hint": "Max 30 characters",
+  // "resource - policies.form.name.hint": "Max 30 characters",
+  "resource - policies.form.name.hint": "Máximo 30 characters",
 
-  // "resource-policies.form.policy-type.label": "Select the policy type",
-  "resource-policies.form.policy-type.label": "Selecione o tipo de política",
+  // "resource - policies.form.policy - type.label": "Select the policy type",
+  "resource - policies.form.policy - type.label": "Selecione o tipo de política",
 
-  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  "resource-policies.form.policy-type.required": "Deve selecionar um tipo de política de recurso.",
+  // "resource - policies.form.policy - type.required": "You must select the resource policy type.",
+  "resource - policies.form.policy - type.required": "Deve selecionar um tipo de política de recurso.",
 
-  // "resource-policies.table.headers.action": "Action",
-  "resource-policies.table.headers.action": "Ação",
+  // "resource - policies.table.headers.action": "Action",
+  "resource - policies.table.headers.action": "Ação",
 
-  // "resource-policies.table.headers.date.end": "End Date",
-  "resource-policies.table.headers.date.end": "Data de término",
+  // "resource - policies.table.headers.date.end": "End Date",
+  "resource - policies.table.headers.date.end": "Data de término",
 
-  // "resource-policies.table.headers.date.start": "Start Date",
-  "resource-policies.table.headers.date.start": "Data de início",
+  // "resource - policies.table.headers.date.start": "Start Date",
+  "resource - policies.table.headers.date.start": "Data de início",
 
-  // "resource-policies.table.headers.edit": "Edit",
-  "resource-policies.table.headers.edit": "Editar",
+  // "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 grupo",
+  // "resource - policies.table.headers.edit.group": "Edit group",
+  "resource - policies.table.headers.edit.group": "Editar grupo",
 
-  // "resource-policies.table.headers.edit.policy": "Edit policy",
-  "resource-policies.table.headers.edit.policy": "Editar política",
+  // "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": "Utilizador",
+  // "resource - policies.table.headers.eperson": "EPerson",
+  "resource - policies.table.headers.eperson": "Utilizador",
 
-  // "resource-policies.table.headers.group": "Group",
-  "resource-policies.table.headers.group": "Grupo",
+  // "resource - policies.table.headers.group": "Group",
+  "resource - policies.table.headers.group": "Grupo",
 
-  // "resource-policies.table.headers.select-all": "Select all",
-  "resource-policies.table.headers.select-all": "Selecionar tudo",
+  // "resource - policies.table.headers.select - all": "Select all",
+  "resource - policies.table.headers.select - all": "Selecionar tudo",
 
-  // "resource-policies.table.headers.deselect-all": "Deselect all",
-  "resource-policies.table.headers.deselect-all": "Desmarcar tudo",
+  // "resource - policies.table.headers.deselect - all": "Deselect all",
+  "resource - policies.table.headers.deselect - all": "Desmarcar tudo",
 
-  // "resource-policies.table.headers.select": "Select",
-  "resource-policies.table.headers.select": "Selecionar",
+  // "resource - policies.table.headers.select": "Select",
+  "resource - policies.table.headers.select": "Selecionar",
 
-  // "resource-policies.table.headers.deselect": "Deselect",
-  "resource-policies.table.headers.deselect": "Desmarcar",
+  // "resource - policies.table.headers.deselect": "Deselect",
+  "resource - policies.table.headers.deselect": "Desmarcar",
 
-  // "resource-policies.table.headers.id": "ID",
-  "resource-policies.table.headers.id": "ID",
+  // "resource - policies.table.headers.id": "ID",
+  "resource - policies.table.headers.id": "ID",
 
-  // "resource-policies.table.headers.name": "Name",
-  "resource-policies.table.headers.name": "Nome",
+  // "resource - policies.table.headers.name": "Name",
+  "resource - policies.table.headers.name": "Nome",
 
-  // "resource-policies.table.headers.policyType": "type",
-  "resource-policies.table.headers.policyType": "tipo",
+  // "resource - policies.table.headers.policyType": "type",
+  "resource - policies.table.headers.policyType": "tipo",
 
-  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  "resource-policies.table.headers.title.for.bitstream": "Política de ficheiros",
+  // "resource - policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource - policies.table.headers.title.for.bitstream": "Política de ficheiros",
 
-  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  "resource-policies.table.headers.title.for.bundle": "Políticas para pacote",
+  // "resource - policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource - policies.table.headers.title.for.bundle": "Políticas para pacote",
 
-  // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  "resource-policies.table.headers.title.for.item": "Políticas para item",
+  // "resource - policies.table.headers.title.for.item": "Policies for Item",
+  "resource - policies.table.headers.title.for.item": "Políticas para item",
 
-  // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  "resource-policies.table.headers.title.for.community": "Políticas para comunidade",
+  // "resource - policies.table.headers.title.for.community": "Policies for Community",
+  "resource - policies.table.headers.title.for.community": "Políticas para comunidade",
 
-  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
+  // "resource - policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource - policies.table.headers.title.for.collection": "Políticas para coleção",
 
-  // "root.skip-to-content": "Skip to main content",
-  "root.skip-to-content": "Ir para o conteúdo principal",
+  // "root.skip - to - content": "Skip to main content",
+  "root.skip - to - content": "Ir para o conteúdo principal",
 
   // "search.description": "",
   "search.description": "",
 
-  // "search.switch-configuration.title": "Show",
-  "search.switch-configuration.title": "Mostrar",
+  // "search.switch - configuration.title": "Show",
+  "search.switch - configuration.title": "Mostrar",
 
   // "search.title": "Search",
   "search.title": "Pesquisa",
@@ -5947,12 +6499,15 @@
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Pesquisar",
 
-  // "search.search-form.placeholder": "Search the repository ...",
-  "search.search-form.placeholder": "Pesquisar no repositório...",
+  // "search.search - form.placeholder": "Search the repository...",
+  "search.search - form.placeholder": "Pesquisar no repositório...",
 
   // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
   "search.filters.remove": "Remover filtro de tipo {{ type }} com valor {{ value }}",
 
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5965,7 +6520,7 @@
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Data de depósito",
 
-  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  // "search.filters.applied.f.discoverable": "Non - discoverable",
   "search.filters.applied.f.discoverable": "Privado",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -5974,6 +6529,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tem ficheiros",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nome do ficheiro",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descrição do ficheiro",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
 
@@ -5990,10 +6551,10 @@
   "search.filters.applied.f.jobTitle": "Cargo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Fim data de nascimento",
+  "search.filters.applied.f.birthDate.max": "Data de nascimento final",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  "search.filters.applied.f.birthDate.min": "Início data de nascimento",
+  "search.filters.applied.f.birthDate.min": "Data de nascimento inicial",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
   "search.filters.applied.f.supervisedBy": "Supervisionado por",
@@ -6001,6 +6562,36 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": "not equals",
+  "search.filters.applied.operator.notequals": "não é igual",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": "not authority",
+  "search.filters.applied.operator.notauthority": "não autoridade",
+
+  // "search.filters.applied.operator.contains": "contains",
+  "search.filters.applied.operator.contains": "contém",
+
+  // "search.filters.applied.operator.notcontains": "not contains",
+  "search.filters.applied.operator.notcontains": "não comtém",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Pesquisar título",
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -6082,7 +6673,7 @@
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
   "search.filters.filter.dateSubmitted.label": "Procurar data de depósito",
 
-  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  // "search.filters.filter.discoverable.head": "Non - discoverable",
   "search.filters.filter.discoverable.head": "Privado",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -6103,6 +6694,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Tem ficheiros",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Pesquisar nome do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descrição do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descrição do ficheiro",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Pesquisar descrição do ficheiro",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo de item depositado",
 
@@ -6184,11 +6793,11 @@
   // "search.filters.filter.scope.label": "Search scope filter",
   "search.filters.filter.scope.label": "Filtro do âmbito da pesquisa",
 
-  // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Colapsar",
+  // "search.filters.filter.show - less": "Collapse",
+  "search.filters.filter.show - less": "Colapsar",
 
-  // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Expandir",
+  // "search.filters.filter.show - more": "Show more",
+  "search.filters.filter.show - more": "Expandir",
 
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Assunto",
@@ -6208,8 +6817,14 @@
   // "search.filters.filter.submitter.label": "Search submitter",
   "search.filters.filter.submitter.label": "Procurar depositante",
 
-  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
-  "search.filters.filter.show-tree": "Percorrer por hierarquia de {{ name }}",
+  // "search.filters.filter.show - tree": "Browse {{ name }} tree",
+  "search.filters.filter.show - tree": "Percorrer por hierarquia de {{ name }}",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiamento",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiamento",
 
   // "search.filters.filter.supervisedBy.head": "Supervised By",
   "search.filters.filter.supervisedBy.head": "Supervisionado por",
@@ -6229,6 +6844,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Organização",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Pessoa",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projeto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicação",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sim",
 
@@ -6247,7 +6871,7 @@
   // "search.filters.namedresourcetype.Validation": "Validation",
   "search.filters.namedresourcetype.Validation": "Em validação",
 
-  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for Controller",
+  // "search.filters.namedresourcetype.waitingforcontroller": "Waiting for reviewer",
   "search.filters.namedresourcetype.waitingforcontroller": "Aguarda validador",
 
   // "search.filters.namedresourcetype.Workflow": "Workflow",
@@ -6271,20 +6895,41 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Igual",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "Não igual",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridade",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Não autoridade",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contém",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "Não contém",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
   // "search.form.search": "Search",
   "search.form.search": "Pesquisar",
 
   // "search.form.search_dspace": "All repository",
-  "search.form.search_dspace": "Pesquisar tudo",
+  "search.form.search_dspace": "Pesquisar todo o repositório",
 
   // "search.form.scope.all": "All of DSpace",
-  "search.form.scope.all": "Pesquisar tudo",
+  "search.form.scope.all": "Pesquisar todo o repositório",
 
   // "search.results.head": "Search Results",
   "search.results.head": "Resultados da pesquisa",
 
-  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Sua pesquisa não retornou resultados. Tem dificuldade em encontrar o que procura? Tente incluir ",
+  // "search.results.no - results": "Your search returned no results.Having trouble finding what you 're looking for? Try putting",
+  "search.results.no-results": "Sua pesquisa não retornou resultados. Tem dificuldade em encontrar o que procura? Tente incluir",
 
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "os termos entre aspas",
@@ -6322,6 +6967,21 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Pesquisa avançada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Adicionar",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configurações",
 
@@ -6376,6 +7036,24 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última alteração descendente",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Apelido ascendente",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Apelido descendente",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nome ascendente",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nome descendente",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Data nascimento ascendente",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Data nascimento descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estatísticas",
 
@@ -6421,7 +7099,7 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancelar",
 
-  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  // "submission.general.cannot_submit": "You don' t have permission to make a new submission.",
   "submission.general.cannot_submit": "Não possui permissões para fazer um novo depósito.",
 
   // "submission.general.deposit": "Deposit",
@@ -6430,10 +7108,10 @@
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Cancelar",
 
-  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  // "submission.general.discard.confirm.info": "This operation can 't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Esta operação não pode ser desfeita. Tem certeza?",
 
-  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  // "submission.general.discard.confirm.submit": "Yes, I' m sure",
   "submission.general.discard.confirm.submit": "Sim, tenho certeza",
 
   // "submission.general.discard.confirm.title": "Discard submission",
@@ -6442,569 +7120,650 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Cancelar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Voltar",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Informação guardada",
 
-  // "submission.general.info.pending-changes": "Unsaved changes",
-  "submission.general.info.pending-changes": "Alterações não guardadas",
+  // "submission.general.info.pending - changes": "Unsaved changes",
+  "submission.general.info.pending - changes": "Alterações não guardadas",
 
   // "submission.general.save": "Save",
   "submission.general.save": "Guardar",
 
-  // "submission.general.save-later": "Save for later",
-  "submission.general.save-later": "Guardar e fechar",
+  // "submission.general.save - later": "Save for later",
+  "submission.general.save - later": "Guardar e fechar",
 
-  // "submission.import-external.page.title": "Import metadata from an external source",
-  "submission.import-external.page.title": "Importar metadados de uma fonte externa",
+  // "submission.import - external.page.title": "Import metadata from an external source",
+  "submission.import - external.page.title": "Importar metadados de uma fonte externa",
 
-  // "submission.import-external.title": "Import metadata from an external source",
-  "submission.import-external.title": "Importar metadados de uma fonte externa",
+  // "submission.import - external.title": "Import metadata from an external source",
+  "submission.import - external.title": "Importar metadados de uma fonte externa",
 
-  // "submission.import-external.title.Journal": "Import a journal from an external source",
-  "submission.import-external.title.Journal": "Importar revista de uma fonte externa",
+  // "submission.import - external.title.Journal": "Import a journal from an external source",
+  "submission.import - external.title.Journal": "Importar revista de uma fonte externa",
 
-  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-  "submission.import-external.title.JournalIssue": "Importar o número de um revista de um fonte externa",
+  // "submission.import - external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import - external.title.JournalIssue": "Importar o número de um revista de um fonte externa",
 
-  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
-  "submission.import-external.title.JournalVolume": "Importar o volume de uma revista de fonte externa",
+  // "submission.import - external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import - external.title.JournalVolume": "Importar o volume de uma revista de fonte externa",
 
-  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
-  "submission.import-external.title.OrgUnit": "Importar editora de uma fonte externa",
+  // "submission.import - external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import - external.title.OrgUnit": "Importar editora de uma fonte externa",
 
-  // "submission.import-external.title.Person": "Import a person from an external source",
-  "submission.import-external.title.Person": "Importar pessoa de uma fonte externa",
+  // "submission.import - external.title.Person": "Import a person from an external source",
+  "submission.import - external.title.Person": "Importar pessoa de uma fonte externa",
 
-  // "submission.import-external.title.Project": "Import a project from an external source",
-  "submission.import-external.title.Project": "Importar projeto de uma fonte externa",
+  // "submission.import - external.title.Project": "Import a project from an external source",
+  "submission.import - external.title.Project": "Importar projeto de uma fonte externa",
 
-  // "submission.import-external.title.Publication": "Import a publication from an external source",
-  "submission.import-external.title.Publication": "Importar uma publicação de uma fonte externa",
+  // "submission.import - external.title.Publication": "Import a publication from an external source",
+  "submission.import - external.title.Publication": "Importar uma publicação de uma fonte externa",
 
-  // "submission.import-external.title.none": "Import metadata from an external source",
-  "submission.import-external.title.none": "Importar metadados de uma fonte externa",
+  // "submission.import - external.title.none": "Import metadata from an external source",
+  "submission.import - external.title.none": "Importar metadados de uma fonte 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": "Pesquise itens abaixo disponíveis na internet para que sejam importados para o repositório.",
+  // "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": "Pesquise itens abaixo disponíveis na internet para que sejam importados para o repositório.",
 
-  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  "submission.import-external.back-to-my-dspace": "Voltar à Minha Área",
+  // "submission.import - external.back - to - my - dspace": "Back to MyDSpace",
+  "submission.import - external.back - to - my - dspace": "Voltar à 'Minha área pessoal'",
 
-  // "submission.import-external.search.placeholder": "Search the external source",
-  "submission.import-external.search.placeholder": "Pesquisar em fonte externa",
+  // "submission.import - external.search.placeholder": "Search the external source",
+  "submission.import - external.search.placeholder": "Pesquisar em fonte externa",
 
-  // "submission.import-external.search.button": "Search",
-  "submission.import-external.search.button": "Pesquisar",
+  // "submission.import - external.search.button": "Search",
+  "submission.import - external.search.button": "Pesquisar",
 
-  // "submission.import-external.search.button.hint": "Write some words to search",
-  "submission.import-external.search.button.hint": "Escreva algumas palavras para pesquisar",
+  // "submission.import - external.search.button.hint": "Write some words to search",
+  "submission.import - external.search.button.hint": "Escreva algumas palavras para pesquisar",
 
-  // "submission.import-external.search.source.hint": "Pick an external source",
-  "submission.import-external.search.source.hint": "Selecione uma fonte externa",
+  // "submission.import - external.search.source.hint": "Pick an external source",
+  "submission.import - external.search.source.hint": "Selecione uma fonte externa",
 
-  // "submission.import-external.source.arxiv": "arXiv",
-  "submission.import-external.source.arxiv": "arXiv",
+  // "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.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.cinii": "CiNii",
+  "submission.import - external.source.cinii": "CiNii",
 
-  // "submission.import-external.source.crossref": "Crossref",
-  "submission.import-external.source.crossref": "Crossref",
+  // "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.datacite": "DataCite",
+  "submission.import - external.source.datacite": "DataCite",
 
-  // "submission.import-external.source.scielo": "SciELO",
-  "submission.import-external.source.scielo": "SciELO",
+  // "submission.import - external.source.doi": "DOI",
+  "submission.import - external.source.doi": "DOI",
 
-  // "submission.import-external.source.scopus": "Scopus",
-  "submission.import-external.source.scopus": "Scopus",
+  // "submission.import - external.source.scielo": "SciELO",
+  "submission.import - external.source.scielo": "SciELO",
 
-  // "submission.import-external.source.vufind": "VuFind",
-  "submission.import-external.source.vufind": "VuFind",
+  // "submission.import - external.source.scopus": "Scopus",
+  "submission.import - external.source.scopus": "Scopus",
 
-  // "submission.import-external.source.wos": "Web of Science",
-  "submission.import-external.source.wos": "Web of Science",
+  // "submission.import - external.source.vufind": "VuFind",
+  "submission.import - external.source.vufind": "VuFind",
 
-  // "submission.import-external.source.orcidWorks": "ORCID",
-  "submission.import-external.source.orcidWorks": "ORCID",
+  // "submission.import - external.source.wos": "Web of Science",
+  "submission.import - external.source.wos": "Web of Science",
 
-  // "submission.import-external.source.epo": "European Patent Office (EPO)",
-  "submission.import-external.source.epo": "European Patent Office (EPO)",
+  // "submission.import - external.source.orcidWorks": "ORCID",
+  "submission.import - external.source.orcidWorks": "ORCID",
 
-  // "submission.import-external.source.loading": "Loading ...",
-  "submission.import-external.source.loading": "A carregar ...",
+  // "submission.import - external.source.epo": "European Patent Office(EPO)",
+  "submission.import - external.source.epo": "European Patent Office(EPO)",
 
-  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "Revistas Sherpa Romeo por nome",
+  // "submission.import - external.source.loading": "Loading...",
+  "submission.import - external.source.loading": "A carregar...",
 
-  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
-  "submission.import-external.source.sherpaJournalIssn": "Revistas Sherpa Romeo por ISSN",
+  // "submission.import - external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import - external.source.sherpaJournal": "Revistas SHERPA",
 
-  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  "submission.import-external.source.sherpaPublisher": "Editoras Sherpa Romeo",
+  // "submission.import - external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import - external.source.sherpaJournalIssn": "Revistas SHERPA por ISSN",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "Financiamento via API OpenAIRE",
+  // "submission.import - external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import - external.source.sherpaPublisher": "Editoras SHERPA",
 
-  // "submission.import-external.source.orcid": "ORCID",
-  "submission.import-external.source.orcid": "ORCID",
+  // "submission.import - external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import - external.source.openaire": "OpenAIRE pesquisar por autores",
 
-  // "submission.import-external.source.pubmed": "PubMed",
-  "submission.import-external.source.pubmed": "PubMed",
+  // "submission.import - external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import - external.source.openaireTitle": "OpenAIRE pesquisar por título",
 
-  // "submission.import-external.source.pubmedeu": "PubMed Europe",
-  "submission.import-external.source.pubmedeu": "PubMed Europa",
+  // "submission.import - external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import - external.source.openaireFunding": "OpenAIRE pesquisar por financiador",
 
-  // "submission.import-external.source.lcname": "Library of Congress Names",
-  "submission.import-external.source.lcname": "Nomes da Library of Congress",
+  // "submission.import - external.source.orcid": "ORCID",
+  "submission.import - external.source.orcid": "ORCID",
 
-  // "submission.import-external.preview.title": "Item Preview",
-  "submission.import-external.preview.title": "Pré-visualização do item",
+  // "submission.import - external.source.pubmed": "PubMed",
+  "submission.import - external.source.pubmed": "PubMed",
 
-  // "submission.import-external.preview.title.Publication": "Publication Preview",
-  "submission.import-external.preview.title.Publication": "Pré-visualização da publicação",
+  // "submission.import - external.source.pubmedeu": "PubMed Europe",
+  "submission.import - external.source.pubmedeu": "PubMed Europa",
 
-  // "submission.import-external.preview.title.none": "Item Preview",
-  "submission.import-external.preview.title.none": "Pré-visualização do item",
+  // "submission.import - external.source.lcname": "Library of Congress Names",
+  "submission.import - external.source.lcname": "Nomes da Library of Congress",
 
-  // "submission.import-external.preview.title.Journal": "Journal Preview",
-  "submission.import-external.preview.title.Journal": "Pré-visualização da revista",
+  // "submission.import - external.source.ror": "Research Organization Registry(ROR)",
+  "submission.import - external.source.ror": "Research Organization Registry(ROR)",
 
-  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  "submission.import-external.preview.title.OrgUnit": "Pré-visualização da organização",
+  // "submission.import - external.preview.title": "Item Preview",
+  "submission.import - external.preview.title": "Pré-visualização do item",
 
-  // "submission.import-external.preview.title.Person": "Person Preview",
-  "submission.import-external.preview.title.Person": "Pré-visualização dos dados pessoais a importar",
+  // "submission.import - external.preview.title.Publication": "Publication Preview",
+  "submission.import - external.preview.title.Publication": "Pré-visualização da publicação",
 
-  // "submission.import-external.preview.title.Project": "Project Preview",
-  "submission.import-external.preview.title.Project": "Pré-visualização do dados do projeto a importar",
+  // "submission.import - external.preview.title.none": "Item Preview",
+  "submission.import - external.preview.title.none": "Pré-visualização do item",
 
-  // "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": "Os seguintes metadados foram importados de uma fonte externa. Serão  pré-preenchidos quando iniciar o depósito.",
+  // "submission.import - external.preview.title.Journal": "Journal Preview",
+  "submission.import - external.preview.title.Journal": "Pré-visualização da revista",
 
-  // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Iniciar depósito",
+  // "submission.import - external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import - external.preview.title.OrgUnit": "Pré-visualização da organização",
 
-  // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Erro no depósito",
+  // "submission.import - external.preview.title.Person": "Person Preview",
+  "submission.import - external.preview.title.Person": "Pré-visualização dos dados pessoais a importar",
 
-  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  "submission.import-external.preview.error.import.body": "Ocorreu um erro durante o processo de importação de metadados de uma fonte externa.",
+  // "submission.import - external.preview.title.Project": "Project Preview",
+  "submission.import - external.preview.title.Project": "Pré-visualização do dados do projeto a importar",
 
-  // "submission.sections.describe.relationship-lookup.close": "Close",
-  "submission.sections.describe.relationship-lookup.close": "Fechar",
+  // "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": "Os seguintes metadados foram importados de uma fonte externa.Serão pré-preenchidos quando iniciar o depósito.",
 
-  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.added": "Adicionada com sucesso uma entrada local à seleção",
+  // "submission.import - external.preview.button.import": "Start submission",
+  "submission.import - external.preview.button.import": "Iniciar depósito",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importar autor remoto",
+  // "submission.import - external.preview.error.import.title": "Submission error",
+  "submission.import - external.preview.error.import.title": "Erro no depósito",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar revista remota",
+  // "submission.import - external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import - external.preview.error.import.body": "Ocorreu um erro durante o processo de importação de metadados de uma fonte externa.",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar número de revista remoto",
+  // "submission.sections.describe.relationship - lookup.close": "Close",
+  "submission.sections.describe.relationship - lookup.close": "Fechar",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volume de revista remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.added": "Adicionada com sucesso uma entrada local à seleção",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.isAuthorOfPublication": "Import remote author",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.isAuthorOfPublication": "Importar autor remoto",
 
-  // "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": "Importar item remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal": "Import remote journal",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal": "Importar revista remota",
 
-  // "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": "Importar evento remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Issue": "Import remote journal issue",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Issue": "Importar número de revista remoto",
 
-  // "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": "Importar produto remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Volume": "Import remote journal volume",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.Journal Volume": "Importar volume de revista remoto",
 
-  // "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": "Importar equipamento remoto",
+  // "submission.sections.describe.relationship - lookup.external - source.import - button - title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship - lookup.external - source.import - button - title.isProjectOfPublication": "Projeto",
 
-  // "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": "Importar organização remota",
+  // "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": "Importar item remoto",
 
-  // "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": "Importar financiamento remoto",
+  // "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": "Importar evento remoto",
 
-  // "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": "Import remote person",
+  // "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": "Importar produto remoto",
 
-  // "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": "Import remote patent",
+  // "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": "Importar equipamento remoto",
 
-  // "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": "Importar projeto remoto",
+  // "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": "Importar organização remota",
 
-  // "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": "Importar publicação remota",
+  // "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": "Importar financiamento remoto",
 
-  // "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 entidade adicionada!",
+  // "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": "Import remote person",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projeto",
+  // "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": "Import remote patent",
 
-  // "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": "Financiamento API OpenAIRE",
+  // "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": "Importar projeto remoto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar autor remoto",
+  // "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": "Importar publicação remota",
 
-  // "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": "Adicionado com sucesso um autor local à seleção",
+  // "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 entidade adicionada!",
 
-  // "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": "Importado com sucesso e adicionado autor à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isProjectOfPublication.title": "Projeto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridade",
+  // "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": "Financiamento API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como nova autoridade local",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.title": "Import Remote Author",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.title": "Importar autor remoto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.added.local - entity": "Successfully added local author to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isAuthorOfPublication.added.local - entity": "Adicionado com sucesso um autor local à seleção",
 
-  // "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": "Selecione a coleção para onde pretende importar as novas entradas",
+  // "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": "Importado com sucesso e adicionado autor à seleção",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.authority": "Authority",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.authority": "Autoridade",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como nova entidade local",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.authority.new": "Import as a new local authority entry",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.authority.new": "Importar como nova autoridade 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": "A importar de LC Name",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.cancel": "Cancel",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.cancel": "Cancelar",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "A importar do ORCID",
+  // "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": "Selecione a coleção para onde pretende importar as novas entradas",
 
-  // "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": "A importar revista do Sherpa",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.entities": "Entities",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.entities": "Entidades",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "A importar editora do Sherpa",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.entities.new": "Import as a new local entity",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.entities.new": "Importar como nova entidade local",
 
-  // "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": "A importar da PubMed",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.lcname": "Importing from LC Name",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.lcname": "Importar de LC Name",
 
-  // "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": "A importar do arXiv",
+  // "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": "Importar do ORCID",
 
-  // "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.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaire": "Importar do OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar revista remota",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireTitle": "Importar do OpenAIRE",
 
-  // "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 adicionada com sucesso à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.openaireFunding": "Importar do OpenAIRE",
 
-  // "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": "Importada e adicionada com sucesso uma revista externa à seleção",
+  // "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": "A importar revista do Sherpa",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar número de revista remota",
+  // "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": "A importar editora do Sherpa",
 
-  // "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": "Número de revista local adicionado com sucesso à seleção",
+  // "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": "A importar da PubMed",
 
-  // "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": "Importado e adicionado um número de revista externa com sucesso à seleção",
+  // "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": "A importar do arXiv",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar volume de revista remota",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.head.ror": "Importar do ROR",
 
-  // "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": "Volume de revista local adicionado com sucesso à seleção",
+  // "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 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": "Importado e adicionado um volume de revista externa com sucesso à seleção",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal.title": "Import Remote Journal",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal.title": "Importar revista remota",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Selecione uma correspondência local:",
+  // "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 adicionada com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselecionar todos",
+  // "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": "Importada e adicionada com sucesso uma revista externa à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselecionar página",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Issue.title": "Import Remote Journal Issue",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Issue.title": "Importar número de revista remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "A carregar...",
+  // "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": "Número de revista local adicionado com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Termos da pesquisa",
+  // "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": "Importado e adicionado um número de revista externa com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Pesquisar",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Volume.title": "Import Remote Journal Volume",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.Journal Volume.title": "Importar volume de revista remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pesquisar...",
+  // "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": "Volume de revista local adicionado com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Selecionar todos",
+  // "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": "Importado e adicionado um volume de revista externa com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Selecionar página",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.select": "Select a local match:",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.select": "Selecione uma correspondência local:",
 
-  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  "submission.sections.describe.relationship-lookup.selected": "Selecionados {{ size }} itens",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.title": "Importar organização remota",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.local - entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.local - entity": "Organização local adicionada com êxito à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.new - entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship - lookup.external - source.import - modal.isOrgUnitOfProject.added.new - entity": "Organização externa importada e adicionada com sucesso à seleção",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.deselect - all": "Deselect all",
+  "submission.sections.describe.relationship - lookup.search - tab.deselect - all": "Deselecionar todos",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicações locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.deselect - page": "Deselect page",
+  "submission.sections.describe.relationship - lookup.search - tab.deselect - page": "Deselecionar página",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.loading": "Loading...",
+  "submission.sections.describe.relationship - lookup.search - tab.loading": "A carregar...",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizacionais locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.placeholder": "Search query",
+  "submission.sections.describe.relationship - lookup.search - tab.placeholder": "Termos da pesquisa",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacotes de dados locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.search": "Go",
+  "submission.sections.describe.relationship - lookup.search - tab.search": "Pesquisar",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Ficheiros de dados locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.search - form.placeholder": "Search...",
+  "submission.sections.describe.relationship - lookup.search - tab.search - form.placeholder": "Pesquisar...",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.select - all": "Select all",
+  "submission.sections.describe.relationship - lookup.search - tab.select - all": "Selecionar todos",
 
-  // "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 revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.select - page": "Select page",
+  "submission.sections.describe.relationship - lookup.search - tab.select - page": "Selecionar página",
 
-  // "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 locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship - lookup.selected": "Selecionados {{ size }} itens",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de revistas locais ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isAuthorOfPublication": "Local Authors  ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isAuthorOfPublication": "Autores locais  ({{ 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": "Volumes de revistas locais ({{ 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 locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistas do Sherpa ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Project": "Projetos locais  ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editoras do Sherpa ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Publication": "Publicações locais ({{ 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.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Person": "Autores locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nomes LC ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.OrgUnit": "Unidades organizacionais locais ({{ 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.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.DataPackage": "Pacotes de dados locais ({{ 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.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.DataFile": "Ficheiros de dados locais ({{ 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": "Pesquisar por agências de financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.Journal": "Revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Pesquisar por financiamento",
+  // "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 revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Pesquisar por unidades organizacionais",
+  // "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 locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Via API OpenAIRE",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isJournalVolumeOfPublication": "Volumes de revistas locais ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projetos",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.JournalVolume": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.JournalVolume": "Volumes de revistas locais ({{ count }})",
 
-  // "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 do projeto",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournal": "Revistas do Sherpa ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicação do author",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaPublisher": "Editoras do Sherpa ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento API OpenAIRE",
+  // "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.selection-tab.title.isProjectOfPublication": "Project",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.lcname": "LC Names ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.lcname": "Nomes LC ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projetos",
+  // "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.title.isFundingAgencyOfProject": "Funder of the Project",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
+  // "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.selection-tab.search-form.placeholder": "Search...",
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pesquisar...",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.ror": "ROR ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Seleção atual ({{ count }})",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.orcidWorks": "ORCID ({{ 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.search - tab.tab - title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.crossref": "Crossref ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Pesquisar números de revista",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.scopus": "Scopus ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaire": "OpenAIRE pesquisa por autores ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireTitle": "OpenAIRE pesquisa por títulos ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openaireFunding": "OpenAIRE pesquisa por financiador ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.sherpaJournalIssn": "Revistas Sherpa por ISSN ({{ count }  })",
 
-  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agência de financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Search for Funding Agencies",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Pesquisar por agências de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  "submission.sections.describe.relationship-lookup.title.Project": "Pesquisar projetos",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isFundingAgencyOfPublication": "Pesquisar por financiamento",
 
-  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  "submission.sections.describe.relationship-lookup.title.Publication": "Publicações",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isChildOrgUnitOf": "Pesquisar por unidades organizacionais",
 
-  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  "submission.sections.describe.relationship-lookup.title.Person": "Pesquisar autores",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.openAIREFunding": "Via API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Pesquisar unidades organizacionais",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isProjectOfPublication": "Projetos",
 
-  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacote de dados",
+  // "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 do projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Ficheiros de dados",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isPublicationOfAuthor": "Publicação do author",
 
-  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agência de financiamento",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openAIREFunding": "Financiamento API OpenAIRE",
 
-  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financiamento",
+  // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit do projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Organização principal",
+   // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
+   "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
 
-  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
-  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicação",
+   // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
+   "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menu dropdown",
+   // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+   "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Configurações",
+  // "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Search...",
+  "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Pesquisar...",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Não selecionou nenhum item.",
+  // "submission.sections.describe.relationship - lookup.selection - tab.tab - title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship - lookup.selection - tab.tab - title": "Seleção atual ({{ count }})",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores selecionados",
+  // "submission.sections.describe.relationship - lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship - lookup.title.Journal": "Revista",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas selecionadas",
+  // "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.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume de revistas selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship - lookup.title.JournalIssue": "Pesquisar números de revista",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship - lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicações selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship - lookup.title.JournalVolume": "Volumes de revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship - lookup.title.isJournalOfPublication": "Revistas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizacionais selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship - lookup.title.isAuthorOfPublication": "Autores",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pacotes de dados selecionados",
+  // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfPublication": "Agência de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Ficheiros de dados selecionados",
+  // "submission.sections.describe.relationship - lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship - lookup.title.Project": "Pesquisar projetos",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas selecionadas",
+  // "submission.sections.describe.relationship - lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship - lookup.title.Publication": "Publicações",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número selecionado",
+  // "submission.sections.describe.relationship - lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship - lookup.title.Person": "Pesquisar autores",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de revista selecionado",
+  // "submission.sections.describe.relationship - lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship - lookup.title.OrgUnit": "Pesquisar unidades organizacionais",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agência de financiamento selecionada",
+  // "submission.sections.describe.relationship - lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship - lookup.title.DataPackage": "Pacote de dados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamento selecionado",
+  // "submission.sections.describe.relationship - lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship - lookup.title.DataFile": "Ficheiros de dados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número selecionado",
+  // "submission.sections.describe.relationship - lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship - lookup.title.Funding Agency": "Agência de financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Organização selecionada",
+  // "submission.sections.describe.relationship - lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship - lookup.title.isFundingOfPublication": "Financiamento",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship - lookup.title.isChildOrgUnitOf": "Organização principal",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship - lookup.title.isPublicationOfAuthor": "Publicação",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship - lookup.title.isOrgUnitOfProject": "OrgUnit",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.search - tab.toggle - dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship - lookup.search - tab.toggle - dropdown": "Alternar menu dropdown",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.settings": "Settings",
+  "submission.sections.describe.relationship - lookup.selection - tab.settings": "Configurações",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.no - selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship - lookup.selection - tab.no - selection": "Não selecionou nenhum item.",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isAuthorOfPublication": "Autores selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalOfPublication": "Revistas selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalVolumeOfPublication": "Volume de revistas selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Project": "Projetos selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Publication": "Publicações selecionadas",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Person": "Autores selecionados",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados da pesquisa",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.OrgUnit": "Unidades organizacionais selecionadas",
 
-  // "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": "Pretende guardar \"{{ value }}\" como um nome alternativo para esta pessoa permitindo a sua reutilização por si e outros em futuros depósitos? Se não, pode usar apenas neste depósito.",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.DataPackage": "Pacotes de dados selecionados",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.DataFile": "Ficheiros de dados selecionados",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.Journal": "Revistas selecionadas",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isJournalIssueOfPublication": "Número selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.JournalVolume": "Volume de revista selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingAgencyOfPublication": "Agência de financiamento selecionada",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isFundingOfPublication": "Financiamento selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.JournalIssue": "Número selecionado",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isChildOrgUnitOf": "Organização selecionada",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaJournal": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.sherpaPublisher": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.orcid": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.orcidv2": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaire": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaireTitle": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.openaireFundin": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.lcname": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.pubmed": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.arxiv": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.crossref": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.epo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.scopus": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.scielo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.wos": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.ror": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship - lookup.selection - tab.title": "Search Results",
+  "submission.sections.describe.relationship - lookup.selection - tab.title": "Resultados da pesquisa",
+
+  // "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": "Pretende guardar \"{{ value }}\"como um nome alternativo para esta pessoa permitindo a sua reutilização por si e outros em futuros depósitos? Se não, pode usar apenas neste depósito.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar um Nome alternativo",
@@ -7063,6 +7822,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Não foi encontrada nenhuma coleção",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "Não foram encontrados tipos de entidades",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Sem opções disponíveis",
 
@@ -7087,14 +7849,14 @@
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
   "submission.sections.identifiers.no_doi": "Não foram gerados DOIs para este item.",
 
-  // "submission.sections.identifiers.handle_label": "Handle: ",
-  "submission.sections.identifiers.handle_label": "Handle: ",
+  // "submission.sections.identifiers.handle_label": "Handle:",
+  "submission.sections.identifiers.handle_label": "Handle:",
 
-  // "submission.sections.identifiers.doi_label": "DOI: ",
-  "submission.sections.identifiers.doi_label": "DOI: ",
+  // "submission.sections.identifiers.doi_label": "DOI:",
+  "submission.sections.identifiers.doi_label": "DOI:",
 
-  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
-  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores: ",
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers:",
+  "submission.sections.identifiers.otherIdentifiers_label": "Outros identificadores:",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condições de acesso do item",
@@ -7114,8 +7876,8 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Descrever",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Potenciais duplicados",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Potenciais duplicados",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "Identificadores",
@@ -7160,10 +7922,10 @@
   "submission.sections.status.info.aria": "Informação adicional",
 
   // "submission.sections.toggle.open": "Open section",
-  "submission.sections.toggle.open": "Seção aberta",
+  "submission.sections.toggle.open": "Abrir secção",
 
   // "submission.sections.toggle.close": "Close section",
-  "submission.sections.toggle.close": "Seção fechada",
+  "submission.sections.toggle.close": "Fechar secção",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
   "submission.sections.toggle.aria.open": "Expandir seção {{sectionHeader}}",
@@ -7171,6 +7933,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Fechar seção {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Tornar {{fileName}} o ficheiro principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Remover {{fileName}} como ficheiro principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
@@ -7265,13 +8033,13 @@
   "submission.sections.accesses.form.discoverable-description": "Quando selecionado, este item será pesquisável na pesquisa/navegação. Se não estiver selecionado, o item apenas estará disponível através uma ligação direta (link) e não aparecerá na pesquisa/navegação.",
 
   // "submission.sections.accesses.form.discoverable-label": "Discoverable",
-  "submission.sections.accesses.form.discoverable-label": "Recuperável",
+  "submission.sections.accesses.form.discoverable-label": "Público",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
   "submission.sections.accesses.form.access-condition-label": "Tipo de  acesso",
 
   // "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": "Selecione um tipo de acesso para aplicar ao item no momento do seu depósito ",
+  "submission.sections.accesses.form.access-condition-hint": "Selecione um tipo de acesso para aplicar ao item no momento do seu depósito",
 
   // "submission.sections.accesses.form.date-required": "Date is required.",
   "submission.sections.accesses.form.date-required": "O preenchimento da data é obrigatório.",
@@ -7306,6 +8074,18 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Até",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "Não foram detectados duplicados.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Foram detectadas potenciais duplicações. Por favor, reveja a lista em baixo.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Este item está na área de trabalho",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Este item está no fluxo de trabalho",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo a licença",
 
@@ -7448,7 +8228,7 @@
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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": "Informe em seguida o motivo da rejeição do depósito, indicando se o depositante pode corrigir algum problema e reenviar o depósito.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Por favor, informe o motivo da rejeição do depósito, indicando se o depositante pode corrigir algum problema e reenviar o depósito.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descreva o motivo da rejeição",
@@ -7472,7 +8252,7 @@
   "submission.workflow.tasks.claimed.return_help": "Libertar esta tarefa para que outra pessoa a possa executar.",
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  "submission.workflow.tasks.generic.error": "ocorreu um erro durante a operação...",
+  "submission.workflow.tasks.generic.error": "Ocorreu um erro durante a operação...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "A processar...",
@@ -7495,14 +8275,17 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalhes",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "Foram detectados potenciais duplicados para este item. Assuma e edite este item para ver os detalhes.",
+
   // "submission.workspace.generic.view": "View",
-  "submission.workspace.generic.view": "Ver",
+  "submission.workspace.generic.view": "Visualizar",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  "submission.workspace.generic.view-help": "Selecione esta opção para ver os metadados do item.",
+  "submission.workspace.generic.view-help": "Selecione esta opção para visualizar os metadados do item.",
 
   // "submitter.empty": "N/A",
-  "submitter.empty": "N/E",
+  "submitter.empty": "N/D",
 
   // "subscriptions.title": "Subscriptions",
   "subscriptions.title": "Subscrições de alertas",
@@ -7543,7 +8326,7 @@
   // "subscriptions.modal.close": "Close",
   "subscriptions.modal.close": "Fechar",
 
-  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\"page under your user profile",
   "subscriptions.modal.delete-info": "Para remover esta subscrição, por favor aceda à página de 'subscrições' debaixo do seu perfil de utilizador",
 
   // "subscriptions.modal.new-subscription-form.type.content": "Content",
@@ -7565,13 +8348,13 @@
   "subscriptions.modal.new-subscription-form.processing": "A processar...",
 
   // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
-  "subscriptions.modal.create.success": "Subscrição para '{{ type }}' realizada com sucessso.",
+  "subscriptions.modal.create.success": "Subscrição para {{ type }} realizada com sucessso.",
 
   // "subscriptions.modal.delete.success": "Subscription deleted successfully",
   "subscriptions.modal.delete.success": "Subscrição removida com sucesso",
 
   // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
-  "subscriptions.modal.update.success": "Subscrição para '{{ type }}' atualizada com suceso",
+  "subscriptions.modal.update.success": "Subscrição para {{ type }} atualizada com suceso",
 
   // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
   "subscriptions.modal.create.error": "Ocorre um erro durante a criação da subscrição",
@@ -7646,7 +8429,7 @@
   "vocabulary-treeview.search.form.reset": "Redefinir",
 
   // "vocabulary-treeview.search.form.search": "Search",
-  "vocabulary-treeview.search.form.search": "pesquisar",
+  "vocabulary-treeview.search.form.search": "Pesquisar",
 
   // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
   "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados inserindo as primeiras letras",
@@ -7672,8 +8455,8 @@
   // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "Apagar",
 
-  // "uploader.or": ", or ",
-  "uploader.or": " ou",
+  // "uploader.or": ", or",
+  "uploader.or": "ou",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   "uploader.processing": "A processar o(s) ficheiro(s) carregado(s)... (agora é seguro fechar esta página)",
@@ -7705,6 +8488,9 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Depósitos e tarefas em áreas de trabalho",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados da pesquisa de unidades organizacionais",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar item em fluxo de trabalho",
 
@@ -7880,7 +8666,7 @@
   "researcher.profile.expose": "Expor",
 
   // "researcher.profile.hide": "Hide",
-  "researcher.profile.hide": "Esconder",
+  "researcher.profile.hide": "Ocultar",
 
   // "researcher.profile.not.associated": "Researcher profile not yet associated",
   "researcher.profile.not.associated": "Perfil do investigador ainda não associado",
@@ -7930,8 +8716,8 @@
   // "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": "Ocorreu algum problema ao ligar o perfil ao ORCID. Se o problema persistir, contacte o 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": "O ORCID iD deste perfil ({{{ orcid }}) ainda não foi ligado a uma conta no registo do ORCID ou a ligação está expirada.",
+  // "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": "O ORCID iD deste perfil  ({{{ orcid }}) ainda não foi ligado a uma conta no registo do ORCID ou a ligação está expirada.",
 
   // "person.page.orcid.unlink": "Disconnect from ORCID",
   "person.page.orcid.unlink": "Desligar do ORCID",
@@ -8042,7 +8828,7 @@
   "person.page.orcid.sync-queue.description.qualification": "Qualificações",
 
   // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
-  "person.page.orcid.sync-queue.description.researcher_urls": "URLS dos investigadores",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs do investigador",
 
   // "person.page.orcid.sync-queue.description.keywords": "Keywords",
   "person.page.orcid.sync-queue.description.keywords": "Palavras-chave",
@@ -8051,7 +8837,7 @@
   "person.page.orcid.sync-queue.tooltip.insert": "Acrescentar uma nova entrada no registo ORCID",
 
   // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
-  "person.page.orcid.sync-queue.tooltip.update": "Actualizar esta entrada no registo do ORCID",
+  "person.page.orcid.sync-queue.tooltip.update": "Atualizar esta entrada no registo do ORCID",
 
   // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
   "person.page.orcid.sync-queue.tooltip.delete": "Remover esta entrada do registo do ORCID",
@@ -8069,7 +8855,7 @@
   "person.page.orcid.sync-queue.tooltip.education": "Educação",
 
   // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
-  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificação",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificações",
 
   // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
   "person.page.orcid.sync-queue.tooltip.other_names": "Outro nome",
@@ -8258,10 +9044,10 @@
   "system-wide-alert.form.save": "Guardar",
 
   // "system-wide-alert.form.label.active": "ACTIVE",
-  "system-wide-alert.form.label.active": "ACTIVO",
+  "system-wide-alert.form.label.active": "ATIVO",
 
   // "system-wide-alert.form.label.inactive": "INACTIVE",
-  "system-wide-alert.form.label.inactive": "INACTIVO",
+  "system-wide-alert.form.label.inactive": "INATIVO",
 
   // "system-wide-alert.form.error.message": "The system wide alert must have a message",
   "system-wide-alert.form.error.message": "O alerta geral do sistema deve conter uma mensagem",
@@ -8299,6 +9085,9 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas gerais do sistema",
 
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descobrir",
+
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
   "item-access-control-title": "Este formulário permite-lhe efetuar alterações às condições de acesso dos metadados do item ou dos seus ficheiros.",
 
@@ -8395,13 +9184,1140 @@
   // "vocabulary-treeview.search.form.add": "Add",
   "vocabulary-treeview.search.form.add": "Adicionar",
 
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reivindicação de publicação",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reivindicação de publicação",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocolo COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\"rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aqui, suportamos totalmente o protocolo COAR Notify, que foi concebido para melhorar a comunicação entre repositórios. Para saber mais sobre o protocolo COAR Notify, visite a página <a href=\"https://notify.coar-repositories.org/\"rel=\"noopener noreferrer\">COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Caixa de entrada LDN",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Para sua conveniência, a nossa caixa de entrada LDN (Linked Data Notifications) está facilmente acessível em {{ ldnInboxUrl }}. A caixa de entrada LDN permite uma comunicação e troca de dados fluída, assegurando uma colaboração eficiente e eficaz.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderação de mensagens",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Para garantir um ambiente seguro e produtivo, todas as mensagens LDN recebidas são moderadas. Se pretende trocar informações connosco, contacte-nos através do nosso",
+
+  // "coar-notify-support.message-moderation.feedback-form": "Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": "Formulário de comentários.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Exluir serviço",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Serviços registados",
+
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nome",
+
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descrição",
+
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estado",
+
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Ação",
+
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOVO",
+
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Serviços registados",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Ativo",
+
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Inativo",
+
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Clique para ativar",
+
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Clique para inativar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar serviço",
+
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Criar serviço",
+
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Criar serviço",
+
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Por favor confirme a criação deste serviço.",
+
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estado",
+
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Criar",
+
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancelar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registar um novo serviço",
+
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nome",
+
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descrição",
+
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL do serviço",
+
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Gama de IP do serviço",
+
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nível de confiança",
+
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL da caixa de entrada LDN",
+
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Por favor, forneça o nome do serviço",
+
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Por favor, forneça uma descrição do seu serviço",
+
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Por favor, introduza o URL para que os utilizadores possam obter mais informações sobre o serviço",
+
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Limite inferior do intervalo IPv4",
+
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Limite superior do intervalo IPv4",
+
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Por favor, especifique o URL da caixa de entrada LDN",
+
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Por favor, introduza um valor entre 0 e 1. Utilize o “.” como separador decimal",
+
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Selecione um padrão",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconhecer e aceitar",
+
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Este padrão é utilizado para reconhecer e aceitar um pedido (oferta). Implica uma intenção de atuar sobre o pedido.",
+
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconhecer e rejeitar",
+
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Este padrão é utilizado para reconhecer e rejeitar um pedido (oferta). Significa que não há mais nenhuma ação relativamente ao pedido.",
+
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconhecer e aceitar provisoriamente",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Este padrão é utilizado para reconhecer e aceitar provisoriamente um pedido (oferta). Implica uma intenção de atuar, que pode mudar.",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconhecer e rejeitar provisoriamente",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Este padrão é utilizado para reconhecer e rejeitar provisoriamente um pedido (oferta). Significa que não há mais nenhuma ação, sujeita a alterações.",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconhecimentos",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar o avaliação",
+
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Este padrão é utilizado para anunciar a existência de uma avaliação, referenciando o recurso avaliado.",
+
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar a integração",
+
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Este padrão é utilizado para anunciar que um recurso foi integrado.",
+
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar relacionamento",
+
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Este padrão é utilizado para anunciar um relacionamento entre dois recursos.",
+
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar revisão",
+
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Este padrão é utilizado para anunciar a existência de uma revisão, referenciando o recurso revisto.",
+
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anúncios",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar o resultado do serviço",
+
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Este padrão é utilizado para anunciar a existência de um 'resultado de serviço', referenciando o recurso relevante.",
+
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anúncios",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Solicitar avaliação",
+
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Este padrão é utilizado para solicitar o endosso de um recurso pertencente ao sistema de origem.",
+
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Solicitações",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Solicitar integração",
+
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Este padrão é utilizado para solicitar que o sistema de destino integre um recurso.",
+
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Solicitações",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Solicitar revisão",
+
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Este padrão é utilizado para solicitar uma revisão de um recurso pertencente ao sistema de origem.",
+
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Solicitações",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Anular oferta",
+
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Este padrão é utilizado para anular (retirar) uma oferta feita anteriormente.",
+
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Anular",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "Nenhum filtro de item selecionado",
+
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtro de item",
+
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automático",
+
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "O nome é obrigatório",
+
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "O URL é obrigatório",
+
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Por favor, introduza uma gama de IPs válida",
+
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Introduza um IpV4 válido em ambos os limites do intervalo (nota: para um IP único, introduza o mesmo valor em ambos os campos)",
+
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "O URL do LDN é obrigatório",
+
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Pelo menos um padrão é obrigatório",
+
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Introduza uma pontuação válida (entre 0 e 1). Utilize o “.” como separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Padrão suportado",
+
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Adicionar mais",
+
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Remover",
+
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Novo serviço",
+
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Tem certeza de que pretende apagar este serviço?",
+
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirma as alterações?",
+
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar serviço",
+
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancelar",
+
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Tem a certeza de que pretende descartar as alterações e deixar?",
+
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar as alterações",
+
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edição bem-sucedida",
+
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "O serviço foi editado",
+
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edição falhou",
+
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "O serviço não foi editado",
+
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Criação bem-sucedida",
+
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "O serviço foi criado",
+
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Criação falhou",
+
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "O serviço não foi criado",
+
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Por favor, selecionar pelo menos um padrão de entrada",
+
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estado atualizado com êxito",
+
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "O estado do serviço foi atualizado",
+
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Excluído com sucesso",
+
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "O serviço foi excluído",
+
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Falha na exclusão",
+
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "O serviço não foi excluído",
+
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancelar",
+
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Excluir serviço",
+
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar serviço",
+
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nome",
+
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descrição",
+
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL do serviço",
+
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL da caixa de entrada LDN",
+
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Padrão de entrada",
+
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Nenhum padrão de entrada",
+
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtro de item selecionado",
+
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sem filtro de itens",
+
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automático",
+
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Adicionar mais",
+
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar Serviço",
+
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Não selecionar nenhum",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Erro",
+
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Ocorreu um erro na criação deste processo",
+
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Sucesso",
+
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "O processo foi criado com êxito",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "O serviço selecionado é compatível com o item de acordo com o seu estado atual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Avaliação",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisão",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciado por",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementado por",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visão geral dos serviços LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Serviços LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Serviço LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "Em baixo pode ver todos os tópicos recebidos das subscrições de {{source}} relativamente ao",
+
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "Em baixo encontra-se a lista de todas as sugestões para o tópico selecionado <b>{{topic}}</b>, relacionado com <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and",
+  "quality-assurance.events.description-with-topic-and-target": "Em baixo, a lista de todas as sugestões para o tópico selecionado <b>{{topic}}</b>, relacionado com <b>{{source}}</b> e",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL do serviço:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Hiperligação:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancelar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Excluir serviço",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Excluir serviço",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Tem certeza que pretende excluir o serviço atual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Excluir serviço",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "O serviço foi excluído com êxito.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Algo correu mal ao excluir o serviço",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID serviços",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nome",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora de início (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estado",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Utilizador",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visão geral dos serviços",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visão geral dos serviços",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Ações",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descrição",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Pode solicitar uma revisão para um dos seguintes serviços",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Pode solicitar aprovação para um dos seguintes 'overlay journals'",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Pode solicitar a integração de uma cópia da sua apresentação a um dos seguintes serviços",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "Sem dados disponíveis",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Não selecionar nenhum",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Selecionar um serviço para {{pattern }} deste artigo",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descrição do serviço selecionado:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "Não existem mais informações disponíveis",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "O serviço selecionado não é adequado para o item atual. Consulte a descrição para obter mais informações sobre os registos que podem ser geridos por este serviço.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "Não foram encontrados padrões configuráveis.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtro inválido, tente selecionar outro serviço ou nenhum.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> foi assumido como responsável.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> foi rejeitado.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "O {{ offerType }} solicitado para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> está a aguardar.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar padrão suportado para exclusão",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar padrão suportado para exclusão",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Selecionar o filtro item para o padrão",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Selecionar um padrão para o serviço",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Selecionar serviço para exclusão",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar serviço LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Fechar 'modal'",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "O tipo de item é um 'Artigo científico' ou 'Conjunto de dados'",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Sempre verdadeiro",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Processamento automático",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contém DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtro DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "Tipo de documento é igual a 'Driver'",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Tem pelo menos um ficheiro",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Tem ficheiro",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Tem um ficheiro",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Está depositado",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Está retirado",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "O item é público",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Integração de revistas",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "O título começa com padrão",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "Tipo é igual a 'Conjunto de dados'",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "Tipo é igual a 'Artigo Científico'",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Nenhum",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Painel de controlo",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Painel de controlo",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Painel de notificações",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "O painel de notificações monitoriza a utilização geral do protocolo COAR Notify em todo o repositório. No separador 'Métricas' encontram-se estatísticas sobre a utilização do protocolo COAR Notify. Nos separadores 'Registos/Entrada' (Logs/Inbound) e 'Registos/Saída' (Logs/Outbound) é possível pesquisar e verificar o estado individual de cada mensagem LDN, recebida ou enviada.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Métricas",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Número de LDN recebidas",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Número de LDN geradas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Aceite",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificações de entrada aceites",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Em exibição: Notificações aceites",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN processado",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificações de entrada processadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Em exibição: LDN processado",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Em exibição: Notificações falhadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Falha",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificações de entrada falhadas",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Em exibição: Notificações falhadas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Falha",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificações de saída falhadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Em exibição: Notificações não confiáveis",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Não confiável",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificações de entrada não confiáveis",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Em exibição: Notificações entregues",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificações de entrada entregues com sucesso",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Entregue",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Em exibição: Notificações entregues",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificações de saída entregues com sucesso",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Em exibição: Notificações em fila de espera",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificações em fila de espera",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Em fila de espera",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Em exibição: Notificações em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificações em fila de espera para nova tentativa",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Itens envolvidos",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Itens relacionados com as notificações de entrada",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Itens envolvidos",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Itens relacionados com as notificações de saída",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Painel de controlo",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Mensagens de entrada",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Registos/Entrada",
+
+  // "admin.notify.dashboard.filter": "Filter:",
+  "admin.notify.dashboard.filter": "Filtro:",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Itens relacionados",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Serviço LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificar revisão",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificar avaliação",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificar relação",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de processamento",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Intervalo mínimo",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Intervalo máximo",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Intervalo mínimo",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Intervalo máximo",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Mensagens de saída",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Registos/Saída",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "A receber",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Item relacionado",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origem",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Serviço LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Destino",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estado da fila de espera",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipo de fluxo de atividade",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Tipo de COAR Notify",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipo de notificação",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Pesquisar itens relacionados",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Pesquisar estado da fila de espera",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Pesquisar destino",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Pesquisar tipo de fluxo de atividade",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estado da fila de espera",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "IP não confiável",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "Em fila de espera",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "A processar",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processado",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Falhou",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "Não confiável",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Ação não mapeada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "Em fila de espera para nova tentativa",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipo de fluxo de atividade",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipo de notificação COAR",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipo de notificação",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Pesquisar tipo de notificação COAR",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Pesquisar tipo de notificação",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Itens relacionados",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Destino",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Pesquisar fonte",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Fonte",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Pesquisar Serviço LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Serviço LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estado da fila de espera",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipo de fluxo de atividade",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Tipo de notificação COAR",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificação",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificar relação",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Pesquisar notificação de relação",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificar relação",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificar revisão",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Pesquisar notificação de revisão",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificar revisão",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Rever ação",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Rever ação",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Rever ação",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Ação de avaliação",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Ação de aprovação",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Ação de avaliação",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ação de integração",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ação de integração",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Ação de integração",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Ação de relacionamento",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Ação de relacionamento",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Ação de relacionamento",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Em fila de espera",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Em fila de espera",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Em fila de espera para nova tentativa",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Em fila de espera para nova tentativa",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "A processar",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "A processar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processado",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processado",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Falhou",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Falhou",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Não confiável",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP não confiável",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Não confiável",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP não confiável",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Ação não mapeada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Ação não mapeada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última fila de espera iniciada descendente",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última fila de espera iniciada ascendente",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Tentativas em fila de espera descendente",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Tentativas em fila de espera ascendente",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Itens envolvidos na entrada LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Itens envolvidos na saída LDN",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipo",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipo de notificação COAR",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipo de fluxo de atividade",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "Em resposta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Item do repositório",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Item do repositório",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Tentativas em fila de espera",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última inicialização da fila de espera",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Serviço LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Serviço LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estado da fila",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Expirou o tempo limite da fila de espera",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detalhe da mensagem",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar mensagem",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Registo de data e hora",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Item do repositório",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Serviço LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipo",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estado",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Ação",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detalhe",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocessar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processado",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Falhou",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "Em fila de espera para nova tentativa",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Ação não mapeada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "A processar",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "Em fila de espera",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "Não confiável",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Serviço LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Item relacionado",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificar avaliação",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificar avaliação",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Pesquisar notificação de avaliação",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licença Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Salvo indicação em contrário, a licença deste artigo é descrita como",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Pesquisar o repositório",
+
   // Other strings...
   // Missing, Duplicate or Redundant ???
 
-  // NOT FOUND 08-12-2023
-
-  // "browse.metadata.srsc": "Subject Category",
-  "browse.metadata.srsc": "Vocabulário controlado (SRSC)",
+  // NOT FOUND ORIGINAL 'en.json5' 02-07-2024
 
   // "datafile.listelement.badge": "Data file",
   "datafile.listelement.badge": "Ficheiro de dados",
@@ -8433,15 +10349,6 @@
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "A senha deve ter pelo menos 6 caracteres.",
 
-  // "search.filters.entityType.Publication": "Publication",
-  "search.filters.entityType.Publication": "Publicação",
-
-  // "search.filters.entityType.Person": "Person",
-  "search.filters.entityType.Person": "Pessoa",
-
-  // "search.filters.entityType.Project": "Project",
-  "search.filters.entityType.Project": "Projeto",
-
   // "search.filters.entityType.Journal": "Journal",
   "search.filters.entityType.Journal": "Revista",
 
@@ -8455,17 +10362,11 @@
   "forgot-email.form.google-recaptcha.open-cookie-settings": "Configurar cookies",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Successfully imported and added external project to the selection",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Importado com sucesso e adicionado autor à seleção",
-
-  // "orgunit.search.results.head": "Organizational Unit Search Results",
-  "orgunit.search.results.head": "Resultados da pesquisa de organizações",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Importado com sucesso e projeto externo adicionado à seleção",
 
   // "orgunit-relationships.search.results.head": "Organizational Unit Search Results",
   "orgunit-relationships.search.results.head": "Resultados da pesquisa de organizações",
 
-  // "journalissue.search.results.head": "Journal Issue Search Results",
-  "journalissue.search.results.head": "Resultados da pesquisa de números",
-
   // "journalissue-relationships.search.results.head": "Journal Issue Search Results",
   "journalissue-relationships.search.results.head": "Resultados da pesquisa de números",
 

From 7cfbeb241be6a356663bfa47fc9531321fbc9bd3 Mon Sep 17 00:00:00 2001
From: Ricardo Saraiva <122451983+rsaraivac@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:20:55 +0100
Subject: [PATCH 0664/1286] Update pt-PT.json5

Lint errors review.

(cherry picked from commit 43071da3ebd1940d2b2979bd94a9b412e2b89623)
---
 src/assets/i18n/pt-PT.json5 | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 2a795ccb9b..0683f242e9 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -21,7 +21,7 @@
   "403.forbidden": "Proibido",
 
   // "500.page-internal-server-error": "Service unavailable",
- "500.page-internal-server-error": "Serviço indisponível",
+  "500.page-internal-server-error": "Serviço indisponível",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
   "500.help": "O servidor encontra-se temporariamete indisponível para responder ao seu pedido, devido a processos de manutenção em curso ou capacidade de resposta. Por favor tente mais tarde.",
@@ -30,7 +30,7 @@
   "500.link.home-page": "Voltar à página de início",
 
   // "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": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
+  "404.help": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início.",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Voltar à página de início",
@@ -39,7 +39,7 @@
   "404.page-not-found": "Página não encontrada",
 
   // "error-page.description.401": "Unauthorized",
- "error-page.description.401": "Não autorizado",
+  "error-page.description.401": "Não autorizado",
 
   // "error-page.description.403": "Forbidden",
   "error-page.description.403": "Proibido",
@@ -2802,7 +2802,7 @@
   "error.search-results": "Erro ao carregar os resultados da pesquisa!",
 
   // "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": "A query da pesquisa não é válida! Por favor verifique <a href='https://solr.apache.org/guide/query-syntax-and-parsing.html' target=\'_blank\'>Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
+  "error.invalid-search-query": "A query da pesquisa não é válida! Por favor verifique <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\"target=\"_blank\">Sintaxe de consulta Solr</a> melhores práticas para obter mais informações sobre este erro.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erro ao carregar sub-coleções!",
@@ -6200,19 +6200,19 @@
   "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registar deve aceitar o <b>registo e a senha de recuperação</b> (Google reCaptcha) cookies.",
 
   // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
- "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
+  "register-page.registration.error.maildomain": "Este endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
 
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
- "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open cookie",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
- "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": "Ocorreu um erro na verificação do reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.error": "Ocorreu um erro na verificação do reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
- "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
 
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
   "register-page.registration.info.maildomain": "As contas podem ser registadas para os endereços de email os domínios",
@@ -7582,14 +7582,14 @@
   // "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit of the Project",
   "submission.sections.describe.relationship - lookup.search - tab.tab - title.isOrgUnitOfProject": "OrgUnit do projeto",
 
-   // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
-   "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
+  // "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship - lookup.selection - tab.title.isProjectOfPublication": "Projeto",
 
-   // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
-   "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
+  // "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship - lookup.title.isProjectOfPublication": "Projetos",
 
-   // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-   "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
+  // "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship - lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
 
   // "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Search...",
   "submission.sections.describe.relationship - lookup.selection - tab.search - form.placeholder": "Pesquisar...",

From ce1dc46857123cf22e2531e20be12f50d688f9a4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 14:02:56 -0500
Subject: [PATCH 0665/1286] Update dependabot.yml

Remove @types grouping because Dependabot already groups types with related dependencies.
---
 .github/dependabot.yml | 48 ------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d19f2df227..2ee321db78 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -63,22 +63,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any @types version updates
-      types:
-        applies-to: version-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together any @types security updates
-      types:
-        applies-to: security-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates
@@ -217,22 +201,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any @types version updates
-      types:
-        applies-to: version-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together any @types security updates
-      types:
-        applies-to: security-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates
@@ -371,22 +339,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any @types version updates
-      types:
-        applies-to: version-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together any @types security updates
-      types:
-        applies-to: security-updates
-        patterns:
-        - "@types/*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates

From b1703330309d80298a54095e0814611314f6a269 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:03:51 +0000
Subject: [PATCH 0666/1286] Bump sass from 1.80.2 to 1.80.3 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.2 to 1.80.3
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.2...1.80.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index 7d10e7265b..ff80bb0626 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "react-dom": "^16.14.0",
         "rimraf": "^3.0.2",
         "rxjs-spy": "^8.0.2",
-        "sass": "~1.80.2",
+        "sass": "~1.80.3",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -20335,9 +20335,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.80.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.2.tgz",
-      "integrity": "sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==",
+      "version": "1.80.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.3.tgz",
+      "integrity": "sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==",
       "dependencies": {
         "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
diff --git a/package.json b/package.json
index c3cdbe530a..a0eb5ba42e 100644
--- a/package.json
+++ b/package.json
@@ -240,7 +240,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.80.2",
+    "sass": "~1.80.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From 7f85a1eaa15fb8afbc2678efc246a0586ca23c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:04:30 +0000
Subject: [PATCH 0667/1286] Bump sass from 1.80.2 to 1.80.3 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.2 to 1.80.3
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.2...1.80.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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 4ade3c177b..b101fb9540 100644
--- a/package.json
+++ b/package.json
@@ -208,7 +208,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.80.2",
+    "sass": "~1.80.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index d2488d977a..cb11489bcf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10273,10 +10273,10 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.2:
-  version "1.80.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.2.tgz#9d13d85a4f81bb17e09d1dc3e1c0944f7fd7315e"
-  integrity sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==
+sass@^1.25.0, sass@~1.80.3:
+  version "1.80.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.3.tgz#3f63dd527647d2b3de35f36acb971bda80517423"
+  integrity sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==
   dependencies:
     "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"

From 7e97dbbe812920de22d4d745ded358ef1e258479 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:06:30 +0000
Subject: [PATCH 0668/1286] Bump eslint-plugin-import from 2.30.0 to 2.31.0 in
 the eslint group

Bumps the eslint group with 1 update: [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import).


Updates `eslint-plugin-import` from 2.30.0 to 2.31.0
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package.json b/package.json
index 4ade3c177b..e06a414cfd 100644
--- a/package.json
+++ b/package.json
@@ -178,7 +178,7 @@
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-dspace-angular-html": "link:./lint/dist/src/rules/html",
     "eslint-plugin-dspace-angular-ts": "link:./lint/dist/src/rules/ts",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.6.0",
diff --git a/yarn.lock b/yarn.lock
index d2488d977a..97b5a3266d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5511,10 +5511,10 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-module-utils@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz#b99b211ca4318243f09661fae088f373ad5243c4"
-  integrity sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==
+eslint-module-utils@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
+  integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
   dependencies:
     debug "^3.2.7"
 
@@ -5538,10 +5538,10 @@ eslint-plugin-import-newlines@^1.3.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.4.0.tgz#469cf3ebb5a8691ba827bdceb00e751bf2f084d1"
   integrity sha512-+Cz1x2xBLtI9gJbmuYEpvY7F8K75wskBmJ7rk4VRObIJo+jklUJaejFJgtnWeL0dCFWabGEkhausrikXaNbtoQ==
 
-eslint-plugin-import@^2.27.5:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449"
-  integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==
+eslint-plugin-import@^2.31.0:
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
+  integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
   dependencies:
     "@rtsao/scc" "^1.1.0"
     array-includes "^3.1.8"
@@ -5551,7 +5551,7 @@ eslint-plugin-import@^2.27.5:
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.9.0"
+    eslint-module-utils "^2.12.0"
     hasown "^2.0.2"
     is-core-module "^2.15.1"
     is-glob "^4.0.3"
@@ -5560,6 +5560,7 @@ eslint-plugin-import@^2.27.5:
     object.groupby "^1.0.3"
     object.values "^1.2.0"
     semver "^6.3.1"
+    string.prototype.trimend "^1.0.8"
     tsconfig-paths "^3.15.0"
 
 eslint-plugin-jsdoc@^45.0.0:

From 6f7c64e8ca1e36adfbcc8c1a4df43c3aa6acd9ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:18:08 +0000
Subject: [PATCH 0669/1286] Bump sass from 1.80.2 to 1.80.3 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.2 to 1.80.3
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.2...1.80.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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 fbfe5c5475..401843852f 100644
--- a/package.json
+++ b/package.json
@@ -195,7 +195,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.80.2",
+    "sass": "~1.80.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 32944824bc..15e68868c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10356,10 +10356,10 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.2:
-  version "1.80.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.2.tgz#9d13d85a4f81bb17e09d1dc3e1c0944f7fd7315e"
-  integrity sha512-9wXY8cGBlUmoUoT+vwOZOFCiS+naiWVjqlreN9ar9PudXbGwlMTFwCR5K9kB4dFumJ6ib98wZyAObJKsWf1nAA==
+sass@^1.25.0, sass@~1.80.3:
+  version "1.80.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.3.tgz#3f63dd527647d2b3de35f36acb971bda80517423"
+  integrity sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==
   dependencies:
     "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"

From 059da40c64b237a73c6ae0de622b68d4249fafe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:18:12 +0000
Subject: [PATCH 0670/1286] Bump markdown-it from 13.0.1 to 13.0.2

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 13.0.1 to 13.0.2.
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 fbfe5c5475..b6add11aff 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "klaro": "^0.7.21",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
-    "markdown-it": "^13.0.1",
+    "markdown-it": "^13.0.2",
     "markdown-it-mathjax3": "^4.3.2",
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
diff --git a/yarn.lock b/yarn.lock
index 32944824bc..123ebb63d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8015,10 +8015,10 @@ markdown-it-mathjax3@^4.3.2:
     juice "^8.0.0"
     mathjax-full "^3.2.0"
 
-markdown-it@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"
-  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
+markdown-it@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
+  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
   dependencies:
     argparse "^2.0.1"
     entities "~3.0.1"

From 610bd328696a46a7c7d93c306774a3ebd2a9bc49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:22:59 +0000
Subject: [PATCH 0671/1286] Bump the eslint group with 5 updates

Bumps the eslint group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `5.59.1` | `5.62.0` |
| [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `5.59.1` | `5.62.0` |
| [eslint-plugin-deprecation](https://github.com/gund/eslint-plugin-deprecation) | `1.4.1` | `1.5.0` |
| [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) | `2.27.5` | `2.31.0` |
| [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) | `2.6.0` | `2.16.0` |


Updates `@typescript-eslint/eslint-plugin` from 5.59.1 to 5.62.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 5.59.1 to 5.62.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/parser)

Updates `eslint-plugin-deprecation` from 1.4.1 to 1.5.0
- [Release notes](https://github.com/gund/eslint-plugin-deprecation/releases)
- [Changelog](https://github.com/gund/eslint-plugin-deprecation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gund/eslint-plugin-deprecation/compare/v1.4.1...v1.5.0)

Updates `eslint-plugin-import` from 2.27.5 to 2.31.0
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.31.0)

Updates `eslint-plugin-jsonc` from 2.6.0 to 2.16.0
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.6.0...v2.16.0)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint-plugin-deprecation
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package.json b/package.json
index fbfe5c5475..eefc1a435d 100644
--- a/package.json
+++ b/package.json
@@ -158,8 +158,8 @@
     "@types/lodash": "^4.17.12",
     "@types/node": "^14.18.63",
     "@types/sanitize-html": "^2.9.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "axe-core": "^4.7.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
@@ -168,10 +168,10 @@
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
-    "eslint-plugin-deprecation": "^1.4.1",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "express-static-gzip": "^2.1.8",
diff --git a/yarn.lock b/yarn.lock
index 32944824bc..48cf6a4aba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2312,6 +2312,11 @@
   resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
 "@schematics/angular@16.2.16":
   version "16.2.16"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.16.tgz#3f077f398fc7ff88654fd477790af8270585c3af"
@@ -2678,30 +2683,30 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz#9b09ee1541bff1d2cebdcb87e7ce4a4003acde08"
-  integrity sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==
+"@typescript-eslint/eslint-plugin@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/type-utils" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.1.tgz#73c2c12127c5c1182d2e5b71a8fa2a85d215cbb4"
-  integrity sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==
+"@typescript-eslint/parser@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.48.2":
@@ -2712,21 +2717,13 @@
     "@typescript-eslint/types" "5.48.2"
     "@typescript-eslint/visitor-keys" "5.48.2"
 
-"@typescript-eslint/scope-manager@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz"
-  integrity sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/visitor-keys" "5.58.0"
-
-"@typescript-eslint/scope-manager@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz#8a20222719cebc5198618a5d44113705b51fd7fe"
-  integrity sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
 
 "@typescript-eslint/type-utils@5.48.2":
   version "5.48.2"
@@ -2738,13 +2735,13 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/type-utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz#63981d61684fd24eda2f9f08c0a47ecb000a2111"
-  integrity sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -2753,15 +2750,10 @@
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz"
   integrity sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==
 
-"@typescript-eslint/types@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz"
-  integrity sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==
-
-"@typescript-eslint/types@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.1.tgz#03f3fedd1c044cb336ebc34cc7855f121991f41d"
-  integrity sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
 "@typescript-eslint/typescript-estree@5.48.2":
   version "5.48.2"
@@ -2776,26 +2768,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz"
-  integrity sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/visitor-keys" "5.58.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz#4aa546d27fd0d477c618f0ca00b483f0ec84c43c"
-  integrity sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -2816,31 +2795,17 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.1.tgz#d89fc758ad23d2157cfae53f0b429bdf15db9473"
-  integrity sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==
+"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.57.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/utils@^5.57.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz"
-  integrity sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.58.0"
-    "@typescript-eslint/types" "5.58.0"
-    "@typescript-eslint/typescript-estree" "5.58.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
@@ -2852,20 +2817,12 @@
     "@typescript-eslint/types" "5.48.2"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.58.0":
-  version "5.58.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz"
-  integrity sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
   dependencies:
-    "@typescript-eslint/types" "5.58.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@typescript-eslint/visitor-keys@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz#0d96c36efb6560d7fb8eb85de10442c10d8f6058"
-  integrity sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.1"
+    "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -3090,11 +3047,16 @@ acorn@^7.1.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1:
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1:
   version "8.8.2"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
+acorn@^8.9.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
+  integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
+
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"
@@ -3306,13 +3268,13 @@ aria-query@5.1.3:
   dependencies:
     deep-equal "^2.0.5"
 
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
   dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
 
 array-flatten@1.1.1:
   version "1.1.1"
@@ -3324,15 +3286,16 @@ array-flatten@^2.1.2:
   resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
 array-union@^1.0.1:
@@ -3352,26 +3315,52 @@ array-uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.findlastindex@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3450,6 +3439,13 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
@@ -3889,7 +3885,7 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-call-bind@^1.0.7:
+call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
   integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
@@ -4624,6 +4620,33 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 date-fns-tz@^1.3.7:
   version "1.3.8"
   resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz"
@@ -4729,7 +4752,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-data-property@^1.1.4:
+define-data-property@^1.0.1, define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
   integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
@@ -4751,6 +4774,15 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -5173,45 +5205,57 @@ error-stack-parser@^2.0.1:
   dependencies:
     stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.2"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"
-  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
   dependencies:
-    array-buffer-byte-length "^1.0.0"
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.0"
-    get-symbol-description "^1.0.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    is-array-buffer "^3.0.2"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.3"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.15"
 
 es-define-property@^1.0.0:
   version "1.0.0"
@@ -5220,7 +5264,7 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.3.0:
+es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
@@ -5245,14 +5289,21 @@ es-module-lexer@^0.9.0:
   resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
 
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
@@ -5261,6 +5312,13 @@ es-shim-unscopables@^1.0.0:
   dependencies:
     has "^1.0.3"
 
+es-shim-unscopables@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
@@ -5345,51 +5403,62 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-compat-utils@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
+  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
+  dependencies:
+    semver "^7.5.4"
+
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-module-utils@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
+  integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-deprecation@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz#09a2889210955fd1a5c37703922c01724aba80eb"
-  integrity sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==
+eslint-plugin-deprecation@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz#5136b3879e623dea5dd19a792c184b4bcc8ae6a9"
+  integrity sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==
   dependencies:
     "@typescript-eslint/utils" "^5.57.0"
     tslib "^2.3.1"
     tsutils "^3.21.0"
 
-eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+eslint-plugin-import@^2.31.0:
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
+  integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
   dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
-    has "^1.0.3"
-    is-core-module "^2.11.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.12.0"
+    hasown "^2.0.2"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.0"
+    semver "^6.3.1"
+    string.prototype.trimend "^1.0.8"
+    tsconfig-paths "^3.15.0"
 
 eslint-plugin-jsdoc@^45.0.0:
   version "45.0.0"
@@ -5405,14 +5474,18 @@ eslint-plugin-jsdoc@^45.0.0:
     semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsonc@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.6.0.tgz#5a439ec15b4930c022bf157264a3d4f4712b982c"
-  integrity sha512-4bA9YTx58QaWalua1Q1b82zt7eZMB7i+ed8q8cKkbKP75ofOA2SXbtFyCSok7RY6jIXeCqQnKjN9If8zCgv6PA==
+eslint-plugin-jsonc@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
+  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
   dependencies:
-    eslint-utils "^3.0.0"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    eslint-compat-utils "^0.5.0"
+    espree "^9.6.1"
+    graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
     natural-compare "^1.4.0"
+    synckit "^0.6.0"
 
 eslint-plugin-lodash@^7.4.0:
   version "7.4.0"
@@ -5474,6 +5547,11 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz"
   integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
 
+eslint-visitor-keys@^3.4.1:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
 eslint@^8.39.0:
   version "8.39.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
@@ -5525,14 +5603,14 @@ esm@^3.2.25:
   resolved "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^9.0.0, espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.0.0, espree@^9.5.1, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
@@ -6041,17 +6119,17 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -6089,7 +6167,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-intrinsic@^1.2.4:
+get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
   integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@@ -6117,13 +6195,14 @@ get-stream@^6.0.0:
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
 getos@^3.2.1:
   version "3.2.1"
@@ -6269,6 +6348,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 guess-parser@^0.4.22:
   version "0.4.22"
   resolved "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz"
@@ -6342,6 +6426,11 @@ has-proto@^1.0.1:
   resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
+has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
@@ -6354,6 +6443,13 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
@@ -6366,7 +6462,7 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hasown@^2.0.0:
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -6775,7 +6871,7 @@ inquirer@8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.4, internal-slot@^1.0.5:
+internal-slot@^1.0.4:
   version "1.0.5"
   resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -6784,6 +6880,15 @@ internal-slot@^1.0.4, internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
+  dependencies:
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
+    side-channel "^1.0.4"
+
 interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
@@ -6824,7 +6929,7 @@ is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+is-array-buffer@^3.0.1:
   version "3.0.2"
   resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"
   integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
@@ -6833,6 +6938,14 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@@ -6877,12 +6990,19 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.8.1:
-  version "2.12.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"
-  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.8.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.2"
+
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
+  dependencies:
+    is-typed-array "^1.1.13"
 
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
@@ -6941,10 +7061,10 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
 is-number-like@^1.0.3:
   version "1.0.8"
@@ -7031,6 +7151,13 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
+  dependencies:
+    call-bind "^1.0.7"
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
@@ -7050,7 +7177,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+is-typed-array@^1.1.10:
   version "1.1.10"
   resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -7061,6 +7188,13 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
+  dependencies:
+    which-typed-array "^1.1.14"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
@@ -8699,16 +8833,16 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
 object-inspect@^1.13.1:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
   integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
 
+object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
 object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"
@@ -8737,14 +8871,43 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+
+object.values@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
+  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -9167,6 +9330,11 @@ portscanner@2.2.0:
     async "^2.6.0"
     is-number-like "^1.0.3"
 
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+
 postcss-apply@0.12.0:
   version "0.12.0"
   resolved "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.12.0.tgz"
@@ -10046,6 +10214,16 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexp.prototype.flags@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
+  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.2"
+
 regexpu-core@^5.3.1:
   version "5.3.2"
   resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"
@@ -10146,7 +10324,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
+resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.9.0:
   version "1.22.2"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -10155,6 +10333,15 @@ resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"
@@ -10280,6 +10467,16 @@ rxjs@7.8.1, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
+safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+  dependencies:
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
@@ -10290,13 +10487,13 @@ safe-buffer@5.2.1, safe-buffer@~5.2.0:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
 safe-stable-stringify@^2.4.3:
@@ -10460,6 +10657,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.4:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -10572,6 +10774,16 @@ set-function-length@^1.2.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
 
+set-function-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
@@ -11014,32 +11226,33 @@ streamroller@^3.1.5:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11132,6 +11345,13 @@ symbol-tree@^3.2.4:
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.6.2.tgz#e1540b97825f2855f7170b98276e8463167f33eb"
+  integrity sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==
+  dependencies:
+    tslib "^2.3.1"
+
 tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
   resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
@@ -11358,10 +11578,10 @@ ts-node@^8.10.2:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tsconfig-paths@^3.14.1:
-  version "3.14.2"
-  resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"
-  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.2"
@@ -11457,14 +11677,49 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+  dependencies:
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    is-typed-array "^1.1.9"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
 
 typed-assert@^1.0.8:
   version "1.0.9"
@@ -12092,6 +12347,17 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.1"
     is-weakset "^2.0.1"
 
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.2"
+
 which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"

From 24b7d38fe9f5607403457e222f3cecfd5727f6b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:47:25 +0000
Subject: [PATCH 0672/1286] Bump webpack from 5.94.0 to 5.95.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.94.0 to 5.95.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.94.0...v5.95.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index c92bcd6729..c458906657 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.3.3",
-    "webpack": "5.94.0",
+    "webpack": "5.95.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
diff --git a/yarn.lock b/yarn.lock
index 74cfda1004..e07382eff0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2692,16 +2692,11 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
   integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
-"@types/estree@1.0.6":
+"@types/estree@1.0.6", "@types/estree@^1.0.5":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
-"@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
   version "4.19.5"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6"
@@ -11823,6 +11818,35 @@ webpack@5.94.0:
     watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
+webpack@5.95.0:
+  version "5.95.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
+  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
+  dependencies:
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
+    webpack-sources "^3.2.3"
+
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"

From 65b8ba34e6d937fb49423ce683d40ec08d7bbd9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:57:39 +0000
Subject: [PATCH 0673/1286] Bump typescript from 5.3.3 to 5.4.5

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.3.3 to 5.4.5.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.3.3...v5.4.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 5708302fa7..a87f7346e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -157,7 +157,7 @@
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
-        "typescript": "~5.3.3",
+        "typescript": "~5.4.5",
         "webpack": "5.94.0",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^5.1.4",
@@ -804,9 +804,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
+      "version": "22.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
+      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
       "dev": true,
       "optional": true,
       "peer": true,
@@ -22150,9 +22150,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index 0542d67520..fd7ffbe6ae 100644
--- a/package.json
+++ b/package.json
@@ -244,7 +244,7 @@
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
-    "typescript": "~5.3.3",
+    "typescript": "~5.4.5",
     "webpack": "5.94.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",

From 3053e401b61de02659cc9c102c278bd77b77476e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 16:29:55 -0500
Subject: [PATCH 0674/1286] Remove sortablejs which is unused

---
 package.json | 1 -
 yarn.lock    | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0b1e654ad2..6acdb8d2cf 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",
-    "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"
diff --git a/yarn.lock b/yarn.lock
index aedacecc85..574b913315 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5529,9 +5529,11 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -10634,11 +10636,6 @@ socks@^2.8.3:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
 
-sortablejs@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
-  integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"

From a561879eb4f4a30b7b9427dcf6d37898a7155825 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 16:31:07 -0500
Subject: [PATCH 0675/1286] Remove unused sanitize-html

---
 package.json |  2 --
 yarn.lock    | 33 ++-------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 6acdb8d2cf..d975d15493 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,6 @@
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.12.1",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"
@@ -160,7 +159,6 @@
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.10",
     "@types/node": "^14.14.9",
-    "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "@typescript-eslint/rule-tester": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 574b913315..8a222074b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2846,13 +2846,6 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
-"@types/sanitize-html@^2.9.0":
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.13.0.tgz#ac3620e867b7c68deab79c72bd117e2049cdd98e"
-  integrity sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==
-  dependencies:
-    htmlparser2 "^8.0.0"
-
 "@types/semver@^7.3.12", "@types/semver@^7.5.0":
   version "7.5.8"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
@@ -6541,7 +6534,7 @@ html-parse-stringify@^3.0.1:
   dependencies:
     void-elements "3.1.0"
 
-htmlparser2@^8.0.0, htmlparser2@^8.0.2:
+htmlparser2@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
   integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
@@ -7077,11 +7070,6 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -8870,11 +8858,6 @@ parse-node-version@^1.0.1:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-parse-srcset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
-  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
-
 parse5-html-rewriting-stream@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz#e376d3e762d2950ccbb6bb59823fc1d7e9fdac36"
@@ -9406,7 +9389,7 @@ postcss@^7.0.14:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.2.14, postcss@^8.3.11, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
+postcss@^8.2.14, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
   integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
@@ -10230,18 +10213,6 @@ safe-stable-stringify@^2.4.3:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.12.1:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae"
-  integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==
-  dependencies:
-    deepmerge "^4.2.2"
-    escape-string-regexp "^4.0.0"
-    htmlparser2 "^8.0.0"
-    is-plain-object "^5.0.0"
-    parse-srcset "^1.0.2"
-    postcss "^8.3.11"
-
 sass-loader@14.1.1:
   version "14.1.1"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.1.tgz#2c9d2277c5b1c5fe789cd0570c046d8ad23cb7ca"

From d9080d14278c100d1cd315474273fe8f01b2968e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 16:37:57 -0500
Subject: [PATCH 0676/1286] Remove unused webfontloader

---
 angular.json | 1 -
 package.json | 1 -
 yarn.lock    | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/angular.json b/angular.json
index 5f0204249b..02fd69b1e1 100644
--- a/angular.json
+++ b/angular.json
@@ -30,7 +30,6 @@
               "lodash",
               "jwt-decode",
               "uuid",
-              "webfontloader",
               "zone.js"
             ],
             "outputPath": "dist/browser",
diff --git a/package.json b/package.json
index d975d15493..adfa9b24db 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8a222074b8..899cda0e61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11593,11 +11593,6 @@ webdriver-manager@^12.1.8:
     semver "^5.3.0"
     xml2js "^0.4.17"
 
-webfontloader@1.6.28:
-  version "1.6.28"
-  resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
-  integrity sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

From e7430b9c1a76e07140b6842b5ca4f236740411c8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 17:01:49 -0500
Subject: [PATCH 0677/1286] Remove unused webfontloader

---
 angular.json | 1 -
 package.json | 1 -
 yarn.lock    | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/angular.json b/angular.json
index 5e597d4d30..afda50a320 100644
--- a/angular.json
+++ b/angular.json
@@ -30,7 +30,6 @@
               "lodash",
               "jwt-decode",
               "uuid",
-              "webfontloader",
               "zone.js"
             ],
             "outputPath": "dist/browser",
diff --git a/package.json b/package.json
index b1163e27f9..394d1f5435 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,6 @@
     "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
-    "webfontloader": "1.6.28",
     "zone.js": "~0.11.5"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 4e93cadb1b..fbc3178b53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12044,11 +12044,6 @@ webdriver-manager@^12.1.8:
     semver "^5.3.0"
     xml2js "^0.4.17"
 
-webfontloader@1.6.28:
-  version "1.6.28"
-  resolved "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz"
-  integrity sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"

From 08fe8beaf994086a73f09ff85022a0b956586397 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 17:07:44 -0500
Subject: [PATCH 0678/1286] Remove sortablejs which is unused

---
 package-lock.json | 6 ------
 package.json      | 1 -
 2 files changed, 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 734a544c62..3d5e7a7e62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,7 +76,6 @@
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
         "sanitize-html": "^2.12.1",
-        "sortablejs": "1.15.0",
         "uuid": "^8.3.2",
         "webfontloader": "1.6.28",
         "zone.js": "~0.14.4"
@@ -20786,11 +20785,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/sortablejs": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz",
-      "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
diff --git a/package.json b/package.json
index dfc967ae56..a729ee7c72 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",
-    "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"

From 2e55f4b47f79405279d7e7860585c524a1453458 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 17:08:25 -0500
Subject: [PATCH 0679/1286] Remove unused sanitize-html

---
 package-lock.json | 38 --------------------------------------
 package.json      |  1 -
 2 files changed, 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3d5e7a7e62..807e09ab7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,7 +75,6 @@
         "pem": "1.14.7",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
-        "sanitize-html": "^2.12.1",
         "uuid": "^8.3.2",
         "webfontloader": "1.6.28",
         "zone.js": "~0.14.4"
@@ -13854,14 +13853,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -17561,11 +17552,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/parse-srcset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
-      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
-    },
     "node_modules/parse5": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -20033,30 +20019,6 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "node_modules/sanitize-html": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
-      "integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "escape-string-regexp": "^4.0.0",
-        "htmlparser2": "^8.0.0",
-        "is-plain-object": "^5.0.0",
-        "parse-srcset": "^1.0.2",
-        "postcss": "^8.3.11"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/sass": {
       "version": "1.62.1",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
diff --git a/package.json b/package.json
index a729ee7c72..cc57342db1 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,6 @@
     "pem": "1.14.7",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.12.1",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"

From beb05b26ce9c40ab44dc618d252d1a8b08194014 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 21 Oct 2024 17:09:06 -0500
Subject: [PATCH 0680/1286] Remove unused webfontloader

---
 angular.json      | 1 -
 package-lock.json | 6 ------
 package.json      | 1 -
 3 files changed, 8 deletions(-)

diff --git a/angular.json b/angular.json
index 5f0204249b..02fd69b1e1 100644
--- a/angular.json
+++ b/angular.json
@@ -30,7 +30,6 @@
               "lodash",
               "jwt-decode",
               "uuid",
-              "webfontloader",
               "zone.js"
             ],
             "outputPath": "dist/browser",
diff --git a/package-lock.json b/package-lock.json
index 807e09ab7f..1a8d709634 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,7 +76,6 @@
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
         "uuid": "^8.3.2",
-        "webfontloader": "1.6.28",
         "zone.js": "~0.14.4"
       },
       "devDependencies": {
@@ -22162,11 +22161,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/webfontloader": {
-      "version": "1.6.28",
-      "resolved": "https://registry.npmjs.org/webfontloader/-/webfontloader-1.6.28.tgz",
-      "integrity": "sha512-Egb0oFEga6f+nSgasH3E0M405Pzn6y3/9tOVanv/DLfa1YBIgcv90L18YyWnvXkRbIM17v5Kv6IT2N6g1x5tvQ=="
-    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/package.json b/package.json
index cc57342db1..ab2ee1273c 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "webfontloader": "1.6.28",
     "zone.js": "~0.14.4"
   },
   "devDependencies": {

From f0b4a56ed551278da0a653777483886f4afd8b23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:56:15 +0000
Subject: [PATCH 0681/1286] Bump zone.js from 0.14.7 to 0.14.10

Bumps [zone.js](https://github.com/angular/angular/tree/HEAD/packages/zone.js) from 0.14.7 to 0.14.10.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/packages/zone.js/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/zone.js-0.14.10/packages/zone.js)

---
updated-dependencies:
- dependency-name: zone.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index ff35ad2c52..1ab3860688 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,7 +76,7 @@
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
         "uuid": "^8.3.2",
-        "zone.js": "~0.14.4"
+        "zone.js": "~0.14.10"
       },
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
@@ -23256,9 +23256,9 @@
       }
     },
     "node_modules/zone.js": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.7.tgz",
-      "integrity": "sha512-0w6DGkX2BPuiK/NLf+4A8FLE43QwBfuqz2dVgi/40Rj1WmqUskCqj329O/pwrqFJLG5X8wkeG2RhIAro441xtg=="
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
+      "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index 4373e8ee66..02353527a1 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",

From 627d8097acf5843fd969483d71bda4229f4b3a6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:21:46 +0000
Subject: [PATCH 0682/1286] Bump sortablejs from 1.15.0 to 1.15.3

Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.15.0 to 1.15.3.
- [Release notes](https://github.com/SortableJS/Sortable/releases)
- [Commits](https://github.com/SortableJS/Sortable/compare/1.15.0...1.15.3)

---
updated-dependencies:
- dependency-name: sortablejs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 394d1f5435..a60045b46d 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.12.1",
-    "sortablejs": "1.15.0",
+    "sortablejs": "1.15.3",
     "uuid": "^8.3.2",
     "zone.js": "~0.11.5"
   },
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..201059f6ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10989,10 +10989,10 @@ socks@^2.6.2:
     ip "^2.0.0"
     smart-buffer "^4.2.0"
 
-sortablejs@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
-  integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
+sortablejs@1.15.3:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.3.tgz#033668db5ebfb11167d1249ab88e748f27959e29"
+  integrity sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==
 
 source-list-map@^2.0.0:
   version "2.0.1"

From dfae913dea950b0bc262f6a09562b7186e2e9e0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:22:59 +0000
Subject: [PATCH 0683/1286] Bump @types/express from 4.17.17 to 4.17.21

Bumps [@types/express](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/express) from 4.17.17 to 4.17.21.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/express)

---
updated-dependencies:
- dependency-name: "@types/express"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 394d1f5435..7e1e49f822 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "@nguniversal/builders": "^15.2.1",
     "@types/deep-freeze": "0.1.2",
     "@types/ejs": "^3.1.5",
-    "@types/express": "^4.17.17",
+    "@types/express": "^4.17.21",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..ce74119c4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2499,10 +2499,10 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.17":
-  version "4.17.17"
-  resolved "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.21":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"

From a1919a7a1fd10bf6e4365a4e380d7316d3c549d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:23:20 +0000
Subject: [PATCH 0684/1286] Bump @fortawesome/fontawesome-free from 6.4.0 to
 6.6.0

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.4.0 to 6.6.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.4.0...6.6.0)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 394d1f5435..bdec6933b6 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "@angular/compiler-cli": "^15.2.10",
     "@angular/language-service": "^15.2.10",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.6.0",
     "@ngrx/store-devtools": "^15.4.0",
     "@ngtools/webpack": "^15.2.6",
     "@nguniversal/builders": "^15.2.1",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..c0faf27ef8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1749,10 +1749,10 @@
   resolved "https://registry.yarnpkg.com/@fastify/deepmerge/-/deepmerge-1.3.0.tgz#8116858108f0c7d9fd460d05a7d637a13fe3239a"
   integrity sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==
 
-"@fortawesome/fontawesome-free@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe"
-  integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==
+"@fortawesome/fontawesome-free@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224"
+  integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"

From 5ac126250e2fbff62196a5428bb5e81bf8b4c529 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:23:38 +0000
Subject: [PATCH 0685/1286] Bump mirador-share-plugin from 0.11.0 to 0.16.0

Bumps [mirador-share-plugin]() from 0.11.0 to 0.16.0.

---
updated-dependencies:
- dependency-name: mirador-share-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 394d1f5435..c53f38c79a 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "markdown-it-mathjax3": "^4.3.2",
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
-    "mirador-share-plugin": "^0.11.0",
+    "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
     "ng-mocks": "^14.10.0",
     "ng2-file-upload": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..485d3b83e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4115,7 +4115,7 @@ clone@^1.0.2:
   resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^1.0.4, clsx@^1.1.1:
+clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -6331,6 +6331,11 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+goober@^2.0.33:
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95"
+  integrity sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
@@ -8411,10 +8416,12 @@ mirador-dl-plugin@^0.13.0:
   resolved "https://registry.npmjs.org/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz"
   integrity sha512-I/6etIvpTtO1zgjxx2uEUFoyB9NxQ43JWg8CMkKmZqblW7AAeFqRn1/zUlQH7N8KFZft9Rah6D8qxtuNAo9jmA==
 
-mirador-share-plugin@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.npmjs.org/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz"
-  integrity sha512-fHcdDXyrtfy5pn1zdQNX9BvE5Tjup66eQwyNippE5PMaP8ImUcrFaSL+mStdn+v6agsHcsdRqLhseZ0XWgEuAw==
+mirador-share-plugin@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.16.0.tgz#736c575dea17f0f846a6c6a4770d87a1275557fc"
+  integrity sha512-Rlywq/06nXf4/BUc2LTBD6jf+Q5VO97NK+MTd4VPMfY50Fb8NMr6L0edZXZETcTML1qh11GDEVrHx/csxMSlMA==
+  dependencies:
+    notistack "^3.0.1"
 
 mirador@^3.3.0:
   version "3.3.0"
@@ -8730,6 +8737,14 @@ normalize-url@^4.5.0:
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
+notistack@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-3.0.1.tgz#daf59888ab7e2c30a1fa8f71f9cba2978773236e"
+  integrity sha512-ntVZXXgSQH5WYfyU+3HfcXuKaapzAJ8fBLQ/G618rn3yvSzEbnOB8ZSOwhX+dAORy/lw+GC2N061JA0+gYWTVA==
+  dependencies:
+    clsx "^1.1.0"
+    goober "^2.0.33"
+
 nouislider@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.8.1.tgz#18729ed29738d2d328a1b5e0429d38eb8be8a696"

From d03b3c3a48d94734afbe39a86e7cf8bc43e776ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:24:02 +0000
Subject: [PATCH 0686/1286] Bump webpack-bundle-analyzer from 4.8.0 to 4.10.2

Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.8.0 to 4.10.2.
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.8.0...v4.10.2)

---
updated-dependencies:
- dependency-name: webpack-bundle-analyzer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 394d1f5435..38911eb6ad 100644
--- a/package.json
+++ b/package.json
@@ -200,7 +200,7 @@
     "ts-node": "^8.10.2",
     "typescript": "~4.8.4",
     "webpack": "5.76.1",
-    "webpack-bundle-analyzer": "^4.8.0",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^4.13.3"
   }
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..da4139d823 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2243,10 +2243,10 @@
     "@parcel/watcher-win32-ia32" "2.4.1"
     "@parcel/watcher-win32-x64" "2.4.1"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.28"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73"
+  integrity sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==
 
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
@@ -3047,12 +3047,7 @@ acorn@^7.1.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1:
-  version "8.8.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-acorn@^8.9.0:
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.9.0:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
   integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
@@ -4667,6 +4662,11 @@ dayjs@^1.10.4:
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
   integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
 
+debounce@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
+  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+
 debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
@@ -6526,7 +6526,7 @@ html-entities@^2.3.2:
   resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
   integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
-html-escaper@^2.0.0:
+html-escaper@^2.0.0, html-escaper@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -8498,10 +8498,10 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+mrmime@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
+  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
 
 ms@2.0.0:
   version "2.0.0"
@@ -10865,14 +10865,14 @@ simple-update-notifier@^1.0.7:
   dependencies:
     semver "~7.0.0"
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+sirv@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
+  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
   dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
 
 sisteransi@^1.0.5:
   version "1.0.5"
@@ -11485,10 +11485,10 @@ toidentifier@1.0.1:
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
 touch@^3.1.0:
   version "3.1.0"
@@ -12064,20 +12064,22 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
-  integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
+webpack-bundle-analyzer@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
     acorn-walk "^8.0.0"
-    chalk "^4.1.0"
     commander "^7.2.0"
+    debounce "^1.2.1"
+    escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
-    lodash "^4.17.20"
+    html-escaper "^2.0.2"
     opener "^1.5.2"
-    sirv "^1.0.7"
+    picocolors "^1.0.0"
+    sirv "^2.0.3"
     ws "^7.3.1"
 
 webpack-cli@^4.2.0:

From 2a92215d82c726413929990c0f20848e997c835d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:24:25 +0000
Subject: [PATCH 0687/1286] Bump date-fns from 2.29.3 to 2.30.0

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.29.3 to 2.30.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.29.3...v2.30.0)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 394d1f5435..2ce39d2a76 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "compression": "^1.7.4",
     "cookie-parser": "1.4.7",
     "core-js": "^3.38.1",
-    "date-fns": "^2.29.3",
+    "date-fns": "^2.30.0",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..6791171e59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,13 +1352,20 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.21.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
   integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
+  integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@7.20.7":
   version "7.20.7"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"
@@ -4652,10 +4659,12 @@ date-fns-tz@^1.3.7:
   resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz"
   integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
 
-date-fns@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
 
 date-format@^4.0.14:
   version "4.0.14"
@@ -10193,6 +10202,11 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
 regenerator-transform@^0.15.1:
   version "0.15.1"
   resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"

From b90f8e1b496a167a29dcc5e0a207ff4b96e711cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:24:35 +0000
Subject: [PATCH 0688/1286] Bump @types/deep-freeze from 0.1.2 to 0.1.5

Bumps [@types/deep-freeze](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/deep-freeze) from 0.1.2 to 0.1.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/deep-freeze)

---
updated-dependencies:
- dependency-name: "@types/deep-freeze"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 394d1f5435..cb54e168bb 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "@ngrx/store-devtools": "^15.4.0",
     "@ngtools/webpack": "^15.2.6",
     "@nguniversal/builders": "^15.2.1",
-    "@types/deep-freeze": "0.1.2",
+    "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.5",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..7cbc52dfd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2459,10 +2459,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/deep-freeze@0.1.2":
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz"
-  integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
+"@types/deep-freeze@0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.5.tgz#ae94f37ca134b4e34facb55f52ed90921192f764"
+  integrity sha512-KZtR+jtmgkCpgE0f+We/QEI2Fi0towBV/tTkvHVhMzx+qhUVGXMx7pWvAtDp6vEWIjdKLTKpqbI/sORRCo8TKg==
 
 "@types/ejs@^3.1.5":
   version "3.1.5"

From 7ee4fd5b0628d3d0b426421d63d9f3c551aacba0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:24:48 +0000
Subject: [PATCH 0689/1286] Bump axios from 1.7.5 to 1.7.7

Bumps [axios](https://github.com/axios/axios) from 1.7.5 to 1.7.7.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.5...v1.7.7)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 394d1f5435..614c9abf74 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "@types/grecaptcha": "^3.0.9",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.7.4",
+    "axios": "^1.7.7",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index fbc3178b53..ce4acee95c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3468,10 +3468,10 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.7.4:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1"
-  integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==
+axios@^1.7.7:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
+  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

From ddafda33b8c4730a732a133147451390ee2c7ab7 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Tue, 22 Oct 2024 13:29:05 -0300
Subject: [PATCH 0690/1286] Issue 3426 - Aligning the browse button

---
 src/app/shared/upload/uploader/uploader.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index b1fd8199d8..4c1db13d13 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -19,8 +19,8 @@
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span>
-          <i class="fas fa-upload" aria-hidden="true"></i>
+        <span class="d-flex align-items-center">
+          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
             <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>

From d634903d0d50dc9e4d87277af594a31a9441952c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 22 Oct 2024 11:35:09 -0500
Subject: [PATCH 0691/1286] Remove unnecessary @ts-expect-error, as the bug
 they are expecting is fixed in webpack 5.95.0.

---
 webpack/webpack.common.ts | 1 -
 webpack/webpack.prod.ts   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index d8155288cb..8d433edf39 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -79,7 +79,6 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
-    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
     }),
diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts
index fce321d152..e35bc0c907 100644
--- a/webpack/webpack.prod.ts
+++ b/webpack/webpack.prod.ts
@@ -6,7 +6,6 @@ import { commonExports } from './webpack.common';
 module.exports = Object.assign({}, commonExports, {
   plugins: [
     ...commonExports.plugins,
-    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       'process.env': {
         NODE_ENV: 'production',

From d98ae341fd6f385ee4230dbd6f3f20d8eae598e6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 22 Oct 2024 11:53:20 -0500
Subject: [PATCH 0692/1286] Must also update typescript version override.

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

diff --git a/package.json b/package.json
index fd7ffbe6ae..f716556bca 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     },
     "@ngtools/webpack": {
       "@angular/compiler-cli": "^17.3.11",
-      "typescript": "~5.3.3"
+      "typescript": "~5.4.5"
     },
     "@nicky-lenaers/ngx-scroll-to": {
       "@angular/common": "^17.3.11",

From cfecf0ff62264821aeb613856ce4b2320cd4bb94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:16:48 +0000
Subject: [PATCH 0693/1286] Bump ng-mocks from 14.10.0 to 14.13.1

Bumps [ng-mocks](https://github.com/help-me-mom/ng-mocks) from 14.10.0 to 14.13.1.
- [Release notes](https://github.com/help-me-mom/ng-mocks/releases)
- [Changelog](https://github.com/help-me-mom/ng-mocks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/help-me-mom/ng-mocks/compare/v14.10.0...v14.13.1)

---
updated-dependencies:
- dependency-name: ng-mocks
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 c53f38c79a..6f0a0c2557 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.10.0",
+    "ng-mocks": "^14.13.1",
     "ng2-file-upload": "1.4.0",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
diff --git a/yarn.lock b/yarn.lock
index 485d3b83e2..fe460733b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8572,10 +8572,10 @@ neo-async@^2.6.2:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^14.10.0:
-  version "14.10.0"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.10.0.tgz#36064650c52f6e01be5c810228a0c9585109bb27"
-  integrity sha512-gUnrSH4ejlkSpd9wgEe7PNKEyADJCriemSIbyebS0SQjyotSZfp/8jBuMl7Euvk0sPanV2IGhOv6W9e6hNRe/A==
+ng-mocks@^14.13.1:
+  version "14.13.1"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.1.tgz#9fef8cc902a0d9d3250550d83514f9c65d4cd366"
+  integrity sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==
 
 ng2-file-upload@1.4.0:
   version "1.4.0"

From ab60ad2072ded752aacb9ac4ce6ab9284a513c71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:18:46 +0000
Subject: [PATCH 0694/1286] Bump sanitize-html and @types/sanitize-html

Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) and [@types/sanitize-html](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sanitize-html). These dependencies needed to be updated together.

Updates `sanitize-html` from 2.12.1 to 2.13.1
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.12.1...2.13.1)

Updates `@types/sanitize-html` from 2.9.0 to 2.13.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sanitize-html)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: "@types/sanitize-html"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 46dbebca64..3686a90eed 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.12.1",
+    "sanitize-html": "^2.13.1",
     "sortablejs": "1.15.3",
     "uuid": "^8.3.2",
     "zone.js": "~0.11.5"
@@ -156,7 +156,7 @@
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",
     "@types/node": "^14.18.63",
-    "@types/sanitize-html": "^2.9.0",
+    "@types/sanitize-html": "^2.13.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "axe-core": "^4.7.2",
diff --git a/yarn.lock b/yarn.lock
index a42376a0ec..3c0ce36a00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2622,10 +2622,10 @@
   resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
-"@types/sanitize-html@^2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.9.0.tgz#5b609f7592de22ef80a0930c39670329753dca1b"
-  integrity sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==
+"@types/sanitize-html@^2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.13.0.tgz#ac3620e867b7c68deab79c72bd117e2049cdd98e"
+  integrity sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==
   dependencies:
     htmlparser2 "^8.0.0"
 
@@ -10535,10 +10535,10 @@ safe-stable-stringify@^2.4.3:
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
-  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
+sanitize-html@^2.13.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.1.tgz#b4639b0a09574ab62b1b353cb99b1b87af742834"
+  integrity sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"

From 47db66919163c84e58bef469115947712e6e90c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:19:40 +0000
Subject: [PATCH 0695/1286] Bump webpack-dev-server from 4.13.3 to 4.15.2

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.13.3 to 4.15.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v4.15.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.13.3...v4.15.2)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 46dbebca64..9cf0bb3332 100644
--- a/package.json
+++ b/package.json
@@ -202,6 +202,6 @@
     "webpack": "5.76.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^4.13.3"
+    "webpack-dev-server": "^4.15.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index a42376a0ec..3e907ecf5f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2676,10 +2676,10 @@
   resolved "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz"
   integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
 
-"@types/ws@^8.5.1":
-  version "8.5.4"
-  resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
+"@types/ws@^8.5.1", "@types/ws@^8.5.5":
+  version "8.5.12"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
+  integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==
   dependencies:
     "@types/node" "*"
 
@@ -12140,7 +12140,7 @@ webpack-dev-middleware@6.1.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.1:
+webpack-dev-middleware@^5.3.1, webpack-dev-middleware@^5.3.4:
   version "5.3.4"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
   integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
@@ -12186,10 +12186,10 @@ webpack-dev-server@4.11.1:
     webpack-dev-middleware "^5.3.1"
     ws "^8.4.2"
 
-webpack-dev-server@^4.13.3:
-  version "4.13.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz#9feb740b8b56b886260bae1360286818a221bae8"
-  integrity sha512-KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug==
+webpack-dev-server@^4.15.2:
+  version "4.15.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173"
+  integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -12197,7 +12197,7 @@ webpack-dev-server@^4.13.3:
     "@types/serve-index" "^1.9.1"
     "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.1"
+    "@types/ws" "^8.5.5"
     ansi-html-community "^0.0.8"
     bonjour-service "^1.0.11"
     chokidar "^3.5.3"
@@ -12219,7 +12219,7 @@ webpack-dev-server@^4.13.3:
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
+    webpack-dev-middleware "^5.3.4"
     ws "^8.13.0"
 
 webpack-merge@5.8.0:

From cfa6d505834ccc5d237f3db6b56f2c61142c7f28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:20:30 +0000
Subject: [PATCH 0696/1286] Bump @babel/runtime from 7.21.0 to 7.25.9

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.21.0 to 7.25.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.9/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 46dbebca64..48a35b075f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@angular/platform-browser-dynamic": "^15.2.10",
     "@angular/platform-server": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.25.9",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.3",
diff --git a/yarn.lock b/yarn.lock
index a42376a0ec..ef87624eba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,14 +1352,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@7.25.9", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
   integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==

From 7eb0a47fca04c0e0e9551eb42d997e269af34dc8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:20:58 +0000
Subject: [PATCH 0697/1286] Bump zone.js from 0.11.8 to 0.13.3

Bumps [zone.js](https://github.com/angular/angular/tree/HEAD/packages/zone.js) from 0.11.8 to 0.13.3.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/packages/zone.js/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/zone.js-0.13.3/packages/zone.js)

---
updated-dependencies:
- dependency-name: zone.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 46dbebca64..91026b4407 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "sanitize-html": "^2.12.1",
     "sortablejs": "1.15.3",
     "uuid": "^8.3.2",
-    "zone.js": "~0.11.5"
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
diff --git a/yarn.lock b/yarn.lock
index a42376a0ec..7644f2ec36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12607,9 +12607,9 @@ yocto-queue@^0.1.0:
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zone.js@~0.11.5:
-  version "0.11.8"
-  resolved "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz"
-  integrity sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==
+zone.js@~0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.3.tgz#344c24098fa047eda6427a4c7ed486e391fd67b5"
+  integrity sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==
   dependencies:
     tslib "^2.3.0"

From 603e46283fe4827217a4d807561a96a3d970e3b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:31:16 +0000
Subject: [PATCH 0698/1286] Bump angulartics2 from 12.2.0 to 12.2.1

Bumps [angulartics2](https://github.com/angulartics/angulartics2) from 12.2.0 to 12.2.1.
- [Release notes](https://github.com/angulartics/angulartics2/releases)
- [Commits](https://github.com/angulartics/angulartics2/compare/v12.2.0...v12.2.1)

---
updated-dependencies:
- dependency-name: angulartics2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 4c5a0f14b8..f2ae87a486 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "@types/grecaptcha": "^3.0.9",
     "angular-idle-preload": "3.0.0",
-    "angulartics2": "^12.2.0",
+    "angulartics2": "^12.2.1",
     "axios": "^1.7.7",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
diff --git a/yarn.lock b/yarn.lock
index f4a6dc381f..0f593936af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3157,10 +3157,10 @@ angular-idle-preload@3.0.0:
   resolved "https://registry.npmjs.org/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz"
   integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
 
-angulartics2@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.0.tgz#79159693b4436905391e3b1e7d549c900408e175"
-  integrity sha512-1wl/cPA4PGYj42z80VIR+A0Hy3+rt13POzfTfZ83NUDx2KKbHjtTKS0O7u3umi10cqvi5tn4NTSYIFFJ1fI2Tw==
+angulartics2@^12.2.1:
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.1.tgz#9a5727aaacafe77b6b912ff5a94532d41377ce51"
+  integrity sha512-+uDXkGGJJzzIITE59z1s3rL5okNyGXZN5mP7m2Ro9gouJF88COeRkhYlXZwIXkdQjBzIyOvUv6UamzgL9NiXLg==
   dependencies:
     tslib "^2.3.0"
 

From b7c4c737c12af0a62845e1a5ae6acc53a114f64f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 22 Oct 2024 16:29:48 -0500
Subject: [PATCH 0699/1286] Update dependabot.yml

---
 .github/dependabot.yml | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2ee321db78..51c8be4bbc 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -395,23 +395,10 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any webpack related version updates
-      webpack:
-        applies-to: version-updates
-        patterns:
-        - "webpack*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together any webpack related seurity updates
-      webpack:
-        applies-to: security-updates
-        patterns:
-        - "webpack*"
-        update-types:
-        - "minor"
-        - "patch"
     ignore:
+      # 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
+      # See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
+      - dependency-name: "webpack"
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]

From cddee3e1db9af1b2806dbc8f6b4bee60c4473a26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:33:14 +0000
Subject: [PATCH 0700/1286] Bump @babel/runtime from 7.25.7 to 7.25.9

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.25.7 to 7.25.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.9/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 0f3f495f14..2e78b90a35 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
     "@angular/ssr": "^17.3.10",
-    "@babel/runtime": "7.25.7",
+    "@babel/runtime": "7.25.9",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.3",
diff --git a/yarn.lock b/yarn.lock
index caf2acb7aa..ac5304c86b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1358,10 +1358,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@7.25.7", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.7.tgz#7ffb53c37a8f247c8c4d335e89cdf16a2e0d0fb6"
-  integrity sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==
+"@babel/runtime@7.25.9", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
+  integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -5517,11 +5517,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"

From 280d6d92ad479da46dacf2c82974fd79e658d955 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:33:30 +0000
Subject: [PATCH 0701/1286] Bump @babel/runtime from 7.25.7 to 7.25.9

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.25.7 to 7.25.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.9/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index fe5ad6ab9c..8f4d667547 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/platform-server": "^17.3.12",
         "@angular/router": "^17.3.12",
         "@angular/ssr": "^17.3.10",
-        "@babel/runtime": "7.25.7",
+        "@babel/runtime": "7.25.9",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
@@ -3789,9 +3789,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
-      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
+      "integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
diff --git a/package.json b/package.json
index ac78d06d4f..964ba08ea1 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@angular/platform-server": "^17.3.12",
     "@angular/router": "^17.3.12",
     "@angular/ssr": "^17.3.10",
-    "@babel/runtime": "7.25.7",
+    "@babel/runtime": "7.25.9",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",

From a9febec691ce990cf98f551c5e931f73ed72c29f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:33:31 +0000
Subject: [PATCH 0702/1286] Bump @types/lodash from 4.17.10 to 4.17.12

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.10 to 4.17.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 0f3f495f14..654548a528 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.10",
+    "@types/lodash": "^4.17.12",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index caf2acb7aa..8aecb589a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2762,10 +2762,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.17.10":
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.10.tgz#64f3edf656af2fe59e7278b73d3e62404144a6e6"
-  integrity sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==
+"@types/lodash@^4.17.12":
+  version "4.17.12"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.12.tgz#25d71312bf66512105d71e55d42e22c36bcfc689"
+  integrity sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==
 
 "@types/mime@^1":
   version "1.3.5"
@@ -5517,11 +5517,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"

From 2ab1472f223edd37e172996ad0ec417db20aeb21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:34:01 +0000
Subject: [PATCH 0703/1286] Bump postcss from 8.4.39 to 8.4.47

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.39 to 8.4.47.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.39...8.4.47)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe5ad6ab9c..2e33259a47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18016,9 +18016,9 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
       "version": "4.0.1",
@@ -18192,9 +18192,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -18211,8 +18211,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -21103,9 +21103,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "engines": {
         "node": ">=0.10.0"
       }

From 93c6ab2684cec35246c571d5d16bc72d72940f30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:34:52 +0000
Subject: [PATCH 0704/1286] Bump webpack from 5.94.0 to 5.95.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.94.0 to 5.95.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.94.0...v5.95.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index fe5ad6ab9c..c50b997621 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -155,7 +155,7 @@
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.94.0",
+        "webpack": "5.95.0",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
@@ -823,6 +823,31 @@
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -882,6 +907,28 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -952,6 +999,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
       "version": "8.4.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
@@ -1173,6 +1232,52 @@
         "@esbuild/win32-x64": "0.19.12"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
       "version": "4.15.1",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
@@ -1255,6 +1360,46 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/@angular-devkit/build-webpack": {
       "version": "0.1703.10",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz",
@@ -22508,11 +22653,10 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
diff --git a/package.json b/package.json
index ac78d06d4f..6bf349a526 100644
--- a/package.json
+++ b/package.json
@@ -242,7 +242,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.94.0",
+    "webpack": "5.95.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"

From 5cb22bb1d09826865aea5f6a65ec76f10c9db885 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:58:01 +0000
Subject: [PATCH 0705/1286] Bump reflect-metadata from 0.1.13 to 0.2.2

Bumps [reflect-metadata](https://github.com/rbuckton/reflect-metadata) from 0.1.13 to 0.2.2.
- [Release notes](https://github.com/rbuckton/reflect-metadata/releases)
- [Changelog](https://github.com/rbuckton/reflect-metadata/blob/main/tsconfig-release.json)
- [Commits](https://github.com/rbuckton/reflect-metadata/commits)

---
updated-dependencies:
- dependency-name: reflect-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index e5e16fc7ff..c7a79d8ed1 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "pem": "1.14.8",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.13.1",
     "sortablejs": "1.15.3",
diff --git a/yarn.lock b/yarn.lock
index d730e08003..50d822c6dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10195,11 +10195,16 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
+reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
+reflect-metadata@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
+  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
+
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"

From 1a816228e8483bff6c6e71bd7962ef66d9184630 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 23 Oct 2024 13:56:18 +0200
Subject: [PATCH 0706/1286] 118223: Add 'loading' overlay while bitstream is
 moving

---
 .../item-bitstreams.component.html            |  4 +-
 .../item-bitstreams.component.scss            | 10 +++++
 .../item-bitstreams.component.ts              |  6 +++
 .../item-bitstreams.service.spec.ts           | 18 ++++++++-
 .../item-bitstreams.service.stub.ts           |  4 ++
 .../item-bitstreams.service.ts                | 38 +++++++++++++++----
 src/assets/i18n/en.json5                      |  2 +
 7 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 7789b68278..88525eb18b 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -27,7 +27,7 @@
     </button>
   </div>
 
-  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border scrollable-table">
+  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border scrollable-table" [ngClass]="{'disabled-overlay': (isProcessingMoveRequest | async)}">
     <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles; first as isFirst"
                                    [bundle]="bundle"
                                    [item]="item"
@@ -63,3 +63,5 @@
     </div>
   </div>
 </div>
+
+<ds-themed-loading *ngIf="isProcessingMoveRequest | async" class="loading-overlay"></ds-themed-loading>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 985516ab12..7fd1f4b31e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -43,3 +43,13 @@
 .scrollable-table {
   overflow-x: auto;
 }
+
+.disabled-overlay {
+  opacity: 0.6;
+}
+
+.loading-overlay {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 6ee5dcb545..72f85675c9 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -59,6 +59,11 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   itemUpdateSubscription: Subscription;
 
+  /**
+   * An observable which emits a boolean which represents whether the service is currently handling a 'move' request
+   */
+  isProcessingMoveRequest: Observable<boolean>;
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
@@ -84,6 +89,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   postItemInit(): void {
     const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
+    this.isProcessingMoveRequest = this.itemBitstreamsService.getPerformingMoveRequest$();
 
     this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: bundlesOptions})).pipe(
       getFirstSucceededRemoteData(),
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
index f2af25f22f..a0277ef064 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -573,8 +573,6 @@ describe('ItemBitstreamsService', () => {
     const to = 7;
     const callback = createSpy('callbackFunction');
 
-    console.log('bundle:', bundle);
-
     it('should correctly create the Move request', () => {
       const expectedOperation: MoveOperation = {
         op: 'move',
@@ -601,6 +599,22 @@ describe('ItemBitstreamsService', () => {
       service.performBitstreamMoveRequest(bundle, from, to, callback);
       expect(callback).toHaveBeenCalled();
     });
+
+    it('should emit at the start and end of the request', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getPerformingMoveRequest$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeFalse();
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[1]).toBeTrue();
+      expect(emittedActions[2]).toBeFalse();
+    }));
   });
 
   describe('displayNotifications', () => {
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
index 7aac79fe69..f60693f726 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
@@ -30,6 +30,10 @@ export class ItemBitstreamsServiceStub {
 
   performBitstreamMoveRequest = jasmine.createSpy('performBitstreamMoveRequest');
 
+  getPerformingMoveRequest = jasmine.createSpy('getPerformingMoveRequest').and.returnValue(false);
+
+  getPerformingMoveRequest$ = jasmine.createSpy('getPerformingMoveRequest$').and.returnValue(of(false));
+
   getInitialBundlesPaginationOptions = jasmine.createSpy('getInitialBundlesPaginationOptions').and
     .returnValue(new PaginationComponentOptions());
 
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index 2329107c29..9bbf380487 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -119,7 +119,7 @@ export class ItemBitstreamsService {
    */
   protected selectionAction$: BehaviorSubject<SelectionAction> = new BehaviorSubject(null);
 
-  protected isPerformingMoveRequest = false;
+  protected isPerformingMoveRequest: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     protected notificationsService: NotificationsService,
@@ -221,7 +221,7 @@ export class ItemBitstreamsService {
   cancelSelection() {
     const selected = this.getSelectedBitstream();
 
-    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
       return;
     }
 
@@ -247,7 +247,7 @@ export class ItemBitstreamsService {
   moveSelectedBitstreamUp() {
     const selected = this.getSelectedBitstream();
 
-    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
       return;
     }
 
@@ -272,7 +272,7 @@ export class ItemBitstreamsService {
   moveSelectedBitstreamDown() {
     const selected = this.getSelectedBitstream();
 
-    if (hasNoValue(selected) || this.isPerformingMoveRequest) {
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
       return;
     }
 
@@ -299,7 +299,7 @@ export class ItemBitstreamsService {
    * @param finish Optional: Function to execute once the response has been received
    */
   performBitstreamMoveRequest(bundle: Bundle, fromIndex: number, toIndex: number, finish?: () => void) {
-    if (this.isPerformingMoveRequest) {
+    if (this.getPerformingMoveRequest()) {
       console.warn('Attempted to perform move request while previous request has not completed yet');
       return;
     }
@@ -310,18 +310,34 @@ export class ItemBitstreamsService {
       path: `/_links/bitstreams/${toIndex}/href`,
     };
 
-    this.isPerformingMoveRequest = true;
+    this.announceLoading();
+    this.isPerformingMoveRequest.next(true);
     this.bundleService.patch(bundle, [moveOperation]).pipe(
       getFirstCompletedRemoteData(),
       tap((response: RemoteData<Bundle>) => this.displayFailedResponseNotifications(MOVE_KEY, [response])),
       switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
       take(1),
     ).subscribe(() => {
-      this.isPerformingMoveRequest = false;
+      console.log('got here!');
+      this.isPerformingMoveRequest.next(false);
       finish?.();
     });
   }
 
+  /**
+   * Whether the service currently is processing a 'move' request
+   */
+  getPerformingMoveRequest(): boolean {
+    return this.isPerformingMoveRequest.value;
+  }
+
+  /**
+   * Returns an observable which emits when the service starts, or ends, processing a 'move' request
+   */
+  getPerformingMoveRequest$(): Observable<boolean> {
+    return this.isPerformingMoveRequest;
+  }
+
   /**
    * Returns the pagination options to use when fetching the bundles
    */
@@ -526,4 +542,12 @@ export class ItemBitstreamsService {
       { bitstream: bitstreamName });
     this.liveRegionService.addMessage(message);
   }
+
+  /**
+   * Adds a message to the live region mentioning that the
+   */
+  announceLoading() {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.loading');
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 519189ed69..9007982a72 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1954,6 +1954,8 @@
 
   "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
 
+  "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+
   "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
 
   "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",

From 207e2ac9aee7fbc7958ae4aba332fa84c21bbea2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:08:36 +0000
Subject: [PATCH 0707/1286] Bump typescript from 5.3.3 to 5.4.5

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.3.3 to 5.4.5.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.3.3...v5.4.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 654548a528..0a15a4538e 100644
--- a/package.json
+++ b/package.json
@@ -208,7 +208,7 @@
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
-    "typescript": "~5.3.3",
+    "typescript": "~5.4.5",
     "webpack": "5.95.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
diff --git a/yarn.lock b/yarn.lock
index 8aecb589a8..48a66bae41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11332,10 +11332,10 @@ typescript@^2.5.0:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
-typescript@~5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+typescript@~5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 ua-parser-js@^0.7.30:
   version "0.7.38"

From 87dc6be213666b3079df6285b755bd7aef0683db Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 22 Oct 2024 11:35:09 -0500
Subject: [PATCH 0708/1286] Remove unnecessary @ts-expect-error, as the bug
 they are expecting is fixed in webpack 5.95.0.

---
 webpack/webpack.common.ts | 1 -
 webpack/webpack.prod.ts   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index d8155288cb..8d433edf39 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -79,7 +79,6 @@ const SCSS_LOADERS = [
 
 export const commonExports = {
   plugins: [
-    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       languageHashes: getFileHashes(path.join(__dirname, '..', 'src', 'assets', 'i18n'), /.*\.json5/g),
     }),
diff --git a/webpack/webpack.prod.ts b/webpack/webpack.prod.ts
index fce321d152..e35bc0c907 100644
--- a/webpack/webpack.prod.ts
+++ b/webpack/webpack.prod.ts
@@ -6,7 +6,6 @@ import { commonExports } from './webpack.common';
 module.exports = Object.assign({}, commonExports, {
   plugins: [
     ...commonExports.plugins,
-    // @ts-expect-error: EnvironmentPlugin constructor types are currently to strict see issue https://github.com/webpack/webpack/issues/18719
     new EnvironmentPlugin({
       'process.env': {
         NODE_ENV: 'production',

From 92ee89e8e5150920dc225384b9f7f4a543af31a5 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 11:31:16 -0500
Subject: [PATCH 0709/1286] Fix bug in dependabot.yml "security-updates"
 settings

"security-updates" configs can only be in sections where there is no "target-branch". This is because they only apply to the primary branch.
---
 .github/dependabot.yml | 122 ++---------------------------------------
 1 file changed, 6 insertions(+), 116 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 51c8be4bbc..4d49cc5117 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,12 +1,16 @@
-# Enable Dependabot NPM updates for all dependencies on a weekly basis
+#-------------------
+# DSpace's dependabot rules. Enables npm updates for all dependencies on a weekly basis
+# for main and any maintenance branches. Security updates only apply to main.
+#-------------------
 version: 2
 updates:
   ###############
   ## Main branch
   ###############
+  # NOTE: At this time, "security-updates" rules only apply if "target-branch" is unspecified
+  # So, only this first section can include "applies-to: security-updates"
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: main
     schedule:
       interval: "weekly"
     # Allow up to 10 open PRs for dependencies
@@ -159,14 +163,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for Angular. Only accept minor/patch types.
-      angular-security:
-        applies-to: security-updates
-        patterns:
-        - "@angular*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together all minor/patch version updates for NgRx in a single PR
       ngrx:
         applies-to: version-updates
@@ -175,14 +171,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for NgRx. Only accept minor/patch types.
-      ngrx-security:
-        applies-to: security-updates
-        patterns:
-        - "@ngrx*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together all patch version updates for eslint in a single PR
       eslint:
         applies-to: version-updates
@@ -192,15 +180,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for eslint.
-      eslint-security:
-        applies-to: security-updates
-        patterns:
-        - "@typescript-eslint*"
-        - "eslint*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates
@@ -213,18 +192,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any testing related security updates
-      testing:
-        applies-to: security-updates
-        patterns:
-        - "@cypress*"
-        - "cypress*"
-        - "jasmine*"
-        - "karma*"
-        - "ng-mocks"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any postcss related version updates
       postcss:
         applies-to: version-updates
@@ -233,23 +200,7 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any postcss related security updates
-      postcss:
-        applies-to: security-updates
-        patterns:
-        - "postcss*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any sass related version updates
-      sass:
-        applies-to: version-updates
-        patterns:
-        - "sass*"
-        update-types:
-        - "minor"
-        - "patch"
-      # Group together any sass related security updates
       sass:
         applies-to: version-updates
         patterns:
@@ -265,14 +216,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any webpack related seurity updates
-      webpack:
-        applies-to: security-updates
-        patterns:
-        - "webpack*"
-        update-types:
-        - "minor"
-        - "patch"
     ignore:
       # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
       - dependency-name: "*"
@@ -297,14 +240,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for Angular. Only accept minor/patch types.
-      angular-security:
-        applies-to: security-updates
-        patterns:
-        - "@angular*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together all minor/patch version updates for NgRx in a single PR
       ngrx:
         applies-to: version-updates
@@ -313,14 +248,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for NgRx. Only accept minor/patch types.
-      ngrx-security:
-        applies-to: security-updates
-        patterns:
-        - "@ngrx*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together all patch version updates for eslint in a single PR
       eslint:
         applies-to: version-updates
@@ -330,15 +257,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together all security updates for eslint.
-      eslint-security:
-        applies-to: security-updates
-        patterns:
-        - "@typescript-eslint*"
-        - "eslint*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any testing related version updates
       testing:
         applies-to: version-updates
@@ -351,18 +269,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any testing related security updates
-      testing:
-        applies-to: security-updates
-        patterns:
-        - "@cypress*"
-        - "cypress*"
-        - "jasmine*"
-        - "karma*"
-        - "ng-mocks"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any postcss related version updates
       postcss:
         applies-to: version-updates
@@ -371,14 +277,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any postcss related security updates
-      postcss:
-        applies-to: security-updates
-        patterns:
-        - "postcss*"
-        update-types:
-        - "minor"
-        - "patch"
       # Group together any sass related version updates
       sass:
         applies-to: version-updates
@@ -387,14 +285,6 @@ updates:
         update-types:
         - "minor"
         - "patch"
-      # Group together any sass related security updates
-      sass:
-        applies-to: version-updates
-        patterns:
-        - "sass*"
-        update-types:
-        - "minor"
-        - "patch"
     ignore:
       # 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
       # See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489

From ea8f24d41071f3f146dbbbfe2f43617d38a1713a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 11:33:28 -0500
Subject: [PATCH 0710/1286] Fix bug where all security-updates need unique IDs

---
 .github/dependabot.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4d49cc5117..0ebfc93793 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -80,7 +80,7 @@ updates:
         - "minor"
         - "patch"
       # Group together any testing related security updates
-      testing:
+      testing-security:
         applies-to: security-updates
         patterns:
         - "@cypress*"
@@ -100,7 +100,7 @@ updates:
         - "minor"
         - "patch"
       # Group together any postcss related security updates
-      postcss:
+      postcss-security:
         applies-to: security-updates
         patterns:
         - "postcss*"
@@ -116,8 +116,8 @@ updates:
         - "minor"
         - "patch"
       # Group together any sass related security updates
-      sass:
-        applies-to: version-updates
+      sass-security:
+        applies-to: security-updates
         patterns:
         - "sass*"
         update-types:
@@ -132,7 +132,7 @@ updates:
         - "minor"
         - "patch"
       # Group together any webpack related seurity updates
-      webpack:
+      webpack-security:
         applies-to: security-updates
         patterns:
         - "webpack*"

From 74e85c79e745980e96412dd641c221edc0253b39 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 11:42:09 -0500
Subject: [PATCH 0711/1286] Remove unused @types/sanitize-html

---
 package-lock.json | 10 ----------
 package.json      |  1 -
 2 files changed, 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a662e3a04..f9712c2779 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -102,7 +102,6 @@
         "@types/js-cookie": "2.2.6",
         "@types/lodash": "^4.17.12",
         "@types/node": "^14.14.9",
-        "@types/sanitize-html": "^2.9.0",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
         "@typescript-eslint/rule-tester": "^7.18.0",
@@ -7053,15 +7052,6 @@
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true
     },
-    "node_modules/@types/sanitize-html": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.11.0.tgz",
-      "integrity": "sha512-7oxPGNQHXLHE48r/r/qjn7q0hlrs3kL7oZnGj0Wf/h9tj/6ibFyRkNbsDxaBBZ4XUZ0Dx5LGCyDJ04ytSofacQ==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^8.0.0"
-      }
-    },
     "node_modules/@types/scheduler": {
       "version": "0.16.8",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
diff --git a/package.json b/package.json
index 8fc0e42a17..768b028dd9 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,6 @@
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",
     "@types/node": "^14.14.9",
-    "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "@typescript-eslint/rule-tester": "^7.18.0",

From 9486ab5fa1d3d0fc11ceb9f5063bbda61a078924 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 18 Oct 2024 14:26:48 -0500
Subject: [PATCH 0712/1286] Fix code scanning alert no. 6: Incomplete string
 escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 372444c50ac28a6c7f68b20695bea616a3ab8b7f)
---
 src/app/core/shared/metadata.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 87a90b53a3..e48b2b0c44 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -157,7 +157,7 @@ export class Metadata {
     const outputKeys: string[] = [];
     for (const inputKey of inputKeys) {
       if (inputKey.includes('*')) {
-        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
+        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\\/g, '\\\\').replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
         for (const mapKey of Object.keys(mdMap)) {
           if (!outputKeys.includes(mapKey) && inputKeyRegex.test(mapKey)) {
             outputKeys.push(mapKey);

From bb84d86cf521fe6c25f12c3d07390289db87f96b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 18 Oct 2024 14:26:48 -0500
Subject: [PATCH 0713/1286] Fix code scanning alert no. 6: Incomplete string
 escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
(cherry picked from commit 372444c50ac28a6c7f68b20695bea616a3ab8b7f)
---
 src/app/core/shared/metadata.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 1ad10356fb..f0290eac39 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -163,7 +163,7 @@ export class Metadata {
     const outputKeys: string[] = [];
     for (const inputKey of inputKeys) {
       if (inputKey.includes('*')) {
-        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
+        const inputKeyRegex = new RegExp('^' + inputKey.replace(/\\/g, '\\\\').replace(/\./g, '\\.').replace(/\*/g, '.*') + '$');
         for (const mapKey of Object.keys(mdMap)) {
           if (!outputKeys.includes(mapKey) && inputKeyRegex.test(mapKey)) {
             outputKeys.push(mapKey);

From c93ed03004ddff1186548342b853df2281bdb43a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 13:26:55 -0500
Subject: [PATCH 0714/1286] Remove unused/unmaintained postcss-apply dep

---
 package-lock.json | 43 -------------------------------------------
 package.json      |  1 -
 postcss.config.js |  1 -
 3 files changed, 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f9712c2779..0b4111366b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,6 @@
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
         "postcss": "^8.4",
-        "postcss-apply": "0.12.0",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
@@ -18353,48 +18352,6 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postcss-apply": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.12.0.tgz",
-      "integrity": "sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.14"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/postcss-apply/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/postcss-attribute-case-insensitive": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
diff --git a/package.json b/package.json
index 768b028dd9..2f11659730 100644
--- a/package.json
+++ b/package.json
@@ -227,7 +227,6 @@
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
-    "postcss-apply": "0.12.0",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
diff --git a/postcss.config.js b/postcss.config.js
index df092d1d39..14013bd4f8 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -2,7 +2,6 @@ module.exports = {
   plugins: [
     require('postcss-import')(),
     require('postcss-preset-env')(),
-    require('postcss-apply')(),
     require('postcss-responsive-type')()
   ]
 };

From 39c5c755d75339230681d45fec5b4878634d7e16 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 13:39:01 -0500
Subject: [PATCH 0715/1286] Remove unused postcss-responsive-type

---
 package-lock.json | 33 ---------------------------------
 package.json      |  1 -
 postcss.config.js |  3 +--
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b4111366b..2a0990de9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,7 +143,6 @@
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
-        "postcss-responsive-type": "1.0.0",
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
         "rimraf": "^3.0.2",
@@ -19033,38 +19032,6 @@
         "postcss": "^8.0.3"
       }
     },
-    "node_modules/postcss-responsive-type": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz",
-      "integrity": "sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.6"
-      }
-    },
-    "node_modules/postcss-responsive-type/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-responsive-type/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/postcss-selector-not": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
diff --git a/package.json b/package.json
index 2f11659730..71c0d5272e 100644
--- a/package.json
+++ b/package.json
@@ -230,7 +230,6 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "postcss-responsive-type": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
diff --git a/postcss.config.js b/postcss.config.js
index 14013bd4f8..f8b9666b31 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   plugins: [
     require('postcss-import')(),
-    require('postcss-preset-env')(),
-    require('postcss-responsive-type')()
+    require('postcss-preset-env')()
   ]
 };

From 04410485a5e08f125b6a595115921a45d6982860 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 13:55:36 -0500
Subject: [PATCH 0716/1286] Remove unused/unmaintained postcss-apply

---
 package.json      |  1 -
 postcss.config.js |  1 -
 yarn.lock         | 23 ++---------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index c48d1e3154..65a03efe6c 100644
--- a/package.json
+++ b/package.json
@@ -195,7 +195,6 @@
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
-    "postcss-apply": "0.12.0",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
diff --git a/postcss.config.js b/postcss.config.js
index df092d1d39..14013bd4f8 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -2,7 +2,6 @@ module.exports = {
   plugins: [
     require('postcss-import')(),
     require('postcss-preset-env')(),
-    require('postcss-apply')(),
     require('postcss-responsive-type')()
   ]
 };
diff --git a/yarn.lock b/yarn.lock
index 961ce5de26..dcebeb2972 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5517,9 +5517,11 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -8962,11 +8964,6 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
 picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -9043,14 +9040,6 @@ possible-typed-array-names@^1.0.0:
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
   integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
-postcss-apply@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/postcss-apply/-/postcss-apply-0.12.0.tgz#11a47b271b14d81db97ed7f51a6c409d025a9c34"
-  integrity sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.14"
-
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
@@ -9389,14 +9378,6 @@ postcss@^6.0.6:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.14:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
 postcss@^8.2.14, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"

From e7ff5646084696d96d33c56bd0ea04568c375d85 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 13:56:46 -0500
Subject: [PATCH 0717/1286] Remove unused postcss-responsive-type

---
 package.json      |  1 -
 postcss.config.js |  3 +--
 yarn.lock         | 20 ++------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 65a03efe6c..ae74beaae4 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,6 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "postcss-responsive-type": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
diff --git a/postcss.config.js b/postcss.config.js
index 14013bd4f8..f8b9666b31 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   plugins: [
     require('postcss-import')(),
-    require('postcss-preset-env')(),
-    require('postcss-responsive-type')()
+    require('postcss-preset-env')()
   ]
 };
diff --git a/yarn.lock b/yarn.lock
index dcebeb2972..e63ae27112 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4164,7 +4164,7 @@ chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -9333,13 +9333,6 @@ postcss-replace-overflow-wrap@^4.0.0:
   resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-responsive-type@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz#bb2d57d830beb9586ec4fda7994f07e37953aad8"
-  integrity sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==
-  dependencies:
-    postcss "^6.0.6"
-
 postcss-selector-not@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
@@ -9369,15 +9362,6 @@ postcss@8.4.35:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^6.0.6:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 postcss@^8.2.14, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
@@ -10904,7 +10888,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==

From 5c877f56e92e07633efecab036a1493b8a06c465 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 14:11:53 -0500
Subject: [PATCH 0718/1286] Remove unused/unmaintained postcss-apply

---
 package.json      |  1 -
 postcss.config.js |  1 -
 yarn.lock         | 21 ---------------------
 3 files changed, 23 deletions(-)

diff --git a/package.json b/package.json
index 5197b720dc..b3988ad5d0 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,6 @@
     "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
-    "postcss-apply": "0.12.0",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
diff --git a/postcss.config.js b/postcss.config.js
index df092d1d39..14013bd4f8 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -2,7 +2,6 @@ module.exports = {
   plugins: [
     require('postcss-import')(),
     require('postcss-preset-env')(),
-    require('postcss-apply')(),
     require('postcss-responsive-type')()
   ]
 };
diff --git a/yarn.lock b/yarn.lock
index 3f6a555df3..3a1f482a96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9279,11 +9279,6 @@ performance-now@^2.1.0:
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
 picocolors@^1.0.0, picocolors@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -9352,14 +9347,6 @@ possible-typed-array-names@^1.0.0:
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
   integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
-postcss-apply@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.12.0.tgz"
-  integrity sha512-u8qZLyA9P86cD08IhqjSVV8tf1eGiKQ4fPvjcG3Ic/eOU65EAkDQClp8We7d15TG+RIWRVPSy9v7cJ2D9OReqw==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.14"
-
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
   resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"
@@ -9693,14 +9680,6 @@ postcss@^6.0.6:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.14:
-  version "7.0.39"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"

From 425078dc4e60aac89151c5ab516597faca2271f6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 14:13:33 -0500
Subject: [PATCH 0719/1286] Remove unused postcss-responsive-type

---
 package.json      |  1 -
 postcss.config.js |  3 +--
 yarn.lock         | 20 ++------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index b3988ad5d0..aaf3c17656 100644
--- a/package.json
+++ b/package.json
@@ -188,7 +188,6 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "postcss-responsive-type": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
diff --git a/postcss.config.js b/postcss.config.js
index 14013bd4f8..f8b9666b31 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   plugins: [
     require('postcss-import')(),
-    require('postcss-preset-env')(),
-    require('postcss-responsive-type')()
+    require('postcss-preset-env')()
   ]
 };
diff --git a/yarn.lock b/yarn.lock
index 3a1f482a96..b05cebf7cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3937,7 +3937,7 @@ chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -9635,13 +9635,6 @@ postcss-replace-overflow-wrap@^4.0.0:
   resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-responsive-type@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz"
-  integrity sha512-O4kAKbc4RLnSkzcguJ6ojW67uOfeILaj+8xjsO0quLU94d8BKCqYwwFEUVRNbj0YcXA6d3uF/byhbaEATMRVig==
-  dependencies:
-    postcss "^6.0.6"
-
 postcss-selector-not@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"
@@ -9671,15 +9664,6 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^6.0.6:
-  version "6.0.23"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
   version "8.4.47"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
@@ -11315,7 +11299,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==

From 693adc7cfc8467b33f4bf4614ee33a0095a1f773 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 14:34:12 -0500
Subject: [PATCH 0720/1286] Bump http-proxy-middleware from 1.0.5 to 2.0.7

---
 package-lock.json | 65 ++++++++++++++++++-----------------------------
 package.json      |  2 +-
 2 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f9712c2779..1c3d4c4dd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
-        "http-proxy-middleware": "^1.0.5",
+        "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
         "isbot": "^5.1.17",
         "js-cookie": "2.2.1",
@@ -6813,7 +6813,7 @@
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -6838,7 +6838,7 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -6890,7 +6890,7 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
       "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -6902,7 +6902,7 @@
       "version": "4.19.5",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
       "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -6928,7 +6928,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/http-proxy": {
       "version": "1.17.14",
@@ -6972,7 +6972,7 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/node": {
       "version": "14.18.63",
@@ -7003,13 +7003,13 @@
       "version": "6.9.15",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
       "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/react": {
       "version": "17.0.80",
@@ -7068,7 +7068,7 @@
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
       "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -7087,7 +7087,7 @@
       "version": "1.15.7",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*",
@@ -13607,18 +13607,27 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
-      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "license": "MIT",
       "dependencies": {
-        "@types/http-proxy": "^1.17.5",
+        "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
         "is-glob": "^4.0.1",
         "is-plain-obj": "^3.0.0",
         "micromatch": "^4.0.2"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
       }
     },
     "node_modules/http-signature": {
@@ -22906,30 +22915,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
diff --git a/package.json b/package.json
index 768b028dd9..b608625725 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
-    "http-proxy-middleware": "^1.0.5",
+    "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
     "isbot": "^5.1.17",
     "js-cookie": "2.2.1",

From 0ed8c05e1c40824d8d428a96c9fb5a0fddd5131a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 15:01:54 -0500
Subject: [PATCH 0721/1286] Bump http-proxy-middleware from 1.0.5 to 2.0.7

---
 package.json |  2 +-
 yarn.lock    | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5197b720dc..d9251da2b9 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
-    "http-proxy-middleware": "^1.0.5",
+    "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
     "isbot": "^5.1.17",
     "js-cookie": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 3f6a555df3..dd61f43ddb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2522,7 +2522,7 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
+"@types/http-proxy@^1.17.8":
   version "1.17.10"
   resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"
   integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==
@@ -6629,21 +6629,10 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@^1.0.5:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"
-  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
-  dependencies:
-    "@types/http-proxy" "^1.17.5"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.6, http-proxy-middleware@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"

From 26f6dc562bd07597ad2bf161d1151d6824d88f9b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 14:57:51 -0500
Subject: [PATCH 0722/1286] Bump http-proxy-middleware from 1.0.5 to 2.0.7

---
 package.json |  2 +-
 yarn.lock    | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c48d1e3154..c32aea3711 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
-    "http-proxy-middleware": "^1.0.5",
+    "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
     "isbot": "^5.1.17",
     "js-cookie": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 961ce5de26..d93534d387 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2735,7 +2735,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
   integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
 
-"@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
+"@types/http-proxy@^1.17.8":
   version "1.17.15"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36"
   integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==
@@ -5517,9 +5517,11 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -6586,7 +6588,7 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3:
+http-proxy-middleware@2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
   integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
@@ -6597,12 +6599,12 @@ http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3:
     is-plain-obj "^3.0.0"
     micromatch "^4.0.2"
 
-http-proxy-middleware@^1.0.5:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
-  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
+http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
-    "@types/http-proxy" "^1.17.5"
+    "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
     is-glob "^4.0.1"
     is-plain-obj "^3.0.0"

From d4bb79ca18d20111786015bd4657c468a29985f2 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Tue, 22 Oct 2024 13:29:05 -0300
Subject: [PATCH 0723/1286] Issue 3426 - Aligning the browse button

(cherry picked from commit ddafda33b8c4730a732a133147451390ee2c7ab7)
---
 src/app/shared/upload/uploader/uploader.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index b1fd8199d8..4c1db13d13 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -19,8 +19,8 @@
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span>
-          <i class="fas fa-upload" aria-hidden="true"></i>
+        <span class="d-flex align-items-center">
+          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
             <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>

From 1c8c5de570679b10dba35e7ed69cf45070637a6f Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Tue, 22 Oct 2024 13:29:05 -0300
Subject: [PATCH 0724/1286] Issue 3426 - Aligning the browse button

(cherry picked from commit ddafda33b8c4730a732a133147451390ee2c7ab7)
---
 src/app/shared/upload/uploader/uploader.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index b1fd8199d8..4c1db13d13 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -19,8 +19,8 @@
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span>
-          <i class="fas fa-upload" aria-hidden="true"></i>
+        <span class="d-flex align-items-center">
+          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
           <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
             <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>

From 217b72a3329329f5a8c83c4bb2c57982bd165b33 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 15:58:35 -0500
Subject: [PATCH 0725/1286] Move @types/grecaptcha to dev dependencies

---
 package-lock.json | 6 ++++--
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 242701505c..6ad2f490fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,6 @@
         "@ngrx/store": "^17.1.1",
         "@ngx-translate/core": "^14.0.0",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-        "@types/grecaptcha": "^3.0.4",
         "angular-idle-preload": "3.0.0",
         "angulartics2": "^12.2.0",
         "axios": "^1.7.4",
@@ -98,6 +97,7 @@
         "@types/deep-freeze": "0.1.5",
         "@types/ejs": "^3.1.2",
         "@types/express": "^4.17.17",
+        "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
         "@types/lodash": "^4.17.12",
@@ -6911,7 +6911,9 @@
     "node_modules/@types/grecaptcha": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.9.tgz",
-      "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw=="
+      "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
       "version": "3.3.5",
diff --git a/package.json b/package.json
index 8962fa742b..d54f1539cc 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,6 @@
     "@ngrx/store": "^17.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.4",
@@ -185,6 +184,7 @@
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
+    "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",

From fef5dd72b30ca6174587f1a7dea8994f1e96bbc9 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 15:59:45 -0500
Subject: [PATCH 0726/1286] Remove unused angular-idle-preload

---
 package-lock.json | 6 ------
 package.json      | 1 -
 2 files changed, 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ad2f490fd..65cf715701 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,6 @@
         "@ngrx/store": "^17.1.1",
         "@ngx-translate/core": "^14.0.0",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-        "angular-idle-preload": "3.0.0",
         "angulartics2": "^12.2.0",
         "axios": "^1.7.4",
         "bootstrap": "^4.6.1",
@@ -8024,11 +8023,6 @@
         "ajv": "^8.8.2"
       }
     },
-    "node_modules/angular-idle-preload": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz",
-      "integrity": "sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA=="
-    },
     "node_modules/angulartics2": {
       "version": "12.2.1",
       "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-12.2.1.tgz",
diff --git a/package.json b/package.json
index d54f1539cc..09badd8e67 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,6 @@
     "@ngrx/store": "^17.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.4",
     "bootstrap": "^4.6.1",

From 426a0ac4880dbfb2381685ab39222ce347e2bc1c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 16:06:26 -0500
Subject: [PATCH 0727/1286] Remove unused browser-sync

---
 package-lock.json | 145 +++++++++++++++++++++++++++++++++++++++++-----
 package.json      |   1 -
 2 files changed, 131 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65cf715701..c00a49ab84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,7 +106,6 @@
         "@typescript-eslint/rule-tester": "^7.18.0",
         "@typescript-eslint/utils": "^7.18.0",
         "axe-core": "^4.10.0",
-        "browser-sync": "^3.0.3",
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
@@ -8340,6 +8339,8 @@
       "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz",
       "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -8793,6 +8794,8 @@
       "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.3.tgz",
       "integrity": "sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "browser-sync-client": "^3.0.3",
         "browser-sync-ui": "^3.0.3",
@@ -8835,6 +8838,8 @@
       "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.3.tgz",
       "integrity": "sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "etag": "1.8.1",
         "fresh": "0.5.2",
@@ -8849,6 +8854,8 @@
       "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz",
       "integrity": "sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "async-each-series": "0.1.1",
         "chalk": "4.1.2",
@@ -8864,6 +8871,8 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8879,6 +8888,8 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8895,6 +8906,8 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8906,13 +8919,17 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/browser-sync-ui/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -8922,6 +8939,8 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8934,6 +8953,8 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8949,6 +8970,8 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8965,6 +8988,8 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8976,13 +9001,17 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/browser-sync/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -8992,6 +9021,8 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9034,7 +9065,9 @@
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz",
       "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/buffer": {
       "version": "5.7.1",
@@ -9655,6 +9688,8 @@
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
       "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.0",
@@ -9670,6 +9705,8 @@
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
       "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -9679,6 +9716,8 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -9687,7 +9726,9 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -10808,6 +10849,8 @@
       "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
       "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "bin": {
         "dev-ip": "lib/dev-ip.js"
       },
@@ -10979,6 +11022,8 @@
       "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz",
       "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "lodash": "^4.17.10"
       },
@@ -10991,6 +11036,8 @@
       "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz",
       "integrity": "sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "chalk": "4.1.2"
       },
@@ -11003,6 +11050,8 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11018,6 +11067,8 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11034,6 +11085,8 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -11045,13 +11098,17 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/eazy-logger/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -11061,6 +11118,8 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11194,6 +11253,8 @@
       "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
       "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
@@ -12774,6 +12835,8 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
       "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.1",
@@ -12792,6 +12855,8 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -12800,13 +12865,17 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/finalhandler/node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -12819,6 +12888,8 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
       "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -12990,6 +13061,8 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
       "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^3.0.0",
@@ -13790,6 +13863,8 @@
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
       "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14228,6 +14303,8 @@
       "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
       "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "lodash.isfinite": "^3.3.2"
       }
@@ -14944,6 +15021,8 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
       "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -15693,7 +15772,9 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
       "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/linkify-it": {
       "version": "4.0.1",
@@ -15825,7 +15906,9 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz",
       "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -16650,7 +16733,9 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
       "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
@@ -17520,6 +17605,8 @@
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "is-wsl": "^1.1.0"
       },
@@ -17532,6 +17619,8 @@
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -18302,6 +18391,8 @@
       "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz",
       "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "async": "^2.6.0",
         "is-number-like": "^1.0.3"
@@ -18316,6 +18407,8 @@
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -20040,6 +20133,8 @@
       "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz",
       "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "debug": "^2.2.0",
         "minimatch": "^3.0.2"
@@ -20053,6 +20148,8 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -20063,6 +20160,8 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -20072,6 +20171,8 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -20083,7 +20184,9 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
@@ -20228,7 +20331,9 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
       "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/rxjs": {
       "version": "7.8.1",
@@ -20827,7 +20932,9 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
       "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
@@ -21089,6 +21196,8 @@
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.0.tgz",
       "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -21381,6 +21490,8 @@
       "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
       "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "commander": "^2.2.0",
         "limiter": "^1.0.5"
@@ -21396,7 +21507,9 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/streamroller": {
       "version": "3.1.5",
@@ -22258,6 +22371,8 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -23251,6 +23366,8 @@
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
       "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
diff --git a/package.json b/package.json
index 09badd8e67..7868d2f08c 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,6 @@
     "@typescript-eslint/rule-tester": "^7.18.0",
     "@typescript-eslint/utils": "^7.18.0",
     "axe-core": "^4.10.0",
-    "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",

From 4c5b064cfb74c9aac263f405248c889e13c81bfe Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 16:11:49 -0500
Subject: [PATCH 0728/1286] Remove unused react dev dependencies

---
 package-lock.json | 5 +++--
 package.json      | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c00a49ab84..90da5aaf70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -141,8 +141,6 @@
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
-        "react": "^16.14.0",
-        "react-dom": "^16.14.0",
         "rimraf": "^3.0.2",
         "rxjs-spy": "^8.0.2",
         "sass": "~1.80.3",
@@ -19424,6 +19422,7 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -19546,6 +19545,7 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
       "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -20694,6 +20694,7 @@
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
       "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
diff --git a/package.json b/package.json
index 7868d2f08c..fc5a74aaa7 100644
--- a/package.json
+++ b/package.json
@@ -228,8 +228,6 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
     "sass": "~1.80.3",

From 3b00cc10809fdf801213066bfe64f6dde1996598 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 16:13:03 -0500
Subject: [PATCH 0729/1286] Remove unused rxjs-spy dev dependency

---
 package-lock.json | 71 -----------------------------------------------
 package.json      |  1 -
 2 files changed, 72 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 90da5aaf70..de86d3354c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,6 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "rxjs-spy": "^8.0.2",
         "sass": "~1.80.3",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
@@ -6822,12 +6821,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/circular-json": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz",
-      "integrity": "sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==",
-      "dev": true
-    },
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
@@ -7111,12 +7104,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/stacktrace-js": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz",
-      "integrity": "sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==",
-      "dev": true
-    },
     "node_modules/@types/ws": {
       "version": "8.5.10",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
@@ -9342,13 +9329,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/circular-json": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-      "deprecated": "CircularJSON is in maintenance only, flatted is its successor.",
-      "dev": true
-    },
     "node_modules/classnames": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
@@ -11368,15 +11348,6 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
-      "dev": true,
-      "dependencies": {
-        "stackframe": "^1.3.4"
-      }
-    },
     "node_modules/es-abstract": {
       "version": "1.23.3",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
@@ -20431,23 +20402,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/rxjs-spy": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-8.0.2.tgz",
-      "integrity": "sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==",
-      "dev": true,
-      "dependencies": {
-        "@types/circular-json": "^0.4.0",
-        "@types/stacktrace-js": "^0.0.33",
-        "circular-json": "^0.5.0",
-        "error-stack-parser": "^2.0.1",
-        "rxjs-report-usage": "^1.0.4",
-        "stacktrace-gps": "^3.0.2"
-      },
-      "peerDependencies": {
-        "rxjs": "^7.0.0"
-      }
-    },
     "node_modules/safe-array-concat": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
@@ -21453,31 +21407,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/stackframe": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
-      "dev": true
-    },
-    "node_modules/stacktrace-gps": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz",
-      "integrity": "sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "0.5.6",
-        "stackframe": "^1.3.4"
-      }
-    },
-    "node_modules/stacktrace-gps/node_modules/source-map": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
diff --git a/package.json b/package.json
index fc5a74aaa7..9acb624181 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,6 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^8.0.2",
     "sass": "~1.80.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",

From 3832851ef4295924e079d3ee196ce455d21790eb Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Oct 2024 16:14:14 -0500
Subject: [PATCH 0730/1286] Remove unused webpack-bundle-analyzer dev
 dependency

---
 package-lock.json | 134 ----------------------------------------------
 package.json      |   1 -
 2 files changed, 135 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de86d3354c..4627460466 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -148,7 +148,6 @@
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
         "webpack": "5.95.0",
-        "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -6317,12 +6316,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
-      "dev": true
-    },
     "node_modules/@react-dnd/asap": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
@@ -10597,12 +10590,6 @@
       "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
       "dev": true
     },
-    "node_modules/debounce": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
-      "dev": true
-    },
     "node_modules/debug": {
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
@@ -10983,12 +10970,6 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-      "dev": true
-    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -13354,21 +13335,6 @@
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
     },
-    "node_modules/gzip-size": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "dev": true,
-      "dependencies": {
-        "duplexer": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -17555,15 +17521,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "dev": true,
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
-    },
     "node_modules/openseadragon": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz",
@@ -21032,20 +20989,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/sirv": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
-      "dev": true,
-      "dependencies": {
-        "@polka/url": "^1.0.0-next.24",
-        "mrmime": "^2.0.0",
-        "totalist": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
@@ -21944,15 +21887,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/totalist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/touch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
@@ -22662,74 +22596,6 @@
         }
       }
     },
-    "node_modules/webpack-bundle-analyzer": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
-      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "0.5.7",
-        "acorn": "^8.0.4",
-        "acorn-walk": "^8.0.0",
-        "commander": "^7.2.0",
-        "debounce": "^1.2.1",
-        "escape-string-regexp": "^4.0.0",
-        "gzip-size": "^6.0.0",
-        "html-escaper": "^2.0.2",
-        "opener": "^1.5.2",
-        "picocolors": "^1.0.0",
-        "sirv": "^2.0.3",
-        "ws": "^7.3.1"
-      },
-      "bin": {
-        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/webpack-cli": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
diff --git a/package.json b/package.json
index 9acb624181..d4a424e780 100644
--- a/package.json
+++ b/package.json
@@ -235,7 +235,6 @@
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
     "webpack": "5.95.0",
-    "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }

From 7a1432a0a286e50aa595af94e8cfa231c23bacc5 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:02:49 -0500
Subject: [PATCH 0731/1286] Move @types/grecaptcha to dev dependencies

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a94135bfe9..0d62cea250 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "@ngrx/store": "^17.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "@types/grecaptcha": "^3.0.4",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.4",
@@ -154,6 +153,7 @@
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
+    "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",
diff --git a/yarn.lock b/yarn.lock
index 53d61da6ab..3d562e1542 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2717,7 +2717,7 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/grecaptcha@^3.0.4":
+"@types/grecaptcha@^3.0.9":
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.9.tgz#9f3b07ec06c8fff221aa6fc124fe5b8a0e2c3349"
   integrity sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==

From 453dee618ba8d1fabbbf8e1c519774e70fd7a3c1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:03:32 -0500
Subject: [PATCH 0732/1286] Remove unused angular-idle-preload

---
 package.json | 1 -
 yarn.lock    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/package.json b/package.json
index 0d62cea250..95f6f23103 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "@ngrx/store": "^17.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.4",
     "bootstrap": "^4.6.1",
diff --git a/yarn.lock b/yarn.lock
index 3d562e1542..1b4010a952 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3459,11 +3459,6 @@ ajv@^8.0.0, ajv@^8.9.0:
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
 
-angular-idle-preload@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
-  integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
-
 angulartics2@^12.2.0:
   version "12.2.1"
   resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.2.1.tgz#9a5727aaacafe77b6b912ff5a94532d41377ce51"

From 234aae4d7722c61ccc5ad15c18b2b6b5c7b06ad5 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:04:27 -0500
Subject: [PATCH 0733/1286] Remove unused browser-sync

---
 package.json |   1 -
 yarn.lock    | 285 ++++-----------------------------------------------
 2 files changed, 20 insertions(+), 266 deletions(-)

diff --git a/package.json b/package.json
index 95f6f23103..8f2094b5d8 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,6 @@
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",
     "axe-core": "^4.7.2",
-    "browser-sync": "^3.0.3",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
diff --git a/yarn.lock b/yarn.lock
index 1b4010a952..16b85e1fa5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3679,18 +3679,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-each-series@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
-  integrity sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==
-
-async@^2.6.0:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
 async@^3.2.0, async@^3.2.3:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
@@ -3951,62 +3939,6 @@ braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browser-sync-client@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-3.0.3.tgz#6805c6cb56762baabe2e0e2ba31b2476a552f665"
-  integrity sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==
-  dependencies:
-    etag "1.8.1"
-    fresh "0.5.2"
-    mitt "^1.1.3"
-
-browser-sync-ui@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz#c15ee62d8e9c91470a760fa360651e7b2ad842b3"
-  integrity sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==
-  dependencies:
-    async-each-series "0.1.1"
-    chalk "4.1.2"
-    connect-history-api-fallback "^1"
-    immutable "^3"
-    server-destroy "1.0.1"
-    socket.io-client "^4.4.1"
-    stream-throttle "^0.1.3"
-
-browser-sync@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-3.0.3.tgz#e82d7a005b47cbf5e5f990bcbe099457eaee3b9a"
-  integrity sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==
-  dependencies:
-    browser-sync-client "^3.0.3"
-    browser-sync-ui "^3.0.3"
-    bs-recipes "1.3.4"
-    chalk "4.1.2"
-    chokidar "^3.5.1"
-    connect "3.6.6"
-    connect-history-api-fallback "^1"
-    dev-ip "^1.0.1"
-    easy-extender "^2.3.4"
-    eazy-logger "^4.0.1"
-    etag "^1.8.1"
-    fresh "^0.5.2"
-    fs-extra "3.0.1"
-    http-proxy "^1.18.1"
-    immutable "^3"
-    micromatch "^4.0.8"
-    opn "5.3.0"
-    portscanner "2.2.0"
-    raw-body "^2.3.2"
-    resp-modifier "6.0.2"
-    rx "4.1.0"
-    send "^0.19.0"
-    serve-index "^1.9.1"
-    serve-static "^1.16.2"
-    server-destroy "1.0.1"
-    socket.io "^4.4.1"
-    ua-parser-js "^1.0.33"
-    yargs "^17.3.1"
-
 browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3:
   version "4.23.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
@@ -4017,11 +3949,6 @@ browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
-bs-recipes@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
-  integrity sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -4140,14 +4067,6 @@ cerialize@0.1.18:
   dependencies:
     typescript "^2.5.0"
 
-chalk@4.1.2, 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==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -4168,6 +4087,14 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.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==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
@@ -4364,7 +4291,7 @@ commander@^10.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
-commander@^2.2.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4432,26 +4359,11 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-connect-history-api-fallback@^1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
-connect@3.6.6:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.0"
-    parseurl "~1.3.2"
-    utils-merge "1.0.1"
-
 connect@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
@@ -4843,7 +4755,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.2.0:
+debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4974,11 +4886,6 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-dev-ip@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
-  integrity sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==
-
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -5094,20 +5001,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-easy-extender@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
-  integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
-  dependencies:
-    lodash "^4.17.10"
-
-eazy-logger@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-4.0.1.tgz#2e9fe487fb14ed6ac20d5f01d90dff377d403041"
-  integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==
-  dependencies:
-    chalk "4.1.2"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -5155,7 +5048,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@~1.0.1, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -5179,17 +5072,6 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.4.tgz#b8bc71ed3f25d0d51d587729262486b4b33bd0d0"
-  integrity sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-    engine.io-parser "~5.2.1"
-    ws "~8.17.1"
-    xmlhttprequest-ssl "~2.0.0"
-
 engine.io-parser@~5.2.1:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
@@ -5735,7 +5617,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
+etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
@@ -5983,19 +5865,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
 finalhandler@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -6135,20 +6004,11 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-fresh@0.5.2, fresh@^0.5.2:
+fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-fs-extra@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^3.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -6743,11 +6603,6 @@ immutability-helper@^3.0.1:
   resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz#2b86b2286ed3b1241c9e23b7b21e0444f52f77b7"
   integrity sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ==
 
-immutable@^3:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
-
 immutable@^4.0.0:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
@@ -7010,13 +6865,6 @@ is-negative-zero@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
   integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
-is-number-like@^1.0.3:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
-  integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
-  dependencies:
-    lodash.isfinite "^3.3.2"
-
 is-number-object@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
@@ -7128,11 +6976,6 @@ is-what@^3.14.1:
   resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
   integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -7417,13 +7260,6 @@ jsonc-parser@^3.0.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4"
   integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
 
-jsonfile@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -7711,11 +7547,6 @@ license-webpack-plugin@4.0.2:
   dependencies:
     webpack-sources "^3.0.0"
 
-limiter@^1.0.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
-  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -7787,11 +7618,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.isfinite@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
-  integrity sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==
-
 lodash.merge@4.6.2, lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -7802,7 +7628,7 @@ lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
+lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8005,7 +7831,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8065,7 +7891,7 @@ minimatch@9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8231,11 +8057,6 @@ mirador@^3.3.0:
     reselect "^4.0.0"
     uuid "^8.1.0"
 
-mitt@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
-  integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
-
 mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -8687,13 +8508,6 @@ openseadragon@^2.4.2:
   resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c"
   integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
 
-opn@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
-  dependencies:
-    is-wsl "^1.1.0"
-
 optionator@^0.9.3:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
@@ -9022,14 +8836,6 @@ popper.js@1.16.1-lts:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
   integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
 
-portscanner@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.2.0.tgz#6059189b3efa0965c9d96a56b958eb9508411cf1"
-  integrity sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==
-  dependencies:
-    async "^2.6.0"
-    is-number-like "^1.0.3"
-
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
@@ -9526,7 +9332,7 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.2, raw-body@^2.3.2:
+raw-body@2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
   integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
@@ -9995,14 +9801,6 @@ resolve@1.22.8, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resp-modifier@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
-  integrity sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==
-  dependencies:
-    debug "^2.2.0"
-    minimatch "^3.0.2"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -10098,11 +9896,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rx@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
-
 rxjs-report-usage@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz#6e06034d9e1592e8a45bee877631638e4bac2576"
@@ -10302,7 +10095,7 @@ semver@~7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-send@0.19.0, send@^0.19.0:
+send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
   integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
@@ -10358,11 +10151,6 @@ serve-static@1.16.2, serve-static@^1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
-server-destroy@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
-  integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
-
 set-function-length@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
@@ -10518,16 +10306,6 @@ socket.io-adapter@~2.5.2:
     debug "~4.3.4"
     ws "~8.17.1"
 
-socket.io-client@^4.4.1:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.5.tgz#919be76916989758bdc20eec63f7ee0ae45c05b7"
-  integrity sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.2"
-    engine.io-client "~6.5.2"
-    socket.io-parser "~4.2.4"
-
 socket.io-parser@~4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
@@ -10536,7 +10314,7 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@^4.4.1, socket.io@^4.7.2:
+socket.io@^4.7.2:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.0.tgz#33d05ae0915fad1670bd0c4efcc07ccfabebe3b1"
   integrity sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==
@@ -10737,19 +10515,6 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
-
-stream-throttle@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
-  integrity sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==
-  dependencies:
-    commander "^2.2.0"
-    limiter "^1.0.5"
-
 streamroller@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
@@ -11302,11 +11067,6 @@ ua-parser-js@^0.7.30:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.38.tgz#f497d8a4dc1fec6e854e5caa4b2f9913422ef054"
   integrity sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==
 
-ua-parser-js@^1.0.33:
-  version "1.0.38"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.38.tgz#66bb0c4c0e322fe48edfe6d446df6042e62f25e2"
-  integrity sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==
-
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -11933,11 +11693,6 @@ xmlbuilder@~11.0.0:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-xmlhttprequest-ssl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
-  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -11968,7 +11723,7 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.3.1:
+yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==

From a23c0ee237fe6492a90dac4b6e41123702447de8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:10:21 -0500
Subject: [PATCH 0734/1286] Remove unused rxjs-spy dev dependency

---
 package.json |  1 -
 yarn.lock    | 52 ----------------------------------------------------
 2 files changed, 53 deletions(-)

diff --git a/package.json b/package.json
index 8f2094b5d8..cfcdd9960c 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,6 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^8.0.2",
     "sass": "~1.80.3",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
diff --git a/yarn.lock b/yarn.lock
index 16b85e1fa5..70d2853047 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2650,11 +2650,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/circular-json@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/circular-json/-/circular-json-0.4.0.tgz#7401f7e218cfe87ad4c43690da5658b9acaf51be"
-  integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
-
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
@@ -2887,11 +2882,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stacktrace-js@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz#9b027370ca161b89798f308af77438802546cb39"
-  integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
-
 "@types/ws@^8.5.5":
   version "8.5.12"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
@@ -4152,11 +4142,6 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-circular-json@^0.5.0:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
 classnames@^2.2.6:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
@@ -5155,13 +5140,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
-  dependencies:
-    stackframe "^1.3.4"
-
 es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
   version "1.23.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
@@ -9909,18 +9887,6 @@ rxjs-report-usage@^1.0.4:
     glob "~7.2.0"
     prompts "~2.4.2"
 
-rxjs-spy@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
-  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
-  dependencies:
-    "@types/circular-json" "^0.4.0"
-    "@types/stacktrace-js" "^0.0.33"
-    circular-json "^0.5.0"
-    error-stack-parser "^2.0.1"
-    rxjs-report-usage "^1.0.4"
-    stacktrace-gps "^3.0.2"
-
 rxjs@6.6.7, rxjs@~6.6.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
@@ -10379,11 +10345,6 @@ source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.5
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
-
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -10492,19 +10453,6 @@ ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-gps@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
-  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
-  dependencies:
-    source-map "0.5.6"
-    stackframe "^1.3.4"
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"

From 148cbce5d1d82cda324c21ecb50e5dfd33c988a8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:11:50 -0500
Subject: [PATCH 0735/1286] Remove "analyze" command and
 webpack-bundle-analyzer dev dependency

---
 package.json |  2 --
 yarn.lock    | 77 +++-------------------------------------------------
 2 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index cfcdd9960c..d1696569bf 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "preserve": "yarn base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
-    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
     "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
@@ -205,7 +204,6 @@
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
     "webpack": "5.95.0",
-    "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 70d2853047..eb565afe76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2347,11 +2347,6 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@polka/url@^1.0.0-next.24":
-  version "1.0.0-next.25"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
-  integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
-
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab"
@@ -3343,14 +3338,14 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.0.0, acorn-walk@^8.1.1:
+acorn-walk@^8.1.1:
   version "8.3.3"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
   integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
   dependencies:
     acorn "^8.11.0"
 
-acorn@^8.0.4, acorn@^8.11.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.11.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
@@ -4286,11 +4281,6 @@ commander@^6.2.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 comment-parser@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
@@ -4735,11 +4725,6 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-debounce@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -4976,11 +4961,6 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -6248,13 +6228,6 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -6355,7 +6328,7 @@ html-entities@^2.3.2:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
   integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
 
-html-escaper@^2.0.0, html-escaper@^2.0.2:
+html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -8058,7 +8031,7 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-mrmime@2.0.0, mrmime@^2.0.0:
+mrmime@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
   integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
@@ -8476,11 +8449,6 @@ open@8.4.2, open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
 openseadragon@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c"
@@ -10217,15 +10185,6 @@ simple-update-notifier@^1.0.7:
   dependencies:
     semver "~7.0.0"
 
-sirv@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
-  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.24"
-    mrmime "^2.0.0"
-    totalist "^3.0.0"
-
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -10760,11 +10719,6 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-totalist@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
-  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
-
 touch@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
@@ -11274,24 +11228,6 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webpack-bundle-analyzer@^4.8.0:
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
-  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
-  dependencies:
-    "@discoveryjs/json-ext" "0.5.7"
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    commander "^7.2.0"
-    debounce "^1.2.1"
-    escape-string-regexp "^4.0.0"
-    gzip-size "^6.0.0"
-    html-escaper "^2.0.2"
-    opener "^1.5.2"
-    picocolors "^1.0.0"
-    sirv "^2.0.3"
-    ws "^7.3.1"
-
 webpack-cli@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
@@ -11608,11 +11544,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^7.3.1:
-  version "7.5.10"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
-  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-
 ws@^8.13.0:
   version "8.18.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"

From 19dcc1d47efd650b848a4c95fe70abe8e134db32 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 15:16:36 -0500
Subject: [PATCH 0736/1286] Remove unused dependencies listed in "resolutions"

---
 package.json |   5 -
 yarn.lock    | 274 +++------------------------------------------------
 2 files changed, 13 insertions(+), 266 deletions(-)

diff --git a/package.json b/package.json
index d1696569bf..47566617d4 100644
--- a/package.json
+++ b/package.json
@@ -54,11 +54,6 @@
     "https": false
   },
   "private": true,
-  "resolutions": {
-    "minimist": "^1.2.5",
-    "webdriver-manager": "^12.1.8",
-    "ts-node": "10.2.1"
-  },
   "dependencies": {
     "@angular/animations": "^17.3.11",
     "@angular/cdk": "^17.3.10",
diff --git a/yarn.lock b/yarn.lock
index eb565afe76..a31ae0b6e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3358,11 +3358,6 @@ adjust-sourcemap-loader@^4.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-adm-zip@^0.5.2:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.16.tgz#0b5e4c779f07dedea5805cdccb1147071d94a909"
-  integrity sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==
-
 agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
@@ -3424,7 +3419,7 @@ ajv@8.6.2:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6:
+ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3468,11 +3463,6 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
 ansi-regex@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
@@ -3488,11 +3478,6 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -3579,23 +3564,11 @@ array-includes@^3.1.8:
     get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
-
 array.prototype.findlastindex@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
@@ -3642,11 +3615,6 @@ arraybuffer.prototype.slice@^1.0.3:
     is-array-buffer "^3.0.4"
     is-shared-array-buffer "^1.0.2"
 
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
-
 asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
@@ -4052,17 +4020,6 @@ cerialize@0.1.18:
   dependencies:
     typescript "^2.5.0"
 
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -4259,7 +4216,7 @@ colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4803,19 +4760,6 @@ define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
@@ -5299,7 +5243,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -5943,15 +5887,6 @@ form-data@^4.0.0, form-data@~4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -6132,7 +6067,7 @@ glob@^10.2.2, glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6194,18 +6129,6 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 goober@^2.0.33:
   version "2.1.16"
   resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95"
@@ -6233,26 +6156,6 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -6425,15 +6328,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
@@ -6618,11 +6512,6 @@ ini@4.1.2:
   resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.2.tgz#7f646dbd9caea595e61f88ef60bfff8b01f8130a"
   integrity sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 ini@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.3.tgz#4c359675a6071a46985eb39b14e4a2c0ec98a795"
@@ -6828,25 +6717,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
-  dependencies:
-    path-is-inside "^1.0.1"
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -7237,16 +7107,6 @@ jsonschema@1.4.1:
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
   integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 jsprim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
@@ -7863,7 +7723,7 @@ minimatch@^9.0.0, minimatch@^9.0.4:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8344,12 +8204,7 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -8666,11 +8521,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -8734,7 +8584,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
@@ -8744,18 +8594,6 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
-
 piscina@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/piscina/-/piscina-4.4.0.tgz#e3af8e5721d8fad08c6ccaf8a64f9f42279efbb5"
@@ -9201,7 +9039,7 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -9229,11 +9067,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
-
 qjobs@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
@@ -9246,11 +9079,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -9659,32 +9487,6 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.87.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -9775,7 +9577,7 @@ rfdc@^1.3.0:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
   integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
+rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -9952,7 +9754,7 @@ sass@^1.25.0, sass@~1.80.3:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sax@>=0.6.0, sax@^1.2.4:
+sax@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
   integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
@@ -10009,7 +9811,7 @@ semver@7.6.0:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
+semver@^5.6.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -10383,7 +10185,7 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.18.0, sshpk@^1.7.0:
+sshpk@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
   integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
@@ -10507,13 +10309,6 @@ string_decoder@~1.1.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -10550,11 +10345,6 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -10734,14 +10524,6 @@ tough-cookie@^4.1.3:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -10757,7 +10539,7 @@ ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-ts-node@10.2.1, ts-node@^10.0.0:
+ts-node@^10.0.0:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
   integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
@@ -11206,23 +10988,6 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-webdriver-manager@^12.1.8:
-  version "12.1.9"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.9.tgz#8d83543b92711b7217b39fef4cda958a4703d2df"
-  integrity sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==
-  dependencies:
-    adm-zip "^0.5.2"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -11559,19 +11324,6 @@ xhr2@^0.2.0:
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93"
   integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==
 
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

From e93e66d3e42392934b09dea194fb061d24dcd6e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:34:03 +0000
Subject: [PATCH 0737/1286] Bump sass from 1.80.3 to 1.80.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.3 to 1.80.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.3...1.80.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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 3bf245cd03..37c8ac0763 100644
--- a/package.json
+++ b/package.json
@@ -192,7 +192,7 @@
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.80.3",
+    "sass": "~1.80.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 2a819fc59b..2326d9b71c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10532,10 +10532,10 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.3:
-  version "1.80.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.3.tgz#3f63dd527647d2b3de35f36acb971bda80517423"
-  integrity sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==
+sass@^1.25.0, sass@~1.80.4:
+  version "1.80.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.4.tgz#bc0418fd796cad2f1a1309d8b4d7fe44b7027de0"
+  integrity sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==
   dependencies:
     "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"

From c83b6ff036ba3c8734cf3f4681ab2dffb0a89463 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:34:55 +0000
Subject: [PATCH 0738/1286] Bump @babel/runtime from 7.25.9 to 7.26.0

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.25.9 to 7.26.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 3bf245cd03..9175ac7c01 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@angular/platform-browser-dynamic": "^15.2.10",
     "@angular/platform-server": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@babel/runtime": "7.25.9",
+    "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.3",
diff --git a/yarn.lock b/yarn.lock
index 2a819fc59b..56c57a98eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,10 +1352,10 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@7.25.9", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
-  integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==
+"@babel/runtime@7.26.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 

From 44889b1c6fc4cfa96f3892baf621a2330d49772d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 24 Oct 2024 17:03:54 -0500
Subject: [PATCH 0739/1286] Move @material-ui depedencies & other mirador
 dependencies to dev dependencies. Only needed to avoid yarn install warnings

---
 package.json | 9 +++++----
 yarn.lock    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 47566617d4..e4f31e4934 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,6 @@
     "@angular/ssr": "^17.3.10",
     "@babel/runtime": "7.25.9",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.11.3",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
@@ -120,8 +118,6 @@
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.8",
-    "prop-types": "^15.8.1",
-    "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
@@ -141,6 +137,8 @@
     "@angular/language-service": "^17.3.11",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.4.0",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "@ngrx/store-devtools": "^17.1.1",
     "@ngtools/webpack": "^16.2.16",
     "@types/deep-freeze": "0.1.5",
@@ -159,6 +157,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
+    "csstype": "^3.1.3",
     "cypress": "^13.15.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
@@ -190,7 +189,9 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
+    "prop-types": "^15.8.1",
     "react": "^16.14.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "sass": "~1.80.3",
diff --git a/yarn.lock b/yarn.lock
index a31ae0b6e4..1633bb631b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1970,7 +1970,7 @@
   dependencies:
     call-bind "^1.0.7"
 
-"@material-ui/core@^4.11.0":
+"@material-ui/core@^4.11.0", "@material-ui/core@^4.12.4":
   version "4.12.4"
   resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
   integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
@@ -4563,7 +4563,7 @@ csstype@^2.5.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
   integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
 
-csstype@^3.0.2:
+csstype@^3.0.2, csstype@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==

From 913c2cb44b7a3d31f0688d702b736b0e25451045 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 12:43:43 -0500
Subject: [PATCH 0740/1286] Move ng-mocks to dev dependencies

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e4f31e4934..5864c58d0c 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,6 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.10.0",
     "ng2-file-upload": "5.0.0",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",
@@ -183,6 +182,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
+    "ng-mocks": "^14.13.1",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
diff --git a/yarn.lock b/yarn.lock
index 1633bb631b..f7e6fbd746 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7947,7 +7947,7 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^14.10.0:
+ng-mocks@^14.13.1:
   version "14.13.1"
   resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.1.tgz#9fef8cc902a0d9d3250550d83514f9c65d4cd366"
   integrity sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==

From 497f4fd8d408e259a3d16c8847a28e028d4a791c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 12:57:26 -0500
Subject: [PATCH 0741/1286] Ensure "axe-*" is a member of the "testing" group,
 as it's only used for e2e tests

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0ebfc93793..b53e501d29 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -72,6 +72,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@cypress*"
+        - "axe-*"
         - "cypress*"
         - "jasmine*"
         - "karma*"
@@ -84,6 +85,7 @@ updates:
         applies-to: security-updates
         patterns:
         - "@cypress*"
+        - "axe-*"
         - "cypress*"
         - "jasmine*"
         - "karma*"
@@ -185,6 +187,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@cypress*"
+        - "axe-*"
         - "cypress*"
         - "jasmine*"
         - "karma*"
@@ -262,6 +265,7 @@ updates:
         applies-to: version-updates
         patterns:
         - "@cypress*"
+        - "axe-*"
         - "cypress*"
         - "jasmine*"
         - "karma*"

From ec4ca74a97949482ec757a5c53ba10a7f327f07c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 17:58:20 +0000
Subject: [PATCH 0742/1286] Bump sass from 1.80.3 to 1.80.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.3 to 1.80.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.3...1.80.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index 4627460466..d2b10f4615 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.80.3",
+        "sass": "~1.80.4",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -20413,9 +20413,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.80.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.3.tgz",
-      "integrity": "sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==",
+      "version": "1.80.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.4.tgz",
+      "integrity": "sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==",
       "dependencies": {
         "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
diff --git a/package.json b/package.json
index d4a424e780..0dd42ae483 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,7 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.3",
+    "sass": "~1.80.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From 31e2bd26ea3abd7fd9f5b909f354e91bffcc51dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 18:00:11 +0000
Subject: [PATCH 0743/1286] Bump the angular group with 3 updates

Bumps the angular group with 3 updates: [@angular/ssr](https://github.com/angular/angular-cli), [@angular-devkit/build-angular](https://github.com/angular/angular-cli) and [@angular/cli](https://github.com/angular/angular-cli).


Updates `@angular/ssr` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

Updates `@angular-devkit/build-angular` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

Updates `@angular/cli` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

---
updated-dependencies:
- dependency-name: "@angular/ssr"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

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

diff --git a/package-lock.json b/package-lock.json
index 4627460466..31cdcc16fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@angular/platform-browser-dynamic": "^17.3.12",
         "@angular/platform-server": "^17.3.12",
         "@angular/router": "^17.3.12",
-        "@angular/ssr": "^17.3.10",
+        "@angular/ssr": "^17.3.11",
         "@babel/runtime": "7.25.9",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -78,7 +78,7 @@
       },
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
-        "@angular-devkit/build-angular": "^17.3.8",
+        "@angular-devkit/build-angular": "^17.3.11",
         "@angular-eslint/builder": "^17.5.3",
         "@angular-eslint/bundled-angular-compiler": "^17.5.3",
         "@angular-eslint/eslint-plugin": "^17.5.3",
@@ -86,7 +86,7 @@
         "@angular-eslint/schematics": "^17.5.3",
         "@angular-eslint/template-parser": "^17.5.3",
         "@angular-eslint/utils": "^17.5.3",
-        "@angular/cli": "^17.3.10",
+        "@angular/cli": "^17.3.11",
         "@angular/compiler-cli": "^17.3.11",
         "@angular/language-service": "^17.3.12",
         "@cypress/schematic": "^1.5.0",
@@ -252,12 +252,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.10",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.10.tgz",
-      "integrity": "sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==",
+      "version": "0.1703.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
+      "integrity": "sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/core": "17.3.11",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -267,15 +267,15 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.10.tgz",
-      "integrity": "sha512-syz7xgzmp8/0tPJWwQIKZt7KNJfp9U7hkqNacXz4XTYz6YM0oyBXlqk2claSxywWBEkc0eJVSMD9e2ArusZBuA==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz",
+      "integrity": "sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1703.10",
-        "@angular-devkit/build-webpack": "0.1703.10",
-        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/architect": "0.1703.11",
+        "@angular-devkit/build-webpack": "0.1703.11",
+        "@angular-devkit/core": "17.3.11",
         "@babel/core": "7.24.0",
         "@babel/generator": "7.23.6",
         "@babel/helper-annotate-as-pure": "7.22.5",
@@ -286,7 +286,7 @@
         "@babel/preset-env": "7.24.0",
         "@babel/runtime": "7.24.0",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "17.3.10",
+        "@ngtools/webpack": "17.3.11",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.18",
@@ -298,7 +298,7 @@
         "css-loader": "6.10.0",
         "esbuild-wasm": "0.20.1",
         "fast-glob": "3.3.2",
-        "http-proxy-middleware": "2.0.6",
+        "http-proxy-middleware": "2.0.7",
         "https-proxy-agent": "7.0.4",
         "inquirer": "9.2.15",
         "jsonc-parser": "3.2.1",
@@ -776,9 +776,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.10.tgz",
-      "integrity": "sha512-yPKmdbTJzxROAl2NS8P8eHB2mU0BqV2I0ZiKmX6oTetY2Ea4i2WzlTK39pPpG7atmdF2NPWYLXdJWAup+JxSyw==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.11.tgz",
+      "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==",
       "dev": true,
       "engines": {
         "node": "^18.13.0 || >=20.9.0",
@@ -951,30 +951,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
@@ -1392,12 +1368,12 @@
       }
     },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1703.10",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz",
-      "integrity": "sha512-m6dDgzKLW+c3z9/TUxYmbJEtEhrdYNQ4ogdtAgEYA/FRrKueDU0WztLNr+dVbvwNP99Skovtr8sAQfN6twproQ==",
+      "version": "0.1703.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.11.tgz",
+      "integrity": "sha512-qbCiiHuoVkD7CtLyWoRi/Vzz6nrEztpF5XIyWUcQu67An1VlxbMTE4yoSQiURjCQMnB/JvS1GPVed7wOq3SJ/w==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.10",
+        "@angular-devkit/architect": "0.1703.11",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -1411,9 +1387,9 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
-      "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
       "dev": true,
       "dependencies": {
         "ajv": "8.12.0",
@@ -1438,12 +1414,12 @@
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.10.tgz",
-      "integrity": "sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
+      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/core": "17.3.11",
         "jsonc-parser": "3.2.1",
         "magic-string": "0.30.8",
         "ora": "5.4.1",
@@ -1870,15 +1846,15 @@
       }
     },
     "node_modules/@angular/cli": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.10.tgz",
-      "integrity": "sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.11.tgz",
+      "integrity": "sha512-8R9LwAGL8hGAWJ4mNG9ZPUrBUzIdmst0Ldua6RJJ+PrqgjX+8IbO+lNnfrOY/XY+Z3LXbCEJflL26f9czCvTPQ==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.10",
-        "@angular-devkit/core": "17.3.10",
-        "@angular-devkit/schematics": "17.3.10",
-        "@schematics/angular": "17.3.10",
+        "@angular-devkit/architect": "0.1703.11",
+        "@angular-devkit/core": "17.3.11",
+        "@angular-devkit/schematics": "17.3.11",
+        "@schematics/angular": "17.3.11",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "4.1.2",
@@ -2187,9 +2163,9 @@
       }
     },
     "node_modules/@angular/ssr": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.10.tgz",
-      "integrity": "sha512-t+NX1HufU38c0u+8mDg31cqrXZo5SEUxjBuXwdu3mOvYbkanjhbtyIgIMYr9Vru8pqncasgHLJv2RVWDvAjlEw==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz",
+      "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==",
       "dependencies": {
         "critters": "0.0.22",
         "tslib": "^2.3.0"
@@ -6608,13 +6584,13 @@
       "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.10.tgz",
-      "integrity": "sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==",
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.11.tgz",
+      "integrity": "sha512-tvJpTgYC+hCnTyLszYRUZVyNTpPd+C44gh5CPTcG3qkqStzXQwynQAf6X/DjtwXbUiPQF0XfF0+0R489GpdZPA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.10",
-        "@angular-devkit/schematics": "17.3.10",
+        "@angular-devkit/core": "17.3.11",
+        "@angular-devkit/schematics": "17.3.11",
         "jsonc-parser": "3.2.1"
       },
       "engines": {
diff --git a/package.json b/package.json
index d4a424e780..d79b45b525 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@angular/platform-browser-dynamic": "^17.3.12",
     "@angular/platform-server": "^17.3.12",
     "@angular/router": "^17.3.12",
-    "@angular/ssr": "^17.3.10",
+    "@angular/ssr": "^17.3.11",
     "@babel/runtime": "7.25.9",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -165,7 +165,7 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.8",
+    "@angular-devkit/build-angular": "^17.3.11",
     "@angular-eslint/builder": "^17.5.3",
     "@angular-eslint/bundled-angular-compiler": "^17.5.3",
     "@angular-eslint/eslint-plugin": "^17.5.3",
@@ -173,7 +173,7 @@
     "@angular-eslint/schematics": "^17.5.3",
     "@angular-eslint/template-parser": "^17.5.3",
     "@angular-eslint/utils": "^17.5.3",
-    "@angular/cli": "^17.3.10",
+    "@angular/cli": "^17.3.11",
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.12",
     "@cypress/schematic": "^1.5.0",

From 8d33d521748153e0e0fe1576ee9b711d22d62603 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 11:08:54 -0500
Subject: [PATCH 0744/1286] Move @types/grecaptcha to dev dependencies

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

diff --git a/package.json b/package.json
index 781b9e4c6a..88e40e8400 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,6 @@
     "@nguniversal/express-engine": "^15.2.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
-    "@types/grecaptcha": "^3.0.9",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.1",
     "axios": "^1.7.7",
@@ -152,6 +151,7 @@
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.5",
     "@types/express": "^4.17.21",
+    "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
     "@types/lodash": "^4.17.12",

From 99d421caec391ae95e172a0ca55548e64596b834 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 11:10:52 -0500
Subject: [PATCH 0745/1286] Remove unused rxjs-spy dev dependency

---
 package.json |   1 -
 yarn.lock    | 107 +++------------------------------------------------
 2 files changed, 5 insertions(+), 103 deletions(-)

diff --git a/package.json b/package.json
index 88e40e8400..b2b4e734a8 100644
--- a/package.json
+++ b/package.json
@@ -191,7 +191,6 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^8.0.2",
     "sass": "~1.80.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
diff --git a/yarn.lock b/yarn.lock
index a0570c426a..51fa5b46b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -725,7 +725,7 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
+"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
@@ -1377,7 +1377,7 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
+"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
   integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
@@ -1393,7 +1393,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.10.3", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4":
+"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4":
   version "7.21.4"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"
   integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
@@ -2427,11 +2427,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/circular-json@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz"
-  integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
-
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"
@@ -2664,11 +2659,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stacktrace-js@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz"
-  integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
-
 "@types/ws@^8.5.1", "@types/ws@^8.5.5":
   version "8.5.12"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
@@ -3561,15 +3551,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bent@~7.3.6:
-  version "7.3.12"
-  resolved "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz"
-  integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
-  dependencies:
-    bytesish "^0.4.1"
-    caseless "~0.12.0"
-    is-stream "^2.0.0"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
@@ -3776,11 +3757,6 @@ bytes@3.1.2:
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-bytesish@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz"
-  integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
-
 cacache@17.0.4:
   version "17.0.4"
   resolved "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz"
@@ -3918,7 +3894,7 @@ cerialize@0.1.18:
   dependencies:
     typescript "^2.5.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@~4.1.0:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4022,11 +3998,6 @@ ci-info@^3.2.0:
   resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"
   integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
 
-circular-json@^0.5.0:
-  version "0.5.9"
-  resolved "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
 classnames@^2.2.6:
   version "2.3.2"
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
@@ -5200,13 +5171,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.1:
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
-  dependencies:
-    stackframe "^1.3.4"
-
 es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
   version "1.23.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
@@ -6250,7 +6214,7 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
+glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -7779,11 +7743,6 @@ klaro@^0.7.21:
     sass "^1.25.0"
     webpack-merge "^5.10.0"
 
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
 klona@^2.0.4, klona@^2.0.5:
   version "2.0.6"
   resolved "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz"
@@ -9705,14 +9664,6 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prompts@~2.4.2:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
@@ -10407,31 +10358,6 @@ rx@4.1.0:
   resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"
   integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
 
-rxjs-report-usage@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz"
-  integrity sha512-omv1DIv5z1kV+zDAEjaDjWSkx8w5TbFp5NZoPwUipwzYVcor/4So9ZU3bUyQ1c8lxY5Q0Es/ztWW7PGjY7to0Q==
-  dependencies:
-    "@babel/parser" "^7.10.3"
-    "@babel/traverse" "^7.10.3"
-    "@babel/types" "^7.10.3"
-    bent "~7.3.6"
-    chalk "~4.1.0"
-    glob "~7.2.0"
-    prompts "~2.4.2"
-
-rxjs-spy@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-8.0.2.tgz"
-  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
-  dependencies:
-    "@types/circular-json" "^0.4.0"
-    "@types/stacktrace-js" "^0.0.33"
-    circular-json "^0.5.0"
-    error-stack-parser "^2.0.1"
-    rxjs-report-usage "^1.0.4"
-    stacktrace-gps "^3.0.2"
-
 rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   version "6.6.7"
   resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
@@ -10853,11 +10779,6 @@ sirv@^2.0.3:
     mrmime "^2.0.0"
     totalist "^3.0.0"
 
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
@@ -11000,11 +10921,6 @@ source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.5
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
-
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
@@ -11139,19 +11055,6 @@ ssri@^9.0.0:
   dependencies:
     minipass "^3.1.1"
 
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
-stacktrace-gps@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz"
-  integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
-  dependencies:
-    source-map "0.5.6"
-    stackframe "^1.3.4"
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"

From 6655dec1ece9b08ea1300e07fa0218c67b509fe3 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 11:11:37 -0500
Subject: [PATCH 0746/1286] Remove "analyze" command and
 webpack-bundle-analyzer dev dependency

---
 package.json |  2 --
 yarn.lock    | 74 ++++------------------------------------------------
 2 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index b2b4e734a8..685c158188 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "preserve": "yarn base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
     "serve:ssr": "node dist/server/main",
-    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
     "build:prod": "cross-env NODE_ENV=production yarn run build:ssr",
@@ -197,7 +196,6 @@
     "ts-node": "^8.10.2",
     "typescript": "~4.8.4",
     "webpack": "5.76.1",
-    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^4.15.2"
   }
diff --git a/yarn.lock b/yarn.lock
index 51fa5b46b9..d520cbc8fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2243,11 +2243,6 @@
     "@parcel/watcher-win32-ia32" "2.4.1"
     "@parcel/watcher-win32-x64" "2.4.1"
 
-"@polka/url@^1.0.0-next.24":
-  version "1.0.0-next.28"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73"
-  integrity sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==
-
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
   resolved "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz"
@@ -3027,7 +3022,7 @@ acorn-walk@^7.1.1:
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
+acorn-walk@^8.0.2, acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -3037,7 +3032,7 @@ acorn@^7.1.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.9.0:
+acorn@^8.1.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.9.0:
   version "8.13.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
   integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
@@ -4147,7 +4142,7 @@ commander@^6.1.0, commander@^6.2.1:
   resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.0.0:
   version "7.2.0"
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -4635,11 +4630,6 @@ dayjs@^1.10.4:
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
   integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
 
-debounce@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
 debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
@@ -4985,11 +4975,6 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.1"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 easy-extender@^2.3.4:
   version "2.3.4"
   resolved "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"
@@ -6331,13 +6316,6 @@ guess-parser@^0.4.22:
   dependencies:
     "@wessberg/ts-evaluator" "0.0.27"
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
@@ -6497,7 +6475,7 @@ html-entities@^2.3.2:
   resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
   integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
-html-escaper@^2.0.0, html-escaper@^2.0.2:
+html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -8455,11 +8433,6 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-mrmime@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
-  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
@@ -8930,11 +8903,6 @@ open@8.4.2, open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
 openseadragon@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz"
@@ -10770,15 +10738,6 @@ simple-update-notifier@^1.0.7:
   dependencies:
     semver "~7.0.0"
 
-sirv@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
-  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.24"
-    mrmime "^2.0.0"
-    totalist "^3.0.0"
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
@@ -11367,11 +11326,6 @@ toidentifier@1.0.1:
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-totalist@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
-  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
-
 touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"
@@ -11946,24 +11900,6 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.10.2:
-  version "4.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
-  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
-  dependencies:
-    "@discoveryjs/json-ext" "0.5.7"
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    commander "^7.2.0"
-    debounce "^1.2.1"
-    escape-string-regexp "^4.0.0"
-    gzip-size "^6.0.0"
-    html-escaper "^2.0.2"
-    opener "^1.5.2"
-    picocolors "^1.0.0"
-    sirv "^2.0.3"
-    ws "^7.3.1"
-
 webpack-cli@^4.2.0:
   version "4.10.0"
   resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
@@ -12315,7 +12251,7 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^7.3.1, ws@^7.4.6:
+ws@^7.4.6:
   version "7.5.10"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==

From 4d365936f2abb13b0b50beb4d270294605c10ba1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 11:15:45 -0500
Subject: [PATCH 0747/1286] Remove unused dependencies listed in "resolutions"

---
 package.json |   5 -
 yarn.lock    | 287 +++------------------------------------------------
 2 files changed, 12 insertions(+), 280 deletions(-)

diff --git a/package.json b/package.json
index 685c158188..21a828b97b 100644
--- a/package.json
+++ b/package.json
@@ -48,11 +48,6 @@
     "https": false
   },
   "private": true,
-  "resolutions": {
-    "minimist": "^1.2.5",
-    "webdriver-manager": "^12.1.8",
-    "ts-node": "10.2.1"
-  },
   "dependencies": {
     "@angular/animations": "^15.2.10",
     "@angular/cdk": "^15.2.9",
diff --git a/yarn.lock b/yarn.lock
index d520cbc8fd..891db985b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3045,11 +3045,6 @@ adjust-sourcemap-loader@^4.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-adm-zip@^0.5.2:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.10.tgz#4a51d5ab544b1f5ce51e1b9043139b639afff45b"
-  integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==
-
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
@@ -3120,7 +3115,7 @@ ajv@8.6.2, ajv@^8.0.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3159,11 +3154,6 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
 ansi-regex@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
@@ -3174,11 +3164,6 @@ ansi-regex@^5.0.1:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
@@ -3278,23 +3263,11 @@ array-includes@^3.1.8:
     get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
-
 array.prototype.findlastindex@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
@@ -3341,11 +3314,6 @@ arraybuffer.prototype.slice@^1.0.3:
     is-array-buffer "^3.0.4"
     is-shared-array-buffer "^1.0.2"
 
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
-
 asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"
@@ -3897,17 +3865,6 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -4120,7 +4077,7 @@ colors@^1.4.0:
   resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4746,19 +4703,6 @@ define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
@@ -5332,7 +5276,7 @@ escape-html@~1.0.3:
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -5974,15 +5918,6 @@ form-data@^4.0.0, form-data@~4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
@@ -6199,7 +6134,7 @@ glob@8.1.0, glob@^8.0.1:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6270,18 +6205,6 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 goober@^2.0.33:
   version "2.1.16"
   resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.16.tgz#7d548eb9b83ff0988d102be71f271ca8f9c82a95"
@@ -6321,26 +6244,6 @@ handle-thing@^2.0.0:
   resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
@@ -6591,15 +6494,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
@@ -6783,11 +6677,6 @@ ini@4.1.1:
   resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
   integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 inquirer@8.2.4:
   version "8.2.4"
   resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"
@@ -7023,25 +6912,6 @@ is-number@^7.0.0:
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
-  dependencies:
-    path-is-inside "^1.0.1"
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
@@ -7518,16 +7388,6 @@ jsonschema@1.4.1:
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
   integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 jsprim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"
@@ -8251,7 +8111,7 @@ minimatch@^9.0.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8761,12 +8621,7 @@ nwsapi@^2.2.0, nwsapi@^2.2.2:
   resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.3.tgz"
   integrity sha512-jscxIO4/VKScHlbmFBdV1Z6LXnLO+ZR4VMtypudUdfwtKxUN3TQcNFIHLwKtrUbDyHN4/GycY9+oRGZ2XMXYPw==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -9142,11 +8997,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
@@ -9205,7 +9055,7 @@ picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
@@ -9215,18 +9065,6 @@ pify@^4.0.1:
   resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
-
 piscina@3.2.0, piscina@~3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz"
@@ -9664,7 +9502,7 @@ prr@~1.0.1:
   resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -9687,11 +9525,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
-
 qjobs@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
@@ -9704,11 +9537,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
@@ -10148,32 +9976,6 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.87.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -10276,7 +10078,7 @@ rfdc@^1.2.0, rfdc@^1.3.0:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
+rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -10436,7 +10238,7 @@ sass@^1.25.0, sass@~1.80.4:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sax@>=0.6.0, sax@^1.2.4:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -10513,7 +10315,7 @@ semver@7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:
+semver@^5.6.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -10978,21 +10780,6 @@ sshpk@^1.18.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 ssri@^10.0.0:
   version "10.0.3"
   resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.3.tgz"
@@ -11109,13 +10896,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
@@ -11145,11 +10925,6 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
@@ -11353,14 +11128,6 @@ tough-cookie@^4.1.3:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"
@@ -11385,7 +11152,7 @@ tree-kill@1.2.2, tree-kill@^1.2.2:
   resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-ts-node@10.2.1, ts-node@^10.0.0:
+ts-node@^10.0.0:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
   integrity sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==
@@ -11863,23 +11630,6 @@ web-resource-inliner@^6.0.1:
     node-fetch "^2.6.0"
     valid-data-url "^3.0.0"
 
-webdriver-manager@^12.1.8:
-  version "12.1.9"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.9.tgz#8d83543b92711b7217b39fef4cda958a4703d2df"
-  integrity sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==
-  dependencies:
-    adm-zip "^0.5.2"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
@@ -12281,19 +12031,6 @@ xml-name-validator@^4.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"

From d4e6aa866006c053100b9ac5fbe1fc75f604f598 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 11:19:46 -0500
Subject: [PATCH 0748/1286] Move @material-ui depedencies & other mirador
 dependencies to dev dependencies. Only needed to avoid yarn install warnings

---
 package.json | 9 +++++----
 yarn.lock    | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 21a828b97b..abe1bc4f40 100644
--- a/package.json
+++ b/package.json
@@ -62,8 +62,6 @@
     "@angular/router": "^15.2.10",
     "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.11.3",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^15.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
@@ -117,8 +115,6 @@
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.8.1",
     "pem": "1.14.8",
-    "prop-types": "^15.8.1",
-    "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.13.1",
@@ -139,6 +135,8 @@
     "@angular/language-service": "^15.2.10",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.6.0",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "@ngrx/store-devtools": "^15.4.0",
     "@ngtools/webpack": "^15.2.6",
     "@nguniversal/builders": "^15.2.1",
@@ -157,6 +155,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
+    "csstype": "^3.1.3",
     "cypress": "^13.15.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
@@ -182,7 +181,9 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
+    "prop-types": "^15.8.1",
     "react": "^16.14.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "sass": "~1.80.4",
diff --git a/yarn.lock b/yarn.lock
index 891db985b9..b1ca8bf65b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1864,7 +1864,7 @@
   resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@material-ui/core@^4.11.0":
+"@material-ui/core@^4.11.0", "@material-ui/core@^4.12.4":
   version "4.12.4"
   resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz"
   integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
@@ -4455,6 +4455,11 @@ csstype@^3.0.2:
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"

From eedaa2c120e1b09a0e0335776d62d54377a939b7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 25 Oct 2024 12:40:49 -0500
Subject: [PATCH 0749/1286] Move ng-mocks to dev dependencies

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

diff --git a/package.json b/package.json
index abe1bc4f40..cc5a9f48eb 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,6 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng-mocks": "^14.13.1",
     "ng2-file-upload": "1.4.0",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
@@ -175,6 +174,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
+    "ng-mocks": "^14.13.1",
     "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",

From d3e9f87432968af6e640f5ceb510a68d64845f98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:13:35 +0000
Subject: [PATCH 0750/1286] Bump @babel/runtime from 7.25.9 to 7.26.0

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.25.9 to 7.26.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 5864c58d0c..d0ac72dc07 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
     "@angular/ssr": "^17.3.10",
-    "@babel/runtime": "7.25.9",
+    "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
diff --git a/yarn.lock b/yarn.lock
index f7e6fbd746..e3c303a022 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1358,10 +1358,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@7.25.9", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.9.tgz#65884fd6dc255a775402cc1d9811082918f4bf00"
-  integrity sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==
+"@babel/runtime@7.26.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -5296,11 +5296,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"

From 40ee2af8efa9020c9f36f34cc26b24c8789b9b8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:13:40 +0000
Subject: [PATCH 0751/1286] Bump sass from 1.80.3 to 1.80.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.3 to 1.80.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.3...1.80.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index 5864c58d0c..a6c9b9c58f 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.3",
+    "sass": "~1.80.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index f7e6fbd746..21eb274f90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5296,11 +5296,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"
@@ -9744,10 +9742,10 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.3:
-  version "1.80.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.3.tgz#3f63dd527647d2b3de35f36acb971bda80517423"
-  integrity sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA==
+sass@^1.25.0, sass@~1.80.4:
+  version "1.80.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.4.tgz#bc0418fd796cad2f1a1309d8b4d7fe44b7027de0"
+  integrity sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==
   dependencies:
     "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"

From ed410d7e95e809b46f68af2206e296f8a24cf153 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:14:02 +0000
Subject: [PATCH 0752/1286] Bump the testing group across 1 directory with 2
 updates

Bumps the testing group with 2 updates in the / directory: [axe-core](https://github.com/dequelabs/axe-core) and [cypress](https://github.com/cypress-io/cypress).


Updates `axe-core` from 4.10.0 to 4.10.2
- [Release notes](https://github.com/dequelabs/axe-core/releases)
- [Changelog](https://github.com/dequelabs/axe-core/blob/v4.10.2/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core/compare/v4.10.0...v4.10.2)

Updates `cypress` from 13.15.0 to 13.15.1
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.0...v13.15.1)

---
updated-dependencies:
- dependency-name: axe-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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

diff --git a/package.json b/package.json
index 5864c58d0c..07004c8edb 100644
--- a/package.json
+++ b/package.json
@@ -152,12 +152,12 @@
     "@typescript-eslint/parser": "^7.2.0",
     "@typescript-eslint/rule-tester": "^7.2.0",
     "@typescript-eslint/utils": "^7.2.0",
-    "axe-core": "^4.7.2",
+    "axe-core": "^4.10.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.3",
-    "cypress": "^13.15.0",
+    "cypress": "^13.15.1",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index f7e6fbd746..24a17cf83e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3688,10 +3688,10 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
   integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axe-core@^4.7.2:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59"
-  integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==
+axe-core@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
+  integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
 axios@^1.7.4:
   version "1.7.7"
@@ -4578,10 +4578,10 @@ cypress-axe@^1.5.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@^13.15.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
-  integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
+cypress@^13.15.1:
+  version "13.15.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.1.tgz#d85074e07cc576eb30068617d529719ef6093b69"
+  integrity sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==
   dependencies:
     "@cypress/request" "^3.0.4"
     "@cypress/xvfb" "^1.2.4"
@@ -4623,6 +4623,7 @@ cypress@^13.15.0:
     semver "^7.5.3"
     supports-color "^8.1.1"
     tmp "~0.2.3"
+    tree-kill "1.2.2"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -5296,11 +5297,9 @@ eslint-plugin-deprecation@^1.4.1:
 
 "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-import-newlines@^1.3.1:
   version "1.4.0"

From efc8cad00fe3e62758067b369b60ce32966731bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:33:38 +0000
Subject: [PATCH 0753/1286] Bump @babel/runtime from 7.25.9 to 7.26.0

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.25.9 to 7.26.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 31cdcc16fc..e019124c7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/platform-server": "^17.3.12",
         "@angular/router": "^17.3.12",
         "@angular/ssr": "^17.3.11",
-        "@babel/runtime": "7.25.9",
+        "@babel/runtime": "7.26.0",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
@@ -3901,9 +3901,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
-      "integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
diff --git a/package.json b/package.json
index d79b45b525..61a42705ed 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@angular/platform-server": "^17.3.12",
     "@angular/router": "^17.3.12",
     "@angular/ssr": "^17.3.11",
-    "@babel/runtime": "7.25.9",
+    "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",

From 3a5cf9c6c306cb4e1f07ec1e27249d46cdace68a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:34:22 +0000
Subject: [PATCH 0754/1286] Bump the testing group across 1 directory with 2
 updates

Bumps the testing group with 2 updates in the / directory: [axe-core](https://github.com/dequelabs/axe-core) and [cypress](https://github.com/cypress-io/cypress).


Updates `axe-core` from 4.10.0 to 4.10.2
- [Release notes](https://github.com/dequelabs/axe-core/releases)
- [Changelog](https://github.com/dequelabs/axe-core/blob/v4.10.2/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core/compare/v4.10.0...v4.10.2)

Updates `cypress` from 13.15.0 to 13.15.1
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.0...v13.15.1)

---
updated-dependencies:
- dependency-name: axe-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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

diff --git a/package-lock.json b/package-lock.json
index 31cdcc16fc..87bd6348fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,11 +105,11 @@
         "@typescript-eslint/parser": "^7.18.0",
         "@typescript-eslint/rule-tester": "^7.18.0",
         "@typescript-eslint/utils": "^7.18.0",
-        "axe-core": "^4.10.0",
+        "axe-core": "^4.10.2",
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.15.0",
+        "cypress": "^13.15.1",
         "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
@@ -8381,9 +8381,9 @@
       "dev": true
     },
     "node_modules/axe-core": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz",
-      "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
+      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -10269,9 +10269,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.0.tgz",
-      "integrity": "sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==",
+      "version": "13.15.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.1.tgz",
+      "integrity": "sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -10315,6 +10315,7 @@
         "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.3",
+        "tree-kill": "1.2.2",
         "untildify": "^4.0.0",
         "yauzl": "^2.10.0"
       },
diff --git a/package.json b/package.json
index d79b45b525..5bd4eb9d0e 100644
--- a/package.json
+++ b/package.json
@@ -192,11 +192,11 @@
     "@typescript-eslint/parser": "^7.18.0",
     "@typescript-eslint/rule-tester": "^7.18.0",
     "@typescript-eslint/utils": "^7.18.0",
-    "axe-core": "^4.10.0",
+    "axe-core": "^4.10.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "^13.15.0",
+    "cypress": "^13.15.1",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",

From 4a394a2a382c796e35f6e02864bc6043dca6f29b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:04:27 +0000
Subject: [PATCH 0755/1286] Bump tough-cookie from 4.1.2 to 4.1.4

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

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

diff --git a/yarn.lock b/yarn.lock
index b1ca8bf65b..c89eb2639e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11113,20 +11113,10 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^4.0.0, tough-cookie@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"
-  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tough-cookie@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@^4.1.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"

From 6f360a6a2d93c886593e51d5cd43592d8c691c2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:05:40 +0000
Subject: [PATCH 0756/1286] Bump the testing group across 1 directory with 2
 updates

Bumps the testing group with 2 updates in the / directory: [axe-core](https://github.com/dequelabs/axe-core) and [cypress](https://github.com/cypress-io/cypress).


Updates `axe-core` from 4.7.2 to 4.10.2
- [Release notes](https://github.com/dequelabs/axe-core/releases)
- [Changelog](https://github.com/dequelabs/axe-core/blob/v4.10.2/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core/compare/v4.7.2...v4.10.2)

Updates `cypress` from 13.15.0 to 13.15.1
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.0...v13.15.1)

---
updated-dependencies:
- dependency-name: axe-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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

diff --git a/package.json b/package.json
index cc5a9f48eb..e2923712c0 100644
--- a/package.json
+++ b/package.json
@@ -150,12 +150,12 @@
     "@types/sanitize-html": "^2.13.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "axe-core": "^4.7.2",
+    "axe-core": "^4.10.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.3",
-    "cypress": "^13.15.0",
+    "cypress": "^13.15.1",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index b1ca8bf65b..39470d9f2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3404,10 +3404,10 @@ aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axe-core@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0"
-  integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
+axe-core@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
+  integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
 axios@0.21.4:
   version "0.21.4"
@@ -4470,10 +4470,10 @@ cypress-axe@^1.5.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@^13.15.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
-  integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
+cypress@^13.15.1:
+  version "13.15.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.1.tgz#d85074e07cc576eb30068617d529719ef6093b69"
+  integrity sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==
   dependencies:
     "@cypress/request" "^3.0.4"
     "@cypress/xvfb" "^1.2.4"
@@ -4515,6 +4515,7 @@ cypress@^13.15.0:
     semver "^7.5.3"
     supports-color "^8.1.1"
     tmp "~0.2.3"
+    tree-kill "1.2.2"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -10330,14 +10331,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.5.4:
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1, semver@^7.5.3, semver@^7.5.4:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

From 161fcb8e83ead11184ce1f5a26d1296cef894cee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 20:21:44 +0000
Subject: [PATCH 0757/1286] Bump the angular group with 3 updates

Bumps the angular group with 3 updates: [@angular/ssr](https://github.com/angular/angular-cli), [@angular-devkit/build-angular](https://github.com/angular/angular-cli) and [@angular/cli](https://github.com/angular/angular-cli).


Updates `@angular/ssr` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

Updates `@angular-devkit/build-angular` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

Updates `@angular/cli` from 17.3.10 to 17.3.11
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular-cli/compare/17.3.10...17.3.11)

---
updated-dependencies:
- dependency-name: "@angular/ssr"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular-devkit/build-angular"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
- dependency-name: "@angular/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular
...

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

diff --git a/package.json b/package.json
index 73226393ec..50d5f13151 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@angular/platform-browser-dynamic": "^17.3.11",
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
-    "@angular/ssr": "^17.3.10",
+    "@angular/ssr": "^17.3.11",
     "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -124,14 +124,14 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.10",
+    "@angular-devkit/build-angular": "^17.3.11",
     "@angular-eslint/builder": "17.5.3",
     "@angular-eslint/bundled-angular-compiler": "17.5.3",
     "@angular-eslint/eslint-plugin": "17.5.3",
     "@angular-eslint/eslint-plugin-template": "17.5.3",
     "@angular-eslint/schematics": "17.5.3",
     "@angular-eslint/template-parser": "17.5.3",
-    "@angular/cli": "^17.3.10",
+    "@angular/cli": "^17.3.11",
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.11",
     "@cypress/schematic": "^1.5.0",
diff --git a/yarn.lock b/yarn.lock
index c2c575d95e..732101d988 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,12 +31,12 @@
     lodash "^4.17.15"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1703.10", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
-  version "0.1703.10"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.10.tgz#c70a59f6dcc5228ac41713a14582253d5e348b40"
-  integrity sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==
+"@angular-devkit/architect@0.1703.11", "@angular-devkit/architect@>=0.1700.0 < 0.1800.0":
+  version "0.1703.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1703.11.tgz#c335d8908875d855c030c3bbe98c1e59d4943305"
+  integrity sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==
   dependencies:
-    "@angular-devkit/core" "17.3.10"
+    "@angular-devkit/core" "17.3.11"
     rxjs "7.8.1"
 
 "@angular-devkit/architect@^0.1202.10":
@@ -47,15 +47,15 @@
     "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@^17.0.0", "@angular-devkit/build-angular@^17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.10.tgz#68c34b2922991f22369e912e080ddc5a0b112ca4"
-  integrity sha512-syz7xgzmp8/0tPJWwQIKZt7KNJfp9U7hkqNacXz4XTYz6YM0oyBXlqk2claSxywWBEkc0eJVSMD9e2ArusZBuA==
+"@angular-devkit/build-angular@^17.0.0", "@angular-devkit/build-angular@^17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz#70dbdcf3cf7f8609b63d688660b74f3ac7c63eb1"
+  integrity sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.1703.10"
-    "@angular-devkit/build-webpack" "0.1703.10"
-    "@angular-devkit/core" "17.3.10"
+    "@angular-devkit/architect" "0.1703.11"
+    "@angular-devkit/build-webpack" "0.1703.11"
+    "@angular-devkit/core" "17.3.11"
     "@babel/core" "7.24.0"
     "@babel/generator" "7.23.6"
     "@babel/helper-annotate-as-pure" "7.22.5"
@@ -66,7 +66,7 @@
     "@babel/preset-env" "7.24.0"
     "@babel/runtime" "7.24.0"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "17.3.10"
+    "@ngtools/webpack" "17.3.11"
     "@vitejs/plugin-basic-ssl" "1.1.0"
     ansi-colors "4.1.3"
     autoprefixer "10.4.18"
@@ -78,7 +78,7 @@
     css-loader "6.10.0"
     esbuild-wasm "0.20.1"
     fast-glob "3.3.2"
-    http-proxy-middleware "2.0.6"
+    http-proxy-middleware "2.0.7"
     https-proxy-agent "7.0.4"
     inquirer "9.2.15"
     jsonc-parser "3.2.1"
@@ -118,12 +118,12 @@
   optionalDependencies:
     esbuild "0.20.1"
 
-"@angular-devkit/build-webpack@0.1703.10":
-  version "0.1703.10"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.10.tgz#235760406246594b9c898eecef9e8703ad20769a"
-  integrity sha512-m6dDgzKLW+c3z9/TUxYmbJEtEhrdYNQ4ogdtAgEYA/FRrKueDU0WztLNr+dVbvwNP99Skovtr8sAQfN6twproQ==
+"@angular-devkit/build-webpack@0.1703.11":
+  version "0.1703.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1703.11.tgz#425961919948c60a6d27b62daa82de445c1ae92c"
+  integrity sha512-qbCiiHuoVkD7CtLyWoRi/Vzz6nrEztpF5XIyWUcQu67An1VlxbMTE4yoSQiURjCQMnB/JvS1GPVed7wOq3SJ/w==
   dependencies:
-    "@angular-devkit/architect" "0.1703.10"
+    "@angular-devkit/architect" "0.1703.11"
     rxjs "7.8.1"
 
 "@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
@@ -138,10 +138,10 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@17.3.10", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.10.tgz#c259052a891ad0bd1a7708d1081571683b3fa814"
-  integrity sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==
+"@angular-devkit/core@17.3.11", "@angular-devkit/core@^17.0.0", "@angular-devkit/core@^17.1.0":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-17.3.11.tgz#a74b042ec06cf626d5a2f6a3971b156c6759fe09"
+  integrity sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -159,12 +159,12 @@
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.10.tgz#a3d62b33f82fd1fa51246d00ada92efe82a00ae7"
-  integrity sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==
+"@angular-devkit/schematics@17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-17.3.11.tgz#37095fb08b0ab0343c7c0dde57ca81115178714f"
+  integrity sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==
   dependencies:
-    "@angular-devkit/core" "17.3.10"
+    "@angular-devkit/core" "17.3.11"
     jsonc-parser "3.2.1"
     magic-string "0.30.8"
     ora "5.4.1"
@@ -244,15 +244,15 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.10.tgz#15156dc511a6c43a798f5015e0345d7678691418"
-  integrity sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==
+"@angular/cli@^17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-17.3.11.tgz#8c80504cac604ef8a5eac3e884bf1984678da4ce"
+  integrity sha512-8R9LwAGL8hGAWJ4mNG9ZPUrBUzIdmst0Ldua6RJJ+PrqgjX+8IbO+lNnfrOY/XY+Z3LXbCEJflL26f9czCvTPQ==
   dependencies:
-    "@angular-devkit/architect" "0.1703.10"
-    "@angular-devkit/core" "17.3.10"
-    "@angular-devkit/schematics" "17.3.10"
-    "@schematics/angular" "17.3.10"
+    "@angular-devkit/architect" "0.1703.11"
+    "@angular-devkit/core" "17.3.11"
+    "@angular-devkit/schematics" "17.3.11"
+    "@schematics/angular" "17.3.11"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "4.1.2"
@@ -354,10 +354,10 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/ssr@^17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.10.tgz#bf13834e3115ca7779834820dcb5b3b9659056bf"
-  integrity sha512-t+NX1HufU38c0u+8mDg31cqrXZo5SEUxjBuXwdu3mOvYbkanjhbtyIgIMYr9Vru8pqncasgHLJv2RVWDvAjlEw==
+"@angular/ssr@^17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@angular/ssr/-/ssr-17.3.11.tgz#a2ed7e7b84b89d5834097c21195b523a236ee68e"
+  integrity sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==
   dependencies:
     critters "0.0.22"
     tslib "^2.3.0"
@@ -2109,10 +2109,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.10.tgz#6f077ef3d1fa4363cffcfee66f9b2e52164069b2"
-  integrity sha512-yPKmdbTJzxROAl2NS8P8eHB2mU0BqV2I0ZiKmX6oTetY2Ea4i2WzlTK39pPpG7atmdF2NPWYLXdJWAup+JxSyw==
+"@ngtools/webpack@17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-17.3.11.tgz#7fda88d850489d8b0bf0812a582052da27150e58"
+  integrity sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==
 
 "@ngtools/webpack@^16.2.16":
   version "16.2.16"
@@ -2495,13 +2495,13 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@schematics/angular@17.3.10":
-  version "17.3.10"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.10.tgz#87c77ae2eb917f391d654df3c908f4a00d3d9443"
-  integrity sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==
+"@schematics/angular@17.3.11":
+  version "17.3.11"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-17.3.11.tgz#a04a449746b30b29c8bfed0a04bfb564f013ba5b"
+  integrity sha512-tvJpTgYC+hCnTyLszYRUZVyNTpPd+C44gh5CPTcG3qkqStzXQwynQAf6X/DjtwXbUiPQF0XfF0+0R489GpdZPA==
   dependencies:
-    "@angular-devkit/core" "17.3.10"
-    "@angular-devkit/schematics" "17.3.10"
+    "@angular-devkit/core" "17.3.11"
+    "@angular-devkit/schematics" "17.3.11"
     jsonc-parser "3.2.1"
 
 "@schematics/angular@^12.2.17":
@@ -6296,18 +6296,7 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-http-proxy-middleware@2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
-  dependencies:
-    "@types/http-proxy" "^1.17.8"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.7:
+http-proxy-middleware@2.0.7, http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
   integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==

From 45fb5aa6114c10de99a27580efa4d139eba818d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:00:31 +0000
Subject: [PATCH 0758/1286] Bump dompurify from 2.4.5 to 2.5.7

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.5 to 2.5.7.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.5...2.5.7)

---
updated-dependencies:
- dependency-name: dompurify
  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 b1ca8bf65b..dce995dafd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4902,9 +4902,9 @@ domino@^2.1.2:
   integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==
 
 dompurify@^2.0.11:
-  version "2.4.5"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz"
-  integrity sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.7.tgz#6e0d36b9177db5a99f18ade1f28579db5ab839d7"
+  integrity sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==
 
 domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"

From 2547b1218f36f00e1a62522a47d9c9f59dbc91e9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 10:34:49 +0200
Subject: [PATCH 0759/1286] 116404: Fixed expandable navbar section loosing
 focus on expand through keyboard

---
 .../expandable-admin-sidebar-section.component.ts    |  2 +-
 .../expandable-navbar-section.component.html         | 12 +++++-------
 .../expandable-navbar-section.component.ts           | 10 ++++------
 .../menu/menu-section/menu-section.component.ts      |  8 +++++---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 1b09d330c2..43d314ecdd 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -84,7 +84,7 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
     this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
     this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
     this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+    this.isExpanded$ = combineLatestObservable([this.active$, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
       map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
     );
   }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 7f9b4a546f..5119cec689 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,9 +1,8 @@
 <div class="ds-menu-item-wrapper text-md-center"
     [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event, isActive)"
-    (mouseleave)="onMouseLeave($event, isActive)"
-    data-test="navbar-section-wrapper"
-    *ngVar="(active | async) as isActive">
+    (mouseenter)="onMouseEnter($event)"
+    (mouseleave)="onMouseLeave($event)"
+    data-test="navbar-section-wrapper">
     <a href="javascript:void(0);" routerLinkActive="active"
        role="menuitem"
        (keyup.enter)="toggleSection($event)"
@@ -12,18 +11,17 @@
        (keydown.space)="$event.preventDefault()"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
-       [attr.aria-expanded]="isActive"
+       [attr.aria-expanded]="(active$ | async).valueOf()"
        [attr.aria-controls]="expandableNavbarSectionId(section.id)"
        class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
        [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
+    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 92da978af7..7f4405e2b6 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -84,13 +84,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseEnter($event: Event, isActive: boolean) {
+  onMouseEnter($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && !isActive && !this.mouseEntered) {
+      if (!isMobile && !this.active$.value && !this.mouseEntered) {
         this.activateSection($event);
       }
       this.mouseEntered = true;
@@ -100,13 +99,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse leaves the section toggler deactivate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseLeave($event: Event, isActive: boolean) {
+  onMouseLeave($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && isActive && this.mouseEntered) {
+      if (!isMobile && this.active$.value && this.mouseEntered) {
         this.deactivateSection($event);
       }
       this.mouseEntered = false;
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index f59c0b5594..685ebe6b99 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -37,9 +37,9 @@ import { MenuSection } from '../menu-section.model';
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
-   * Observable that emits whether or not this section is currently active
+   * {@link BehaviorSubject} containing the current state to whether this section is currently active
    */
-  active: Observable<boolean>;
+  active$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   /**
    * The ID of the menu this section resides in
@@ -72,7 +72,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.active = this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged());
+    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      this.active$.next(isActive);
+    });
     this.initializeInjectorData();
   }
 

From c08c2721ac2d14f4ba6adf1baf39e8c46cc9401d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 11:01:38 +0200
Subject: [PATCH 0760/1286] 116404: Don't navigate in the expandable navbar
 section with tab

Had to move the @slide animation to prevent focus being lost when tabbing in the expandable section
---
 .../expandable-navbar-section.component.html          | 11 +++++++----
 .../menu/menu-section/menu-section.component.ts       |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 5119cec689..f37fc222d5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -9,6 +9,7 @@
        (keyup.space)="toggleSection($event)"
        (click)="toggleSection($event)"
        (keydown.space)="$event.preventDefault()"
+       (keydown.tab)="deactivateSection($event, false)"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
        [attr.aria-expanded]="(active$ | async).valueOf()"
@@ -21,13 +22,15 @@
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+      <div @slide role="presentation">
         <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-            <ng-container
-                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </div>
+              <ng-container
+                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+      </div>
     </div>
 </div>
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 685ebe6b99..43df73547a 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -102,10 +102,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Deactivate this section
+   *
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  deactivateSection(event: Event) {
-    event.preventDefault();
+  deactivateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     this.menuService.deactivateSection(this.menuID, this.section.id);
   }
 

From 05232cdf2b068223c8147ed61afe364fc92986d1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 13:30:01 +0200
Subject: [PATCH 0761/1286] 116404: Added navigation with arrow keys in navbar
 & collapsed the expandable menu when hovering outside of it

---
 .../expandable-navbar-section.component.html  |  59 +++++-----
 .../expandable-navbar-section.component.ts    | 104 ++++++++++++++++--
 .../shared/utils/hover-outside.directive.ts   |  51 +++++++++
 .../expandable-navbar-section.component.ts    |  14 ++-
 4 files changed, 185 insertions(+), 43 deletions(-)
 create mode 100644 src/app/shared/utils/hover-outside.directive.ts

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f37fc222d5..f8facaa82a 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,36 +1,37 @@
-<div class="ds-menu-item-wrapper text-md-center"
-    [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event)"
-    (mouseleave)="onMouseLeave($event)"
-    data-test="navbar-section-wrapper">
-    <a href="javascript:void(0);" routerLinkActive="active"
-       role="menuitem"
-       (keyup.enter)="toggleSection($event)"
-       (keyup.space)="toggleSection($event)"
-       (click)="toggleSection($event)"
-       (keydown.space)="$event.preventDefault()"
-       (keydown.tab)="deactivateSection($event, false)"
-       aria-haspopup="menu"
-       data-test="navbar-section-toggler"
-       [attr.aria-expanded]="(active$ | async).valueOf()"
-       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
-       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
-       [class.disabled]="section.model?.disabled">
+<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+     [id]="'expandable-navbar-section-' + section.id"
+     (mouseenter)="onMouseEnter($event)"
+     (mouseleave)="onMouseLeave($event)"
+     data-test="navbar-section-wrapper">
+  <a href="javascript:void(0);" routerLinkActive="active"
+     role="menuitem"
+     (keyup.enter)="toggleSection($event)"
+     (keyup.space)="toggleSection($event)"
+     (click)="toggleSection($event)"
+     (keydown)="keyDown($event)"
+     aria-haspopup="menu"
+     data-test="navbar-section-toggler"
+     [attr.aria-expanded]="(active$ | async).valueOf()"
+     [attr.aria-controls]="expandableNavbarSectionId()"
+     class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+     [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
       </span>
-      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
-    </a>
-    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
-        [id]="expandableNavbarSectionId(section.id)"
-        role="menu"
-        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-      <div @slide role="presentation">
-        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-              <ng-container
-                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-          </div>
+    <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+  </a>
+  <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+       [id]="expandableNavbarSectionId()"
+       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       (dsHoverOutside)="deactivateSection($event, false)"
+       role="menu"
+       class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+    <div @slide role="presentation">
+      <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
       </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 7f4405e2b6..7fb86ce323 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -5,11 +5,14 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewChecked,
   Component,
+  ElementRef,
   HostListener,
   Inject,
   Injector,
   OnInit,
+  ViewChild,
 } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -19,6 +22,8 @@ import { slide } from '../../shared/animations/slide';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
@@ -31,9 +36,20 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    NgFor,
+    NgIf,
+    RouterLinkActive,
+    VarDirective,
+  ],
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
+
+  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+
   /**
    * This section resides in the Public Navbar
    */
@@ -54,6 +70,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   isMobile$: Observable<boolean>;
 
+  /**
+   * Boolean used to add the event listeners to the items in the expandable menu when expanded. This is done for
+   * performance reasons, there is currently an *ngIf on the menu to prevent the {@link HoverOutsideDirective} to tank
+   * performance when not expanded.
+   */
+  addArrowEventListeners = false;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -68,17 +91,33 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     });
   }
 
-  constructor(@Inject('sectionDataProvider') menuSection,
-              protected menuService: MenuService,
-              protected injector: Injector,
-              private windowService: HostWindowService,
+  constructor(
+    @Inject('sectionDataProvider') public section: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected windowService: HostWindowService,
   ) {
-    super(menuSection, menuService, injector);
+    super(section, menuService, injector);
     this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
     super.ngOnInit();
+    this.subs.push(this.active$.subscribe((active: boolean) => {
+      if (active === true) {
+        this.addArrowEventListeners = true;
+      }
+    }));
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.addArrowEventListeners) {
+      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach(item => {
+        item.addEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.addArrowEventListeners = false;
+    }
   }
 
   /**
@@ -113,9 +152,54 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   /**
    * returns the ID of the DOM element representing the navbar section
-   * @param sectionId
    */
-  expandableNavbarSectionId(sectionId: string) {
-    return `expandable-navbar-section-${sectionId}-dropdown`;
+  expandableNavbarSectionId(): string {
+    return `expandable-navbar-section-${this.section.id}-dropdown`;
+  }
+
+  /**
+   * Handles the navigation between the menu items
+   *
+   * @param event
+   */
+  navigateDropdown(event: KeyboardEvent): void {
+    if (event.key === 'Tab') {
+      this.deactivateSection(event, false);
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+
+    const items: NodeListOf<Element> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+    if (items.length === 0) {
+      return;
+    }
+    const currentIndex: number = Array.from(items).findIndex((item: Element) => item === event.target);
+
+    if (event.key === 'ArrowDown') {
+      (items[(currentIndex + 1) % items.length] as HTMLElement).focus();
+    } else if (event.key === 'ArrowUp') {
+      (items[(currentIndex - 1 + items.length) % items.length] as HTMLElement).focus();
+    }
+  }
+
+  /**
+   * Handles all the keydown events on the dropdown toggle
+   *
+   * @param event
+   */
+  keyDown(event: KeyboardEvent): void {
+    switch (event.code) {
+      // Works for both Tab & Shift Tab
+      case 'Tab':
+        this.deactivateSection(event, false);
+        break;
+      case 'ArrowDown':
+        this.navigateDropdown(event);
+        break;
+      case 'Space':
+        event.preventDefault();
+        break;
+    }
   }
 }
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
new file mode 100644
index 0000000000..a0abb8bb63
--- /dev/null
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -0,0 +1,51 @@
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+} from '@angular/core';
+
+/**
+ * Directive to detect when the user hovers outside of the element the directive was put on
+ *
+ * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
+ * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ */
+@Directive({
+  selector: '[dsHoverOutside]',
+  standalone: true,
+})
+export class HoverOutsideDirective {
+
+  /**
+   * Emits null when the user hovers outside of the element
+   */
+  @Output()
+  public dsHoverOutside = new EventEmitter();
+
+  /**
+   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
+   * element the directive was put on.
+   */
+  @Input()
+  public dsHoverOutsideOfElement: ElementRef;
+
+  constructor(
+    private elementRef: ElementRef,
+  ) {
+    this.dsHoverOutsideOfElement = this.elementRef;
+  }
+
+  @HostListener('document:mouseover', ['$event'])
+  public onMouseOver(event: MouseEvent): void {
+    const targetElement: HTMLElement = event.target as HTMLElement;
+    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+
+    if (!hoveredInside) {
+      this.dsHoverOutside.emit(null);
+    }
+  }
+
+}
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index f0e2ebd502..167b805fd5 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -9,11 +9,9 @@ import { RouterLinkActive } from '@angular/router';
 
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
+import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive';
 import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
-/**
- * Represents an expandable section in the navbar
- */
 @Component({
   selector: 'ds-themed-expandable-navbar-section',
   // templateUrl: './expandable-navbar-section.component.html',
@@ -22,7 +20,15 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    NgFor,
+    NgIf,
+    RouterLinkActive,
+    VarDirective,
+  ],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {
 }

From 2152bab717c197f7e67b8a025ea611b6515ef308 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 16:02:42 +0200
Subject: [PATCH 0762/1286] 116404: Apply focus on first item

---
 .../expandable-navbar-section.component.ts               | 9 ++++++---
 .../shared/menu/menu-section/menu-section.component.ts   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 7fb86ce323..3b1d2f7faa 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -112,10 +112,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach(item => {
+      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
+      if (dropdownItems.length > 0) {
+        dropdownItems.item(0).focus();
+      }
       this.addArrowEventListeners = false;
     }
   }
@@ -195,7 +198,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
-        this.navigateDropdown(event);
+        this.activateSection(event);
         break;
       case 'Space':
         event.preventDefault();
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 43df73547a..21deca9b18 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -92,9 +92,12 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
   /**
    * Activate this section
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  activateSection(event: Event) {
-    event.preventDefault();
+  activateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     if (!this.section.model?.disabled) {
       this.menuService.activateSection(this.menuID, this.section.id);
     }

From 84df67c00bc46f6346efadb7a6cb7c068d7d36a0 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 17:57:18 +0200
Subject: [PATCH 0763/1286] 116404: Close modal on escape

---
 .../expandable-navbar-section.component.ts                  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 3b1d2f7faa..e546585c07 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -166,9 +166,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param event
    */
   navigateDropdown(event: KeyboardEvent): void {
-    if (event.key === 'Tab') {
+    if (event.code === 'Tab') {
       this.deactivateSection(event, false);
       return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
     }
     event.preventDefault();
     event.stopPropagation();

From f7bb83013a7b6c49fee3695668c66129b4078f5c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 27 Oct 2024 14:11:05 +0100
Subject: [PATCH 0764/1286] 116404: Replaced ViewChild logic with a CSS
 selector

This change avoids triggering an additional change detection cycle
---
 .../expandable-navbar-section.component.html  |  4 +-
 ...xpandable-navbar-section.component.spec.ts | 20 +++++----
 .../expandable-navbar-section.component.ts    | 42 ++++++++++++++-----
 .../shared/utils/hover-outside.directive.ts   | 18 ++++----
 .../expandable-navbar-section.component.ts    |  2 -
 5 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f8facaa82a..0af5c706b7 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,4 +1,4 @@
-<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+<div class="ds-menu-item-wrapper text-md-center"
      [id]="'expandable-navbar-section-' + section.id"
      (mouseenter)="onMouseEnter($event)"
      (mouseleave)="onMouseLeave($event)"
@@ -23,7 +23,7 @@
   </a>
   <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
        [id]="expandableNavbarSectionId()"
-       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
        (dsHoverOutside)="deactivateSection($event, false)"
        role="menu"
        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index d03c8d89eb..91d5a7f1ed 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -12,7 +12,7 @@ import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 
 describe('ExpandableNavbarSectionComponent', () => {
@@ -23,7 +23,12 @@ describe('ExpandableNavbarSectionComponent', () => {
   describe('on larger screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
@@ -41,10 +46,6 @@ describe('ExpandableNavbarSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
     describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
         spyOn(component, 'onMouseEnter').and.callThrough();
@@ -184,7 +185,12 @@ describe('ExpandableNavbarSectionComponent', () => {
   describe('on smaller, mobile screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index e546585c07..b28aa25804 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -7,12 +7,11 @@ import {
 import {
   AfterViewChecked,
   Component,
-  ElementRef,
   HostListener,
   Inject,
   Injector,
+  OnDestroy,
   OnInit,
-  ViewChild,
 } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -24,7 +23,6 @@ import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
 import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
-import { VarDirective } from '../../shared/utils/var.directive';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
 /**
@@ -43,12 +41,9 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
     NgFor,
     NgIf,
     RouterLinkActive,
-    VarDirective,
   ],
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
-
-  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
 
   /**
    * This section resides in the Public Navbar
@@ -77,6 +72,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   addArrowEventListeners = false;
 
+  /**
+   * List of current dropdown items who have event listeners
+   */
+  private dropdownItems: NodeListOf<HTMLElement>;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -106,23 +106,43 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.subs.push(this.active$.subscribe((active: boolean) => {
       if (active === true) {
         this.addArrowEventListeners = true;
+      } else {
+        this.unsubscribeFromEventListeners();
       }
     }));
   }
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach((item: HTMLElement) => {
+      this.dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (dropdownItems.length > 0) {
-        dropdownItems.item(0).focus();
+      if (this.dropdownItems.length > 0) {
+        this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
     }
   }
 
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.unsubscribeFromEventListeners();
+  }
+
+  /**
+   * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
+   * destruction)
+   */
+  unsubscribeFromEventListeners(): void {
+    if (this.dropdownItems) {
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.removeEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.dropdownItems = undefined;
+    }
+  }
+
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
index a0abb8bb63..e046d3a087 100644
--- a/src/app/shared/utils/hover-outside.directive.ts
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -8,10 +8,11 @@ import {
 } from '@angular/core';
 
 /**
- * Directive to detect when the user hovers outside of the element the directive was put on
+ * Directive to detect when the user hovers outside the element the directive was put on
  *
- * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
- * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ * **Performance Consideration**: it's probably not good for performance to use this excessively (on
+ * {@link ExpandableNavbarSectionComponent} for example, a workaround for this problem was to add an `*ngIf` to prevent
+ * this Directive from always being active)
  */
 @Directive({
   selector: '[dsHoverOutside]',
@@ -26,22 +27,23 @@ export class HoverOutsideDirective {
   public dsHoverOutside = new EventEmitter();
 
   /**
-   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
-   * element the directive was put on.
+   * CSS selector for the parent element to monitor. If set, the directive will use this
+   * selector to determine if the hover event originated within the selected parent element.
+   * If left unset, the directive will monitor mouseover hover events for the element it is applied to.
    */
   @Input()
-  public dsHoverOutsideOfElement: ElementRef;
+  public dsHoverOutsideOfParentSelector: string;
 
   constructor(
     private elementRef: ElementRef,
   ) {
-    this.dsHoverOutsideOfElement = this.elementRef;
   }
 
   @HostListener('document:mouseover', ['$event'])
   public onMouseOver(event: MouseEvent): void {
     const targetElement: HTMLElement = event.target as HTMLElement;
-    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+    const element: Element = document.querySelector(this.dsHoverOutsideOfParentSelector);
+    const hoveredInside = (element ? new ElementRef(element) : this.elementRef).nativeElement.contains(targetElement);
 
     if (!hoveredInside) {
       this.dsHoverOutside.emit(null);
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 167b805fd5..b0b57a75aa 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -10,7 +10,6 @@ import { RouterLinkActive } from '@angular/router';
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
 import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-themed-expandable-navbar-section',
@@ -27,7 +26,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     NgFor,
     NgIf,
     RouterLinkActive,
-    VarDirective,
   ],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {

From 6763df88bc8d98a3b6eb8c8497ef9a4b0379c3cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 03:16:28 +0000
Subject: [PATCH 0765/1286] Bump zone.js from 0.14.10 to 0.15.0

Bumps [zone.js](https://github.com/angular/angular/tree/HEAD/packages/zone.js) from 0.14.10 to 0.15.0.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/packages/zone.js/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/zone.js-0.15.0/packages/zone.js)

---
updated-dependencies:
- dependency-name: zone.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 50d5f13151..aa3121389b 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.15.0"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 732101d988..998c3415bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11391,7 +11391,7 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110"
   integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==
 
-zone.js@~0.14.4:
-  version "0.14.10"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.14.10.tgz#23b8b29687c6bffece996e5ee5b854050e7775c8"
-  integrity sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==
+zone.js@~0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.15.0.tgz#4810624e58d6dcf7b8379c1631765589917a0d8f"
+  integrity sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==

From 59e5f71a73053f8633446a1f43965ee99e4693f6 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 17:02:42 +0100
Subject: [PATCH 0766/1286] 117287: Fixed group form not working correctly
 anymore when switching between different groups

Also fixed edit ePerson not showing the group names
---
 .../eperson-form/eperson-form.component.html  |  4 +-
 .../group-form/group-form.component.ts        | 46 ++++++++++++-------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 3c5b2d13b4..16948919ba 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -71,7 +71,9 @@
             {{ dsoNameService.getName(group) }}
           </a>
           </td>
-          <td class="align-middle">{{ dsoNameService.getName(undefined) }}</td>
+          <td class="align-middle">
+            {{ dsoNameService.getName((group.object | async)?.payload) }}
+          </td>
         </tr>
         </tbody>
       </table>
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 37ce30473f..c0ea034fbb 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
@@ -13,7 +13,7 @@ import {
   Observable,
   Subscription, combineLatest,
 } from 'rxjs';
-import { map, switchMap, take, debounceTime, startWith, filter } from 'rxjs/operators';
+import { map, switchMap, take, debounceTime } from 'rxjs/operators';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
@@ -35,7 +35,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertType } from '../../../shared/alert/aletr-type';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { hasValue, isNotEmpty, hasValueOperator, hasNoValue } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, hasValueOperator } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -164,11 +164,16 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.activeGroupLinkedDSO$ = this.getActiveGroupLinkedDSO();
     this.linkedEditRolesRoute$ = this.getLinkedEditRolesRoute();
     this.canEdit$ = this.activeGroupLinkedDSO$.pipe(
-      filter((dso: DSpaceObject) => hasNoValue(dso)),
-      switchMap(() => this.activeGroup$),
-      hasValueOperator(),
-      switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
-      startWith(false),
+      switchMap((dso: DSpaceObject) => {
+        if (hasValue(dso)) {
+          return [false];
+        } else {
+          return this.activeGroup$.pipe(
+            hasValueOperator(),
+            switchMap((group: Group) => this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self)),
+          );
+        }
+      }),
     );
     this.initialisePage();
   }
@@ -216,7 +221,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       combineLatest([
         this.activeGroup$,
         this.canEdit$,
-        this.activeGroupLinkedDSO$.pipe(take(1)),
+        this.activeGroupLinkedDSO$,
       ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
 
         if (activeGroup != null) {
@@ -224,25 +229,31 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           // Disable group name exists validator
           this.formGroup.controls.groupName.clearAsyncValidators();
 
-          if (linkedObject?.name) {
-            this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, groupCommunityModel);
-            this.groupDescription = this.formGroup.get('groupCommunity');
+          if (isNotEmpty(linkedObject?.name)) {
+            if (!this.formGroup.controls.groupCommunity) {
+              this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, groupCommunityModel);
+              this.groupDescription = this.formGroup.get('groupCommunity');
+            }
             this.formGroup.patchValue({
               groupName: activeGroup.name,
               groupCommunity: linkedObject?.name ?? '',
               groupDescription: activeGroup.firstMetadataValue('dc.description'),
             });
           } else {
+            this.formModel = [
+              groupNameModel,
+              groupDescriptionModel,
+            ];
             this.formGroup.patchValue({
               groupName: activeGroup.name,
               groupDescription: activeGroup.firstMetadataValue('dc.description'),
             });
           }
-          setTimeout(() => {
-            if (!canEdit || activeGroup.permanent) {
-              this.formGroup.disable();
-            }
-          }, 200);
+          if (!canEdit || activeGroup.permanent) {
+            this.formGroup.disable();
+          } else {
+            this.formGroup.enable();
+          }
         }
       })
     );
@@ -471,6 +482,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
    */
   getLinkedEditRolesRoute(): Observable<string> {
     return this.activeGroupLinkedDSO$.pipe(
+      hasValueOperator(),
       map((dso: DSpaceObject) => {
         switch ((dso as any).type) {
           case Community.type.value:
@@ -478,7 +490,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           case Collection.type.value:
             return getCollectionEditRolesRoute(dso.id);
         }
-      })
+      }),
     );
   }
 }

From 976ac7604be2458c31f92b6af05e94df453a74ea Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 17:36:33 +0100
Subject: [PATCH 0767/1286] 117287: Fixed UI freezing on withdrawn item pages

---
 .../alerts/item-alerts.component.html         |  2 +-
 .../alerts/item-alerts.component.spec.ts      |  2 +-
 .../item-page/alerts/item-alerts.component.ts | 27 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index f6304340f3..b964327e39 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -8,7 +8,7 @@
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
                 <div class="gap-2 d-flex">
                   <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
-                  <a *ngIf="showReinstateButton$() | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+                  <a *ngIf="showReinstateButton$ | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
                 </div>
             </div>
         </ds-alert>
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
index d2541f9d0d..ef788c47ec 100644
--- a/src/app/item-page/alerts/item-alerts.component.spec.ts
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -161,7 +161,7 @@ describe('ItemAlertsComponent', () => {
         (authorizationService.isAuthorized).and.returnValue(isAdmin$);
         (correctionTypeDataService.findByItem).and.returnValue(correction$);
 
-        expectObservable(component.showReinstateButton$()).toBe(expectedMarble, expectedValues);
+        expectObservable(component.shouldShowReinstateButton()).toBe(expectedMarble, expectedValues);
       });
     });
 
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index 1984de0324..bcf940e69d 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -5,6 +5,8 @@ import {
 import {
   Component,
   Input,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -45,12 +47,17 @@ import {
 /**
  * Component displaying alerts for an item
  */
-export class ItemAlertsComponent {
+export class ItemAlertsComponent implements OnChanges {
   /**
    * The Item to display alerts for
    */
   @Input() item: Item;
 
+  /**
+   * Whether the reinstate button should be shown
+   */
+  showReinstateButton$: Observable<boolean>;
+
   /**
    * The AlertType enumeration
    * @type {AlertType}
@@ -58,18 +65,24 @@ export class ItemAlertsComponent {
   public AlertTypeEnum = AlertType;
 
   constructor(
-    private authService: AuthorizationDataService,
-    private dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
-    private correctionTypeDataService: CorrectionTypeDataService,
+    protected authService: AuthorizationDataService,
+    protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    protected correctionTypeDataService: CorrectionTypeDataService,
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item?.currentValue.withdrawn && this.showReinstateButton$) {
+      this.showReinstateButton$ = this.shouldShowReinstateButton();
+    }
+  }
+
   /**
    * Determines whether to show the reinstate button.
    * The button is shown if the user is not an admin and the item has a reinstate request.
    * @returns An Observable that emits a boolean value indicating whether to show the reinstate button.
    */
-  showReinstateButton$(): Observable<boolean>  {
+  shouldShowReinstateButton(): Observable<boolean>  {
     const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe(
       getFirstCompletedRemoteData(),
       map((correctionTypeRD: RemoteData<PaginatedList<CorrectionType>>) => correctionTypeRD.hasSucceeded ? correctionTypeRD.payload.page : []),
@@ -78,8 +91,8 @@ export class ItemAlertsComponent {
     return combineLatest([isAdmin$, correction$]).pipe(
       map(([isAdmin, correction]) => {
         return !isAdmin && correction.some((correctionType) => correctionType.topic === REQUEST_REINSTATE);
-      },
-      ));
+      }),
+    );
   }
 
   /**

From 0cb5b76159ce41b8b15192010ff7c89ab9911d21 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 18:33:01 +0100
Subject: [PATCH 0768/1286] 117287: Prevent /api/eperson/epersons/undefined
 from being fired on the create ePerson page

---
 .../eperson-form/eperson-form.component.ts                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 4a1d907990..8aa7f15250 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -278,9 +278,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-    this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
-      this.epersonService.editEPerson(ePersonRD.payload);
-    }));
+    if (this.route.snapshot.params.id) {
+      this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+        this.epersonService.editEPerson(ePersonRD.payload);
+      }));
+    }
     this.firstName = new DynamicInputModel({
       id: 'firstName',
       label: this.translateService.instant(`${this.messagePrefix}.firstName`),

From 8d00d435c432db20409a2d01835442196a4b94e9 Mon Sep 17 00:00:00 2001
From: Nima Behforouz <92104872+nimabehforouz@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:48:53 -0400
Subject: [PATCH 0769/1286] Update fr.json5

Translation updates to fr.json5 file regarding the Access Control sections.
---
 src/assets/i18n/fr.json5 | 96 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 185576e186..b2a03fad7d 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -357,6 +357,18 @@
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "EPeople",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nouvelle EPerson",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nouvelle EPerson",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Ajouter EPerson",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Ajouter EPerson",
+
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "EPeople",
 
@@ -747,6 +759,30 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Retour",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Assurance qualité",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Suggestions d'assurance qualité",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Suggestions d'assurance qualité",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Assurance qualité",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Assurance qualité",
+
+  // "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.editGroupPage": "Sur cette page, vous pouvez modifier les propriétés et les membres d'un groupe. Dans la section supérieure, vous pouvez éditer le nom et la description du groupe, sauf s'il s'agit d'un groupe d'administrateurs d'une collection ou d'une communauté ; dans ce cas, le nom et la description du groupe sont générés automatiquement et ne peuvent pas être modifiés. Dans les sections suivantes, vous pouvez modifier l'appartenance au groupe. Voir [le wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) pour plus de détails.",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pour ajouter ou retirer une EPerson à/de ce groupe, cliquez sur le bouton « Parcourir tout », ou utilisez la barre de recherche ci-dessous pour rechercher des utilisateurs (utilisez le menu déroulant à gauche de la barre de recherche pour choisir si vous souhaitez effectuer la recherche par métadonnées ou par courriel). Ensuite, cliquez sur l'icône + pour chaque utilisateur que vous souhaitez ajouter dans la liste ci-dessous, ou sur l'icône de la corbeille pour chaque utilisateur que vous souhaitez retirer. La liste ci-dessous peut comporter plusieurs pages : utilisez les contrôles de pagination sous la liste pour naviguer vers les pages suivantes.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Pour ajouter ou retirer un sous-groupe à/de ce groupe, cliquez sur le bouton « Parcourir tout », ou utilisez la barre de recherche ci-dessous pour rechercher des groupes. Ensuite, cliquez sur l'icône + pour chaque groupe que vous souhaitez ajouter dans la liste ci-dessous, ou sur l'icône de la corbeille pour chaque groupe que vous souhaitez retirer. La liste ci-dessous peut comporter plusieurs pages : utilisez les contrôles de pagination sous la liste pour naviguer vers les pages suivantes.",
+
   //"admin.reports.collections.title": "Collection Filter Report",
   "admin.reports.collections.title": "Rapport de collections filtrées",
 
@@ -1576,6 +1612,12 @@
   // "collection.edit.return": "Back",
   "collection.edit.return": "Retour",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Édition de Collection - Contrôle d'accès",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Gestion du contenu",
 
@@ -1932,6 +1974,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Édition de communauté - Gestion du contenu",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Édition de Communauté - Contrôle d'accès",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Éditer Métadonnées",
 
@@ -3227,6 +3275,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Édition d'Item - Gestion de contenu",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Gestion de contenu de l'Item: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Édition de l'Item - Contrôle d'accès",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Métadonnées",
 
@@ -6687,6 +6744,45 @@
   //"access-control-cancel": "Cancel",
   "access-control-cancel": "Annuler",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Ce formulaire vous permet de modifier les conditions d'accès aux métadonnées de l'Item ou à ses Bitstreams.",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Exécuter",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Ajouter plus",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Supprimer la condition d'accès",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Sélectionner les Bitstreams",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Aucun Item à afficher.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Fermer",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Type de condition d'accès",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Choisissez une condition d'accès à appliquer aux objets sélectionnés.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Accorder l'accès à partir de",
+
+  //"access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Sélectionnez la date à partir de laquelle la condition d'accès liée est appliquée",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Accorder l'accès jusqu'à",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Sélectionnez la date jusqu'à laquelle la condition d'accès liée est appliquée",
+
 
 }
 

From 8dd132d7a7b4d69864dfcd6fe0d4269c5726b86f Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:15:53 -0300
Subject: [PATCH 0770/1286] Changing the bitstream title in the submission form
 to use the view component title, avoiding disappearance with changes to the
 form

(cherry picked from commit fec4aa6df1bd6c5ea1ca9eeb10e4bc643a16d39e)
---
 .../sections/upload/file/section-upload-file.component.html  | 3 +--
 .../upload/file/view/section-upload-file-view.component.html | 5 +++--
 .../upload/file/view/section-upload-file-view.component.ts   | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index da83e3f9a0..4698fdf68a 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -18,7 +18,7 @@
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
-        <h3>{{fileName}} <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span></h3>
+        <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
       </div>
       <div class="float-right w-15">
         <ng-container>
@@ -43,7 +43,6 @@
         </ng-container>
       </div>
       <div class="clearfix"></div>
-      <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
     </div>
   </div>
 </ng-container>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index cc12b5dea6..dc72fbdad0 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -2,9 +2,10 @@
   <ng-container *ngIf="metadata">
     <ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
       <ng-container *ngIf="entry.value !== ''">
-        <h5>
+        <h3>
           {{entry.value}}
-        </h5>
+          <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
+        </h3>
       </ng-container>
       <ng-container *ngIf="entry.value === ''">
         <h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 0630a28a76..7ab21fb85b 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,6 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
+import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
 
 /**
  * This component allow to show bitstream's metadata
@@ -31,7 +32,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
     TruncatePipe,
     NgIf,
     NgForOf,
-  ],
+    FileSizePipe
+],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {

From 3104264cd4b1801cb1ab1ee8938d45374204ec9a Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:38:42 -0300
Subject: [PATCH 0771/1286] Adjusting spacing and good rules

(cherry picked from commit df24a63a464c3f88adedf982cdf540241414a86a)
---
 .../upload/file/view/section-upload-file-view.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7ab21fb85b..378753a1e6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -18,7 +18,7 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submis
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
-import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
+import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
 
 /**
  * This component allow to show bitstream's metadata
@@ -32,8 +32,8 @@ import { FileSizePipe } from "../../../../../shared/utils/file-size-pipe";
     TruncatePipe,
     NgIf,
     NgForOf,
-    FileSizePipe
-],
+    FileSizePipe,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {

From 10f11a55fff372a40bb85250d433a54ed915caa9 Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:46:37 -0300
Subject: [PATCH 0772/1286] Adjusting spacing

(cherry picked from commit 762bc8ce8c5a87a1dc7ba9763916addaabe06398)
---
 .../upload/file/view/section-upload-file-view.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6..7b8e870400 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    * The bitstream's title key
    * @type {string}
    */
-  public fileTitleKey = 'Title';
+  public fileTitleKey: string = 'Title';
 
   /**
    * The bitstream's description key
    * @type {string}
    */
-  public fileDescrKey = 'Description';
+  public fileDescrKey: string = 'Description';
 
   public fileFormat!: string;
 

From 784f5c180861f8d79aac119a951a42e1e455b10a Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:01:56 -0300
Subject: [PATCH 0773/1286] Fix last commit

(cherry picked from commit 62006c00cacf7e74661d6cc3dd4b5a53f47aeb72)
---
 .../upload/file/view/section-upload-file-view.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 7b8e870400..378753a1e6 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -54,13 +54,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    * The bitstream's title key
    * @type {string}
    */
-  public fileTitleKey: string = 'Title';
+  public fileTitleKey = 'Title';
 
   /**
    * The bitstream's description key
    * @type {string}
    */
-  public fileDescrKey: string = 'Description';
+  public fileDescrKey = 'Description';
 
   public fileFormat!: string;
 

From fccfc93a10f895d065d67eb49a9c2c8bb0b8386b Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:10:48 -0300
Subject: [PATCH 0774/1286] Import order adjustment

(cherry picked from commit eeaac8965b8b82e8d21f712350781c3e7f627157)
---
 .../upload/file/view/section-upload-file-view.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 378753a1e6..20e86a492d 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -17,8 +17,8 @@ import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 
 /**
  * This component allow to show bitstream's metadata

From 7e827165e930d0235a8561aa8a0783e3aaa8856f Mon Sep 17 00:00:00 2001
From: DanGastardelli <55243638+DanGastardelli@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:24:46 -0300
Subject: [PATCH 0775/1286] Import order adjustment

(cherry picked from commit 2643a459b6a1213b4edb16f245732ba0a1b32bcb)
---
 .../upload/file/view/section-upload-file-view.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 20e86a492d..f065fc9e19 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -16,8 +16,8 @@ import {
 import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessConditions/submission-section-upload-access-conditions.component';
 
 /**

From 3b8a075049c52b569ebe1a7f0cb4d31808cdbf4d Mon Sep 17 00:00:00 2001
From: Nima Behforouz <92104872+nimabehforouz@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:48:53 -0400
Subject: [PATCH 0776/1286] Update fr.json5

Translation updates to fr.json5 file regarding the Access Control sections.

(cherry picked from commit 8d00d435c432db20409a2d01835442196a4b94e9)
---
 src/assets/i18n/fr.json5 | 96 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 185576e186..b2a03fad7d 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -357,6 +357,18 @@
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "EPeople",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nouvelle EPerson",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nouvelle EPerson",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Ajouter EPerson",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Ajouter EPerson",
+
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "EPeople",
 
@@ -747,6 +759,30 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Retour",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Assurance qualité",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Suggestions d'assurance qualité",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Suggestions d'assurance qualité",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Assurance qualité",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Assurance qualité",
+
+  // "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.editGroupPage": "Sur cette page, vous pouvez modifier les propriétés et les membres d'un groupe. Dans la section supérieure, vous pouvez éditer le nom et la description du groupe, sauf s'il s'agit d'un groupe d'administrateurs d'une collection ou d'une communauté ; dans ce cas, le nom et la description du groupe sont générés automatiquement et ne peuvent pas être modifiés. Dans les sections suivantes, vous pouvez modifier l'appartenance au groupe. Voir [le wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) pour plus de détails.",
+
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pour ajouter ou retirer une EPerson à/de ce groupe, cliquez sur le bouton « Parcourir tout », ou utilisez la barre de recherche ci-dessous pour rechercher des utilisateurs (utilisez le menu déroulant à gauche de la barre de recherche pour choisir si vous souhaitez effectuer la recherche par métadonnées ou par courriel). Ensuite, cliquez sur l'icône + pour chaque utilisateur que vous souhaitez ajouter dans la liste ci-dessous, ou sur l'icône de la corbeille pour chaque utilisateur que vous souhaitez retirer. La liste ci-dessous peut comporter plusieurs pages : utilisez les contrôles de pagination sous la liste pour naviguer vers les pages suivantes.",
+
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Pour ajouter ou retirer un sous-groupe à/de ce groupe, cliquez sur le bouton « Parcourir tout », ou utilisez la barre de recherche ci-dessous pour rechercher des groupes. Ensuite, cliquez sur l'icône + pour chaque groupe que vous souhaitez ajouter dans la liste ci-dessous, ou sur l'icône de la corbeille pour chaque groupe que vous souhaitez retirer. La liste ci-dessous peut comporter plusieurs pages : utilisez les contrôles de pagination sous la liste pour naviguer vers les pages suivantes.",
+
   //"admin.reports.collections.title": "Collection Filter Report",
   "admin.reports.collections.title": "Rapport de collections filtrées",
 
@@ -1576,6 +1612,12 @@
   // "collection.edit.return": "Back",
   "collection.edit.return": "Retour",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Édition de Collection - Contrôle d'accès",
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Gestion du contenu",
 
@@ -1932,6 +1974,12 @@
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Édition de communauté - Gestion du contenu",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Édition de Communauté - Contrôle d'accès",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Éditer Métadonnées",
 
@@ -3227,6 +3275,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Édition d'Item - Gestion de contenu",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Gestion de contenu de l'Item: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Contrôle d'accès",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Édition de l'Item - Contrôle d'accès",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Métadonnées",
 
@@ -6687,6 +6744,45 @@
   //"access-control-cancel": "Cancel",
   "access-control-cancel": "Annuler",
 
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Ce formulaire vous permet de modifier les conditions d'accès aux métadonnées de l'Item ou à ses Bitstreams.",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Exécuter",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Ajouter plus",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Supprimer la condition d'accès",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Sélectionner les Bitstreams",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "Aucun Item à afficher.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Fermer",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Type de condition d'accès",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Choisissez une condition d'accès à appliquer aux objets sélectionnés.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Accorder l'accès à partir de",
+
+  //"access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Sélectionnez la date à partir de laquelle la condition d'accès liée est appliquée",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Accorder l'accès jusqu'à",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Sélectionnez la date jusqu'à laquelle la condition d'accès liée est appliquée",
+
 
 }
 

From 0ab4d903d958c1564e73c2ff1ab5a766b3648ea7 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Thu, 31 Oct 2024 10:44:27 +0100
Subject: [PATCH 0777/1286] [CST-15593] fix orejime cookie name, a11y issues
 and package-lock

---
 cypress/support/e2e.ts                        |  4 ++--
 package-lock.json                             | 19 ++++++++++++++++++-
 .../google-recaptcha.service.ts               |  2 +-
 .../register-email-form.component.ts          |  2 +-
 .../shared/cookies/orejime-configuration.ts   |  2 +-
 src/styles/_custom_variables.scss             |  2 +-
 src/styles/_global-styles.scss                |  2 +-
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index c1b6bc6d3f..3c9f4e7b56 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -54,9 +54,9 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
+  // Pre-agree to all Orejime cookies by setting the orejime cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('orejime-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);
diff --git a/package-lock.json b/package-lock.json
index 43798601f9..4cbcfca916 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5975,6 +5975,7 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
       "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "dev": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -6010,6 +6011,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -6029,6 +6031,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -6048,6 +6051,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -6067,6 +6071,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -6086,6 +6091,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6105,6 +6111,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6124,6 +6131,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6143,6 +6151,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6162,6 +6171,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6181,6 +6191,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6200,6 +6211,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6219,6 +6231,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6234,7 +6247,8 @@
     "node_modules/@parcel/watcher/node_modules/node-addon-api": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true
     },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
@@ -10735,6 +10749,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -20599,6 +20614,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
       "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dev": true,
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -20619,6 +20635,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
       "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "dev": true,
       "engines": {
         "node": ">= 14.16.0"
       },
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index c23223b678..580bc876f4 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -105,7 +105,7 @@ export class GoogleRecaptchaService {
       tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
 
         if (
-          this.cookieService.get('orejime-anonymous') && this.cookieService.get('orejime-anonymous')[CAPTCHA_NAME] &&
+          this.cookieService.get('orejime') && this.cookieService.get('orejime')[CAPTCHA_NAME] &&
           recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
           isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
         ) {
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 90841f3088..e71227f504 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -247,7 +247,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * Return true if the user has accepted the required cookies for reCaptcha
    */
   isRecaptchaCookieAccepted(): boolean {
-    const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
+    const orejimeAnonymousCookie = this.cookieService.get('orejime');
     return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_NAME] : false;
   }
 
diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts
index fd275f7e77..e995e04ef5 100644
--- a/src/app/shared/cookies/orejime-configuration.ts
+++ b/src/app/shared/cookies/orejime-configuration.ts
@@ -15,7 +15,7 @@ import { NativeWindowRef } from '../../core/services/window.service';
  */
 export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
 
-export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime-anonymous';
+export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime';
 
 export const GOOGLE_ANALYTICS_OREJIME_KEY = 'google-analytics';
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 682306c636..6bddfd58e9 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -148,6 +148,6 @@
   --ds-process-overview-table-info-column-width: 250px;
   --ds-process-overview-table-actions-column-width: 80px;
 
-  --green1: #1FB300;  // This variable represents the success color for the Orejime cookie banner
+  --green1: #1c710a;  // This variable represents the success color for the Orejime cookie banner
   --button-text-color-cookie: #fff; // This variable represents the text color for buttons in the Orejime cookie banner
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 3e0e8c5f82..4934ec3d35 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -56,7 +56,7 @@ body {
   }
 
   a {
-    color: var(--green1);
+    color: var(--bs-white);
   }
 }
 

From e516ae86532904223e3dd65c6dc95d63d977c070 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Thu, 31 Oct 2024 11:32:54 +0100
Subject: [PATCH 0778/1286] [CST-15593] go back to orejime-anonymous cookie

---
 cypress/support/e2e.ts                                       | 4 ++--
 src/app/core/google-recaptcha/google-recaptcha.service.ts    | 2 +-
 src/app/register-email-form/register-email-form.component.ts | 2 +-
 src/app/shared/cookies/orejime-configuration.ts              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 3c9f4e7b56..c1b6bc6d3f 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -54,9 +54,9 @@ before(() => {
 
 // Runs once before the first test in each "block"
 beforeEach(() => {
-  // Pre-agree to all Orejime cookies by setting the orejime cookie
+  // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('orejime', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index 580bc876f4..c23223b678 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -105,7 +105,7 @@ export class GoogleRecaptchaService {
       tap(([recaptchaVersionRD, recaptchaModeRD, recaptchaKeyRD]) => {
 
         if (
-          this.cookieService.get('orejime') && this.cookieService.get('orejime')[CAPTCHA_NAME] &&
+          this.cookieService.get('orejime-anonymous') && this.cookieService.get('orejime-anonymous')[CAPTCHA_NAME] &&
           recaptchaKeyRD.hasSucceeded && recaptchaVersionRD.hasSucceeded &&
           isNotEmpty(recaptchaVersionRD.payload?.values) && isNotEmpty(recaptchaKeyRD.payload?.values)
         ) {
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index e71227f504..90841f3088 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -247,7 +247,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
    * Return true if the user has accepted the required cookies for reCaptcha
    */
   isRecaptchaCookieAccepted(): boolean {
-    const orejimeAnonymousCookie = this.cookieService.get('orejime');
+    const orejimeAnonymousCookie = this.cookieService.get('orejime-anonymous');
     return isNotEmpty(orejimeAnonymousCookie) ? orejimeAnonymousCookie[CAPTCHA_NAME] : false;
   }
 
diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts
index e995e04ef5..aea2bc3338 100644
--- a/src/app/shared/cookies/orejime-configuration.ts
+++ b/src/app/shared/cookies/orejime-configuration.ts
@@ -15,7 +15,7 @@ import { NativeWindowRef } from '../../core/services/window.service';
  */
 export const HAS_AGREED_END_USER = 'dsHasAgreedEndUser';
 
-export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime';
+export const ANONYMOUS_STORAGE_NAME_OREJIME = 'orejime-anonymous';
 
 export const GOOGLE_ANALYTICS_OREJIME_KEY = 'google-analytics';
 
@@ -26,7 +26,7 @@ export const GOOGLE_ANALYTICS_OREJIME_KEY = 'google-analytics';
 
 export function getOrejimeConfiguration(_window: NativeWindowRef): any {
   return {
-    storageName: ANONYMOUS_STORAGE_NAME_OREJIME,
+    cookieName: ANONYMOUS_STORAGE_NAME_OREJIME,
 
     privacyPolicy: './info/privacy',
 

From 625771837770a9fa1d5b6441474660ce256e18f2 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Thu, 31 Oct 2024 13:00:21 +0100
Subject: [PATCH 0779/1286] [CST-15593] improve tests reliability

---
 cypress/e2e/admin-add-new-modals.cy.ts               | 12 ++++++------
 cypress/e2e/admin-edit-modals.cy.ts                  |  6 +++---
 cypress/e2e/admin-export-modals.cy.ts                |  4 ++--
 cypress/e2e/admin-sidebar.cy.ts                      |  2 +-
 .../admin-sidebar-section.component.html             |  4 +++-
 .../admin-sidebar-section.component.ts               |  3 ++-
 .../admin/admin-sidebar/admin-sidebar.component.html |  1 +
 .../admin/admin-sidebar/admin-sidebar.component.ts   |  3 ++-
 .../expandable-admin-sidebar-section.component.html  |  2 +-
 .../expandable-admin-sidebar-section.component.ts    |  3 ++-
 .../collection-item-mapper.component.html            |  2 +-
 .../collection-item-mapper.component.ts              |  2 ++
 .../item-collection-mapper.component.html            |  2 +-
 .../item-collection-mapper.component.ts              |  2 ++
 .../admin/admin-sidebar/admin-sidebar.component.ts   |  3 ++-
 15 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 565ae154f1..c783972b75 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,10 +9,10 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
 
@@ -22,10 +22,10 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
 
@@ -35,10 +35,10 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-new-title').click();
+    cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
 
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index e96d6ce898..f2f18de877 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,7 +9,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
@@ -22,7 +22,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
@@ -35,7 +35,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
     cy.get('#admin-menu-section-edit-title').click();
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 9f69764d19..0efe040fc8 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,7 +9,7 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
@@ -22,7 +22,7 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
     cy.get('#admin-menu-section-export-title').click();
diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts
index be1c9d4ef2..318bf2b27e 100644
--- a/cypress/e2e/admin-sidebar.cy.ts
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -10,7 +10,7 @@ describe('Admin Sidebar', () => {
 
   it('should be pinnable and pass accessibility tests', () => {
     // Pin the sidebar open
-    cy.get('#sidebar-collapse-toggle').click();
+    cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on every expandable section to open all menus
     cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 24ba17fff4..30a7a3353b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -14,7 +14,9 @@
     </div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-        <span [id]="adminMenuSectionTitleId(section.id)">{{itemModel.text | translate}}</span>
+        <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
+          {{itemModel.text | translate}}
+        </span>
       </div>
     </div>
   </a>
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index ff9897ce9e..2910f948a2 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -17,6 +17,7 @@ import { MenuID } from '../../../shared/menu/menu-id.model';
 import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
 import { MenuSection } from '../../../shared/menu/menu-section.model';
 import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
+import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 
 /**
  * Represents a non-expandable section in the admin sidebar
@@ -26,7 +27,7 @@ import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-sec
   templateUrl: './admin-sidebar-section.component.html',
   styleUrls: ['./admin-sidebar-section.component.scss'],
   standalone: true,
-  imports: [NgClass, RouterLink, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule, BrowserOnlyPipe],
 
 })
 export class AdminSidebarSectionComponent extends MenuSectionComponent implements OnInit {
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index f3d5409a64..41376f777e 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -42,6 +42,7 @@
   <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
     <a class="sidebar-section-wrapper sidebar-full-width-container"
        id="sidebar-collapse-toggle"
+       [attr.data-test]="'sidebar-collapse-toggle' | dsBrowserOnly"
        href="javascript:void(0);"
        (click)="toggle($event)"
        (keyup.space)="toggle($event)"
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 00514d2afc..f882a5b2f3 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -36,6 +36,7 @@ import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
 import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
 import { ThemeService } from '../../shared/theme-support/theme.service';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
 /**
  * Component representing the admin sidebar
@@ -46,7 +47,7 @@ import { ThemeService } from '../../shared/theme-support/theme.service';
   styleUrls: ['./admin-sidebar.component.scss'],
   animations: [slideSidebar],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 1febfc2304..d051136921 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -19,7 +19,7 @@
     </div>
     <div class="sidebar-collapsible-element-outer-wrapper">
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
-        <span [id]="adminMenuSectionTitleId(section.id)">
+        <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
           <ng-container
             *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 1b09d330c2..9bd90ea7f1 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -25,6 +25,7 @@ import { slide } from '../../../shared/animations/slide';
 import { MenuService } from '../../../shared/menu/menu.service';
 import { MenuID } from '../../../shared/menu/menu-id.model';
 import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
+import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component';
 
 /**
@@ -36,7 +37,7 @@ import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor],
   standalone: true,
-  imports: [NgClass, NgComponentOutlet, NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [NgClass, NgComponentOutlet, NgIf, NgFor, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionComponent implements OnInit {
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index 3ca9665b1c..f3124720ca 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -23,7 +23,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
+        <li [ngbNavItem]="'mapTab' | dsBrowserOnly" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'collection.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index c60e23e81e..351a5daf60 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -62,6 +62,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { ThemedSearchFormComponent } from '../../shared/search-form/themed-search-form.component';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 
 @Component({
@@ -86,6 +87,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     AsyncPipe,
     ItemSelectComponent,
     NgIf,
+    BrowserOnlyPipe,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 9e298edcc6..0aa7b27d2e 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -22,7 +22,7 @@
             </div>
           </ng-template>
         </li>
-        <li [ngbNavItem]="'mapTab'" role="presentation" data-test="mapTab">
+        <li [ngbNavItem]="'mapTab' | dsBrowserOnly" role="presentation" data-test="mapTab">
           <a ngbNavLink>{{'item.edit.item-mapper.tabs.map' | translate}}</a>
           <ng-template ngbNavContent>
             <div class="row mt-2">
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index bc962e27ff..3c93780a87 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -61,6 +61,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { CollectionSelectComponent } from '../../../shared/object-select/collection-select/collection-select.component';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { ThemedSearchFormComponent } from '../../../shared/search-form/themed-search-form.component';
+import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
@@ -79,6 +80,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     AsyncPipe,
     TranslateModule,
     NgIf,
+    BrowserOnlyPipe,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
index 2d61561611..66e66e86e6 100644
--- a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -10,6 +10,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin/admin-sidebar/admin-sidebar.component';
+import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 /**
  * Component representing the admin sidebar
@@ -21,7 +22,7 @@ import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin
   // styleUrls: ['./admin-sidebar.component.scss']
   styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends BaseComponent {
 }

From e629d9edf0d2177953950f5e145bf49ff1203f88 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:27:10 -0300
Subject: [PATCH 0780/1286] Dynamic aria-describedby attribute

---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 +++++++++++++++++++
 .../register-email-form.component.ts          | 26 ++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 8fd17157d7..d830fc441d 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-describedby]="ariaDescribedby"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index eda9110dc7..c622b9c0e9 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -210,4 +210,39 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
+  describe('ariaDescribedby', () => {
+    it('should have required error message when email is empty', () => {
+      comp.form.patchValue({ email: '' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+    });
+
+    it('should have invalid email error message when email is invalid', () => {
+      comp.form.patchValue({ email: 'invalid-email' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+    });
+
+    it('should clear ariaDescribedby when email is valid', () => {
+      comp.form.patchValue({ email: 'valid@email.com' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toBe('');
+    });
+
+    it('should update ariaDescribedby on value changes', () => {
+      spyOn(comp, 'checkEmailValidity').and.callThrough();
+
+      comp.form.patchValue({ email: '' });
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+
+      comp.form.patchValue({ email: 'invalid-email' });
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+
+      comp.form.patchValue({ email: 'valid@email.com' });
+      expect(comp.ariaDescribedby).toBe('');
+    });
+  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ac13abb865..3c207aae71 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -109,6 +109,11 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
+  /**
+   * Stores error messages related to the email field
+   */
+  ariaDescribedby: string = '';
+
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -178,6 +183,13 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
+
+    /**
+     * Subscription to email field value changes
+     */
+    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
+      this.checkEmailValidity();
+    }));
   }
 
   /**
@@ -291,4 +303,18 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
     }
   }
 
+  checkEmailValidity() {
+    const descriptions = [];
+
+    if (this.email.errors?.required) {
+      descriptions.push('email-errors-required');
+    }
+
+    if (this.email.errors?.pattern || this.email.errors?.email) {
+      descriptions.push('email-error-not-valid');
+    }
+
+    this.ariaDescribedby = descriptions.join(' ');
+  }
+
 }

From 7b72a5f0c26514eb07f58faf3470c89fe9729d6f Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:39:34 -0300
Subject: [PATCH 0781/1286] Resolving a wrongly declared variable error

---
 src/app/register-email-form/register-email-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 3c207aae71..936d11063e 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -112,7 +112,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
   /**
    * Stores error messages related to the email field
    */
-  ariaDescribedby: string = '';
+  ariaDescribedby = '';
 
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();

From ac720033dcca82c0bbd8c6a9f8ac8b1d07ffb37e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 31 Oct 2024 11:12:29 -0400
Subject: [PATCH 0782/1286] Complete tag translation in french for ORCID

Contains all french translations for ORCID and Researcher Profile.
---
 src/assets/i18n/fr.json5 | 366 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 366 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index b2a03fad7d..f4f4bd1ce4 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6615,6 +6615,372 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolonger la session",
 
+  //"researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "En traitement...",
+
+  //"researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil du chercheur associé",
+
+  //"researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Une erreur inattendue s'est produite pendant le changement apporté à la visibilité du profil.",
+
+  //"researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Créer un nouveau",
+
+  //"researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil créé avec succès",
+
+  //"researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Une erreur s'est produite lors de la création du profil",
+
+  //"researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Supprimer",
+
+  //"researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Exposer",
+
+  //"researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Cacher",
+
+  //"researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Profil non associé",
+
+  //"researcher.profile.view": "View",
+  "researcher.profile.view": "Voir",
+
+  //"researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVÉ",
+
+  //"researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIC",
+
+  //"researcher.profile.status": "Status:",
+  "researcher.profile.status": "Statut:",
+
+  //"researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Vous n'êtes pas autorisé à réclamer cet item. Pour plus de détails contacter la personne administratrice.",
+
+  //"researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Une erreur s'est produite lors de la réclamation du profil, veuillez réessayer plus tard.",
+
+  //"researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erreur",
+
+  //"researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil réclamé avec succès",
+
+  //"researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Succès",
+
+  //"person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Créer un identifiant ORCID",
+
+  //"person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorisations accordées",
+
+  //"person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Accorder des autorisations",
+
+  //"person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Se connecter à ORCID",
+
+  //"person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
+
+  //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+
+  //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
+
+  //"person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Déconnecter d'ORCID",
+
+  //"person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Traitement en cours...",
+
+  //"person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorisations manquantes",
+
+  //"person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Les autorisations suivantes sont manquantes :",
+
+  //"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": "Cette boite est vide, vous avez autorisé l'utilisation de toutes les fonctions proposées par votre organisation.",
+
+  //"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": "Aucun identifiant ORCID n'est encore associé. En cliquant sur le bouton ci-dessous, il est possible de lier ce profil à un compte ORCID.",
+
+  //"person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Préférences du profil",
+
+  //"person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Préférence pour la section Financement",
+
+  //"person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Préférence pour la section Publication",
+
+  //"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 vous avez besoin de retirer votre ORCID, contacter la personne administratrice du dépôt.",
+
+  //"person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Mettre à jour les configurations",
+
+  //"person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Données biographiques",
+
+   //"person.page.orcid.sync-profile.education": "Education",
+   "person.page.orcid.sync-profile.education": "Éducation",
+
+  //"person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifiants",
+
+  //"person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tous les financements",
+
+  //"person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mes financements",
+
+  //"person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Financements sélectionnés",
+
+  //"person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Toutes les publications",
+
+  //"person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Mes publications",
+
+  //"person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Publications sélectionnées",
+
+  //"person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Ignorer les changements et ne pas synchroniser avec le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "L'annulation de la file d'attente ORCID a échoué.",
+
+  //"person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "La file d'attente ORCID a été annulée avec succès.",
+
+  //"person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La file d'attente ORCID est vide.",
+
+  //"person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Type",
+
+  //"person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Description",
+
+  //"person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Action",
+
+  //"person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+
+  //"person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Pays",
+
+  //"person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Identifiants externes",
+
+  //"person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Autres noms",
+
+  //"person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+
+  //"person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs du chercheur",
+
+  //"person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Mots clés",
+
+  //"person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Ajouter une nouvelle entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Mettre à jour cette entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Supprimer cette entrée du registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+
+  //"person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projet",
+
+  //"person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+
+  //"person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Autre nom",
+
+  //"person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Pays",
+
+  //"person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Mot clé",
+
+  //"person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identifiant externe",
+
+  //"person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL du chercheur",
+
+  //"person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchroniser avec le 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": "La transmission à ORCID a échoué en raison d'autorisations manquantes.",
+
+  //"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": "Cliquer <a href='{{orcid}}'>ici</a> afin d'accorder à nouveau les permissions nécessaires. Si le problème persiste, contacter l'administrateur.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource envoyée n'est pas valide.",
+
+  //"person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "La transmission à ORCID a échoué.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
+
+  //"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 données que vous souhaitez synchroniser avec ORCID ne sont pas valides.",
+
+  //"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": "La devise du montant est requise.",
+
+  //"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": "La ressource à transmettre doit avoir au moins un identifiant.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Le titre est obligatoire.",
+
+  //"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": "Le type de document est obligatoire.",
+
+  //"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": "La date de début est obbligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "L'organisme subventionnaire est obligatoire.",
+
+  //"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": "Code de pays ISO 3166 à 2 chiffres invalide",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "L'organisation est obligatoire.",
+
+  //"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": "Le nom de l'organisation est obligatoire.",
+
+  //"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 date de publication doit être d'au moins un an après 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": "L'organisation a transmettre doit avoir une adresse.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit mentionner une ville.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit avoir une code de pays ISO 3166 à 2 chiffres valide.",
+
+  //"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": "Un identifiant pour désambiguer l'orgnisation est obligatoire. Les identifiants possibles sont GRID, Ringgold, Legal Entity identifiers (LEIs) et Crossref Funder Registry identifiers",
+
+  //"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": "Une valeur pour l'identifiant de l'organisation est obligatoire.",
+
+  //"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": "La source de l'identifiant de l'organisation est obligatoire.",
+
+   //"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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
+
+  //"person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Mode de synchronisation",
+
+  //"person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "En lot",
+
+  //"person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Mode de synchronisation",
+
+  //"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": "Sélectionner le mode de synchronisation vers ORCID. Les options sont \"Manuel\" (vous devrez sélectionner les données à transmettre vers ORCID manuellement), ou \"En lot\" (le système transmettra vos données vers ORCID automatiquement).",
+
+  //"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": "Sélectionnez si vous souhaitez transmettre vos projets de recherche vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Les paramètres de synchronisation ont été mis à jour avec succès.",
+
+  //"person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "La mise à jour des paramètres de synchronisation a échoué.",
+
+  //"person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuel",
+
+  //"person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenez votre identifiant ORCID",
+
+  //"person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Consultez vos informations ayant le paramètre de visibilité réglé sur Parties de confiance.",
+
+  //"person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
+
+   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
+
+  //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "La déconnexion entre votre profil et le registre ORCID a été effectuée avec succès.",
+
+  //"person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Une erreur s'est produite lors de la déconnexion entre votre profil et le registre ORCID. Veuillez réessayer.",
+
+  //"person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Paramètres de synchronisation ORCID",
+
+  //"person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Liste d'attente pour le registre ORCID",
+
+  //"person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorisation ORCID",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 

From fa6e85d6db5a671038e8e27968701b46520154df Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:01:54 -0300
Subject: [PATCH 0783/1286] Simplifying the implementation of dynamic
 aria-describedby

---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 -------------------
 .../register-email-form.component.ts          | 28 +--------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index d830fc441d..2e93902ada 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           [attr.aria-describedby]="ariaDescribedby"
+                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index c622b9c0e9..eda9110dc7 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -210,39 +210,4 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
-  describe('ariaDescribedby', () => {
-    it('should have required error message when email is empty', () => {
-      comp.form.patchValue({ email: '' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-    });
-
-    it('should have invalid email error message when email is invalid', () => {
-      comp.form.patchValue({ email: 'invalid-email' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-    });
-
-    it('should clear ariaDescribedby when email is valid', () => {
-      comp.form.patchValue({ email: 'valid@email.com' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toBe('');
-    });
-
-    it('should update ariaDescribedby on value changes', () => {
-      spyOn(comp, 'checkEmailValidity').and.callThrough();
-
-      comp.form.patchValue({ email: '' });
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-
-      comp.form.patchValue({ email: 'invalid-email' });
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-
-      comp.form.patchValue({ email: 'valid@email.com' });
-      expect(comp.ariaDescribedby).toBe('');
-    });
-  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 936d11063e..69497a7703 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -109,11 +109,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
-  /**
-   * Stores error messages related to the email field
-   */
-  ariaDescribedby = '';
-
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -183,13 +178,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
-
-    /**
-     * Subscription to email field value changes
-     */
-    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
-      this.checkEmailValidity();
-    }));
   }
 
   /**
@@ -302,19 +290,5 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-
-  checkEmailValidity() {
-    const descriptions = [];
-
-    if (this.email.errors?.required) {
-      descriptions.push('email-errors-required');
-    }
-
-    if (this.email.errors?.pattern || this.email.errors?.email) {
-      descriptions.push('email-error-not-valid');
-    }
-
-    this.ariaDescribedby = descriptions.join(' ');
-  }
-
+  
 }

From 009da08177f31d049c2094151d8485c157ee0ede Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:07:22 -0300
Subject: [PATCH 0784/1286] Adjusting spaces in ts

---
 src/app/register-email-form/register-email-form.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 69497a7703..fff8479cbe 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -290,5 +290,4 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-  
 }

From 28c8550ef5c23e0a6c3b08d274970e5522aecb4e Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Thu, 31 Oct 2024 21:31:27 +0100
Subject: [PATCH 0785/1286] Add button to enable free-text editing in dropdown
 fields during item edition and fix error when clicking "Clear selection"
 option

---
 .../dso-edit-metadata-value.component.html    | 10 ++++-
 .../dso-edit-metadata-value.component.ts      | 37 ++++++++++++++++---
 src/assets/i18n/en.json5                      |  4 ++
 3 files changed, 44 insertions(+), 7 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 25b82b9b43..da6a00bf48 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,15 +3,21 @@
      [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 flex-column" *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 && (isAuthorityControlled() | async) !== true" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || enabledFreeTextEditing)" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing"
                                     [bindId]="mdField"
                                     [group]="group"
                                     [model]="getModel()"
                                     (change)="onChangeAuthorityField($event)">
     </ds-dynamic-scrollable-dropdown>
+    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+        [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
+        (click)="toggleFreeTextEdition()">
+    <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
+    {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
+    </button>
     <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
                       [group]="group"
                       [model]="getModel()"
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 11bbcfd9d5..69bdf41787 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
@@ -191,6 +191,12 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    */
   public editingAuthority = false;
 
+
+  /**
+   * Whether or not the free-text editing is enabled when scrollable dropdown vocabulary is used
+   */
+  public enabledFreeTextEditing = false;
+
   /**
    * Field group used by authority field
    * @type {UntypedFormGroup}
@@ -438,15 +444,23 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    * Process the change of authority field value updating the authority key and confidence as necessary
    */
   onChangeAuthorityField(event): void {
-    this.mdValue.newValue.value = event.value;
-    if (event.authority) {
-      this.mdValue.newValue.authority = event.authority;
-      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+    if (event) {
+      this.mdValue.newValue.value = event.value;
+      if (event.authority) {
+        this.mdValue.newValue.authority = event.authority;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+      } else {
+        this.mdValue.newValue.authority = null;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      }
+      this.confirm.emit(false);
     } else {
+      // The event is undefined when the user clears the selection in scrollable dropdown
+      this.mdValue.newValue.value = '';
       this.mdValue.newValue.authority = null;
       this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      this.confirm.emit(false);
     }
-    this.confirm.emit(false);
   }
 
   /**
@@ -480,4 +494,17 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
     }
   }
 
+  /**
+   * Toggles the free-text ediitng mode
+   */
+  toggleFreeTextEdition() {
+    if (this.enabledFreeTextEditing) {
+      if (this.getModel().value !== this.mdValue.newValue.value) {
+        // Reload the model to adapt it to the new possible value modified during free text editing
+        this.initAuthorityProperties();
+      }
+    }
+    this.enabledFreeTextEditing = !this.enabledFreeTextEditing;
+  }
+
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 05f528af07..196e2971ed 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2392,6 +2392,10 @@
 
   "item.edit.metadata.edit.authority.key": "Edit authority key",
 
+  "item.edit.metadata.edit.buttons.enable-free-text-editing": "Enable free-text editing",
+
+  "item.edit.metadata.edit.buttons.disable-free-text-editing": "Disable free-text editing",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",

From 585bbec5d53ebc8dedbafaf37f89c095addb883a Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Tue, 27 Aug 2024 17:02:12 -0300
Subject: [PATCH 0786/1286] Improving accessibility on the new user
 registration page

(cherry picked from commit 0eb2d5ce587ece5d3573cad7534bcbb8df5c6ed4)
---
 .../register-email-form.component.html                   | 9 ++++++---
 src/assets/i18n/en.json5                                 | 2 ++
 src/assets/i18n/es.json5                                 | 3 +++
 src/assets/i18n/pt-BR.json5                              | 3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index d4cf75b563..b47790d1cb 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -14,13 +14,16 @@
                     <label class="font-weight-bold"
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"/>
+                           type="text" id="email" formControlName="email"
+                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-invalid]="form.get('email')?.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required">
+                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
                         {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
                         <ng-container *ngIf="validMailDomains.length > 0">
                           {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 475e6437d6..84fbb5db96 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5369,4 +5369,6 @@
   "process.overview.unknown.user": "Unknown",
 
   "browse.search-form.placeholder": "Search the repository",
+
+  "register-email.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 3bc98a9502..6373f91652 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7831,5 +7831,8 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index aae51b3671..09c6cbf630 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -7857,4 +7857,7 @@
 
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
+
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Digite seu e-mail",
 }

From a6b45f777cbfdafd4bf104cff81c9ed8f3a7460c Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Thu, 5 Sep 2024 09:35:55 -0300
Subject: [PATCH 0787/1286] Code refactoring - Accessibility on the new user
 registration and forgotten password forms

(cherry picked from commit f00eae67602c3b1d12c5f8fcf43db774a7a70e11)
---
 .../register-email-form/register-email-form.component.html | 4 ++--
 src/assets/i18n/en.json5                                   | 4 +++-
 src/assets/i18n/es.json5                                   | 7 +++++--
 src/assets/i18n/pt-BR.json5                                | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index b47790d1cb..9192226b1e 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -15,9 +15,9 @@
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
-                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
                            aria-describedby="email-errors-required email-error-not-valid"
-                           [attr.aria-invalid]="form.get('email')?.invalid"/>
+                           [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
                     <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 84fbb5db96..56439dee43 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5370,5 +5370,7 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
-  "register-email.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Enter your e-mail address",
+
+  "forgot-email.form.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 6373f91652..dfdf4ca628 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7831,8 +7831,11 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 09c6cbf630..eebf896889 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -7858,6 +7858,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Digite seu e-mail",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Digite seu e-mail",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Digite seu e-mail",
 }

From 3b3fa4f643ca96e81216963018b826d8989545ec Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:27:10 -0300
Subject: [PATCH 0788/1286] Dynamic aria-describedby attribute

(cherry picked from commit e629d9edf0d2177953950f5e145bf49ff1203f88)
---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 +++++++++++++++++++
 .../register-email-form.component.ts          | 26 ++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 9192226b1e..a3ccc4bce8 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-describedby]="ariaDescribedby"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index 9e852d9491..67b87a974c 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -192,4 +192,39 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
+  describe('ariaDescribedby', () => {
+    it('should have required error message when email is empty', () => {
+      comp.form.patchValue({ email: '' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+    });
+
+    it('should have invalid email error message when email is invalid', () => {
+      comp.form.patchValue({ email: 'invalid-email' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+    });
+
+    it('should clear ariaDescribedby when email is valid', () => {
+      comp.form.patchValue({ email: 'valid@email.com' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toBe('');
+    });
+
+    it('should update ariaDescribedby on value changes', () => {
+      spyOn(comp, 'checkEmailValidity').and.callThrough();
+
+      comp.form.patchValue({ email: '' });
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+
+      comp.form.patchValue({ email: 'invalid-email' });
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+
+      comp.form.patchValue({ email: 'valid@email.com' });
+      expect(comp.ariaDescribedby).toBe('');
+    });
+  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index df7e9bea5e..0ba37a9090 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -66,6 +66,11 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
+  /**
+   * Stores error messages related to the email field
+   */
+  ariaDescribedby: string = '';
+
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -135,6 +140,13 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
+
+    /**
+     * Subscription to email field value changes
+     */
+    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
+      this.checkEmailValidity();
+    }));
   }
 
   /**
@@ -248,4 +260,18 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
     }
   }
 
+  checkEmailValidity() {
+    const descriptions = [];
+
+    if (this.email.errors?.required) {
+      descriptions.push('email-errors-required');
+    }
+
+    if (this.email.errors?.pattern || this.email.errors?.email) {
+      descriptions.push('email-error-not-valid');
+    }
+
+    this.ariaDescribedby = descriptions.join(' ');
+  }
+
 }

From c330e83095c844c3db61e4be47499f793c0c1773 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:39:34 -0300
Subject: [PATCH 0789/1286] Resolving a wrongly declared variable error

(cherry picked from commit 7b72a5f0c26514eb07f58faf3470c89fe9729d6f)
---
 src/app/register-email-form/register-email-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 0ba37a9090..1d8a6d3474 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -69,7 +69,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
   /**
    * Stores error messages related to the email field
    */
-  ariaDescribedby: string = '';
+  ariaDescribedby = '';
 
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();

From 1fad3cffc7c78dd52380ca21006ea2aa17ada847 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:01:54 -0300
Subject: [PATCH 0790/1286] Simplifying the implementation of dynamic
 aria-describedby

(cherry picked from commit fa6e85d6db5a671038e8e27968701b46520154df)
---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 -------------------
 .../register-email-form.component.ts          | 28 +--------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a3ccc4bce8..f6f4880ab6 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           [attr.aria-describedby]="ariaDescribedby"
+                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index 67b87a974c..9e852d9491 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -192,39 +192,4 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
-  describe('ariaDescribedby', () => {
-    it('should have required error message when email is empty', () => {
-      comp.form.patchValue({ email: '' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-    });
-
-    it('should have invalid email error message when email is invalid', () => {
-      comp.form.patchValue({ email: 'invalid-email' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-    });
-
-    it('should clear ariaDescribedby when email is valid', () => {
-      comp.form.patchValue({ email: 'valid@email.com' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toBe('');
-    });
-
-    it('should update ariaDescribedby on value changes', () => {
-      spyOn(comp, 'checkEmailValidity').and.callThrough();
-
-      comp.form.patchValue({ email: '' });
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-
-      comp.form.patchValue({ email: 'invalid-email' });
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-
-      comp.form.patchValue({ email: 'valid@email.com' });
-      expect(comp.ariaDescribedby).toBe('');
-    });
-  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 1d8a6d3474..42be43aab3 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -66,11 +66,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
-  /**
-   * Stores error messages related to the email field
-   */
-  ariaDescribedby = '';
-
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -140,13 +135,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
-
-    /**
-     * Subscription to email field value changes
-     */
-    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
-      this.checkEmailValidity();
-    }));
   }
 
   /**
@@ -259,19 +247,5 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-
-  checkEmailValidity() {
-    const descriptions = [];
-
-    if (this.email.errors?.required) {
-      descriptions.push('email-errors-required');
-    }
-
-    if (this.email.errors?.pattern || this.email.errors?.email) {
-      descriptions.push('email-error-not-valid');
-    }
-
-    this.ariaDescribedby = descriptions.join(' ');
-  }
-
+  
 }

From 1011468273f2887b21e77bf687285acb240d3e53 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:07:22 -0300
Subject: [PATCH 0791/1286] Adjusting spaces in ts

(cherry picked from commit 009da08177f31d049c2094151d8485c157ee0ede)
---
 src/app/register-email-form/register-email-form.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 42be43aab3..c8ca0cc710 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -247,5 +247,4 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-  
 }

From b041601006bafe81ed6c0658418a0d7369a921cd Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Tue, 27 Aug 2024 17:02:12 -0300
Subject: [PATCH 0792/1286] Improving accessibility on the new user
 registration page

(cherry picked from commit 0eb2d5ce587ece5d3573cad7534bcbb8df5c6ed4)
---
 .../register-email-form.component.html                   | 9 ++++++---
 src/assets/i18n/en.json5                                 | 2 ++
 src/assets/i18n/es.json5                                 | 3 +++
 src/assets/i18n/pt-BR.json5                              | 3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a38c4a81c0..740018392c 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -14,13 +14,16 @@
                     <label class="font-weight-bold"
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"/>
+                           type="text" id="email" formControlName="email"
+                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-invalid]="form.get('email')?.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required">
+                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
                         {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
                         <ng-container *ngIf="validMailDomains.length > 0">
                           {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 7c106f3c70..43b12b92d2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6741,4 +6741,6 @@
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 
   "browse.search-form.placeholder": "Search the repository",
+
+  "register-email.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 55962d25b5..0306c5a9bb 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8152,5 +8152,8 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index c3b26a09d2..6f4f94d464 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10249,4 +10249,7 @@
 
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
+
+  // "register-email.aria.label": "Enter your e-mail address",
+  "register-email.aria.label": "Digite seu e-mail",
 }

From 58612ce22738ed1af97bed94c2e3dd4554005197 Mon Sep 17 00:00:00 2001
From: andreaNeki <root@TI-03.OHB.LOCAL>
Date: Thu, 5 Sep 2024 09:35:55 -0300
Subject: [PATCH 0793/1286] Code refactoring - Accessibility on the new user
 registration and forgotten password forms

(cherry picked from commit f00eae67602c3b1d12c5f8fcf43db774a7a70e11)
---
 .../register-email-form/register-email-form.component.html | 4 ++--
 src/assets/i18n/en.json5                                   | 4 +++-
 src/assets/i18n/es.json5                                   | 7 +++++--
 src/assets/i18n/pt-BR.json5                                | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 740018392c..8fd17157d7 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -15,9 +15,9 @@
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
-                           [attr.aria-label]="'register-email.aria.label'|translate"
+                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
                            aria-describedby="email-errors-required email-error-not-valid"
-                           [attr.aria-invalid]="form.get('email')?.invalid"/>
+                           [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
                     <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 43b12b92d2..0ba1f5476b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6742,5 +6742,7 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
-  "register-email.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Enter your e-mail address",
+
+  "forgot-email.form.aria.label": "Enter your e-mail address",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 0306c5a9bb..25dfb54ca2 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8152,8 +8152,11 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Introduzca su dirección de correo electrónico",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
 
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 6f4f94d464..9ebdc5fbbf 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10250,6 +10250,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
-  // "register-email.aria.label": "Enter your e-mail address",
-  "register-email.aria.label": "Digite seu e-mail",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Digite seu e-mail",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Digite seu e-mail",
 }

From c71e7139cae90d554acd8f1f2a7854b584782f47 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:27:10 -0300
Subject: [PATCH 0794/1286] Dynamic aria-describedby attribute

(cherry picked from commit e629d9edf0d2177953950f5e145bf49ff1203f88)
---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 +++++++++++++++++++
 .../register-email-form.component.ts          | 26 ++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 8fd17157d7..d830fc441d 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           aria-describedby="email-errors-required email-error-not-valid"
+                           [attr.aria-describedby]="ariaDescribedby"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index eda9110dc7..c622b9c0e9 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -210,4 +210,39 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
+  describe('ariaDescribedby', () => {
+    it('should have required error message when email is empty', () => {
+      comp.form.patchValue({ email: '' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+    });
+
+    it('should have invalid email error message when email is invalid', () => {
+      comp.form.patchValue({ email: 'invalid-email' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+    });
+
+    it('should clear ariaDescribedby when email is valid', () => {
+      comp.form.patchValue({ email: 'valid@email.com' });
+      comp.checkEmailValidity();
+
+      expect(comp.ariaDescribedby).toBe('');
+    });
+
+    it('should update ariaDescribedby on value changes', () => {
+      spyOn(comp, 'checkEmailValidity').and.callThrough();
+
+      comp.form.patchValue({ email: '' });
+      expect(comp.ariaDescribedby).toContain('email-errors-required');
+
+      comp.form.patchValue({ email: 'invalid-email' });
+      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
+
+      comp.form.patchValue({ email: 'valid@email.com' });
+      expect(comp.ariaDescribedby).toBe('');
+    });
+  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ac13abb865..3c207aae71 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -109,6 +109,11 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
+  /**
+   * Stores error messages related to the email field
+   */
+  ariaDescribedby: string = '';
+
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -178,6 +183,13 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
+
+    /**
+     * Subscription to email field value changes
+     */
+    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
+      this.checkEmailValidity();
+    }));
   }
 
   /**
@@ -291,4 +303,18 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
     }
   }
 
+  checkEmailValidity() {
+    const descriptions = [];
+
+    if (this.email.errors?.required) {
+      descriptions.push('email-errors-required');
+    }
+
+    if (this.email.errors?.pattern || this.email.errors?.email) {
+      descriptions.push('email-error-not-valid');
+    }
+
+    this.ariaDescribedby = descriptions.join(' ');
+  }
+
 }

From 67cd8a989bed3aed4ede54c08bb7ed702821d636 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 11:39:34 -0300
Subject: [PATCH 0795/1286] Resolving a wrongly declared variable error

(cherry picked from commit 7b72a5f0c26514eb07f58faf3470c89fe9729d6f)
---
 src/app/register-email-form/register-email-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 3c207aae71..936d11063e 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -112,7 +112,7 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
   /**
    * Stores error messages related to the email field
    */
-  ariaDescribedby: string = '';
+  ariaDescribedby = '';
 
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();

From 45b6f251f34fd2a17bec103d9a3941b2d23c6436 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:01:54 -0300
Subject: [PATCH 0796/1286] Simplifying the implementation of dynamic
 aria-describedby

(cherry picked from commit fa6e85d6db5a671038e8e27968701b46520154df)
---
 .../register-email-form.component.html        |  2 +-
 .../register-email-form.component.spec.ts     | 35 -------------------
 .../register-email-form.component.ts          | 28 +--------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index d830fc441d..2e93902ada 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -16,7 +16,7 @@
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
                            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           [attr.aria-describedby]="ariaDescribedby"
+                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
                            [attr.aria-invalid]="email.invalid"/>
                     <div *ngIf="email.invalid && (email.dirty || email.touched)"
                          class="invalid-feedback show-feedback">
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index c622b9c0e9..eda9110dc7 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -210,39 +210,4 @@ describe('RegisterEmailFormComponent', () => {
       expect(router.navigate).not.toHaveBeenCalled();
     }));
   });
-  describe('ariaDescribedby', () => {
-    it('should have required error message when email is empty', () => {
-      comp.form.patchValue({ email: '' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-    });
-
-    it('should have invalid email error message when email is invalid', () => {
-      comp.form.patchValue({ email: 'invalid-email' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-    });
-
-    it('should clear ariaDescribedby when email is valid', () => {
-      comp.form.patchValue({ email: 'valid@email.com' });
-      comp.checkEmailValidity();
-
-      expect(comp.ariaDescribedby).toBe('');
-    });
-
-    it('should update ariaDescribedby on value changes', () => {
-      spyOn(comp, 'checkEmailValidity').and.callThrough();
-
-      comp.form.patchValue({ email: '' });
-      expect(comp.ariaDescribedby).toContain('email-errors-required');
-
-      comp.form.patchValue({ email: 'invalid-email' });
-      expect(comp.ariaDescribedby).toContain('email-error-not-valid');
-
-      comp.form.patchValue({ email: 'valid@email.com' });
-      expect(comp.ariaDescribedby).toBe('');
-    });
-  });
 });
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 936d11063e..69497a7703 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -109,11 +109,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   subscriptions: Subscription[] = [];
 
-  /**
-   * Stores error messages related to the email field
-   */
-  ariaDescribedby = '';
-
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -183,13 +178,6 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
     }));
-
-    /**
-     * Subscription to email field value changes
-     */
-    this.subscriptions.push(this.email.valueChanges.subscribe(() => {
-      this.checkEmailValidity();
-    }));
   }
 
   /**
@@ -302,19 +290,5 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-
-  checkEmailValidity() {
-    const descriptions = [];
-
-    if (this.email.errors?.required) {
-      descriptions.push('email-errors-required');
-    }
-
-    if (this.email.errors?.pattern || this.email.errors?.email) {
-      descriptions.push('email-error-not-valid');
-    }
-
-    this.ariaDescribedby = descriptions.join(' ');
-  }
-
+  
 }

From ebc7a7548ea916a719d21d5b7baf7d12b41e468d Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Thu, 31 Oct 2024 15:07:22 -0300
Subject: [PATCH 0797/1286] Adjusting spaces in ts

(cherry picked from commit 009da08177f31d049c2094151d8485c157ee0ede)
---
 src/app/register-email-form/register-email-form.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index 69497a7703..fff8479cbe 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -290,5 +290,4 @@ export class RegisterEmailFormComponent implements OnDestroy, OnInit {
         console.warn(`Unimplemented notification '${key}' from reCaptcha service`);
     }
   }
-  
 }

From fde2db85e72e44e9606938d216c1205c8dabd253 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 11:35:05 -0400
Subject: [PATCH 0798/1286] Correct small alignment errors

---
 src/assets/i18n/fr.json5 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index f4f4bd1ce4..b0017068d7 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6732,8 +6732,8 @@
   //"person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Données biographiques",
 
-   //"person.page.orcid.sync-profile.education": "Education",
-   "person.page.orcid.sync-profile.education": "Éducation",
+  //"person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Éducation",
 
   //"person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identifiants",
@@ -6864,8 +6864,8 @@
   //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le 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": "La ressource n'existe plus dans le registre ORCID.",
 
   //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
   "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
@@ -6921,7 +6921,7 @@
   //"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": "La source de l'identifiant de l'organisation est obligatoire.",
 
-   //"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": "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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
 
   //"person.page.orcid.synchronization-mode": "Synchronization mode",
@@ -6963,7 +6963,7 @@
   //"person.page.orcid.scope.activities-update": "Add/update your research activities",
   "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
 
-   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  //"person.page.orcid.scope.person-update": "Add/update other information about you",
   "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
 
   //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",

From 23dd7903ba36bd4140c3e15af2f9d33bfd2fd9a5 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 14:02:00 -0400
Subject: [PATCH 0799/1286] Correction of 2 lint errors due to spacing.

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index b0017068d7..2ea96ad58d 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6688,7 +6688,7 @@
   "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
 
   //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+  "person.page.orcid.link.error.message": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
 
   //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
@@ -6941,7 +6941,7 @@
 
   //"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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
 

From 449c092bf965bfb1319ac72fa26ce3408347101d Mon Sep 17 00:00:00 2001
From: Ray Lee <ray.lee@lyrasis.org>
Date: Thu, 1 Feb 2024 16:59:50 -0500
Subject: [PATCH 0800/1286] Add support for SAML authentication.

---
 src/app/core/auth/models/auth.method-type.ts              | 3 ++-
 src/app/core/auth/models/auth.method.ts                   | 5 +++++
 src/app/shared/log-in/methods/log-in.methods-decorator.ts | 1 +
 src/assets/i18n/en.json5                                  | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/core/auth/models/auth.method-type.ts b/src/app/core/auth/models/auth.method-type.ts
index 594d6d8b39..87871f433e 100644
--- a/src/app/core/auth/models/auth.method-type.ts
+++ b/src/app/core/auth/models/auth.method-type.ts
@@ -5,5 +5,6 @@ export enum AuthMethodType {
   Ip = 'ip',
   X509 = 'x509',
   Oidc = 'oidc',
-  Orcid = 'orcid'
+  Orcid = 'orcid',
+  Saml = 'saml'
 }
diff --git a/src/app/core/auth/models/auth.method.ts b/src/app/core/auth/models/auth.method.ts
index b84e7a308a..5ff5532cea 100644
--- a/src/app/core/auth/models/auth.method.ts
+++ b/src/app/core/auth/models/auth.method.ts
@@ -40,6 +40,11 @@ export class AuthMethod {
         this.location = location;
         break;
       }
+      case 'saml': {
+        this.authMethodType = AuthMethodType.Saml;
+        this.location = location;
+        break;
+      }
 
       default: {
         break;
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 79a53fcb8f..e714d03e3e 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -11,6 +11,7 @@ export const AUTH_METHOD_FOR_DECORATOR_MAP = new Map<AuthMethodType, AuthMethodT
   [AuthMethodType.Shibboleth, LogInExternalProviderComponent],
   [AuthMethodType.Oidc, LogInExternalProviderComponent],
   [AuthMethodType.Orcid, LogInExternalProviderComponent],
+  [AuthMethodType.Saml, LogInExternalProviderComponent],
 ]);
 
 /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4296e5cfc7..7ee0c5767e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3188,6 +3188,8 @@
 
   "login.form.password": "Password",
 
+  "login.form.saml": "Log in with SAML",
+
   "login.form.shibboleth": "Log in with Shibboleth",
 
   "login.form.submit": "Log in",

From 26f4d1d329d21f1661b6e10bd06362897c7521d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:46:18 +0000
Subject: [PATCH 0801/1286] Bump sass from 1.80.4 to 1.80.6 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.4 to 1.80.6
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.4...1.80.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index e2923712c0..67e416e6e1 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.4",
+    "sass": "~1.80.6",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 21dcdd6fa5..69b50f026e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10234,15 +10234,16 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.4:
-  version "1.80.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.4.tgz#bc0418fd796cad2f1a1309d8b4d7fe44b7027de0"
-  integrity sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==
+sass@^1.25.0, sass@~1.80.6:
+  version "1.80.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.6.tgz#5d0aa55763984effe41e40019c9571ab73e6851f"
+  integrity sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==
   dependencies:
-    "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
+  optionalDependencies:
+    "@parcel/watcher" "^2.4.1"
 
 sax@^1.2.4:
   version "1.2.4"

From 2eb120909b6b917d3f82852382429e391ace7bfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:46:50 +0000
Subject: [PATCH 0802/1286] Bump compression from 1.7.4 to 1.7.5

Bumps [compression](https://github.com/expressjs/compression) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/expressjs/compression/releases)
- [Changelog](https://github.com/expressjs/compression/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/compression/compare/1.7.4...1.7.5)

---
updated-dependencies:
- dependency-name: compression
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index e2923712c0..24c674d8d6 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
-    "compression": "^1.7.4",
+    "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
     "core-js": "^3.38.1",
     "date-fns": "^2.30.0",
diff --git a/yarn.lock b/yarn.lock
index 21dcdd6fa5..0208ffe1a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2983,7 +2983,7 @@ abbrev@1, abbrev@^1.0.0:
   resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -3710,11 +3710,6 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
@@ -4119,7 +4114,7 @@ commondir@^1.0.1:
   resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-compressible@~2.0.16:
+compressible@~2.0.18:
   version "2.0.18"
   resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
@@ -4134,17 +4129,17 @@ compression-webpack-plugin@^9.2.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.7.4, compression@^1.7.5:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
+  integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
   dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
+    bytes "3.1.2"
+    compressible "~2.0.18"
     debug "2.6.9"
+    negotiator "~0.6.4"
     on-headers "~1.0.2"
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.1"
     vary "~1.1.2"
 
 concat-map@0.0.1:
@@ -8351,11 +8346,16 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@0.6.3, negotiator@^0.6.3:
+negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+negotiator@^0.6.3, negotiator@~0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
+  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
+
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
@@ -10158,12 +10158,12 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

From 1b77530a3187f5e991a686876053b72a16d9ddcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:47:05 +0000
Subject: [PATCH 0803/1286] Bump @types/lodash from 4.17.12 to 4.17.13

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.12 to 4.17.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 e2923712c0..6aef716bd5 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.12",
+    "@types/lodash": "^4.17.13",
     "@types/node": "^14.18.63",
     "@types/sanitize-html": "^2.13.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
diff --git a/yarn.lock b/yarn.lock
index 21dcdd6fa5..a44db790f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2539,10 +2539,10 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.17.12":
-  version "4.17.12"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.12.tgz#25d71312bf66512105d71e55d42e22c36bcfc689"
-  integrity sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==
+"@types/lodash@^4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
+  integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
 
 "@types/mime@*":
   version "3.0.1"

From 64e65a6e8c285b8ced61a73372d1f396a0c82f56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:56:51 +0000
Subject: [PATCH 0804/1286] Bump webpack from 5.95.0 to 5.96.1 in the webpack
 group

Bumps the webpack group with 1 update: [webpack](https://github.com/webpack/webpack).


Updates `webpack` from 5.95.0 to 5.96.1
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.95.0...v5.96.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: webpack
...

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

diff --git a/package.json b/package.json
index aa3121389b..83f9cd90ed 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.95.0",
+    "webpack": "5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 998c3415bb..dc2889a8dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2682,7 +2682,23 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.5.tgz#49d738257cc73bafe45c13cb8ff240683b4d5117"
   integrity sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==
 
-"@types/estree@1.0.6", "@types/estree@^1.0.5":
+"@types/eslint-scope@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
+  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@1.0.6", "@types/estree@^1.0.5", "@types/estree@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
@@ -2742,7 +2758,7 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3345,10 +3361,10 @@ acorn-walk@^8.1.1:
   dependencies:
     acorn "^8.11.0"
 
-acorn@^8.11.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+acorn@^8.11.0, acorn@^8.14.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
@@ -3892,15 +3908,15 @@ braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3:
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
-  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
+browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0:
+  version "4.24.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
+  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
   dependencies:
-    caniuse-lite "^1.0.30001646"
-    electron-to-chromium "^1.5.4"
+    caniuse-lite "^1.0.30001669"
+    electron-to-chromium "^1.5.41"
     node-releases "^2.0.18"
-    update-browserslist-db "^1.1.0"
+    update-browserslist-db "^1.1.1"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -4008,6 +4024,11 @@ caniuse-lite@^1.0.30001591, caniuse-lite@^1.0.30001646:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz#f370c311ffbc19c4965d8ec0064a3625c8aaa7af"
   integrity sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==
 
+caniuse-lite@^1.0.30001669:
+  version "1.0.30001677"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz#27c2e2c637e007cfa864a16f7dfe7cde66b38b5f"
+  integrity sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -4931,10 +4952,10 @@ ejs@^3.1.10:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.5.4:
-  version "1.5.18"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz#5fe62b9d21efbcfa26571066502d94f3ed97e495"
-  integrity sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==
+electron-to-chromium@^1.5.41:
+  version "1.5.50"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz#d9ba818da7b2b5ef1f3dd32bce7046feb7e93234"
+  integrity sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -5234,7 +5255,7 @@ esbuild@^0.19.3:
     "@esbuild/win32-ia32" "0.19.12"
     "@esbuild/win32-x64" "0.19.12"
 
-escalade@^3.1.1, escalade@^3.1.2:
+escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
   integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
@@ -10850,13 +10871,13 @@ untildify@^4.0.0:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-update-browserslist-db@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
-  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
+update-browserslist-db@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
   dependencies:
-    escalade "^3.1.2"
-    picocolors "^1.0.1"
+    escalade "^3.2.0"
+    picocolors "^1.1.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -11152,18 +11173,18 @@ webpack@5.94.0:
     watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
-webpack@5.95.0:
-  version "5.95.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
-  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
+webpack@5.96.1:
+  version "5.96.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.1.tgz#3676d1626d8312b6b10d0c18cc049fba7ac01f0c"
+  integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==
   dependencies:
-    "@types/estree" "^1.0.5"
+    "@types/eslint-scope" "^3.7.7"
+    "@types/estree" "^1.0.6"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
     "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"

From 1484464232b8870c40b27f6efc9973bda24e2b3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:57:37 +0000
Subject: [PATCH 0805/1286] Bump compression from 1.7.4 to 1.7.5

Bumps [compression](https://github.com/expressjs/compression) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/expressjs/compression/releases)
- [Changelog](https://github.com/expressjs/compression/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/compression/compare/1.7.4...1.7.5)

---
updated-dependencies:
- dependency-name: compression
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index aa3121389b..6cb4246b59 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
-    "compression": "^1.7.4",
+    "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
     "core-js": "^3.30.1",
     "date-fns": "^2.29.3",
diff --git a/yarn.lock b/yarn.lock
index 998c3415bb..e4d0272be6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3320,7 +3320,7 @@ abbrev@^2.0.0:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
   integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -3920,11 +3920,6 @@ buffer@^5.5.0, buffer@^5.7.1:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -4258,7 +4253,7 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
-compressible@~2.0.16:
+compressible@~2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
@@ -4273,17 +4268,17 @@ compression-webpack-plugin@^9.2.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.7.4, compression@^1.7.5:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
+  integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
   dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
+    bytes "3.1.2"
+    compressible "~2.0.18"
     debug "2.6.9"
+    negotiator "~0.6.4"
     on-headers "~1.0.2"
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.1"
     vary "~1.1.2"
 
 concat-map@0.0.1:
@@ -7925,11 +7920,16 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@0.6.3, negotiator@^0.6.3:
+negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+negotiator@^0.6.3, negotiator@~0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
+  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
+
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"

From 76b73405897b98cb89efd2e37ed23b881e98854b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 02:57:55 +0000
Subject: [PATCH 0806/1286] Bump @types/lodash from 4.17.12 to 4.17.13

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.12 to 4.17.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 aa3121389b..a430cd6640 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.12",
+    "@types/lodash": "^4.17.13",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 998c3415bb..ebb324ce65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2752,10 +2752,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.17.12":
-  version "4.17.12"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.12.tgz#25d71312bf66512105d71e55d42e22c36bcfc689"
-  integrity sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==
+"@types/lodash@^4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
+  integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
 
 "@types/mime@^1":
   version "1.3.5"

From 6b521e750587ff358df4c9f32563b87f5fef23a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 03:02:30 +0000
Subject: [PATCH 0807/1286] Bump @types/lodash from 4.17.12 to 4.17.13

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.12 to 4.17.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 6f217e858a..a9e28c07c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,7 +99,7 @@
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.12",
+        "@types/lodash": "^4.17.13",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -6921,9 +6921,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
-      "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
+      "version": "4.17.13",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
+      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
       "dev": true
     },
     "node_modules/@types/mime": {
diff --git a/package.json b/package.json
index 45f5da14cf..9b0bc832cb 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.12",
+    "@types/lodash": "^4.17.13",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",

From 1645acece4f6dac8e1bf167e5cd879b9550ba8be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 03:03:36 +0000
Subject: [PATCH 0808/1286] Bump compression from 1.7.4 to 1.7.5

Bumps [compression](https://github.com/expressjs/compression) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/expressjs/compression/releases)
- [Changelog](https://github.com/expressjs/compression/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/compression/compare/1.7.4...1.7.5)

---
updated-dependencies:
- dependency-name: compression
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 6f217e858a..176dd20789 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
-        "compression": "^1.7.4",
+        "compression": "^1.7.5",
         "cookie-parser": "1.4.7",
         "core-js": "^3.38.1",
         "date-fns": "^2.29.3",
@@ -8664,14 +8664,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -9063,9 +9055,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -9576,16 +9568,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -9625,6 +9617,33 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/compression/node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -19298,14 +19317,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/re-reselect": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz",
diff --git a/package.json b/package.json
index 45f5da14cf..d4d0213a22 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
-    "compression": "^1.7.4",
+    "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
     "core-js": "^3.38.1",
     "date-fns": "^2.29.3",

From 5bd99a12166de4fdee2a35ac05d3cf2985c5763b Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 4 Nov 2024 12:40:45 +0100
Subject: [PATCH 0809/1286] [CST-15593] fix authenticated orejime cookie
 encoding

---
 cypress/support/e2e.ts                               |  2 +-
 .../shared/cookies/browser-orejime.service.spec.ts   |  2 +-
 src/app/shared/cookies/browser-orejime.service.ts    |  2 +-
 src/app/shared/cookies/orejime-configuration.ts      | 12 ++++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index c1b6bc6d3f..48985e7911 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -56,7 +56,7 @@ before(() => {
 beforeEach(() => {
   // Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
   // This just ensures it doesn't get in the way of matching other objects in the page.
-  cy.setCookie('orejime-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
+  cy.setCookie('orejime-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true}');
 
   // Remove any CSRF cookies saved from prior tests
   cy.clearCookie(DSPACE_XSRF_COOKIE);
diff --git a/src/app/shared/cookies/browser-orejime.service.spec.ts b/src/app/shared/cookies/browser-orejime.service.spec.ts
index a281805238..d7e226a42e 100644
--- a/src/app/shared/cookies/browser-orejime.service.spec.ts
+++ b/src/app/shared/cookies/browser-orejime.service.spec.ts
@@ -70,7 +70,7 @@ describe('BrowserOrejimeService', () => {
     configurationDataService = createConfigSuccessSpy(recaptchaValue);
     findByPropertyName = configurationDataService.findByPropertyName;
     cookieService = jasmine.createSpyObj('cookieService', {
-      get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22orejime%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
+      get: '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true}',
       set: () => {
         /* empty */
       },
diff --git a/src/app/shared/cookies/browser-orejime.service.ts b/src/app/shared/cookies/browser-orejime.service.ts
index 4a7a182e0a..a2c66f9500 100644
--- a/src/app/shared/cookies/browser-orejime.service.ts
+++ b/src/app/shared/cookies/browser-orejime.service.ts
@@ -207,7 +207,7 @@ export class BrowserOrejimeService extends OrejimeService {
    */
   private initializeUser(user: EPerson) {
     this.orejimeConfig.callback = debounce((consent, app) => this.updateSettingsForUsers(user), updateDebounce);
-    this.orejimeConfig.storageName = this.getStorageName(user.uuid);
+    this.orejimeConfig.cookieName = this.getStorageName(user.uuid);
 
     const anonCookie = this.cookieService.get(ANONYMOUS_STORAGE_NAME_OREJIME);
     if (hasValue(this.getSettingsForUser(user))) {
diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts
index aea2bc3338..8e99ff30b2 100644
--- a/src/app/shared/cookies/orejime-configuration.ts
+++ b/src/app/shared/cookies/orejime-configuration.ts
@@ -44,6 +44,18 @@ export function getOrejimeConfiguration(_window: NativeWindowRef): any {
      */
     appElement: 'ds-app',
 
+    stringifyCookie: (contents: any) => {
+      return (typeof contents === 'string') ? contents : JSON.stringify(contents);
+    },
+
+    parseCookie: (cookie: string) => {
+      if (typeof cookie === 'string') {
+        cookie = decodeURIComponent(cookie);
+        return JSON.parse(cookie);
+      }
+      return cookie;
+    },
+
     /*
     You can overwrite existing translations and add translations for your app
     descriptions and purposes. See `src/translations/` for a full list of

From 1aef6ce1d623ac8f0a52dcf8086847996a2d0180 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Mon, 4 Nov 2024 14:37:04 +0100
Subject: [PATCH 0810/1286] Updated messages for the 'supervised' and 'claim'
 sentenses

---
 src/assets/i18n/cs.json5 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 466e3475bf..f06db668a3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Supervizován:",
+  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu supervize",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -4380,10 +4380,10 @@
   "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
-  "item.page.claim.button": "Prohlásit",
+  "item.page.claim.button": "Převzít",
 
   // "item.page.claim.tooltip": "Claim this item as profile",
-  "item.page.claim.tooltip": "Prohlásit tento záznam za profilovou",
+  "item.page.claim.tooltip": "Prohlásit tento záznam za profil",
 
   // "item.page.image.alt.ROR": "ROR logo",
   // TODO New key - Add a translation
@@ -5414,7 +5414,7 @@
   "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
+  "mydspace.show.supervisedWorkspace": "Záznamy pod dohledem",
 
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Archivováno",
@@ -6922,7 +6922,7 @@
   "search.filters.applied.f.birthDate.min": "Datum narození od",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  "search.filters.applied.f.supervisedBy": "Zkontrolováno",
+  "search.filters.applied.f.supervisedBy": "Pod dohledem",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Vyřazeno",
@@ -7221,8 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",
@@ -8924,7 +8923,7 @@
   "virtual-metadata.delete-relationship.modal-head": "Vyberte záznamy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  "supervisedWorkspace.search.results.head": "Zkontrolované záznamy",
+  "supervisedWorkspace.search.results.head": "Záznamy pod dohledem",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Moje záznamy",

From 2aaa32ae5f27594aaea2146c809352c7a8a02cc6 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 31 Oct 2024 11:12:29 -0400
Subject: [PATCH 0811/1286] Complete tag translation in french for ORCID

Contains all french translations for ORCID and Researcher Profile.

(cherry picked from commit ac720033dcca82c0bbd8c6a9f8ac8b1d07ffb37e)
---
 src/assets/i18n/fr.json5 | 366 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 366 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index a73baacf2d..9c0b85cfe4 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6241,6 +6241,372 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolonger la session",
 
+  //"researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "En traitement...",
+
+  //"researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil du chercheur associé",
+
+  //"researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Une erreur inattendue s'est produite pendant le changement apporté à la visibilité du profil.",
+
+  //"researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Créer un nouveau",
+
+  //"researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil créé avec succès",
+
+  //"researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Une erreur s'est produite lors de la création du profil",
+
+  //"researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Supprimer",
+
+  //"researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Exposer",
+
+  //"researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Cacher",
+
+  //"researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Profil non associé",
+
+  //"researcher.profile.view": "View",
+  "researcher.profile.view": "Voir",
+
+  //"researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVÉ",
+
+  //"researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIC",
+
+  //"researcher.profile.status": "Status:",
+  "researcher.profile.status": "Statut:",
+
+  //"researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Vous n'êtes pas autorisé à réclamer cet item. Pour plus de détails contacter la personne administratrice.",
+
+  //"researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Une erreur s'est produite lors de la réclamation du profil, veuillez réessayer plus tard.",
+
+  //"researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erreur",
+
+  //"researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil réclamé avec succès",
+
+  //"researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Succès",
+
+  //"person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Créer un identifiant ORCID",
+
+  //"person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorisations accordées",
+
+  //"person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Accorder des autorisations",
+
+  //"person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Se connecter à ORCID",
+
+  //"person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
+
+  //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+
+  //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
+
+  //"person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Déconnecter d'ORCID",
+
+  //"person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Traitement en cours...",
+
+  //"person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorisations manquantes",
+
+  //"person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Les autorisations suivantes sont manquantes :",
+
+  //"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": "Cette boite est vide, vous avez autorisé l'utilisation de toutes les fonctions proposées par votre organisation.",
+
+  //"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": "Aucun identifiant ORCID n'est encore associé. En cliquant sur le bouton ci-dessous, il est possible de lier ce profil à un compte ORCID.",
+
+  //"person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Préférences du profil",
+
+  //"person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Préférence pour la section Financement",
+
+  //"person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Préférence pour la section Publication",
+
+  //"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 vous avez besoin de retirer votre ORCID, contacter la personne administratrice du dépôt.",
+
+  //"person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Mettre à jour les configurations",
+
+  //"person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Données biographiques",
+
+   //"person.page.orcid.sync-profile.education": "Education",
+   "person.page.orcid.sync-profile.education": "Éducation",
+
+  //"person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifiants",
+
+  //"person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tous les financements",
+
+  //"person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mes financements",
+
+  //"person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Financements sélectionnés",
+
+  //"person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Toutes les publications",
+
+  //"person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Mes publications",
+
+  //"person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Publications sélectionnées",
+
+  //"person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Ignorer les changements et ne pas synchroniser avec le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "L'annulation de la file d'attente ORCID a échoué.",
+
+  //"person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "La file d'attente ORCID a été annulée avec succès.",
+
+  //"person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La file d'attente ORCID est vide.",
+
+  //"person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Type",
+
+  //"person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Description",
+
+  //"person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Action",
+
+  //"person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+
+  //"person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Pays",
+
+  //"person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Identifiants externes",
+
+  //"person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Autres noms",
+
+  //"person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+
+  //"person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs du chercheur",
+
+  //"person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Mots clés",
+
+  //"person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Ajouter une nouvelle entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Mettre à jour cette entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Supprimer cette entrée du registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+
+  //"person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projet",
+
+  //"person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+
+  //"person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Autre nom",
+
+  //"person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Pays",
+
+  //"person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Mot clé",
+
+  //"person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identifiant externe",
+
+  //"person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL du chercheur",
+
+  //"person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchroniser avec le 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": "La transmission à ORCID a échoué en raison d'autorisations manquantes.",
+
+  //"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": "Cliquer <a href='{{orcid}}'>ici</a> afin d'accorder à nouveau les permissions nécessaires. Si le problème persiste, contacter l'administrateur.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource envoyée n'est pas valide.",
+
+  //"person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "La transmission à ORCID a échoué.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
+
+  //"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 données que vous souhaitez synchroniser avec ORCID ne sont pas valides.",
+
+  //"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": "La devise du montant est requise.",
+
+  //"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": "La ressource à transmettre doit avoir au moins un identifiant.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Le titre est obligatoire.",
+
+  //"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": "Le type de document est obligatoire.",
+
+  //"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": "La date de début est obbligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "L'organisme subventionnaire est obligatoire.",
+
+  //"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": "Code de pays ISO 3166 à 2 chiffres invalide",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "L'organisation est obligatoire.",
+
+  //"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": "Le nom de l'organisation est obligatoire.",
+
+  //"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 date de publication doit être d'au moins un an après 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": "L'organisation a transmettre doit avoir une adresse.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit mentionner une ville.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit avoir une code de pays ISO 3166 à 2 chiffres valide.",
+
+  //"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": "Un identifiant pour désambiguer l'orgnisation est obligatoire. Les identifiants possibles sont GRID, Ringgold, Legal Entity identifiers (LEIs) et Crossref Funder Registry identifiers",
+
+  //"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": "Une valeur pour l'identifiant de l'organisation est obligatoire.",
+
+  //"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": "La source de l'identifiant de l'organisation est obligatoire.",
+
+   //"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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
+
+  //"person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Mode de synchronisation",
+
+  //"person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "En lot",
+
+  //"person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Mode de synchronisation",
+
+  //"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": "Sélectionner le mode de synchronisation vers ORCID. Les options sont \"Manuel\" (vous devrez sélectionner les données à transmettre vers ORCID manuellement), ou \"En lot\" (le système transmettra vos données vers ORCID automatiquement).",
+
+  //"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": "Sélectionnez si vous souhaitez transmettre vos projets de recherche vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Les paramètres de synchronisation ont été mis à jour avec succès.",
+
+  //"person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "La mise à jour des paramètres de synchronisation a échoué.",
+
+  //"person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuel",
+
+  //"person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenez votre identifiant ORCID",
+
+  //"person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Consultez vos informations ayant le paramètre de visibilité réglé sur Parties de confiance.",
+
+  //"person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
+
+   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
+
+  //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "La déconnexion entre votre profil et le registre ORCID a été effectuée avec succès.",
+
+  //"person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Une erreur s'est produite lors de la déconnexion entre votre profil et le registre ORCID. Veuillez réessayer.",
+
+  //"person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Paramètres de synchronisation ORCID",
+
+  //"person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Liste d'attente pour le registre ORCID",
+
+  //"person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorisation ORCID",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 

From 33262795babe9ada5d4d97f83fbaaf36cd8c626f Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 11:35:05 -0400
Subject: [PATCH 0812/1286] Correct small alignment errors

(cherry picked from commit fde2db85e72e44e9606938d216c1205c8dabd253)
---
 src/assets/i18n/fr.json5 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 9c0b85cfe4..8122486a4e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6358,8 +6358,8 @@
   //"person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Données biographiques",
 
-   //"person.page.orcid.sync-profile.education": "Education",
-   "person.page.orcid.sync-profile.education": "Éducation",
+  //"person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Éducation",
 
   //"person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identifiants",
@@ -6490,8 +6490,8 @@
   //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le 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": "La ressource n'existe plus dans le registre ORCID.",
 
   //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
   "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
@@ -6547,7 +6547,7 @@
   //"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": "La source de l'identifiant de l'organisation est obligatoire.",
 
-   //"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": "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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
 
   //"person.page.orcid.synchronization-mode": "Synchronization mode",
@@ -6589,7 +6589,7 @@
   //"person.page.orcid.scope.activities-update": "Add/update your research activities",
   "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
 
-   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  //"person.page.orcid.scope.person-update": "Add/update other information about you",
   "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
 
   //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",

From 9c3363d4652c97279836e5b655a369eab18e76dc Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 14:02:00 -0400
Subject: [PATCH 0813/1286] Correction of 2 lint errors due to spacing.

(cherry picked from commit 23dd7903ba36bd4140c3e15af2f9d33bfd2fd9a5)
---
 src/assets/i18n/fr.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8122486a4e..0f5587626b 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6314,7 +6314,7 @@
   "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
 
   //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+  "person.page.orcid.link.error.message": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
 
   //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
@@ -6567,7 +6567,7 @@
 
   //"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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
 

From 73e0c1ffcf0f41d56c80131cdc9c5f2534b3b91e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 31 Oct 2024 11:12:29 -0400
Subject: [PATCH 0814/1286] Complete tag translation in french for ORCID

Contains all french translations for ORCID and Researcher Profile.

(cherry picked from commit ac720033dcca82c0bbd8c6a9f8ac8b1d07ffb37e)
---
 src/assets/i18n/fr.json5 | 366 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 366 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index b2a03fad7d..f4f4bd1ce4 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6615,6 +6615,372 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolonger la session",
 
+  //"researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "En traitement...",
+
+  //"researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profil du chercheur associé",
+
+  //"researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Une erreur inattendue s'est produite pendant le changement apporté à la visibilité du profil.",
+
+  //"researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Créer un nouveau",
+
+  //"researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profil créé avec succès",
+
+  //"researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Une erreur s'est produite lors de la création du profil",
+
+  //"researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Supprimer",
+
+  //"researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Exposer",
+
+  //"researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Cacher",
+
+  //"researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Profil non associé",
+
+  //"researcher.profile.view": "View",
+  "researcher.profile.view": "Voir",
+
+  //"researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVÉ",
+
+  //"researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIC",
+
+  //"researcher.profile.status": "Status:",
+  "researcher.profile.status": "Statut:",
+
+  //"researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Vous n'êtes pas autorisé à réclamer cet item. Pour plus de détails contacter la personne administratrice.",
+
+  //"researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Une erreur s'est produite lors de la réclamation du profil, veuillez réessayer plus tard.",
+
+  //"researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erreur",
+
+  //"researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profil réclamé avec succès",
+
+  //"researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Succès",
+
+  //"person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Créer un identifiant ORCID",
+
+  //"person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorisations accordées",
+
+  //"person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Accorder des autorisations",
+
+  //"person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Se connecter à ORCID",
+
+  //"person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
+
+  //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+
+  //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
+
+  //"person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Déconnecter d'ORCID",
+
+  //"person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Traitement en cours...",
+
+  //"person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorisations manquantes",
+
+  //"person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Les autorisations suivantes sont manquantes :",
+
+  //"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": "Cette boite est vide, vous avez autorisé l'utilisation de toutes les fonctions proposées par votre organisation.",
+
+  //"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": "Aucun identifiant ORCID n'est encore associé. En cliquant sur le bouton ci-dessous, il est possible de lier ce profil à un compte ORCID.",
+
+  //"person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Préférences du profil",
+
+  //"person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Préférence pour la section Financement",
+
+  //"person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Préférence pour la section Publication",
+
+  //"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 vous avez besoin de retirer votre ORCID, contacter la personne administratrice du dépôt.",
+
+  //"person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Mettre à jour les configurations",
+
+  //"person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Données biographiques",
+
+   //"person.page.orcid.sync-profile.education": "Education",
+   "person.page.orcid.sync-profile.education": "Éducation",
+
+  //"person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifiants",
+
+  //"person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tous les financements",
+
+  //"person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Mes financements",
+
+  //"person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Financements sélectionnés",
+
+  //"person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Toutes les publications",
+
+  //"person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Mes publications",
+
+  //"person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Publications sélectionnées",
+
+  //"person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Désactivé",
+
+  //"person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Ignorer les changements et ne pas synchroniser avec le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "L'annulation de la file d'attente ORCID a échoué.",
+
+  //"person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "La file d'attente ORCID a été annulée avec succès.",
+
+  //"person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La file d'attente ORCID est vide.",
+
+  //"person.page.orcid.sync-queue.table.header.type": "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Type",
+
+  //"person.page.orcid.sync-queue.table.header.description": "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Description",
+
+  //"person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Action",
+
+  //"person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+
+  //"person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Pays",
+
+  //"person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Identifiants externes",
+
+  //"person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Autres noms",
+
+  //"person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+
+  //"person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs du chercheur",
+
+  //"person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Mots clés",
+
+  //"person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Ajouter une nouvelle entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Mettre à jour cette entrée dans le registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Supprimer cette entrée du registre ORCID",
+
+  //"person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+
+  //"person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projet",
+
+  //"person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+
+  //"person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Éducation",
+
+  //"person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+
+  //"person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Autre nom",
+
+  //"person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Pays",
+
+  //"person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Mot clé",
+
+  //"person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identifiant externe",
+
+  //"person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL du chercheur",
+
+  //"person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Synchroniser avec le 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": "La transmission à ORCID a échoué en raison d'autorisations manquantes.",
+
+  //"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": "Cliquer <a href='{{orcid}}'>ici</a> afin d'accorder à nouveau les permissions nécessaires. Si le problème persiste, contacter l'administrateur.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource envoyée n'est pas valide.",
+
+  //"person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "La transmission à ORCID a échoué.",
+
+  //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le registre ORCID.",
+
+  //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
+
+  //"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 données que vous souhaitez synchroniser avec ORCID ne sont pas valides.",
+
+  //"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": "La devise du montant est requise.",
+
+  //"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": "La ressource à transmettre doit avoir au moins un identifiant.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Le titre est obligatoire.",
+
+  //"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": "Le type de document est obligatoire.",
+
+  //"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": "La date de début est obbligatoire.",
+
+  //"person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "L'organisme subventionnaire est obligatoire.",
+
+  //"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": "Code de pays ISO 3166 à 2 chiffres invalide",
+
+  //"person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "L'organisation est obligatoire.",
+
+  //"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": "Le nom de l'organisation est obligatoire.",
+
+  //"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 date de publication doit être d'au moins un an après 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": "L'organisation a transmettre doit avoir une adresse.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit mentionner une ville.",
+
+  //"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": "L'adresse de l'organisation à transmettre doit avoir une code de pays ISO 3166 à 2 chiffres valide.",
+
+  //"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": "Un identifiant pour désambiguer l'orgnisation est obligatoire. Les identifiants possibles sont GRID, Ringgold, Legal Entity identifiers (LEIs) et Crossref Funder Registry identifiers",
+
+  //"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": "Une valeur pour l'identifiant de l'organisation est obligatoire.",
+
+  //"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": "La source de l'identifiant de l'organisation est obligatoire.",
+
+   //"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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
+
+  //"person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Mode de synchronisation",
+
+  //"person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "En lot",
+
+  //"person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Mode de synchronisation",
+
+  //"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": "Sélectionner le mode de synchronisation vers ORCID. Les options sont \"Manuel\" (vous devrez sélectionner les données à transmettre vers ORCID manuellement), ou \"En lot\" (le système transmettra vos données vers ORCID automatiquement).",
+
+  //"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": "Sélectionnez si vous souhaitez transmettre vos projets de recherche vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
+
+  //"person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Les paramètres de synchronisation ont été mis à jour avec succès.",
+
+  //"person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "La mise à jour des paramètres de synchronisation a échoué.",
+
+  //"person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuel",
+
+  //"person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenez votre identifiant ORCID",
+
+  //"person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Consultez vos informations ayant le paramètre de visibilité réglé sur Parties de confiance.",
+
+  //"person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
+
+   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
+
+  //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "La déconnexion entre votre profil et le registre ORCID a été effectuée avec succès.",
+
+  //"person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Une erreur s'est produite lors de la déconnexion entre votre profil et le registre ORCID. Veuillez réessayer.",
+
+  //"person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Paramètres de synchronisation ORCID",
+
+  //"person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Liste d'attente pour le registre ORCID",
+
+  //"person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorisation ORCID",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 

From 07e4e0cabb03fdbe2c7d16326513a7987cf1e879 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 11:35:05 -0400
Subject: [PATCH 0815/1286] Correct small alignment errors

(cherry picked from commit fde2db85e72e44e9606938d216c1205c8dabd253)
---
 src/assets/i18n/fr.json5 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index f4f4bd1ce4..b0017068d7 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6732,8 +6732,8 @@
   //"person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Données biographiques",
 
-   //"person.page.orcid.sync-profile.education": "Education",
-   "person.page.orcid.sync-profile.education": "Éducation",
+  //"person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Éducation",
 
   //"person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identifiants",
@@ -6864,8 +6864,8 @@
   //"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": "La transmission à ORCID a échoué en raison du fait que la ressource est déjà présente dans le 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": "La ressource n'existe plus dans le 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": "La ressource n'existe plus dans le registre ORCID.",
 
   //"person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
   "person.page.orcid.sync-queue.send.success": "La transmission à ORCID a été effectuée avec succès.",
@@ -6921,7 +6921,7 @@
   //"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": "La source de l'identifiant de l'organisation est obligatoire.",
 
-   //"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": "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 source d'un des identifiants d'organisation est invalide. Les sources possibles sont RINGGOLD, GRID, LEI and FUNDREF",
 
   //"person.page.orcid.synchronization-mode": "Synchronization mode",
@@ -6963,7 +6963,7 @@
   //"person.page.orcid.scope.activities-update": "Add/update your research activities",
   "person.page.orcid.scope.activities-update": "Ajouter ou mettre à jour vos activités de recherche",
 
-   //"person.page.orcid.scope.person-update": "Add/update other information about you",
+  //"person.page.orcid.scope.person-update": "Add/update other information about you",
   "person.page.orcid.scope.person-update": "Ajouter ou mettre à jour d'autre information sur vous",
 
   //"person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",

From fe8f79b750a0aba295529bd1ad75736066cc9f0e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 1 Nov 2024 14:02:00 -0400
Subject: [PATCH 0816/1286] Correction of 2 lint errors due to spacing.

(cherry picked from commit 23dd7903ba36bd4140c3e15af2f9d33bfd2fd9a5)
---
 src/assets/i18n/fr.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index b0017068d7..2ea96ad58d 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6688,7 +6688,7 @@
   "person.page.orcid.link.processing": "Liaison du profil avec ORCID en cours...",
 
   //"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": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
+  "person.page.orcid.link.error.message": "Quelque chose a échoué lors de la connection du profil avec ORCID. Si le problème persiste, contacter la personne administratice.",
 
   //"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'identifiant ORCID du profil ({{ orcid }}) n'a pas encore été connecté à une compte du registre ORCID ou la connection a expiré. ",
@@ -6941,7 +6941,7 @@
 
   //"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": "Sélectionnez si vous souhaitez transmettre vos publications vers votre profil 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": "Sélectionnez si vous souhaitez transmettre vos données biographiques vers votre profil ORCID.",
 

From 67f9623cf4878bdc33e60b952cea1e5e0f89418a Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Tue, 5 Nov 2024 22:01:05 +0100
Subject: [PATCH 0817/1286] Allow free-text editing for hierarchical vocabulary
 fields as well

---
 .../dso-edit-metadata-value.component.html         | 14 +++++++-------
 .../dso-edit-metadata-value.component.ts           |  2 +-
 2 files changed, 8 insertions(+), 8 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 da6a00bf48..f3bbef3a4d 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 flex-column" *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 && ((isAuthorityControlled() | async) !== true || enabledFreeTextEditing)" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
     <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing"
@@ -12,17 +12,17 @@
                                     [model]="getModel()"
                                     (change)="onChangeAuthorityField($event)">
     </ds-dynamic-scrollable-dropdown>
-    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+    <ds-dynamic-onebox *ngIf="mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))"
+                      [group]="group"
+                      [model]="getModel()"
+                      (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-onebox>
+    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))"
         [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
         (click)="toggleFreeTextEdition()">
     <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
     {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
     </button>
-    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
-                      [group]="group"
-                      [model]="getModel()"
-                      (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-onebox>
     <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
       <span class="badge badge-light border" >
         <i dsAuthorityConfidenceState
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 69bdf41787..12c2dce966 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
@@ -193,7 +193,7 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
 
 
   /**
-   * Whether or not the free-text editing is enabled when scrollable dropdown vocabulary is used
+   * Whether or not the free-text editing is enabled when scrollable dropdown or hierarchical vocabulary is used
    */
   public enabledFreeTextEditing = false;
 

From ded0079f24e0f6670f357e545e9ff14219aa4913 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 6 Nov 2024 14:07:58 +0100
Subject: [PATCH 0818/1286] 119915: Restored functionality to hide the research
 profile section on the profile page

---
 src/app/profile-page/profile-page.component.html    | 2 +-
 src/app/profile-page/profile-page.component.spec.ts | 6 +++---
 src/app/profile-page/profile-page.component.ts      | 7 -------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index b5703c47a3..3dc7c9d489 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
     <h1>{{'profile.title' | translate}}</h1>
-    <ng-container>
+    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 810cf63389..82a0a9d67b 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -369,7 +369,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return true', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: true,
         });
@@ -385,7 +385,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false,
         });
@@ -401,7 +401,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false,
         });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index afa89360b2..75760105e0 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -235,13 +235,6 @@ export class ProfilePageComponent implements OnInit {
     this.updateProfile();
   }
 
-  /**
-   * Returns true if the researcher profile feature is enabled, false otherwise.
-   */
-  isResearcherProfileEnabled(): Observable<boolean> {
-    return this.isResearcherProfileEnabled$.asObservable();
-  }
-
   /**
    * Returns an error message from a password validation request with a specific reason or
    * a default message without specific reason.

From 752eb4c57bd9b41f65cae0094006c2e887f37147 Mon Sep 17 00:00:00 2001
From: pcg-kk <krzysztof.kubiak@pcgacademia.pl>
Date: Wed, 6 Nov 2024 21:29:34 +0100
Subject: [PATCH 0819/1286] fix: resolve issue with unit tests

---
 .../core/data/base/base-data.service.spec.ts   | 14 ++++++++++++--
 src/app/core/data/base/base-data.service.ts    | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 3f44ad5e5a..7e4443d9a7 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -26,11 +26,13 @@ import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-ser
 import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { LinkDefinition } from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
+import { HALResource } from '../../shared/hal-resource.model';
 import { FindListOptions } from '../find-list-options.model';
 import { RemoteData } from '../remote-data';
 import { RequestService } from '../request.service';
@@ -417,6 +419,11 @@ describe('BaseDataService', () => {
           c: remoteDataMocks.ResponsePending,
           d: remoteDataMocks.Success,
         }));
+        spyOn(service, 'getLinkDefinition').and.callFake((source, linkName) => {
+          return {
+            propertyName: linkName,
+          } as any as LinkDefinition<HALResource>;
+        });
         const expected = '--b-c-d';
         const values = {
           b: remoteDataMocks.RequestPending,
@@ -625,16 +632,19 @@ describe('BaseDataService', () => {
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
           }));
+          spyOn(service, 'getLinkDefinition').and.callFake((source, linkName) => {
+            return {
+              propertyName: linkName,
+            } as any as LinkDefinition<HALResource>;
+          });
           const expected = '--b-c-d';
           const values = {
             b: remoteDataPageMocks.RequestPending,
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
           };
-
           expectObservable(service.findListByHref(selfLink, findListOptions, false, false, ...linksToFollow)).toBe(expected, values);
           flush();
-          expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
         });
       });
     });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index b47deb339c..19e466ee7a 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -28,14 +28,19 @@ import {
   isNotEmptyOperator,
 } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { getLinkDefinition } from '../../cache/builders/build-decorators';
+import {
+  getLinkDefinition,
+  LinkDefinition,
+} from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
+import { HALResource } from '../../shared/hal-resource.model';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
 import { FindListOptions } from '../find-list-options.model';
@@ -303,7 +308,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
         if (hasValue(remoteDataObject?.payload?._links)) {
           for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
             // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
-            const linkDefinition = getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+            const linkDefinition = this.getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
             if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
               // followLink can be either an individual HALLink or a HALLink[]
               const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
@@ -359,8 +364,8 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
             if (hasValue(object?._links)) {
               for (const followLinkName of Object.keys(object._links)) {
                 // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
-                const linkDefinition = getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
-                if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
+                const linkDefinition = this.getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+                if (linkDefinition?.propertyName && followLinkName !== 'self' && hasValue(object[linkDefinition.propertyName])) {
                   // followLink can be either an individual HALLink or a HALLink[]
                   const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
                   for (const individualFollowLink of followLinksList) {
@@ -515,4 +520,9 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     return done$;
   }
+
+  getLinkDefinition<D extends HALResource>(source: GenericConstructor<D>, linkName: keyof D['_links']): LinkDefinition<D> {
+    return getLinkDefinition(source, linkName);
+  }
+
 }

From 33dddc697fb86d449998900ab82e4f876631eaac Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 19:58:01 +0100
Subject: [PATCH 0820/1286] update comment to correctly describe component's
 purpose

---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index 4bb89a85f4..158eafd0eb 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -30,7 +30,7 @@ import { ResourcePoliciesComponent } from '../../shared/resource-policies/resour
   standalone: true,
 })
 /**
- * Component that handles the Collection Authorizations
+ * Component that handles the Bitstream Authorizations
  */
 export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
 

From 752951ce3b05436a13d689fc492fa0b95563862e Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 20:02:39 +0100
Subject: [PATCH 0821/1286] fix invalid selector

---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index 158eafd0eb..d6133f2a97 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -19,7 +19,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ResourcePoliciesComponent } from '../../shared/resource-policies/resource-policies.component';
 
 @Component({
-  selector: 'ds-collection-authorizations',
+  selector: 'ds-bitstream-authorizations',
   templateUrl: './bitstream-authorizations.component.html',
   imports: [
     ResourcePoliciesComponent,

From 65d17e4784beb03a95350acbdfcbe599713c0930 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 20:09:05 +0100
Subject: [PATCH 0822/1286] rename parameter name in the function JSDoc from
 'mapOrMaps' to 'mdMapOrMaps'

---
 src/app/core/shared/metadata.utils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index f0290eac39..a82f218ed9 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -77,7 +77,7 @@ export class Metadata {
   /**
    * Gets the first matching MetadataValue object in the map(s), or `undefined`.
    *
-   * @param {MetadataMapInterface|MetadataMapInterface[]} mapOrMaps The source map(s).
+   * @param {MetadataMapInterface|MetadataMapInterface[]} mdMapOrMaps The source map(s).
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
    * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
    * @returns {MetadataValue} the first matching value, or `undefined`.
@@ -98,7 +98,7 @@ export class Metadata {
   /**
    * Like [[Metadata.first]], but only returns a string value, or `undefined`.
    *
-   * @param {MetadataMapInterface|MetadataMapInterface[]} mapOrMaps The source map(s).
+   * @param {MetadataMapInterface|MetadataMapInterface[]} mdMapOrMaps The source map(s).
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
    * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
    * @returns {string} the first matching string value, or `undefined`.
@@ -112,7 +112,7 @@ export class Metadata {
   /**
    * Checks for a matching metadata value in the given map(s).
    *
-   * @param {MetadataMapInterface|MetadataMapInterface[]} mapOrMaps The source map(s).
+   * @param {MetadataMapInterface|MetadataMapInterface[]} mdMapOrMaps The source map(s).
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
    * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
    * @returns {boolean} whether a match is found.

From 87f5b502010581ad4d8f3152aa126dbc6c6bbe62 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 19:58:01 +0100
Subject: [PATCH 0823/1286] update comment to correctly describe component's
 purpose

(cherry picked from commit 33dddc697fb86d449998900ab82e4f876631eaac)
---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index adc0638780..90b4151a9d 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -12,7 +12,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
   templateUrl: './bitstream-authorizations.component.html',
 })
 /**
- * Component that handles the Collection Authorizations
+ * Component that handles the Bitstream Authorizations
  */
 export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
 

From 9f879d38501f68e068350b567dafbe9b0a858d92 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 20:02:39 +0100
Subject: [PATCH 0824/1286] fix invalid selector

(cherry picked from commit 752951ce3b05436a13d689fc492fa0b95563862e)
---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index 90b4151a9d..72683f5d74 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -8,7 +8,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 @Component({
-  selector: 'ds-collection-authorizations',
+  selector: 'ds-bitstream-authorizations',
   templateUrl: './bitstream-authorizations.component.html',
 })
 /**

From 62a1443b755843787f3d95cb5d590b75863007e8 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 19:58:01 +0100
Subject: [PATCH 0825/1286] update comment to correctly describe component's
 purpose

(cherry picked from commit 33dddc697fb86d449998900ab82e4f876631eaac)
---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index 4bb89a85f4..158eafd0eb 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -30,7 +30,7 @@ import { ResourcePoliciesComponent } from '../../shared/resource-policies/resour
   standalone: true,
 })
 /**
- * Component that handles the Collection Authorizations
+ * Component that handles the Bitstream Authorizations
  */
 export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
 

From fb57b72eca1347931e3682b8563b00b18b0f5bd0 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 7 Nov 2024 20:02:39 +0100
Subject: [PATCH 0826/1286] fix invalid selector

(cherry picked from commit 752951ce3b05436a13d689fc492fa0b95563862e)
---
 .../bitstream-authorizations.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
index 158eafd0eb..d6133f2a97 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -19,7 +19,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { ResourcePoliciesComponent } from '../../shared/resource-policies/resource-policies.component';
 
 @Component({
-  selector: 'ds-collection-authorizations',
+  selector: 'ds-bitstream-authorizations',
   templateUrl: './bitstream-authorizations.component.html',
   imports: [
     ResourcePoliciesComponent,

From d819cf43968665c20870ee16a1620e744dfbd821 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 8 Nov 2024 15:24:06 +0100
Subject: [PATCH 0827/1286] Updated supervised by messages following NTK
 suggestions

---
 src/assets/i18n/cs.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index f06db668a3..866660f513 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
+  "workflow-item.search.result.list.element.supervised-by": "Dohlížející autorita:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat dohlížející autoritu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -7221,7 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
+  "search.filters.filter.supervisedBy.label": "Hledat dohlížející autoritu",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",

From 821b8ee3f08b8dbea8105ad56d9bb5bcd9c4fe24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:24:18 +0000
Subject: [PATCH 0828/1286] Bump webpack from 5.95.0 to 5.96.1 in the webpack
 group

Bumps the webpack group with 1 update: [webpack](https://github.com/webpack/webpack).


Updates `webpack` from 5.95.0 to 5.96.1
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.95.0...v5.96.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: webpack
...

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

diff --git a/package-lock.json b/package-lock.json
index fc7f220e8c..c5c1ce1714 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -147,7 +147,7 @@
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.95.0",
+        "webpack": "5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -6804,6 +6804,26 @@
       "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
       "dev": true
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -7808,9 +7828,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -22617,18 +22637,18 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "^1.0.5",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
diff --git a/package.json b/package.json
index bc9bf662db..f1cae71d22 100644
--- a/package.json
+++ b/package.json
@@ -234,7 +234,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.95.0",
+    "webpack": "5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }

From 6076423907e22707a4c31c7c96d1b74ca6b0d81c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 29 Oct 2024 13:58:50 -0500
Subject: [PATCH 0829/1286] Fix Klaro translations by forcing Klaro to use a
 'zy' language key which DSpace will translate

---
 .../cookies/browser-klaro.service.spec.ts     |  6 +++---
 .../shared/cookies/browser-klaro.service.ts   |  8 +++----
 src/app/shared/cookies/klaro-configuration.ts | 21 +++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
index 953734d38c..5cdd5275cd 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -108,7 +108,7 @@ describe('BrowserKlaroService', () => {
 
     mockConfig = {
       translations: {
-        zz: {
+        zy: {
           purposes: {},
           test: {
             testeritis: testKey,
@@ -166,8 +166,8 @@ describe('BrowserKlaroService', () => {
 
   it('addAppMessages', () => {
     service.addAppMessages();
-    expect(mockConfig.translations.zz[appName]).toBeDefined();
-    expect(mockConfig.translations.zz.purposes[purpose]).toBeDefined();
+    expect(mockConfig.translations.zy[appName]).toBeDefined();
+    expect(mockConfig.translations.zy.purposes[purpose]).toBeDefined();
   });
 
   it('translateConfiguration', () => {
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index f673a41736..b7d00c4b46 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -111,7 +111,7 @@ export class BrowserKlaroService extends KlaroService {
   initialize() {
     if (!environment.info.enablePrivacyStatement) {
       delete this.klaroConfig.privacyPolicy;
-      this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+      this.klaroConfig.translations.zy.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
     }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
@@ -258,12 +258,12 @@ export class BrowserKlaroService extends KlaroService {
    */
   addAppMessages() {
     this.klaroConfig.services.forEach((app) => {
-      this.klaroConfig.translations.zz[app.name] = {
+      this.klaroConfig.translations.zy[app.name] = {
         title: this.getTitleTranslation(app.name),
         description: this.getDescriptionTranslation(app.name),
       };
       app.purposes.forEach((purpose) => {
-        this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
+        this.klaroConfig.translations.zy.purposes[purpose] = this.getPurposeTranslation(purpose);
       });
     });
   }
@@ -277,7 +277,7 @@ export class BrowserKlaroService extends KlaroService {
      */
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
-    this.translate(this.klaroConfig.translations.zz);
+    this.translate(this.klaroConfig.translations.zy);
   }
 
   /**
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index c2fb7738a0..85d24ce22c 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -23,7 +23,7 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
 
 /**
  * Klaro configuration
- * For more information see https://kiprotect.com/docs/klaro/annotated-config
+ * For more information see https://klaro.org/docs/integration/annotated-configuration
  */
 export const klaroConfiguration: any = {
   storageName: ANONYMOUS_STORAGE_NAME_KLARO,
@@ -53,21 +53,30 @@ export const klaroConfiguration: any = {
 
   htmlTexts: true,
 
+  /*
+  Force Klaro to use our custom "zy" lang configs defined below.
+  */
+  lang: 'zy',
+
   /*
   You can overwrite existing translations and add translations for your app
   descriptions and purposes. See `src/translations/` for a full list of
   translations that can be overwritten:
-  https://github.com/KIProtect/klaro/tree/master/src/translations
+  https://github.com/klaro-org/klaro-js/tree/master/src/translations
   */
   translations: {
     /*
-      The `zz` key contains default translations that will be used as fallback values.
-      This can e.g. be useful for defining a fallback privacy policy URL.
-      FOR DSPACE: We use 'zz' to map to our own i18n translations for klaro, see
+      For DSpace we use this custom 'zy' key to map to our own i18n translations for klaro, see
       translateConfiguration() in browser-klaro.service.ts. All the below i18n keys are specified
       in your /src/assets/i18n/*.json5 translation pack.
+      This 'zy' key has no special meaning to Klaro & is not a valid language code. It just
+      allows DSpace to override Klaro's own translations in favor of DSpace's i18n keys.
+      NOTE: we do not use 'zz' as that has special meaning to Klaro and is ONLY used as a "fallback"
+      if no other translations can be found within Klaro. Currently, a bug in Klaro means that
+      'zz' is never used as there's no way to exclude translations:
+      https://github.com/klaro-org/klaro-js/issues/515
     */
-    zz: {
+    zy: {
       acceptAll: 'cookies.consent.accept-all',
       acceptSelected: 'cookies.consent.accept-selected',
       close: 'cookies.consent.close',

From 4353c57cd045f912f27bf8c3dce2a73497ff7d42 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 29 Oct 2024 13:58:50 -0500
Subject: [PATCH 0830/1286] Fix Klaro translations by forcing Klaro to use a
 'zy' language key which DSpace will translate

(cherry picked from commit 6076423907e22707a4c31c7c96d1b74ca6b0d81c)
---
 .../cookies/browser-klaro.service.spec.ts     |  6 +++---
 .../shared/cookies/browser-klaro.service.ts   |  8 +++----
 src/app/shared/cookies/klaro-configuration.ts | 21 +++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
index 7fd72b54b3..3da3a8b7a3 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -101,7 +101,7 @@ describe('BrowserKlaroService', () => {
 
     mockConfig = {
       translations: {
-        zz: {
+        zy: {
           purposes: {},
           test: {
             testeritis: testKey
@@ -159,8 +159,8 @@ describe('BrowserKlaroService', () => {
 
   it('addAppMessages', () => {
     service.addAppMessages();
-    expect(mockConfig.translations.zz[appName]).toBeDefined();
-    expect(mockConfig.translations.zz.purposes[purpose]).toBeDefined();
+    expect(mockConfig.translations.zy[appName]).toBeDefined();
+    expect(mockConfig.translations.zy.purposes[purpose]).toBeDefined();
   });
 
   it('translateConfiguration', () => {
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 2b09c0bf15..adcb59e146 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -91,7 +91,7 @@ export class BrowserKlaroService extends KlaroService {
   initialize() {
     if (!environment.info.enablePrivacyStatement) {
       delete this.klaroConfig.privacyPolicy;
-      this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+      this.klaroConfig.translations.zy.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
     }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
@@ -238,12 +238,12 @@ export class BrowserKlaroService extends KlaroService {
    */
   addAppMessages() {
     this.klaroConfig.services.forEach((app) => {
-      this.klaroConfig.translations.zz[app.name] = {
+      this.klaroConfig.translations.zy[app.name] = {
         title: this.getTitleTranslation(app.name),
         description: this.getDescriptionTranslation(app.name)
       };
       app.purposes.forEach((purpose) => {
-        this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
+        this.klaroConfig.translations.zy.purposes[purpose] = this.getPurposeTranslation(purpose);
       });
     });
   }
@@ -257,7 +257,7 @@ export class BrowserKlaroService extends KlaroService {
      */
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
-    this.translate(this.klaroConfig.translations.zz);
+    this.translate(this.klaroConfig.translations.zy);
   }
 
   /**
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index f527f7f096..6ec4855e28 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -17,7 +17,7 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
 
 /**
  * Klaro configuration
- * For more information see https://kiprotect.com/docs/klaro/annotated-config
+ * For more information see https://klaro.org/docs/integration/annotated-configuration
  */
 export const klaroConfiguration: any = {
   storageName: ANONYMOUS_STORAGE_NAME_KLARO,
@@ -47,21 +47,30 @@ export const klaroConfiguration: any = {
 
   htmlTexts: true,
 
+  /*
+  Force Klaro to use our custom "zy" lang configs defined below.
+  */
+  lang: 'zy',
+
   /*
   You can overwrite existing translations and add translations for your app
   descriptions and purposes. See `src/translations/` for a full list of
   translations that can be overwritten:
-  https://github.com/KIProtect/klaro/tree/master/src/translations
+  https://github.com/klaro-org/klaro-js/tree/master/src/translations
   */
   translations: {
     /*
-      The `zz` key contains default translations that will be used as fallback values.
-      This can e.g. be useful for defining a fallback privacy policy URL.
-      FOR DSPACE: We use 'zz' to map to our own i18n translations for klaro, see
+      For DSpace we use this custom 'zy' key to map to our own i18n translations for klaro, see
       translateConfiguration() in browser-klaro.service.ts. All the below i18n keys are specified
       in your /src/assets/i18n/*.json5 translation pack.
+      This 'zy' key has no special meaning to Klaro & is not a valid language code. It just
+      allows DSpace to override Klaro's own translations in favor of DSpace's i18n keys.
+      NOTE: we do not use 'zz' as that has special meaning to Klaro and is ONLY used as a "fallback"
+      if no other translations can be found within Klaro. Currently, a bug in Klaro means that
+      'zz' is never used as there's no way to exclude translations:
+      https://github.com/klaro-org/klaro-js/issues/515
     */
-    zz: {
+    zy: {
       acceptAll: 'cookies.consent.accept-all',
       acceptSelected: 'cookies.consent.accept-selected',
       close: 'cookies.consent.close',

From 64628f7e0d92d8bbee3078719eabeea4aa4275a9 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 13 Sep 2024 16:34:16 -0300
Subject: [PATCH 0831/1286] DSpace#2668 - Adding and changing classes in global
 scss to make cookie settings more accessible

---
 src/styles/_custom_variables.scss |  1 +
 src/styles/_global-styles.scss    | 34 +++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 7171aea689..aa67acac1c 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -137,4 +137,5 @@
 
   --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
   --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
+  --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b3120c08cd..99cc075dbe 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -43,17 +43,39 @@ body {
     .cm-btn.cm-btn-success {
       color: var(--button-text-color-cookie);
       background-color: var(--green1);
-    }
-    .cm-btn.cm-btn-success.cm-btn-accept-all {
-      color: var(--button-text-color-cookie);
-      background-color: var(--green1);
+      font-weight: 600;
     }
   }
 }
 
-.klaro .cookie-modal a, .klaro .context-notice a, .klaro .cookie-notice a
-{
+.klaro .cookie-modal .cm-btn.cm-btn-success.cm-btn-accept-all {
+  color: var(--button-text-color-cookie);
+  background-color: var(--green1);
+  font-weight: 600;
+}
+
+.klaro .cookie-modal a,
+.klaro .context-notice a,
+.klaro .cookie-notice a {
   color: var(--green1);
+  text-decoration: underline !important;
+}
+
+.klaro .cookie-modal .cm-modal .cm-body span,
+.klaro
+  .cookie-modal
+  .cm-modal
+  .cm-body
+  ul.cm-purposes
+  li.cm-purpose
+  span.cm-required,
+p.purposes,
+.klaro .cookie-modal .cm-modal .cm-footer .cm-powered-by a {
+  color: var(--bs-light) !important;
+}
+
+.klaro .cookie-modal .cm-btn.cm-btn-info {
+  background-color: var(--very-dark-cyan) !important;
 }
 
 .media-viewer

From a81799fd07c1e11d137cf8da6446cd06cac441f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:29:10 +0000
Subject: [PATCH 0832/1286] Bump sass from 1.80.4 to 1.80.6 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.4 to 1.80.6
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.4...1.80.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index c5c1ce1714..5452347e23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.80.4",
+        "sass": "~1.80.6",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -5976,6 +5976,7 @@
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
       "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -6248,7 +6249,8 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
@@ -10770,6 +10772,7 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
+      "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -20479,12 +20482,11 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.80.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.4.tgz",
-      "integrity": "sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==",
+      "version": "1.80.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
+      "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
       "dev": true,
       "dependencies": {
-        "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
@@ -20494,6 +20496,9 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
diff --git a/package.json b/package.json
index f1cae71d22..f48331a2f6 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,7 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.4",
+    "sass": "~1.80.6",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From cdeb0473daa19dae455b35738f648b7119408fd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:30:30 +0000
Subject: [PATCH 0833/1286] Bump sass from 1.80.4 to 1.80.6 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.4 to 1.80.6
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.4...1.80.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index af64e000e3..0869841d5d 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.4",
+    "sass": "~1.80.6",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index d3695ed47f..5c8f24ec62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9753,15 +9753,16 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.4:
-  version "1.80.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.4.tgz#bc0418fd796cad2f1a1309d8b4d7fe44b7027de0"
-  integrity sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==
+sass@^1.25.0, sass@~1.80.6:
+  version "1.80.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.6.tgz#5d0aa55763984effe41e40019c9571ab73e6851f"
+  integrity sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==
   dependencies:
-    "@parcel/watcher" "^2.4.1"
     chokidar "^4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
+  optionalDependencies:
+    "@parcel/watcher" "^2.4.1"
 
 sax@^1.2.4:
   version "1.4.1"

From bc7c086ca6b92761e5c0b76b7b13411a764d762d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:33:00 +0000
Subject: [PATCH 0834/1286] Bump core-js from 3.38.1 to 3.39.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.38.1 to 3.39.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.39.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index c74614b775..b35d126f34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "colors": "^1.4.0",
         "compression": "^1.7.5",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.38.1",
+        "core-js": "^3.39.0",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
@@ -9933,9 +9933,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
+      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
diff --git a/package.json b/package.json
index b8be6badb7..0deba830e5 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.38.1",
+    "core-js": "^3.39.0",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",

From 59ab2aa35619c45cfac409a534e36476ab525b21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:34:18 +0000
Subject: [PATCH 0835/1286] Bump core-js from 3.38.1 to 3.39.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.38.1 to 3.39.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.39.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 6f797af901..5b68e2e3c7 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.30.1",
+    "core-js": "^3.39.0",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index 0c14aee369..1b9e35a465 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4417,10 +4417,10 @@ core-js-compat@^3.31.0, core-js-compat@^3.34.0:
   dependencies:
     browserslist "^4.23.3"
 
-core-js@^3.30.1:
-  version "3.38.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e"
-  integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
+core-js@^3.39.0:
+  version "3.39.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83"
+  integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==
 
 core-util-is@1.0.2:
   version "1.0.2"

From bc50efec5e4387bfbae6f1405717d9d2c5bed0eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 20:35:42 +0000
Subject: [PATCH 0836/1286] Bump core-js from 3.38.1 to 3.39.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.38.1 to 3.39.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.39.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 b3dbb92115..c4fad1e06a 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.38.1",
+    "core-js": "^3.39.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index e6c67e0e80..eedca951f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4272,10 +4272,10 @@ core-js-compat@^3.25.1:
   dependencies:
     browserslist "^4.21.5"
 
-core-js@^3.38.1:
-  version "3.38.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e"
-  integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
+core-js@^3.39.0:
+  version "3.39.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83"
+  integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==
 
 core-util-is@1.0.2:
   version "1.0.2"

From fb55a04f704242d8e4d03ab6a9b59ea1f06e6690 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 02:18:07 +0000
Subject: [PATCH 0837/1286] Bump orejime from 2.3.0 to 2.3.1

Bumps [orejime](https://github.com/empreinte-digitale/orejime) from 2.3.0 to 2.3.1.
- [Changelog](https://github.com/empreinte-digitale/orejime/blob/master/CHANGELOG.md)
- [Commits](https://github.com/empreinte-digitale/orejime/commits)

---
updated-dependencies:
- dependency-name: orejime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 9bd081ddf8..86b18afaaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,7 +69,7 @@
         "ngx-pagination": "6.0.3",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
-        "orejime": "^2.3.0",
+        "orejime": "^2.3.1",
         "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
@@ -17706,9 +17706,9 @@
       }
     },
     "node_modules/orejime": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.0.tgz",
-      "integrity": "sha512-eDUgd5yEF5pCIUHPNXVDKmgH+4k4GEwxU7eexBFeVESba3ZYDHSDq4ULXiF2LnZwxg+H6Qi28o8rGfGxNeOriA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.1.tgz",
+      "integrity": "sha512-LpJCuOG7mvR5fwD3wr+FoHPG+DX2t7+dJ4gBZnWICnNHtOTNuBzne0T+JcK0nW30JjiYULq1vfOaSLU2qmHCPg==",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
         "react-modal": "^3.13.1"
diff --git a/package.json b/package.json
index dec54f98ba..daf7a91355 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "ngx-pagination": "6.0.3",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
-    "orejime": "^2.3.0",
+    "orejime": "^2.3.1",
     "pem": "1.14.8",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",

From 19da7bf4535a9aaa17822c224444dc1db35aeda7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 02:18:52 +0000
Subject: [PATCH 0838/1286] Bump express-static-gzip from 2.1.8 to 2.2.0

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.8 to 2.2.0.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.8...v2.2.0)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 9bd081ddf8..9dbb3e9587 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -124,7 +124,7 @@
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.2.0",
-        "express-static-gzip": "^2.1.8",
+        "express-static-gzip": "^2.2.0",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
@@ -12525,11 +12525,12 @@
       "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
     },
     "node_modules/express-static-gzip": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
-      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz",
+      "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==",
       "dev": true,
       "dependencies": {
+        "parseurl": "^1.3.3",
         "serve-static": "^1.16.2"
       }
     },
diff --git a/package.json b/package.json
index dec54f98ba..0ba11d8662 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "express-static-gzip": "^2.1.8",
+    "express-static-gzip": "^2.2.0",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",

From d50af8afb66a74fa0b6156957fc21ac1e41d76e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 02:34:27 +0000
Subject: [PATCH 0839/1286] Bump express-static-gzip from 2.1.8 to 2.2.0

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.8 to 2.2.0.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.8...v2.2.0)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index df31c20204..488fd1a729 100644
--- a/package.json
+++ b/package.json
@@ -172,7 +172,7 @@
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "express-static-gzip": "^2.1.8",
+    "express-static-gzip": "^2.2.0",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
diff --git a/yarn.lock b/yarn.lock
index fc71ba3378..bcc5050599 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5601,11 +5601,12 @@ express-rate-limit@^5.1.3:
   resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.8.tgz#f37f0fe9e8113e56cfac63a98c0197ee6bd6458f"
-  integrity sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==
+express-static-gzip@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.2.0.tgz#7c3f7dd89da68e51c591edf02e6de6169c017f5f"
+  integrity sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==
   dependencies:
+    parseurl "^1.3.3"
     serve-static "^1.16.2"
 
 express@^4.17.3, express@^4.21.1:
@@ -8510,7 +8511,7 @@ parse5@^7.0.0, parse5@^7.1.2:
   dependencies:
     entities "^4.4.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==

From 06783364c41f66dc237f606ad294ef67fc87c89f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 03:15:03 +0000
Subject: [PATCH 0840/1286] Bump express-static-gzip from 2.1.8 to 2.2.0

Bumps [express-static-gzip](https://github.com/tkoenig89/express-static-gzip) from 2.1.8 to 2.2.0.
- [Release notes](https://github.com/tkoenig89/express-static-gzip/releases)
- [Commits](https://github.com/tkoenig89/express-static-gzip/compare/v2.1.8...v2.2.0)

---
updated-dependencies:
- dependency-name: express-static-gzip
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index f8f725fafc..7381cdfa97 100644
--- a/package.json
+++ b/package.json
@@ -165,7 +165,7 @@
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "express-static-gzip": "^2.1.8",
+    "express-static-gzip": "^2.2.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
     "karma": "^6.4.4",
diff --git a/yarn.lock b/yarn.lock
index 0106427952..aa4fb3ed3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5609,11 +5609,12 @@ express-rate-limit@^5.1.3:
   resolved "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.8.tgz#f37f0fe9e8113e56cfac63a98c0197ee6bd6458f"
-  integrity sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==
+express-static-gzip@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.2.0.tgz#7c3f7dd89da68e51c591edf02e6de6169c017f5f"
+  integrity sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==
   dependencies:
+    parseurl "^1.3.3"
     serve-static "^1.16.2"
 
 express@^4.17.3, express@^4.18.2, express@^4.21.1:
@@ -8988,7 +8989,7 @@ parse5@^7.0.0, parse5@^7.1.1, parse5@^7.1.2:
   dependencies:
     entities "^4.4.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==

From 6b32d04aecc57586318b919fa5fadaeb032772a8 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:32:57 +0200
Subject: [PATCH 0841/1286] Updated some messages following the lindat v5 and
 clarin-dspace v7 instance.

(cherry picked from commit b10563ea5388e8c398ec8927dc562d6f841473db)
---
 src/assets/i18n/cs.json5 | 101 +++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0b4168cca9..3824e9741a 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1477,8 +1477,8 @@
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
 
-  // "bitstream.download.page.back": "Back",
-  "bitstream.download.page.back": "Zpět" ,
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Upravit politiky souboru",
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-  // "collection.create.breadcrumbs": "Create collection",
+    // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 
@@ -2210,8 +2210,7 @@
   "collection.source.controls.harvest.last": "Naposledy harvestováno:",
 
   // "collection.source.controls.harvest.message": "Harvest info:",
-  "collection.source.controls.harvest.message": "Informace o harevstu:",
-
+  "collection.source.controls.harvest.message": "Informace o harvestu:",
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
@@ -2703,7 +2702,7 @@
   "dso-selector.create.community.head": "Nová komunita",
 
   // "dso-selector.create.community.or-divider": "or",
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "nebo",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Vytvořit novou komunitu v",
@@ -2940,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "eslání. Pokud tuto licenci v tuto chvíli nemůžete udělit, můžete svou práci uložit a vrátit se k ní později nebo podání odstranit.",
+  "error.validation.license.notgranted": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -3252,7 +3251,7 @@
   "grant-deny-request-copy.intro2": "Po výběru možnosti se zobrazí návrh e-mailové odpovědi, který můžete upravit.",
 
   // "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": " Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
+  "grant-deny-request-copy.processed": "Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
 
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Žádost o kopii dokumentu",
@@ -3432,8 +3431,7 @@
   "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
 
   // "item.alerts.private": "This item is non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.alerts.private": "Tento záznam je nezobrazitelný",
+  "item.alerts.private": "Tento záznam je nevyhledatelný",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Tento záznam byl stažen",
@@ -4168,7 +4166,7 @@
   "item.page.journal-title": "Název časopisu",
 
   // "item.page.publisher": "Publisher",
-  "item.page.publisher": "Vydavatel",
+  "item.page.publisher": "Nakladatel",
 
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Záznam: ",
@@ -4268,7 +4266,7 @@
   "item.page.abstract": "Abstrakt",
 
   // "item.page.author": "Authors",
-  "item.page.author": "Autor",
+  "item.page.author": "Autoři",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Citace",
@@ -4310,10 +4308,10 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Úplný záznam",
+  "item.page.link.full": "Zobrazit celý záznam",
 
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Jednoduchý záznam",
+  "item.page.link.simple": "Zobrazit minimální záznam",
 
   // "item.page.orcid.title": "ORCID",
   "item.page.orcid.title": "ORCID",
@@ -4346,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "URI",
+  "item.page.uri": "Identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4461,10 +4459,10 @@
   "item.preview.oaire.awardNumber": "Identifikátor zdroje financování:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  "item.preview.dc.title.alternative": "Akronym:",
+  "item.preview.dc.title.alternative": "Zkratka:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-  "item.preview.dc.coverage.spatial": "Jurisdikce:",
+  "item.preview.dc.coverage.spatial": "Příslušnost:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Tok finančních prostředků:",
@@ -4841,7 +4839,7 @@
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  "journal.page.publisher": "Vydavatel",
+  "journal.page.publisher": "Nakladatel",
 
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Časopis: ",
@@ -4936,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo: ",
+  "iiif.page.issue": "Problém:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5042,8 +5040,7 @@
   "menu.header.nav.description": "Admin navigation bar",
 
   // "menu.header.admin": "Management",
-  // TODO Source message changed - Revise the translation
-  "menu.header.admin": "Management",
+  "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo úložiště",
@@ -5378,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Váš příspěvek",
+  "mydspace.results.head": "Vaše zázmany",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5390,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádné datum",
+  "mydspace.results.no-date": "Žádny datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -5412,9 +5409,9 @@
   // TODO Source message changed - Revise the translation
   "mydspace.show.workflow": "Úlohy workflow",
 
-  // "mydspace.show.workspace": "Your submissions",
+  // "mydspace.show.workspace": "Your Submissions",
   // TODO Source message changed - Revise the translation
-  "mydspace.show.workspace": "Váš příspěvek",
+  "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
@@ -5488,7 +5485,7 @@
   "nav.user-profile-menu-and-logout": "Menu uživatelského profilu a odhlášení",
 
   // "nav.logout": "Log Out",
-  "nav.logout": "Menu uživatelského profilu a odhlášení",
+  "nav.logout": "Odhlásit se",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Hlavní navigační panel",
@@ -6289,7 +6286,7 @@
   "publication.page.journal-title": "Název časopisu",
 
   // "publication.page.publisher": "Publisher",
-  "publication.page.publisher": "Vydavatel",
+  "publication.page.publisher": "Nakladatel",
 
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publikace: ",
@@ -6913,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Vkladatel",
+  "search.filters.applied.f.submitter": "Předkladatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7019,10 +7016,10 @@
   "search.filters.filter.creativeWorkKeywords.label": "Předmět hledání",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.head": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.head": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "Hledat vydavatele",
@@ -7058,7 +7055,7 @@
   "search.filters.filter.discoverable.head": "Nedohledatelné",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  "search.filters.filter.withdrawn.head": "Zrušeno",
+  "search.filters.filter.withdrawn.head": "Vyřazeno",
 
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Typ záznamu",
@@ -7142,7 +7139,7 @@
   "search.filters.filter.objectpeople.placeholder": "Lidé",
 
   // "search.filters.filter.objectpeople.label": "Search people",
-  "search.filters.filter.objectpeople.label": "Hledat lidi",
+  "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Stát",
@@ -7178,7 +7175,7 @@
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
 
   // "search.filters.filter.scope.label": "Search scope filter",
-  "search.filters.filter.scope.label": "Hledat filtr rozsahu",
+  "search.filters.filter.scope.label": "Filtr rozsahu hledání",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
@@ -7196,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Vkladatel",
+  "search.filters.filter.submitter.head": "Předkladatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Vkladatel",
+  "search.filters.filter.submitter.placeholder": "Předkladatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat vkladatele",
+  "search.filters.filter.submitter.label": "Hledat předkladatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -7286,8 +7283,8 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Ne",
 
-  // "search.filters.head": "Filters",
-  "search.filters.head": "Filtry",
+  // "search.filters.head": "Limit your search",
+  "search.filters.head": "Zúžit hledání",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Resetovat filtry",
@@ -7526,7 +7523,7 @@
   "submission.general.cannot_submit": "Nemáte oprávnění k vytvoření nového příspěvku.",
 
   // "submission.general.deposit": "Deposit",
-  "submission.general.deposit": "Vložit do repozitáře",
+  "submission.general.deposit": "Nahrát",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Zrušit",
@@ -7554,7 +7551,7 @@
   "submission.general.info.pending-changes": "Neuložené změny",
 
   // "submission.general.save": "Save",
-  "submission.general.save": "Průběžně uložit záznam",
+  "submission.general.save": "Uložit",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Uložit na později",
@@ -7709,10 +7706,10 @@
   "submission.import-external.preview.subtitle": "Níže uvedená metadata byla importována z externího zdroje. Budou předvyplněna při zahájení odesílání..",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Zahájit odesílání",
+  "submission.import-external.preview.button.import": "Začít nový příspěvek",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Chyba při odesílání",
+  "submission.import-external.preview.error.import.title": "Chyba při vytváření nového příspěvku",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Během procesu importu externí zdrojového záznamu došlo k chybě.",
@@ -7893,7 +7890,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Vyhledávací dotaz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Hledání",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Přejít na",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Hledání...",
@@ -8080,7 +8077,7 @@
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Financující agentura",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Projekt, ke kterému publikace náleží",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financování",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadřazená organizační jednotka",
@@ -8311,7 +8308,7 @@
   "submission.sections.submit.progressbar.describe.recycle": "Opětovně použít",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  "submission.sections.submit.progressbar.describe.stepcustom": "Popsat",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Popis",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Základní informace o dokumentu",
@@ -8627,8 +8624,8 @@
   "submission.submit.breadcrumbs": "Nově podaný záznam",
 
   // "submission.submit.title": "New submission",
-  // TODO Source message changed - Revise the translation
-  "submission.submit.title": "Nově podaný záznam",
+  "submission.submit.title": "Nový příspěvek",
+
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
@@ -8710,7 +8707,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Zadavatel",
+  "submission.workflow.tasks.generic.submitter": "Předkladatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
@@ -9074,10 +9071,10 @@
   "workflow-item.scorereviewaction.notification.error.content": "Nebylo možné zkontrolovat tento záznam",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  "workflow-item.scorereviewaction.title": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.title": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  "workflow-item.scorereviewaction.header": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.header": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
   "workflow-item.scorereviewaction.button.cancel": "Zrušit",
@@ -11034,6 +11031,4 @@
   // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
   // TODO New key - Add a translation
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
-
-
-}
\ No newline at end of file
+}

From e5ea435cbe58186e6dc42d56753147ade7ce3d5a Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:49:37 +0200
Subject: [PATCH 0842/1286] Fixed linting error.

(cherry picked from commit 7e864d27b45c58ef566d31c5d0e2a478a540ecdd)
---
 src/assets/i18n/cs.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 3824e9741a..a957232a89 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-    // "collection.create.breadcrumbs": "Create collection",
+  // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 

From 865268e820fafcfe047a752d9effb9fcfd99c160 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 15:08:31 +0200
Subject: [PATCH 0843/1286] Updated cs messages following review requirements

(cherry picked from commit 813d644b32a28685f8a4205bc383268b2502afdb)
---
 src/assets/i18n/cs.json5 | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index a957232a89..5e52f751ec 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1475,9 +1475,9 @@
   "auth.messages.token-refresh-failed": "Nepodařilo se obnovit váš přístupový token. Prosím přihlašte se znovu.",
 
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
-  "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
+  "bitstream.download.page": "Nyní se stahuje {{bitstream}}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4308,7 +4308,7 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Zobrazit celý záznam",
+  "item.page.link.full": "Zobrazit úplný záznam",
 
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Zobrazit minimální záznam",
@@ -4344,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "Identifikátor",
+  "item.page.uri": "Permanentní identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Problém:",
+  "iiif.page.issue": "Číslo:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5375,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Vaše zázmany",
+  "mydspace.results.head": "Vaše záznamy",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5387,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádny datum",
+  "mydspace.results.no-date": "Žádné datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -6910,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Předkladatel",
+  "search.filters.applied.f.submitter": "Odesílatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7193,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Předkladatel",
+  "search.filters.filter.submitter.head": "Odesílatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Předkladatel",
+  "search.filters.filter.submitter.placeholder": "Odesílatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat předkladatele",
+  "search.filters.filter.submitter.label": "Hledat odesílatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -8626,7 +8626,6 @@
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nový příspěvek",
 
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
 
@@ -8692,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu předložit.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8707,7 +8706,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Předkladatel",
+  "submission.workflow.tasks.generic.submitter": "Odesílatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",

From 33bc8ba1a3fe5934c10f648c2a756e65a6c59e27 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:09:51 +0200
Subject: [PATCH 0844/1286] Fixed messages following the PR from the UFAL -
 https://github.com/dataquest-dev/dspace-angular/pull/669/commits/f18d45ce23ea9c42778885f59e5f7d25e548b2e9

(cherry picked from commit 5e5c627b8b4dbafc5454d91e24797f3ef6ef76aa)
---
 src/assets/i18n/cs.json5 | 220 +++++++++++++++++++--------------------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 5e52f751ec..2cb95f10d3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -13,7 +13,7 @@
   "403.help": "Nemáte povolení k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "403.link.home-page": "Take me to the home page",
-  "403.link.home-page": "Přesměrujte mě na domovskou stránku",
+  "403.link.home-page": "Návrat na domovskou stránku",
 
   // "403.forbidden": "Forbidden",
   "403.forbidden": "Přístup zakázán",
@@ -46,7 +46,7 @@
   "error-page.description.500": "Služba je nedostupná",
 
   // "error-page.description.404": "Page not found",
-  "error-page.description.404": "Stránka nebyla nenalezena",
+  "error-page.description.404": "Stránka nebyla nalezena",
 
   // "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": "Při přihlašování přes ORCID došlo k chybě. Ujistěte se, že jste sdíleli e-mailovou adresu připojenou ke svému účtu ORCID s DSpace. Pokud chyba přetrvává, kontaktujte správce",
@@ -67,13 +67,13 @@
   "access-status.unknown.listelement.badge": "Status neznámý",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  "admin.curation-tasks.breadcrumbs": "Kurátorská úloha systému",
+  "admin.curation-tasks.breadcrumbs": "Systémové úlohy správy",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Kurátorská úloha systému",
+  "admin.curation-tasks.title": "Systémové úlohy správy",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Kurátorská úloha systému",
+  "admin.curation-tasks.header": "Systémové úlohy správy",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Registr formátů",
@@ -172,7 +172,7 @@
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Úroveň podpory",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registr formátu souboru",
+  "admin.registries.bitstream-formats.head": "Registr formátů souboru",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Žádné formáty souboru k zobrazení.",
@@ -373,7 +373,7 @@
   "admin.access-control.bulk-access.breadcrumbs": "Hromadná správa přístupu",
 
   // "administrativeBulkAccess.search.results.head": "Search Results",
-  "administrativeBulkAccess.search.results.head": "Prohledávat výsledky",
+  "administrativeBulkAccess.search.results.head": "Výsledky vyhledávání",
 
   // "admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "Hromadná správa přístupu",
@@ -403,7 +403,7 @@
   "admin.access-control.epeople.actions.reset": "Resetovat heslo",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "admin.access-control.epeople.actions.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Uživatelé",
@@ -612,7 +612,7 @@
   "admin.access-control.groups.table.edit.buttons.remove": "Odstranit \"{{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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto jako UUID,",
+  "admin.access-control.groups.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo UUID",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "Úspěšně odstraněna skupina \"{{name}}\"",
@@ -696,7 +696,7 @@
   "admin.access-control.groups.form.members-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  "admin.access-control.groups.form.members-list.headMembers": "Aktuální členové",
+  "admin.access-control.groups.form.members-list.headMembers": "Současní členové",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Hledat",
@@ -738,13 +738,13 @@
   "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Přidat člena jménem \"{{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": "Žádná aktuální aktivní skupina, nejprve zadejte jméno.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "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": "Ve skupině zatím nejsou žádní členové, vyhledejte je a přidejte.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyly nalezeni žádní uživatelé",
+  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Neúspěch: Něco se pokazilo: \"{{cause}}\"",
@@ -801,7 +801,7 @@
   "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Toto je aktuální skupina, nelze přidat.",
 
   // "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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo 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": "Ve skupině zatím nejsou žádné podskupiny.",
@@ -831,7 +831,7 @@
   "admin.notifications.source.breadcrumbs": "Quality Assurance",
 
   // "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.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
   // "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.",
   "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pro přidání nebo odebrání uživatele z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno pro vyhledání uživatele (použijte roletku na levé straně vyhledávacího okna a vyberte, zda chcete prohledávat pomocí metadat nebo e-mailu). Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
@@ -1406,7 +1406,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Prohledávat vše",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktuální členové",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Současní členové",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hledat",
@@ -1448,7 +1448,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Přidat uživatele jménem \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktivní skupina, nejdříve vložte název.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Žádní členové ve skupině, nejdříve vyhledejte a přidejte.",
@@ -1792,7 +1792,7 @@
   "claimed-approved-search-result-list-element.title": "Schváleno",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět vkladateli",
+  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět odesílateli",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
@@ -1815,7 +1815,7 @@
   "collection.create.sub-head": "Vytvořit kolekci pro komunitu {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  "collection.curate.header": "Kurátorovat kolekci: {{collection}}",
+  "collection.curate.header": "Spravovat kolekci: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Zrušit",
@@ -1923,7 +1923,7 @@
   "collection.edit.logo.notifications.add.success": "Nahrání loga kolekce proběhlo úspěšně.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "collection.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo kolekce",
@@ -1948,10 +1948,10 @@
   "collection.edit.tabs.access-control.title": "Úprava kolekce - Řízení přístupu",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  "collection.edit.tabs.curate.head": "Kurátorovat",
+  "collection.edit.tabs.curate.head": "Spravovat",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Upravit kolekci - kurátorovat",
+  "collection.edit.tabs.curate.title": "Upravit kolekci - správa",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Oprávnění",
@@ -2014,7 +2014,7 @@
   "collection.edit.tabs.source.head": "Zdroj obsahu",
 
   // "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": "Vaše změny byly vyřazeny. Chcete-li své změny obnovit, klikněte na tlačítko Zpět",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
@@ -2024,7 +2024,7 @@
   "collection.edit.tabs.source.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata neplatná",
+  "collection.edit.tabs.source.notifications.invalid.title": "Neplatná metadata",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "Vaše změny ve zdroji obsahu této kolekce byly uloženy.",
@@ -2215,7 +2215,7 @@
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  "collection.source.update.notifications.error.content": "Zadané nastavení bylo testováno a nefungovalo.",
+  "collection.source.update.notifications.error.content": "Zadané nastavení bylo otestováno a nefungovalo.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Chyba serveru",
@@ -2262,7 +2262,7 @@
   "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Kurátorství komunity: {{ community }}",
+  "community.curate.header": "Spravovat komunitu: {{ community }}",
 
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Zrušit",
@@ -2295,7 +2295,7 @@
   "community.edit.breadcrumbs": "Upravit komunitu",
 
   // "community.edit.logo.delete.title": "Delete logo",
-  "community.edit.logo.delete.title": "Odstranit logo",
+  "community.edit.logo.delete.title": "Smazat logo",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Zrušit odstranění",
@@ -2310,7 +2310,7 @@
   "community.edit.logo.notifications.add.success": "Nahrání loga komunity proběhlo úspěšně.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "community.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo komunity",
@@ -2335,10 +2335,10 @@
   "community.edit.return": "Zpět",
 
   // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Kurátorovat",
+  "community.edit.tabs.curate.head": "Spravovat",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Upravit komunitu - kurátorovat",
+  "community.edit.tabs.curate.title": "Upravit komunitu - správa",
 
   // "community.edit.tabs.access-control.head": "Access Control",
   "community.edit.tabs.access-control.head": "Řízení přístupu",
@@ -2396,13 +2396,13 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  "comcol-role.edit.submitters.name": "Vkladatelé",
+  "comcol-role.edit.submitters.name": "Odesílatelé",
 
   // "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": "Uživatelé a skupiny, které mají oprávnění ke vkládání nových záznamů do této kolekce.",
@@ -2460,7 +2460,7 @@
   "community.form.errors.title.required": "Zadejte název komunity",
 
   // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Text autorských práv (HTML)",
+  "community.form.rights": "Copyright (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Novinky (HTML)",
@@ -2640,16 +2640,16 @@
   "curation.form.submit": "Start",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  "curation.form.submit.success.head": "Kurátorská úloha byla úspěšně spuštěna",
+  "curation.form.submit.success.head": "Úloha správy byla úspěšně spuštěna",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Budete přesměrováni na příslušnou stránku procesu.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  "curation.form.submit.error.head": "Spuštění kurátorské úlohy se nezdařilo.",
+  "curation.form.submit.error.head": "Spuštění úlohy správy se nezdařilo.",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  "curation.form.submit.error.content": "Při pokusu o spuštění kurátorské úlohy došlo k chybě.",
+  "curation.form.submit.error.content": "Při pokusu o spuštění úlohy správy došlo k chybě.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
   "curation.form.submit.error.invalid-handle": "Nepodařilo se určit handle pro tento objekt",
@@ -3044,7 +3044,7 @@
   "forgot-email.form.success.head": "E-mail pro obnovení hesla odeslán",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální adresu URL a další pokyny.",
+  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální URL a další instrukce.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
   // TODO Source message changed - Revise the translation
@@ -3242,7 +3242,7 @@
   "grant-deny-request-copy.header": "Žádost o kopii dokumentu",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
-  "grant-deny-request-copy.home-page": "Přesměrujte mne na domovskou stránku",
+  "grant-deny-request-copy.home-page": "Návrat na domovskou stránku",
 
   // "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": "Pokud jste jedním z autorů dokumentu <a href='{{ url }}'>{{ name }}</a>, použijte prosím jednu z níže uvedených možností, abyste odpověděli na žádost uživatele.",
@@ -3278,13 +3278,13 @@
   "health-page.info-tab": "Informace",
 
   // "health-page.status-tab": "Status",
-  "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stav",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "Služba kontrolující stav systému je momentálně nedostupná.",
 
   // "health-page.property.status": "Status code",
-  "health-page.property.status": "Kód statusu",
+  "health-page.property.status": "Stavový kód",
 
   // "health-page.section.db.title": "Database",
   "health-page.section.db.title": "Databáze",
@@ -3455,7 +3455,7 @@
   "item.badge.private": "Nedohledatelné",
 
   // "item.badge.withdrawn": "Withdrawn",
-  "item.badge.withdrawn": "Zrušeno",
+  "item.badge.withdrawn": "Vyřazeno",
 
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Svazek",
@@ -3543,10 +3543,10 @@
   "item.edit.bitstreams.headers.name": "Název",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Undo'",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  "item.edit.bitstreams.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.bitstreams.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Chyba při přesunu souborů",
@@ -3558,7 +3558,7 @@
   "item.edit.bitstreams.notifications.move.saved.title": "Změny uloženy",
 
   // "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": "Záznam, na které právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.bitstreams.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Změny jsou zastaralé",
@@ -3651,13 +3651,13 @@
   "item.edit.identifiers.doi.status.MINTED": "Vydáno (nezaregistrováno)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  "item.edit.tabs.status.buttons.register-doi.label": "Registrace nového nebo čekání na nové DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
   "item.edit.tabs.status.buttons.register-doi.button": "Zaregistrujte DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  "item.edit.register-doi.header": "Zaregistrujte nové DOI nebo čekající k registraci",
+  "item.edit.register-doi.header": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
   "item.edit.register-doi.description": "Níže zkontrolujte všechny identifikátory a metadata ve frontě. Zvolte \"Potvrdit\" pro pokračování v registraci DOI nebo \"Zrušit\" pro přerušení procesu.",
@@ -3687,7 +3687,7 @@
   "item.edit.item-mapper.cancel": "Zrušit",
 
   // "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": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tuto záznam na jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
+  "item.edit.item-mapper.description": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tento záznam do jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Mapování do jiných kolekcí - mapovat záznam do kolekcí",
@@ -3768,7 +3768,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
 
   // "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.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z příbuzné entity. Nemůže být zděděna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
+  "item.edit.metadata.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z provázané entity. Nemůže být změněna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Záznam aktuálně neobsahuje žádná metadata. Kliknutím na tlačítko Přidat začněte přidávat hodnotu metadat.",
@@ -3796,11 +3796,11 @@
   "item.edit.metadata.metadatafield.invalid": "Prosím, vyberte platné metadatové pole",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
-  "item.edit.metadata.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.metadata.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Došlo k chybě",
@@ -3809,17 +3809,17 @@
   "item.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  "item.edit.metadata.notifications.invalid.title": "Metadata neplatná",
+  "item.edit.metadata.notifications.invalid.title": "Neplatná metadata",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.metadata.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat této záznamu byly uloženy.",
+  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat tohoto záznamu byly uloženy.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadata uložena",
@@ -3976,16 +3976,16 @@
   "item.edit.relationships.no-relationships": "Žádné vztahy",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  "item.edit.relationships.notifications.discarded.title": "Změny vyřazeny",
+  "item.edit.relationships.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "Chyba při úpravě vztahů",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou vyřazeny, aby se zabránilo konfliktům",
+  "item.edit.relationships.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Změny jsou zastaralé",
@@ -4009,25 +4009,25 @@
   "item.edit.return": "Zpět",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  "item.edit.tabs.bitstreams.head": "Soubor",
+  "item.edit.tabs.bitstreams.head": "Soubory",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Úprava záznamu - soubor",
 
   // "item.edit.tabs.curate.head": "Curate",
-  "item.edit.tabs.curate.head": "Kurátorovat",
+  "item.edit.tabs.curate.head": "Spravovat",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  "item.edit.tabs.curate.title": "Úprava záznamu - Kurátorovat",
+  "item.edit.tabs.curate.title": "Úprava záznamu - spravovat",
 
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  "item.edit.curate.title": "Kurátorovat záznam: {{item}}",
+  "item.edit.curate.title": "Spravovat záznam: {{item}}",
 
   // "item.edit.tabs.access-control.head": "Access Control",
-  "item.edit.tabs.access-control.head": "Kontrola přístupu",
+  "item.edit.tabs.access-control.head": "Řízení přístupu",
 
   // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
-  "item.edit.tabs.access-control.title": "Úprava záznamu - Kontrola přístupu",
+  "item.edit.tabs.access-control.title": "Úprava záznamu - Řízení přístupu",
 
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadata",
@@ -4275,7 +4275,7 @@
   "item.page.collections": "Kolekce",
 
   // "item.page.collections.loading": "Loading...",
-  "item.page.collections.loading": "Načítání...",
+  "item.page.collections.loading": "Načítá se...",
 
   // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "Načíst další",
@@ -4377,7 +4377,7 @@
   "item.page.reinstate": "Request reinstatement",
 
   // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
-  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí právě probíhá zadání nové verze.",
+  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
   "item.page.claim.button": "Prohlásit",
@@ -4585,7 +4585,7 @@
   "item.version.history.table.action.deleteVersion": "Smazat verzi",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.history.table.action.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "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": "Toto není nejnovější verze tohoto záznamu. Nejnovější verzi naleznete <a href='{{destination}}'>zde</a>.",
@@ -4698,7 +4698,7 @@
   "item.version.create.notification.failure": "Nová verze nebyla vytvořena",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.create.notification.inProgress": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Smazat verzi",
@@ -4788,7 +4788,7 @@
   "itemtemplate.edit.metadata.metadatafield.invalid": "Prosím zvolte platné metadatové pole",
 
   // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Chcete-li obnovit své změny, klikněte na tlačítko 'Zpět'.",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
   "itemtemplate.edit.metadata.notifications.discarded.title": "Změny byly zahozeny",
@@ -4797,7 +4797,7 @@
   "itemtemplate.edit.metadata.notifications.error.title": "Vyskytla se chyba",
 
   // "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.content": "Vaše změny nebyly uloženy. Před uložením se ujistěte, že všechna pole jsou platná.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "itemtemplate.edit.metadata.notifications.invalid.title": "Neplatná metadata",
@@ -4812,7 +4812,7 @@
   "itemtemplate.edit.metadata.notifications.saved.content": "Vaše změny v šabloně metadat tohoto záznamu byly uloženy.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uloženy",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uložena",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
   "itemtemplate.edit.metadata.reinstate-button": "Vrátit zpět",
@@ -5043,7 +5043,7 @@
   "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
-  "menu.header.image.logo": "Logo úložiště",
+  "menu.header.image.logo": "Logo repozitáře",
 
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Management menu",
@@ -5119,7 +5119,7 @@
   "menu.section.control_panel": "Ovládací panel",
 
   // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Kurátorská úloha",
+  "menu.section.curation_task": "Úloha správy",
 
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Upravit",
@@ -5165,25 +5165,25 @@
   "menu.section.icon.control_panel": "Sekce menu Ovládací panel",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-  "menu.section.icon.curation_tasks": "Sekce menu Kurátorská úloha",
+  "menu.section.icon.curation_tasks": "Sekce menu úloha správy",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Sekce menu Upravit",
 
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Exportovat sekci menu",
+  "menu.section.icon.export": "Sekce menu Exportovat",
 
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Najít sekci menu",
+  "menu.section.icon.find": "Sekce menu Najít",
 
   // "menu.section.icon.health": "Health check menu section",
-  "menu.section.icon.health": "Kontrola stavu sekce menu",
+  "menu.section.icon.health": "Sekce menu Kontrola stavu",
 
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Importovat sekci menu",
+  "menu.section.icon.import": "Sekce menu Importovat",
 
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Nová sekce menu",
+  "menu.section.icon.new": "Sekce menu Nový",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Připnout postranní panel",
@@ -5260,7 +5260,7 @@
   "menu.section.health": "Stav systému",
 
   // "menu.section.registries": "Registries",
-  "menu.section.registries": "Rejstřík",
+  "menu.section.registries": "Registry",
 
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formát",
@@ -5285,7 +5285,7 @@
   "menu.section.toggle.control_panel": "Přepnout sekci ovládacího panelu",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Přepnout sekci Kurátorská úloha",
+  "menu.section.toggle.curation_task": "Přepnout sekci úloha správy",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Přepnout sekci Úpravy",
@@ -5303,7 +5303,7 @@
   "menu.section.toggle.new": "Přepnout sekci Nová",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Přepnout sekci Rejstříky",
+  "menu.section.toggle.registries": "Přepnout sekci Registry",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Přepnout sekci Statistická úloha",
@@ -5327,7 +5327,7 @@
   "mydspace.description": "",
 
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu vkladateli záznamu.",
+  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu odesílateli záznamu.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Zde vložte svou zprávu...",
@@ -5506,7 +5506,7 @@
   "nav.statistics.header": "Statistika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "nav.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "Nastavení notifikací",
@@ -5810,7 +5810,7 @@
   "orgunit.page.city": "Město",
 
   // "orgunit.page.country": "Country",
-  "orgunit.page.country": "Stát",
+  "orgunit.page.country": "Země",
 
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Datum založení.",
@@ -5892,7 +5892,7 @@
   "person-relationships.search.results.head": "Výsledky vyhledávání osob",
 
   // "person.search.title": "Person Search",
-  "person.search.title": "Vyledatávání osob",
+  "person.search.title": "Vyhledávání osob",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametry",
@@ -6121,7 +6121,7 @@
   "process.overview.delete.clear": "Zrušit výběr mazá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": "Smazává se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
+  "process.overview.delete.processing": "Maže se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
   "process.overview.delete.body": "Určitě chcete smazat {{count}} procesů",
@@ -6512,7 +6512,7 @@
   "register-page.registration.header": "Registrace nového uživatele",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru sbírek pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
+  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru kolekcí pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
 
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-mailová adresa *",
@@ -6880,7 +6880,7 @@
   "search.filters.applied.f.dateIssued.min": "Datum zahájení",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  "search.filters.applied.f.dateSubmitted": "Date vložení",
+  "search.filters.applied.f.dateSubmitted": "Datum vložení",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
   // TODO Source message changed - Revise the translation
@@ -6925,7 +6925,7 @@
   "search.filters.applied.f.supervisedBy": "Zkontrolováno",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  "search.filters.applied.f.withdrawn": "Zrušeno",
+  "search.filters.applied.f.withdrawn": "Vyřazeno",
 
   // "search.filters.applied.operator.equals": "",
   // TODO New key - Add a translation
@@ -7142,10 +7142,10 @@
   "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  "search.filters.filter.organizationAddressCountry.head": "Stát",
+  "search.filters.filter.organizationAddressCountry.head": "Země",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  "search.filters.filter.organizationAddressCountry.placeholder": "Stát",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Země",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
   "search.filters.filter.organizationAddressCountry.label": "Hledat stát",
@@ -7438,10 +7438,10 @@
   "sorting.dc.date.issued.DESC": "Datum vydání sestupně",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  "sorting.dc.date.accessioned.ASC": "Datum přírůstku vzestupně",
+  "sorting.dc.date.accessioned.ASC": "Datum odeslání vzestupně",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  "sorting.dc.date.accessioned.DESC": "Datum přírůstku sestupně",
+  "sorting.dc.date.accessioned.DESC": "Datum odeslání sestupně",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Naposledy upraveno vzestupně",
@@ -8284,7 +8284,7 @@
   "submission.sections.identifiers.info": "Pro tento záznam budou vytvořeny následující identifikátory:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  "submission.sections.identifiers.no_handle": "Tomuto záznamu nybyl přidělen žádný handle.",
+  "submission.sections.identifiers.no_handle": "Tomuto záznamu nebyl přidělen žádný handle.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
   "submission.sections.identifiers.no_doi": "Tomuto záznamu nebylo přiděleno žádné DOI.",
@@ -8446,10 +8446,10 @@
   "submission.sections.upload.form.until-placeholder": "Až do",
 
   // "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": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.nolist": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následujících skupin:",
 
   // "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": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.withlist": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následujících skupin:",
 
   // "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 by dragging & dropping them anywhere on the page.</strong>",
   "submission.sections.upload.info": "Zde najdete všechny soubory, které jsou aktuálně v záznamu. Můžete aktualizovat metadata souborů a podmínky přístupu nebo <strong>nahrát další soubory pouhým přetažením kdekoli na stránku</strong>.",
@@ -8618,7 +8618,7 @@
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  "submission.sections.sherpa.error.message": "Informace ze Sherpa Romeo se nepodařilo načíst.",
+  "submission.sections.sherpa.error.message": "Při načítání informací ze služby Sherpa došlo k chybě",
 
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nově podaný záznam",
@@ -8676,7 +8676,7 @@
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může vkladatel problém odstranit a podání znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může odesílatel problém odstranit a podání znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Popište důvod odmítnutí",
@@ -8691,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl odesílatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8712,7 +8712,7 @@
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Vyžádat si",
+  "submission.workflow.tasks.pool.claim": "Převzít",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Přiřaďte si tento úkol.",
@@ -8909,7 +8909,7 @@
   "uploader.or": ", nebo ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  "uploader.processing": "(nyní je bezpečné tuto stránku zavřít)",
+  "uploader.processing": "Zpracovávám nahrané soubory... (nyní je bezpečné tuto stránku zavřít)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Délka fronty",
@@ -8933,7 +8933,7 @@
   "workflowAdmin.search.results.head": "Spravovat workflow",
 
   // "workflow.search.results.head": "Workflow tasks",
-  "workflow.search.results.head": "Kroky workflow",
+  "workflow.search.results.head": "Úlohy workflow",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Úlohy Workflow a osobního pracovního prostoru",
@@ -8973,22 +8973,22 @@
   "workflow-item.delete.button.confirm": "Smazat",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  "workflow-item.send-back.notification.success.title": "Odesláno zpět vkladateli",
+  "workflow-item.send-back.notification.success.title": "Vráceno zpět odesílateli",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně odeslán zpět vkladateli",
+  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně vrácen zpět odesílateli",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Něco se pokazilo",
 
   // "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": "Záznam ve workflow se nepodařilo odeslat zpět vkladateli",
+  "workflow-item.send-back.notification.error.content": "Záznam ve workflow se nepodařilo vrátit zpět odesílateli",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.title": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.header": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Zrušit",
@@ -9004,7 +9004,7 @@
   "workspace-item.view.breadcrumbs": "Zobrazení pracovního prostoru",
 
   // "workspace-item.view.title": "Workspace View",
-  "workspace-item.view.title": "Zobrazení pracovní prostoru",
+  "workspace-item.view.title": "Zobrazení pracovního prostoru",
 
   // "workspace-item.delete.breadcrumbs": "Workspace Delete",
   "workspace-item.delete.breadcrumbs": "Vymazat obsah pracovního prostoru",
@@ -9337,7 +9337,7 @@
   "person.page.orcid.sync-queue.send.bad-request-error": "Odeslání do ORCID se nezdařilo, protože zdroj odeslaný do registru ORCID není platný",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
-  "person.page.orcid.sync-queue.send.error": "Podání do ORCID se nezdařilo",
+  "person.page.orcid.sync-queue.send.error": "Odeslání do ORCID se nezdařilo",
 
   // "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": "Odeslání do ORCID se nezdařilo, protože zdroj se již nachází v registru ORCID",
@@ -9490,7 +9490,7 @@
   "system-wide-alert-form.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  "system-wide-alert.form.cancel": "Zrušir",
+  "system-wide-alert.form.cancel": "Zrušit",
 
   // "system-wide-alert.form.save": "Save",
   "system-wide-alert.form.save": "Uložit",
@@ -9508,7 +9508,7 @@
   "system-wide-alert.form.label.message": "Obsah upozornění",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočítávací měřič",
+  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočet",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Nápověda: Nastavte odpočítávací měřič. Je-li to povoleno, lze datum nastavit i v budoucnosti a systémový upozornění bude uvádět odpočítávání do nastaveného data. Ve chvíli, kdy skončí odpočítávání, zmizí i odpočítávač z upozornění. Server NEBUDE automaticky zastaven.",
@@ -9643,7 +9643,7 @@
 
   // "vocabulary-treeview.search.form.add": "Add",
   // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Přidat",
 
   // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
   // TODO New key - Add a translation

From d586a8450d5d0207035d4703b7545d8caf1b5dfa Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:14:04 +0200
Subject: [PATCH 0845/1286] Updated cs localization for subcommunities and
 subcollections

(cherry picked from commit 9badd4a4b6261a2abf5ed838f16bb000b1a127f0)
---
 src/assets/i18n/cs.json5 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 2cb95f10d3..09dd023e8d 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2259,7 +2259,7 @@
   "community.create.notifications.success": "Úspěšně vytvořena komunita",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
+  "community.create.sub-head": "Vytvořit podkomunitu v komunitě {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Spravovat komunitu: {{ community }}",
@@ -2396,7 +2396,7 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
@@ -2421,7 +2421,7 @@
 
   // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
   // TODO Source message changed - Revise the translation
-  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Výchozí čtení pro příchozí soubory je v současné době nastaveno na hodnotu Anonymní.",
@@ -2481,7 +2481,7 @@
   "community.page.news": "Novinky",
 
   // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Dílčí komunity a kolekce",
+  "community.all-lists.head": "Podkomunity a kolekce",
 
   // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
@@ -2927,10 +2927,10 @@
   "error.invalid-search-query": "Vyhledávací dotaz není platný. Další informace o této chybě naleznete v osvědčených postupech <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Chyba při načítání dílčích kolekcí",
+  "error.sub-collections": "Chyba při načítání podkolekcí",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Chyba při načítání dílčích komunit",
+  "error.sub-communities": "Chyba při načítání podkomunit",
 
   // "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": "Při inicializaci sekce došlo k chybě, zkontrolujte prosím konfiguraci vstupního formuláře. Podrobnosti jsou uvedeny níže : <br> <br>",
@@ -4985,10 +4985,10 @@
   "loading.search-results": "Načítají se výsledky vyhledávání...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Načítají se dílčí kolekce...",
+  "loading.sub-collections": "Načítají se podkolekce...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Načítají se dílčí komunity...",
+  "loading.sub-communities": "Načítají se podkomunity...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",

From 68b6cc9bd45e01a306990c05b464e94cacb1a4f2 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 11 Oct 2024 13:37:24 +0200
Subject: [PATCH 0846/1286] Fixed small cs localization mistakes

(cherry picked from commit 680d6c94166266d6195f13b92e3be916917ae8c0)
---
 src/assets/i18n/cs.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 09dd023e8d..466e3475bf 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěvku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo:",
+  "iiif.page.issue": "Číslo: ",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",

From b11efbbf0cde5cde73f3873a41539bec7588cf9c Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Mon, 4 Nov 2024 14:37:04 +0100
Subject: [PATCH 0847/1286] Updated messages for the 'supervised' and 'claim'
 sentenses

(cherry picked from commit 1aef6ce1d623ac8f0a52dcf8086847996a2d0180)
---
 src/assets/i18n/cs.json5 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 466e3475bf..f06db668a3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Supervizován:",
+  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu supervize",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -4380,10 +4380,10 @@
   "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
-  "item.page.claim.button": "Prohlásit",
+  "item.page.claim.button": "Převzít",
 
   // "item.page.claim.tooltip": "Claim this item as profile",
-  "item.page.claim.tooltip": "Prohlásit tento záznam za profilovou",
+  "item.page.claim.tooltip": "Prohlásit tento záznam za profil",
 
   // "item.page.image.alt.ROR": "ROR logo",
   // TODO New key - Add a translation
@@ -5414,7 +5414,7 @@
   "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
+  "mydspace.show.supervisedWorkspace": "Záznamy pod dohledem",
 
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Archivováno",
@@ -6922,7 +6922,7 @@
   "search.filters.applied.f.birthDate.min": "Datum narození od",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  "search.filters.applied.f.supervisedBy": "Zkontrolováno",
+  "search.filters.applied.f.supervisedBy": "Pod dohledem",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Vyřazeno",
@@ -7221,8 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",
@@ -8924,7 +8923,7 @@
   "virtual-metadata.delete-relationship.modal-head": "Vyberte záznamy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  "supervisedWorkspace.search.results.head": "Zkontrolované záznamy",
+  "supervisedWorkspace.search.results.head": "Záznamy pod dohledem",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Moje záznamy",

From bd638f03560015a5bdc31108227810ca1fdba540 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 8 Nov 2024 15:24:06 +0100
Subject: [PATCH 0848/1286] Updated supervised by messages following NTK
 suggestions

(cherry picked from commit d819cf43968665c20870ee16a1620e744dfbd821)
---
 src/assets/i18n/cs.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index f06db668a3..866660f513 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
+  "workflow-item.search.result.list.element.supervised-by": "Dohlížející autorita:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat dohlížející autoritu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -7221,7 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
+  "search.filters.filter.supervisedBy.label": "Hledat dohlížející autoritu",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",

From 757574080caabd944d13d75c47997a2d77637744 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:32:57 +0200
Subject: [PATCH 0849/1286] Updated some messages following the lindat v5 and
 clarin-dspace v7 instance.

(cherry picked from commit b10563ea5388e8c398ec8927dc562d6f841473db)
---
 src/assets/i18n/cs.json5 | 101 +++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 0b4168cca9..3824e9741a 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1477,8 +1477,8 @@
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
 
-  // "bitstream.download.page.back": "Back",
-  "bitstream.download.page.back": "Zpět" ,
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Upravit politiky souboru",
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-  // "collection.create.breadcrumbs": "Create collection",
+    // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 
@@ -2210,8 +2210,7 @@
   "collection.source.controls.harvest.last": "Naposledy harvestováno:",
 
   // "collection.source.controls.harvest.message": "Harvest info:",
-  "collection.source.controls.harvest.message": "Informace o harevstu:",
-
+  "collection.source.controls.harvest.message": "Informace o harvestu:",
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
@@ -2703,7 +2702,7 @@
   "dso-selector.create.community.head": "Nová komunita",
 
   // "dso-selector.create.community.or-divider": "or",
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "nebo",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Vytvořit novou komunitu v",
@@ -2940,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "eslání. Pokud tuto licenci v tuto chvíli nemůžete udělit, můžete svou práci uložit a vrátit se k ní později nebo podání odstranit.",
+  "error.validation.license.notgranted": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -3252,7 +3251,7 @@
   "grant-deny-request-copy.intro2": "Po výběru možnosti se zobrazí návrh e-mailové odpovědi, který můžete upravit.",
 
   // "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": " Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
+  "grant-deny-request-copy.processed": "Tato žádost již byla zpracována. Pomocí níže uvedeného tlačítka se můžete vrátit na domovskou stránku.",
 
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Žádost o kopii dokumentu",
@@ -3432,8 +3431,7 @@
   "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
 
   // "item.alerts.private": "This item is non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.alerts.private": "Tento záznam je nezobrazitelný",
+  "item.alerts.private": "Tento záznam je nevyhledatelný",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Tento záznam byl stažen",
@@ -4168,7 +4166,7 @@
   "item.page.journal-title": "Název časopisu",
 
   // "item.page.publisher": "Publisher",
-  "item.page.publisher": "Vydavatel",
+  "item.page.publisher": "Nakladatel",
 
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Záznam: ",
@@ -4268,7 +4266,7 @@
   "item.page.abstract": "Abstrakt",
 
   // "item.page.author": "Authors",
-  "item.page.author": "Autor",
+  "item.page.author": "Autoři",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Citace",
@@ -4310,10 +4308,10 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Úplný záznam",
+  "item.page.link.full": "Zobrazit celý záznam",
 
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Jednoduchý záznam",
+  "item.page.link.simple": "Zobrazit minimální záznam",
 
   // "item.page.orcid.title": "ORCID",
   "item.page.orcid.title": "ORCID",
@@ -4346,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "URI",
+  "item.page.uri": "Identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4461,10 +4459,10 @@
   "item.preview.oaire.awardNumber": "Identifikátor zdroje financování:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  "item.preview.dc.title.alternative": "Akronym:",
+  "item.preview.dc.title.alternative": "Zkratka:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-  "item.preview.dc.coverage.spatial": "Jurisdikce:",
+  "item.preview.dc.coverage.spatial": "Příslušnost:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Tok finančních prostředků:",
@@ -4841,7 +4839,7 @@
   "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-  "journal.page.publisher": "Vydavatel",
+  "journal.page.publisher": "Nakladatel",
 
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Časopis: ",
@@ -4936,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo: ",
+  "iiif.page.issue": "Problém:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5042,8 +5040,7 @@
   "menu.header.nav.description": "Admin navigation bar",
 
   // "menu.header.admin": "Management",
-  // TODO Source message changed - Revise the translation
-  "menu.header.admin": "Management",
+  "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo úložiště",
@@ -5378,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Váš příspěvek",
+  "mydspace.results.head": "Vaše zázmany",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5390,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádné datum",
+  "mydspace.results.no-date": "Žádny datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -5412,9 +5409,9 @@
   // TODO Source message changed - Revise the translation
   "mydspace.show.workflow": "Úlohy workflow",
 
-  // "mydspace.show.workspace": "Your submissions",
+  // "mydspace.show.workspace": "Your Submissions",
   // TODO Source message changed - Revise the translation
-  "mydspace.show.workspace": "Váš příspěvek",
+  "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
   "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
@@ -5488,7 +5485,7 @@
   "nav.user-profile-menu-and-logout": "Menu uživatelského profilu a odhlášení",
 
   // "nav.logout": "Log Out",
-  "nav.logout": "Menu uživatelského profilu a odhlášení",
+  "nav.logout": "Odhlásit se",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Hlavní navigační panel",
@@ -6289,7 +6286,7 @@
   "publication.page.journal-title": "Název časopisu",
 
   // "publication.page.publisher": "Publisher",
-  "publication.page.publisher": "Vydavatel",
+  "publication.page.publisher": "Nakladatel",
 
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publikace: ",
@@ -6913,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Vkladatel",
+  "search.filters.applied.f.submitter": "Předkladatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7019,10 +7016,10 @@
   "search.filters.filter.creativeWorkKeywords.label": "Předmět hledání",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.head": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.head": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Vydavatel",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Nakladatel",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "Hledat vydavatele",
@@ -7058,7 +7055,7 @@
   "search.filters.filter.discoverable.head": "Nedohledatelné",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  "search.filters.filter.withdrawn.head": "Zrušeno",
+  "search.filters.filter.withdrawn.head": "Vyřazeno",
 
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Typ záznamu",
@@ -7142,7 +7139,7 @@
   "search.filters.filter.objectpeople.placeholder": "Lidé",
 
   // "search.filters.filter.objectpeople.label": "Search people",
-  "search.filters.filter.objectpeople.label": "Hledat lidi",
+  "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Stát",
@@ -7178,7 +7175,7 @@
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
 
   // "search.filters.filter.scope.label": "Search scope filter",
-  "search.filters.filter.scope.label": "Hledat filtr rozsahu",
+  "search.filters.filter.scope.label": "Filtr rozsahu hledání",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
@@ -7196,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Vkladatel",
+  "search.filters.filter.submitter.head": "Předkladatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Vkladatel",
+  "search.filters.filter.submitter.placeholder": "Předkladatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat vkladatele",
+  "search.filters.filter.submitter.label": "Hledat předkladatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -7286,8 +7283,8 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Ne",
 
-  // "search.filters.head": "Filters",
-  "search.filters.head": "Filtry",
+  // "search.filters.head": "Limit your search",
+  "search.filters.head": "Zúžit hledání",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Resetovat filtry",
@@ -7526,7 +7523,7 @@
   "submission.general.cannot_submit": "Nemáte oprávnění k vytvoření nového příspěvku.",
 
   // "submission.general.deposit": "Deposit",
-  "submission.general.deposit": "Vložit do repozitáře",
+  "submission.general.deposit": "Nahrát",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Zrušit",
@@ -7554,7 +7551,7 @@
   "submission.general.info.pending-changes": "Neuložené změny",
 
   // "submission.general.save": "Save",
-  "submission.general.save": "Průběžně uložit záznam",
+  "submission.general.save": "Uložit",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Uložit na později",
@@ -7709,10 +7706,10 @@
   "submission.import-external.preview.subtitle": "Níže uvedená metadata byla importována z externího zdroje. Budou předvyplněna při zahájení odesílání..",
 
   // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Zahájit odesílání",
+  "submission.import-external.preview.button.import": "Začít nový příspěvek",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Chyba při odesílání",
+  "submission.import-external.preview.error.import.title": "Chyba při vytváření nového příspěvku",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Během procesu importu externí zdrojového záznamu došlo k chybě.",
@@ -7893,7 +7890,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Vyhledávací dotaz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Hledání",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Přejít na",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Hledání...",
@@ -8080,7 +8077,7 @@
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Financující agentura",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Projekt, ke kterému publikace náleží",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financování",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadřazená organizační jednotka",
@@ -8311,7 +8308,7 @@
   "submission.sections.submit.progressbar.describe.recycle": "Opětovně použít",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  "submission.sections.submit.progressbar.describe.stepcustom": "Popsat",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Popis",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Základní informace o dokumentu",
@@ -8627,8 +8624,8 @@
   "submission.submit.breadcrumbs": "Nově podaný záznam",
 
   // "submission.submit.title": "New submission",
-  // TODO Source message changed - Revise the translation
-  "submission.submit.title": "Nově podaný záznam",
+  "submission.submit.title": "Nový příspěvek",
+
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
@@ -8710,7 +8707,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Zadavatel",
+  "submission.workflow.tasks.generic.submitter": "Předkladatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
@@ -9074,10 +9071,10 @@
   "workflow-item.scorereviewaction.notification.error.content": "Nebylo možné zkontrolovat tento záznam",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  "workflow-item.scorereviewaction.title": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.title": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  "workflow-item.scorereviewaction.header": "Zkontrolovat tento záznam",
+  "workflow-item.scorereviewaction.header": "Ohodnotit tento záznam",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
   "workflow-item.scorereviewaction.button.cancel": "Zrušit",
@@ -11034,6 +11031,4 @@
   // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
   // TODO New key - Add a translation
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
-
-
-}
\ No newline at end of file
+}

From c357ac93f3a4de0ee9a3721bbe73bea81686cb98 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 26 Jul 2024 15:49:37 +0200
Subject: [PATCH 0850/1286] Fixed linting error.

(cherry picked from commit 7e864d27b45c58ef566d31c5d0e2a478a540ecdd)
---
 src/assets/i18n/cs.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 3824e9741a..a957232a89 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1797,7 +1797,7 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
 
-    // "collection.create.breadcrumbs": "Create collection",
+  // "collection.create.breadcrumbs": "Create collection",
   // TODO New key - Add a translation
   "collection.create.breadcrumbs": "Create collection",
 

From ca8981611a9559c80024dbf38a234ad2dfebb7c6 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 15:08:31 +0200
Subject: [PATCH 0851/1286] Updated cs messages following review requirements

(cherry picked from commit 813d644b32a28685f8a4205bc383268b2502afdb)
---
 src/assets/i18n/cs.json5 | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index a957232a89..5e52f751ec 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1475,9 +1475,9 @@
   "auth.messages.token-refresh-failed": "Nepodařilo se obnovit váš přístupový token. Prosím přihlašte se znovu.",
 
   // "bitstream.download.page": "Now downloading {{bitstream}}...",
-  "bitstream.download.page": "Nyní se stahuje {{bitstream}}..." ,
+  "bitstream.download.page": "Nyní se stahuje {{bitstream}}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Zpět",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Pro dokončení zaslání musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4308,7 +4308,7 @@
   "item.page.journal.search.title": "Články v tomto časopise",
 
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Zobrazit celý záznam",
+  "item.page.link.full": "Zobrazit úplný záznam",
 
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Zobrazit minimální záznam",
@@ -4344,7 +4344,7 @@
   "item.page.subject": "Klíčová slova",
 
   // "item.page.uri": "URI",
-  "item.page.uri": "Identifikátor",
+  "item.page.uri": "Permanentní identifikátor",
 
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Zobrazit více",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Problém:",
+  "iiif.page.issue": "Číslo:",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",
@@ -5375,7 +5375,7 @@
   "mydspace.new-submission-external-short": "Importovat metadata",
 
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Vaše zázmany",
+  "mydspace.results.head": "Vaše záznamy",
 
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Žádný abstrakt",
@@ -5387,7 +5387,7 @@
   "mydspace.results.no-collections": "Žádné kolekce",
 
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Žádny datum",
+  "mydspace.results.no-date": "Žádné datum",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Žádné soubory",
@@ -6910,7 +6910,7 @@
   "search.filters.applied.f.subject": "Předmět",
 
   // "search.filters.applied.f.submitter": "Submitter",
-  "search.filters.applied.f.submitter": "Předkladatel",
+  "search.filters.applied.f.submitter": "Odesílatel",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Název pracovní pozice",
@@ -7193,13 +7193,13 @@
   "search.filters.filter.subject.label": "Hledat předmět",
 
   // "search.filters.filter.submitter.head": "Submitter",
-  "search.filters.filter.submitter.head": "Předkladatel",
+  "search.filters.filter.submitter.head": "Odesílatel",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder": "Předkladatel",
+  "search.filters.filter.submitter.placeholder": "Odesílatel",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Hledat předkladatele",
+  "search.filters.filter.submitter.label": "Hledat odesílatele",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Procházet {{ name }} podle",
@@ -8626,7 +8626,6 @@
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nový příspěvek",
 
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Smazat",
 
@@ -8692,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu předložit.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8707,7 +8706,7 @@
   "submission.workflow.tasks.generic.processing": "Zpracování...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Předkladatel",
+  "submission.workflow.tasks.generic.submitter": "Odesílatel",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",

From 301eb9017c046873146d721f162ef90c3769afe2 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:09:51 +0200
Subject: [PATCH 0852/1286] Fixed messages following the PR from the UFAL -
 https://github.com/dataquest-dev/dspace-angular/pull/669/commits/f18d45ce23ea9c42778885f59e5f7d25e548b2e9

(cherry picked from commit 5e5c627b8b4dbafc5454d91e24797f3ef6ef76aa)
---
 src/assets/i18n/cs.json5 | 220 +++++++++++++++++++--------------------
 1 file changed, 110 insertions(+), 110 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 5e52f751ec..2cb95f10d3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -13,7 +13,7 @@
   "403.help": "Nemáte povolení k přístupu na tuto stránku. Pro návrat na domovskou stránku můžete použít tlačítko níže.",
 
   // "403.link.home-page": "Take me to the home page",
-  "403.link.home-page": "Přesměrujte mě na domovskou stránku",
+  "403.link.home-page": "Návrat na domovskou stránku",
 
   // "403.forbidden": "Forbidden",
   "403.forbidden": "Přístup zakázán",
@@ -46,7 +46,7 @@
   "error-page.description.500": "Služba je nedostupná",
 
   // "error-page.description.404": "Page not found",
-  "error-page.description.404": "Stránka nebyla nenalezena",
+  "error-page.description.404": "Stránka nebyla nalezena",
 
   // "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": "Při přihlašování přes ORCID došlo k chybě. Ujistěte se, že jste sdíleli e-mailovou adresu připojenou ke svému účtu ORCID s DSpace. Pokud chyba přetrvává, kontaktujte správce",
@@ -67,13 +67,13 @@
   "access-status.unknown.listelement.badge": "Status neznámý",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  "admin.curation-tasks.breadcrumbs": "Kurátorská úloha systému",
+  "admin.curation-tasks.breadcrumbs": "Systémové úlohy správy",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Kurátorská úloha systému",
+  "admin.curation-tasks.title": "Systémové úlohy správy",
 
   // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Kurátorská úloha systému",
+  "admin.curation-tasks.header": "Systémové úlohy správy",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Registr formátů",
@@ -172,7 +172,7 @@
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Úroveň podpory",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registr formátu souboru",
+  "admin.registries.bitstream-formats.head": "Registr formátů souboru",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Žádné formáty souboru k zobrazení.",
@@ -373,7 +373,7 @@
   "admin.access-control.bulk-access.breadcrumbs": "Hromadná správa přístupu",
 
   // "administrativeBulkAccess.search.results.head": "Search Results",
-  "administrativeBulkAccess.search.results.head": "Prohledávat výsledky",
+  "administrativeBulkAccess.search.results.head": "Výsledky vyhledávání",
 
   // "admin.access-control.bulk-access": "Bulk Access Management",
   "admin.access-control.bulk-access": "Hromadná správa přístupu",
@@ -403,7 +403,7 @@
   "admin.access-control.epeople.actions.reset": "Resetovat heslo",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "admin.access-control.epeople.actions.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Uživatelé",
@@ -612,7 +612,7 @@
   "admin.access-control.groups.table.edit.buttons.remove": "Odstranit \"{{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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto jako UUID,",
+  "admin.access-control.groups.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo UUID",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "Úspěšně odstraněna skupina \"{{name}}\"",
@@ -696,7 +696,7 @@
   "admin.access-control.groups.form.members-list.button.see-all": "Procházet vše",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  "admin.access-control.groups.form.members-list.headMembers": "Aktuální členové",
+  "admin.access-control.groups.form.members-list.headMembers": "Současní členové",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Hledat",
@@ -738,13 +738,13 @@
   "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Přidat člena jménem \"{{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": "Žádná aktuální aktivní skupina, nejprve zadejte jméno.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "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": "Ve skupině zatím nejsou žádní členové, vyhledejte je a přidejte.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyly nalezeni žádní uživatelé",
+  "admin.access-control.groups.form.members-list.no-items": "V tomto vyhledávání nebyli nalezeni žádní uživatelé",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Neúspěch: Něco se pokazilo: \"{{cause}}\"",
@@ -801,7 +801,7 @@
   "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Toto je aktuální skupina, nelze přidat.",
 
   // "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": "Nebyly nalezeny žádné skupiny, které by měly toto ve svém názvu nebo toto UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nebyla nalezena žádná skupina s tímto v návzvu nebo 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": "Ve skupině zatím nejsou žádné podskupiny.",
@@ -831,7 +831,7 @@
   "admin.notifications.source.breadcrumbs": "Quality Assurance",
 
   // "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.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "Na této stránce můžete upravit vlastnosti a členy skupiny. V horní části můžete upravit název a popis skupiny, pokud se nejedá o skupinu admin pro kolekci nebo komunitu. V takovém případě jsou název a popis skupiny vygenerovány automaticky a nelze je upravovat. V následujících částech můžete upravovat členství ve skupině. Další podrobnosti naleznete v části [wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
   // "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.",
   "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Pro přidání nebo odebrání uživatele z této skupiny, buď klikněte na „Prohledávat všechny“ nebo použijte vyhledávací okno pro vyhledání uživatele (použijte roletku na levé straně vyhledávacího okna a vyberte, zda chcete prohledávat pomocí metadat nebo e-mailu). Potom klikněte na tlačítko plus u každého uživatele, kterého chcete přidat, nebo na ikonu odpadkového koše u každého uživatele, kterého chcete odebrat. Seznam níže může obsahovat několik stránek: k přechodu na další stránku použijte ovládací prvky pod seznamem. Až budete hotovi, uložte změny pomocí tlačítka „Uložit“ v horní části.",
@@ -1406,7 +1406,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Prohledávat vše",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Aktuální členové",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Současní členové",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Hledat",
@@ -1448,7 +1448,7 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Přidat uživatele jménem \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktivní skupina, nejdříve vložte název.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Žádná aktuální aktivní skupina, nejprve zadejte název.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Žádní členové ve skupině, nejdříve vyhledejte a přidejte.",
@@ -1792,7 +1792,7 @@
   "claimed-approved-search-result-list-element.title": "Schváleno",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět vkladateli",
+  "claimed-declined-search-result-list-element.title": "Zamítnuto, posláno zpět odesílateli",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Zamítnuto, posláno zpět správci schvalovacího workflow",
@@ -1815,7 +1815,7 @@
   "collection.create.sub-head": "Vytvořit kolekci pro komunitu {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  "collection.curate.header": "Kurátorovat kolekci: {{collection}}",
+  "collection.curate.header": "Spravovat kolekci: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Zrušit",
@@ -1923,7 +1923,7 @@
   "collection.edit.logo.notifications.add.success": "Nahrání loga kolekce proběhlo úspěšně.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "collection.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo kolekce",
@@ -1948,10 +1948,10 @@
   "collection.edit.tabs.access-control.title": "Úprava kolekce - Řízení přístupu",
 
   // "collection.edit.tabs.curate.head": "Curate",
-  "collection.edit.tabs.curate.head": "Kurátorovat",
+  "collection.edit.tabs.curate.head": "Spravovat",
 
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Upravit kolekci - kurátorovat",
+  "collection.edit.tabs.curate.title": "Upravit kolekci - správa",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Oprávnění",
@@ -2014,7 +2014,7 @@
   "collection.edit.tabs.source.head": "Zdroj obsahu",
 
   // "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": "Vaše změny byly vyřazeny. Chcete-li své změny obnovit, klikněte na tlačítko Zpět",
+  "collection.edit.tabs.source.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
@@ -2024,7 +2024,7 @@
   "collection.edit.tabs.source.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata neplatná",
+  "collection.edit.tabs.source.notifications.invalid.title": "Neplatná metadata",
 
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "Vaše změny ve zdroji obsahu této kolekce byly uloženy.",
@@ -2215,7 +2215,7 @@
   "collection.source.controls.harvest.no-information": "Není k dispozi",
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  "collection.source.update.notifications.error.content": "Zadané nastavení bylo testováno a nefungovalo.",
+  "collection.source.update.notifications.error.content": "Zadané nastavení bylo otestováno a nefungovalo.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Chyba serveru",
@@ -2262,7 +2262,7 @@
   "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Kurátorství komunity: {{ community }}",
+  "community.curate.header": "Spravovat komunitu: {{ community }}",
 
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Zrušit",
@@ -2295,7 +2295,7 @@
   "community.edit.breadcrumbs": "Upravit komunitu",
 
   // "community.edit.logo.delete.title": "Delete logo",
-  "community.edit.logo.delete.title": "Odstranit logo",
+  "community.edit.logo.delete.title": "Smazat logo",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Zrušit odstranění",
@@ -2310,7 +2310,7 @@
   "community.edit.logo.notifications.add.success": "Nahrání loga komunity proběhlo úspěšně.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logo odstraněno",
+  "community.edit.logo.notifications.delete.success.title": "Logo smazáno",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "Úspěšně odstraněno logo komunity",
@@ -2335,10 +2335,10 @@
   "community.edit.return": "Zpět",
 
   // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Kurátorovat",
+  "community.edit.tabs.curate.head": "Spravovat",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Upravit komunitu - kurátorovat",
+  "community.edit.tabs.curate.title": "Upravit komunitu - správa",
 
   // "community.edit.tabs.access-control.head": "Access Control",
   "community.edit.tabs.access-control.head": "Řízení přístupu",
@@ -2396,13 +2396,13 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
 
   // "comcol-role.edit.submitters.name": "Submitters",
-  "comcol-role.edit.submitters.name": "Vkladatelé",
+  "comcol-role.edit.submitters.name": "Odesílatelé",
 
   // "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": "Uživatelé a skupiny, které mají oprávnění ke vkládání nových záznamů do této kolekce.",
@@ -2460,7 +2460,7 @@
   "community.form.errors.title.required": "Zadejte název komunity",
 
   // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Text autorských práv (HTML)",
+  "community.form.rights": "Copyright (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Novinky (HTML)",
@@ -2640,16 +2640,16 @@
   "curation.form.submit": "Start",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  "curation.form.submit.success.head": "Kurátorská úloha byla úspěšně spuštěna",
+  "curation.form.submit.success.head": "Úloha správy byla úspěšně spuštěna",
 
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Budete přesměrováni na příslušnou stránku procesu.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-  "curation.form.submit.error.head": "Spuštění kurátorské úlohy se nezdařilo.",
+  "curation.form.submit.error.head": "Spuštění úlohy správy se nezdařilo.",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  "curation.form.submit.error.content": "Při pokusu o spuštění kurátorské úlohy došlo k chybě.",
+  "curation.form.submit.error.content": "Při pokusu o spuštění úlohy správy došlo k chybě.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
   "curation.form.submit.error.invalid-handle": "Nepodařilo se určit handle pro tento objekt",
@@ -3044,7 +3044,7 @@
   "forgot-email.form.success.head": "E-mail pro obnovení hesla odeslán",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální adresu URL a další pokyny.",
+  "forgot-email.form.success.content": "Na adresu {{ email }} byl odeslán e-mail obsahující speciální URL a další instrukce.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
   // TODO Source message changed - Revise the translation
@@ -3242,7 +3242,7 @@
   "grant-deny-request-copy.header": "Žádost o kopii dokumentu",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
-  "grant-deny-request-copy.home-page": "Přesměrujte mne na domovskou stránku",
+  "grant-deny-request-copy.home-page": "Návrat na domovskou stránku",
 
   // "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": "Pokud jste jedním z autorů dokumentu <a href='{{ url }}'>{{ name }}</a>, použijte prosím jednu z níže uvedených možností, abyste odpověděli na žádost uživatele.",
@@ -3278,13 +3278,13 @@
   "health-page.info-tab": "Informace",
 
   // "health-page.status-tab": "Status",
-  "health-page.status-tab": "Status",
+  "health-page.status-tab": "Stav",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "Služba kontrolující stav systému je momentálně nedostupná.",
 
   // "health-page.property.status": "Status code",
-  "health-page.property.status": "Kód statusu",
+  "health-page.property.status": "Stavový kód",
 
   // "health-page.section.db.title": "Database",
   "health-page.section.db.title": "Databáze",
@@ -3455,7 +3455,7 @@
   "item.badge.private": "Nedohledatelné",
 
   // "item.badge.withdrawn": "Withdrawn",
-  "item.badge.withdrawn": "Zrušeno",
+  "item.badge.withdrawn": "Vyřazeno",
 
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Svazek",
@@ -3543,10 +3543,10 @@
   "item.edit.bitstreams.headers.name": "Název",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Undo'",
+  "item.edit.bitstreams.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  "item.edit.bitstreams.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.bitstreams.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Chyba při přesunu souborů",
@@ -3558,7 +3558,7 @@
   "item.edit.bitstreams.notifications.move.saved.title": "Změny uloženy",
 
   // "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": "Záznam, na které právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.bitstreams.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Změny jsou zastaralé",
@@ -3651,13 +3651,13 @@
   "item.edit.identifiers.doi.status.MINTED": "Vydáno (nezaregistrováno)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  "item.edit.tabs.status.buttons.register-doi.label": "Registrace nového nebo čekání na nové DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
   "item.edit.tabs.status.buttons.register-doi.button": "Zaregistrujte DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  "item.edit.register-doi.header": "Zaregistrujte nové DOI nebo čekající k registraci",
+  "item.edit.register-doi.header": "Registrovat nové nebo čekající DOI",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
   "item.edit.register-doi.description": "Níže zkontrolujte všechny identifikátory a metadata ve frontě. Zvolte \"Potvrdit\" pro pokračování v registraci DOI nebo \"Zrušit\" pro přerušení procesu.",
@@ -3687,7 +3687,7 @@
   "item.edit.item-mapper.cancel": "Zrušit",
 
   // "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": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tuto záznam na jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
+  "item.edit.item-mapper.description": "Toto je nástroj pro mapování záznamů, který umožňuje správcům mapovat tento záznam do jiné kolekce. Můžete vyhledávat kolekce a mapovat je nebo procházet seznam kolekcí, ke kterým je záznam aktuálně mapována.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Mapování do jiných kolekcí - mapovat záznam do kolekcí",
@@ -3768,7 +3768,7 @@
   "item.edit.metadata.edit.buttons.unedit": "Zastavit úpravy",
 
   // "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.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z příbuzné entity. Nemůže být zděděna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
+  "item.edit.metadata.edit.buttons.virtual": "Tato hodnota metadat je virtuální, tedy děděná z provázané entity. Nemůže být změněna napřímo. Přidejte či odeberte příslušný vztah na záložce \"Vztahy\".",
 
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Záznam aktuálně neobsahuje žádná metadata. Kliknutím na tlačítko Přidat začněte přidávat hodnotu metadat.",
@@ -3796,11 +3796,11 @@
   "item.edit.metadata.metadatafield.invalid": "Prosím, vyberte platné metadatové pole",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   // TODO Source message changed - Revise the translation
-  "item.edit.metadata.notifications.discarded.title": "Změny zahozeny",
+  "item.edit.metadata.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Došlo k chybě",
@@ -3809,17 +3809,17 @@
   "item.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  "item.edit.metadata.notifications.invalid.title": "Metadata neplatná",
+  "item.edit.metadata.notifications.invalid.title": "Neplatná metadata",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou zahozeny, aby se zabránilo konfliktům",
+  "item.edit.metadata.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   // TODO Source message changed - Revise the translation
   "item.edit.metadata.notifications.outdated.title": "Změny jsou zastaralé",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat této záznamu byly uloženy.",
+  "item.edit.metadata.notifications.saved.content": "Vaše změny metadat tohoto záznamu byly uloženy.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadata uložena",
@@ -3976,16 +3976,16 @@
   "item.edit.relationships.no-relationships": "Žádné vztahy",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly vyřazeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
+  "item.edit.relationships.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  "item.edit.relationships.notifications.discarded.title": "Změny vyřazeny",
+  "item.edit.relationships.notifications.discarded.title": "Zahozené změny",
 
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "Chyba při úpravě vztahů",
 
   // "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": "Záznam, na které právě pracujete, byl změněna jiným uživatelem. Vaše aktuální změny jsou vyřazeny, aby se zabránilo konfliktům",
+  "item.edit.relationships.notifications.outdated.content": "Záznam, na kterém právě pracujete, byl změněn jiným uživatelem. Vaše aktuální změny byly zahozeny, aby se zabránilo konfliktům",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Změny jsou zastaralé",
@@ -4009,25 +4009,25 @@
   "item.edit.return": "Zpět",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  "item.edit.tabs.bitstreams.head": "Soubor",
+  "item.edit.tabs.bitstreams.head": "Soubory",
 
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Úprava záznamu - soubor",
 
   // "item.edit.tabs.curate.head": "Curate",
-  "item.edit.tabs.curate.head": "Kurátorovat",
+  "item.edit.tabs.curate.head": "Spravovat",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  "item.edit.tabs.curate.title": "Úprava záznamu - Kurátorovat",
+  "item.edit.tabs.curate.title": "Úprava záznamu - spravovat",
 
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  "item.edit.curate.title": "Kurátorovat záznam: {{item}}",
+  "item.edit.curate.title": "Spravovat záznam: {{item}}",
 
   // "item.edit.tabs.access-control.head": "Access Control",
-  "item.edit.tabs.access-control.head": "Kontrola přístupu",
+  "item.edit.tabs.access-control.head": "Řízení přístupu",
 
   // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
-  "item.edit.tabs.access-control.title": "Úprava záznamu - Kontrola přístupu",
+  "item.edit.tabs.access-control.title": "Úprava záznamu - Řízení přístupu",
 
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadata",
@@ -4275,7 +4275,7 @@
   "item.page.collections": "Kolekce",
 
   // "item.page.collections.loading": "Loading...",
-  "item.page.collections.loading": "Načítání...",
+  "item.page.collections.loading": "Načítá se...",
 
   // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "Načíst další",
@@ -4377,7 +4377,7 @@
   "item.page.reinstate": "Request reinstatement",
 
   // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
-  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí právě probíhá zadání nové verze.",
+  "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
   "item.page.claim.button": "Prohlásit",
@@ -4585,7 +4585,7 @@
   "item.version.history.table.action.deleteVersion": "Smazat verzi",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.history.table.action.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "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": "Toto není nejnovější verze tohoto záznamu. Nejnovější verzi naleznete <a href='{{destination}}'>zde</a>.",
@@ -4698,7 +4698,7 @@
   "item.version.create.notification.failure": "Nová verze nebyla vytvořena",
 
   // "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": "Nová verze nemůže být vytvořena, protože v historii verzí probíhá odesílání.",
+  "item.version.create.notification.inProgress": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Smazat verzi",
@@ -4788,7 +4788,7 @@
   "itemtemplate.edit.metadata.metadatafield.invalid": "Prosím zvolte platné metadatové pole",
 
   // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Chcete-li obnovit své změny, klikněte na tlačítko 'Zpět'.",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Vaše změny byly zahozeny. Pro obnovení změn klikněte na tlačítko 'Vrátit změny'",
 
   // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
   "itemtemplate.edit.metadata.notifications.discarded.title": "Změny byly zahozeny",
@@ -4797,7 +4797,7 @@
   "itemtemplate.edit.metadata.notifications.error.title": "Vyskytla se chyba",
 
   // "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.content": "Vaše změny nebyly uloženy. Před uložením se ujistěte, že všechna pole jsou platná.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Vaše změny nebyly uloženy. Před uložením se prosím ujistěte, že jsou všechna pole platná.",
 
   // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "itemtemplate.edit.metadata.notifications.invalid.title": "Neplatná metadata",
@@ -4812,7 +4812,7 @@
   "itemtemplate.edit.metadata.notifications.saved.content": "Vaše změny v šabloně metadat tohoto záznamu byly uloženy.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uloženy",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata uložena",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
   "itemtemplate.edit.metadata.reinstate-button": "Vrátit zpět",
@@ -5043,7 +5043,7 @@
   "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
-  "menu.header.image.logo": "Logo úložiště",
+  "menu.header.image.logo": "Logo repozitáře",
 
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Management menu",
@@ -5119,7 +5119,7 @@
   "menu.section.control_panel": "Ovládací panel",
 
   // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Kurátorská úloha",
+  "menu.section.curation_task": "Úloha správy",
 
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Upravit",
@@ -5165,25 +5165,25 @@
   "menu.section.icon.control_panel": "Sekce menu Ovládací panel",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-  "menu.section.icon.curation_tasks": "Sekce menu Kurátorská úloha",
+  "menu.section.icon.curation_tasks": "Sekce menu úloha správy",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Sekce menu Upravit",
 
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Exportovat sekci menu",
+  "menu.section.icon.export": "Sekce menu Exportovat",
 
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Najít sekci menu",
+  "menu.section.icon.find": "Sekce menu Najít",
 
   // "menu.section.icon.health": "Health check menu section",
-  "menu.section.icon.health": "Kontrola stavu sekce menu",
+  "menu.section.icon.health": "Sekce menu Kontrola stavu",
 
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Importovat sekci menu",
+  "menu.section.icon.import": "Sekce menu Importovat",
 
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Nová sekce menu",
+  "menu.section.icon.new": "Sekce menu Nový",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Připnout postranní panel",
@@ -5260,7 +5260,7 @@
   "menu.section.health": "Stav systému",
 
   // "menu.section.registries": "Registries",
-  "menu.section.registries": "Rejstřík",
+  "menu.section.registries": "Registry",
 
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formát",
@@ -5285,7 +5285,7 @@
   "menu.section.toggle.control_panel": "Přepnout sekci ovládacího panelu",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Přepnout sekci Kurátorská úloha",
+  "menu.section.toggle.curation_task": "Přepnout sekci úloha správy",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Přepnout sekci Úpravy",
@@ -5303,7 +5303,7 @@
   "menu.section.toggle.new": "Přepnout sekci Nová",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Přepnout sekci Rejstříky",
+  "menu.section.toggle.registries": "Přepnout sekci Registry",
 
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Přepnout sekci Statistická úloha",
@@ -5327,7 +5327,7 @@
   "mydspace.description": "",
 
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
-  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu vkladateli záznamu.",
+  "mydspace.messages.controller-help": "Zvolte tuto možnost, chcete-li odeslat zprávu odesílateli záznamu.",
 
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Zde vložte svou zprávu...",
@@ -5506,7 +5506,7 @@
   "nav.statistics.header": "Statistika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Přestat simulovat jiného uživatele",
+  "nav.stop-impersonating": "Přestat vystupovat jako jiný uživatel",
 
   // "nav.subscriptions": "Subscriptions",
   "nav.subscriptions": "Nastavení notifikací",
@@ -5810,7 +5810,7 @@
   "orgunit.page.city": "Město",
 
   // "orgunit.page.country": "Country",
-  "orgunit.page.country": "Stát",
+  "orgunit.page.country": "Země",
 
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Datum založení.",
@@ -5892,7 +5892,7 @@
   "person-relationships.search.results.head": "Výsledky vyhledávání osob",
 
   // "person.search.title": "Person Search",
-  "person.search.title": "Vyledatávání osob",
+  "person.search.title": "Vyhledávání osob",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametry",
@@ -6121,7 +6121,7 @@
   "process.overview.delete.clear": "Zrušit výběr mazá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": "Smazává se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
+  "process.overview.delete.processing": "Maže se {{count}} procesů. Počkejte prosím na úplné dokončení mazání. To může chvíli trvat.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
   "process.overview.delete.body": "Určitě chcete smazat {{count}} procesů",
@@ -6512,7 +6512,7 @@
   "register-page.registration.header": "Registrace nového uživatele",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru sbírek pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
+  "register-page.registration.info": "Zaregistrujte si účet a přihlaste se k odběru kolekcí pro e-mailové aktualizace a odesílejte nové záznamy do systému DSpace",
 
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-mailová adresa *",
@@ -6880,7 +6880,7 @@
   "search.filters.applied.f.dateIssued.min": "Datum zahájení",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  "search.filters.applied.f.dateSubmitted": "Date vložení",
+  "search.filters.applied.f.dateSubmitted": "Datum vložení",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
   // TODO Source message changed - Revise the translation
@@ -6925,7 +6925,7 @@
   "search.filters.applied.f.supervisedBy": "Zkontrolováno",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  "search.filters.applied.f.withdrawn": "Zrušeno",
+  "search.filters.applied.f.withdrawn": "Vyřazeno",
 
   // "search.filters.applied.operator.equals": "",
   // TODO New key - Add a translation
@@ -7142,10 +7142,10 @@
   "search.filters.filter.objectpeople.label": "Hledat osoby",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-  "search.filters.filter.organizationAddressCountry.head": "Stát",
+  "search.filters.filter.organizationAddressCountry.head": "Země",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  "search.filters.filter.organizationAddressCountry.placeholder": "Stát",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Země",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
   "search.filters.filter.organizationAddressCountry.label": "Hledat stát",
@@ -7438,10 +7438,10 @@
   "sorting.dc.date.issued.DESC": "Datum vydání sestupně",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  "sorting.dc.date.accessioned.ASC": "Datum přírůstku vzestupně",
+  "sorting.dc.date.accessioned.ASC": "Datum odeslání vzestupně",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  "sorting.dc.date.accessioned.DESC": "Datum přírůstku sestupně",
+  "sorting.dc.date.accessioned.DESC": "Datum odeslání sestupně",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Naposledy upraveno vzestupně",
@@ -8284,7 +8284,7 @@
   "submission.sections.identifiers.info": "Pro tento záznam budou vytvořeny následující identifikátory:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  "submission.sections.identifiers.no_handle": "Tomuto záznamu nybyl přidělen žádný handle.",
+  "submission.sections.identifiers.no_handle": "Tomuto záznamu nebyl přidělen žádný handle.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
   "submission.sections.identifiers.no_doi": "Tomuto záznamu nebylo přiděleno žádné DOI.",
@@ -8446,10 +8446,10 @@
   "submission.sections.upload.form.until-placeholder": "Až do",
 
   // "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": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.nolist": "Nahrané soubory v kolekci {{collectionName}} budou přístupné podle následujících skupin:",
 
   // "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": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následující skupiny (skupin):",
+  "submission.sections.upload.header.policy.default.withlist": "Vezměte prosím na vědomí, že nahrané soubory v kolekci {{collectionName}} budou kromě toho, co je explicitně rozhodnuto pro jednotlivý soubor, přístupné podle následujících skupin:",
 
   // "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 by dragging & dropping them anywhere on the page.</strong>",
   "submission.sections.upload.info": "Zde najdete všechny soubory, které jsou aktuálně v záznamu. Můžete aktualizovat metadata souborů a podmínky přístupu nebo <strong>nahrát další soubory pouhým přetažením kdekoli na stránku</strong>.",
@@ -8618,7 +8618,7 @@
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  "submission.sections.sherpa.error.message": "Informace ze Sherpa Romeo se nepodařilo načíst.",
+  "submission.sections.sherpa.error.message": "Při načítání informací ze služby Sherpa došlo k chybě",
 
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nově podaný záznam",
@@ -8676,7 +8676,7 @@
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může vkladatel problém odstranit a podání znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Do níže uvedeného pole zadejte důvod odmítnutí podání a uveďte, zda může odesílatel problém odstranit a podání znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Popište důvod odmítnutí",
@@ -8691,7 +8691,7 @@
   "submission.workflow.tasks.claimed.reject.submit": "Odmítnout",
 
   // "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": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl vkladatel něco změnit a znovu odeslat.",
+  "submission.workflow.tasks.claimed.reject_help": "Pokud jste záznam zkontrolovali a zjistili, že <strong>není</strong> vhodný pro zařazení do kolekce, vyberte \"Odmítnout\".  Poté budete vyzváni k zadání zprávy, ve které uvedete, proč je záznam nevhodný, a zda by měl odesílatel něco změnit a znovu odeslat.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vrátit do fondu",
@@ -8712,7 +8712,7 @@
   "submission.workflow.tasks.generic.success": "Operace proběhla úspěšně",
 
   // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Vyžádat si",
+  "submission.workflow.tasks.pool.claim": "Převzít",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Přiřaďte si tento úkol.",
@@ -8909,7 +8909,7 @@
   "uploader.or": ", nebo ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  "uploader.processing": "(nyní je bezpečné tuto stránku zavřít)",
+  "uploader.processing": "Zpracovávám nahrané soubory... (nyní je bezpečné tuto stránku zavřít)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Délka fronty",
@@ -8933,7 +8933,7 @@
   "workflowAdmin.search.results.head": "Spravovat workflow",
 
   // "workflow.search.results.head": "Workflow tasks",
-  "workflow.search.results.head": "Kroky workflow",
+  "workflow.search.results.head": "Úlohy workflow",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Úlohy Workflow a osobního pracovního prostoru",
@@ -8973,22 +8973,22 @@
   "workflow-item.delete.button.confirm": "Smazat",
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  "workflow-item.send-back.notification.success.title": "Odesláno zpět vkladateli",
+  "workflow-item.send-back.notification.success.title": "Vráceno zpět odesílateli",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně odeslán zpět vkladateli",
+  "workflow-item.send-back.notification.success.content": "Tento záznam ve workflow byl úspěšně vrácen zpět odesílateli",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Něco se pokazilo",
 
   // "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": "Záznam ve workflow se nepodařilo odeslat zpět vkladateli",
+  "workflow-item.send-back.notification.error.content": "Záznam ve workflow se nepodařilo vrátit zpět odesílateli",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.title": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Odeslat záznam ve workflow zpět vladateli",
+  "workflow-item.send-back.header": "Vrátit záznam ve workflow zpět odesílateli",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Zrušit",
@@ -9004,7 +9004,7 @@
   "workspace-item.view.breadcrumbs": "Zobrazení pracovního prostoru",
 
   // "workspace-item.view.title": "Workspace View",
-  "workspace-item.view.title": "Zobrazení pracovní prostoru",
+  "workspace-item.view.title": "Zobrazení pracovního prostoru",
 
   // "workspace-item.delete.breadcrumbs": "Workspace Delete",
   "workspace-item.delete.breadcrumbs": "Vymazat obsah pracovního prostoru",
@@ -9337,7 +9337,7 @@
   "person.page.orcid.sync-queue.send.bad-request-error": "Odeslání do ORCID se nezdařilo, protože zdroj odeslaný do registru ORCID není platný",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
-  "person.page.orcid.sync-queue.send.error": "Podání do ORCID se nezdařilo",
+  "person.page.orcid.sync-queue.send.error": "Odeslání do ORCID se nezdařilo",
 
   // "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": "Odeslání do ORCID se nezdařilo, protože zdroj se již nachází v registru ORCID",
@@ -9490,7 +9490,7 @@
   "system-wide-alert-form.retrieval.error": "Něco se pokazilo při načítání systémových upozornění",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  "system-wide-alert.form.cancel": "Zrušir",
+  "system-wide-alert.form.cancel": "Zrušit",
 
   // "system-wide-alert.form.save": "Save",
   "system-wide-alert.form.save": "Uložit",
@@ -9508,7 +9508,7 @@
   "system-wide-alert.form.label.message": "Obsah upozornění",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočítávací měřič",
+  "system-wide-alert.form.label.countdownTo.enable": "Povolit odpočet",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Nápověda: Nastavte odpočítávací měřič. Je-li to povoleno, lze datum nastavit i v budoucnosti a systémový upozornění bude uvádět odpočítávání do nastaveného data. Ve chvíli, kdy skončí odpočítávání, zmizí i odpočítávač z upozornění. Server NEBUDE automaticky zastaven.",
@@ -9643,7 +9643,7 @@
 
   // "vocabulary-treeview.search.form.add": "Add",
   // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Přidat",
 
   // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
   // TODO New key - Add a translation

From 5049b13d22b3ba424f1b82d66e3acc019d52973f Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Wed, 9 Oct 2024 16:14:04 +0200
Subject: [PATCH 0853/1286] Updated cs localization for subcommunities and
 subcollections

(cherry picked from commit 9badd4a4b6261a2abf5ed838f16bb000b1a127f0)
---
 src/assets/i18n/cs.json5 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 2cb95f10d3..09dd023e8d 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2259,7 +2259,7 @@
   "community.create.notifications.success": "Úspěšně vytvořena komunita",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Vytvořit dílčí komunitu pro komunitu {{ parent }}",
+  "community.create.sub-head": "Vytvořit podkomunitu v komunitě {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Spravovat komunitu: {{ community }}",
@@ -2396,7 +2396,7 @@
   "comcol-role.edit.collection-admin.name": "Správci",
 
   // "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": "Administrátoři komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.community-admin.description": "Administrátoři komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do všech podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Správci kolekcí rozhodují o tom, kdo může do kolekce vkládat záznamy, upravovat metadata záznamů (po vložení) a přidávat (mapovat) existující záznamy z jiných kolekcí do této kolekce (podléhá autorizaci pro danou kolekci).",
@@ -2421,7 +2421,7 @@
 
   // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
   // TODO Source message changed - Revise the translation
-  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet dílčí komunity nebo kolekce a spravovat nebo přidělovat správu těmto dílčím komunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných dílčích kolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávnění).",
+  "comcol-role.edit.bitstream_read.description": "Správci komunit mohou vytvářet podkomunity nebo kolekce a spravovat nebo přidělovat správu těmto podkomunitám nebo kolekcím. Kromě toho rozhodují o tom, kdo může odesílat záznamy do libovolných podkolekcí, upravovat metadata záznamů (po odeslání) a přidávat (mapovat) existující záznamy z jiných kolekcí (na základě oprávně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": "Výchozí čtení pro příchozí soubory je v současné době nastaveno na hodnotu Anonymní.",
@@ -2481,7 +2481,7 @@
   "community.page.news": "Novinky",
 
   // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Dílčí komunity a kolekce",
+  "community.all-lists.head": "Podkomunity a kolekce",
 
   // "community.search.results.head": "Search Results",
   // TODO New key - Add a translation
@@ -2927,10 +2927,10 @@
   "error.invalid-search-query": "Vyhledávací dotaz není platný. Další informace o této chybě naleznete v osvědčených postupech <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Chyba při načítání dílčích kolekcí",
+  "error.sub-collections": "Chyba při načítání podkolekcí",
 
   // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Chyba při načítání dílčích komunit",
+  "error.sub-communities": "Chyba při načítání podkomunit",
 
   // "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": "Při inicializaci sekce došlo k chybě, zkontrolujte prosím konfiguraci vstupního formuláře. Podrobnosti jsou uvedeny níže : <br> <br>",
@@ -4985,10 +4985,10 @@
   "loading.search-results": "Načítají se výsledky vyhledávání...",
 
   // "loading.sub-collections": "Loading sub-collections...",
-  "loading.sub-collections": "Načítají se dílčí kolekce...",
+  "loading.sub-collections": "Načítají se podkolekce...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Načítají se dílčí komunity...",
+  "loading.sub-communities": "Načítají se podkomunity...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",

From 71627d8abf254b1f95b4730b83f5da2038cf5169 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 11 Oct 2024 13:37:24 +0200
Subject: [PATCH 0854/1286] Fixed small cs localization mistakes

(cherry picked from commit 680d6c94166266d6195f13b92e3be916917ae8c0)
---
 src/assets/i18n/cs.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 09dd023e8d..466e3475bf 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -2939,7 +2939,7 @@
   "error.top-level-communities": "Chyba při načítání komunit nejvyšší úrovně",
 
   // "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": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěveku později nebo jej smažte.",
+  "error.validation.license.notgranted": "Bez udělení licence nelze záznam dokončit. Pokud v tuto chvíli nemůžete licenci udělit, uložte svou práci a vraťte se k příspěvku později nebo jej smažte.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Toto zadání je omezeno aktuálním vzorcem: {{ pattern }}.",
@@ -4934,7 +4934,7 @@
   "iiif.page.doi": "Trvalý odkaz: ",
 
   // "iiif.page.issue": "Issue: ",
-  "iiif.page.issue": "Číslo:",
+  "iiif.page.issue": "Číslo: ",
 
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Popis: ",

From 15afbc2dc9b9d5a4050c35374cc367f34ea6e090 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Mon, 4 Nov 2024 14:37:04 +0100
Subject: [PATCH 0855/1286] Updated messages for the 'supervised' and 'claim'
 sentenses

(cherry picked from commit 1aef6ce1d623ac8f0a52dcf8086847996a2d0180)
---
 src/assets/i18n/cs.json5 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 466e3475bf..f06db668a3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Supervizován:",
+  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu supervize",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -4380,10 +4380,10 @@
   "item.page.version.hasDraft": "Nová verze nemůže být vytvořena, protože v historii verzí už další rozpracovaná verze existuje.",
 
   // "item.page.claim.button": "Claim",
-  "item.page.claim.button": "Prohlásit",
+  "item.page.claim.button": "Převzít",
 
   // "item.page.claim.tooltip": "Claim this item as profile",
-  "item.page.claim.tooltip": "Prohlásit tento záznam za profilovou",
+  "item.page.claim.tooltip": "Prohlásit tento záznam za profil",
 
   // "item.page.image.alt.ROR": "ROR logo",
   // TODO New key - Add a translation
@@ -5414,7 +5414,7 @@
   "mydspace.show.workspace": "Vaše záznamy",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  "mydspace.show.supervisedWorkspace": "Zkontrolované záznamy",
+  "mydspace.show.supervisedWorkspace": "Záznamy pod dohledem",
 
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Archivováno",
@@ -6922,7 +6922,7 @@
   "search.filters.applied.f.birthDate.min": "Datum narození od",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  "search.filters.applied.f.supervisedBy": "Zkontrolováno",
+  "search.filters.applied.f.supervisedBy": "Pod dohledem",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Vyřazeno",
@@ -7221,8 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",
@@ -8924,7 +8923,7 @@
   "virtual-metadata.delete-relationship.modal-head": "Vyberte záznamy, pro které chcete uložit virtuální metadata jako skutečná metadata",
 
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  "supervisedWorkspace.search.results.head": "Zkontrolované záznamy",
+  "supervisedWorkspace.search.results.head": "Záznamy pod dohledem",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Moje záznamy",

From e7da6e42f70e00f0220c4dc50ba84fbcd450be36 Mon Sep 17 00:00:00 2001
From: milanmajchrak <milan.majchrak@dataquest.sk>
Date: Fri, 8 Nov 2024 15:24:06 +0100
Subject: [PATCH 0856/1286] Updated supervised by messages following NTK
 suggestions

(cherry picked from commit d819cf43968665c20870ee16a1620e744dfbd821)
---
 src/assets/i18n/cs.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index f06db668a3..866660f513 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -4221,10 +4221,10 @@
   "workflow-item.search.result.notification.deleted.failure": "Při mazání příkazu supervize \"{{name}}\" došlo k chybě",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  "workflow-item.search.result.list.element.supervised-by": "Pod dohledem:",
+  "workflow-item.search.result.list.element.supervised-by": "Dohlížející autorita:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat skupinu dohledu",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Odebrat dohlížející autoritu",
 
   // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
   // TODO New key - Add a translation
@@ -7221,7 +7221,7 @@
   "search.filters.filter.supervisedBy.placeholder": "Supervised By",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  "search.filters.filter.supervisedBy.label": "Hledat pod dohledem",
+  "search.filters.filter.supervisedBy.label": "Hledat dohlížející autoritu",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Číslo časopisu",

From 20263073c68b727932844c6037bcf2602a5cab2f Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 11 Nov 2024 13:57:43 -0500
Subject: [PATCH 0857/1286] French translations for COAR Notify  LDN Service

Contains all translations in french for new DSpace 8 COAR Notify module.
---
 src/assets/i18n/fr.json5 | 1132 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 1132 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 2ea96ad58d..d334789f7e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -7149,6 +7149,1138 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Sélectionnez la date jusqu'à laquelle la condition d'accès liée est appliquée",
 
+  //"vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Ajouter",
 
+  //"admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Réclamer une publication",
+
+  //"admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Réclamer une publication",
+
+  //"coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocole COAR Notify",
+
+  //"coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Le protocole COAR Notify est destiné à améliorer la communication entre dépôts. Afin d'en savoir plus sur ce protocole, consulter le <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">site web COAR Notify</a>.",
+
+  //"coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Boîte aux lettres LDN",
+
+  //"coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "La boîte aux lettres LDN (Linked Data Notifications) est accessible à l'adresse {{ ldnInboxUrl }}. La boîte aux lettres LDN permet la communication et l'échange de données afin de garantir une collaboration effective et efficiente.",
+
+  //"coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Modération des messages",
+
+  //"coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Afin d'assurer un environnement sécuritaire et productif, tous les messages LDN entrants font l'objet d'une modération. Si vous envisagez d'échanger de l'information avec nous, veuillez nous contacter en utilisant notre",
+
+  //"coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " formulaire.",
+
+  //"service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Supprimer le service",
+
+  //"ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Services enregistrés",
+
+  //"ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nom",
+
+  //"ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Description",
+
+  //"ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Statut",
+
+  //"ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Action",
+
+  //"ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOUVEAU",
+
+  //"ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Services enregistrés",
+
+  //"ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Activé",
+
+  //"ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Désactivé",
+
+  //"ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Cliquer pour activer",
+
+  //"ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Cliquer pour désactiver",
+
+  //"ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Éditer le service",
+
+  //"ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Créer un service",
+
+  //"service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Créer un service",
+
+  //"service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "S'il vous plaît, confirmer la création de ce service.",
+
+  //"ldn-service-status": "Status",
+  "ldn-service-status": "Statut",
+
+  //"service.confirm.create": "Create",
+  "service.confirm.create": "Créer",
+
+  //"service.refuse.create": "Cancel",
+  "service.refuse.create": "Annuler",
+
+  //"ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Enregistrer un nouveau service",
+
+  //"ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Sauvegarder",
+
+  //"ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nom",
+
+  //"ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Description",
+
+  //"ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL du service",
+
+  //"ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Intervalle IP du service",
+
+  //"ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Niveau de confiance",
+
+  //"ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL de la boîte aux lettres LDN",
+
+  //"ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "S'il vous plaît, fournissez le nom du service",
+
+  //"ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "S'il vous plaît, décrivez votre service",
+
+  //"ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "S'il vous plaît, fournissez l'URL pour les usagers afin qu'ils puissent consulter plus d'information sur le service.",
+
+  //"ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Limite inférieure de l'intervalle IPv4",
+
+  //"ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Limite supérieure de l'intervalle IPv4",
+
+  //"ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "S'il vous plaît, spécifiez l'URL de la boîte aux lettres LDN",
+
+  //"ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "S'il vous plaît, saisissez une valeur entre 0 et 1. Utilisez le “.” comme séparateur de décimale.",
+
+  //"ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Sélectionnez un modèle",
+
+  //"ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Accuser réception et accepter",
+
+  //"ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Ce modèle est utilisé pour accuser réception et accepter une requête (offre). Il implique une intention de donner suite à la requête.",
+
+  //"ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Accuser réception et refuser",
+
+  //"ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Ce modèle est utilisé pour accuser réception et refuser une requête (offre). Il signifie qu'aucune action supplémentaire n'est nécessaire pour la requête.",
+
+  //"ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Accuser réception et accepter provisoirement",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Ce modèle est utilisé pour accuser réception et accepter provisoirement une requête (offre). Il implique une intention d'agir qui pourrait changer.",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Accuser réception et refuser provisoirement",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Ce modèle est utilisé pour accuser réception et refuser provisoirement une requête (offre). Il implique qu'aucune action supplémentaire n'est nécessaire sous réserve de modification.",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Annocer l'approbation",
+
+  //"ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Ce modèle est utilisé pour annoncer l'existence d'une approbation, référençant la ressource approuvée.",
+
+  //"ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Annoncer l'ingestion",
+
+  //"ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Ce modèle est utilisé pour annoncer qu'une ressource a été ingérée.",
+
+  //"ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Annoncer la relation",
+
+  //"ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Ce modèle est utilisé pour annoncer une relation entre 2 ressources.",
+
+  //"ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Annoncer l'évaluation",
+
+  //"ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Ce modèle est utilisé pour annoncer l'existence d'une évaluation, référencant la ressource évaluée.",
+
+  //"ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Annoncer le résultat de service",
+
+  //"ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Ce modèle est utilisé pour annoncer l'existence d'un 'résultat de service', référençant la ressource pertinente.",
+
+  //"ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Annonces",
+
+  //"ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Approbation de la requête",
+
+  //"ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Ce modèle est utilisé pour demander l'approbation d'une ressource appartenant au système d'origine.",
+
+  //"ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Requêtes",
+
+  //"ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Demander l'ingestion",
+
+  //"ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Ce modèle est utilisé pour demander au système cible d'ingérer une ressource.",
+
+  //"ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Requêtes",
+
+  //"ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Requête d'évaluation",
+
+  //"ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Ce modèle est utilisé pour demander l'évaluation d'une ressource appartenant au système d'origine.",
+
+  //"ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Requêtes",
+
+  //"ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Retirer l'offre",
+
+  //"ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Ce modèle est utilisé pour retirer une offre faite précédemment.",
+
+  //"ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Retirer",
+
+  //"ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "Aucun filtre d'Item sélectionné",
+
+  //"ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtre d'Item",
+
+  //"ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automatique",
+
+  //"ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Le nom est obligatoire",
+
+  //"ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "L'URL est obligatoire",
+
+  //"ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "S'il vous plaît, saisissez un intervalle IP valide.",
+
+  //"ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "S'il vous plaît, saisissez une adresse IpV4 valide pour chaque limite de l'intervalle (note: pour une adresse IP unique, entrez les mêmes valeurs dans les 2 champs).",
+
+  //"ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "L'URL LDN est obligatoire.",
+
+  //"ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Au moins un modèle est requis.",
+
+  //"ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "S'il vous plaît, saisissez une note valide (entre 0 et 1). Utilisez le “.” comme séparateur de décimale.",
+
+  //"ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Modèle supporté",
+
+  //"ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Ajouter",
+
+  //"ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Supprimer",
+
+  //"ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nouveau service",
+
+  //"service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Êtes-vous sûr de vouloir supprimer ce service ?",
+
+  //"service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirmez-vous les changements ?",
+
+  //"service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Modifier le service",
+
+  //"service.detail.update": "Confirm",
+  "service.detail.update": "Confirmer",
+
+  //"service.detail.return": "Cancel",
+  "service.detail.return": "Annuler",
+
+  //"service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Êtes-vous sûr de vouloir ignorer les changements et de quitter ?",
+
+  //"service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Ignorer les changements",
+
+  //"service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Ignorer",
+
+  //"admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Modification réussie",
+
+  //"admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "Le service a été modifié.",
+
+  //"admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "La modification a échoué.",
+
+  //"admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "Le service a été modifié.",
+
+  //"ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Création réussie",
+
+  //"ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "Le service a été crée.",
+
+  //"ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Échec de la création",
+
+  //"ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "Le service n'a pas été crée.",
+
+  //"ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Sélectionnez au moins un modèle entrant.",
+
+  //"ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Mise à jour du statut réussie",
+
+  //"ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "Le statut du service a été mis à jour.",
+
+  //"ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Suppression réussie",
+
+  //"ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "Le service a été supprimé.",
+
+  //"ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Échec de la suppression",
+
+  //"ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "Le service n'a pas été supprimé.",
+
+  //"service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Annuler",
+
+  //"service.overview.delete": "Delete service",
+  "service.overview.delete": "Supprimer le service",
+
+  //"ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Modifier le service",
+
+  //"ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nom",
+
+  //"ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Description",
+
+  //"ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL du service",
+
+  //"ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL de la boîte aux lettres LDN",
+
+  //"ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Modèle entrant",
+
+  //"ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Aucun modèle entrant",
+
+  //"ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtre d'Item sélectionné",
+
+  //"ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Aucun filtre d'Item",
+
+  //"ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automatique",
+
+  //"ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Ajouter",
+
+  //"ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Sauvegarder",
+
+  //"ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Éditer le service",
+
+  //"ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Ne rien sélectionner",
+
+  //"ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Erreur",
+
+  //"ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Une erreur s'est produite lors de la création de ce processus.",
+
+  //"ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Succès",
+
+  //"ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "Le processus a été créé.",
+
+  //"submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "Le service sélectionné est compatible avec l'Item d'après son statut actuel. {{ service.name }}: {{ service.description }}",
+
+  //"item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Approbation",
+
+  //"item.page.review": "Review",
+  "item.page.review": "Évaluation",
+
+  //"item.page.referenced": "Referenced By",
+  "item.page.referenced": "Référencé par",
+
+  //"item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complété par",
+
+  //"menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Aperçu des services LDN",
+
+  //"menu.section.services": "LDN Services",
+  "menu.section.services": "Services LDN",
+
+  //"menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Service LDN",
+
+  //"quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "Vous pouvez consulter ci-dessous tous les sujets reçus de l'abonnement à {{source}} en ce qui concerne",
+
+  //"quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "En dessous de la liste des suggestions pour le sujet sélectionné <b>{{topic}}</b>, en relation avec <b>{{source}}</b>.",
+
+  //"quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "En dessous de la liste des suggestions pour le sujet sélectionné <b>{{topic}}</b>, en relation avec <b>{{source}}</b> and ",
+
+  //"quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL du service :",
+
+  //"quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Lien :",
+
+  //"service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Annuler",
+
+  //"service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Supprimer le service",
+
+  //"service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Supprimer le service",
+
+  //"service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Êtes-vous sûr de vouloir supprimer ce service ?",
+
+  //"service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Supprimer le service",
+
+  //"service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "Le service a été supprimé.",
+
+  //"service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Une erreure s'est produite lors de la suppression du service.",
+
+  //"service.overview.table.id": "Services ID",
+  "service.overview.table.id": "Identifiants des services",
+
+  //"service.overview.table.name": "Name",
+  "service.overview.table.name": "Nom",
+
+  //"service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Heure de début (UTC)",
+
+  //"service.overview.table.status": "Status",
+  "service.overview.table.status": "Statut",
+
+  //"service.overview.table.user": "User",
+  "service.overview.table.user": "Utilisateur",
+
+  //"service.overview.title": "Services Overview",
+  "service.overview.title": "Aperçu des services",
+
+  //"service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Aperçu des services",
+
+  //"service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Actions",
+
+  //"service.overview.table.description": "Description",
+  "service.overview.table.description": "Description",
+
+  //"submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  //"submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Vous pouvez demander une évaluation à l'un des services suivants",
+
+  //"submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Vous pouvez demander une approbation à l'une des épirevues suivantes",
+
+  //"submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Vous pouvez demander à ce qu'une copie de votre soumission soit ingérée par l'un des services suivants",
+
+  //"submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "Aucune donnée disponible",
+
+  //"submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Ne rien sélectionner",
+
+  //"submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Sélectionner un service pour {{ pattern }} pour cet Item",
+
+  //"submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Description du service sélectionné :",
+
+  //"submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "Aucune autre information n'est disponible",
+
+  //"submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "Le service sélectionné n'est pas approprié pour cet Item. Consulter la description afin de savoir quel Item est approprié pour ce service.",
+
+  //"submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "Aucun modèle configurable n'a été trouvé.",
+
+  //"error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtre invalide, sélectionnez un autre service ou aucun service.",
+
+  //"request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> a été pris en charge.",
+
+  //"request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> a été rejeté.",
+
+  //"request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> est en attente.",
+
+  //"ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Sélectionner le modèle pour suppression",
+
+  //"ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Désélectionner le modèle pour suppression",
+
+  //"ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Sélectionner le filtre de l'Item pour le modèle",
+
+  //"ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Sélectionner un modèle pour le service",
+
+  //"ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Sélectionner le service à supprimer",
+
+  //"ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Modifier le service LDN",
+
+  //"ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Fermer la fenêtre",
+
+  //"a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "Le type de l'Item est Article de revue ou Jeu de donnnées",
+
+  //"always_true_filter.label": "Always true",
+  "always_true_filter.label": "Toujours vrai",
+
+  //"automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Traitement automatique",
+
+  //"dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "L'URI contient un DOI",
+
+  //"doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtre DOI",
+
+  //"driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "Le type de document correspond à Driver",
+
+  //"has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "A au moins un Bitstream",
+
+  //"has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "A un Bitstream",
+
+  //"has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "A un Bitstream",
+
+  //"is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Est archivé",
+
+  //"is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Est retiré",
+
+  //"item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "L'Item est public",
+
+  //"journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestion des revues",
+
+  //"title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "Le titre commence par le modèle",
+
+  //"type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "Le type de document est Jeu de données",
+
+  //"type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "Le type de document est Article de revue",
+
+  //"ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Aucun",
+
+  //"admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Tableau de bord",
+
+  //"menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Tableau de bord",
+
+  //"menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  //"admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Tableau de bord Notify",
+
+  //"admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "Le tableau de bord Notify surveille l'utilisation générale du protocole COAR Notify dans le dépôt. Les statistiques d'utilisation du protocole COAR Notify sont dans l'onglet “Métrique”. Dans les onglets “Journaux/Entrant” et “Journaux/Sortant” il est possible de rechercher et vérifier le statut de chaque message LDN, qu'il ait été reçu ou envoyé.",
+
+  //"admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Metriques",
+
+  //"admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Nombre de LDN reçu",
+
+  //"admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Nombre de LDN généré",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepté",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Avis entrant acceptés",
+
+  //"admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Affiché actuellement : avis acceptés",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN traités",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Avis entrant traités",
+
+  //"admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Affiché actuellement : LDN traités",
+
+  //"admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Affiché actuellement : avis en échec",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Échec",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Avis entrant en échec",
+
+  //"admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Affiché actuellement : avis en échec",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Échec",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Avis sortant en échec",
+
+  //"admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Affiché actuellement : avis non fiables",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Non fiable",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Avis entrant non fiable",
+
+  //"admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Affiché actuellement : avis livrés",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Avis entrants livrés avec succès",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Livrés",
+
+  //"admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Affiché actuellement : avis livrés",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Avis sortant livrés avec succès",
+
+  //"admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Affiché actuellement : avis dans la liste d'attente",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Avis actuellement dans la liste d'attente",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Ajouter à la liste d'attente",
+
+  //"admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Affiché actuellement : Avis en attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En file d'attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Avis actuellement en attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items impliqués",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items liés aux avis entrants",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items impliqués",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items liés aux avis sortants",
+
+  //"admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Tableau de bord",
+
+  //"admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Messages entrants",
+
+  //"admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Journaux/Entrant",
+
+  //"admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtre : ",
+
+  //"search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Items liés",
+
+  //"search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Service LDN",
+
+  //"search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Évaluation Notify",
+
+  //"search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Approbation Notify",
+
+  //"search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Relation Notify",
+
+  //"search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Dernière heure de traitement ",
+
+  //"search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Intervalle minimum",
+
+  //"search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Intervalle maximum",
+
+  //"search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Intervalle minimum",
+
+  //"search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Intervalle maximum",
+
+  //"admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Messages sortants",
+
+  //"admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Journaux/Sortant",
+
+  //"NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "À venir",
+
+  //"search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Item lié",
+
+  //"search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origine",
+
+  //"search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Service LDN",
+
+  //"search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Cible",
+
+  //"search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Statut de la file d'attente",
+
+  //"search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Type de flux d'activité",
+
+  //"search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Type COAR Notify",
+
+  //"search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Type d'avis",
+
+  //"search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Chercher des Items liés",
+
+  //"search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Chercher le statut de la file d'attente",
+
+  //"search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Chercher la cible",
+
+  //"search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Chercheur le type de flux d'activité",
+
+  //"search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Statut de la file d'attente",
+
+  //"search.filters.queue_status.0,authority": "Untrusted Ip"
+  "search.filters.queue_status.0,authority": "IP non fiable",
+
+  //"search.filters.queue_status.1,authority": "Queued", 
+  "search.filters.queue_status.1,authority": "Dans la file d'attente",
+
+  //"search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "En traitement",
+
+  //"search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Traité",
+
+  //"search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "En échec",
+
+  //"search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "Non fiable",
+
+  //"search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Action non répertoriée",
+
+  //"search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En file d'attente pour une nouvelle tentative",
+
+  //"search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Type de flux d'activité",
+
+  //"search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Type COAR Notify",
+
+  //"search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Type d'avis",
+
+  //"search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Chercher le type COAR Notify",
+
+  //"search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Chercher le type d'avis",
+
+  //"search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Items liés",
+
+  //"search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Cible",
+
+  //"search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Chercher la source",
+
+  //"search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Source",
+
+  //"search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Chercher le service LDN",
+
+  //"search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Service LDN",
+
+  //"search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Statut de la file d'attente",
+
+  //"search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Type de flux d'activité",
+
+  //"search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Type COAR Notify",
+
+  //"search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Avis",
+
+  //"search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Relation Notify",
+
+  //"search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Chercher une relation Notify",
+
+  //"search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Relation Notify",
+
+  //"search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Évaluation Notify",
+
+  //"search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Chercher une évaluation Notify",
+
+  //"search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Évaluation Notify",
+
+  //"search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Action d'évaluation",
+
+  //"search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Action d'évaluation",
+
+  //"notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Action d'évaluation",
+
+  //"search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Action d'approbation",
+
+  //"search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Action d'approbation",
+
+  //"notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Action d'approbation",
+
+  //"search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Action d'ingestion",
+
+  //"search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Action d'ingestion",
+
+  //"notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Action d'ingestion",
+
+  //"search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Action de relation",
+
+  //"search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Action de relation",
+
+  //"notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Action de relation",
+
+  //"search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En file d'attente",
+
+  //"notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En file d'attente",
+
+  //"search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En file d'attente pour une nouvelle tentative",
+
+  //"notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En file d'attente pour une nouvelle tentative",
+
+  //"search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "En traitement",
+
+  //"notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "En traitement",
+
+  //"search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Traité",
+
+  //"notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Traité",
+
+  //"search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "En échec",
+
+  //"notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "En échec",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Non fiable",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP non fiable",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Non fiable",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP non fiable",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Action non répertoriée",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Action non répertoriée",
+
+  //"sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Dernière file d'attente démarrée Descendant",
+
+  //"sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Dernière file d'attente démarrée Ascendant",
+
+  //"sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Tentative de mise en file d'attente Descendant",
+
+  //"sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Tentative de mise en file d'attente Ascendant",
+
+  //"NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items inclus dans le LDN entrant",
+
+  //"NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items inclus dans le LDN en cours",
+
+  //"type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Type",
+
+  //"id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Identifiant",
+
+  //"coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Type COAR Notify",
+
+  //"activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Type de flux d'activité",
+
+  //"inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En réponse à",
+
+  //"object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Item du dépôt",
+
+  //"context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Item du dépôt",
+
+  //"queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Tentatives de mise en file d'attente",
+
+  //"queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Dernière file d'attente démarrée",
+
+  //"origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Service LDN",
+
+  //"target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Service LDN",
+
+  //"queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Statut de la file d'attente",
+
+  //"queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Délai de mise en file d'attente",
+
+  //"notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Détail du message",
+
+  //"notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Voir le message",
+
+  //notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Estampille temporelle",
+
+  //"notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Item du dépôt",
+
+  //"notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Service LDN",
+
+  //"notify-message-result.type": "Type",
+  "notify-message-result.type": "Type",
+
+  //"notify-message-result.status": "Status",
+  "notify-message-result.status": "Statut",
+
+  //"notify-message-result.action": "Action",
+  "notify-message-result.action": "Action",
+
+  //"notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Détail",
+
+  //"notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Réexécuter",
+
+  //"notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Traité",
+
+  //"notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "En échec",
+
+  //"notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En file d'attente pour une nouvelle tentative",
+
+  //"notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Action non répertoriée",
+
+  //"notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "En traitement",
+
+  //"notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En file d'attente",
+
+  //"notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "Non fiable",
+
+  //"ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Service LDN",
+
+  //"relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Item lié",
+
+  //"search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Approbation Notify",
+
+  //"search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Approbation Notify",
+
+  //"search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Chercher l'approbation Notify",
+
+  //"item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licence Creative Commons",
+
+  //"item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Sauf indication contraire, la licence de cet Item est décrite comme",
+
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Chercher dans le dépôt",
 }
 

From 60dfe056dd06b08263cdcfad0c2c3d4d93abeb8e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 11 Nov 2024 14:27:41 -0500
Subject: [PATCH 0858/1286] Fixes lint error Trailing spaces

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index d334789f7e..af17af859a 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -7983,7 +7983,7 @@
   //"search.filters.queue_status.0,authority": "Untrusted Ip"
   "search.filters.queue_status.0,authority": "IP non fiable",
 
-  //"search.filters.queue_status.1,authority": "Queued", 
+  //"search.filters.queue_status.1,authority": "Queued",
   "search.filters.queue_status.1,authority": "Dans la file d'attente",
 
   //"search.filters.queue_status.2,authority": "Processing",

From 898b5fa634e4d09f7c366ceaa833a9af32d5dd47 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 11 Nov 2024 13:57:43 -0500
Subject: [PATCH 0859/1286] French translations for COAR Notify  LDN Service

Contains all translations in french for new DSpace 8 COAR Notify module.

(cherry picked from commit 20263073c68b727932844c6037bcf2602a5cab2f)
---
 src/assets/i18n/fr.json5 | 1132 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 1132 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 2ea96ad58d..d334789f7e 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -7149,6 +7149,1138 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Sélectionnez la date jusqu'à laquelle la condition d'accès liée est appliquée",
 
+  //"vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Ajouter",
 
+  //"admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Réclamer une publication",
+
+  //"admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Réclamer une publication",
+
+  //"coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocole COAR Notify",
+
+  //"coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Le protocole COAR Notify est destiné à améliorer la communication entre dépôts. Afin d'en savoir plus sur ce protocole, consulter le <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">site web COAR Notify</a>.",
+
+  //"coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Boîte aux lettres LDN",
+
+  //"coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "La boîte aux lettres LDN (Linked Data Notifications) est accessible à l'adresse {{ ldnInboxUrl }}. La boîte aux lettres LDN permet la communication et l'échange de données afin de garantir une collaboration effective et efficiente.",
+
+  //"coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Modération des messages",
+
+  //"coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Afin d'assurer un environnement sécuritaire et productif, tous les messages LDN entrants font l'objet d'une modération. Si vous envisagez d'échanger de l'information avec nous, veuillez nous contacter en utilisant notre",
+
+  //"coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " formulaire.",
+
+  //"service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Supprimer le service",
+
+  //"ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Services enregistrés",
+
+  //"ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nom",
+
+  //"ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Description",
+
+  //"ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Statut",
+
+  //"ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Action",
+
+  //"ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOUVEAU",
+
+  //"ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Services enregistrés",
+
+  //"ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Activé",
+
+  //"ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Désactivé",
+
+  //"ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Cliquer pour activer",
+
+  //"ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Cliquer pour désactiver",
+
+  //"ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Éditer le service",
+
+  //"ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Créer un service",
+
+  //"service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Créer un service",
+
+  //"service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "S'il vous plaît, confirmer la création de ce service.",
+
+  //"ldn-service-status": "Status",
+  "ldn-service-status": "Statut",
+
+  //"service.confirm.create": "Create",
+  "service.confirm.create": "Créer",
+
+  //"service.refuse.create": "Cancel",
+  "service.refuse.create": "Annuler",
+
+  //"ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Enregistrer un nouveau service",
+
+  //"ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Sauvegarder",
+
+  //"ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nom",
+
+  //"ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Description",
+
+  //"ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL du service",
+
+  //"ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Intervalle IP du service",
+
+  //"ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Niveau de confiance",
+
+  //"ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL de la boîte aux lettres LDN",
+
+  //"ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "S'il vous plaît, fournissez le nom du service",
+
+  //"ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "S'il vous plaît, décrivez votre service",
+
+  //"ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "S'il vous plaît, fournissez l'URL pour les usagers afin qu'ils puissent consulter plus d'information sur le service.",
+
+  //"ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Limite inférieure de l'intervalle IPv4",
+
+  //"ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Limite supérieure de l'intervalle IPv4",
+
+  //"ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "S'il vous plaît, spécifiez l'URL de la boîte aux lettres LDN",
+
+  //"ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "S'il vous plaît, saisissez une valeur entre 0 et 1. Utilisez le “.” comme séparateur de décimale.",
+
+  //"ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Sélectionnez un modèle",
+
+  //"ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Accuser réception et accepter",
+
+  //"ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Ce modèle est utilisé pour accuser réception et accepter une requête (offre). Il implique une intention de donner suite à la requête.",
+
+  //"ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Accuser réception et refuser",
+
+  //"ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Ce modèle est utilisé pour accuser réception et refuser une requête (offre). Il signifie qu'aucune action supplémentaire n'est nécessaire pour la requête.",
+
+  //"ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Accuser réception et accepter provisoirement",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Ce modèle est utilisé pour accuser réception et accepter provisoirement une requête (offre). Il implique une intention d'agir qui pourrait changer.",
+
+  //"ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Accuser réception et refuser provisoirement",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Ce modèle est utilisé pour accuser réception et refuser provisoirement une requête (offre). Il implique qu'aucune action supplémentaire n'est nécessaire sous réserve de modification.",
+
+  //"ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Accusés de réception",
+
+  //"ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Annocer l'approbation",
+
+  //"ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Ce modèle est utilisé pour annoncer l'existence d'une approbation, référençant la ressource approuvée.",
+
+  //"ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Annoncer l'ingestion",
+
+  //"ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Ce modèle est utilisé pour annoncer qu'une ressource a été ingérée.",
+
+  //"ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Annoncer la relation",
+
+  //"ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Ce modèle est utilisé pour annoncer une relation entre 2 ressources.",
+
+  //"ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Annoncer l'évaluation",
+
+  //"ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Ce modèle est utilisé pour annoncer l'existence d'une évaluation, référencant la ressource évaluée.",
+
+  //"ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Annonces",
+
+  //"ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Annoncer le résultat de service",
+
+  //"ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Ce modèle est utilisé pour annoncer l'existence d'un 'résultat de service', référençant la ressource pertinente.",
+
+  //"ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Annonces",
+
+  //"ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Approbation de la requête",
+
+  //"ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Ce modèle est utilisé pour demander l'approbation d'une ressource appartenant au système d'origine.",
+
+  //"ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Requêtes",
+
+  //"ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Demander l'ingestion",
+
+  //"ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Ce modèle est utilisé pour demander au système cible d'ingérer une ressource.",
+
+  //"ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Requêtes",
+
+  //"ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Requête d'évaluation",
+
+  //"ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Ce modèle est utilisé pour demander l'évaluation d'une ressource appartenant au système d'origine.",
+
+  //"ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Requêtes",
+
+  //"ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Retirer l'offre",
+
+  //"ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Ce modèle est utilisé pour retirer une offre faite précédemment.",
+
+  //"ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Retirer",
+
+  //"ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "Aucun filtre d'Item sélectionné",
+
+  //"ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtre d'Item",
+
+  //"ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automatique",
+
+  //"ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Le nom est obligatoire",
+
+  //"ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "L'URL est obligatoire",
+
+  //"ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "S'il vous plaît, saisissez un intervalle IP valide.",
+
+  //"ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "S'il vous plaît, saisissez une adresse IpV4 valide pour chaque limite de l'intervalle (note: pour une adresse IP unique, entrez les mêmes valeurs dans les 2 champs).",
+
+  //"ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "L'URL LDN est obligatoire.",
+
+  //"ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Au moins un modèle est requis.",
+
+  //"ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "S'il vous plaît, saisissez une note valide (entre 0 et 1). Utilisez le “.” comme séparateur de décimale.",
+
+  //"ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Modèle supporté",
+
+  //"ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Ajouter",
+
+  //"ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Supprimer",
+
+  //"ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nouveau service",
+
+  //"service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Êtes-vous sûr de vouloir supprimer ce service ?",
+
+  //"service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirmez-vous les changements ?",
+
+  //"service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Modifier le service",
+
+  //"service.detail.update": "Confirm",
+  "service.detail.update": "Confirmer",
+
+  //"service.detail.return": "Cancel",
+  "service.detail.return": "Annuler",
+
+  //"service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Êtes-vous sûr de vouloir ignorer les changements et de quitter ?",
+
+  //"service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Ignorer les changements",
+
+  //"service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Ignorer",
+
+  //"admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Modification réussie",
+
+  //"admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "Le service a été modifié.",
+
+  //"admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "La modification a échoué.",
+
+  //"admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "Le service a été modifié.",
+
+  //"ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Création réussie",
+
+  //"ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "Le service a été crée.",
+
+  //"ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Échec de la création",
+
+  //"ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "Le service n'a pas été crée.",
+
+  //"ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Sélectionnez au moins un modèle entrant.",
+
+  //"ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Mise à jour du statut réussie",
+
+  //"ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "Le statut du service a été mis à jour.",
+
+  //"ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Suppression réussie",
+
+  //"ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "Le service a été supprimé.",
+
+  //"ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Échec de la suppression",
+
+  //"ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "Le service n'a pas été supprimé.",
+
+  //"service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Annuler",
+
+  //"service.overview.delete": "Delete service",
+  "service.overview.delete": "Supprimer le service",
+
+  //"ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Modifier le service",
+
+  //"ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nom",
+
+  //"ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Description",
+
+  //"ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL du service",
+
+  //"ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL de la boîte aux lettres LDN",
+
+  //"ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Modèle entrant",
+
+  //"ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Aucun modèle entrant",
+
+  //"ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtre d'Item sélectionné",
+
+  //"ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Aucun filtre d'Item",
+
+  //"ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automatique",
+
+  //"ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Ajouter",
+
+  //"ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Sauvegarder",
+
+  //"ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Éditer le service",
+
+  //"ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Ne rien sélectionner",
+
+  //"ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Erreur",
+
+  //"ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Une erreur s'est produite lors de la création de ce processus.",
+
+  //"ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Succès",
+
+  //"ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "Le processus a été créé.",
+
+  //"submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "Le service sélectionné est compatible avec l'Item d'après son statut actuel. {{ service.name }}: {{ service.description }}",
+
+  //"item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Approbation",
+
+  //"item.page.review": "Review",
+  "item.page.review": "Évaluation",
+
+  //"item.page.referenced": "Referenced By",
+  "item.page.referenced": "Référencé par",
+
+  //"item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complété par",
+
+  //"menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Aperçu des services LDN",
+
+  //"menu.section.services": "LDN Services",
+  "menu.section.services": "Services LDN",
+
+  //"menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Service LDN",
+
+  //"quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "Vous pouvez consulter ci-dessous tous les sujets reçus de l'abonnement à {{source}} en ce qui concerne",
+
+  //"quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "En dessous de la liste des suggestions pour le sujet sélectionné <b>{{topic}}</b>, en relation avec <b>{{source}}</b>.",
+
+  //"quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "En dessous de la liste des suggestions pour le sujet sélectionné <b>{{topic}}</b>, en relation avec <b>{{source}}</b> and ",
+
+  //"quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL du service :",
+
+  //"quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Lien :",
+
+  //"service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Annuler",
+
+  //"service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Supprimer le service",
+
+  //"service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Supprimer le service",
+
+  //"service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Êtes-vous sûr de vouloir supprimer ce service ?",
+
+  //"service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Supprimer le service",
+
+  //"service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "Le service a été supprimé.",
+
+  //"service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Une erreure s'est produite lors de la suppression du service.",
+
+  //"service.overview.table.id": "Services ID",
+  "service.overview.table.id": "Identifiants des services",
+
+  //"service.overview.table.name": "Name",
+  "service.overview.table.name": "Nom",
+
+  //"service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Heure de début (UTC)",
+
+  //"service.overview.table.status": "Status",
+  "service.overview.table.status": "Statut",
+
+  //"service.overview.table.user": "User",
+  "service.overview.table.user": "Utilisateur",
+
+  //"service.overview.title": "Services Overview",
+  "service.overview.title": "Aperçu des services",
+
+  //"service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Aperçu des services",
+
+  //"service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Actions",
+
+  //"service.overview.table.description": "Description",
+  "service.overview.table.description": "Description",
+
+  //"submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  //"submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Vous pouvez demander une évaluation à l'un des services suivants",
+
+  //"submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Vous pouvez demander une approbation à l'une des épirevues suivantes",
+
+  //"submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Vous pouvez demander à ce qu'une copie de votre soumission soit ingérée par l'un des services suivants",
+
+  //"submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "Aucune donnée disponible",
+
+  //"submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Ne rien sélectionner",
+
+  //"submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Sélectionner un service pour {{ pattern }} pour cet Item",
+
+  //"submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Description du service sélectionné :",
+
+  //"submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "Aucune autre information n'est disponible",
+
+  //"submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "Le service sélectionné n'est pas approprié pour cet Item. Consulter la description afin de savoir quel Item est approprié pour ce service.",
+
+  //"submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "Aucun modèle configurable n'a été trouvé.",
+
+  //"error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtre invalide, sélectionnez un autre service ou aucun service.",
+
+  //"request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> a été pris en charge.",
+
+  //"request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> a été rejeté.",
+
+  //"request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "Le {{ offerType }} demandé pour <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> est en attente.",
+
+  //"ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Sélectionner le modèle pour suppression",
+
+  //"ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Désélectionner le modèle pour suppression",
+
+  //"ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Sélectionner le filtre de l'Item pour le modèle",
+
+  //"ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Sélectionner un modèle pour le service",
+
+  //"ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Sélectionner le service à supprimer",
+
+  //"ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Modifier le service LDN",
+
+  //"ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Fermer la fenêtre",
+
+  //"a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "Le type de l'Item est Article de revue ou Jeu de donnnées",
+
+  //"always_true_filter.label": "Always true",
+  "always_true_filter.label": "Toujours vrai",
+
+  //"automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Traitement automatique",
+
+  //"dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "L'URI contient un DOI",
+
+  //"doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtre DOI",
+
+  //"driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "Le type de document correspond à Driver",
+
+  //"has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "A au moins un Bitstream",
+
+  //"has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "A un Bitstream",
+
+  //"has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "A un Bitstream",
+
+  //"is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Est archivé",
+
+  //"is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Est retiré",
+
+  //"item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "L'Item est public",
+
+  //"journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestion des revues",
+
+  //"title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "Le titre commence par le modèle",
+
+  //"type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "Le type de document est Jeu de données",
+
+  //"type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "Le type de document est Article de revue",
+
+  //"ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Aucun",
+
+  //"admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Tableau de bord",
+
+  //"menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Tableau de bord",
+
+  //"menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  //"admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Tableau de bord Notify",
+
+  //"admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "Le tableau de bord Notify surveille l'utilisation générale du protocole COAR Notify dans le dépôt. Les statistiques d'utilisation du protocole COAR Notify sont dans l'onglet “Métrique”. Dans les onglets “Journaux/Entrant” et “Journaux/Sortant” il est possible de rechercher et vérifier le statut de chaque message LDN, qu'il ait été reçu ou envoyé.",
+
+  //"admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Metriques",
+
+  //"admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Nombre de LDN reçu",
+
+  //"admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Nombre de LDN généré",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepté",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Avis entrant acceptés",
+
+  //"admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Affiché actuellement : avis acceptés",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN traités",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Avis entrant traités",
+
+  //"admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Affiché actuellement : LDN traités",
+
+  //"admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Affiché actuellement : avis en échec",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Échec",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Avis entrant en échec",
+
+  //"admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Affiché actuellement : avis en échec",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Échec",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Avis sortant en échec",
+
+  //"admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Affiché actuellement : avis non fiables",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Non fiable",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Avis entrant non fiable",
+
+  //"admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Affiché actuellement : avis livrés",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Avis entrants livrés avec succès",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Livrés",
+
+  //"admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Affiché actuellement : avis livrés",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Avis sortant livrés avec succès",
+
+  //"admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Affiché actuellement : avis dans la liste d'attente",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Avis actuellement dans la liste d'attente",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Ajouter à la liste d'attente",
+
+  //"admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Affiché actuellement : Avis en attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En file d'attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Avis actuellement en attente pour une nouvelle tentative",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items impliqués",
+
+  //"admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items liés aux avis entrants",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items impliqués",
+
+  //"admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items liés aux avis sortants",
+
+  //"admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Tableau de bord",
+
+  //"admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Messages entrants",
+
+  //"admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Journaux/Entrant",
+
+  //"admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtre : ",
+
+  //"search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Items liés",
+
+  //"search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Service LDN",
+
+  //"search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Évaluation Notify",
+
+  //"search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Approbation Notify",
+
+  //"search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Relation Notify",
+
+  //"search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Dernière heure de traitement ",
+
+  //"search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Intervalle minimum",
+
+  //"search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Intervalle maximum",
+
+  //"search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Intervalle minimum",
+
+  //"search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Intervalle maximum",
+
+  //"admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Messages sortants",
+
+  //"admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Journaux/Sortant",
+
+  //"NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "À venir",
+
+  //"search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Item lié",
+
+  //"search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origine",
+
+  //"search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Service LDN",
+
+  //"search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Cible",
+
+  //"search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Statut de la file d'attente",
+
+  //"search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Type de flux d'activité",
+
+  //"search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Type COAR Notify",
+
+  //"search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Type d'avis",
+
+  //"search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Chercher des Items liés",
+
+  //"search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Chercher le statut de la file d'attente",
+
+  //"search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Chercher la cible",
+
+  //"search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Chercheur le type de flux d'activité",
+
+  //"search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Statut de la file d'attente",
+
+  //"search.filters.queue_status.0,authority": "Untrusted Ip"
+  "search.filters.queue_status.0,authority": "IP non fiable",
+
+  //"search.filters.queue_status.1,authority": "Queued", 
+  "search.filters.queue_status.1,authority": "Dans la file d'attente",
+
+  //"search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "En traitement",
+
+  //"search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Traité",
+
+  //"search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "En échec",
+
+  //"search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "Non fiable",
+
+  //"search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Action non répertoriée",
+
+  //"search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En file d'attente pour une nouvelle tentative",
+
+  //"search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Type de flux d'activité",
+
+  //"search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Type COAR Notify",
+
+  //"search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Type d'avis",
+
+  //"search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Chercher le type COAR Notify",
+
+  //"search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Chercher le type d'avis",
+
+  //"search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Items liés",
+
+  //"search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Cible",
+
+  //"search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Chercher la source",
+
+  //"search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Source",
+
+  //"search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Chercher le service LDN",
+
+  //"search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Service LDN",
+
+  //"search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Statut de la file d'attente",
+
+  //"search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Type de flux d'activité",
+
+  //"search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Type COAR Notify",
+
+  //"search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Avis",
+
+  //"search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Relation Notify",
+
+  //"search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Chercher une relation Notify",
+
+  //"search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Relation Notify",
+
+  //"search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Évaluation Notify",
+
+  //"search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Chercher une évaluation Notify",
+
+  //"search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Évaluation Notify",
+
+  //"search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Action d'évaluation",
+
+  //"search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Action d'évaluation",
+
+  //"notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Action d'évaluation",
+
+  //"search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Action d'approbation",
+
+  //"search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Action d'approbation",
+
+  //"notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Action d'approbation",
+
+  //"search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Action d'ingestion",
+
+  //"search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Action d'ingestion",
+
+  //"notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Action d'ingestion",
+
+  //"search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Action de relation",
+
+  //"search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Action de relation",
+
+  //"notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Action de relation",
+
+  //"search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En file d'attente",
+
+  //"notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En file d'attente",
+
+  //"search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En file d'attente pour une nouvelle tentative",
+
+  //"notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En file d'attente pour une nouvelle tentative",
+
+  //"search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "En traitement",
+
+  //"notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "En traitement",
+
+  //"search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Traité",
+
+  //"notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Traité",
+
+  //"search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "En échec",
+
+  //"notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "En échec",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Non fiable",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP non fiable",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Non fiable",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP non fiable",
+
+  //"search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Action non répertoriée",
+
+  //"notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Action non répertoriée",
+
+  //"sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Dernière file d'attente démarrée Descendant",
+
+  //"sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Dernière file d'attente démarrée Ascendant",
+
+  //"sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Tentative de mise en file d'attente Descendant",
+
+  //"sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Tentative de mise en file d'attente Ascendant",
+
+  //"NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items inclus dans le LDN entrant",
+
+  //"NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items inclus dans le LDN en cours",
+
+  //"type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Type",
+
+  //"id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Identifiant",
+
+  //"coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Type COAR Notify",
+
+  //"activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Type de flux d'activité",
+
+  //"inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En réponse à",
+
+  //"object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Item du dépôt",
+
+  //"context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Item du dépôt",
+
+  //"queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Tentatives de mise en file d'attente",
+
+  //"queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Dernière file d'attente démarrée",
+
+  //"origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Service LDN",
+
+  //"target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Service LDN",
+
+  //"queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Statut de la file d'attente",
+
+  //"queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Délai de mise en file d'attente",
+
+  //"notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Détail du message",
+
+  //"notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Voir le message",
+
+  //notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Estampille temporelle",
+
+  //"notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Item du dépôt",
+
+  //"notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Service LDN",
+
+  //"notify-message-result.type": "Type",
+  "notify-message-result.type": "Type",
+
+  //"notify-message-result.status": "Status",
+  "notify-message-result.status": "Statut",
+
+  //"notify-message-result.action": "Action",
+  "notify-message-result.action": "Action",
+
+  //"notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Détail",
+
+  //"notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Réexécuter",
+
+  //"notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Traité",
+
+  //"notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "En échec",
+
+  //"notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En file d'attente pour une nouvelle tentative",
+
+  //"notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Action non répertoriée",
+
+  //"notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "En traitement",
+
+  //"notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En file d'attente",
+
+  //"notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "Non fiable",
+
+  //"ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Service LDN",
+
+  //"relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Item lié",
+
+  //"search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Approbation Notify",
+
+  //"search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Approbation Notify",
+
+  //"search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Chercher l'approbation Notify",
+
+  //"item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licence Creative Commons",
+
+  //"item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Sauf indication contraire, la licence de cet Item est décrite comme",
+
+  //"browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Chercher dans le dépôt",
 }
 

From 9e19e8d85965e2848512fe41376a3080e7d6a2ed Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 11 Nov 2024 14:27:41 -0500
Subject: [PATCH 0860/1286] Fixes lint error Trailing spaces

(cherry picked from commit 60dfe056dd06b08263cdcfad0c2c3d4d93abeb8e)
---
 src/assets/i18n/fr.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index d334789f7e..af17af859a 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -7983,7 +7983,7 @@
   //"search.filters.queue_status.0,authority": "Untrusted Ip"
   "search.filters.queue_status.0,authority": "IP non fiable",
 
-  //"search.filters.queue_status.1,authority": "Queued", 
+  //"search.filters.queue_status.1,authority": "Queued",
   "search.filters.queue_status.1,authority": "Dans la file d'attente",
 
   //"search.filters.queue_status.2,authority": "Processing",

From c062d95354cea7118b9ab2babc2759409fe2ae10 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 12 Nov 2024 11:33:45 +0100
Subject: [PATCH 0861/1286] 120150: Fixed authorization tab not loading in dev
 mode

---
 src/app/item-page/item-page.resolver.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index 22267f3ce6..ef59bf00b8 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -40,7 +40,7 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   store: Store<AppState> = inject(Store<AppState>),
   authService: AuthService = inject(AuthService),
 ): Observable<RemoteData<Item>> => {
-  return itemService.findById(
+  const itemRD$ = itemService.findById(
     route.params.id,
     true,
     false,
@@ -48,8 +48,14 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   ).pipe(
     getFirstCompletedRemoteData(),
     redirectOn4xx(router, authService),
+  );
+
+  itemRD$.subscribe((itemRD: RemoteData<Item>) => {
+    store.dispatch(new ResolvedAction(state.url, itemRD.payload));
+  });
+
+  return itemRD$.pipe(
     map((rd: RemoteData<Item>) => {
-      store.dispatch(new ResolvedAction(state.url, rd.payload));
       if (rd.hasSucceeded && hasValue(rd.payload)) {
         const thisRoute = state.url;
 

From aae373ef228f40fb154bb3d578fb0438b1f1a0f5 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 12 Nov 2024 11:33:45 +0100
Subject: [PATCH 0862/1286] 120150: Fixed authorization tab not loading in dev
 mode

(cherry picked from commit c062d95354cea7118b9ab2babc2759409fe2ae10)
---
 src/app/item-page/item-page.resolver.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index 431d8522e7..7c99188992 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -40,7 +40,7 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   store: Store<AppState> = inject(Store<AppState>),
   authService: AuthService = inject(AuthService),
 ): Observable<RemoteData<Item>> => {
-  return itemService.findById(
+  const itemRD$ = itemService.findById(
     route.params.id,
     true,
     false,
@@ -48,8 +48,14 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
   ).pipe(
     getFirstCompletedRemoteData(),
     redirectOn4xx(router, authService),
+  );
+
+  itemRD$.subscribe((itemRD: RemoteData<Item>) => {
+    store.dispatch(new ResolvedAction(state.url, itemRD.payload));
+  });
+
+  return itemRD$.pipe(
     map((rd: RemoteData<Item>) => {
-      store.dispatch(new ResolvedAction(state.url, rd.payload));
       if (rd.hasSucceeded && hasValue(rd.payload)) {
         const thisRoute = state.url;
 

From 2c161629486ee7252cc6a8bdc38f25aff64a673f Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 13 Nov 2024 10:19:02 -0500
Subject: [PATCH 0863/1286] French translations for subscriptions feature

Includes all french labels for subcriptions, plus 2 or 3 other missing things.
---
 src/assets/i18n/fr.json5 | 127 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index af17af859a..bee30294a9 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1122,12 +1122,21 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "En traitement",
 
+  //"admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Dépôts en cours",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Supprimer",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Retourner au déposant",
 
+  //"admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiques",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervision",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
 
@@ -1773,6 +1782,12 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Collection",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logo de la collection",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Chercher",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Dépôts récents",
 
@@ -1791,6 +1806,9 @@
   // "collection.page.news": "News",
   "collection.page.news": "Nouvelles",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Résultats de recherche",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmer la sélection",
 
@@ -2100,6 +2118,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sous-communautés et collections",
 
+  //"community.search.results.head": "Search Results",
+  "community.search.results.head": "Résultats de recherche",
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
@@ -3531,6 +3552,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Créer une nouvelle version",
 
+  //"item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Demander le retrait de cet Item",
+
+  //"item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Demander la réintégration de cet Item",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
 
@@ -4104,6 +4131,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processus",
 
+  //"menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notifications",
+
+  //"menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assurance qualité",
+
+  //"menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Réclamation de publication",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Épingler le menu latéral",
 
@@ -6445,9 +6481,90 @@
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Afficher",
 
-  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  //"submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
+  //"submitter.empty": "N/A",
+  "submitter.empty": "S/O",
+
+  //"subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Abonnements",
+
+  //"subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Type et fréquence",
+
+  //"subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Fermer",
+
+  //"subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pour vous désabonner, visitez la page Abonnements dans votre profil utilisateur",
+
+  //"subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenu",
+
+  //"subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Quotidienne",
+
+  //"subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Hebdomadaire",
+
+  //"subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensuelle",
+
+  //"subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "S'abonner",
+
+  //"subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Soumettre",
+
+  //"subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "En traitement...",
+
+  //"subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Abonnement à {{ type }} réussi.",
+
+  //"subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "L'abonnement a été résilié avec succès",
+
+  //"subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "L'abonnement à {{ type }} a été mis à jour avec succès",
+
+  //"subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Une erreur s'est produite lors de la création de l'abonnement",
+
+  //"subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Une erreur s'est produite lors de la résiliation de l'abonnement",
+
+  //"subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Une erreur s'est produite lors de la mise à jour de l'abonnement",
+
+  //"subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Sujet",
+
+  //"subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Type d'abonnement",
+
+  //"subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Fréquence",
+
+  //"subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Action",
+
+  //"subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Éditer",
+
+  //"subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Supprimer",
+
+  //"subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Indisponible",
+
+  //"subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'Item auquel vous étiez abonné a été supprimé, ou vous n'êtes pas autorisé à le consulter.",
+
+  //"subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Vous n'avez aucun abonnement. Pour vous abonnez à des mises à jour par courriel pour une commmunauté ou une collection, utilisez le bouton d'abonnement sur la page de l'Item.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",
 
@@ -6981,6 +7098,12 @@
   //"person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorisation ORCID",
 
+  //"home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Dépôts récents",
+
+  //"listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Cet objet n'a pas été trouvé.",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 
@@ -6996,8 +7119,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Messages d'avertissement",
 

From 844a605b5ee89f4e0188f211e4bb52f6dadc6936 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 19 Jul 2024 14:54:39 +0200
Subject: [PATCH 0864/1286] [CST-15591] Fixed headings by their rank

---
 .../create-collection-page.component.html          |  4 ++--
 .../create-community-page.component.html           |  6 +++---
 .../events/quality-assurance-events.component.html | 14 +++++++-------
 .../source/quality-assurance-source.component.html |  4 ++--
 .../topics/quality-assurance-topics.component.html |  4 ++--
 .../workspaceitem-actions.component.html           |  2 +-
 .../item-list-preview.component.html               |  2 +-
 .../scope-selector-modal.component.html            |  6 +++---
 .../search-results/search-results.component.html   |  2 +-
 .../sections/upload/section-upload.component.html  |  2 +-
 .../workspaceitems-delete-page.component.html      |  4 ++--
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index 6ca5533924..5c1b7b32a5 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,8 +1,8 @@
 <div class="container" *ngIf="(isLoading$ | async) === false">
   <div class="row">
     <div class="col-12 pb-4">
-      <h2 id="sub-header"
-          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
+      <h1 id="sub-header"
+          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
     </div>
   </div>
   <ds-collection-form (submitForm)="onSubmit($event)"
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 219f6470b0..1d3d6eb871 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -2,9 +2,9 @@
   <div class="row">
     <div class="col-12 pb-4">
       <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h2 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h2>
-        <h2 *ngIf="parent" id="sub-header"
-            class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
+        <h1 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
+        <h1 *ngIf="parent" id="sub-header"
+            class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
       </ng-container>
     </div>
   </div>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 4341764d1c..8a9f40e2b2 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -1,11 +1,11 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h2 class="border-bottom pb-2">
+      <h1 class="border-bottom pb-2">
         <div class="d-flex justify-content-between">
           {{'notifications.events.title'| translate}}
         </div>
-      </h2>
+      </h1>
       <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
         <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
       </ds-alert>
@@ -17,9 +17,9 @@
   </div>
   <div class="row">
     <div class="col-12">
-      <h4 class="border-bottom pb-2">
+      <h2 class="border-bottom pb-2">
         {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
-      </h4>
+      </h2>
 
       <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
 
@@ -247,7 +247,7 @@
 
 <ng-template #ignoreModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
@@ -264,7 +264,7 @@
 
 <ng-template #rejectModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
@@ -281,7 +281,7 @@
 
 <ng-template #undoModal let-modal>
   <div class="modal-header">
-    <h4 class="modal-title" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h4>
+    <h1 class="modal-title h4" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h1>
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.undo.description' | translate}}</p>
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index faeb571234..7d24452c9b 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -1,13 +1,13 @@
 <div class="container">
     <div class="row">
       <div class="col-12">
-        <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+        <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
         <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
       </div>
     </div>
     <div class="row">
       <div class="col-12">
-        <h3 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h3>
+        <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
 
         <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
         <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index 6825bdd080..c2882f94ef 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+      <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
       <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
       <ds-alert *ngIf="targetId" [type]="'alert-info'">
         {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
@@ -11,7 +11,7 @@
   </div>
   <div class="row">
     <div class="col-12">
-      <h4 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h4>
+      <h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>
 
       <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
       <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index c3515b4d72..daefc75fd3 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -30,7 +30,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
+    <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index a0ded30d29..035a7ff9f5 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -9,7 +9,7 @@
         <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
       </div>
       <ds-truncatable [id]="item.id">
-        <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
+        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
         <div>
           <span class="text-muted">
             <ds-truncatable-part [id]="item.id" [minLines]="1">
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 013274320b..74c71b1d12 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="position-relative py-1 my-3 font-weight-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
+        <h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 0c7e560238..871b2b2ca8 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex justify-content-between">
-    <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
 </div>
 <div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index a9061e40f2..9d916a4f98 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -51,7 +51,7 @@
 <ng-template #noFileUploaded>
   <div class="row">
     <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+      <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
 </ng-template>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index f33a4a6706..75c265b420 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2>{{ 'workspace-item.delete.header' | translate }}</h2>
+  <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
   <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
@@ -7,7 +7,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{ 'workspace-item.delete.header' | translate }}</h4>
+    <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>

From 66dedc5b2e08de7c3691fb21a7238d1ac08be15c Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Fri, 19 Jul 2024 14:54:39 +0200
Subject: [PATCH 0865/1286] [CST-15591] Fixed headings by their rank

---
 .../create-collection-page.component.html                   | 2 +-
 .../create-community-page.component.html                    | 4 ++--
 .../workspaceitem/workspaceitem-actions.component.html      | 2 +-
 .../item-list-preview/item-list-preview.component.html      | 2 +-
 .../scope-selector-modal.component.html                     | 6 +++---
 .../search/search-results/search-results.component.html     | 2 +-
 .../sections/upload/section-upload.component.html           | 2 +-
 .../workspaceitems-delete-page.component.html               | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index f3f9785692..4a09d25aed 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row">
         <div class="col-12 pb-4">
-            <h2 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
+            <h1 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
         </div>
     </div>
     <ds-collection-form (submitForm)="onSubmit($event)"
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 57039040c2..a421b6468a 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -2,8 +2,8 @@
   <div class="row">
     <div class="col-12 pb-4">
       <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h2 *ngIf="!parent" id="header" class="border-bottom pb-2">{{ 'community.create.head' | translate }}</h2>
-        <h2 *ngIf="parent" id="sub-header" class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
+        <h1 *ngIf="!parent" id="header" class="border-bottom pb-2">{{ 'community.create.head' | translate }}</h1>
+        <h1 *ngIf="parent" id="sub-header" class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
       </ng-container>
     </div>
   </div>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 6e958c7a8b..26066df4b5 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -30,7 +30,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
+    <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index c8ef730faf..b4fade662b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -9,7 +9,7 @@
         <ds-themed-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-themed-badges>
       </div>
       <ds-truncatable [id]="item.id">
-        <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h3>
+        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
         <div>
           <span class="text-muted">
             <ds-truncatable-part [id]="item.id" [minLines]="1">
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 013274320b..74c71b1d12 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <div class="position-relative py-1 my-3 font-weight-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
+        <h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 11c589254a..1f1e58ea10 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex justify-content-between">
-    <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
 </div>
 <div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index b57b454288..3c4fbe49f6 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -5,7 +5,7 @@
 <ng-container *ngIf="fileList.length == 0">
   <div class="row">
     <div class="col-md-12">
-      <h3 class="text-center"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></h3>
+      <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
 </ng-container>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index a0f0a1711e..9d9bece197 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h2>{{ 'workspace-item.delete.header' | translate }}</h2>
+  <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
   <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="(dso$ | async)"></ds-modify-item-overview>
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
@@ -7,7 +7,7 @@
 
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
-    <h4 class="modal-title text-danger">{{ 'workspace-item.delete.header' | translate }}</h4>
+    <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
     <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
       <span aria-hidden="true">&times;</span>
     </button>

From b2f9743f9f4c8d8f3da4a90f845b99398ad5a1ce Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 13 Nov 2024 10:19:02 -0500
Subject: [PATCH 0866/1286] French translations for subscriptions feature

Includes all french labels for subcriptions, plus 2 or 3 other missing things.

(cherry picked from commit 2c161629486ee7252cc6a8bdc38f25aff64a673f)
---
 src/assets/i18n/fr.json5 | 127 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 0f5587626b..8965d290aa 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -790,12 +790,21 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "En traitement",
 
+  //"admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Dépôts en cours",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Supprimer",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Retourner au déposant",
 
+  //"admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiques",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervision",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
 
@@ -1435,6 +1444,12 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Collection",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logo de la collection",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Chercher",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Dépôts récents",
 
@@ -1453,6 +1468,9 @@
   // "collection.page.news": "News",
   "collection.page.news": "Nouvelles",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Résultats de recherche",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmer la sélection",
 
@@ -1756,6 +1774,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sous-communautés et collections",
 
+  //"community.search.results.head": "Search Results",
+  "community.search.results.head": "Résultats de recherche",
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
@@ -3169,6 +3190,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Créer une nouvelle version",
 
+  //"item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Demander le retrait de cet Item",
+
+  //"item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Demander la réintégration de cet Item",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
 
@@ -3730,6 +3757,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processus",
 
+  //"menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notifications",
+
+  //"menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assurance qualité",
+
+  //"menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Réclamation de publication",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Épingler le menu latéral",
 
@@ -6068,9 +6104,90 @@
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Afficher",
 
-  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  //"submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
+  //"submitter.empty": "N/A",
+  "submitter.empty": "S/O",
+
+  //"subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Abonnements",
+
+  //"subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Type et fréquence",
+
+  //"subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Fermer",
+
+  //"subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pour vous désabonner, visitez la page Abonnements dans votre profil utilisateur",
+
+  //"subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenu",
+
+  //"subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Quotidienne",
+
+  //"subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Hebdomadaire",
+
+  //"subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensuelle",
+
+  //"subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "S'abonner",
+
+  //"subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Soumettre",
+
+  //"subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "En traitement...",
+
+  //"subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Abonnement à {{ type }} réussi.",
+
+  //"subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "L'abonnement a été résilié avec succès",
+
+  //"subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "L'abonnement à {{ type }} a été mis à jour avec succès",
+
+  //"subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Une erreur s'est produite lors de la création de l'abonnement",
+
+  //"subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Une erreur s'est produite lors de la résiliation de l'abonnement",
+
+  //"subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Une erreur s'est produite lors de la mise à jour de l'abonnement",
+
+  //"subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Sujet",
+
+  //"subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Type d'abonnement",
+
+  //"subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Fréquence",
+
+  //"subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Action",
+
+  //"subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Éditer",
+
+  //"subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Supprimer",
+
+  //"subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Indisponible",
+
+  //"subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'Item auquel vous étiez abonné a été supprimé, ou vous n'êtes pas autorisé à le consulter.",
+
+  //"subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Vous n'avez aucun abonnement. Pour vous abonnez à des mises à jour par courriel pour une commmunauté ou une collection, utilisez le bouton d'abonnement sur la page de l'Item.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",
 
@@ -6607,6 +6724,12 @@
   //"person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorisation ORCID",
 
+  //"home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Dépôts récents",
+
+  //"listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Cet objet n'a pas été trouvé.",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 
@@ -6622,8 +6745,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Messages d'avertissement",
 

From e345dfd637ef5efae174e9716d40430801b385ce Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 13 Nov 2024 10:19:02 -0500
Subject: [PATCH 0867/1286] French translations for subscriptions feature

Includes all french labels for subcriptions, plus 2 or 3 other missing things.

(cherry picked from commit 2c161629486ee7252cc6a8bdc38f25aff64a673f)
---
 src/assets/i18n/fr.json5 | 127 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index af17af859a..bee30294a9 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1122,12 +1122,21 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "En traitement",
 
+  //"admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Dépôts en cours",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Supprimer",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Retourner au déposant",
 
+  //"admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Politiques",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervision",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
 
@@ -1773,6 +1782,12 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Collection",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logo de la collection",
+
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Chercher",
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Dépôts récents",
 
@@ -1791,6 +1806,9 @@
   // "collection.page.news": "News",
   "collection.page.news": "Nouvelles",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Résultats de recherche",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmer la sélection",
 
@@ -2100,6 +2118,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sous-communautés et collections",
 
+  //"community.search.results.head": "Search Results",
+  "community.search.results.head": "Résultats de recherche",
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Collections au sein de cette communauté",
 
@@ -3531,6 +3552,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Créer une nouvelle version",
 
+  //"item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Demander le retrait de cet Item",
+
+  //"item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Demander la réintégration de cet Item",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "Une nouvelle version ne peut être créée car il y a une soumission en cours dans l'historique des versions",
 
@@ -4104,6 +4131,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processus",
 
+  //"menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notifications",
+
+  //"menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assurance qualité",
+
+  //"menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Réclamation de publication",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Épingler le menu latéral",
 
@@ -6445,9 +6481,90 @@
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Afficher",
 
-  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  //"submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'item.",
 
+  //"submitter.empty": "N/A",
+  "submitter.empty": "S/O",
+
+  //"subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Abonnements",
+
+  //"subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Type et fréquence",
+
+  //"subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Fermer",
+
+  //"subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Pour vous désabonner, visitez la page Abonnements dans votre profil utilisateur",
+
+  //"subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenu",
+
+  //"subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Quotidienne",
+
+  //"subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Hebdomadaire",
+
+  //"subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensuelle",
+
+  //"subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "S'abonner",
+
+  //"subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Soumettre",
+
+  //"subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "En traitement...",
+
+  //"subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Abonnement à {{ type }} réussi.",
+
+  //"subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "L'abonnement a été résilié avec succès",
+
+  //"subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "L'abonnement à {{ type }} a été mis à jour avec succès",
+
+  //"subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Une erreur s'est produite lors de la création de l'abonnement",
+
+  //"subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Une erreur s'est produite lors de la résiliation de l'abonnement",
+
+  //"subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Une erreur s'est produite lors de la mise à jour de l'abonnement",
+
+  //"subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Sujet",
+
+  //"subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Type d'abonnement",
+
+  //"subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Fréquence",
+
+  //"subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Action",
+
+  //"subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Éditer",
+
+  //"subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Supprimer",
+
+  //"subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Indisponible",
+
+  //"subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'Item auquel vous étiez abonné a été supprimé, ou vous n'êtes pas autorisé à le consulter.",
+
+  //"subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Vous n'avez aucun abonnement. Pour vous abonnez à des mises à jour par courriel pour une commmunauté ou une collection, utilisez le bouton d'abonnement sur la page de l'Item.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",
 
@@ -6981,6 +7098,12 @@
   //"person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autorisation ORCID",
 
+  //"home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Dépôts récents",
+
+  //"listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Cet objet n'a pas été trouvé.",
+
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
   "system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
 
@@ -6996,8 +7119,6 @@
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
   "menu.section.system-wide-alert": "Messages d'avertissement",
 

From 23d8730d5b1637b95f19cc2502d64816d9b18dee Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Thu, 14 Nov 2024 17:44:56 +0100
Subject: [PATCH 0868/1286] [DURACOM-302_2] Manual porting of 'DSC-2002'

---
 src/app/shared/form/chips/chips.component.html    |  8 ++++++--
 src/app/shared/form/chips/chips.component.scss    |  3 ++-
 src/app/shared/form/chips/chips.component.spec.ts |  4 ++--
 src/app/shared/form/chips/chips.component.ts      | 15 +++++++++++++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index 927ca426ef..a623b37d22 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -1,14 +1,18 @@
 <div [className]="'float-left w-100 ' + wrapperClass">
-  <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="onDrop($event)">
+  <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" cdkDropListGroup>
     <ng-template #tipContent>
       <p class="text-left p-0 m-0" *ngFor="let tip of tipText">
         {{tip}}
       </p>
     </ng-template>
-    <div role="listitem" class="nav-item mr-2 mb-1"
+    <div role="listitem" class="nav-item mr-2 mb-1 d-flex flex-row"
            *ngFor="let c of chips.getChips(); let i = index"
            #t="ngbTooltip"
            triggers="manual"
+           cdkDropList
+           [cdkDropListData]="{ index: i }"
+           cdkDropListOrientation="horizontal"
+           (cdkDropListDropped)="onDrop($event)"
            [ngbTooltip]="tipContent"
            (mouseover)="showTooltip(t, i)"
            (mouseout)="t.close()">
diff --git a/src/app/shared/form/chips/chips.component.scss b/src/app/shared/form/chips/chips.component.scss
index a136c40cf3..9289af8199 100644
--- a/src/app/shared/form/chips/chips.component.scss
+++ b/src/app/shared/form/chips/chips.component.scss
@@ -1,7 +1,8 @@
 .cdk-drag-placeholder {
   filter: grayscale(100%);
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+  margin: 0 0.25rem;
 }
+
 .cdk-drag-preview {
   color: white;
   box-sizing: border-box;
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index d53d173d0b..dec37249ef 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -143,9 +143,9 @@ describe('ChipsComponent test suite', () => {
 
     it('should update chips item order when drag and drop end', fakeAsync(() => {
       spyOn(chipsComp.chips, 'updateOrder');
-      const de = chipsFixture.debugElement.query(By.css('div[role="list"]'));
+      const de = chipsFixture.debugElement.query(By.css('div[role="listitem"]'));
 
-      de.triggerEventHandler('cdkDropListDropped', { previousIndex: 0, currentIndex: 1 });
+      de.triggerEventHandler('cdkDropListDropped', { previousIndex: 0, currentIndex: 1, previousContainer: { data: { index: 0 } }, container: { data: { index: 1 } } });
 
       expect(chipsComp.dragged).toBe(-1);
       expect(chipsComp.chips.updateOrder).toHaveBeenCalled();
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index ff05e6d2b7..642de844c9 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -2,6 +2,7 @@ import {
   CdkDrag,
   CdkDragDrop,
   CdkDropList,
+  CdkDropListGroup,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
 import {
@@ -48,6 +49,7 @@ import { ChipsItem } from './models/chips-item.model';
     TranslateModule,
     CdkDrag,
     CdkDropList,
+    CdkDropListGroup,
   ],
   standalone: true,
 })
@@ -105,8 +107,17 @@ export class ChipsComponent implements OnChanges {
     this.dragged = index;
   }
 
-  onDrop(event: CdkDragDrop<ChipsItem[]>) {
-    moveItemInArray(this.chips.chipsItems.getValue(), event.previousIndex, event.currentIndex);
+  onDrop(event: CdkDragDrop<{ index: number }>) {
+    const previousContainerIndex = event.previousContainer.data.index;
+    const currentContainerIndex = event.container.data.index;
+
+    const currentPositionInCurrentContainer = event.currentIndex;
+
+    const directionAdjuster = currentContainerIndex > previousContainerIndex ? -1 : 0;
+
+    moveItemInArray(this.chips.chipsItems.getValue(),
+      previousContainerIndex,
+      currentContainerIndex + currentPositionInCurrentContainer + directionAdjuster);
     this.dragged = -1;
     this.chips.updateOrder();
     this.isDragging.next(false);

From 2b104183f770072f76024c03856e4ec4f51a0c91 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Fri, 15 Nov 2024 15:33:23 +0100
Subject: [PATCH 0869/1286] [DURACOM-300] Fixed space in registration form

---
 .../register-page/create-profile/create-profile.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..dd9528925a 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -5,7 +5,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
+                    <label class="font-weight-bold mr-4"
                            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
                     <span id="email">{{(registration$ |async).email}}</span></div>
             </div>

From 5a1522deacdfd7f3b913f4bf6d827c437b80a926 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Fri, 15 Nov 2024 15:33:23 +0100
Subject: [PATCH 0870/1286] [DURACOM-300] Fixed space in registration form

(cherry picked from commit 2b104183f770072f76024c03856e4ec4f51a0c91)
---
 .../register-page/create-profile/create-profile.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..dd9528925a 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -5,7 +5,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
+                    <label class="font-weight-bold mr-4"
                            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
                     <span id="email">{{(registration$ |async).email}}</span></div>
             </div>

From f6e30b0b631c6e75d8a3ca62b0fdbb8989c72751 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Fri, 15 Nov 2024 15:33:23 +0100
Subject: [PATCH 0871/1286] [DURACOM-300] Fixed space in registration form

(cherry picked from commit 2b104183f770072f76024c03856e4ec4f51a0c91)
---
 .../register-page/create-profile/create-profile.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index f56059ad69..dd9528925a 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -5,7 +5,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
+                    <label class="font-weight-bold mr-4"
                            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
                     <span id="email">{{(registration$ |async).email}}</span></div>
             </div>

From ff42b65fc954eb54a13a58fe52e98e5a3b173ad4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 11 Oct 2024 09:59:10 +0200
Subject: [PATCH 0872/1286] 118944: Fix hasDraftVersion$ not working for
 embedded payloads with no content

(cherry picked from commit 704cc06f1647c29fadb0ba12f93fde5d190d8a7f)
---
 src/app/core/data/version-history-data.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index 8229083535..8ecfde0686 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -171,7 +171,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((versionRD: RemoteData<Version>) => {
-        if (versionRD.hasSucceeded && !versionRD.hasNoContent) {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent && hasValue(versionRD.payload)) {
           return versionRD.payload.versionhistory.pipe(
             getFirstCompletedRemoteData(),
             map((versionHistoryRD: RemoteData<VersionHistory>) => {

From ec6aff411ab370c261ca0eed1acd89df180200fa Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 11 Oct 2024 09:59:10 +0200
Subject: [PATCH 0873/1286] 118944: Fix hasDraftVersion$ not working for
 embedded payloads with no content

(cherry picked from commit 704cc06f1647c29fadb0ba12f93fde5d190d8a7f)
---
 src/app/core/data/version-history-data.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index cc93e275ba..e15fcd3907 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -190,7 +190,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     return this.versionDataService.findByHref(versionHref, false, true, followLink('versionhistory')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((versionRD: RemoteData<Version>) => {
-        if (versionRD.hasSucceeded && !versionRD.hasNoContent) {
+        if (versionRD.hasSucceeded && !versionRD.hasNoContent && hasValue(versionRD.payload)) {
           return versionRD.payload.versionhistory.pipe(
             getFirstCompletedRemoteData(),
             map((versionHistoryRD: RemoteData<VersionHistory>) => {

From e2615a798e9d8e5115d6da57dcb5d17931ccb60a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 17 Nov 2024 02:33:53 +0100
Subject: [PATCH 0874/1286] Fixed flaky item-edit tests

This simply restores the accidental changes made during this cherry-pick: 3df66e025770325ef6e10199a1732da9d2838cbf
---
 cypress/e2e/item-edit.cy.ts | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 25c63bea81..604aab9d04 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -15,14 +15,12 @@ describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="metadata"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="metadata"]').should('have.class', 'active');
+
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
-    // wait for all the Edit Item tabs to be rendered
-    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLDivElement) => {
-      cy.wrap($row).find('li[role="presentation"]').should('be.visible');
-    });
-
     // wait for all the ds-dso-edit-metadata-value components to be rendered
     cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
       cy.wrap($row).find('div[role="cell"]').should('be.visible');
@@ -38,6 +36,9 @@ describe('Edit Item > Status tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="status"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="status"]').should('have.class', 'active');
+
     // <ds-item-status> tag must be loaded
     cy.get('ds-item-status').should('be.visible');
 
@@ -51,6 +52,9 @@ describe('Edit Item > Bitstreams tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="bitstreams"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
+
     // <ds-item-bitstreams> tag must be loaded
     cy.get('ds-item-bitstreams').should('be.visible');
 
@@ -75,6 +79,9 @@ describe('Edit Item > Curate tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="curate"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="curate"]').should('have.class', 'active');
+
     // <ds-item-curate> tag must be loaded
     cy.get('ds-item-curate').should('be.visible');
 
@@ -88,6 +95,9 @@ describe('Edit Item > Relationships tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="relationships"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="relationships"]').should('have.class', 'active');
+
     // <ds-item-relationships> tag must be loaded
     cy.get('ds-item-relationships').should('be.visible');
 
@@ -101,6 +111,9 @@ describe('Edit Item > Version History tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="versionhistory"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
+
     // <ds-item-version-history> tag must be loaded
     cy.get('ds-item-version-history').should('be.visible');
 
@@ -114,6 +127,9 @@ describe('Edit Item > Access Control tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="access-control"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="access-control"]').should('have.class', 'active');
+
     // <ds-item-access-control> tag must be loaded
     cy.get('ds-item-access-control').should('be.visible');
 
@@ -127,6 +143,9 @@ describe('Edit Item > Collection Mapper tab', () => {
   it('should pass accessibility tests', () => {
     cy.get('a[data-test="mapper"]').click();
 
+    // Our selected tab should be active
+    cy.get('a[data-test="mapper"]').should('have.class', 'active');
+
     // <ds-item-collection-mapper> tag must be loaded
     cy.get('ds-item-collection-mapper').should('be.visible');
 

From 628ec2b6baa25cf6e0fbe4bb1505e4a13dc72f7e Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Mon, 18 Nov 2024 15:19:04 +0100
Subject: [PATCH 0875/1286] [DURACOM-305] Fixes the deserialization of the
 SystemWideAlert

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

diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts
index 37f0d61656..78629f9d95 100644
--- a/src/app/core/provide-core.ts
+++ b/src/app/core/provide-core.ts
@@ -16,6 +16,7 @@ import { AccessStatusObject } from '../shared/object-collection/shared/badges/ac
 import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
 import { Subscription } from '../shared/subscriptions/models/subscription.model';
 import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
+import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model';
 import { AuthStatus } from './auth/models/auth-status.model';
 import { ShortLivedToken } from './auth/models/short-lived-token.model';
 import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
@@ -186,4 +187,5 @@ export const models =
     Itemfilter,
     SubmissionCoarNotifyConfig,
     NotifyRequestsStatus,
+    SystemWideAlert,
   ];

From 21fa85c31d5ff832ea3551fc2aebb4b2550ac6e4 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Mon, 18 Nov 2024 15:19:04 +0100
Subject: [PATCH 0876/1286] [DURACOM-305] Fixes the deserialization of the
 SystemWideAlert

(cherry picked from commit 628ec2b6baa25cf6e0fbe4bb1505e4a13dc72f7e)
---
 src/app/core/provide-core.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/core/provide-core.ts b/src/app/core/provide-core.ts
index 37f0d61656..78629f9d95 100644
--- a/src/app/core/provide-core.ts
+++ b/src/app/core/provide-core.ts
@@ -16,6 +16,7 @@ import { AccessStatusObject } from '../shared/object-collection/shared/badges/ac
 import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
 import { Subscription } from '../shared/subscriptions/models/subscription.model';
 import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
+import { SystemWideAlert } from '../system-wide-alert/system-wide-alert.model';
 import { AuthStatus } from './auth/models/auth-status.model';
 import { ShortLivedToken } from './auth/models/short-lived-token.model';
 import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
@@ -186,4 +187,5 @@ export const models =
     Itemfilter,
     SubmissionCoarNotifyConfig,
     NotifyRequestsStatus,
+    SystemWideAlert,
   ];

From 0f4d71eb58d63c9c73af2e098126437da0f266c4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 16:35:45 +0100
Subject: [PATCH 0877/1286] 120109: Fixed BaseDataService not emitting when the
 request is too fast and the ResponsePending are not emitted

---
 .../core/data/base/base-data.service.spec.ts  | 96 +++++++++++++------
 src/app/core/data/base/base-data.service.ts   |  6 +-
 2 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 3f44ad5e5a..fc3704bce5 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -65,6 +65,7 @@ describe('BaseDataService', () => {
   let selfLink;
   let linksToFollow;
   let testScheduler;
+  let remoteDataTimestamp: number;
   let remoteDataMocks: { [responseType: string]: RemoteData<any> };
   let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
 
@@ -85,7 +86,9 @@ describe('BaseDataService', () => {
       expect(actual).toEqual(expected);
     });
 
-    const timeStamp = new Date().getTime();
+    // The response's lastUpdated equals the time of 60 seconds after the test started, ensuring they are not perceived
+    // as cached values.
+    remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
     const payload = {
       foo: 'bar',
@@ -112,22 +115,22 @@ describe('BaseDataService', () => {
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
     remoteDataPageMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
 
     return new TestService(
@@ -361,11 +364,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
+        // Old cached value from 1 minute before the test started
+        const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+          timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+          lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+        } as RemoteData<any>);
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -383,6 +390,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
@@ -411,17 +434,12 @@ describe('BaseDataService', () => {
     it('should link all the followLinks of a cached object by calling addDependency', () => {
       spyOn(objectCache, 'addDependency').and.callThrough();
       testScheduler.run(({ cold, expectObservable, flush }) => {
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d', {
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', {
           a: remoteDataMocks.Success,
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
         }));
-        const expected = '--b-c-d';
+        const expected = 'a';
         const values = {
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
+          a: remoteDataMocks.Success,
         };
 
         expectObservable(service.findByHref(selfLink, false, false, ...linksToFollow)).toBe(expected, values);
@@ -570,11 +588,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
         testScheduler.run(({ cold, expectObservable }) => {
+          // Old cached value from 1 minute before the test started
+          const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+            timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+            lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+          } as RemoteData<any>);
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataPageMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataPageMocks.RequestPending,
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
@@ -592,6 +614,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b', {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index d09ee21ee0..979379e95b 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -285,6 +285,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<T>> = this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
@@ -292,7 +293,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -338,6 +339,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<PaginatedList<T>>> = this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
@@ -345,7 +347,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );

From decacec40437e891c672d1842598dfabd55f204a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:14:12 +0100
Subject: [PATCH 0878/1286] 120109: Fixed "no elements in sequence" sometimes
 being thrown on the item bitstream & relationship tabs

---
 .../abstract-item-update/abstract-item-update.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 1e963a5cca..254c44ad46 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -16,9 +16,9 @@ import {
   Subscription,
 } from 'rxjs';
 import {
-  first,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
@@ -102,7 +102,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     super.ngOnInit();
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.hasChanges().pipe(first()).subscribe((hasChanges) => {
+    this.hasChanges().pipe(take(1)).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
       } else {
@@ -187,7 +187,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   private checkLastModified() {
     const currentVersion = this.item.lastModified;
-    this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
+    this.objectUpdatesService.getLastModified(this.url).pipe(take(1)).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));

From 5c9f494f7692ae7d664cf89d970c330528878abe Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:45:16 +0100
Subject: [PATCH 0879/1286] 120109: Updated the route configuration to only
 resolve the dsoEditMenuResolver on pages who use the DsoEditMenuComponent

---
 cypress/e2e/item-edit.cy.ts                               | 5 -----
 src/app/browse-by/browse-by-page-routes.ts                | 2 --
 src/app/collection-page/collection-page-routes.ts         | 4 +++-
 src/app/community-page/community-page-routes.ts           | 4 +++-
 src/app/item-page/item-page-routes.ts                     | 7 ++++++-
 src/app/shared/dso-page/dso-edit-menu-resolver.service.ts | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 45131baace..604aab9d04 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,11 +9,6 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-
-  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
-  // This because the edit item page causes often tests to fails due to timeout.
-  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
-  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {
diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts
index 9c7e16ab39..3843a50f6e 100644
--- a/src/app/browse-by/browse-by-page-routes.ts
+++ b/src/app/browse-by/browse-by-page-routes.ts
@@ -1,6 +1,5 @@
 import { Route } from '@angular/router';
 
-import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { browseByGuard } from './browse-by-guard';
 import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
@@ -11,7 +10,6 @@ export const ROUTES: Route[] = [
     path: '',
     resolve: {
       breadcrumb: browseByDSOBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     children: [
       {
diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts
index f2dadc3fbe..e20e3ba8af 100644
--- a/src/app/collection-page/collection-page-routes.ts
+++ b/src/app/collection-page/collection-page-routes.ts
@@ -54,7 +54,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: collectionPageResolver,
       breadcrumb: collectionBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -83,6 +82,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCollectionPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts
index d9505c53b1..2c8a7942a4 100644
--- a/src/app/community-page/community-page-routes.ts
+++ b/src/app/community-page/community-page-routes.ts
@@ -51,7 +51,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: communityPageResolver,
       breadcrumb: communityBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -70,6 +69,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCommunityPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts
index 684ea56459..854d66fabe 100644
--- a/src/app/item-page/item-page-routes.ts
+++ b/src/app/item-page/item-page-routes.ts
@@ -27,7 +27,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: itemPageResolver,
       breadcrumb: itemBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -35,10 +34,16 @@ export const ROUTES: Route[] = [
         path: '',
         component: ThemedItemPageComponent,
         pathMatch: 'full',
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: 'full',
         component: ThemedFullItemPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: ITEM_EDIT_PATH,
diff --git a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
index e6bbeac619..8c4fd15b7e 100644
--- a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
+++ b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
@@ -155,7 +155,7 @@ export class DSOEditMenuResolverService  {
         this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
         this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
         this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
-        this.correctionTypeDataService.findByItem(dso.uuid, false).pipe(
+        this.correctionTypeDataService.findByItem(dso.uuid, true).pipe(
           getFirstCompletedRemoteData(),
           getRemoteDataPayload()),
       ]).pipe(

From 1c9272107c427e3c1210c9df2c3f859da2463278 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 18 Nov 2024 14:07:34 +0100
Subject: [PATCH 0880/1286] [DURACOM-297] fix changing values in submission
 form after ordering

---
 .../array-group/dynamic-form-array.component.html   |  6 +++---
 .../array-group/dynamic-form-array.component.ts     | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index dd19e6158d..a7a6b103e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -7,9 +7,9 @@
       <!-- Draggable Container -->
       <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups; let idx = index"
+        <div *ngFor="let groupModel of model.groups"
              role="group"
-             [formGroupName]="idx"
+             [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
              cdkDrag
              [cdkDragDisabled]="dragDisabled"
@@ -25,7 +25,7 @@
                                              [formGroup]="group"
                                              [formModel]="formModel"
                                              [context]="groupModel"
-                                             [group]="control.get([idx])"
+                                             [group]="getControlOfGroup(groupModel)"
                                              [hidden]="_model.hidden"
                                              [class.d-none]="_model.hidden"
                                              [layout]="formLayout"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 4c45393c92..0ae397ce61 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -114,4 +114,17 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   get dragDisabled(): boolean {
     return this.model.groups.length === 1 || !this.model.isDraggable;
   }
+
+  /**
+   * Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
+   * already have it. This ensures that the controls are always linked to the correct group model.
+   * @param groupModel The group model to get the control for.
+   * @returns The form control of the specified group model.
+   */
+  getControlOfGroup(groupModel: any) {
+    if (!groupModel.hasOwnProperty('startingIndex')) {
+      groupModel.startingIndex = groupModel.index;
+    }
+    return this.control.get([groupModel.startingIndex]);
+  }
 }

From fbef294fb49c758aedeb9af88730fdcc8efce8dd Mon Sep 17 00:00:00 2001
From: Drew Heles <drew.heles@lyrasis.org>
Date: Thu, 21 Nov 2024 14:03:50 -0500
Subject: [PATCH 0881/1286] Update docker files for 8_x

---
 Dockerfile.dist                | 2 +-
 docker/README.md               | 6 +++---
 docker/cli.yml                 | 4 ++--
 docker/db.entities.yml         | 3 ++-
 docker/docker-compose-ci.yml   | 7 ++++---
 docker/docker-compose-dist.yml | 2 +-
 docker/docker-compose-rest.yml | 6 +++---
 docker/docker-compose.yml      | 2 +-
 8 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Dockerfile.dist b/Dockerfile.dist
index 4c47b0cb40..98e2e32ab5 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -2,7 +2,7 @@
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
 # Test build:
-# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
 
 FROM node:18-alpine AS build
 
diff --git a/docker/README.md b/docker/README.md
index 3dc5fd5055..6360124b60 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -23,14 +23,14 @@ the Docker compose scripts in this 'docker' folder.
 This Dockerfile is used to build a *development* DSpace Angular UI image, published as 'dspace/dspace-angular'
 
 ```
-docker build -t dspace/dspace-angular:latest .
+docker build -t dspace/dspace-angular:dspace-8_x .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:latest
+docker push dspace/dspace-angular:dspace-8_x
 ```
 
 ### Dockerfile.dist
@@ -39,7 +39,7 @@ The `Dockerfile.dist` is used to generate a *production* build and runtime envir
 
 ```bash
 # build the latest image
-docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
 ```
 
 A default/demo version of this image is built *automatically*.
diff --git a/docker/cli.yml b/docker/cli.yml
index 9b1973426f..93fb0f5ee2 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -14,14 +14,14 @@
 # Therefore, it should be kept in sync with that file
 networks:
   # Default to using network named 'dspacenet' from docker-compose-rest.yml.
-  # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
+  # Its full name will be prepended with the project name (e.g. "-p d8" means it will be named "d8_dspacenet")
   # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
   default:
     name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index b3cf5bd86f..17414eb992 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,10 +14,11 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      # NOTE: currently there is no dspace8 version
       - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
   dspace:
     ### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index c5c419a4a7..6ff2a509c9 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,11 +60,12 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
+      # NOTE: currently there is no dspace8 version
       LOADSQL: https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -81,7 +82,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 67eba16785..de28699c01 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
+    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 09dfcf2a5f..a35bfdfd09 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -68,7 +68,7 @@ services:
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -85,7 +85,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1c268b84b7..e98f6f9599 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}
+    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}
     build:
       context: ..
       dockerfile: Dockerfile

From 138c007f28b643397660e32d16d8b82b44731807 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 22 Nov 2024 09:42:14 -0600
Subject: [PATCH 0882/1286] Fix incorrect example. The setting category is
 called "ssr" and not "universal"

---
 config/config.example.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index bb8f3de58c..3b46b8403f 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -1,7 +1,7 @@
 # NOTE: will log all redux actions and transfers in console
 debug: false
 
-# Angular Universal server settings
+# Angular User Inteface settings
 # NOTE: these settings define where Node.js will start your UI application. Therefore, these
 # "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
 ui:
@@ -17,12 +17,12 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
-universal:
-  # Whether to inline "critical" styles into the server-side rendered HTML.
-  # Determining which styles are critical is a relatively expensive operation;
-  # this option can be disabled to boost server performance at the expense of
-  # loading smoothness.
-  inlineCriticalCss: true
+# Angular Server Side Rendering (SSR) settings
+ssr:
+  # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation; this option is
+  # disabled (false) by default to boost server performance at the expense of loading smoothness.
+  inlineCriticalCss: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From 7b9f1dcc6985fb7e46dc231c0a7b798c1fa71c07 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 22 Nov 2024 09:42:14 -0600
Subject: [PATCH 0883/1286] Fix incorrect example. The setting category is
 called "ssr" and not "universal"

(cherry picked from commit 138c007f28b643397660e32d16d8b82b44731807)
---
 config/config.example.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 6c3c900f6a..25949ba491 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -1,7 +1,7 @@
 # NOTE: will log all redux actions and transfers in console
 debug: false
 
-# Angular Universal server settings
+# Angular User Inteface settings
 # NOTE: these settings define where Node.js will start your UI application. Therefore, these
 # "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
 ui:
@@ -17,12 +17,12 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
-universal:
-  # Whether to inline "critical" styles into the server-side rendered HTML.
-  # Determining which styles are critical is a relatively expensive operation;
-  # this option can be disabled to boost server performance at the expense of
-  # loading smoothness.
-  inlineCriticalCss: true
+# Angular Server Side Rendering (SSR) settings
+ssr:
+  # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation; this option is
+  # disabled (false) by default to boost server performance at the expense of loading smoothness.
+  inlineCriticalCss: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From 62b31ea8c57a0bad0b460a2d8092b1df2fcfeeac Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 22 Nov 2024 09:42:14 -0600
Subject: [PATCH 0884/1286] Fix incorrect example. The setting category is
 called "ssr" and not "universal"

---
 config/config.example.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index a8acfb0543..42e13038d0 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -1,7 +1,7 @@
 # NOTE: will log all redux actions and transfers in console
 debug: false
 
-# Angular Universal server settings
+# Angular User Inteface settings
 # NOTE: these settings define where Node.js will start your UI application. Therefore, these
 # "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
 ui:
@@ -17,11 +17,11 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
-universal:
-  # Whether to inline "critical" styles into the server-side rendered HTML.
-  # Determining which styles are critical is a relatively expensive operation;
-  # this option can be disabled to boost server performance at the expense of
-  # loading smoothness. For improved SSR performance, DSpace defaults this to false (disabled).
+# Angular Server Side Rendering (SSR) settings
+ssr:
+  # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
+  # Determining which styles are critical is a relatively expensive operation; this option is
+  # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
 
 # The REST API server settings

From e4daf2b82580ed00aab83395e25fcf62ac689b7d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 25 Nov 2024 15:17:34 +0100
Subject: [PATCH 0885/1286] 120256: Ensure searchOptions$ is a SearchOptions
 and not a plain object

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

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 994b488d9c..0edbeea7ea 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -118,7 +118,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
     this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
-      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign(new SearchOptions(options), {
         scope: this.scope,
       })),
     );

From 70b855e7852f3b302e8c9ad0b5d71f9fc14e3a6d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 24 Nov 2024 22:42:05 +0100
Subject: [PATCH 0886/1286] 121534: Removed unauthorized metadata-export-search
 request on search page for non-admins

---
 .../search-export-csv.component.spec.ts       | 19 +++++++-----
 .../search-export-csv.component.ts            | 31 +++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index 82c15feeac..f75f01afa2 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -6,7 +6,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { SearchExportCsvComponent } from './search-export-csv.component';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Script } from '../../../process-page/scripts/script.model';
 import { Process } from '../../../process-page/processes/process.model';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { NotificationsService } from '../../notifications/notifications.service';
@@ -25,7 +24,6 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), {id: 'metadata-export-search', name: 'metadata-export-search'});
   const process = Object.assign(new Process(), {processId: 5, scriptName: 'metadata-export-search'});
 
   const searchConfig = new PaginatedSearchOptions({
@@ -41,7 +39,7 @@ describe('SearchExportCsvComponent', () => {
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      findById: createSuccessfulRemoteDataObject$(script),
+      scriptWithNameExistsAndCanExecute: observableOf(true),
       invoke: createSuccessfulRemoteDataObject$(process)
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
@@ -110,15 +108,22 @@ describe('SearchExportCsvComponent', () => {
     describe('when the metadata-export-search script is not present', () => {
       beforeEach(waitForAsync(() => {
         initBeforeEachAsync();
-        (scriptDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not found', 404));
+        (scriptDataService.scriptWithNameExistsAndCanExecute as jasmine.Spy).and.returnValue(observableOf(false));
       }));
-      beforeEach(() => {
-        initBeforeEach();
-      });
+
       it('should should not add the button', () => {
+        initBeforeEach();
+
         const debugElement = fixture.debugElement.query(By.css('button.export-button'));
         expect(debugElement).toBeNull();
       });
+
+      it('should not call scriptWithNameExistsAndCanExecute when unauthorized', () => {
+        (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+        initBeforeEach();
+
+        expect(scriptDataService.scriptWithNameExistsAndCanExecute).not.toHaveBeenCalled();
+      });
     });
   });
   describe('export', () => {
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 6ad105342f..ac425214da 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { map } from 'rxjs/operators';
+import { map, switchMap, filter, startWith } from 'rxjs/operators';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { hasValue, isNotEmpty } from '../../empty.util';
@@ -13,6 +13,7 @@ import { NotificationsService } from '../../notifications/notifications.service'
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 
 @Component({
   selector: 'ds-search-export-csv',
@@ -48,15 +49,11 @@ export class SearchExportCsvComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
-      getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload))
-    );
-
-    const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
-
-    this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
+    this.shouldShowButton$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute('metadata-export-search')),
+      map((canExecute: boolean) => canExecute),
+      startWith(false),
     );
   }
 
@@ -76,19 +73,19 @@ export class SearchExportCsvComponent implements OnInit {
         parameters.push({name: '-c', value: this.searchConfig.configuration});
       }
       if (isNotEmpty(this.searchConfig.filters)) {
-        this.searchConfig.filters.forEach((filter) => {
-          if (hasValue(filter.values)) {
-            filter.values.forEach((value) => {
+        this.searchConfig.filters.forEach((searchFilter: SearchFilter) => {
+          if (hasValue(searchFilter.values)) {
+            searchFilter.values.forEach((value: string) => {
               let operator;
               let filterValue;
-              if (hasValue(filter.operator)) {
-                operator = filter.operator;
+              if (hasValue(searchFilter.operator)) {
+                operator = searchFilter.operator;
                 filterValue = value;
               } else {
                 operator = value.substring(value.lastIndexOf(',') + 1);
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
-              const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
+              const valueToAdd = `${searchFilter.key.substring(2)},${operator}=${filterValue}`;
               parameters.push({name: '-f', value: valueToAdd});
             });
           }

From 683109758bc38db97b83f9ec62afb68158f4cfb2 Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Fri, 6 Sep 2024 17:10:09 +0200
Subject: [PATCH 0887/1286] [DURACOM-296] Enabled 'admin-div' only for Site
 Administrator

(cherry picked from commit 4d5910981ab239f36b174a2724aeb5ba6a846fa6)
---
 ...e-community-parent-selector.component.html |  3 ++-
 ...ommunity-parent-selector.component.spec.ts | 24 ++++++++++++++++++-
 ...ate-community-parent-selector.component.ts | 16 +++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 8ae146b42c..a8ec02239d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -5,6 +5,7 @@
         </button>
     </div>
     <div class="modal-body">
+      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
         <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
@@ -12,7 +13,7 @@
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
         </div>
-
+      </div>
         <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index cfef8a6d68..04922d4deb 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -7,13 +7,16 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import {
   ActivatedRoute,
   Router,
 } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
@@ -38,7 +41,9 @@ describe('CreateCommunityParentSelectorComponent', () => {
   const communityRD = createSuccessfulRemoteDataObject(community);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   const createPath = '/communities/create';
-
+  const mockAuthorizationDataService = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true),
+  });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CreateCommunityParentSelectorComponent],
@@ -59,6 +64,7 @@ describe('CreateCommunityParentSelectorComponent', () => {
         {
           provide: Router, useValue: router,
         },
+        { provide: AuthorizationDataService, useValue: mockAuthorizationDataService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -85,4 +91,20 @@ describe('CreateCommunityParentSelectorComponent', () => {
     expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } });
   });
 
+  it('should show the div when user is an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(true);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeTruthy();
+  })));
+
+  it('should hide the div when user is not an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(false);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeFalsy();
+  })));
+
 });
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 6b1e51dbf5..d4e9b31245 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   OnInit,
@@ -9,6 +13,7 @@ import {
 } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
 import { environment } from '../../../../../environments/environment';
 import {
@@ -19,6 +24,8 @@ import {
   SortDirection,
   SortOptions,
 } from '../../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { hasValue } from '../../../empty.util';
@@ -40,18 +47,23 @@ import {
   styleUrls: ['./create-community-parent-selector.component.scss'],
   templateUrl: './create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  isAdmin$: Observable<boolean>;
 
-  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
+  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, protected authorizationService: AuthorizationDataService) {
     super(activeModal, route);
   }
 
+  ngOnInit() {
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+  }
+
   /**
    * Navigate to the community create page
    */

From c743387a26ac8b103e433bb0fa2c8058addf134c Mon Sep 17 00:00:00 2001
From: Simone Ramundi <simone.ramundi@4science.com>
Date: Thu, 28 Nov 2024 12:36:55 +0100
Subject: [PATCH 0888/1286] [DURACOM-296] Enabled 'admin-div' only for Site
 Administrator

---
 ...e-community-parent-selector.component.html |  3 ++-
 ...ommunity-parent-selector.component.spec.ts | 26 +++++++++++++++++--
 ...ate-community-parent-selector.component.ts | 10 ++++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 8ae146b42c..a8ec02239d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -5,6 +5,7 @@
         </button>
     </div>
     <div class="modal-body">
+      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
         <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
         <div class="h3 position-relative py-1 my-3 font-weight-normal">
             <hr>
@@ -12,7 +13,7 @@
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
         </div>
-
+      </div>
         <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index 2d0a2a25de..d21714a5ef 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -8,6 +8,9 @@ import { Community } from '../../../../core/shared/community.model';
 import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
 
 describe('CreateCommunityParentSelectorComponent', () => {
   let component: CreateCommunityParentSelectorComponent;
@@ -26,7 +29,9 @@ describe('CreateCommunityParentSelectorComponent', () => {
   const communityRD = createSuccessfulRemoteDataObject(community);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   const createPath = '/communities/create';
-
+  const mockAuthorizationDataService = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true),
+  });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
@@ -47,7 +52,8 @@ describe('CreateCommunityParentSelectorComponent', () => {
         },
         {
           provide: Router, useValue: router
-        }
+        },
+        { provide: AuthorizationDataService, useValue: mockAuthorizationDataService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -70,4 +76,20 @@ describe('CreateCommunityParentSelectorComponent', () => {
     expect(router.navigate).toHaveBeenCalledWith([createPath], { queryParams: { parent: community.uuid } });
   });
 
+  it('should show the div when user is an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(true);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeTruthy();
+  })));
+
+  it('should hide the div when user is not an admin', (waitForAsync(() => {
+    component.isAdmin$ = observableOf(false);
+    fixture.detectChanges();
+
+    const divElement = fixture.debugElement.query(By.css('div[data-test="admin-div"]'));
+    expect(divElement).toBeFalsy();
+  })));
+
 });
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 77458d9802..e44a7450e6 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -14,6 +14,9 @@ import {
 } from '../../../../community-page/community-page-routing-paths';
 import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
 import { environment } from '../../../../../environments/environment';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { Observable } from 'rxjs';
 
 /**
  * Component to wrap a button - for top communities -
@@ -32,11 +35,16 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  isAdmin$: Observable<boolean>;
 
-  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
+  constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, protected authorizationService: AuthorizationDataService) {
     super(activeModal, route);
   }
 
+  ngOnInit() {
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+  }
+
   /**
    * Navigate to the community create page
    */

From 8849f140fbf47e8a15dda672ecec7770d49308b7 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 28 Nov 2024 22:39:08 +0100
Subject: [PATCH 0889/1286] 117287: Removed method calls returning observables
 from ItemDetailPreviewComponent

---
 .../item-detail-preview.component.html                |  2 +-
 .../item-detail-preview.component.ts                  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index bd00c9411f..c2f5299d4b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -8,7 +8,7 @@
         <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
           <ds-themed-thumbnail [thumbnail]="item?.thumbnail | async"></ds-themed-thumbnail>
         </ds-metadata-field-wrapper>
-        <ng-container *ngVar="(getFiles() | async) as bitstreams">
+        <ng-container *ngIf="(bitstreams$ | async) as bitstreams">
           <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
             <div *ngIf="bitstreams?.length > 0" class="file-section">
               <button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 2e290bfffa..b881590f4b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
@@ -13,6 +13,7 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 import { SearchResult } from '../../../search/models/search-result.model';
 import { Context } from '../../../../core/shared/context.model';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { hasValue } from '../../../empty.util';
 
 /**
  * This component show metadata for the given item object in the detail view.
@@ -23,7 +24,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
   templateUrl: './item-detail-preview.component.html',
   animations: [fadeInOut]
 })
-export class ItemDetailPreviewComponent {
+export class ItemDetailPreviewComponent implements OnChanges {
   /**
    * The item to display
    */
@@ -62,6 +63,12 @@ export class ItemDetailPreviewComponent {
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.item)) {
+      this.bitstreams$ = this.getFiles();
+    }
+  }
+
   /**
    * Perform bitstream download
    */

From 7eeeab4c26f9845cacad0b9007fe315e098fd90a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 02:38:03 +0000
Subject: [PATCH 0890/1286] Bump sortablejs from 1.15.3 to 1.15.6

Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.15.3 to 1.15.6.
- [Release notes](https://github.com/SortableJS/Sortable/releases)
- [Commits](https://github.com/SortableJS/Sortable/compare/1.15.3...1.15.6)

---
updated-dependencies:
- dependency-name: sortablejs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 f8f725fafc..79aa225651 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "sanitize-html": "^2.13.1",
-    "sortablejs": "1.15.3",
+    "sortablejs": "1.15.6",
     "uuid": "^8.3.2",
     "zone.js": "~0.13.3"
   },
diff --git a/yarn.lock b/yarn.lock
index 0106427952..e337495578 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10650,10 +10650,10 @@ socks@^2.6.2:
     ip "^2.0.0"
     smart-buffer "^4.2.0"
 
-sortablejs@1.15.3:
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.3.tgz#033668db5ebfb11167d1249ab88e748f27959e29"
-  integrity sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==
+sortablejs@1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.6.tgz#ff93699493f5b8ab8d828f933227b4988df1d393"
+  integrity sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==
 
 source-list-map@^2.0.0:
   version "2.0.1"

From 9f74d45e162ed3b582fe226398a1898208bbf0e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 02:40:45 +0000
Subject: [PATCH 0891/1286] Bump cypress in the testing group across 1
 directory

Bumps the testing group with 1 update in the / directory: [cypress](https://github.com/cypress-io/cypress).


Updates `cypress` from 13.15.1 to 13.16.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.1...v13.16.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
...

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

diff --git a/package-lock.json b/package-lock.json
index 9bd081ddf8..79455f7256 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -109,7 +109,7 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.15.1",
+        "cypress": "^13.16.0",
         "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
@@ -4258,9 +4258,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.4.tgz",
-      "integrity": "sha512-eqNHMsxEXuit0sRvvWoGG3/4+Q5qwqjKARWXKM/KoSsKvTNBwWt8pwspg5+TniP3POAZcPPx0O8CiEIQ4e6NWg==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.6.tgz",
+      "integrity": "sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -4269,7 +4269,7 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.5.0",
+        "form-data": "~4.0.0",
         "http-signature": "~1.4.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -4278,7 +4278,7 @@
         "performance-now": "^2.1.0",
         "qs": "6.13.0",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -4286,20 +4286,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@cypress/request/node_modules/form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/@cypress/schematic": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.7.0.tgz",
@@ -9270,9 +9256,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
+      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
       "dev": true,
       "funding": [
         {
@@ -10285,13 +10271,13 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.15.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.1.tgz",
-      "integrity": "sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==",
+      "version": "13.16.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.0.tgz",
+      "integrity": "sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.4",
+        "@cypress/request": "^3.0.6",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -10302,6 +10288,7 @@
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
+        "ci-info": "^4.0.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
         "commander": "^6.2.1",
@@ -10316,7 +10303,6 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -14122,18 +14108,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-ci": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^3.2.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
@@ -19273,12 +19247,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -19324,12 +19292,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -21937,6 +21899,24 @@
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
+    "node_modules/tldts": {
+      "version": "6.1.65",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.65.tgz",
+      "integrity": "sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==",
+      "dev": true,
+      "dependencies": {
+        "tldts-core": "^6.1.65"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.65",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.65.tgz",
+      "integrity": "sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==",
+      "dev": true
+    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
@@ -21988,36 +21968,15 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
+      "integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "tldts": "^6.1.32"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/tr46": {
@@ -22512,16 +22471,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "node_modules/use-memo-one": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
diff --git a/package.json b/package.json
index dec54f98ba..206b025da3 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "^13.15.1",
+    "cypress": "^13.16.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",

From e4b25585b8754fe33736e513e3fdc333f66ca356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 03:07:28 +0000
Subject: [PATCH 0892/1286] Bump cypress in the testing group across 1
 directory

Bumps the testing group with 1 update in the / directory: [cypress](https://github.com/cypress-io/cypress).


Updates `cypress` from 13.15.1 to 13.16.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.1...v13.16.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
...

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

diff --git a/package.json b/package.json
index df31c20204..afa9988b15 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.3",
-    "cypress": "^13.15.1",
+    "cypress": "^13.16.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index fc71ba3378..110451dba6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1519,10 +1519,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@^3.0.4":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63"
-  integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==
+"@cypress/request@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.6.tgz#f5580add6acee0e183b4d4e07eff4f31327ae12b"
+  integrity sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1539,7 +1539,7 @@
     performance-now "^2.1.0"
     qs "6.13.0"
     safe-buffer "^5.1.2"
-    tough-cookie "^4.1.3"
+    tough-cookie "^5.0.0"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
@@ -4105,10 +4105,10 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
   integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
 
-ci-info@^3.2.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
-  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
+ci-info@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
+  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
 
 classnames@^2.2.6:
   version "2.5.1"
@@ -4594,12 +4594,12 @@ cypress-axe@^1.5.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@^13.15.1:
-  version "13.15.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.1.tgz#d85074e07cc576eb30068617d529719ef6093b69"
-  integrity sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==
+cypress@^13.16.0:
+  version "13.16.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.16.0.tgz#7674ca33941f9da58f15fd4e3456856d87730970"
+  integrity sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==
   dependencies:
-    "@cypress/request" "^3.0.4"
+    "@cypress/request" "^3.0.6"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
@@ -4610,6 +4610,7 @@ cypress@^13.15.1:
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
+    ci-info "^4.0.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
     commander "^6.2.1"
@@ -4624,7 +4625,6 @@ cypress@^13.15.1:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.1"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -6631,13 +6631,6 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
-  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
-  dependencies:
-    ci-info "^3.2.0"
-
 is-core-module@^2.13.0, is-core-module@^2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
@@ -9048,11 +9041,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
 pstree.remy@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
@@ -9071,7 +9059,7 @@ punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
@@ -9088,11 +9076,6 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -10485,6 +10468,18 @@ tiny-warning@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tldts-core@^6.1.65:
+  version "6.1.65"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.65.tgz#4b238e9658469f82a61787ee9135a3f083de68fa"
+  integrity sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==
+
+tldts@^6.1.32:
+  version "6.1.65"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.65.tgz#a3b8ad62292c7465d79addba3ff4bdc5fa92e4f5"
+  integrity sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==
+  dependencies:
+    tldts-core "^6.1.65"
+
 tmp@0.2.3, tmp@^0.2.1, tmp@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
@@ -10524,15 +10519,12 @@ touch@^3.1.0:
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694"
   integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==
 
-tough-cookie@^4.1.3:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
-  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
+tough-cookie@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"
+  integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==
   dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
+    tldts "^6.1.32"
 
 tr46@~0.0.3:
   version "0.0.3"
@@ -10852,11 +10844,6 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
@@ -10887,14 +10874,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 use-memo-one@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"

From c9df52cba21b7ec6f0b98dd991adc6b86d0be325 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 25 Nov 2024 15:17:34 +0100
Subject: [PATCH 0893/1286] 120256: Ensure searchOptions$ is a SearchOptions
 and not a plain object

(cherry picked from commit e4daf2b82580ed00aab83395e25fcf62ac689b7d)
---
 .../search-facet-filter/search-facet-filter.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 6f56b627b1..c25651b330 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -122,7 +122,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
     this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
-      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign(new SearchOptions(options), {
         scope: this.scope,
       })),
     );

From 80e938b1f29f8fd94176b31809b13dc6fa79059b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 24 Nov 2024 22:42:05 +0100
Subject: [PATCH 0894/1286] 121534: Removed unauthorized metadata-export-search
 request on search page for non-admins

(cherry picked from commit 70b855e7852f3b302e8c9ad0b5d71f9fc14e3a6d)
---
 .../search-export-csv.component.spec.ts       | 19 +++++++-----
 .../search-export-csv.component.ts            | 31 +++++++++----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index 82c15feeac..f75f01afa2 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -6,7 +6,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { SearchExportCsvComponent } from './search-export-csv.component';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { Script } from '../../../process-page/scripts/script.model';
 import { Process } from '../../../process-page/processes/process.model';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { NotificationsService } from '../../notifications/notifications.service';
@@ -25,7 +24,6 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), {id: 'metadata-export-search', name: 'metadata-export-search'});
   const process = Object.assign(new Process(), {processId: 5, scriptName: 'metadata-export-search'});
 
   const searchConfig = new PaginatedSearchOptions({
@@ -41,7 +39,7 @@ describe('SearchExportCsvComponent', () => {
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      findById: createSuccessfulRemoteDataObject$(script),
+      scriptWithNameExistsAndCanExecute: observableOf(true),
       invoke: createSuccessfulRemoteDataObject$(process)
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
@@ -110,15 +108,22 @@ describe('SearchExportCsvComponent', () => {
     describe('when the metadata-export-search script is not present', () => {
       beforeEach(waitForAsync(() => {
         initBeforeEachAsync();
-        (scriptDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not found', 404));
+        (scriptDataService.scriptWithNameExistsAndCanExecute as jasmine.Spy).and.returnValue(observableOf(false));
       }));
-      beforeEach(() => {
-        initBeforeEach();
-      });
+
       it('should should not add the button', () => {
+        initBeforeEach();
+
         const debugElement = fixture.debugElement.query(By.css('button.export-button'));
         expect(debugElement).toBeNull();
       });
+
+      it('should not call scriptWithNameExistsAndCanExecute when unauthorized', () => {
+        (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+        initBeforeEach();
+
+        expect(scriptDataService.scriptWithNameExistsAndCanExecute).not.toHaveBeenCalled();
+      });
     });
   });
   describe('export', () => {
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 1997a663a1..27c0e86205 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { map } from 'rxjs/operators';
+import { map, switchMap, filter, startWith } from 'rxjs/operators';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { hasValue, isNotEmpty } from '../../empty.util';
@@ -13,6 +13,7 @@ import { NotificationsService } from '../../notifications/notifications.service'
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 
 @Component({
   selector: 'ds-search-export-csv',
@@ -48,15 +49,11 @@ export class SearchExportCsvComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
-      getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload))
-    );
-
-    const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
-
-    this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized)
+    this.shouldShowButton$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute('metadata-export-search')),
+      map((canExecute: boolean) => canExecute),
+      startWith(false),
     );
   }
 
@@ -76,19 +73,19 @@ export class SearchExportCsvComponent implements OnInit {
         parameters.push({name: '-c', value: this.searchConfig.configuration});
       }
       if (isNotEmpty(this.searchConfig.filters)) {
-        this.searchConfig.filters.forEach((filter) => {
-          if (hasValue(filter.values)) {
-            filter.values.forEach((value) => {
+        this.searchConfig.filters.forEach((searchFilter: SearchFilter) => {
+          if (hasValue(searchFilter.values)) {
+            searchFilter.values.forEach((value: string) => {
               let operator;
               let filterValue;
-              if (hasValue(filter.operator)) {
-                operator = filter.operator;
+              if (hasValue(searchFilter.operator)) {
+                operator = searchFilter.operator;
                 filterValue = value;
               } else {
                 operator = value.substring(value.lastIndexOf(',') + 1);
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
-              const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
+              const valueToAdd = `${searchFilter.key.substring(2)},${operator}=${filterValue}`;
               parameters.push({name: '-f', value: valueToAdd});
             });
           }

From 4fcae182b191fe935cef3a9d709a4a8da0b08d43 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 25 Nov 2024 15:17:34 +0100
Subject: [PATCH 0895/1286] 120256: Ensure searchOptions$ is a SearchOptions
 and not a plain object

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

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index f09c4f18f4..0bb708db91 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -160,7 +160,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.currentUrl = this.router.url;
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
     this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
-      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign(new SearchOptions(options), {
         scope: this.scope,
       })),
     );

From 0c81a79d0c0d71b9af37d289a97c1cfcdb3e72b4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 24 Nov 2024 22:42:05 +0100
Subject: [PATCH 0896/1286] 121534: Removed unauthorized metadata-export-search
 request on search page for non-admins

---
 .../search-export-csv.component.spec.ts       | 19 ++++++----
 .../search-export-csv.component.ts            | 37 +++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index fc4052a52e..9abdd8d366 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -13,7 +13,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
 import { Process } from '../../../process-page/processes/process.model';
-import { Script } from '../../../process-page/scripts/script.model';
 import { NotificationsService } from '../../notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
@@ -33,7 +32,6 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), { id: 'metadata-export-search', name: 'metadata-export-search' });
   const process = Object.assign(new Process(), { processId: 5, scriptName: 'metadata-export-search' });
 
   const searchConfig = new PaginatedSearchOptions({
@@ -49,7 +47,7 @@ describe('SearchExportCsvComponent', () => {
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      findById: createSuccessfulRemoteDataObject$(script),
+      scriptWithNameExistsAndCanExecute: observableOf(true),
       invoke: createSuccessfulRemoteDataObject$(process),
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
@@ -117,15 +115,22 @@ describe('SearchExportCsvComponent', () => {
     describe('when the metadata-export-search script is not present', () => {
       beforeEach(waitForAsync(() => {
         initBeforeEachAsync();
-        (scriptDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not found', 404));
+        (scriptDataService.scriptWithNameExistsAndCanExecute as jasmine.Spy).and.returnValue(observableOf(false));
       }));
-      beforeEach(() => {
-        initBeforeEach();
-      });
+
       it('should should not add the button', () => {
+        initBeforeEach();
+
         const debugElement = fixture.debugElement.query(By.css('button.export-button'));
         expect(debugElement).toBeNull();
       });
+
+      it('should not call scriptWithNameExistsAndCanExecute when unauthorized', () => {
+        (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+        initBeforeEach();
+
+        expect(scriptDataService.scriptWithNameExistsAndCanExecute).not.toHaveBeenCalled();
+      });
     });
   });
   describe('export', () => {
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 9e25e387c2..f8ec2012b1 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -13,11 +13,13 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 import {
-  combineLatest as observableCombineLatest,
-  Observable,
-} from 'rxjs';
-import { map } from 'rxjs/operators';
+  filter,
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -32,6 +34,7 @@ import {
 } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 
 @Component({
   selector: 'ds-search-export-csv',
@@ -69,15 +72,11 @@ export class SearchExportCsvComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
-      getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload)),
-    );
-
-    const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
-
-    this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized),
+    this.shouldShowButton$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute('metadata-export-search')),
+      map((canExecute: boolean) => canExecute),
+      startWith(false),
     );
   }
 
@@ -97,19 +96,19 @@ export class SearchExportCsvComponent implements OnInit {
         parameters.push({ name: '-c', value: this.searchConfig.configuration });
       }
       if (isNotEmpty(this.searchConfig.filters)) {
-        this.searchConfig.filters.forEach((filter) => {
-          if (hasValue(filter.values)) {
-            filter.values.forEach((value) => {
+        this.searchConfig.filters.forEach((searchFilter: SearchFilter) => {
+          if (hasValue(searchFilter.values)) {
+            searchFilter.values.forEach((value: string) => {
               let operator;
               let filterValue;
-              if (hasValue(filter.operator)) {
-                operator = filter.operator;
+              if (hasValue(searchFilter.operator)) {
+                operator = searchFilter.operator;
                 filterValue = value;
               } else {
                 operator = value.substring(value.lastIndexOf(',') + 1);
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
-              const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
+              const valueToAdd = `${searchFilter.key.substring(2)},${operator}=${filterValue}`;
               parameters.push({ name: '-f', value: valueToAdd });
             });
           }

From ed4e794d466cec87ec9f7029f59165ff12409174 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 4 Dec 2024 17:16:14 +0100
Subject: [PATCH 0897/1286] 119799: Prevent submission from updating the
 dropdown values when hitting enter in another input form (onsubmit)

---
 .../dynamic-scrollable-dropdown.component.html              | 6 ++++--
 src/app/shared/form/form.service.ts                         | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 6e2d29b789..96fb78c0aa 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -41,10 +41,12 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item disabled" type="button" *ngIf="optionsList && optionsList.length == 0">
+        {{ 'form.no-results' | translate }}
+      </button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList"
               (click)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option"
+              title="{{ listEntry.display }}" role="option" type="button"
               [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index bf316daaed..e6c3776a42 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -130,6 +130,9 @@ export class FormService {
   }
 
   public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
+    if (field.errors === null) {
+      return;
+    }
     const errors: string[] = Object.keys(field.errors)
       .filter((errorKey) => field.errors[errorKey] === true)
       .map((errorKey) => `error.validation.${errorKey}`);

From 97cda8f75200d4da184d6061f964b0ae724ea0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?=
 <zoltan.kanasz-nagy@qulto.eu>
Date: Wed, 4 Dec 2024 23:46:15 +0100
Subject: [PATCH 0898/1286] QREPO-0 updating Hungarian translations for DSpace
 8.0

---
 src/assets/i18n/hu.json5 | 5460 +++++++++++++++++++++++---------------
 1 file changed, 3335 insertions(+), 2125 deletions(-)

diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 1b1702503f..44348b916d 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -6,10 +6,8 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Vissza a főoldalra",
 
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "jogosulatlan",
-
-
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "Nincs jogosultsága",
 
   // "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": "Nincs jogosultsága az oldal eléréséhez. Az alábbi gombbal vissza tud lépni a főoldalra.",
@@ -17,40 +15,41 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Vissza a főoldalra",
 
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "elérhetetlen",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Elérhetetlen",
 
-  // "500.page-internal-server-error": "Service Unavailable",
-  "404.help": "A keresett oldal nem található. Az oldalt elköltöztették, vagy letörölték. Az alsó gombbal visszakerülhet a honlapra ",
+  // "500.page-internal-server-error": "Service unavailable",
+  // TODO New key - Add a translation
+  "500.page-internal-server-error": "Service unavailable",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
-  "404.help": "A szerver ideiglenesen nem tudja kiszolgálni a kérését, karbantartás vagy más technikai okok miatt. Próbálja meg később.",
+  // TODO New key - Add a translation
+  "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
 
   // "500.link.home-page": "Take me to the home page",
-  "404.help": "Vissza a főoldalra",
-
+  // TODO New key - Add a translation
+  "500.link.home-page": "Take me to the home page",
 
   // "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. ",
-  // TODO Source message changed - Revise the translation
   "404.help": "A keresett oldal nem található. Az oldalt elköltöztették, vagy letörölték. Az alsó gombbal visszakerülhet a honlapra ",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Vissza a főoldalra",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "oldal nem található",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Az oldal nem található",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "unauthorized",
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "jogosulatlan",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "forbidden",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "elérhetetlen",
 
-  // "error-page.description.500": "Service Unavailable",
-  "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
+  "error-page.description.500": "A szolgáltatás nem elérhető",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "page not found",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Az oldal nem található",
 
   // "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": "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",
@@ -59,16 +58,16 @@
   "access-status.embargo.listelement.badge": "Embargo",
 
   // "access-status.metadata.only.listelement.badge": "Metadata only",
-  "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Csak metaadattal rendelkező",
 
   // "access-status.open.access.listelement.badge": "Open Access",
   "access-status.open.access.listelement.badge": "Open Access",
 
   // "access-status.restricted.listelement.badge": "Restricted",
-  "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Védett",
 
   // "access-status.unknown.listelement.badge": "Unknown",
-  "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Ismeretlen",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Karbantartási feladatok",
@@ -89,9 +88,9 @@
   "admin.registries.bitstream-formats.create.failure.content": "Bitfolyam létrehozása közben hiba történt",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  "admin.registries.bitstream-formats.create.failure.head": "Nem sikerült",
+  "admin.registries.bitstream-formats.create.failure.head": "Hiba történt",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Bitfolyam formátum létrehozása",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -104,10 +103,10 @@
   "admin.registries.bitstream-formats.create.success.head": "Sikerült",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-  "admin.registries.bitstream-formats.delete.failure.amount": "A {{ amount }} formátum(ok) törlése nem sikerült",
+  "admin.registries.bitstream-formats.delete.failure.amount": "A {{ amount }} formátum(ok) törlése sikertelen",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  "admin.registries.bitstream-formats.delete.failure.head": "Nem sikerült",
+  "admin.registries.bitstream-formats.delete.failure.head": "Hiba történt",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "A {{ amount }} formátum(ok) sikeresen törölve",
@@ -140,10 +139,11 @@
   "admin.registries.bitstream-formats.edit.failure.content": "Bitfolyam szerkesztése közben hiba történt.",
 
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  "admin.registries.bitstream-formats.edit.failure.head": "Nem sikerült",
+  "admin.registries.bitstream-formats.edit.failure.head": "Hiba történt",
 
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
-  "admin.registries.bitstream-formats.edit.head": "Bitfolyam formátum: {{ format }}",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ 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": "Belsőként megjelölt formátumokat a felhasználó nem láthat, ezek adminisztratív célokat szolgálnak.",
@@ -164,7 +164,7 @@
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Név",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-  "admin.registries.bitstream-formats.edit.success.content": "Bitfolyam formátum szerkesztése sikerült.",
+  "admin.registries.bitstream-formats.edit.success.content": "Bitfolyam formátum szerkesztése sikeres.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Sikerült",
@@ -185,7 +185,7 @@
   "admin.registries.bitstream-formats.table.delete": "Kiválasztottak törlése",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-  "admin.registries.bitstream-formats.table.deselect-all": "Valamennyi kiválasztás megszüntetése",
+  "admin.registries.bitstream-formats.table.deselect-all": "Összes kijelölés megszüntetése",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "belső",
@@ -195,8 +195,12 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Név",
-  // "admin.registries.bitstream-formats.table.id" : "ID",
-  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Kiválasztott bitfolyam formátumok",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "Azonosító",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Vissza",
@@ -216,7 +220,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Bitfolyam formátum leíró adatbázis",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Kijelölés",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Kijelölés törlése",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Metaadat leíró adatbázis",
@@ -242,9 +250,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Nincs elérhető metaadat séma.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Kijelölés",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Kijelölés törlése",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Kiválasztottak törlése",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Kijelölt sémák",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "Azonosító",
 
@@ -257,14 +274,18 @@
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "Metaadat leíró adatbázis",
 
-
-
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metaadat séma",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Ez a metaadat séma a következőhöz \"{{namespace}}\".",
 
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Kijelölés",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Kijelölés törlése",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Séma metaadat mezők",
 
@@ -276,8 +297,12 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Mező",
-  // "admin.registries.schema.fields.table.id" : "ID",
-  "admin.registries.schema.fields.table.id": "ID",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Kiválasztott metaadat mezők",
+
+  // "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.id": "Azonosító",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Cél megjegyzés",
@@ -304,13 +329,13 @@
   "admin.registries.schema.notification.created": "Metaadat séma létrehozása sikerült \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.failure": "A {{amount}} metaadat sémák törlése nem sikerült",
+  "admin.registries.schema.notification.deleted.failure": "A {{amount}} metaadat sémák törlése sikertelen",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.success": "A {{amount}} metaadat sémák törlése sikerült",
+  "admin.registries.schema.notification.deleted.success": "A {{amount}} metaadat sémák törlése sikeres",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Metaadat séma szerkesztése sikerült \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Metaadat séma szerkesztése sikeres \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Hiba",
@@ -319,13 +344,13 @@
   "admin.registries.schema.notification.field.created": "Metaadat mező létrehozva\"{{field}}\"",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  "admin.registries.schema.notification.field.deleted.failure": "A{{amount}} metaadat mezők törlése nem sikerült",
+  "admin.registries.schema.notification.field.deleted.failure": "A{{amount}} metaadat mezők törlése sikertelen",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-  "admin.registries.schema.notification.field.deleted.success": "A{{amount}} metaadat mezők törlése sikerült",
+  "admin.registries.schema.notification.field.deleted.success": "A{{amount}} metaadat mezők törlése sikeres",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "metaadat mező szerkesztése sikerült\"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "metaadat mező szerkesztése sikeres\"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Sikerült",
@@ -336,40 +361,76 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Metaadat Séma leíró adatbázis",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Tömeges hozzáférés kezelés",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Keresés eredménye",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Tömeges hozzáférés kezelés",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Tömeges hozzáférés kezelés",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  // TODO New key - Add a translation
+  "admin.access-control.bulk-access-browse.header": "1.lépés: Objektumok kiválasztása",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Keresés",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Jelenlegi kijelölés({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  // TODO New key - Add a translation
+  "admin.access-control.bulk-access-settings.header": "2.lépés: Művelet végrehajtása",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  "admin.access-control.epeople.actions.delete": "EPerson törlése",
+  "admin.access-control.epeople.actions.delete": "Felhasználó törlése",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  "admin.access-control.epeople.actions.impersonate": "EPerson megszemélyesítése",
+  "admin.access-control.epeople.actions.impersonate": "Felhasználó megszemélyesítése",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Jelszó visszaállítása",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "EPerson megszemélyesítésének befejezése",
+  "admin.access-control.epeople.actions.stop-impersonating": "Felhasználó megszemélyesítésének befejezése",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
-  "admin.access-control.epeople.breadcrumbs": "ESzemély",
+  "admin.access-control.epeople.breadcrumbs": "Felhasználó",
 
   // "admin.access-control.epeople.title": "EPeople",
-  "admin.access-control.epeople.title": "ESzemély",
+  "admin.access-control.epeople.title": "Felhasználó",
+
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Új EPerson",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Új EPerson",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Felhasználó hozzáadása",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Felhasználó hozzáadása",
 
   // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "ESzemély",
+  "admin.access-control.epeople.head": "Felhasználó",
 
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Keresés",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  "admin.access-control.epeople.button.see-all": "Valamennyi böngészése",
+  "admin.access-control.epeople.button.see-all": "Összes böngészése",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metaadat",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  "admin.access-control.epeople.search.scope.email": "E-mail (pontosan)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
+  "admin.access-control.epeople.search.scope.email": "Email (pontosan)",
 
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Keresés",
@@ -378,7 +439,7 @@
   "admin.access-control.epeople.search.placeholder": "Személy keresése...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  "admin.access-control.epeople.button.add": "EPerson hozzáadása",
+  "admin.access-control.epeople.button.add": "Felhasználó hozzáadása",
 
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "Azonosító",
@@ -386,8 +447,8 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Név",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  "admin.access-control.epeople.table.email": "E-mail (pontosan)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
+  "admin.access-control.epeople.table.email": "E-mail",
 
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "Szerkesztés",
@@ -405,10 +466,10 @@
   "admin.access-control.epeople.no-items": "Nincs elérhető ESzemély.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "ESzemély létrehozása",
+  "admin.access-control.epeople.form.create": "Felhasználó létrehozása",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  "admin.access-control.epeople.form.edit": "ESzemély szerkesztése",
+  "admin.access-control.epeople.form.edit": "Felhasználó szerkesztése",
 
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "Keresztnév",
@@ -416,11 +477,11 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Családnév",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
-  "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
+  "admin.access-control.epeople.form.email": "Email",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  "admin.access-control.epeople.form.emailHint": "Érvényes e-mail cím kell, hogy legyen",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
+  "admin.access-control.epeople.form.emailHint": "Érvényes email cím kell, hogy legyen",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Bejelentkezhet",
@@ -432,30 +493,31 @@
   "admin.access-control.epeople.form.return": "Vissza",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{name}} sikeresen létrehozva\"",
+  "admin.access-control.epeople.form.notification.created.success": "Felhasználó \"{{name}} sikeresen létrehozva\"",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.failure": "EPerson \"{{name}}létrehozása nem sikerült\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Felhasználó \"{{name}}létrehozása sikertelen\"",
 
   // "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": "EPerson \"{{name}}\" létrehozása nem sikerült, email \"{{email}}\" már használatban van.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Felhasználó \"{{name}}\" létrehozása sikertelen, email \"{{email}}\" már használatban van.",
 
   // "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": "EPerson \"{{name}}\" szerkesztése nem sikerült, email \"{{email}}\" már használatban van.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Felhasználó \"{{name}}\" szerkesztése sikertelen, email \"{{email}}\" már használatban van.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{name}}\" szerkesztése sikerült",
+  "admin.access-control.epeople.form.notification.edited.success": "Felhasználó \"{{name}}\" szerkesztése sikeres",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.failure": "EPerson \"{{name}}\" szerkesztése nem sikerült",
+  "admin.access-control.epeople.form.notification.edited.failure": "Felhasználó \"{{name}}\" szerkesztése sikertelen",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "Sikeresen törölve: EPerson \"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.failure": "Nem sikerült törülni: EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Sikertelen törlés: Felhasználó \"{{name}}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  // TODO New key - Add a translation
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Tagja a következő csoportoknak:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
@@ -473,13 +535,13 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Hozzáadás csoportokhoz",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "ESzemély: \"{{name}}\" törlése nem sikerült",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "ESzemély: \"{{name}}\" törlése sikerült",
-
-
+  // TODO New key - Add a translation
+  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
 
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Csoportok",
@@ -509,7 +571,7 @@
   "admin.access-control.groups.search.head": "Csoportok keresése",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-  "admin.access-control.groups.button.see-all": "valamennyi böngészése",
+  "admin.access-control.groups.button.see-all": "Összes böngészése",
 
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Keresés",
@@ -539,18 +601,17 @@
   "admin.access-control.groups.table.edit.buttons.remove": "Törlés \"{{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": "Egyetlen csoport sem tartalmazza nevében, vagy UUID-ként ezt",
+  "admin.access-control.groups.no-items": "Egyetlen csoport sem tartalmazza nevében vagy azonosítóként (UUID) a megadott keresőkifejezést",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" csoport törlése sikerült",
+  "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" csoport törlése sikeres",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" csoport törlése nem sikerült",
+  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" csoport törlése sikertelen",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  "admin.access-control.groups.notification.deleted.failure.content": "Ok: \"{{cause}}\"",
-
-
+  // TODO New key - Add a translation
+  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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": "Ez a csoport állandó, nem szerkeszthető vagy törölhető. Ugyanakor a csoporttagság szerkeszthető.",
@@ -577,13 +638,14 @@
   "admin.access-control.groups.form.notification.created.success": "\"{{name}}\" csoport létrehozása sikerült",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" csoport létrehozása nem sikerült",
+  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" csoport létrehozása sikertelen",
 
   // "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": "Nem sikerült csoport létrehozása a következő névvel: \"{{name}}\", győződjön meg róla, hogy a név nincs már használatban.",
+  // TODO New key - Add a translation
+  "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.edited.failure": "Failed to edit Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.failure": "Nem sikerült szerkeszteni a csoportot \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "Csoport szerkesztése sikertelen \"{{name}}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "A(z) \"{{name}}\" név már foglalt!",
@@ -601,7 +663,7 @@
   "admin.access-control.groups.form.delete-group.modal.info": "Biztos törli a csoportot: \"{{ dsoName }}\"",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Mégsem",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Mégse",
 
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "Törlés",
@@ -610,29 +672,24 @@
   "admin.access-control.groups.form.notification.deleted.success": "Csoport sikeresen törölve: \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Nem sikerült törölni a csoportot: \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Csoport törlése sikertelen \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Ok: \"{{ cause }}\"",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ 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": "Felhasználó",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
   "admin.access-control.groups.form.members-list.search.head": "EPeople hozzáadása",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.members-list.button.see-all": "Valamennyi böngészése",
+  "admin.access-control.groups.form.members-list.button.see-all": "Összes böngészése",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Jelenlegi tagok",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metaadat",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (pontosan)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Keresés",
 
@@ -658,16 +715,20 @@
   "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "A\"{{name}}\" nevű tag törlése",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "A: \"{{name}}\" tag sikeresen hozzáadva",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{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": "A: \"{{name}}\" tag hozzáadása nem sikerült",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{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": "A: \"{{name}}\" tag törlése sikerült",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{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": "A: \"{{name}}\" tag törlése nem sikerült",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{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": "Tag hozzáadása a következő névvel: \"{{name}}\"",
@@ -682,7 +743,8 @@
   "admin.access-control.groups.form.members-list.no-items": "Ez a keresés nem talált EPeople-t",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Valami nem sikerült: \"{{cause}}\"",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Csoportok",
@@ -691,10 +753,10 @@
   "admin.access-control.groups.form.subgroups-list.search.head": "Alcsoport hozzáadása",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "valamennyi böngészése",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Összes böngészése",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "jelenlegi alcsoportok",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Jelenlegi alcsoportok",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "keresés",
@@ -717,20 +779,21 @@
   // "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": "A következő nevű \"{{name}}\" alcsoport hozzáadása",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Jelenlegi csoport",
-
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "A: \"{{name}}\" alcsoport sikeresen hozzáadva",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{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": "A: \"{{name}}\" alcsoport hozzáadása nem sikerült",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{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": "A: \"{{name}}\" alcsoport sikeresen törölve",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{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": "A: \"{{name}}\" alcsoport törlése nem sikerült",
+  // TODO New key - Add a translation
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{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": "jelenleg nincs aktív csoport, előbb adjon meg egy nevet.",
@@ -747,419 +810,327 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Vissza",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Minőségbiztosítás",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Minőségbiztosítási javaslatok",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Minőségbiztosítási javaslatok",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Minőségbiztosítás",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Minőségbiztosítás",
+
   // "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.",
   // TODO New key - Add a translation
   "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.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.",
   // TODO New key - Add a translation
-  "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.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.",
 
-  // "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.",
-  // TODO New key - Add a translation
-  "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.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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Gyűjtemény Szűrő Jelentés",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Gyűjtemény Szűrő Jelentés",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Gyűjtemény Szűrő Jelentés",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Gyűjtemények megjelenítése",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Gyűjtemény Riport",
 
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Tárgy találatok",
 
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Közösség",
 
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Gyűjtemény",
 
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. Tárgyak",
 
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Megfelel az összes kiválasztott szűrőnek",
 
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Metaadat Lekérdezés Riport",
 
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Metaadat Lekérdezés Riport",
 
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Tárgy Lekérdezés Futtatása",
 
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Gyűjtemény Kiválasztó",
 
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Metaadat Mező Lekérdezések",
 
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Előre Meghatározott Lekérdezések",
 
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
   "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
 
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Korlátozás/",
 
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Offset",
 
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Teljes Tár",
 
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Bármelyik mező",
+
+  // "admin.reports.items.predicate.exists": "exists",
   "admin.reports.items.predicate.exists": "exists",
 
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
   "admin.reports.items.predicate.doesNotExist": "does not exist",
 
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.equals": "equals",
   "admin.reports.items.predicate.equals": "equals",
 
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
   "admin.reports.items.predicate.doesNotEqual": "does not equal",
 
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.like": "like",
   "admin.reports.items.predicate.like": "like",
 
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.notLike": "not like",
   "admin.reports.items.predicate.notLike": "not like",
 
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.contains": "contains",
   "admin.reports.items.predicate.contains": "contains",
 
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
   "admin.reports.items.predicate.doesNotContain": "does not contain",
 
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.matches": "matches",
   "admin.reports.items.predicate.matches": "matches",
 
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
   "admin.reports.items.predicate.doesNotMatch": "does not match",
 
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Új Lekérdezés",
 
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Nincs cím",
 
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Nincs dc.identifier.uri",
 
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
   "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
 
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
   "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
 
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
   "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
 
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
   "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
 
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
   "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
 
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
   "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
 
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
   "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
 
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
   "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
 
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
   "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
 
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
   "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
 
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
+  // "admin.reports.items.number": "No.",
   "admin.reports.items.number": "No.",
 
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
+  // "admin.reports.items.id": "UUID",
   "admin.reports.items.id": "UUID",
 
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Gyűjtemény",
 
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
+  // "admin.reports.items.handle": "URI",
   "admin.reports.items.handle": "URI",
 
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Cím",
 
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Szűrők",
 
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.additional-data": "Additional data to return",
   "admin.reports.commons.additional-data": "Additional data to return",
 
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Előző oldal",
 
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Következő oldal",
 
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Oldal",
 
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.of": "of",
   "admin.reports.commons.of": "of",
 
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportálás Metaadatok Frissítéséhez",
 
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Összes szűrő kijelölésének megszüntetése",
 
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Összes szűrő kijelölése",
 
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Egyezik az összes megadott szűrővel",
 
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property": "Item Property Filters",
   "admin.reports.commons.filters.property": "Item Property Filters",
 
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
   "admin.reports.commons.filters.property.is_item": "Is Item - always true",
 
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
   "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
 
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
   "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
 
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
   "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
 
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
   "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
 
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
   "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
 
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
   "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
 
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
   "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
 
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
   "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
 
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
   "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
   "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
   "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
   "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
   "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
   "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
   "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
   "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
   "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
   "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
 
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Támogatott MIME típus szűrők",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
   "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
   "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
   "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
   "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
 
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
   "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
 
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
   "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
 
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
   "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
 
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
   "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
 
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
   "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
 
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
   "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
 
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
   "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
 
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
   "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
 
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Jogosultság szűrők",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
   "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
   "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
   "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
   "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
 
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
   "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
 
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
   "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
 
   // "admin.search.breadcrumbs": "Administrative Search",
@@ -1184,7 +1155,7 @@
   "admin.search.item.make-public": "Legyen nyilvános",
 
   // "admin.search.item.move": "Move",
-  "admin.search.item.move": "Költöztetés",
+  "admin.search.item.move": "Áthelyezés",
 
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Visszaállítás",
@@ -1198,9 +1169,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Adminisztratív keresés",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Munkafolyamat irányítása",
 
@@ -1211,8 +1179,7 @@
   "admin.workflow.item.workflow": "Munkafolyamat",
 
   // "admin.workflow.item.workspace": "Workspace",
-  // TODO New key - Add a translation
-  "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Munkaterület",
 
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Törlés",
@@ -1221,55 +1188,48 @@
   "admin.workflow.item.send-back": "Visszaküldés",
 
   // "admin.workflow.item.policies": "Policies",
-  // TODO New key - Add a translation
-  "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Jogosultságok",
 
   // "admin.workflow.item.supervision": "Supervision",
-  // TODO New key - Add a translation
-  "admin.workflow.item.supervision": "Supervision",
-
-
+  "admin.workflow.item.supervision": "Felügyelet",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Metaadat importálása",
 
   // "admin.batch-import.breadcrumbs": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Csoportos importálás",
 
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Metaadat importálása",
 
   // "admin.batch-import.title": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Csoportos importálás",
 
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Metaadat importálása",
 
   // "admin.batch-import.page.header": "Import Batch",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Csoportos importálás",
 
   // "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": "Becsatolhat vagy kikereshet CSV fájlokat, amelyek az itt tárolt fájlokra vonatkozó műveleteket tárolnak",
 
   // "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",
-  // TODO New key - Add a translation
   "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.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Húzzon ide egy metaadat CSV-t az importáláshoz",
 
   // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
-  // TODO New key - Add a translation
   "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Húzzon ide egy metaadat CSV-t az importálás felülírásához",
 
   // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
-  // TODO New key - Add a translation
   "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
 
   // "admin.metadata-import.page.button.return": "Back",
@@ -1284,107 +1244,86 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Előbb válassza ki a fájlt!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
-  // TODO New key - Add a translation
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Először illessze be a fájl URL címét!",
+
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+  "admin.batch-import.page.error.addFile": "Először válassza ki a ZIP fájlt!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Feltöltés",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
 
   // "admin.metadata-import.page.validateOnly": "Validate Only",
-  // TODO New key - Add a translation
   "admin.metadata-import.page.validateOnly": "Validate Only",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.",
 
   // "advanced-workflow-action.rating.form.rating.label": "Rating",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Értékelés",
 
   // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
-  // TODO New key - Add a translation
-  "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Értékelnie kell a tárgyat",
 
   // "advanced-workflow-action.rating.form.review.label": "Review",
-  // TODO New key - Add a translation
   "advanced-workflow-action.rating.form.review.label": "Review",
 
   // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
-  // TODO New key - Add a translation
   "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
 
   // "advanced-workflow-action.rating.description": "Please select a rating below",
-  // TODO New key - Add a translation
   "advanced-workflow-action.rating.description": "Please select a rating below",
 
   // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
-  // TODO New key - Add a translation
   "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
 
-
   // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
-  // TODO New key - Add a translation
   "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
 
   // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
-  // TODO New key - Add a translation
   "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
 
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Felhasználó",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Felhasználó hozzáadása",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Összes böngészése",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
-
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Jelenlegi tagok",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Keresés",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "Azonosító",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Név",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitás",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
-  // TODO New key - Add a translation
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Törlés / Hozzáadás",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "\"{{name}}\" nevű tag eltávolítása",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
   // TODO New key - Add a translation
@@ -1403,31 +1342,24 @@
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Tag hozzáadása \"{{name}}\" névvel",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Jelenleg nincs aktív csoport, először írjon be egy nevet.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Még nincsenek tagok a csoportban, keressen és adjon hozzá tagokat.",
 
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "A keresés során nem találtunk ESzemélyeket",
 
   // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
-  // TODO New key - Add a translation
   "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.remove": "remove",
-  // TODO New key - Add a translation
   "admin.batch-import.page.remove": "remove",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
@@ -1437,34 +1369,26 @@
   "auth.messages.expired": "Az idő lejárt. Kérjük, lépjen be újra.",
 
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
-  // TODO New key - Add a translation
   "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
 
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "Now downloading {{bitstream}}...",
 
-
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-  // TODO New key - Add a translation
-  "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-
-  // "bitstream.download.page.back": "Back" ,
-  // TODO New key - Add a translation
-  "bitstream.download.page.back": "Back" ,
-
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Vissza",
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-  // TODO New key - Add a translation
-  "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Bitfolyam jogosultságok szerkesztése",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  // TODO New key - Add a translation
-  "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Bitfolyam jogosultságok szerkesztése",
 
   // "bitstream.edit.return": "Back",
-  // TODO New key - Add a translation
-  "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Vissza",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Bitfolyam: ",
+  // TODO New key - Add a translation
+  "bitstream.edit.bitstream": "Bitstream: ",
 
   // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
   "bitstream.edit.form.description.hint": "Választhatóan megadhatja az állomány rövid leírását, például \"<i>Fő cikk</i>\" vagy \"<i>Kísérleti adatok</i>\".",
@@ -1490,8 +1414,8 @@
   // "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": "A program, amellyel az állományt létrehozta és a verzió száma (például, \"<i>ACMESoft SuperApp version 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  "bitstream.edit.form.primaryBitstream.label": "Elsődleges bitfolyam",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
+  "bitstream.edit.form.primaryBitstream.label": "Elsődleges fájl",
 
   // "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": "Amennyiben a formátum nem található a fentebbi listán, <b>válassza \"formátum nincs a listán\" feljebb</b> majd írja le \"Új formátum leírása\".",
@@ -1505,39 +1429,33 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Bitfolyam formátum mentése közben hiba történt",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Hiba történt az elsődleges bitfolyam mentése során",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF Címke",
 
   // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
 
   // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
 
   // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
 
   // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
 
   // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
 
   // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
 
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
-  // TODO New key - Add a translation
   "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "A bitfolyamban eszközölt változtatások elmentve.",
 
@@ -1548,84 +1466,63 @@
   "bitstream.edit.title": "Bitfolyam szerkesztése",
 
   // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
-  // TODO New key - Add a translation
   "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.canDownload2": "here",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.alert.canDownload2": "here",
 
   // "bitstream-request-a-copy.header": "Request a copy of the file",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Kérjen másolatot az fájlról",
 
   // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
 
   // "bitstream-request-a-copy.name.label": "Name *",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.name.label": "Name *",
 
   // "bitstream-request-a-copy.name.error": "The name is required",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.name.error": "The name is required",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
+  "bitstream-request-a-copy.email.label": "Your email address *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
 
   // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
 
   // "bitstream-request-a-copy.allfiles.label": "Files",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.allfiles.label": "Files",
 
   // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
 
   // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
 
   // "bitstream-request-a-copy.message.label": "Message",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.message.label": "Message",
 
   // "bitstream-request-a-copy.return": "Back",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Vissza",
 
   // "bitstream-request-a-copy.submit": "Request copy",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.submit": "Request copy",
 
   // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
 
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
-  // TODO New key - Add a translation
   "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
 
-
-
   // "browse.back.all-results": "All browse results",
-  // TODO New key - Add a translation
   "browse.back.all-results": "All browse results",
 
   // "browse.comcol.by.author": "By Author",
@@ -1637,6 +1534,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Tárgyszó szerint",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Tárgyszó kategória szerint",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "By Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Cím szerint",
 
@@ -1653,11 +1556,14 @@
   "browse.metadata.dateissued": "Megjelenés dátuma",
 
   // "browse.metadata.subject": "Subject",
-  "browse.metadata.subject": "Tárgy",
+  "browse.metadata.subject": "Tárgyszó",
 
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Cím",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Tárgyszó kategória",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Böngészés szerző szerint",
 
@@ -1667,6 +1573,18 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Böngészés tárgyszó szerint",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+
+  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Böngészés cím szerint",
 
@@ -1677,11 +1595,9 @@
   "pagination.previous.button": "Előző",
 
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
-  // TODO New key - Add a translation
   "pagination.next.button.disabled.tooltip": "No more pages of results",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
-  // TODO New key - Add a translation
   "browse.startsWith": ", starting with {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
@@ -1691,7 +1607,6 @@
   "browse.startsWith.choose_year": "(Válassza az évet)",
 
   // "browse.startsWith.choose_year.label": "Choose the issue year",
-  // TODO New key - Add a translation
   "browse.startsWith.choose_year.label": "Choose the issue year",
 
   // "browse.startsWith.jump": "Filter results by year or month",
@@ -1728,7 +1643,6 @@
   "browse.startsWith.months.none": "(Válasszon hónapot)",
 
   // "browse.startsWith.months.none.label": "Choose the issue month",
-  // TODO New key - Add a translation
   "browse.startsWith.months.none.label": "Choose the issue month",
 
   // "browse.startsWith.months.november": "November",
@@ -1747,52 +1661,56 @@
   "browse.startsWith.type_date": "Eredmények szűrése dátum szerint",
 
   // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
-  // TODO New key - Add a translation
   "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
 
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "browse.startsWith.type_text": "Eredmények szűrése az első pár betű alapján",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filter",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Browse",
+
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
   "browse.title": "{{ collection }} böngészése, {{ field }} {{ value }} szerint",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
   "browse.title.page": "{{ collection }} böngészése, {{ field }} {{ value }} szerint",
 
-
   // "search.browse.item-back": "Back to Results",
-  // TODO New key - Add a translation
-  "search.browse.item-back": "Back to Results",
-
+  "search.browse.item-back": "Vissza a találatokhoz",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Chip eltávolítása",
 
-
   // "claimed-approved-search-result-list-element.title": "Approved",
-  // TODO New key - Add a translation
-  "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Jóváhagyva",
 
   // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
-  // TODO New key - Add a translation
   "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
 
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
-  // TODO New key - Add a translation
   "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Gyűjtemény létrehozása",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Gyűjtemény logó böngészése",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Hozzon létre egy gyűjteményt",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-  "collection.create.notifications.success": "Guűjtemény sikeresen létrehozva",
+  "collection.create.notifications.success": "Gyűjtemény sikeresen létrehozva",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Hozzon létre gyűjteményt a közösség számára {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  "collection.curate.header": "Gyűjtemény gondozója: {{collection}}",
+  // TODO New key - Add a translation
+  "collection.curate.header": "Curate Collection: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Mégse",
@@ -1801,14 +1719,13 @@
   "collection.delete.confirm": "Mehet",
 
   // "collection.delete.processing": "Deleting",
-  // TODO New key - Add a translation
-  "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Törlés",
 
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Gyűjtemény törlése",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  "collection.delete.notification.fail": "Gyűjteményt nem sikerült törölni",
+  "collection.delete.notification.fail": "Gyűjtemény törlése sikertelen",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Gyűjtemény törölve",
@@ -1816,8 +1733,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Biztos benne, hogy törölni szeretné a gyűjteményt \"{{ dso }}\"",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Törölje ezt a gyűjteményt",
 
@@ -1827,21 +1742,18 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Gyűjtemény szerkesztése",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
 
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
   "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Mégse",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  "collection.edit.item-mapper.collection": "Gyűjtemény: \"<b>{{name}}</b>\"",
+  // TODO New key - Add a translation
+  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Térképezze a kiválasztott tárgyakat",
@@ -1883,8 +1795,7 @@
   "collection.edit.item-mapper.remove": "Kiválasztott térgyak térképezésének törlése",
 
   // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Tárgyak keresése...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Térképezett tárgyak böngészése",
@@ -1892,45 +1803,44 @@
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Új tárgyak térképezése",
 
-
   // "collection.edit.logo.delete.title": "Delete logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Logó törlése",
 
   // "collection.edit.logo.delete-undo.title": "Undo delete",
-  // TODO New key - Add a translation
-  "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Törlés visszavonása",
 
   // "collection.edit.logo.label": "Collection logo",
-  "collection.edit.logo.label": "Gyűjtemény logo",
+  "collection.edit.logo.label": "Gyűjtemény logó",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  "collection.edit.logo.notifications.add.error": "Gyűjtemény logo feltöltése nem sikerült. Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
+  "collection.edit.logo.notifications.add.error": "Gyűjtemény logó feltöltése sikertelen. Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  "collection.edit.logo.notifications.add.success": "Gyűjtemény logo feltöltése sikerült.",
+  "collection.edit.logo.notifications.add.success": "Gyűjtemény logó feltöltése sikerült.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo törölve",
+  "collection.edit.logo.notifications.delete.success.title": "Logó törölve",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Gyűjteménylogo sikeresen törölve",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  "collection.edit.logo.notifications.delete.error.title": "Logo törlése közben hiba történt",
+  "collection.edit.logo.notifications.delete.error.title": "Logó törlése közben hiba történt",
 
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Feltöltéshez húzza ide a gyűjtemény Logót",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  "collection.edit.notifications.success": "Gyűjtemény szerkesztése sikerült",
+  "collection.edit.notifications.success": "Gyűjtemény szerkesztése sikeres",
 
   // "collection.edit.return": "Back",
   "collection.edit.return": "Vissza",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Hozzáférés kontroll",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Gondozás",
@@ -1939,12 +1849,10 @@
   "collection.edit.tabs.curate.title": "Gyűjtemény szerkesztés - gondozás",
 
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Engedélyezések",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Gyűjtemény szerkesztés - Engedélyezések",
 
   // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
   "collection.edit.item.authorizations.load-bundle-button": "További csomagok betöltése",
@@ -1953,7 +1861,6 @@
   "collection.edit.item.authorizations.load-more-button": "Továbbiak betöltése",
 
   // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
-  // TODO New key - Add a translation
   "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
@@ -2008,7 +1915,7 @@
   "collection.edit.tabs.source.notifications.discarded.title": "Változások elvetve",
 
   // "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": "Változtatások nincsenek mentve. Kérjük, ellenőrizze, hogy valamennyi mező érvényes, mielőtt mentene.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Változtatások nincsenek mentve. Kérjük, ellenőrizze, hogy az összes mező érvényes, mielőtt mentene.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metaadat érvénytelen",
@@ -2022,16 +1929,14 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Gyűjtemény szerkesztés - tartalom forrása",
 
-
-
   // "collection.edit.template.add-button": "Add",
-  "collection.edit.template.add-button": "Hozzáad",
+  "collection.edit.template.add-button": "Hozzáadás",
 
   // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "Elemsablon",
 
   // "collection.edit.template.cancel": "Cancel",
-  "collection.edit.template.cancel": "Mégsem",
+  "collection.edit.template.cancel": "Mégse",
 
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Töröl",
@@ -2040,7 +1945,6 @@
   "collection.edit.template.edit-button": "Szerkeszt",
 
   // "collection.edit.template.error": "An error occurred retrieving the template item",
-  // TODO New key - Add a translation
   "collection.edit.template.error": "An error occurred retrieving the template item",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
@@ -2050,20 +1954,17 @@
   "collection.edit.template.label": "Elemsablon",
 
   // "collection.edit.template.loading": "Loading template item...",
-  // TODO New key - Add a translation
   "collection.edit.template.loading": "Loading template item...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  "collection.edit.template.notifications.delete.error": "Nem sikerült törölni az elemsablont",
+  "collection.edit.template.notifications.delete.error": "Elemsablon törlése sikertelen",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  "collection.edit.template.notifications.delete.success": "Sikeresen töröltük az elemsablont",
+  "collection.edit.template.notifications.delete.success": "Elemsablon törlése sikeres",
 
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Elemsablon szerkesztése",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Rövid leírás",
 
@@ -2089,21 +1990,16 @@
   "collection.form.title": "Név",
 
   // "collection.form.entityType": "Entity Type",
-  // TODO New key - Add a translation
   "collection.form.entityType": "Entity Type",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Gyűjtemény",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Gyűjtemény logó",
 
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Friss feltöltések",
-
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "Nincs tárgy",
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Keresés",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Gyűjtemény szerkesztése",
@@ -2117,7 +2013,8 @@
   // "collection.page.news": "News",
   "collection.page.news": "Hírek",
 
-
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Keresés eredménye",
 
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Kiválasztás igazolása",
@@ -2125,80 +2022,86 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Nincs gyűjtemény",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Selected collections",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Select collection",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deselect collection",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Cím",
 
-
   // "collection.source.controls.head": "Harvest Controls",
-  // TODO New key - Add a translation
   "collection.source.controls.head": "Harvest Controls",
-  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
-  // "collection.source.controls.test.failed": "The script to test the settings has failed",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.failed": "The script to test the settings has failed",
-  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
-  // "collection.source.controls.test.submit": "Test configuration",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.submit": "Test configuration",
-  // "collection.source.controls.test.running": "Testing configuration...",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.running": "Testing configuration...",
-  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.submit.success": "The import has been successfully initiated",
-  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
-  // "collection.source.controls.import.submit": "Import now",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.submit": "Import now",
-  // "collection.source.controls.import.running": "Importing...",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.running": "Importing...",
-  // "collection.source.controls.import.failed": "An error occurred during the import",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.failed": "An error occurred during the import",
-  // "collection.source.controls.import.completed": "The import completed",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.completed": "The import completed",
-  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
-  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
-  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
-  // "collection.source.controls.reset.completed": "The reset and reimport completed",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.completed": "The reset and reimport completed",
-  // "collection.source.controls.reset.submit": "Reset and reimport",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.submit": "Reset and reimport",
-  // "collection.source.controls.reset.running": "Resetting and reimporting...",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.running": "Resetting and reimporting...",
-  // "collection.source.controls.harvest.status": "Harvest status:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.status": "Harvest status:",
-  // "collection.source.controls.harvest.start": "Harvest start time:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.start": "Harvest start time:",
-  // "collection.source.controls.harvest.last": "Last time harvested:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.last": "Last time harvested:",
-  // "collection.source.controls.harvest.message": "Harvest info:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.message": "Harvest info:",
-  // "collection.source.controls.harvest.no-information": "N/A",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.no-information": "N/A",
 
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "The script to test the settings has failed",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Test configuration",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Testing configuration...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Import now",
+
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importálás...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Hiba történt az importálás során",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "Importálás befejezve",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "The reset and reimport completed",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Reset and reimport",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Resetting and reimporting...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Harvest status:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Harvest start time:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Last time harvested:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Harvest info:",
+
+  // "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": "A megadott beállításokat ellenőriztük és nem működnek.",
@@ -2206,11 +2109,8 @@
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Szerverhiba",
 
-
-
   // "communityList.breadcrumbs": "Community List",
-  // TODO New key - Add a translation
-  "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Kategóriák listája",
 
   // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "DSpace - Közösség lista",
@@ -2221,7 +2121,20 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Tovább",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expand {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Collapse {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Közösség logó böngészése",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Közzösség létrehozása",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Hozzon létre egy közösséget",
@@ -2230,26 +2143,26 @@
   "community.create.notifications.success": "Közösség sikeresen létrehozva",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Hozzon létre egy alközösséget a közösségben {{ parent }}",
+  "community.create.sub-head": "Hozzon létre egy alközösséget az alábbi közösségben {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Közösség gondozása: {{community}}",
+  // TODO New key - Add a translation
+  "community.curate.header": "Curate Community: {{community}}",
 
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Mégse",
 
   // "community.delete.confirm": "Confirm",
-  "community.delete.confirm": "Igazolja",
+  "community.delete.confirm": "Megerősít",
 
   // "community.delete.processing": "Deleting...",
-  // TODO New key - Add a translation
-  "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Törlés...",
 
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Közösség törlése",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Közösség törlése nem sikerült",
+  "community.delete.notification.fail": "Közösség törlése sikertelen",
 
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "SKözösség sikeresen törölve",
@@ -2266,58 +2179,63 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Közösség szerkesztése",
 
-
   // "community.edit.logo.delete.title": "Delete logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Logó törlése",
+
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirm deletion",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
-  // TODO New key - Add a translation
   "community.edit.logo.delete-undo.title": "Undo delete",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Undo delete",
+
   // "community.edit.logo.label": "Community logo",
-  "community.edit.logo.label": "Közösségi logo",
+  "community.edit.logo.label": "Közösségi logó",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  "community.edit.logo.notifications.add.error": "Közösségi logo feltöltése nem sikerült Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Közösségi logó feltöltése sikertelen. Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Közösségi logo feltöltve.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Közösségi logó feltöltve.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logo törölve",
+  "community.edit.logo.notifications.delete.success.title": "Logó törölve",
 
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "A közösség logóját sikeresen törölte",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  "community.edit.logo.notifications.delete.error.title": "Logo törlése közben hiba történt",
+  "community.edit.logo.notifications.delete.error.title": "Logótörlése közben hiba történt",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Feltöltéshez húzza ide a közösségi logót",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
-  "community.edit.notifications.success": "Közösség szerkesztése sikerült",
+  "community.edit.notifications.success": "Közösség szerkesztése sikeres",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Nincs meg a szükséges jogosultsága a változtatáshoz",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occured while editing the community",
   "community.edit.notifications.error": "Hiba történt a közösség szerkesztésekor",
 
   // "community.edit.return": "Back",
   "community.edit.return": "Vissza",
 
-
-
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Gondozás",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Közösség szerkesztés - Gondozás",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Hozzáférés kontroll",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Metaadat szerkesztés",
 
@@ -2331,26 +2249,24 @@
   "community.edit.tabs.roles.title": "Közösség szerkesztése - Feladatok",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  "community.edit.tabs.authorizations.head": "Jogosultásgok",
+  "community.edit.tabs.authorizations.head": "Jogosultságok",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Közösségi szerkesztés - Jogosultásgok",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Közösség",
 
-
+  // "community.logo": "Community logo",
+  "community.logo": "Community logo",
 
   // "comcol-role.edit.no-group": "None",
-  "comcol-role.edit.no-group": "Semmi",
+  "comcol-role.edit.no-group": "Nincs",
 
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Létrehoz",
 
   // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
-  // TODO New key - Add a translation
   "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
 
   // "comcol-role.edit.restrict": "Restrict",
@@ -2360,31 +2276,26 @@
   "comcol-role.edit.delete": "Töröl",
 
   // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
-  // TODO New key - Add a translation
   "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
 
-
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Adminisztrátorok",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Adminisztrátorok",
 
-
   // "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": "A közösségek adminisztrátorai létrehozhatnak alkategóriákat vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
 
   // "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": "A közösségek adminisztrátorai  öntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Feltöltők",
 
   // "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": "E-People és csoportok akik feltölthetnek új tárgyakat ebbe a gyűjteménybe.",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Alapbeállított tárgy olvasási hozzáférés",
 
@@ -2394,48 +2305,39 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Beérkező tárgyak olvasási alapbeállítása jelenleg Névtelen.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Bitfolyam olvasási hozzáférés alapbeállítás",
 
-  // "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": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
   "comcol-role.edit.bitstream_read.description": "A közösségek adminisztrátorai létrehozhatnak alkategóriákat vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Beérkező bitfolyamok olvasási alapbeállítása jelenleg Névtelen.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Szerkesztők",
 
   // "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": "Szerkesztők szerkeszthetik a beérkező feltöltések metaadatait és elfogadhatják, vagy elutasíthatják azokat.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Végső szerkesztők",
 
   // "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": "Végső szerkesztők szerkeszthetik a beérkező feltöltések metaadatait de nem utasíthatják el azokat.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Lektorálók",
 
   // "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": "A lektorálók elfogadhatják, vagy elutasíthatják a beérkező feltöltéseket, de nem szerkeszthetik azok metaadatait.",
 
-
   // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
-  // TODO New key - Add a translation
   "comcol-role.edit.scorereviewers.name": "Score Reviewers",
 
   // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
-  // TODO New key - Add a translation
   "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
 
-
-
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Rövid leírás",
 
@@ -2469,14 +2371,15 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Alkategóriák és gyűjtemények",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Keresés eredménye",
+
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Ennek a közösségnek a gyűjteményei",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Ennek a kategóriának az alkategóriái",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Mind elfogad",
 
@@ -2499,44 +2402,41 @@
   "cookies.consent.app.required.title": "(mindig szükséges)",
 
   // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
-  // TODO New key - Add a translation
   "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
 
   // "cookies.consent.app.disable-all.title": "Enable or disable all services",
-  // TODO New key - Add a translation
   "cookies.consent.app.disable-all.title": "Enable or disable all services",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Változások történtek az utolsó látogatása óta, frissítse a beleegyezését.",
 
   // "cookies.consent.close": "Close",
-  "cookies.consent.close": "Bezár",
+  "cookies.consent.close": "Bezárás",
 
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Elutasít",
 
   // "cookies.consent.ok": "That's ok",
-  // TODO New key - Add a translation
-  "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Elfogadom",
 
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Mentés",
 
   // "cookies.consent.content-notice.title": "Cookie Consent",
-  "cookies.consent.content-notice.title": "Cookie elfogadása",
+  "cookies.consent.content-notice.title": "Süti elfogadása",
 
   // "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": "Mi gyűjtjük és feldolgozzuk a személyes adatait a következő célból: <strong>Hitelesítés, Beállítások, Elismerés és Statisztikák</strong>. <br/> Részletekért olvassa el: {privacyPolicy}.",
+  // TODO New key - Add a translation
+  "cookies.consent.content-notice.description": "Az adatok gyűjtése és feldolgozása a következő célból történik: <strong>Hitelesítés, Beállítások, Elfogadás és Statisztikák</strong>. <br/> A részletek a következő link segítségével érhetők el: {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>.",
-  // TODO New key - Add a translation
-  "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": "Az adatok gyűjtése és feldolgozása a következő célból történik: <strong>Hitelesítés, Beállítások, Elfogadás és Statisztikák</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-  "cookies.consent.content-notice.learnMore": "Személyreszab",
+  "cookies.consent.content-notice.learnMore": "Testreszabás",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  "cookies.consent.content-modal.description": "Itt láthatja és személyre szabhatja az Önről gyűjtött adatokat.",
+  "cookies.consent.content-modal.description": "Itt tekinthető meg és szabhatja testre az Önről gyűjtött adatokat.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "Adatvédelmi nyilatkozat",
@@ -2548,11 +2448,9 @@
   "cookies.consent.content-modal.title": "Gyűjtött adatok",
 
   // "cookies.consent.content-modal.services": "services",
-  // TODO New key - Add a translation
   "cookies.consent.content-modal.services": "services",
 
   // "cookies.consent.content-modal.service": "service",
-  // TODO New key - Add a translation
   "cookies.consent.content-modal.service": "service",
 
   // "cookies.consent.app.title.authentication": "Authentication",
@@ -2561,40 +2459,30 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Szükséges a beléptetéséhez",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Beállítások",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Szükséges a beállítások mentéséhez",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Elismerés",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Szükséges az elismerésének és beleegyezésének a mentéséhez",
 
-
-
   // "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": "Engedélyezi statisztikai adatok gyűjtését",
 
-
-
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
-  // TODO New key - Add a translation
   "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
 
-
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funkcionális",
 
@@ -2602,18 +2490,15 @@
   "cookies.consent.purpose.statistical": "Statisztikai",
 
   // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
-  // TODO New key - Add a translation
   "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
 
   // "cookies.consent.purpose.sharing": "Sharing",
-  // TODO New key - Add a translation
   "cookies.consent.purpose.sharing": "Sharing",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
-  // TODO New key - Add a translation
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Generate Citation Page",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Hivatkozások ellenőrzése a metaadatokban",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2632,13 +2517,11 @@
   "curation-task.task.vscan.label": "Virus ellenőrzés",
 
   // "curation-task.task.registerdoi.label": "Register DOI",
-  // TODO New key - Add a translation
   "curation-task.task.registerdoi.label": "Register DOI",
 
-
-
   // "curation.form.task-select.label": "Task:",
-  "curation.form.task-select.label": "Feladat:",
+  // TODO New key - Add a translation
+  "curation.form.task-select.label": "Task:",
 
   // "curation.form.submit": "Start",
   "curation.form.submit": "Start",
@@ -2656,7 +2539,6 @@
   "curation.form.submit.error.content": "Hiba történt a kurátor feladat elindításakor.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
-  // TODO New key - Add a translation
   "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
 
   // "curation.form.handle.label": "Handle:",
@@ -2665,39 +2547,35 @@
   // "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": "Hint: Írja be a(z) [your-handle-prefix]/0 hogy futtasson egy feladatok az egész oldalon (nem minden feladat alakalmas a futtatásra)",
 
-
-
   // "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 }}>",
-  // TODO New key - Add a translation
   "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.subject": "Request copy of document",
-  // TODO New key - Add a translation
   "deny-request-copy.email.subject": "Request copy of document",
 
   // "deny-request-copy.error": "An error occurred",
-  // TODO New key - Add a translation
   "deny-request-copy.error": "An error occurred",
 
   // "deny-request-copy.header": "Deny document copy request",
-  // TODO New key - Add a translation
   "deny-request-copy.header": "Deny document copy request",
 
   // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
-  // TODO New key - Add a translation
   "deny-request-copy.intro": "This message will be sent to the applicant of the request",
 
   // "deny-request-copy.success": "Successfully denied item request",
-  // TODO New key - Add a translation
   "deny-request-copy.success": "Successfully denied item request",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Clear selection",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Clear the selected option",
 
   // "dso.name.untitled": "Untitled",
-  // TODO New key - Add a translation
-  "dso.name.untitled": "Untitled",
-
+  "dso.name.untitled": "Cím nélkül",
 
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Unnamed",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Új gyűjtemény",
@@ -2709,8 +2587,7 @@
   "dso-selector.create.community.head": "Új közösség",
 
   // "dso-selector.create.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "vagy",
 
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Hozzon létre új közösséget benne",
@@ -2737,115 +2614,99 @@
   "dso-selector.edit.item.head": "Szerkessze a tárgyat",
 
   // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
-  // TODO New key - Add a translation
   "dso-selector.error.title": "An error occurred searching for a {{ type }}",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Metaadat exportálása innen",
 
   // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
-  // TODO New key - Add a translation
   "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
 
   // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
-  // TODO New key - Add a translation
   "dso-selector.import-batch.dspaceobject.head": "Import batch from",
 
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Nincs {{ type }} találat",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
-  "dso-selector.placeholder": "Keressen egy {{ type }}",
+  "dso-selector.placeholder": "{{ type }} keresése",
+
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "Kategória",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "Gyűjtemény",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "Elem",
 
   // "dso-selector.select.collection.head": "Select a collection",
-  // TODO New key - Add a translation
-  "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Gyűjtemény kiválasztása",
 
   // "dso-selector.set-scope.community.head": "Select a search scope",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "A keresés hatókörének kiválasztása",
 
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "Keresés a teljes DSpaceben",
 
   // "dso-selector.set-scope.community.or-divider": "or",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "vagy",
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Kategória, gyűjtemény keresése",
 
   // "dso-selector.claim.item.head": "Profile tips",
-  // TODO New key - Add a translation
   "dso-selector.claim.item.head": "Profile tips",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.not-mine-label": "None of these are mine",
-  // TODO New key - Add a translation
   "dso-selector.claim.item.not-mine-label": "None of these are mine",
 
   // "dso-selector.claim.item.create-from-scratch": "Create a new one",
-  // TODO New key - Add a translation
   "dso-selector.claim.item.create-from-scratch": "Create a new one",
 
   // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
-  // TODO New key - Add a translation
   "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
 
   // "supervision-group-selector.header": "Supervision Group Selector",
-  // TODO New key - Add a translation
   "supervision-group-selector.header": "Supervision Group Selector",
 
   // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
 
   // "supervision-group-selector.select.type-of-order.option.none": "NONE",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.type-of-order.option.none": "NONE",
 
   // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
 
   // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
 
   // "supervision-group-selector.select.group.label": "Select a Group",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.group.label": "Select a Group",
 
   // "supervision-group-selector.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Mégse",
 
   // "supervision-group-selector.button.save": "Save",
-  // TODO New key - Add a translation
-  "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Mentés",
 
   // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
 
   // "supervision-group-selector.select.group.error": "Please select a group",
-  // TODO New key - Add a translation
   "supervision-group-selector.select.group.error": "Please select a group",
 
   // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
-  // TODO New key - Add a translation
   "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
 
   // "supervision-group-selector.notification.create.failure.title": "Error",
-  // TODO New key - Add a translation
   "supervision-group-selector.notification.create.failure.title": "Error",
 
-  // "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group",
-  // TODO New key - Add a translation
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
   "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
@@ -2855,69 +2716,60 @@
   "confirmation-modal.export-metadata.info": "Biztos benne, hogy exportálni szeretné a metaadatok a követkő céllal: {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  "confirmation-modal.export-metadata.cancel": "Mégsem",
+  "confirmation-modal.export-metadata.cancel": "Mégse",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Export",
 
   // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
   "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
 
   // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
-  // TODO New key - Add a translation
   "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
 
   // "confirmation-modal.export-batch.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Mégse",
 
   // "confirmation-modal.export-batch.confirm": "Export",
-  // TODO New key - Add a translation
   "confirmation-modal.export-batch.confirm": "Export",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.header": "EPerson törlése \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Felhasználó törlése \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.info": "Biztos benne, hogy törli: EPerson \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  "confirmation-modal.delete-eperson.cancel": "Mégsem",
+  "confirmation-modal.delete-eperson.cancel": "Mégse",
 
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Töröl",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-profile.header": "Delete Profile",
 
   // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
 
   // "confirmation-modal.delete-profile.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Mégse",
 
   // "confirmation-modal.delete-profile.confirm": "Delete",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-profile.confirm": "Delete",
 
   // "confirmation-modal.delete-subscription.header": "Delete Subscription",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-subscription.header": "Delete Subscription",
 
   // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-subscription.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Mégse",
 
   // "confirmation-modal.delete-subscription.confirm": "Delete",
-  // TODO New key - Add a translation
   "confirmation-modal.delete-subscription.confirm": "Delete",
 
   // "error.bitstream": "Error fetching bitstream",
@@ -2957,7 +2809,6 @@
   "error.search-results": "keresési eredmények megjelenítésekor hiba történt",
 
   // "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.",
-  // TODO New key - Add a translation
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
 
   // "error.sub-collections": "Error fetching sub-collections",
@@ -2967,7 +2818,8 @@
   "error.sub-communities": "Alkategóriák megjelenítésekor hiba történt",
 
   // "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": "Szakasz kezdőértékének megadásakor hiba történt, kérjük ellenőrizze az adatbeviteli forma beállításait. Részletek alább : <br> <br>",
+  // TODO New key - Add a translation
+  "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Hiba a csúcsszintű kategóriák megjelenítésekor",
@@ -2976,38 +2828,54 @@
   "error.validation.license.notgranted": "ezt az engedélyt meg kell adnia ahhoz, hogy befejezze a feltöltést. Ha jelenleg ez nem lehetséges, elmentheti az eddigi munkát és később folytathatja, vagy törölheti a feltöltést.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
-  "error.validation.pattern": "Ezt a bevitelt korlátozza a jelenlegi útvonal: {{ pattern }}.",
+  // TODO New key - Add a translation
+  "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Az állomány feltöltése kötelező",
 
   // "error.validation.required": "This field is required",
-  // TODO New key - Add a translation
   "error.validation.required": "This field is required",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
-  // TODO New key - Add a translation
-  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
+  "error.validation.NotValidEmail": "This is not a valid email",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
-  // TODO New key - Add a translation
-  "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
+  "error.validation.emailTaken": "This email is already taken",
 
   // "error.validation.groupExists": "This group already exists",
-  // TODO New key - Add a translation
   "error.validation.groupExists": "This group already exists",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
 
   // "feed.description": "Syndication feed",
-  // TODO New key - Add a translation
   "feed.description": "Syndication feed",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Restricted bitstream",
 
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Hiba történ az elemhez tartozó fájlok beszerzésekor",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "szerzői jog © 2002-{{ year }}",
 
@@ -3023,13 +2891,14 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Adatvédelmi nyilatkozat",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Felhasználói feltételek",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Visszajelzés küldése",
 
-
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Elfelejtettem a jelszót",
@@ -3044,7 +2913,6 @@
   "forgot-email.form.email.error.required": "Írjon be egy e-mail címet",
 
   // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
-  // TODO New key - Add a translation
   "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
@@ -3063,11 +2931,8 @@
   "forgot-email.form.error.head": "Hiba történt a jelszó visszaállításakor",
 
   // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  // TODO New key - Add a translation
   "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-password.title": "Forgot Password",
   "forgot-password.title": "Elfelejtettem a jelszót",
 
@@ -3084,7 +2949,8 @@
   "forgot-password.form.identification.header": "Azonosítás",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "E-mail cím: ",
+  // TODO New key - Add a translation
+  "forgot-password.form.identification.email": "Email address: ",
 
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Jelszó",
@@ -3092,7 +2958,7 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Írja újra a visszaigazoláshoz",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
   "forgot-password.form.error.empty-password": "Írja be a jelszót a lenti mezőbe.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
@@ -3110,7 +2976,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Jelszó beküldése",
 
-
   // "form.add": "Add more",
   "form.add": "Továbbiak hozzáadása",
 
@@ -3130,7 +2995,6 @@
   "form.discard": "Elvet",
 
   // "form.drag": "Drag",
-  // TODO New key - Add a translation
   "form.drag": "Drag",
 
   // "form.edit": "Edit",
@@ -3172,6 +3036,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Nem adott meg értéket",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Email",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "First Name",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "In Solr Index",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institution",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Last Name",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Törlés",
 
@@ -3188,182 +3070,140 @@
   "form.search-help": "Kattintson ide egy meglévő levelezés kikereséséhez",
 
   // "form.submit": "Save",
-  "form.submit": "Ment",
+  "form.submit": "Mentés",
+
+  // "form.create": "Create",
+  "form.create": "Létrehoz",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrement {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Increment {{field}}",
 
   // "form.repeatable.sort.tip": "Drop the item in the new position",
-  // TODO New key - Add a translation
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
-
-
   // "grant-deny-request-copy.deny": "Don't send copy",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.deny": "Don't send copy",
 
   // "grant-deny-request-copy.email.back": "Back",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Vissza",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.message": "Message",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Optional additional message",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.email.message.empty": "Please enter a message",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.label": "Change to open access",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.email.permissions.label": "Change to open access",
 
   // "grant-deny-request-copy.email.send": "Send",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.email.send": "Send",
 
   // "grant-deny-request-copy.email.subject": "Subject",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.email.subject": "Subject",
 
   // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
 
   // "grant-deny-request-copy.grant": "Send copy",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.grant": "Send copy",
 
   // "grant-deny-request-copy.header": "Document copy request",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.header": "Document copy request",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
   "grant-deny-request-copy.home-page": "Take me to the home page",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
-  // TODO New key - Add a translation
   "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.processed": "This request has already been processed. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
   "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-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 }}>",
-  // TODO New key - Add a translation
-  "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.subject": "Request copy of document",
-  // TODO New key - Add a translation
   "grant-request-copy.email.subject": "Request copy of document",
 
   // "grant-request-copy.error": "An error occurred",
-  // TODO New key - Add a translation
   "grant-request-copy.error": "An error occurred",
 
   // "grant-request-copy.header": "Grant document copy request",
-  // TODO New key - Add a translation
   "grant-request-copy.header": "Grant document copy request",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
-  // TODO New key - Add a translation
-  "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": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
 
   // "grant-request-copy.success": "Successfully granted item request",
-  // TODO New key - Add a translation
   "grant-request-copy.success": "Successfully granted item request",
 
-
   // "health.breadcrumbs": "Health",
-  // TODO New key - Add a translation
-  "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Monitoring",
 
-  // "health-page.heading" : "Health",
-  // TODO New key - Add a translation
-  "health-page.heading": "Health",
+  // "health-page.heading": "Health",
+  "health-page.heading": "Monitoring",
 
-  // "health-page.info-tab" : "Info",
-  // TODO New key - Add a translation
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Info",
 
-  // "health-page.status-tab" : "Status",
-  // TODO New key - Add a translation
-  "health-page.status-tab": "Status",
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Állapot",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
-  // TODO New key - Add a translation
   "health-page.error.msg": "The health check service is temporarily unavailable",
 
   // "health-page.property.status": "Status code",
-  // TODO New key - Add a translation
   "health-page.property.status": "Status code",
 
   // "health-page.section.db.title": "Database",
-  // TODO New key - Add a translation
   "health-page.section.db.title": "Database",
 
   // "health-page.section.geoIp.title": "GeoIp",
-  // TODO New key - Add a translation
   "health-page.section.geoIp.title": "GeoIp",
 
   // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
-  // TODO New key - Add a translation
   "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
   // "health-page.section.solrOaiCore.title": "Solr: oai core",
-  // TODO New key - Add a translation
   "health-page.section.solrOaiCore.title": "Solr: oai core",
 
   // "health-page.section.solrSearchCore.title": "Solr: search core",
-  // TODO New key - Add a translation
   "health-page.section.solrSearchCore.title": "Solr: search core",
 
   // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
-  // TODO New key - Add a translation
   "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   // "health-page.section-info.app.title": "Application Backend",
-  // TODO New key - Add a translation
   "health-page.section-info.app.title": "Application Backend",
 
   // "health-page.section-info.java.title": "Java",
-  // TODO New key - Add a translation
   "health-page.section-info.java.title": "Java",
 
   // "health-page.status": "Status",
-  // TODO New key - Add a translation
-  "health-page.status": "Status",
+  "health-page.status": "Állapot",
 
   // "health-page.status.ok.info": "Operational",
-  // TODO New key - Add a translation
   "health-page.status.ok.info": "Operational",
 
   // "health-page.status.error.info": "Problems detected",
-  // TODO New key - Add a translation
   "health-page.status.error.info": "Problems detected",
 
   // "health-page.status.warning.info": "Possible issues detected",
-  // TODO New key - Add a translation
   "health-page.status.warning.info": "Possible issues detected",
 
   // "health-page.title": "Health",
-  // TODO New key - Add a translation
-  "health-page.title": "Health",
+  "health-page.title": "Monitoring",
 
   // "health-page.section.no-issues": "No issues detected",
-  // TODO New key - Add a translation
   "health-page.section.no-issues": "No issues detected",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -3371,7 +3211,7 @@
   "home.breadcrumbs": "Főoldal",
 
   // "home.search-form.placeholder": "Search the repository ...",
-  "home.search-form.placeholder": "Keresés az adattárban ...",
+  "home.search-form.placeholder": "Keresés a repozitóriumban ...",
 
   // "home.title": "Home",
   "home.title": "Főoldal",
@@ -3382,8 +3222,6 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Válasszon ki egy kategóriát, hogy böngéssze a gyűjteményeit.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "Elolvastam és elfogadom a felhasználói feltételeket",
 
@@ -3397,7 +3235,7 @@
   "info.end-user-agreement.breadcrumbs": "Felhasználói feltételek",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  "info.end-user-agreement.buttons.cancel": "Mégsem",
+  "info.end-user-agreement.buttons.cancel": "Mégse",
 
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "Mentés",
@@ -3408,6 +3246,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Felhasználói feltételek",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "the United States",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Adatvédelmi nyilatkozat",
 
@@ -3418,8 +3259,7 @@
   "info.privacy.title": "Adatvédelmi nyilatkozat",
 
   // "info.feedback.breadcrumbs": "Feedback",
-  // TODO New key - Add a translation
-  "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Visszajelzés",
 
   // "info.feedback.head": "Feedback",
   "info.feedback.head": "Visszajelzés",
@@ -3428,11 +3268,9 @@
   "info.feedback.title": "Visszajelzés",
 
   // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
-  // TODO New key - Add a translation
   "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
 
   // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
-  // TODO New key - Add a translation
   "info.feedback.email_help": "This address will be used to follow up on your feedback.",
 
   // "info.feedback.send": "Send Feedback",
@@ -3444,27 +3282,26 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Az e-mail címe",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
-  // TODO New key - Add a translation
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Feedback Sent Successfully!",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
-  // TODO New key - Add a translation
+  // "info.feedback.error.email.required": "A valid email address is required",
   "info.feedback.error.email.required": "A valid email address is required",
 
-  // "info.feedback.error.message.required" : "A comment is required",
-  // TODO New key - Add a translation
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "A comment is required",
 
-  // "info.feedback.page-label" : "Page",
-  // TODO New key - Add a translation
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Page",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
-  // TODO New key - Add a translation
-  "info.feedback.page_help": "Tha page related to your feedback",
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "The page related to your feedback",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "COAR Notify Support",
 
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
 
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Ez az elem privát",
@@ -3472,15 +3309,18 @@
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Ez az elem vissza lett vonva",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Requested by",
 
   // "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": "Evvel a szerkesztővel megnézheti vagy szerkesztheti egy elem jogosutságát, és szerkesztheti egy egyedi elem componenseinek jogosutságát: bundles és bitstreams. Röviden, egy elem a kötegek gyűjteménye, és a kötegek a bitsteramek gyűjteménye. A kötegeknek többnyire van ADD/REMOVE/READ/WRITE jogosultsága, miközben a bitstreameknek csak READ/WRITE jogosultsága.",
+  // TODO New key - Add a translation
+  "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.title": "Edit item's Policies",
-  "item.edit.authorizations.title": "Jogosultásgok elem szerkesztése",
-
-
+  "item.edit.authorizations.title": "Az elem jogosultságainak szerkesztése",
 
   // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privát",
@@ -3488,8 +3328,6 @@
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Visszavont",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Csomag",
 
@@ -3499,7 +3337,7 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Hozzon létre csomagot",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Ez a tárgy nem tartalmaz csomagot, ahova bitfolyamot lehetne feltölteni.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -3509,7 +3347,8 @@
   "item.bitstreams.upload.drop-message": "Húzza ide a feltöltendő állományt",
 
   // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Tárgy: ",
+  // TODO New key - Add a translation
+  "item.bitstreams.upload.item": "Item: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Új csomag sikeresen létrehozva.",
@@ -3518,27 +3357,26 @@
   "item.bitstreams.upload.notifications.bundle.created.title": "Csomag létrehozva",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  "item.bitstreams.upload.notifications.upload.failed": "Feltöltés nem sikerült. Kérjük ellenőrizze a tartalmát, mielőtt újra próbálkozna.",
+  "item.bitstreams.upload.notifications.upload.failed": "Feltöltés sikertelen. Kérjük ellenőrizze a tartalmát, mielőtt újra próbálkozna.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Bitfolyam feltöltése",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Feltöltés",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  "item.edit.bitstreams.bundle.displaying": "Jelenleg látható {{ amount }} Bitfolyam ennyiből: {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Jelenleg látható {{ amount }} bitfolyam / {{ total }}.",
 
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  "item.edit.bitstreams.bundle.load.all": "Valamennyi betöltése ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Összes betöltése ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Több betöltése",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  "item.edit.bitstreams.bundle.name": "CSOMAG: {{ name }}",
+  // TODO New key - Add a translation
+  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Elvetés",
@@ -3615,8 +3453,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Feltöltés",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Mégse",
 
@@ -3624,13 +3460,15 @@
   "item.edit.delete.confirm": "Törlés",
 
   // "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": "Biztos benne, hogy ezt a tárgyat teljesen törölni óhajtja? Figyelem: jelenleg nem marad sírkő.",
+  // TODO New key - Add a translation
+  "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Tárgy törlése közben hiba történt",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  "item.edit.delete.header": "Tárgy törlése: {{ id }}",
+  // TODO New key - Add a translation
+  "item.edit.delete.header": "Delete item: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Tárgy törölve",
@@ -3642,100 +3480,75 @@
   "item.edit.breadcrumbs": "Tárgy szerkesztése",
 
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
-  // TODO New key - Add a translation
   "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Gyűjteményhez rendelés",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
   "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
 
   // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
 
   // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
 
   // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
 
   // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
 
   // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
 
   // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
 
   // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
 
   // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
 
   // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
 
   // "item.edit.identifiers.doi.status.DELETED": "Deleted",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.DELETED": "Deleted",
 
   // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
 
   // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
-  // TODO New key - Add a translation
   "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
 
   // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
 
   // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
 
   // "item.edit.register-doi.header": "Register a new or pending DOI",
-  // TODO New key - Add a translation
   "item.edit.register-doi.header": "Register a new or pending DOI",
 
   // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
-  // TODO New key - Add a translation
   "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
 
   // "item.edit.register-doi.confirm": "Confirm",
-  // TODO New key - Add a translation
   "item.edit.register-doi.confirm": "Confirm",
 
   // "item.edit.register-doi.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Mégse",
 
   // "item.edit.register-doi.success": "DOI queued for registration successfully.",
-  // TODO New key - Add a translation
   "item.edit.register-doi.success": "DOI queued for registration successfully.",
 
   // "item.edit.register-doi.error": "Error registering DOI",
-  // TODO New key - Add a translation
   "item.edit.register-doi.error": "Error registering DOI",
 
   // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
-  // TODO New key - Add a translation
   "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
@@ -3754,7 +3567,8 @@
   "item.edit.item-mapper.head": "Tárgytérképező - Térképezze a tárgyat gyűjteményekhez",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.item": "Tárgy: \"<b>{{name}}</b>\"",
+  // TODO New key - Add a translation
+  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Kérjük írja be a keresett szót",
@@ -3784,7 +3598,6 @@
   "item.edit.item-mapper.notifications.remove.success.head": "Térképezés eltávolítása befejeződött",
 
   // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
-  // TODO New key - Add a translation
   "item.edit.item-mapper.search-form.placeholder": "Search collections...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
@@ -3793,20 +3606,25 @@
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Térképezzen új gyűjteményeket",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Hozzáadás",
 
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Elvetés",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Edit language",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Edit value",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
@@ -3822,7 +3640,6 @@
   "item.edit.metadata.edit.buttons.unedit": "Szerkesztés leállítása",
 
   // "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",
-  // TODO New key - Add a translation
   "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.",
@@ -3840,8 +3657,10 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Érték",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Edit field",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
   "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
@@ -3857,7 +3676,7 @@
   "item.edit.metadata.notifications.error.title": "Hiba történt",
 
   // "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": "Módosításai nincsenek elmentve, Kérjük mentés előtt ellenőrizze, hogy valamennyi mező érvényes.",
+  "item.edit.metadata.notifications.invalid.content": "Módosításai nincsenek elmentve, Kérjük mentés előtt ellenőrizze, hogy az összes mező érvényes.",
 
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Érvénytelen metaadat",
@@ -3878,13 +3697,19 @@
   "item.edit.metadata.reinstate-button": "Visszaállítás",
 
   // "item.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
   "item.edit.metadata.reset-order-button": "Undo reorder",
 
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Mentés",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Authority: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Mező",
@@ -3895,18 +3720,14 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Érték",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Vissza",
 
   // "item.edit.move.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Mentés",
 
   // "item.edit.move.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Elvetés",
 
   // "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": "Válassza ki a gyűjteményt amelyhez ezt a tárgyat hozzá kívánja adni. A látható gyűjtemények listájának szűkítéséhez írjon be keresőszót a mezőbe.",
@@ -3915,7 +3736,8 @@
   "item.edit.move.error": "Tárgy mozgatásakor hiba történt",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  "item.edit.move.head": "Tárgy mozgatása: {{id}}",
+  // TODO New key - Add a translation
+  "item.edit.move.head": "Move item: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Szabályzatok öröklése",
@@ -3923,6 +3745,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Örökölje a célgyűjtemény alapértelmezett szabályzatát",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mozgatás",
 
@@ -3938,58 +3763,42 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Tárgy mozgatása",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Mégse",
 
   // "item.edit.private.confirm": "Make it non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.confirm": "Legyen privát",
 
   // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.description": "Biztos legyen ez a tárgy privát ebben az archívumban?",
 
   // "item.edit.private.error": "An error occurred while making the item non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.error": "A tárgy privát beállí1tása közben hiba történt",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  // TODO New key - Add a translation
   "item.edit.private.header": "Make item non-discoverable: {{ id }}",
 
   // "item.edit.private.success": "The item is now non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.success": "Ezx a tárgy most privát",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Mégse",
 
   // "item.edit.public.confirm": "Make it discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.confirm": "legyen nyilvános",
 
   // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.description": "ABiztos legyen ez a tárgy nyilvános ebben az archívumban?",
 
   // "item.edit.public.error": "An error occurred while making the item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.error": "Tárgy nyilvánossá tétele közben hiba történt",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
-  // TODO New key - Add a translation
   "item.edit.public.header": "Make item discoverable: {{ id }}",
 
   // "item.edit.public.success": "The item is now discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.success": "A tárgy most nyilvános",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Mégse",
 
@@ -4003,18 +3812,17 @@
   "item.edit.reinstate.error": "Tárgy visszaállítása közben hiba történt",
 
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
-  "item.edit.reinstate.header": "Tárgy visszaállítása: {{ id }}",
+  // TODO New key - Add a translation
+  "item.edit.reinstate.header": "Reinstate item: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Tárgy visszaállítása sikerült",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Elvetés",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  "item.edit.relationships.edit.buttons.add": "Hozzáad",
+  "item.edit.relationships.edit.buttons.add": "Hozzáadás",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Eltávolítás",
@@ -4055,11 +3863,8 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Adja hozzá a 'dspace.entity.type' metaadatot ezen elem hivatkozásánek engedélyezéséhez",
 
-
   // "item.edit.return": "Back",
-  // TODO New key - Add a translation
-  "item.edit.return": "Back",
-
+  "item.edit.return": "Vissza",
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Bitfolyamok",
@@ -4073,6 +3878,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Tárgy szerkesztése - Gondozás",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curate Item: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Hozzáférés kontroll",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metaadat",
 
@@ -4104,26 +3918,21 @@
   "item.edit.tabs.status.buttons.mappedCollections.label": "Térképezett gyűjtemények szervezése",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.move.button": "Elmozdítás...",
+  "item.edit.tabs.status.buttons.move.button": "Áthelyezés...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Tárgy másik gyűjteménybe költöztetése",
 
   // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.private.button": "Legyen privát...",
 
   // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.buttons.private.label": "Legyen a tárgy privát",
+  "item.edit.tabs.status.buttons.private.label": "Legyen a tárgy privát (nem nyilvános)",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.public.button": "Legyen nyilvános...",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.public.label": "Legyen a tárgy nyilvános",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
@@ -4133,15 +3942,13 @@
   "item.edit.tabs.status.buttons.reinstate.label": "Tárgy visszaállítása az adattárba",
 
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
-  // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
 
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.withdraw.button": "Visszavonás...",
 
   // "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",
+  "item.edit.tabs.status.buttons.withdraw.label": "Tárgy visszavonása a repozitóriumból",
 
   // "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": "Üdvözöljük a tárgyak szervezése oldalon. Itt visszavonhat, visszaállíthat, költöztethet vagy törölhet tárgyakat. Ugyanitt frissíthet metaadatokat illetve bitfolyamokat a többi fülnél, vagy újakat adhat hozzá",
@@ -4150,7 +3957,7 @@
   "item.edit.tabs.status.head": "Állapot",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-  "item.edit.tabs.status.labels.handle": "Mutató",
+  "item.edit.tabs.status.labels.handle": "Handle",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Tárgy belső azonosító",
@@ -4165,7 +3972,7 @@
   "item.edit.tabs.status.title": "Tárgy szerkesztése -  Állapot",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-  "item.edit.tabs.versionhistory.head": "Változatok története",
+  "item.edit.tabs.versionhistory.head": "Verziók története",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
   "item.edit.tabs.versionhistory.title": "Tárgy szerkesztése - Változatok története",
@@ -4179,8 +3986,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Tárgy szerkesztése -  Megtekintés",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Mégse",
 
@@ -4194,18 +3999,17 @@
   "item.edit.withdraw.error": "Tárgy visszavonásakor hiba történt",
 
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
-  "item.edit.withdraw.header": "Tárgy visszavonása: {{ id }}",
+  // TODO New key - Add a translation
+  "item.edit.withdraw.header": "Withdraw item: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Tárgy visszavonása sikerült",
 
   // "item.orcid.return": "Back",
-  // TODO New key - Add a translation
-  "item.orcid.return": "Back",
-
+  "item.orcid.return": "Vissza",
 
   // "item.listelement.badge": "Item",
-  "item.listelement.badge": "Tétel",
+  "item.listelement.badge": "Elem",
 
   // "item.page.description": "Description",
   "item.page.description": "Leírás",
@@ -4220,7 +4024,8 @@
   "item.page.publisher": "Kiadó",
 
   // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Elem: ",
+  // TODO New key - Add a translation
+  "item.page.titleprefix": "Item: ",
 
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Kötet címe",
@@ -4229,50 +4034,76 @@
   "item.search.results.head": "Elem keresésének eredménye",
 
   // "item.search.title": "Item Search",
-  // TODO Source message changed - Revise the translation
-  "item.search.title": "DSpace Angular :: Elem Keresése",
+  "item.search.title": "DSpace Repozitórium :: Elem Keresése",
 
   // "item.truncatable-part.show-more": "Show more",
-  // TODO New key - Add a translation
   "item.truncatable-part.show-more": "Show more",
 
   // "item.truncatable-part.show-less": "Collapse",
-  // TODO New key - Add a translation
   "item.truncatable-part.show-less": "Collapse",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Megtekint",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Megtekint",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
-  // TODO New key - Add a translation
   "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
 
   // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
-  // TODO New key - Add a translation
   "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
 
   // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Mégse",
 
   // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
-  // TODO New key - Add a translation
   "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
 
   // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
   "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
 
   // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
-  // TODO New key - Add a translation
   "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
 
   // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
-  // TODO New key - Add a translation
   "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
 
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
-  // TODO New key - Add a translation
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
 
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Kivonat",
@@ -4302,18 +4133,22 @@
   "item.page.files": "Állományok",
 
   // "item.page.filesection.description": "Description:",
+  // TODO New key - Add a translation
   "item.page.filesection.description": "Leírás:",
 
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Letöltés",
 
   // "item.page.filesection.format": "Format:",
+  // TODO New key - Add a translation
   "item.page.filesection.format": "Formátum:",
 
   // "item.page.filesection.name": "Name:",
+  // TODO New key - Add a translation
   "item.page.filesection.name": "Név:",
 
   // "item.page.filesection.size": "Size:",
+  // TODO New key - Add a translation
   "item.page.filesection.size": "Méret:",
 
   // "item.page.journal.search.title": "Articles in this journal",
@@ -4329,7 +4164,6 @@
   "item.page.orcid.title": "ORCID",
 
   // "item.page.orcid.tooltip": "Open ORCID setting page",
-  // TODO New key - Add a translation
   "item.page.orcid.tooltip": "Open ORCID setting page",
 
   // "item.page.person.search.title": "Articles by this author",
@@ -4365,121 +4199,150 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Bezár",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Primary",
+
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Eredeti csomag",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Licenccsomag",
 
   // "item.page.return": "Back",
   "item.page.return": "Vissza",
 
   // "item.page.version.create": "Create new version",
-  // TODO New key - Add a translation
-  "item.page.version.create": "Create new version",
+  "item.page.version.create": "Új verzió készítése",
+
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Elem visszavonásának kérvényezése",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Request reinstatement",
 
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
-  // TODO New key - Add a translation
   "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
   // "item.page.claim.button": "Claim",
-  // TODO New key - Add a translation
   "item.page.claim.button": "Claim",
 
   // "item.page.claim.tooltip": "Claim this item as profile",
-  // TODO New key - Add a translation
   "item.page.claim.tooltip": "Claim this item as profile",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR logo",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
-  "item.preview.dc.identifier.uri": "Azonosító:",
+  // TODO New key - Add a translation
+  "item.preview.dc.identifier.uri": "Identifier:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  "item.preview.dc.contributor.author": "Szerzők:",
+  // TODO New key - Add a translation
+  "item.preview.dc.contributor.author": "Authors:",
 
   // "item.preview.dc.date.issued": "Published date:",
-  "item.preview.dc.date.issued": "Kiadás dátuma:",
+  // TODO New key - Add a translation
+  "item.preview.dc.date.issued": "Published date:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-  "item.preview.dc.description.abstract": "Kivonat:",
+  // TODO New key - Add a translation
+  "item.preview.dc.description.abstract": "Abstract:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-  "item.preview.dc.identifier.other": "Más azonosító:",
+  // TODO New key - Add a translation
+  "item.preview.dc.identifier.other": "Other identifier:",
 
   // "item.preview.dc.language.iso": "Language:",
-  "item.preview.dc.language.iso": "Nyelv:",
+  // TODO New key - Add a translation
+  "item.preview.dc.language.iso": "Language:",
 
   // "item.preview.dc.subject": "Subjects:",
-  "item.preview.dc.subject": "Téma:",
+  // TODO New key - Add a translation
+  "item.preview.dc.subject": "Subjects:",
 
   // "item.preview.dc.title": "Title:",
-  "item.preview.dc.title": "Cím:",
+  // TODO New key - Add a translation
+  "item.preview.dc.title": "Title:",
 
   // "item.preview.dc.type": "Type:",
-  // TODO New key - Add a translation
   "item.preview.dc.type": "Type:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
-  // TODO New key - Add a translation
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Issue",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
-  // TODO New key - Add a translation
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volume",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
-  // TODO New key - Add a translation
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
-  // TODO New key - Add a translation
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
-  // TODO New key - Add a translation
   "item.preview.dc.identifier": "Identifier:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
-  // TODO New key - Add a translation
-  "item.preview.dc.relation.ispartof": "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
+  "item.preview.dc.relation.ispartof": "Journal or Series",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
-  // TODO New key - Add a translation
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Publisher:",
+
   // "item.preview.person.familyName": "Surname:",
-  "item.preview.person.familyName": "Keresztnév:",
+  // TODO New key - Add a translation
+  "item.preview.person.familyName": "Surname:",
 
   // "item.preview.person.givenName": "Name:",
-  "item.preview.person.givenName": "Vezetéknév:",
+  // TODO New key - Add a translation
+  "item.preview.person.givenName": "Név:",
 
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID:",
 
   // "item.preview.project.funder.name": "Funder:",
-  // TODO New key - Add a translation
   "item.preview.project.funder.name": "Funder:",
 
   // "item.preview.project.funder.identifier": "Funder Identifier:",
-  // TODO New key - Add a translation
   "item.preview.project.funder.identifier": "Funder Identifier:",
 
   // "item.preview.oaire.awardNumber": "Funding ID:",
-  // TODO New key - Add a translation
   "item.preview.oaire.awardNumber": "Funding ID:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  // TODO New key - Add a translation
   "item.preview.dc.title.alternative": "Acronym:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-  // TODO New key - Add a translation
   "item.preview.dc.coverage.spatial": "Jurisdiction:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
-  // TODO New key - Add a translation
   "item.preview.oaire.fundingStream": "Funding Stream:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
 
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "Country",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Founding Date",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Legal Name",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Kiválasztás igazolása",
@@ -4487,6 +4350,15 @@
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nincs megtekinthető tárgy",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Selected items",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Select item",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deselect item",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Szerző",
 
@@ -4496,7 +4368,6 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Cím",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Ennek a tárgynak még nincs más változata.",
 
@@ -4504,14 +4375,12 @@
   "item.version.history.head": "Változatok története",
 
   // "item.version.history.return": "Back",
-  // TODO Source message changed - Revise the translation
   "item.version.history.return": "Vissza",
 
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Kiválasztott változat",
 
   // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
-  // TODO New key - Add a translation
   "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
 
   // "item.version.history.table.version": "Version",
@@ -4530,259 +4399,250 @@
   "item.version.history.table.summary": "Összefoglaló",
 
   // "item.version.history.table.workspaceItem": "Workspace item",
-  // TODO New key - Add a translation
   "item.version.history.table.workspaceItem": "Workspace item",
 
   // "item.version.history.table.workflowItem": "Workflow item",
-  // TODO New key - Add a translation
   "item.version.history.table.workflowItem": "Workflow item",
 
   // "item.version.history.table.actions": "Action",
-  // TODO New key - Add a translation
   "item.version.history.table.actions": "Action",
 
   // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
-  // TODO New key - Add a translation
   "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
 
   // "item.version.history.table.action.editSummary": "Edit summary",
-  // TODO New key - Add a translation
   "item.version.history.table.action.editSummary": "Edit summary",
 
   // "item.version.history.table.action.saveSummary": "Save summary edits",
-  // TODO New key - Add a translation
   "item.version.history.table.action.saveSummary": "Save summary edits",
 
   // "item.version.history.table.action.discardSummary": "Discard summary edits",
-  // TODO New key - Add a translation
   "item.version.history.table.action.discardSummary": "Discard summary edits",
 
   // "item.version.history.table.action.newVersion": "Create new version from this one",
-  // TODO New key - Add a translation
   "item.version.history.table.action.newVersion": "Create new version from this one",
 
   // "item.version.history.table.action.deleteVersion": "Delete version",
-  // TODO New key - Add a translation
   "item.version.history.table.action.deleteVersion": "Delete version",
 
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
-  // TODO New key - Add a translation
   "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
 
-
   // "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": "Ez nem ennek a tárgynak a legutóbbi változata. A legutóbbi változat megtalálható itt <a href='{{destination}}'>here</a>.",
 
-
   // "item.version.create.modal.header": "New version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Új verzió",
+
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Request reinstate",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Új verzió",
 
   // "item.version.create.modal.text": "Create a new version for this item",
-  // TODO New key - Add a translation
-  "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Új verzió készítése ehhez az elemhez",
 
   // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
-  // TODO New key - Add a translation
   "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
 
   // "item.version.create.modal.button.confirm": "Create",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Létrehoz",
 
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Új verzió készítése",
+
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
 
   // "item.version.create.modal.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Mégse",
+
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Mégse",
 
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
-  // TODO New key - Add a translation
   "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
   // "item.version.create.modal.form.summary.label": "Summary",
-  // TODO New key - Add a translation
-  "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Összefoglaló",
+
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
 
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Kérjük adja meg az új verzió összefoglalóját",
+
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
 
   // "item.version.create.modal.submitted.header": "Creating new version...",
-  // TODO New key - Add a translation
   "item.version.create.modal.submitted.header": "Creating new version...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+
   // "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.",
-  // TODO New key - Add a translation
   "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.notification.success" : "New version has been created with version number {{version}}",
-  // TODO New key - Add a translation
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "New version has been created with version number {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
-  // TODO New key - Add a translation
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "New version has not been created",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
-  // TODO New key - Add a translation
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
 
-
   // "item.version.delete.modal.header": "Delete version",
-  // TODO New key - Add a translation
   "item.version.delete.modal.header": "Delete version",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-  // TODO New key - Add a translation
   "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
 
   // "item.version.delete.modal.button.confirm": "Delete",
-  // TODO New key - Add a translation
   "item.version.delete.modal.button.confirm": "Delete",
 
   // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
-  // TODO New key - Add a translation
   "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
 
   // "item.version.delete.modal.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Mégse",
 
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
-  // TODO New key - Add a translation
   "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
-  // TODO New key - Add a translation
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "Version number {{version}} has been deleted",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
-  // TODO New key - Add a translation
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
 
-
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
-  // TODO New key - Add a translation
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
   "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
 
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
-  // TODO New key - Add a translation
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
 
-
-
   // "itemtemplate.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Hozzáadás",
 
   // "itemtemplate.edit.metadata.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Elvetés",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Edit language",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Edit value",
 
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
 
   // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
 
   // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
 
   // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
 
   // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
 
   // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
 
   // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.headers.edit": "Edit",
 
   // "itemtemplate.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.headers.field": "Field",
 
   // "itemtemplate.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.headers.language": "Lang",
 
   // "itemtemplate.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.headers.value": "Value",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Edit field",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
 
   // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
 
   // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
   "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.",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
   "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",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
 
   // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
 
   // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
 
   // "itemtemplate.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.reinstate-button": "Undo",
 
   // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
-  // TODO New key - Add a translation
   "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
 
   // "itemtemplate.edit.metadata.save-button": "Save",
-  // TODO New key - Add a translation
-  "itemtemplate.edit.metadata.save-button": "Save",
-
-
+  "itemtemplate.edit.metadata.save-button": "Mentés",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Folyóirat",
@@ -4803,7 +4663,8 @@
   "journal.page.publisher": "Kiadó",
 
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Folyóirat: ",
+  // TODO New key - Add a translation
+  "journal.page.titleprefix": "Journal: ",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Folyóirat keresés eredménye",
@@ -4814,8 +4675,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Folyóirat keresés",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Folyóirat szám",
 
@@ -4841,9 +4700,11 @@
   "journalissue.page.number": "Szám",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Folyóirat száma: ",
-
+  // TODO New key - Add a translation
+  "journalissue.page.titleprefix": "Journal Issue: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Folyóiratszám keresési eredménye",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Folyóirat kötet",
@@ -4858,57 +4719,48 @@
   "journalvolume.page.issuedate": "Megjelenés dátuma",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Folyóirat kötet: ",
+  // TODO New key - Add a translation
+  "journalvolume.page.titleprefix": "Journal Volume: ",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Kötet",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Journal Volume Search Results",
 
   // "iiifsearchable.listelement.badge": "Document Media",
-  // TODO New key - Add a translation
   "iiifsearchable.listelement.badge": "Document Media",
 
   // "iiifsearchable.page.titleprefix": "Document: ",
-  // TODO New key - Add a translation
   "iiifsearchable.page.titleprefix": "Document: ",
 
   // "iiifsearchable.page.doi": "Permanent Link: ",
-  // TODO New key - Add a translation
   "iiifsearchable.page.doi": "Permanent Link: ",
 
   // "iiifsearchable.page.issue": "Issue: ",
-  // TODO New key - Add a translation
   "iiifsearchable.page.issue": "Issue: ",
 
   // "iiifsearchable.page.description": "Description: ",
-  // TODO New key - Add a translation
   "iiifsearchable.page.description": "Description: ",
 
   // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
-  // TODO New key - Add a translation
   "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
 
   // "iiif.listelement.badge": "Image Media",
-  // TODO New key - Add a translation
   "iiif.listelement.badge": "Image Media",
 
   // "iiif.page.titleprefix": "Image: ",
-  // TODO New key - Add a translation
   "iiif.page.titleprefix": "Image: ",
 
   // "iiif.page.doi": "Permanent Link: ",
-  // TODO New key - Add a translation
   "iiif.page.doi": "Permanent Link: ",
 
   // "iiif.page.issue": "Issue: ",
-  // TODO New key - Add a translation
   "iiif.page.issue": "Issue: ",
 
   // "iiif.page.description": "Description: ",
-  // TODO New key - Add a translation
   "iiif.page.description": "Description: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Bitfolyam betöltése...",
 
@@ -4963,8 +4815,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Csúcsszintű kategóriák betöltése...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "E-mail cím",
 
@@ -4977,15 +4827,10 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Új felhasználó? Regisztráljon.",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "vagy",
-
   // "login.form.oidc": "Log in with OIDC",
-  // TODO New key - Add a translation
   "login.form.oidc": "Log in with OIDC",
 
   // "login.form.orcid": "Log in with ORCID",
-  // TODO New key - Add a translation
   "login.form.orcid": "Log in with ORCID",
 
   // "login.form.password": "Password",
@@ -5003,8 +4848,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Bejelentkezés",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Kilépés a DSpace-ből",
 
@@ -5014,54 +4857,45 @@
   // "logout.title": "Logout",
   "logout.title": "Kilépés",
 
-
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Admin navigation bar",
 
   // "menu.header.admin": "Management",
-  // TODO Source message changed - Revise the translation
   "menu.header.admin": "Admin",
 
   // "menu.header.image.logo": "Repository logo",
-  "menu.header.image.logo": "Adattár logo",
+  "menu.header.image.logo": "Repozitórium logó",
 
   // "menu.header.admin.description": "Management menu",
-  // TODO New key - Add a translation
   "menu.header.admin.description": "Management menu",
 
-
-
   // "menu.section.access_control": "Access Control",
-  "menu.section.access_control": "Hozzáférési kontroll",
+  "menu.section.access_control": "Hozzáférés kontroll",
 
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Engedélyezések",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Tömeges hozzáférés kezelés",
+
   // "menu.section.access_control_groups": "Groups",
-  "menu.section.access_control_groups": "csoportok",
+  "menu.section.access_control_groups": "Csoportok",
 
   // "menu.section.access_control_people": "People",
-  "menu.section.access_control_people": "Emberek",
-
-
+  "menu.section.access_control_people": "Felhasználók",
 
   // "menu.section.reports": "Reports",
-  // TODO New key - Add a translation
   "menu.section.reports": "Reports",
 
   // "menu.section.reports.collections": "Filtered Collections",
-  // TODO New key - Add a translation
   "menu.section.reports.collections": "Filtered Collections",
 
   // "menu.section.reports.queries": "Metadata Query",
-  // TODO New key - Add a translation
   "menu.section.reports.queries": "Metadata Query",
 
-
-
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Admin keresés",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "ez a közösség",
 
@@ -5086,22 +4920,24 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Tárgyszó szerint",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Tárgyszó kategória szerint",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Cím szerint",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Kategóriák & Gyűjtemények",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Vezérlőpult",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Gondozási feladat",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Szerkesztés",
 
@@ -5114,8 +4950,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Tárgy",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Export",
 
@@ -5132,14 +4966,12 @@
   "menu.section.export_metadata": "Metaadat",
 
   // "menu.section.export_batch": "Batch Export (ZIP)",
-  // TODO New key - Add a translation
   "menu.section.export_batch": "Batch Export (ZIP)",
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Hozzáférés kontroll menü felület",
 
-  //"menu.section.icon.reports": "Reports menu section",
-  // TODO New key - Add a translation
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Reports menu section",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -5149,7 +4981,6 @@
   "menu.section.icon.control_panel": "Vezérlőpult menü felület",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-  // TODO New key - Add a translation
   "menu.section.icon.curation_tasks": "Curation Task menu section",
 
   // "menu.section.icon.edit": "Edit menu section",
@@ -5162,7 +4993,6 @@
   "menu.section.icon.find": "Keresés menü felület",
 
   // "menu.section.icon.health": "Health check menu section",
-  // TODO New key - Add a translation
   "menu.section.icon.health": "Health check menu section",
 
   // "menu.section.icon.import": "Import menu section",
@@ -5175,7 +5005,6 @@
   "menu.section.icon.pin": "Oldalsáv rögzítése",
 
   // "menu.section.icon.processes": "Processes Health",
-  // TODO Source message changed - Revise the translation
   "menu.section.icon.processes": "Menü felület feldolgozása",
 
   // "menu.section.icon.registries": "Registries menu section",
@@ -5185,13 +5014,13 @@
   "menu.section.icon.statistics_task": "Statisztikai feladatok menü felület",
 
   // "menu.section.icon.workflow": "Administer workflow menu section",
-  // TODO New key - Add a translation
   "menu.section.icon.workflow": "Administer workflow menu section",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Oldalbár rögzítés megszüntetése",
 
-
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Notifications menu section",
 
   // "menu.section.import": "Import",
   "menu.section.import": "Import",
@@ -5202,8 +5031,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metaadat",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Új",
 
@@ -5222,7 +5049,14 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Folyamat",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Értesítések",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Quality Assurance",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Oldalsáv rögzítése",
@@ -5230,16 +5064,11 @@
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Oldalsáv rögzítés megszüntetése",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Folyamatok",
 
   // "menu.section.health": "Health",
-  // TODO New key - Add a translation
-  "menu.section.health": "Health",
-
-
+  "menu.section.health": "Monitoring",
 
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Leíró adatbázisok",
@@ -5250,23 +5079,18 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metaadat",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Statisztikák",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Statisztikai feladatok",
 
-
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Váltás a Hozzáférés kontrol felületre",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Váltás a Vezérlőpult felületre",
 
@@ -5294,24 +5118,19 @@
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Statisztikai feladatok felületre váltás",
 
-
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Munkafolyamat irányítása",
 
-
   // "metadata-export-search.tooltip": "Export search results as CSV",
-  // TODO New key - Add a translation
-  "metadata-export-search.tooltip": "Export search results as CSV",
-  // "metadata-export-search.submit.success": "The export was started successfully",
-  // TODO New key - Add a translation
-  "metadata-export-search.submit.success": "The export was started successfully",
-  // "metadata-export-search.submit.error": "Starting the export has failed",
-  // TODO New key - Add a translation
-  "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.tooltip": "Keresés eredményének exportálása CSV formátumban",
 
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "Az export sikeresen elindult",
+
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Az export elindítása sikertelen",
 
   // "mydspace.breadcrumbs": "MyDSpace",
-  // TODO New key - Add a translation
   "mydspace.breadcrumbs": "MyDSpace",
 
   // "mydspace.description": "",
@@ -5389,23 +5208,20 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Nincs cím",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Nincs Uri",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
-  // TODO New key - Add a translation
-  "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
+  "mydspace.search-form.placeholder": "Search in MyDSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
-  // TODO Source message changed - Revise the translation
-  "mydspace.show.workflow": "Valamennyi feladat",
+  "mydspace.show.workflow": "Összes workflow feladat",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Az ön feltöltései",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
-  // TODO New key - Add a translation
-  "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Ellenőrzés alatt álló tárgyak",
 
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Tárolva",
@@ -5438,9 +5254,19 @@
   "mydspace.upload.upload-multiple-successful": "{{qty}} Új munkafelület tárgyak létrehozva.",
 
   // "mydspace.view-btn": "View",
-  "mydspace.view-btn": "Megtekintés",
+  "mydspace.view-btn": "Megtekint",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenu)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "review the suggestions",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Please",
 
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Böngészés",
@@ -5449,7 +5275,6 @@
   "nav.community-browse.header": "Közösség szerint",
 
   // "nav.context-help-toggle": "Toggle context help",
-  // TODO New key - Add a translation
   "nav.context-help-toggle": "Toggle context help",
 
   // "nav.language": "Language switch",
@@ -5458,15 +5283,13 @@
   // "nav.login": "Log In",
   "nav.login": "Bejelentkezés",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
-  // TODO New key - Add a translation
-  "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
+  "nav.user-profile-menu-and-logout": "User profile menu and log out",
 
   // "nav.logout": "Log Out",
   "nav.logout": "Kilépés",
 
   // "nav.main.description": "Main navigation bar",
-  // TODO New key - Add a translation
   "nav.main.description": "Main navigation bar",
 
   // "nav.mydspace": "MyDSpace",
@@ -5478,35 +5301,242 @@
   // "nav.search": "Search",
   "nav.search": "Keresés",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Submit search",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Statisztika",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "EPerson megszemélyesítésének leállítása",
+  "nav.stop-impersonating": "Felhasználó megszemélyesítésének leállítása",
 
-  // "nav.subscriptions" : "Subscriptions",
-  // TODO New key - Add a translation
-  "nav.subscriptions": "Subscriptions",
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Feliratkozások",
 
-  // "nav.toggle" : "Toggle navigation",
-  // TODO New key - Add a translation
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Toggle navigation",
 
-  // "nav.user.description" : "User profile bar",
-  // TODO New key - Add a translation
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "User profile bar",
 
   // "none.listelement.badge": "Item",
-  // TODO New key - Add a translation
   "none.listelement.badge": "Item",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Quality Assurance",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "Below you can see all the notification's sources.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Current Topics",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Current Sources",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Topic",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Source",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Last Event",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Actions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No topics found.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No sources found.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Quality Assurance Suggestions",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Loading ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Topic:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No suggestions found.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Trust",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publication",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Details",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Project details",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Actions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Accept suggestion",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignore suggestion",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Delete",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Reject suggestion",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Import project and accept suggestion",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "PID Type:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "PID Value:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Subject Value:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Abstract:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Project title:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acronym:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Code:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Funder:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Funding program:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Back to topics",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Show less",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Show more",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Bound to the local record:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No local record found",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Are you sure?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "This operation can't be undone!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Mégse",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Choose a project to bound",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publication:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Project search",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Search",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Clear",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Mégse",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Bound project",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Remove",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No project found.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Reason",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Szervezeti egység",
 
   // "orgunit.listelement.no-title": "Untitled",
-  // TODO New key - Add a translation
-  "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Cím nélkül",
 
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Város",
@@ -5527,27 +5557,29 @@
   "orgunit.page.id": "Azonosító",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Szervezeti egység: ",
+  // TODO New key - Add a translation
+  "orgunit.page.titleprefix": "Organizational Unit: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "ROR Identifier",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Szervezeti egység találati lista",
 
   // "pagination.options.description": "Pagination options",
-  // TODO New key - Add a translation
-  "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Lapozás beállításai",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Találatok oldalanként",
 
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  "pagination.showing.detail": "{{ range }} ennyiből {{ total }}",
+  "pagination.showing.detail": "{{ range }} / {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Jelenleg látható ",
 
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Rendszerezési lehetőségek",
-
-
+  "pagination.sort-direction": "Rendezési lehetőségek",
 
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Személy",
@@ -5574,11 +5606,10 @@
   "person.page.lastname": "Családnév",
 
   // "person.page.name": "Name",
-  // TODO New key - Add a translation
-  "person.page.name": "Name",
+  "person.page.name": "Név",
 
   // "person.page.link.full": "Show all metadata",
-  "person.page.link.full": "valamennyi metaadat megjelenítése",
+  "person.page.link.full": "Minden metaadat megjelenítése",
 
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
@@ -5587,7 +5618,8 @@
   "person.page.staffid": "Személyzeti azonosító",
 
   // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Személy: ",
+  // TODO New key - Add a translation
+  "person.page.titleprefix": "Person: ",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Személy keresési eredmények",
@@ -5596,19 +5628,27 @@
   "person-relationships.search.results.head": "Személy keresési eredménye",
 
   // "person.search.title": "Person Search",
-  // TODO Source message changed - Revise the translation
-  "person.search.title": "DSpace Angular :: Személy keresése",
-
-
+  "person.search.title": "DSpace Repozitórium :: Személy keresése",
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Paraméterek",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Select parameter",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Add a parameter...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Delete parameter",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Parameter value",
+
   // "process.new.cancel": "Cancel",
-  "process.new.cancel": "Mégsem",
+  "process.new.cancel": "Mégse",
 
   // "process.new.submit": "Save",
-  // TODO Source message changed - Revise the translation
   "process.new.submit": "Beküld",
 
   // "process.new.select-script": "Script",
@@ -5636,7 +5676,8 @@
   "process.new.parameter.type.file": "fájl",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  "process.new.parameter.required.missing": "A következő paraméter szükséges:",
+  // TODO New key - Add a translation
+  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
 
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Sikerült",
@@ -5650,6 +5691,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Hiba történt a folyamat létrehozásakor",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Új folyamat létrehozása",
 
@@ -5659,18 +5703,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Új folyamat létrehozása",
 
-
-
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Érvek",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Ez a folyamat nem tartalmaz érveket",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Vissza",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Folyamat eredménye",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -5682,86 +5724,104 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Ennek a folyamatnak nincs kimenete",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Kimeneti fájlok",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Ennek a folyamatnak nincsenek kimeneti fájljai",
 
-  // "process.detail.script" : "Script",
+  // "process.detail.script": "Script",
   "process.detail.script": "Szkript",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title": "Folyamat: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Process: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Kezdési idő",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Végzési idő",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Állapot",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Hasonló folyamat létrehozása",
 
   // "process.detail.actions": "Actions",
-  // TODO New key - Add a translation
   "process.detail.actions": "Actions",
 
   // "process.detail.delete.button": "Delete process",
-  // TODO New key - Add a translation
   "process.detail.delete.button": "Delete process",
 
   // "process.detail.delete.header": "Delete process",
-  // TODO New key - Add a translation
   "process.detail.delete.header": "Delete process",
 
   // "process.detail.delete.body": "Are you sure you want to delete the current process?",
-  // TODO New key - Add a translation
   "process.detail.delete.body": "Are you sure you want to delete the current process?",
 
   // "process.detail.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Mégse",
 
   // "process.detail.delete.confirm": "Delete process",
-  // TODO New key - Add a translation
   "process.detail.delete.confirm": "Delete process",
 
   // "process.detail.delete.success": "The process was successfully deleted.",
-  // TODO New key - Add a translation
   "process.detail.delete.success": "The process was successfully deleted.",
 
   // "process.detail.delete.error": "Something went wrong when deleting the process",
-  // TODO New key - Add a translation
   "process.detail.delete.error": "Something went wrong when deleting the process",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Auto-refreshing…",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Befejezés dátuma (UTC)",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
-  // TODO Source message changed - Revise the translation
-  "process.overview.table.finish": "Végzési idő",
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Sikeresen lefutott processzek",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No matching processes found.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Befejezés dátuma (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Sikertelen processzek",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Befejezés dátuma (UTC)",
+
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Folyamat ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Név",
 
-  // "process.overview.table.start" : "Start time (UTC)",
-  // TODO Source message changed - Revise the translation
-  "process.overview.table.start": "Kezdési idő",
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Indítás dátuma (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Futó állapotú processzek",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Processz létrehozásának dátuma (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Időzített processzek",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Indítás dátuma (UTC)",
+
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Állapot",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Felhasználó",
 
   // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Folyaamt áttekintő",
+  "process.overview.title": "Folyamat áttekintő",
 
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "Folyamat áttekintő",
@@ -5770,65 +5830,55 @@
   "process.overview.new": "Új",
 
   // "process.overview.table.actions": "Actions",
-  // TODO New key - Add a translation
   "process.overview.table.actions": "Actions",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  // TODO New key - Add a translation
-  "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "{{count}} folyamat törlése",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Folyamat törlése",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  // TODO New key - Add a translation
   "process.overview.delete.clear": "Clear delete selection",
 
   // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
-  // TODO New key - Add a translation
   "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
 
   // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
-  // TODO New key - Add a translation
   "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
 
   // "process.overview.delete.header": "Delete processes",
-  // TODO New key - Add a translation
   "process.overview.delete.header": "Delete processes",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Unknown",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
-  // TODO New key - Add a translation
   "process.bulk.delete.error.head": "Error on deleteing process",
 
   // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
-  // TODO New key - Add a translation
   "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ",
 
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
-  // TODO New key - Add a translation
   "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
 
-
-
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil frissítése",
 
   // "profile.card.identify": "Identify",
-  "profile.card.identify": "Azonosít",
+  "profile.card.identify": "Azonosítás",
 
   // "profile.card.security": "Security",
   "profile.card.security": "Biztonság",
 
   // "profile.form.submit": "Save",
-  // TODO Source message changed - Revise the translation
   "profile.form.submit": "Profil frissítése",
 
   // "profile.groups.head": "Authorization groups you belong to",
-  "profile.groups.head": "Felhatalmazási csoportok amelyekhez ön tartozik",
+  "profile.groups.head": "Tagja a következő csoportoknak",
 
   // "profile.special.groups.head": "Authorization special groups you belong to",
-  // TODO New key - Add a translation
-  "profile.special.groups.head": "Authorization special groups you belong to",
-
-  // "profile.head": "Update Profile",
-  "profile.head": "Profil frissítése",
+  "profile.special.groups.head": "Tagja a következő speciális csoportoknak",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Keresztnév kötelező",
@@ -5867,18 +5917,16 @@
   "profile.security.form.error.matching-passwords": "A jelszavak nem találnak.",
 
   // "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.",
-  // TODO Source message changed - Revise the translation
   "profile.security.form.info": "Opcionálisan beírhatja jelszavát az alsó mezőbe majd igazolhatja azt, beírva a második mezőbe. Legalább hat karakter hosszú kell, hogy legyen.",
 
   // "profile.security.form.label.password": "Password",
-  "profile.security.form.label.password": "Jelszó",
+  "profile.security.form.label.password": "Új jelszó",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  "profile.security.form.label.passwordrepeat": "Írja be újra a jelszót",
+  "profile.security.form.label.passwordrepeat": "Új jelszó megadása ismét",
 
   // "profile.security.form.label.current-password": "Current password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Jelenlegi jelszó",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Jelszó módosítása elmentve.",
@@ -5890,22 +5938,19 @@
   "profile.security.form.notifications.error.title": "Jelszó megváltoztatásakor hiba történt",
 
   // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.",
-  // TODO New key - Add a translation
   "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.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "A megadott jelszavak nem azonosak.",
 
   // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
-  // TODO New key - Add a translation
   "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
 
   // "profile.title": "Update Profile",
   "profile.title": "Profil frissítése",
 
   // "profile.card.researcher": "Researcher Profile",
-  // TODO New key - Add a translation
-  "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Kutatói profil",
 
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Kutatási projekt",
@@ -5935,7 +5980,8 @@
   "project.page.status": "Állapot",
 
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Kutatási projekt: ",
+  // TODO New key - Add a translation
+  "project.page.titleprefix": "Research Project: ",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Projekt keresési eredménye",
@@ -5943,8 +5989,6 @@
   // "project-relationships.search.results.head": "Project Search Results",
   "project-relationships.search.results.head": "Projekt keresési eredménye",
 
-
-
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publikáció",
 
@@ -5964,7 +6008,8 @@
   "publication.page.publisher": "Kiadó",
 
   // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publikáció: ",
+  // TODO New key - Add a translation
+  "publication.page.titleprefix": "Publication: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Kötet címe",
@@ -5976,22 +6021,115 @@
   "publication-relationships.search.results.head": "Publikáció keresés eredménye",
 
   // "publication.search.title": "Publication Search",
-  // TODO Source message changed - Revise the translation
-  "publication.search.title": "DSpace Angular :: Publikáció keresése",
-
+  "publication.search.title": "DSpace Repozitórium :: Publikáció keresése",
 
   // "media-viewer.next": "Next",
-  // TODO New key - Add a translation
-  "media-viewer.next": "Next",
+  "media-viewer.next": "Következő",
 
   // "media-viewer.previous": "Previous",
-  // TODO New key - Add a translation
-  "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Előző",
 
   // "media-viewer.playlist": "Playlist",
-  // TODO New key - Add a translation
-  "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Lejászólista",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Loading ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Publication Claim",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Current Suggestions",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Researcher Name",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Actions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "No target found.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Type",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Score",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Approve & import",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "See evidence",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Hide evidence",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Suggestions for",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "from the ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "You have no publication claims left",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Total Score",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Új felhasználó regisztrálása",
@@ -6027,7 +6165,6 @@
   "register-page.create-profile.security.header": "Biztonság",
 
   // "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.",
-  // TODO Source message changed - Revise the translation
   "register-page.create-profile.security.info": "Írjon be egy jelszót a lenti mezőbe, és írja be újra az alatta levőbe. Legalább hat karakter hosszú kell legyen.",
 
   // "register-page.create-profile.security.label.password": "Password *",
@@ -6057,7 +6194,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Sikeres regisztráció",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Új felhasználó regisztrálása",
 
@@ -6071,11 +6207,9 @@
   "register-page.registration.email.error.required": "Töltse ki az e-mail címet",
 
   // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
-  // TODO New key - Add a translation
   "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
 
   // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
-  // TODO New key - Add a translation
   "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
@@ -6094,49 +6228,40 @@
   "register-page.registration.error.head": "Hiba történt az e-mail cím regisztrációjakor",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  "register-page.registration.error.content": "Hiba történt a következő e-mail cím regisztrációjakor: {{ email }}",
+  // TODO New key - Add a translation
+  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
 
   // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
-  // TODO New key - Add a translation
   "register-page.registration.error.recaptcha": "Error when trying to authenticate with 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.",
-  // TODO New key - Add a translation
   "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.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
-  // TODO New key - Add a translation
   "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
 
-
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
 
   // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
 
   // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification",
 
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
-  // TODO New key - Add a translation
   "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+
   // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
-  // TODO New key - Add a translation
   "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
 
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
   "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
 
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
   "relationships.add.error.server.content": "The server returned an error",
 
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
 
   // "relationships.isAuthorOf": "Authors",
@@ -6151,12 +6276,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Folyóirat számok",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Folyóirat szám",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Folyóirat szám",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Folyóiratok",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Journal Volume",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Szervezeti egységek",
 
@@ -6181,6 +6312,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Folyóirat kötetek",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Közreműködők",
 
@@ -6191,22 +6325,19 @@
   "relationships.isContributorOf.Person": "Hozzájáruló",
 
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
-  // TODO New key - Add a translation
   "relationships.isFundingAgencyOf.OrgUnit": "Funder",
 
-
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Adattár logó",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "EDA ",
-
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "EDA ",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "DSpace Repozitórium",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "DSpace Repozitórium :: ",
 
   // "resource-policies.add.button": "Add",
-  "resource-policies.add.button": "Hozzáad",
+  "resource-policies.add.button": "Hozzáadás",
 
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "Új szabály",
@@ -6257,11 +6388,9 @@
   "resource-policies.edit.page.failure.content": "Hiba történt az erőforrás szabály szerkesztésekor.",
 
   // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.",
-  // TODO New key - Add a translation
   "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.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.",
-  // TODO New key - Add a translation
   "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.success.content": "Operation successful",
@@ -6277,14 +6406,13 @@
   "resource-policies.form.action-type.required": "Ki kell válasszon egy műveletet.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO Source message changed - Revise the translation
   "resource-policies.form.eperson-group-list.label": "Az eperson vagy csoport amihez rendeli a jogosultságot",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Kiválaszt",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  "resource-policies.form.eperson-group-list.tab.eperson": "ePerson keresése",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Felhasználó keresése",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Csoport keresése",
@@ -6299,23 +6427,18 @@
   "resource-policies.form.eperson-group-list.table.headers.name": "Név",
 
   // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Nem lehet megváltoztatni a típust",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
-  // TODO New key - Add a translation
-  "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": "Nem lehetséges egy ESzemélyt egy csoporttal helyettesíteni.",
 
   // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.",
-  // TODO New key - Add a translation
-  "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": "Egy csoportot nem lehet helyettesíteni egy ESzeméllyel.",
 
   // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.",
-  // TODO New key - Add a translation
-  "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": "Törölje a jelenlegi szabálytípust, és hozzon létre egy újat a kívánt típussal.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
   // "resource-policies.form.date.end.label": "End Date",
@@ -6330,9 +6453,8 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Név",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
+  "resource-policies.form.name.hint": "Max 30 karakter",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Szabály típus kiválasztása",
@@ -6359,11 +6481,23 @@
   "resource-policies.table.headers.edit.policy": "Szabály módosítása",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "Felhasználó",
 
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Csoport",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Összes kijelölése",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Összes kijelölés visszavonása",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Kijelölés",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Kijelölés törlése",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -6388,24 +6522,29 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Gyűjtemény szabályok",
 
-
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Ugrás a fő tartalomra",
 
   // "search.description": "",
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-  "search.switch-configuration.title": "Megtekintés",
+  "search.switch-configuration.title": "Megtekint",
 
   // "search.title": "Search",
-  // TODO Source message changed - Revise the translation
-  "search.title": "DSpace Angular :: Keresés",
+  "search.title": "Keresés",
 
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Keresés",
 
   // "search.search-form.placeholder": "Search the repository ...",
-  "search.search-form.placeholder": "Keresés az adattárban ...",
+  "search.search-form.placeholder": "Keresés a repozitóriumban ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Cím",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Szerző",
@@ -6420,7 +6559,6 @@
   "search.filters.applied.f.dateSubmitted": "Feltöltés dátuma",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.applied.f.discoverable": "Privát",
 
   // "search.filters.applied.f.entityType": "Item Type",
@@ -6429,6 +6567,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Fájlokat tartalmaz",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Fájl név",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "File leírás",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Típus",
 
@@ -6451,13 +6595,40 @@
   "search.filters.applied.f.birthDate.min": "Születési dátum eleje",
 
   // "search.filters.applied.f.supervisedBy": "Supervised by",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Felügyeli",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Visszavonva",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " not equals",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " not authority",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contains",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " not contains",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Cím",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Cím",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Cím keresése",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Szerző",
@@ -6466,8 +6637,7 @@
   "search.filters.filter.author.placeholder": "Szerző neve",
 
   // "search.filters.filter.author.label": "Search author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Szerző név keresése",
 
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Születési dátum",
@@ -6476,11 +6646,9 @@
   "search.filters.filter.birthDate.placeholder": "Születési dátum",
 
   // "search.filters.filter.birthDate.label": "Search birth date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Születési dátum keresése",
 
   // "search.filters.filter.collapse": "Collapse filter",
-  // TODO New key - Add a translation
   "search.filters.filter.collapse": "Collapse filter",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
@@ -6490,8 +6658,7 @@
   "search.filters.filter.creativeDatePublished.placeholder": "Publikálás dátuma",
 
   // "search.filters.filter.creativeDatePublished.label": "Search date published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Kiadási dátum keresése",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Szerkesztő",
@@ -6500,18 +6667,16 @@
   "search.filters.filter.creativeWorkEditor.placeholder": "Szerkesztő",
 
   // "search.filters.filter.creativeWorkEditor.label": "Search editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Szerkesztő keresése",
 
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  "search.filters.filter.creativeWorkKeywords.head": "Tárgy",
+  "search.filters.filter.creativeWorkKeywords.head": "Tárgyszó",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Tárgy",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Tárgyszó",
 
   // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Tárgyszó keresése",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Kiadó",
@@ -6520,27 +6685,22 @@
   "search.filters.filter.creativeWorkPublisher.placeholder": "Kiadó",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Kiadó keresése",
 
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Dátum",
 
   // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
-  // TODO Source message changed - Revise the translation
-  "search.filters.filter.dateIssued.max.placeholder": "Minimum Dátum",
+  "search.filters.filter.dateIssued.max.placeholder": "Maximum Dátum",
 
   // "search.filters.filter.dateIssued.max.label": "End",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Végdátum",
 
   // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
-  // TODO Source message changed - Revise the translation
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Dátum",
+  "search.filters.filter.dateIssued.min.placeholder": "Minimum Dátum",
 
   // "search.filters.filter.dateIssued.min.label": "Start",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Kezdő dátum",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Feltöltés dátuma",
@@ -6549,11 +6709,9 @@
   "search.filters.filter.dateSubmitted.placeholder": "Feltöltés dátuma",
 
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
-  // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.label": "Search date submitted",
 
   // "search.filters.filter.discoverable.head": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.filter.discoverable.head": "Privát",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -6566,16 +6724,32 @@
   "search.filters.filter.entityType.placeholder": "Tárgy típusa",
 
   // "search.filters.filter.entityType.label": "Search item type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Tárgy típus keresése",
 
   // "search.filters.filter.expand": "Expand filter",
-  // TODO New key - Add a translation
   "search.filters.filter.expand": "Expand filter",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Állományokat tartalmaz",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Fájlnév",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Fájlnév",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Fájlnév keresése",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Fájl leírása",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Fájl leírása",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Fájl leírása keresése",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Típus",
 
@@ -6583,8 +6757,7 @@
   "search.filters.filter.itemtype.placeholder": "Típus",
 
   // "search.filters.filter.itemtype.label": "Search type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Típus keresése",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Munkakör",
@@ -6593,7 +6766,6 @@
   "search.filters.filter.jobTitle.placeholder": "Munkakör",
 
   // "search.filters.filter.jobTitle.label": "Search job title",
-  // TODO New key - Add a translation
   "search.filters.filter.jobTitle.label": "Search job title",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
@@ -6603,7 +6775,6 @@
   "search.filters.filter.knowsLanguage.placeholder": "Ismert nyelv",
 
   // "search.filters.filter.knowsLanguage.label": "Search known language",
-  // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.label": "Search known language",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
@@ -6613,17 +6784,15 @@
   "search.filters.filter.namedresourcetype.placeholder": "Állapot",
 
   // "search.filters.filter.namedresourcetype.label": "Search status",
-  // TODO New key - Add a translation
   "search.filters.filter.namedresourcetype.label": "Search status",
 
   // "search.filters.filter.objectpeople.head": "People",
-  "search.filters.filter.objectpeople.head": "Emberek",
+  "search.filters.filter.objectpeople.head": "Felhasználók",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-  "search.filters.filter.objectpeople.placeholder": "Emberek",
+  "search.filters.filter.objectpeople.placeholder": "Felhasználók",
 
   // "search.filters.filter.objectpeople.label": "Search people",
-  // TODO New key - Add a translation
   "search.filters.filter.objectpeople.label": "Search people",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
@@ -6633,8 +6802,7 @@
   "search.filters.filter.organizationAddressCountry.placeholder": "Ország",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Ország keresése",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Város",
@@ -6643,8 +6811,7 @@
   "search.filters.filter.organizationAddressLocality.placeholder": "Város",
 
   // "search.filters.filter.organizationAddressLocality.label": "Search city",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Város keresése",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Alapítás dátuma",
@@ -6653,8 +6820,7 @@
   "search.filters.filter.organizationFoundingDate.placeholder": "Alapítás dátuma",
 
   // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Alapítás dátum keresése",
 
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Célja",
@@ -6663,24 +6829,22 @@
   "search.filters.filter.scope.placeholder": "Cél szűrő",
 
   // "search.filters.filter.scope.label": "Search scope filter",
-  // TODO New key - Add a translation
   "search.filters.filter.scope.label": "Search scope filter",
 
   // "search.filters.filter.show-less": "Collapse",
-  "search.filters.filter.show-less": "Összevon",
+  "search.filters.filter.show-less": "Összecsuk",
 
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Tovább",
 
   // "search.filters.filter.subject.head": "Subject",
-  "search.filters.filter.subject.head": "Tárgy",
+  "search.filters.filter.subject.head": "Tárgyszó",
 
   // "search.filters.filter.subject.placeholder": "Subject",
-  "search.filters.filter.subject.placeholder": "Tárgy",
+  "search.filters.filter.subject.placeholder": "Téma",
 
   // "search.filters.filter.subject.label": "Search subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Téma keresése",
 
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Feltöltő",
@@ -6689,27 +6853,26 @@
   "search.filters.filter.submitter.placeholder": "Feltöltő",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  // TODO New key - Add a translation
   "search.filters.filter.submitter.label": "Search submitter",
 
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
-  // TODO New key - Add a translation
   "search.filters.filter.show-tree": "Browse {{ name }} tree",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Funding",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Funding",
+
   // "search.filters.filter.supervisedBy.head": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Felügyeli",
 
   // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
-  // TODO New key - Add a translation
-  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Felügyeli",
 
   // "search.filters.filter.supervisedBy.label": "Search Supervised By",
-  // TODO New key - Add a translation
   "search.filters.filter.supervisedBy.label": "Search Supervised By",
 
-
-
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Folyóirat száma",
 
@@ -6719,6 +6882,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Szervezeti egység",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Személy",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projekt",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publication",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Igen",
 
@@ -6731,13 +6903,27 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Igen",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivált",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Érvényesítés",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "Értékelőre vár",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Munkafolyamat",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Munkaterület",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Igen",
 
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Nem",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Szűrők",
 
@@ -6745,21 +6931,37 @@
   "search.filters.reset": "Szűrők visszaállítása",
 
   // "search.filters.search.submit": "Submit",
-  // TODO New key - Add a translation
   "search.filters.search.submit": "Submit",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Egyenlő",
 
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "Nem egyenlő",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Authority",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Not Authority",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Tartalmaz",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "Nem tartalmaz",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Lekérdezés",
 
   // "search.form.search": "Search",
   "search.form.search": "Keresés",
 
   // "search.form.search_dspace": "All repository",
-  "search.form.search_dspace": "Teljes adattár",
+  "search.form.search_dspace": "Teljes repozitórium",
 
   // "search.form.scope.all": "All of DSpace",
-  "search.form.scope.all": "A teljes EDA",
-
-
+  "search.form.scope.all": "A teljes DSpace",
 
   // "search.results.head": "Search Results",
   "search.results.head": "Keresési eredmények",
@@ -6774,11 +6976,9 @@
   "search.results.empty": "A keresésnek nincs eredménye.",
 
   // "search.results.view-result": "View",
-  // TODO New key - Add a translation
-  "search.results.view-result": "View",
+  "search.results.view-result": "Megtekint",
 
   // "search.results.response.500": "An error occurred during query execution, please try again later",
-  // TODO New key - Add a translation
   "search.results.response.500": "An error occurred during query execution, please try again later",
 
   // "default.search.results.head": "Search Results",
@@ -6787,7 +6987,6 @@
   // "default-relationships.search.results.head": "Search Results",
   "default-relationships.search.results.head": "Keresés eredménye",
 
-
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Vissza a találatokhoz",
 
@@ -6804,13 +7003,26 @@
   "search.sidebar.settings.rpp": "Eredmények oldalanként",
 
   // "search.sidebar.settings.sort-by": "Sort By",
-  "search.sidebar.settings.sort-by": "Rendszerezés eszerint",
+  "search.sidebar.settings.sort-by": "Rendezési szempont",
+
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Összetett keresés",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Szűrőfeltétel",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Szűrőfeltételek",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Logikai feltételek",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Hozzáadás",
 
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Beállítások",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Részletek megjelenítése",
 
@@ -6820,7 +7032,11 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Megjelenítés listaként",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Elem kijelölésének megszüntetése",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Elem kijelölése",
 
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Növekvő",
@@ -6829,10 +7045,10 @@
   "sorting.DESC": "Csökkenő",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-  "sorting.dc.title.ASC": "Cím növekvő sorrendben",
+  "sorting.dc.title.ASC": "Cím szerint növekvő",
 
   // "sorting.dc.title.DESC": "Title Descending",
-  "sorting.dc.title.DESC": "Cím csökkenő sorrendben",
+  "sorting.dc.title.DESC": "Cím szerint csökkenő",
 
   // "sorting.score.ASC": "Least Relevant",
   "sorting.score.ASC": "Legkevésbé releváns",
@@ -6853,11 +7069,28 @@
   "sorting.dc.date.accessioned.DESC": "Hozzáférés dátuma szerint csökkenő",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
-  "sorting.lastModified.ASC": "Utoljára módosított növekvő",
+  "sorting.lastModified.ASC": "Utolsó módosítás dátuma szerint növekvő",
 
   // "sorting.lastModified.DESC": "Last modified Descending",
-  "sorting.lastModified.DESC": "Utoljára módosított növekvő csökkenő",
+  "sorting.lastModified.DESC": "Utolsó módosítás dátuma szerint csökkenő",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Vezetéknév szerint növekvő",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Vezetéknév szerint csökkenő",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Név szerint növekvő",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Név szerint csökkenő",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Születési dátum szerint növekvő",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Születési dátum szerint csökkenő",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Statisztikák",
@@ -6875,7 +7108,7 @@
   "statistics.table.no-data": "Nincsenek adatok",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-  "statistics.table.title.TotalVisits": "Összes látogatás",
+  "statistics.table.title.TotalVisits": "Összes megtekintés",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "Összes látogató a hónapban",
@@ -6892,24 +7125,23 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Látogatások",
 
-
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(object name could not be loaded)",
 
   // "submission.edit.breadcrumbs": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Feltöltés szerkesztése",
 
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Feltöltés szerkesztése",
 
   // "submission.general.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Mégse",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  "submission.general.cannot_submit": "Önnek nincs új feltöltéshez szükséges privilégiuma.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "Önnek nincs meg a szükséges engedélye egy új feltöltéshez.",
 
   // "submission.general.deposit": "Deposit",
-  "submission.general.deposit": "Adattár",
+  "submission.general.deposit": "Beküld",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Mégse",
@@ -6926,13 +7158,14 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Elvetés",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Vissza",
+
   // "submission.general.info.saved": "Saved",
-  // TODO New key - Add a translation
-  "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Mentve",
 
   // "submission.general.info.pending-changes": "Unsaved changes",
-  // TODO New key - Add a translation
-  "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Nem mentett változtatások",
 
   // "submission.general.save": "Save",
   "submission.general.save": "Mentés",
@@ -6940,7 +7173,6 @@
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Mentés későbbre",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Metaadatok importálása külső forrásból",
 
@@ -6948,36 +7180,28 @@
   "submission.import-external.title": "Metaadatok importálása külső forrásból",
 
   // "submission.import-external.title.Journal": "Import a journal from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Folyóirat importálása külső forrásból",
 
   // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Folyóiratszám importálása külső forrásból",
 
   // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Folyóirat kötet importálása külső forrásból",
 
   // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Kiadó importálása külső forrásból",
 
   // "submission.import-external.title.Person": "Import a person from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Személy importálása külső forrásból",
 
   // "submission.import-external.title.Project": "Import a project from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Projekt importálása külső forrásból",
 
   // "submission.import-external.title.Publication": "Import a publication from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Publikáció importálása külső forrásból",
 
   // "submission.import-external.title.none": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Metaadat importálása külső forrásból",
 
   // "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": "Írjon be egy lekérést hogy elemeket találjon a web-en amiket importálhat DSpace-be.",
@@ -7001,61 +7225,58 @@
   "submission.import-external.source.arxiv": "arXiv",
 
   // "submission.import-external.source.ads": "NASA/ADS",
-  // TODO New key - Add a translation
   "submission.import-external.source.ads": "NASA/ADS",
 
   // "submission.import-external.source.cinii": "CiNii",
-  // TODO New key - Add a translation
   "submission.import-external.source.cinii": "CiNii",
 
   // "submission.import-external.source.crossref": "Crossref",
-  // TODO New key - Add a translation
-  "submission.import-external.source.crossref": "Crossref",
+  "submission.import-external.source.crossref": "CrossRef",
 
   // "submission.import-external.source.datacite": "DataCite",
-  // TODO New key - Add a translation
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
-  // TODO New key - Add a translation
   "submission.import-external.source.scielo": "SciELO",
 
   // "submission.import-external.source.scopus": "Scopus",
-  // TODO New key - Add a translation
   "submission.import-external.source.scopus": "Scopus",
 
   // "submission.import-external.source.vufind": "VuFind",
-  // TODO New key - Add a translation
   "submission.import-external.source.vufind": "VuFind",
 
   // "submission.import-external.source.wos": "Web Of Science",
-  // TODO New key - Add a translation
   "submission.import-external.source.wos": "Web Of Science",
 
   // "submission.import-external.source.orcidWorks": "ORCID",
-  // TODO New key - Add a translation
   "submission.import-external.source.orcidWorks": "ORCID",
 
   // "submission.import-external.source.epo": "European Patent Office (EPO)",
-  // TODO New key - Add a translation
   "submission.import-external.source.epo": "European Patent Office (EPO)",
 
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Betöltés ...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "SHERPA folyóiratok",
 
   // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA folyóirat ISSN megadásával",
 
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "SHERPA kiadók",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  // "submission.import-external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "OpenAIRE szerzők",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "OpenAIRE címek",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "OpenAIRE támogatás",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -7064,38 +7285,34 @@
   "submission.import-external.source.pubmed": "Pubmed",
 
   // "submission.import-external.source.pubmedeu": "Pubmed Europe",
-  // TODO New key - Add a translation
   "submission.import-external.source.pubmedeu": "Pubmed Europe",
 
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Library of Congress Names",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Elem előnézet",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Publikáció Előnézet",
 
   // "submission.import-external.preview.title.none": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Tárgy Előnézet",
 
   // "submission.import-external.preview.title.Journal": "Journal Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Folyóirat Előnézet",
 
   // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Szervezeti Egység Előnézet",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Személy Előnézet",
 
   // "submission.import-external.preview.title.Project": "Project Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Projekt Előnézet",
 
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
   "submission.import-external.preview.subtitle": "A lentebbi metaadat importálva a külső forrásból. Ki lesz töltve ha elkezdi a beküldési folyamatot.",
@@ -7116,85 +7333,64 @@
   "submission.sections.describe.relationship-lookup.external-source.added": "Helyi bevitel sikeresen hozzáadva a kiválasztotthoz",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "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": "Szerző importálása külső rendszerből",
 
   // "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": "Távoli folyóirat importálása",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Folyóirat importálása külső rendszerből",
 
   // "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": "Távoli folyóiratszám importálása",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Folyóiratszám importálása külső rendszerből",
 
   // "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": "Távoli folyóiratkötet importálása",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Folyóiratkötet importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekt",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item",
-  // TODO New key - Add a translation
-  "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": "Elem importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
-  // TODO New key - Add a translation
-  "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": "Esemény importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
-  // TODO New key - Add a translation
-  "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": "Termék importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
-  // TODO New key - Add a translation
-  "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": "Szervezeti egység importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
-  // TODO New key - Add a translation
-  "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": "Támogató importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
-  // TODO New key - Add a translation
-  "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": "Személy importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
-  // TODO New key - Add a translation
-  "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": "Szabadalom importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
-  // TODO New key - Add a translation
-  "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": "Project importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
-  // TODO New key - Add a translation
-  "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": "Publikáció importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
-  // TODO New key - Add a translation
-  "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": "Új entitás hozzáadva!",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekt",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "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": "Szerző importálása külső rendszerből",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "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": "Sikeresen hozzáadta a helyi szerzőt a kiválasztáshoz",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "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": "Sikeresen importált és hozzáadott külső rendszerből származó szerzőt a kiválasztáshoz",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoritás",
@@ -7220,6 +7416,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID-ról importál",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importálás az OpenAIRE szerzői közül",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importálás az OpenAIRE címei közül",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importálás az OpenAIRE támogatói közül",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Sherpa Journal-ról importál",
 
@@ -7232,6 +7437,9 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv-ről importál",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importálás a ROR rendszeréből",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importál",
 
@@ -7263,10 +7471,20 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Külső folyóiratkötet sikeresen importálva és hozzáadva a kiválasztotthoz",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Válasszon ki helyi megfelelést:",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Szervezet importálása külső rendszerből",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Sikeresen hozzáadta a helyi szervezetet a kiválasztáshoz",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Sikeresen importálta és hozzáadta a külső rendszerből származó szervezetet a kiválasztáshoz",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Valamennyi kiválasztás megszüntetése",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Az összes kijelölés megszüntetése",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Oldal kiválasztásának megszüntetése",
@@ -7281,11 +7499,10 @@
   "submission.sections.describe.relationship-lookup.search-tab.search": "Mehet",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Keresés...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Valamennyi kiválasztása",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Összes kiválasztása",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Oldal választása",
@@ -7298,6 +7515,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Helyi folyóiratok ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Helyi projektek ({{ count }})",
 
@@ -7321,11 +7539,13 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Helyi folyóiratszámok ({{ 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": "Helyi folyóiratszámok ({{ 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": "Helyi folyóiratkötetek ({{ 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": "Helyi folyóiratkötetek ({{ count }})",
 
@@ -7347,6 +7567,30 @@
   // "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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "CrossRef ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE szerzők ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE címek ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE támogatók ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa folyóiratok ISSN megadásával ({{ 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": "Támogató szervezetek keresése",
 
@@ -7356,55 +7600,45 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Intézményi egységek kereséset",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projektek",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "A projekt támogatója",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "A publikáció szerzője",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "A projekthez kapcsolódó szervezeti egység",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekt",
 
   // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projektek",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-
-
-
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "A projekt támogatója",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Keresés...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Jelenleg kiválasztott ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Folyóirat",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Folyóirat számok",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Folyóirat számok",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Folyóirat kötetek",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Folyóirat kötetek",
 
@@ -7416,6 +7650,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Támogató szervezet",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projektek",
 
@@ -7444,8 +7679,10 @@
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Szülő szervezeti egység",
 
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Kiadvány",
+
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "Szervezeti egység",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Lenyíló menü váltás",
@@ -7464,6 +7701,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Választott folyóirat kötet",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Választott projektek",
 
@@ -7487,6 +7725,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Választott szám",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Választott folyóirat kötet",
 
@@ -7495,6 +7734,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Választott támogatás",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Választott szám",
 
@@ -7513,6 +7753,15 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Keresés eredménye",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Keresés eredménye",
 
@@ -7537,10 +7786,13 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Keresés eredménye",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Keresés eredménye",
 
-  // "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": "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": "Óhajtja-e elmenteni \"{{ value }}\" névváltozatként ennek a személynek, hogy később ön is és mások is újrahasználhassák feltöltéshez? Amennyiben nem, még mindig használhatja ehhez a feltöltéshez.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -7565,17 +7817,17 @@
   "submission.sections.ccLicense.option.select": "Válasszon ki valamit…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  "submission.sections.ccLicense.link": "A következő licencet választotta ki:",
+  // TODO New key - Add a translation
+  "submission.sections.ccLicense.link": "You’ve selected the following license:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Engedélyezem a lentebbi licencet",
 
   // "submission.sections.general.add-more": "Add more",
-  "submission.sections.general.add-more": "Több hozzáadása",
+  "submission.sections.general.add-more": "Továbbiak hozzáadása",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Az űrlapon található hibák miatt az elem beküldése nem teljesíthető.<br>Kérjük töltse ki az összes kötelező mezőt a beküldéshez.",
 
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Gyűjtemény",
@@ -7601,6 +7853,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Nem található gyűjtemény",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "Nem találhatóak entitástípusok",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Nincs elérhető opció",
 
@@ -7621,19 +7876,15 @@
   "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
 
   // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Az elemhez nem készült handle azonosító.",
 
   // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
-  // TODO New key - Add a translation
-  "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Az elemhez nem készült DOI.",
 
   // "submission.sections.identifiers.handle_label": "Handle: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.handle_label": "Handle: ",
 
   // "submission.sections.identifiers.doi_label": "DOI: ",
-  // TODO New key - Add a translation
   "submission.sections.identifiers.doi_label": "DOI: ",
 
   // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
@@ -7641,98 +7892,85 @@
   "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Az elem hozzáférési feltételei",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  "submission.sections.submit.progressbar.describe.recycle": "Reciklál",
+  "submission.sections.submit.progressbar.describe.recycle": "Újrafelhasznál",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  "submission.sections.submit.progressbar.describe.stepcustom": "Leír",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Leíró adatok megadása",
 
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
-  "submission.sections.submit.progressbar.describe.stepone": "Leír",
+  "submission.sections.submit.progressbar.describe.stepone": "Leíró adatok megadása",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  "submission.sections.submit.progressbar.describe.steptwo": "Leír",
+  "submission.sections.submit.progressbar.describe.steptwo": "Leíró adatok megadása",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Potenciális duplázódás",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Lehetséges duplikációk",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Azonosítók",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  "submission.sections.submit.progressbar.license": "Engedély raktározása",
+  "submission.sections.submit.progressbar.license": "Beküldési engedély",
 
   // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa irányelvek",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Állományok feltöltése",
 
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
-
+  "submission.sections.submit.progressbar.sherpaPolicies": "A kiadó nyílt hozzáférésről szóló információja",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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": "Nem áll rendelkezésre kiadó nyílt hozzáférésről szóló információja. Ha a művéhez tartozik ISSN, kérjük, adja meg fentebb, hogy láthassa a kapcsolódó kiadók nyílt hozzáférésről szóló irányelveit.",
 
   // "submission.sections.status.errors.title": "Errors",
-  // TODO New key - Add a translation
-  "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Hibák",
 
   // "submission.sections.status.valid.title": "Valid",
-  // TODO New key - Add a translation
-  "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Érvényes",
 
   // "submission.sections.status.warnings.title": "Warnings",
-  // TODO New key - Add a translation
-  "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Figyelmeztetések",
 
   // "submission.sections.status.errors.aria": "has errors",
-  // TODO New key - Add a translation
-  "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "hibákat tartalmaz",
 
   // "submission.sections.status.valid.aria": "is valid",
-  // TODO New key - Add a translation
-  "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "érvényes",
 
   // "submission.sections.status.warnings.aria": "has warnings",
-  // TODO New key - Add a translation
-  "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "figyelmeztetéseket tartalmaz",
 
   // "submission.sections.status.info.title": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "További információk",
 
   // "submission.sections.status.info.aria": "Additional Information",
-  // TODO New key - Add a translation
-  "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "További információk",
 
   // "submission.sections.toggle.open": "Open section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Szekció megnyitása",
 
   // "submission.sections.toggle.close": "Close section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Szekció bezárása",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "A(z) {{sectionHeader}} szekció megnyitása",
 
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "A(z) {{sectionHeader}} szekció becsukása",
+
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Legyen a(z) {{fileName}} elsődleges bitfolyam",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Az elsődleges bitfolyam tulajdonság eltávolítása a(z) {{fileName}} fájlról",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Mégse",
@@ -7750,43 +7988,37 @@
   "submission.sections.upload.delete.submit": "Törlés",
 
   // "submission.sections.upload.download.title": "Download bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Bitstream letöltés",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Húzza ide az állományokat, hogy a tárgyhoz csatolja",
 
   // "submission.sections.upload.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Bitstream szerkesztés",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
-  "submission.sections.upload.form.access-condition-label": "Elérhetőségi feltétel típusa",
+  "submission.sections.upload.form.access-condition-label": "Hozzáférés szabályának típusa",
 
   // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
-  // TODO New key - Add a translation
-  "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": "A kiválasztott hozzáférési szabály az elem beküldését követően rögtön beállításra kerül a bitfolyamon",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Dátum kötelező.",
 
   // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "A hozzáférés kezdő dátumának megadása kötelező.",
 
   // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "A hozzáférés visszavonási dátumának megadása kötelező.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Elérhetőség megadása innen",
 
   // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "A kezdő dátum kiválasztása, amelyet követően a kiválasztott hozzáférési szabály alkalmazásra kerül",
 
   // "submission.sections.upload.form.from-placeholder": "From",
-  "submission.sections.upload.form.from-placeholder": "Innen",
+  "submission.sections.upload.form.from-placeholder": "Kezdő dátum",
 
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Csoport",
@@ -7795,23 +8027,24 @@
   "submission.sections.upload.form.group-required": "Csoport kötelező.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-  "submission.sections.upload.form.until-label": "Elérhetőséget engedélyez eddig",
+  "submission.sections.upload.form.until-label": "A hozzáférés engedély végső dátuma",
 
   // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "A végső dátum kiválasztása, amely dátumig a kiválasztott hozzáférési szabály érvényben marad",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-  "submission.sections.upload.form.until-placeholder": "Eddig",
+  "submission.sections.upload.form.until-placeholder": "Végső dátum",
 
   // "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": "A {{collectionName}} feltöltött állományok elérhetők lesznek a következő csoport(ok) szerint:",
+  // TODO New key - Add a translation
+  "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.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": "Kérjük, vegye figyelembe, hogy a {{collectionName}} gyűjteménybe feltöltött állományok elérhetők lesznek, azon kívül amit az egyedi állományokról kifejezetten eldöntött, a következő csoport(ok)ban:",
+  // TODO New key - Add a translation
+  "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.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 by dragging & dropping them anywhere on the page.</strong>",
-  "submission.sections.upload.info": "Itt megtalálja a tárgyban lévő valamennyi állományt. Frissítheti az állomány metaadatait és hozzáférési feltételeit vagy <strong>feltölthet további állományokat azzal, hogy behúzza azokat bárhova az oldalra</strong>",
+  "submission.sections.upload.info": "Itt megtalálja a tárgyban lévő összes állományt. Frissítheti az állomány metaadatait és hozzáférési feltételeit vagy <strong>feltölthet további állományokat azzal, hogy behúzza azokat bárhova az oldalra</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Nem",
@@ -7826,122 +8059,105 @@
   "submission.sections.upload.undo": "Mégse",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-  "submission.sections.upload.upload-failed": "Feltöltés nem sikerült",
+  "submission.sections.upload.upload-failed": "Feltöltés sikertelen",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
-  "submission.sections.upload.upload-successful": "Feltöltés sikerült",
+  "submission.sections.upload.upload-successful": "Sikeres feltöltés",
 
   // "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.",
-  // TODO New key - Add a translation
   "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-label": "Discoverable",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Böngészhető",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Hozzáférés szabályának típusa",
 
   // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
-  // TODO New key - Add a translation
-  "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": "A kiválasztott hozzáférési szabály az elem beküldését követően rögtön beállításra kerül",
 
   // "submission.sections.accesses.form.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Dátum megadása kötelező.",
 
   // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "A hozzáférés kezdő dátumának megadása kötelező.",
 
   // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "A hozzférés végső dátumának megadása kötelező.",
 
   // "submission.sections.accesses.form.from-label": "Grant access from",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "A hozzáférés kezdő dátuma",
 
   // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "A kezdő dátum kiválasztása, amelyet követően a kiválasztott hozzáférési szabály alkalmazásra kerül",
 
   // "submission.sections.accesses.form.from-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Kezdő dátum",
 
   // "submission.sections.accesses.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Csoport",
 
   // "submission.sections.accesses.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Csoport megadása kötelező.",
 
   // "submission.sections.accesses.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "A hozzáférés végső dátuma",
 
   // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "A végső dátum kiválasztása, amely dátumig a kiválasztott hozzáférési szabály érvényben marad",
 
   // "submission.sections.accesses.form.until-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Végső dátum",
+
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "Nem találhatóak duplikációk.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Lehetséges duplikációkatat észleltünk. Kérjük vizsgálja meg az alábbi listát.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Ez az elem munkaterület állapotú",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Ez az elem munkafolyamat állapotú",
 
   // "submission.sections.license.granted-label": "I confirm the license above",
-  // TODO New key - Add a translation
-  "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Elfogadom a fenti licenszt",
 
   // "submission.sections.license.required": "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.required": "You must accept the license",
-
-  // "submission.sections.license.notgranted":  "You must accept the license",
-  // TODO New key - Add a translation
-  "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.required": "A licensz elfogadása kötelező",
 
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "A licensz elfogadása kötelező",
 
   // "submission.sections.sherpa.publication.information": "Publication information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Publikáció információ",
 
   // "submission.sections.sherpa.publication.information.title": "Title",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Cím",
 
   // "submission.sections.sherpa.publication.information.issns": "ISSNs",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "ISSN-ek",
 
   // "submission.sections.sherpa.publication.information.url": "URL",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.url": "URL",
 
   // "submission.sections.sherpa.publication.information.publishers": "Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publication.information.publishers": "Publisher",
+  "submission.sections.sherpa.publication.information.publishers": "Kiadó",
 
   // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
 
   // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
 
   // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy": "Publisher Policy",
+  "submission.sections.sherpa.publisher.policy": "Kiadó jogi szabályozása",
 
   // "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.",
-  // TODO New key - Add a translation
   "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.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",
-  // TODO New key - Add a translation
   "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.more.information": "For more information, please see the following links:",
@@ -7949,82 +8165,61 @@
   "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
 
   // "submission.sections.sherpa.publisher.policy.version": "Version",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Verzió",
 
   // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargó",
 
   // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Nincs beállított embargó",
 
   // "submission.sections.sherpa.publisher.policy.nolocation": "None",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nincs",
 
   // "submission.sections.sherpa.publisher.policy.license": "License",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licensz",
 
   // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Előfeltételek",
 
   // "submission.sections.sherpa.publisher.policy.location": "Location",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Hely",
 
   // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Hozzáférési feltételek",
 
   // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Frissítés",
 
   // "submission.sections.sherpa.record.information": "Record Information",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Rekord információ",
 
   // "submission.sections.sherpa.record.information.id": "ID",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.id": "ID",
 
   // "submission.sections.sherpa.record.information.date.created": "Date Created",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.created": "Date Created",
+  "submission.sections.sherpa.record.information.date.created": "Létrehozás dátuma",
 
   // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Utolsó módosítás dátuma",
 
   // "submission.sections.sherpa.record.information.uri": "URI",
-  // TODO New key - Add a translation
   "submission.sections.sherpa.record.information.uri": "URI",
 
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-  // TODO New key - Add a translation
-  "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
-
-
+  "submission.sections.sherpa.error.message": "Hiba történt a sherpa információ lekérdezése közben",
 
   // "submission.submit.breadcrumbs": "New submission",
-  // TODO New key - Add a translation
-  "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Új feltöltés",
 
   // "submission.submit.title": "New submission",
-  // TODO Source message changed - Revise the translation
-  "submission.submit.title": "Beküldés",
-
-
+  "submission.submit.title": "Új feltöltés",
 
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Töröl",
 
-  // "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": "Ha el óhajtja vetni a tárgyat, válassz a  \"Töröl\" gombot.  Majd döntését igazolja.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Válassza ezt az opciót amennyiben törölni szeretné az elemet. Kérjük döntését ezt követően erősítse meg.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Szerkesztés",
@@ -8038,25 +8233,18 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Válassza ezt, hogy megtekintse a tárgy metaadatait.",
 
-
   // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Reviewer kiválasztása",
 
   // "submission.workflow.generic.submit_select_reviewer-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_select_reviewer-help": "",
 
-
   // "submission.workflow.generic.submit_score": "Rate",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Értékelés",
 
   // "submission.workflow.generic.submit_score-help": "",
-  // TODO New key - Add a translation
   "submission.workflow.generic.submit_score-help": "",
 
-
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Jóváhagy",
 
@@ -8070,11 +8258,9 @@
   "submission.workflow.tasks.claimed.edit_help": "Válassza ezt, hogy módosítsa a tárgy metaadatait.",
 
   // "submission.workflow.tasks.claimed.decline": "Decline",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "visszautasít",
 
   // "submission.workflow.tasks.claimed.decline_help": "",
-  // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.decline_help": "",
 
   // "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.",
@@ -8101,8 +8287,6 @@
   // "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": "Vigye a feladatot vissza a készletbe, hogy más felhasználó elvégezhesse azt.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Művelet közben hiba keletkezett...",
 
@@ -8115,8 +8299,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Művelet sikeres",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Követelés",
 
@@ -8129,156 +8311,122 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Részletek felfedése",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "lehetséges duplikációkat észleltünk az elem kapcsán. Igényelje és szerkessze a részletek megtekintéséhez.",
 
   // "submission.workspace.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Megtekint",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Válassza ezt az opciót az elem leíró adatainak megtekintéséhez.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "Nem alkalmazható",
 
   // "subscriptions.title": "Subscriptions",
-  // TODO New key - Add a translation
-  "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Feliratkozások",
 
   // "subscriptions.item": "Subscriptions for items",
-  // TODO New key - Add a translation
-  "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Tárgy feliratkozások",
 
   // "subscriptions.collection": "Subscriptions for collections",
-  // TODO New key - Add a translation
-  "subscriptions.collection": "Kategóriafeliratkozások",
+  "subscriptions.collection": "Gyűjtemény feliratkozások",
 
   // "subscriptions.community": "Subscriptions for communities",
-  // TODO New key - Add a translation
-  "subscriptions.community": "Kategóriafeliratkozások",
+  "subscriptions.community": "Közösség feliratkozások",
 
   // "subscriptions.subscription_type": "Subscription type",
-  // TODO New key - Add a translation
-  "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Feliratkozás típusa",
 
   // "subscriptions.frequency": "Subscription frequency",
-  // TODO New key - Add a translation
-  "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Feliratkozás gyakorisága",
 
   // "subscriptions.frequency.D": "Daily",
-  // TODO New key - Add a translation
-  "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Napi",
 
   // "subscriptions.frequency.M": "Monthly",
-  // TODO New key - Add a translation
-  "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Havi",
 
   // "subscriptions.frequency.W": "Weekly",
-  // TODO New key - Add a translation
-  "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Heti",
 
   // "subscriptions.tooltip": "Subscribe",
-  // TODO New key - Add a translation
-  "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Feliratkozás",
 
   // "subscriptions.modal.title": "Subscriptions",
-  // TODO New key - Add a translation
-  "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Feliratkozások",
 
   // "subscriptions.modal.type-frequency": "Type and frequency",
-  // TODO New key - Add a translation
-  "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Típus és gyakoriság",
 
   // "subscriptions.modal.close": "Close",
-  // TODO New key - Add a translation
-  "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Bezárás",
 
   // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "A feliratkozás törléséhez kérjük látogasson a felhasználói profilja alatt található \"Feliratkozások\" oldalra",
 
   // "subscriptions.modal.new-subscription-form.type.content": "Content",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Tartalom",
 
   // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Napi",
 
   // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Heti",
 
   // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Havi",
 
   // "subscriptions.modal.new-subscription-form.submit": "Submit",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Küldés",
 
   // "subscriptions.modal.new-subscription-form.processing": "Processing...",
-  // TODO New key - Add a translation
-  "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Feldolgozás...",
 
   // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Sikeres feliratkozás a következőre {{ type }}.",
 
   // "subscriptions.modal.delete.success": "Subscription deleted successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "A feliratkozás sikeresen törölve",
 
   // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "A feliratkozás sikeresen frissítve a következőre {{ type }}.",
 
   // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
-  // TODO New key - Add a translation
-  "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Hiba történt a feliratkozás közben",
 
   // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
-  // TODO New key - Add a translation
-  "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Hiba történt a feliratkozás törlése közben",
 
   // "subscriptions.modal.update.error": "An error occurs during the subscription update",
-  // TODO New key - Add a translation
-  "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Hiba történt a feliratkozás frissítése közben",
 
   // "subscriptions.table.dso": "Subject",
-  // TODO New key - Add a translation
-  "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Tárgyszó",
 
   // "subscriptions.table.subscription_type": "Subscription Type",
-  // TODO New key - Add a translation
-  "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Feliratkozás típusa",
 
   // "subscriptions.table.subscription_frequency": "Subscription Frequency",
-  // TODO New key - Add a translation
-  "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Feliratkozás gyakorisága",
 
   // "subscriptions.table.action": "Action",
-  // TODO New key - Add a translation
-  "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Művelet",
 
   // "subscriptions.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Szerkesztés",
 
   // "subscriptions.table.delete": "Delete",
-  // TODO New key - Add a translation
-  "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Törlés",
 
   // "subscriptions.table.not-available": "Not available",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Nem elérhető",
 
   // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
-  // TODO New key - Add a translation
-  "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "A felirakozott elem törlésre került vagy nincs meg a szükséges jogosultsága a megtekintéshez",
 
   // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
-  // TODO New key - Add a translation
-  "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
-
+  "subscriptions.table.empty.message": "Jelenleg nincs egyetlen feliratkozása sem. A kategórák és gyűjtemények kapcsán email értesítőre való feliratkozáshoz használja a feliratkozás gombot az adott elem oldalán.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Thumbnail kép",
@@ -8290,28 +8438,19 @@
   "thumbnail.project.alt": "Projekt Logo",
 
   // "thumbnail.project.placeholder": "Project Placeholder Image",
-  // TODO New key - Add a translation
-  "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Projekt Placeholder képe",
 
   // "thumbnail.orgunit.alt": "OrgUnit Logo",
-  "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Szervezeti egység Logo",
 
   // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
-  // TODO New key - Add a translation
-  "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Szervezeti egység Placeholder képe",
 
   // "thumbnail.person.alt": "Profile Picture",
   "thumbnail.person.alt": "Profilkép",
 
   // "thumbnail.person.placeholder": "No Profile Picture Available",
-  // TODO New key - Add a translation
-  "thumbnail.person.placeholder": "No Profile Picture Available",
-
-
-
-  // "title": "DSpace",
-  "title": "DSpace",
-
+  "thumbnail.person.placeholder": "Profilkép nem elérhető",
 
 
   // "vocabulary-treeview.header": "Hierarchical tree view",
@@ -8326,6 +8465,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Keresés",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Találatok szűrése a szűrőfeltétel első néhány karakterének begépelésével",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Nincsenek megjelenítendő elemek",
 
@@ -8336,8 +8478,7 @@
   "vocabulary-treeview.tree.description.srsc": "Kutatási tárgy kategóriák",
 
   // "vocabulary-treeview.info": "Select a subject to add as search filter",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Tárgyszó kiválasztása szűrőfeltételként",
 
   // "uploader.browse": "browse",
   "uploader.browse": "böngészés",
@@ -8352,8 +8493,7 @@
   "uploader.or": ", vagy",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Feldolgozás",
+  "uploader.processing": "Fájlok feldolgozása...(most már biztonságosan bezárható az oldal)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Sor hossza",
@@ -8367,36 +8507,26 @@
   // "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": "Válassza ki azokat a tárgyakat, amelyekhez óhajtja a virtuális metaadatok elmentését valódi metaadatokként",
 
-
-
   // "supervisedWorkspace.search.results.head": "Supervised Items",
-  // TODO New key - Add a translation
-  "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Ellenőrzés alatt álló tárgyak",
 
   // "workspace.search.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Feltöltéseim",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Munkafolyamat szervezése",
 
   // "workflow.search.results.head": "Workflow tasks",
-  // TODO New key - Add a translation
-  "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Munkafolyamat feladatok",
 
   // "supervision.search.results.head": "Workflow and Workspace tasks",
-  // TODO New key - Add a translation
-  "supervision.search.results.head": "Workflow and Workspace tasks",
-
-
+  "supervision.search.results.head": "Munkafolyamat és munkaterület feladatok",
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
-  // TODO New key - Add a translation
-  "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Munkafolyamat elem szerkesztése",
 
   // "workflow-item.edit.title": "Edit workflowitem",
-  // TODO New key - Add a translation
-  "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Munkafolyamat elem szerkesztése",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Törölve",
@@ -8408,7 +8538,7 @@
   "workflow-item.delete.notification.error.title": "Valami hiba keletkezett",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  "workflow-item.delete.notification.error.content": "Munkafolyamat elem törlése nem sikerült",
+  "workflow-item.delete.notification.error.content": "Munkafolyamat elem törlése sikertelen",
 
   // "workflow-item.delete.title": "Delete workflow item",
   "workflow-item.delete.title": "Munkafolyamat elem törlése",
@@ -8422,7 +8552,6 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Töröl",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Visszaküldve a feladónak",
 
@@ -8433,7 +8562,7 @@
   "workflow-item.send-back.notification.error.title": "Valami hiba keletkezett",
 
   // "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": "Munkafolyamat elem visszaküldése a feladónak nem sikerült",
+  "workflow-item.send-back.notification.error.content": "Munkafolyamat elem visszaküldése a feladónak sikertelen",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
   "workflow-item.send-back.title": "Munkafolyamt elemet visszaküld a feladónak",
@@ -8445,697 +8574,1778 @@
   "workflow-item.send-back.button.cancel": "Mégse",
 
   // "workflow-item.send-back.button.confirm": "Send back",
-  // TODO Source message changed - Revise the translation
   "workflow-item.send-back.button.confirm": "Visszaküld",
 
   // "workflow-item.view.breadcrumbs": "Workflow View",
-  // TODO New key - Add a translation
-  "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Munkafolyamat nézet",
 
   // "workspace-item.view.breadcrumbs": "Workspace View",
-  // TODO New key - Add a translation
-  "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Munkaterület nézet",
 
   // "workspace-item.view.title": "Workspace View",
-  // TODO New key - Add a translation
-  "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Munkaterület nézet",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Munkaterület törlése",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Munkaterületi elem törlése",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Törlés",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Mégse",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Törölve",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "A munkaterületi tárgy sikeresen törölve lett",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Hiba történt",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "A munkaterület elem nem törölhető",
 
   // "workflow-item.advanced.title": "Advanced workflow",
-  // TODO New key - Add a translation
   "workflow-item.advanced.title": "Advanced workflow",
 
-
   // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
 
   // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
 
   // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
 
   // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
 
   // "workflow-item.selectrevieweraction.title": "Select Reviewer",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.title": "Select Reviewer",
 
   // "workflow-item.selectrevieweraction.header": "Select Reviewer",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.header": "Select Reviewer",
 
   // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Mégse",
 
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
   "workflow-item.selectrevieweraction.button.confirm": "Confirm",
 
-
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.notification.success.title": "Rating review",
 
   // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
 
   // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
 
   // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
 
   // "workflow-item.scorereviewaction.title": "Rate this item",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.title": "Rate this item",
 
   // "workflow-item.scorereviewaction.header": "Rate this item",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.header": "Rate this item",
 
   // "workflow-item.scorereviewaction.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Mégse",
 
   // "workflow-item.scorereviewaction.button.confirm": "Confirm",
-  // TODO New key - Add a translation
   "workflow-item.scorereviewaction.button.confirm": "Confirm",
 
   // "idle-modal.header": "Session will expire soon",
-  // TODO New key - Add a translation
   "idle-modal.header": "Session will expire soon",
 
   // "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?",
-  // TODO New key - Add a translation
   "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.log-out": "Log out",
-  // TODO New key - Add a translation
   "idle-modal.log-out": "Log out",
 
   // "idle-modal.extend-session": "Extend session",
-  // TODO New key - Add a translation
   "idle-modal.extend-session": "Extend session",
 
-  // "researcher.profile.action.processing" : "Processing...",
-  // TODO New key - Add a translation
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processing...",
 
   // "researcher.profile.associated": "Researcher profile associated",
-  // TODO New key - Add a translation
   "researcher.profile.associated": "Researcher profile associated",
 
   // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
-  // TODO New key - Add a translation
   "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
 
   // "researcher.profile.create.new": "Create new",
-  // TODO New key - Add a translation
-  "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Új profil létrehozása",
 
   // "researcher.profile.create.success": "Researcher profile created successfully",
-  // TODO New key - Add a translation
-  "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Kutatói profil létrehozása sikeres",
 
   // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
-  // TODO New key - Add a translation
   "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
 
   // "researcher.profile.delete": "Delete",
-  // TODO New key - Add a translation
   "researcher.profile.delete": "Delete",
 
   // "researcher.profile.expose": "Expose",
-  // TODO New key - Add a translation
   "researcher.profile.expose": "Expose",
 
   // "researcher.profile.hide": "Hide",
-  // TODO New key - Add a translation
   "researcher.profile.hide": "Hide",
 
   // "researcher.profile.not.associated": "Researcher profile not yet associated",
-  // TODO New key - Add a translation
-  "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "A kutatói profil még nincs társítva",
 
   // "researcher.profile.view": "View",
-  // TODO New key - Add a translation
-  "researcher.profile.view": "View",
+  "researcher.profile.view": "Megtekint",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
-  // TODO New key - Add a translation
-  "researcher.profile.private.visibility": "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVÁT",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
-  // TODO New key - Add a translation
-  "researcher.profile.public.visibility": "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIKUS",
 
   // "researcher.profile.status": "Status:",
-  // TODO New key - Add a translation
-  "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Állapot:",
 
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
-  // TODO New key - Add a translation
   "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
-  // TODO New key - Add a translation
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
 
-  // "researcherprofile.error.claim.title" : "Error",
-  // TODO New key - Add a translation
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
-  // TODO New key - Add a translation
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Profile claimed with success",
 
-  // "researcherprofile.success.claim.title" : "Success",
-  // TODO New key - Add a translation
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Success",
 
   // "person.page.orcid.create": "Create an ORCID ID",
-  // TODO New key - Add a translation
   "person.page.orcid.create": "Create an ORCID ID",
 
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
-  // TODO New key - Add a translation
   "person.page.orcid.granted-authorizations": "Granted authorizations",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
-  // TODO New key - Add a translation
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Grant authorizations",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
-  // TODO New key - Add a translation
   "person.page.orcid.link": "Connect to ORCID ID",
 
   // "person.page.orcid.link.processing": "Linking profile to ORCID...",
-  // TODO New key - Add a translation
   "person.page.orcid.link.processing": "Linking profile to ORCID...",
 
   // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
-  // TODO New key - Add a translation
   "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.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.",
-  // TODO New key - Add a translation
   "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.unlink": "Disconnect from ORCID",
-  // TODO New key - Add a translation
   "person.page.orcid.unlink": "Disconnect from ORCID",
 
   // "person.page.orcid.unlink.processing": "Processing...",
-  // TODO New key - Add a translation
   "person.page.orcid.unlink.processing": "Processing...",
 
   // "person.page.orcid.missing-authorizations": "Missing authorizations",
-  // TODO New key - Add a translation
   "person.page.orcid.missing-authorizations": "Missing authorizations",
 
   // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
-  // TODO New key - Add a translation
   "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
 
   // "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.",
-  // TODO New key - Add a translation
   "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-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
-  // TODO New key - Add a translation
   "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.profile-preferences": "Profile preferences",
-  // TODO New key - Add a translation
   "person.page.orcid.profile-preferences": "Profile preferences",
 
   // "person.page.orcid.funding-preferences": "Funding preferences",
-  // TODO New key - Add a translation
   "person.page.orcid.funding-preferences": "Funding preferences",
 
   // "person.page.orcid.publications-preferences": "Publication preferences",
-  // TODO New key - Add a translation
   "person.page.orcid.publications-preferences": "Publication preferences",
 
   // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
-  // TODO New key - Add a translation
   "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
 
   // "person.page.orcid.save.preference.changes": "Update settings",
-  // TODO New key - Add a translation
   "person.page.orcid.save.preference.changes": "Update settings",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Affiliation",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Biographical data",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Education",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identifiers",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "All fundings",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "My fundings",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Disabled",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "All publications",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "My publications",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Selected publications",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Disabled",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
   "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
 
   // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
 
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Type",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Description",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Action",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
 
   // "person.page.orcid.sync-queue.description.country": "Country",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.country": "Country",
 
   // "person.page.orcid.sync-queue.description.education": "Educations",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.education": "Educations",
 
   // "person.page.orcid.sync-queue.description.external_ids": "External ids",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.external_ids": "External ids",
 
   // "person.page.orcid.sync-queue.description.other_names": "Other names",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.other_names": "Other names",
 
   // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.qualification": "Qualifications",
 
   // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
 
   // "person.page.orcid.sync-queue.description.keywords": "Keywords",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.description.keywords": "Keywords",
 
   // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
 
   // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
 
   // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
 
   // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.publication": "Publication",
 
   // "person.page.orcid.sync-queue.tooltip.project": "Project",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.project": "Project",
 
   // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
 
   // "person.page.orcid.sync-queue.tooltip.education": "Education",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.education": "Education",
 
   // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
 
   // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
 
   // "person.page.orcid.sync-queue.tooltip.country": "Country",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.country": "Country",
 
   // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
 
   // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
 
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
-  // TODO New key - Add a translation
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
-  // TODO New key - Add a translation
   "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.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
-  // TODO New key - Add a translation
   "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.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
-  // TODO New key - Add a translation
   "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.error": "The submission to ORCID failed",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
 
   // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
-  // TODO New key - Add a translation
   "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.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
-  // TODO New key - Add a translation
   "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.success": "The submission to ORCID was completed successfully",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
 
   // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
-  // TODO New key - Add a translation
   "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.amount-currency.required": "The amount's currency is required",
-  // TODO New key - Add a translation
   "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.external-id.required": "The resource to be sent requires at least one identifier",
-  // TODO New key - Add a translation
   "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.title.required": "The title is required",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
 
   // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
 
   // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
 
   // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
 
   // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
-  // TODO New key - Add a translation
   "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
-  // TODO New key - Add a translation
   "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.publication.date-invalid" : "The publication date must be one year after 1900",
-  // TODO New key - Add a translation
+  // "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": "The publication date must be one year after 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
-  // TODO New key - Add a translation
   "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.city-required": "The address of the organization to be sent requires a city",
-  // TODO New key - Add a translation
   "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.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
-  // TODO New key - Add a translation
   "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.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
-  // TODO New key - Add a translation
   "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.value-required": "The organization's identifiers requires a value",
-  // TODO New key - Add a translation
   "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.disambiguation-source.required": "The organization's identifiers requires a source",
-  // TODO New key - Add a translation
   "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.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
-  // TODO New key - Add a translation
   "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.synchronization-mode": "Synchronization mode",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-mode": "Synchronization mode",
 
   // "person.page.orcid.synchronization-mode.batch": "Batch",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-mode.batch": "Batch",
 
   // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-mode.label": "Synchronization mode",
 
   // "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).",
-  // TODO New key - Add a translation
   "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-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
-  // TODO New key - Add a translation
   "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-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
-  // TODO New key - Add a translation
   "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-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
-  // TODO New key - Add a translation
   "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-settings-update.success": "The synchronization settings have been updated successfully",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
 
   // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
 
   // "person.page.orcid.synchronization-mode.manual": "Manual",
-  // TODO New key - Add a translation
   "person.page.orcid.synchronization-mode.manual": "Manual",
 
   // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
-  // TODO New key - Add a translation
   "person.page.orcid.scope.authenticate": "Get your ORCID iD",
 
   // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
-  // TODO New key - Add a translation
   "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
 
   // "person.page.orcid.scope.activities-update": "Add/update your research activities",
-  // TODO New key - Add a translation
   "person.page.orcid.scope.activities-update": "Add/update your research activities",
 
   // "person.page.orcid.scope.person-update": "Add/update other information about you",
-  // TODO New key - Add a translation
   "person.page.orcid.scope.person-update": "Add/update other information about you",
 
   // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
-  // TODO New key - Add a translation
   "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
 
   // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
-  // TODO New key - Add a translation
   "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
 
   // "person.orcid.sync.setting": "ORCID Synchronization settings",
-  // TODO New key - Add a translation
   "person.orcid.sync.setting": "ORCID Synchronization settings",
 
   // "person.orcid.registry.queue": "ORCID Registry Queue",
-  // TODO New key - Add a translation
   "person.orcid.registry.queue": "ORCID Registry Queue",
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
-  // TODO New key - Add a translation
   "person.orcid.registry.auth": "ORCID Authorizations",
 
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Friss feltöltések",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
-  // TODO New key - Add a translation
   "listable-notification-object.default-message": "This object couldn't be retrieved",
 
-
   // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
-  // TODO New key - Add a translation
   "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
 
   // "system-wide-alert-banner.countdown.prefix": "In",
-  // TODO New key - Add a translation
   "system-wide-alert-banner.countdown.prefix": "In",
 
   // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
-  // TODO New key - Add a translation
   "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
 
   // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
-  // TODO New key - Add a translation
   "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
 
   // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
-  // TODO New key - Add a translation
   "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
 
-
-
   // "menu.section.system-wide-alert": "System-wide Alert",
-  // TODO New key - Add a translation
-  "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Rendszerszintű figyelmeztetés",
 
   // "system-wide-alert.form.header": "System-wide Alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Rendszerszintű figyelmeztetés",
 
   // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
-  // TODO New key - Add a translation
   "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
 
   // "system-wide-alert.form.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Mégse",
 
   // "system-wide-alert.form.save": "Save",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Mentés",
 
   // "system-wide-alert.form.label.active": "ACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "AKTÍV",
 
   // "system-wide-alert.form.label.inactive": "INACTIVE",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INAKTÍV",
 
   // "system-wide-alert.form.error.message": "The system wide alert must have a message",
-  // TODO New key - Add a translation
   "system-wide-alert.form.error.message": "The system wide alert must have a message",
 
   // "system-wide-alert.form.label.message": "Alert message",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Figyelmeztetés szövege",
 
   // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Visszaszámlálós időzítő engedélyezése",
 
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Tipp: Visszaszámlálós időzítő engedélyezése. Használata révén egy jövőbeli dátum adható meg, amelyhez képest egy visszaszámláló el fog indulni a figyelmeztetés szövegével együtt. A beállított dátumot elérve a rendszerszintű figyelmeztetés automatikusan el fog tűnni.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Dátum kiválasztása dátumválasztó révén",
 
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "A rendszerszintű figyelmeztetés előnézete",
 
   // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "A rendszerszintű figyelmeztetés sikeresen módosítva",
 
   // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "A rendszerszintű figyelmeztetés módosítása sikertelen",
 
   // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "A rendszerszintű figyelmeztetés létrehozása sikeres",
 
   // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
-  // TODO New key - Add a translation
-  "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "A rendszerszintű figyelmeztetés létrehozása sikertelen",
 
   // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
-  // TODO New key - Add a translation
-  "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Rendszerszintű figyelmeztetések",
 
   // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Rendszerszintű figyelmeztetések",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Discover",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Az alábbi űrlap lehetővé teszi az elem metaadatai illetve bitfolyamai esetében a hozzáférési szabályok módosítását.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Az alábbi űrlap lehetővé teszi a gyűjtemény összes eleme esetén a hozzáférési szabályok módosítását. A változtatások végrehajthatók az összes elem metaadatai illetve összes fájlja (bitfolyama) esetében.",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Az alábbi űrlap lehetővé teszi a közösségbe tartozó összes gyűjtemény összes eleme esetén a hozzáférési szabályok módosítását. A változtatások végrehajthatók az összes elem metaadatai illetve összes fájlja (bitfolyama) esetében.",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Elemhez tartozó metaadatok",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Bitfolyamok",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mód",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Hozzáférési szabályok",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Jelenleg egyetlen hozzáférési szabály sem lett kiválasztva az alábbi listából. Ha így hajtja végre a folyamatot, akkor a jelenlegi hozzáférési szabályok a tartalmazó gyűjtemény alapértelmezett hozzáférési szabályaira fognak lecserélődni.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Jelenlegi hozzáférési szabály cseréje",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Hozzáadás a jelenlegihez",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Az elemhez tartozó összes bitfolyam frissítése",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "bitfolyam kiválasztva",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Bitfolyamok kiválasztása",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Mégse",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Végrehajt",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Továbbiak hozzáadása",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Remove access condition",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Select bitstreams",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No items to show.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Bezárás",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Hozzáférés szabályának típusa",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Válasszon egy hozzáférési szabályt, amely alkalmazásra kerül a kiválasztott elemeken.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Grant access from",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Grant access until",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Hozzáadás",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "COAR Notify Protocol",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Message Moderation",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Delete Service",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Registered Services",
+
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Név",
+
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Description",
+
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Állapot",
+
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Action",
+
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NEW",
+
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Enabled",
+
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Disabled",
+
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Edit Service",
+
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Create service",
+
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Create Service",
+
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Please confirm the creation of this service.",
+
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Állapot",
+
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Létrehoz",
+
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Mégse",
+
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Register a new service",
+
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Mentés",
+
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Név",
+
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Description",
+
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "Service URL",
+
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Level of trust",
+
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Announce Review",
+
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Request Review",
+
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automatic",
+
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Name is required",
+
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "URL is required",
+
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "At least a pattern is required",
+
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "New Service",
+
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Do you confirm the changes?",
+
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Edit Service",
+
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirm",
+
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Mégse",
+
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Discard Changes",
+
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Elvetés",
+
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Successful Create",
+
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "The service has been created",
+
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Failed Create",
+
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "The service has not been created",
+
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Mégse",
+
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Delete service",
+
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Edit service",
+
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Név",
+
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Description",
+
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "Service URL",
+
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automatic",
+
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Mentés",
+
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Success",
+
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Endorsement",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Review",
+
+  // "item.page.referenced": "Referenced By",
   // TODO New key - Add a translation
-  "admin.system-wide-alert.title": "System-wide Alerts",
+  "item.page.referenced": "Referenced By",
 
+  // "item.page.supplemented": "Supplemented By",
+  // TODO New key - Add a translation
+  "item.page.supplemented": "Supplemented By",
 
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "LDN Services overview",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "LDN Services",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "LDN Service",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Mégse",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Delete service",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Delete service",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Delete service",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "Services ID",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Név",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Indítás dátuma (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Állapot",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "User",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Services Overview",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Services Overview",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Actions",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Description",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Mark inbound pattern for deletion",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Close modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Always true",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "DOI filter",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Is archived",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "Item is public",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "None",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Notify Dashboard",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Related items",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Related item",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origin",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Target",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Search target",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "Queued",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Processing",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processed",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Failed",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Target",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Search source",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Source",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Type",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Repository Item",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Repository Item",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "LDN Service",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "LDN Service",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Message Detail",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Show message",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Timestamp",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "LDN Service",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Type",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Állapot",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Action",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detail",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocess",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processed",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Failed",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Processing",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "Queued",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "Untrusted",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Creative Commons license",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  // TODO New key - Add a translation
+  "browse.search-form.placeholder": "Search the repository",
 }

From 907a16ca09a9f7c5a689c264f84bc9ec0b55316c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?=
 <zoltan.kanasz-nagy@qulto.eu>
Date: Thu, 5 Dec 2024 00:03:45 +0100
Subject: [PATCH 0899/1286] QREPO-0 updating registration and forgot password
 related translations

---
 src/assets/i18n/hu.json5 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 44348b916d..a14cacc013 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -2901,10 +2901,10 @@
   "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
-  "forgot-email.form.header": "Elfelejtettem a jelszót",
+  "forgot-email.form.header": "Elfelejtett jelszó",
 
   // "forgot-email.form.info": "Enter the email address associated with the account.",
-  "forgot-email.form.info": "Írja be a fiókhoz rendelt e-mail címet.",
+  "forgot-email.form.info": "Kérjük adja meg a fiókhoz rendelt e-mail címét.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "E-mail cím *",
@@ -2916,7 +2916,7 @@
   "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
-  "forgot-email.form.email.hint": "Elküldtünk egy e-mailt erre a címre további utasításokkal.",
+  "forgot-email.form.email.hint": "A megadott email címre érkezni fog egy levél a további utasításokkal.",
 
   // "forgot-email.form.submit": "Reset password",
   "forgot-email.form.submit": "Jelszó visszaállítása",
@@ -2934,10 +2934,10 @@
   "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-password.title": "Forgot Password",
-  "forgot-password.title": "Elfelejtettem a jelszót",
+  "forgot-password.title": "Elfelejtett jelszó",
 
   // "forgot-password.form.head": "Forgot Password",
-  "forgot-password.form.head": "Elfelejtettem a jelszót",
+  "forgot-password.form.head": "Elfelejtett jelszó",
 
   // "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": "Írjon be egy új jelszót a lenti mezőbe, és igazolja a második mezőbe újraírva azt.",
@@ -6132,7 +6132,7 @@
   "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
-  "register-email.title": "Új felhasználó regisztrálása",
+  "register-email.title": "Új felhasználó regisztrációja",
 
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "Profil létrehozása",
@@ -6213,7 +6213,7 @@
   "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  "register-page.registration.email.hint": "Az e-mail cím ellenőrizve lesz és evvel tud belépni a rendszerbe.",
+  "register-page.registration.email.hint": "A regisztráció során az e-mail cím megerősítésére lesz szükség, mert bejelentkezési névként ez a cím kerül felhasználásra.",
 
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Regisztráció",
@@ -6222,7 +6222,7 @@
   "register-page.registration.success.head": "Ellenőrző e-mail elküldve",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "register-page.registration.success.content": "Egy e-mail elküldve a(z) {{ email }} címre, tartalmaz egy speciális címet a további utasításokhoz.",
+  "register-page.registration.success.content": "Egy e-mail elküldve a(z) {{ email }} címre, amely tartalmaz egy hivatkozást a további utasításokhoz.",
 
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Hiba történt az e-mail cím regisztrációjakor",

From 964c085ee27186ceceab83d51c79eeb31edd430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?=
 <zoltan.kanasz-nagy@qulto.eu>
Date: Thu, 5 Dec 2024 02:53:15 +0100
Subject: [PATCH 0900/1286] QREPO-0 adding translations for mapping item to
 other collections

---
 src/assets/i18n/hu.json5 | 164 +++++++++++++++++++--------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index a14cacc013..dca810b1b6 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -94,13 +94,13 @@
   "admin.registries.bitstream-formats.create.head": "Bitfolyam formátum létrehozása",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-  "admin.registries.bitstream-formats.create.new": "Bitfolyam formátum hozzáadása.",
+  "admin.registries.bitstream-formats.create.new": "Bitfolyam formátum hozzáadása",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Új bitfolyam formátum sikeresen létrehozva.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-  "admin.registries.bitstream-formats.create.success.head": "Sikerült",
+  "admin.registries.bitstream-formats.create.success.head": "Sikeres művelet",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "A {{ amount }} formátum(ok) törlése sikertelen",
@@ -112,7 +112,7 @@
   "admin.registries.bitstream-formats.delete.success.amount": "A {{ amount }} formátum(ok) sikeresen törölve",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-  "admin.registries.bitstream-formats.delete.success.head": "Sikerült",
+  "admin.registries.bitstream-formats.delete.success.head": "Sikeres művelet",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Ez a bitfolyam formátum lista ismert formátumokról és azok támogatásáról nyújt információt.",
@@ -167,7 +167,7 @@
   "admin.registries.bitstream-formats.edit.success.content": "Bitfolyam formátum szerkesztése sikeres.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-  "admin.registries.bitstream-formats.edit.success.head": "Sikerült",
+  "admin.registries.bitstream-formats.edit.success.head": "Sikeres művelet",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Intézménye ilyen szintű támogatást biztosít ennek a formátumnak.",
@@ -329,10 +329,10 @@
   "admin.registries.schema.notification.created": "Metaadat séma létrehozása sikerült \"{{prefix}}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.failure": "A {{amount}} metaadat sémák törlése sikertelen",
+  "admin.registries.schema.notification.deleted.failure": "A(z) {{amount}} metaadat sémák törlése sikertelen",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-  "admin.registries.schema.notification.deleted.success": "A {{amount}} metaadat sémák törlése sikeres",
+  "admin.registries.schema.notification.deleted.success": "A(z) {{amount}} metaadat sémák törlése sikeres",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Metaadat séma szerkesztése sikeres \"{{prefix}}\"",
@@ -353,7 +353,7 @@
   "admin.registries.schema.notification.field.edited": "metaadat mező szerkesztése sikeres\"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  "admin.registries.schema.notification.success": "Sikerült",
+  "admin.registries.schema.notification.success": "Sikeres művelet",
 
   // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "Vissza",
@@ -1418,13 +1418,13 @@
   "bitstream.edit.form.primaryBitstream.label": "Elsődleges fájl",
 
   // "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": "Amennyiben a formátum nem található a fentebbi listán, <b>válassza \"formátum nincs a listán\" feljebb</b> majd írja le \"Új formátum leírása\".",
+  "bitstream.edit.form.selectedFormat.hint": "Amennyiben a formátum nem található a fentebbi listában, <b>válassza \"formátum nincs a listában\" opciót</b>, majd pedig írja le \"Új formátum leírása\" mezőben.",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Kiválasztott formátum",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  "bitstream.edit.form.selectedFormat.unknown": "Formátum nincs a listán",
+  "bitstream.edit.form.selectedFormat.unknown": "Formátum nincs a listában",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Bitfolyam formátum mentése közben hiba történt",
@@ -1716,7 +1716,7 @@
   "collection.delete.cancel": "Mégse",
 
   // "collection.delete.confirm": "Confirm",
-  "collection.delete.confirm": "Mehet",
+  "collection.delete.confirm": "Megerősít",
 
   // "collection.delete.processing": "Deleting",
   "collection.delete.processing": "Törlés",
@@ -1768,37 +1768,37 @@
   "collection.edit.item-mapper.no-search": "Írja be a keresőszót",
 
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.map.error.content": "A {{amount}} tárgyak térképezésekor hiba történt.",
+  "collection.edit.item-mapper.notifications.map.error.content": "A(z) {{amount}} tárgy hozzárendelésekor hiba történt.",
 
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  "collection.edit.item-mapper.notifications.map.error.head": "Térképezési hibák",
+  "collection.edit.item-mapper.notifications.map.error.head": "Hozzárendelés hibái",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  "collection.edit.item-mapper.notifications.map.success.content": "A {{amount}} tárgyak térképezése sikerült.",
+  "collection.edit.item-mapper.notifications.map.success.content": "A(z) {{amount}} tárgy hozzárendelése sikeres.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  "collection.edit.item-mapper.notifications.map.success.head": "Térképezés befejezve",
+  "collection.edit.item-mapper.notifications.map.success.head": "Hozzárendelés befejeződött",
 
   // "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": "A {{amount}} tárgyak térképezésének törlésekor hiba történt.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "A(z) {{amount}} tárgy hozzárendelésének törlésekor hiba történt.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Térképezési hibák törlése",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "A {{amount}} tárgyak térképezése sikeresen törölve.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "A(z) {{amount}} tárgy térképezése sikeresen törölve.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Térképezés törlése befejeződött",
 
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  "collection.edit.item-mapper.remove": "Kiválasztott térgyak térképezésének törlése",
+  "collection.edit.item-mapper.remove": "Kiválasztott tárgyak hozzárendelésének törlése",
 
   // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
   "collection.edit.item-mapper.search-form.placeholder": "Tárgyak keresése...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-  "collection.edit.item-mapper.tabs.browse": "Térképezett tárgyak böngészése",
+  "collection.edit.item-mapper.tabs.browse": "Gyűjteményhez hozzárendelt tárgyak böngészése",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Új tárgyak térképezése",
@@ -1816,7 +1816,7 @@
   "collection.edit.logo.notifications.add.error": "Gyűjtemény logó feltöltése sikertelen. Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  "collection.edit.logo.notifications.add.success": "Gyűjtemény logó feltöltése sikerült.",
+  "collection.edit.logo.notifications.add.success": "Gyűjtemény logó feltöltése sikeres.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "Logó törölve",
@@ -2638,7 +2638,7 @@
   "dso-selector.placeholder.type.collection": "Gyűjtemény",
 
   // "dso-selector.placeholder.type.item": "item",
-  "dso-selector.placeholder.type.item": "Elem",
+  "dso-selector.placeholder.type.item": "Tárgy",
 
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Gyűjtemény kiválasztása",
@@ -3483,10 +3483,10 @@
   "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
 
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  "item.edit.tabs.mapper.head": "Gyűjteményhez rendelés",
+  "item.edit.tabs.mapper.head": "Gyűjteményi hozzárendelés",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Elem szerkesztése - Gyűjteményi hozzárendelés",
 
   // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
   "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
@@ -3537,7 +3537,7 @@
   "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
 
   // "item.edit.register-doi.confirm": "Confirm",
-  "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Megerősít",
 
   // "item.edit.register-doi.cancel": "Cancel",
   "item.edit.register-doi.cancel": "Mégse",
@@ -3552,59 +3552,59 @@
   "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  "item.edit.item-mapper.buttons.add": "Térképezze a tárgyat a kiválasztott gyűjteményekhez",
+  "item.edit.item-mapper.buttons.add": "A tárgy kiválasztott gyűjteményekhez való hozzárendelése",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  "item.edit.item-mapper.buttons.remove": "Törölje a tárgy térképezését a kiválasztott gyűjteményekhez",
+  "item.edit.item-mapper.buttons.remove": "Törölje a tárgy hozzárendelését a kiválasztott gyűjteményekhez",
 
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Mégse",
 
   // "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": "Ez a térképező eszköz, amellyel az adminisztrátorok ezt a tárgyat más gyűjteményekhez térképezhetik. Kereshet gyűjteményeket amelyekhez térképezze, vagy böngészheti azon gyűjtemények listáját, amelyhez jelenleg hozzá van térképezve..",
+  "item.edit.item-mapper.description": "A gyűjteményi hozzárendelés révén az adminisztrátorok ezt a tárgyat más gyűjteményekhez is hozzárendelhetik anélkül, hogy az adott elem duplikálásra kerülne. Az alábbi részen egyrészt böngészheti azon gyűjtemények listáját, amelyhez jelenleg a tartalmazó gyűjteményen kívül is már hozzá van rendelve, illetve gyűjtemények keresése révén új tudja új gyűjteményekhez rendelheti az aktuális elemet.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  "item.edit.item-mapper.head": "Tárgytérképező - Térképezze a tárgyat gyűjteményekhez",
+  "item.edit.item-mapper.head": "Elem hozzárendelése - A tárgy gyűjteményi hozzárendelése",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Tárgy: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-  "item.edit.item-mapper.no-search": "Kérjük írja be a keresett szót",
+  "item.edit.item-mapper.no-search": "Kérjük adja meg a keresőkifejezést",
 
   // "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": "A tárgynak a {{amount}} gyűjteményekhez való térképezésekor hiba történt.",
+  "item.edit.item-mapper.notifications.add.error.content": "A tárgynak a {{amount}} gyűjteményekhez való hozzárendelésekor hiba történt.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
-  "item.edit.item-mapper.notifications.add.error.head": "Térképezési hibák",
+  "item.edit.item-mapper.notifications.add.error.head": "Hozzárendelés hibái",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.add.success.content": "Tárgy sikeresen térképezve {{amount}} gyűjteményhez.",
+  "item.edit.item-mapper.notifications.add.success.content": "Tárgy sikeresen hozzárendelve {{amount}} gyűjteményhez.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  "item.edit.item-mapper.notifications.add.success.head": "Térképezés befejeződött",
+  "item.edit.item-mapper.notifications.add.success.head": "Hozzárendelés befejeződött",
 
   // "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": "A {{amount}} gyűjteményekhez való térképezés eltávolításakor hiba történt.",
+  "item.edit.item-mapper.notifications.remove.error.content": "A(z) {{amount}} gyűjteményekhez való hozzárendelés eltávolításakor hiba történt.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
-  "item.edit.item-mapper.notifications.remove.error.head": "Térképezési hibák eltávolítása",
+  "item.edit.item-mapper.notifications.remove.error.head": "Hozzárendelési hibák eltávolítása",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.success.content": "A {{amount}} gyűjteményhez való térképezés sikeresen eltávolítva.",
+  "item.edit.item-mapper.notifications.remove.success.content": "A(z) {{amount}} gyűjteményhez való hozzárendelés sikeresen eltávolítva.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
-  "item.edit.item-mapper.notifications.remove.success.head": "Térképezés eltávolítása befejeződött",
+  "item.edit.item-mapper.notifications.remove.success.head": "A hozzárendelés eltávolítása befejeződött",
 
   // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
-  "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Gyűjtemények keresése...",
 
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
-  "item.edit.item-mapper.tabs.browse": "Böngéssze a térképezett gyűjteményeket",
+  "item.edit.item-mapper.tabs.browse": "A már hozzárendelt gyűjtemények böngészése",
 
   // "item.edit.item-mapper.tabs.map": "Map new collections",
-  "item.edit.item-mapper.tabs.map": "Térképezzen új gyűjteményeket",
+  "item.edit.item-mapper.tabs.map": "Új gyűjtemények hozzárendelése",
 
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Hozzáadás",
@@ -3613,16 +3613,16 @@
   "item.edit.metadata.discard-button": "Elvetés",
 
   // "item.edit.metadata.edit.language": "Edit language",
-  "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Nyelv szerkesztése",
 
   // "item.edit.metadata.edit.value": "Edit value",
-  "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Érték módosítása",
 
   // "item.edit.metadata.edit.authority.key": "Edit authority key",
-  "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Autoritáskulcs szerkesztése",
 
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
-  "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Megerősít",
 
   // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -3758,7 +3758,7 @@
   "item.edit.move.search.placeholder": "Írjon be keresőszót hogy gyűjteményeket találjon",
 
   // "item.edit.move.success": "The item has been moved successfully",
-  "item.edit.move.success": "Tárgy mozgatása sikerült",
+  "item.edit.move.success": "Tárgy mozgatása sikeres",
 
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Tárgy mozgatása",
@@ -3816,7 +3816,7 @@
   "item.edit.reinstate.header": "Reinstate item: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-  "item.edit.reinstate.success": "Tárgy visszaállítása sikerült",
+  "item.edit.reinstate.success": "Tárgy visszaállítása sikeres",
 
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Elvetés",
@@ -3912,16 +3912,16 @@
   "item.edit.tabs.status.buttons.delete.label": "Tárgy teljes kitörlése",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-  "item.edit.tabs.status.buttons.mappedCollections.button": "Térképezett gyűjtemények",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Hozzárendelt gyűjtemények",
 
   // "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.mappedCollections.label": "Hozzárendelt gyűjtemények szervezése",
 
   // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Áthelyezés...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
-  "item.edit.tabs.status.buttons.move.label": "Tárgy másik gyűjteménybe költöztetése",
+  "item.edit.tabs.status.buttons.move.label": "Tárgy áthelyezése másik gyűjteménybe",
 
   // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
   "item.edit.tabs.status.buttons.private.button": "Legyen privát...",
@@ -3978,7 +3978,7 @@
   "item.edit.tabs.versionhistory.title": "Tárgy szerkesztése - Változatok története",
 
   // "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": "Változatok szerkesztése, vagy újak hozzáadása ezen a felületen még nem lehetséges.",
+  "item.edit.tabs.versionhistory.under-construction": "Meglévő verziók szerkesztése vagy újak hozzáadása ezen a felületen még nem lehetséges.",
 
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Tárgy megtekintése",
@@ -4003,13 +4003,13 @@
   "item.edit.withdraw.header": "Withdraw item: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  "item.edit.withdraw.success": "Tárgy visszavonása sikerült",
+  "item.edit.withdraw.success": "Tárgy visszavonása sikeres",
 
   // "item.orcid.return": "Back",
   "item.orcid.return": "Vissza",
 
   // "item.listelement.badge": "Item",
-  "item.listelement.badge": "Elem",
+  "item.listelement.badge": "Tárgy",
 
   // "item.page.description": "Description",
   "item.page.description": "Leírás",
@@ -4369,22 +4369,22 @@
   "item.select.table.title": "Cím",
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  "item.version.history.empty": "Ennek a tárgynak még nincs más változata.",
+  "item.version.history.empty": "E tárgynak még nincs más verziója.",
 
   // "item.version.history.head": "Version History",
-  "item.version.history.head": "Változatok története",
+  "item.version.history.head": "Verzió történet",
 
   // "item.version.history.return": "Back",
   "item.version.history.return": "Vissza",
 
   // "item.version.history.selected": "Selected version",
-  "item.version.history.selected": "Kiválasztott változat",
+  "item.version.history.selected": "A kiválasztott verzió",
 
   // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
-  "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Ön jelenleg az aktuális elem {{version}}.verzióját tekinti meg.",
 
   // "item.version.history.table.version": "Version",
-  "item.version.history.table.version": "Változat",
+  "item.version.history.table.version": "Verzió",
 
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Tárgy",
@@ -4399,37 +4399,37 @@
   "item.version.history.table.summary": "Összefoglaló",
 
   // "item.version.history.table.workspaceItem": "Workspace item",
-  "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Munkaterület elem",
 
   // "item.version.history.table.workflowItem": "Workflow item",
-  "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Munkafolyamat elem",
 
   // "item.version.history.table.actions": "Action",
-  "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Művelet",
 
   // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
-  "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Munkaterület elem szerkesztése",
 
   // "item.version.history.table.action.editSummary": "Edit summary",
-  "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Összefoglaló szerkesztése",
 
   // "item.version.history.table.action.saveSummary": "Save summary edits",
-  "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Összefoglaló módosításának mentése",
 
   // "item.version.history.table.action.discardSummary": "Discard summary edits",
-  "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Összefoglaló módosításának visszavonása",
 
   // "item.version.history.table.action.newVersion": "Create new version from this one",
-  "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Új verzió létrehozása ebből a verzióból",
 
   // "item.version.history.table.action.deleteVersion": "Delete version",
-  "item.version.history.table.action.deleteVersion": "Delete version",
+  "item.version.history.table.action.deleteVersion": "Verzió törlése",
 
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
-  "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
+  "item.version.history.table.action.hasDraft": "Az új verzió létrehozása sikertelen, mert egy folyamatban lévő feltöltés található a verziók történetében",
 
   // "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": "Ez nem ennek a tárgynak a legutóbbi változata. A legutóbbi változat megtalálható itt <a href='{{destination}}'>here</a>.",
+  "item.version.notice": "A jelen verzió ennek az elemnek nem a legutóbbi változata. A legutóbbi változat <a href='{{destination}}'>itt</a> található.",
 
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Új verzió",
@@ -4567,7 +4567,7 @@
   "itemtemplate.edit.metadata.edit.value": "Edit value",
 
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
-  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Megerősít",
 
   // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
   "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -5320,7 +5320,7 @@
   "nav.user.description": "User profile bar",
 
   // "none.listelement.badge": "Item",
-  "none.listelement.badge": "Item",
+  "none.listelement.badge": "Tárgy",
 
   // "quality-assurance.title": "Quality Assurance",
   "quality-assurance.title": "Quality Assurance",
@@ -5680,7 +5680,7 @@
   "process.new.parameter.required.missing": "The following parameters are required but still missing:",
 
   // "process.new.notification.success.title": "Success",
-  "process.new.notification.success.title": "Sikerült",
+  "process.new.notification.success.title": "Siker",
 
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "A folyamat sikeresen létrehozva",
@@ -8634,7 +8634,7 @@
   "workflow-item.selectrevieweraction.button.cancel": "Mégse",
 
   // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
-  "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Megerősít",
 
   // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
   "workflow-item.scorereviewaction.notification.success.title": "Rating review",
@@ -8658,19 +8658,19 @@
   "workflow-item.scorereviewaction.button.cancel": "Mégse",
 
   // "workflow-item.scorereviewaction.button.confirm": "Confirm",
-  "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Megerősít",
 
   // "idle-modal.header": "Session will expire soon",
-  "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "A munkamenet hamarosan lejár",
 
   // "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": "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": "Biztonsági okokból a felhasználói munkamenetek {{ timeToExpire }} perc inaktivitás után lejárnak. A munkamenete hamarosan lejár. Szeretné meghosszabbítani, vagy kijelentkezik?",
 
   // "idle-modal.log-out": "Log out",
-  "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Kijelentkezés",
 
   // "idle-modal.extend-session": "Extend session",
-  "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Munkamenet meghosszabbítása",
 
   // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processing...",
@@ -8838,7 +8838,7 @@
   "person.page.orcid.sync-queue.table.header.description": "Description",
 
   // "person.page.orcid.sync-queue.table.header.action": "Action",
-  "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Művelet",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
   "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -9162,7 +9162,7 @@
   "access-control-add-to-existing": "Hozzáadás a jelenlegihez",
 
   // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
-  "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "A módosítások korlátozása bizonyos bitfolyamokra",
 
   // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
   "access-control-process-all-bitstreams": "Az elemhez tartozó összes bitfolyam frissítése",
@@ -9258,7 +9258,7 @@
   "ldn-registered-services.table.status": "Állapot",
 
   // "ldn-registered-services.table.action": "Action",
-  "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Művelet",
 
   // "ldn-registered-services.new": "NEW",
   "ldn-registered-services.new": "NEW",
@@ -9516,7 +9516,7 @@
   "service.overview.edit.modal": "Edit Service",
 
   // "service.detail.update": "Confirm",
-  "service.detail.update": "Confirm",
+  "service.detail.update": "Megerősít",
 
   // "service.detail.return": "Cancel",
   "service.detail.return": "Mégse",
@@ -10295,7 +10295,7 @@
   "notify-message-result.status": "Állapot",
 
   // "notify-message-result.action": "Action",
-  "notify-message-result.action": "Action",
+  "notify-message-result.action": "Művelet",
 
   // "notify-message-result.detail": "Detail",
   "notify-message-result.detail": "Detail",

From b86d0a083af1694780990362c52b82802ad5b8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kan=C3=A1sz-Nagy=20Zolt=C3=A1n?=
 <zoltan.kanasz-nagy@qulto.eu>
Date: Thu, 5 Dec 2024 03:33:18 +0100
Subject: [PATCH 0901/1286] QREPO-0 withdraw & reinstate related translations

---
 src/assets/i18n/hu.json5 | 70 ++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index dca810b1b6..e39e228969 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -3561,7 +3561,7 @@
   "item.edit.item-mapper.cancel": "Mégse",
 
   // "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": "A gyűjteményi hozzárendelés révén az adminisztrátorok ezt a tárgyat más gyűjteményekhez is hozzárendelhetik anélkül, hogy az adott elem duplikálásra kerülne. Az alábbi részen egyrészt böngészheti azon gyűjtemények listáját, amelyhez jelenleg a tartalmazó gyűjteményen kívül is már hozzá van rendelve, illetve gyűjtemények keresése révén új tudja új gyűjteményekhez rendelheti az aktuális elemet.",
+  "item.edit.item-mapper.description": "A gyűjteményi hozzárendelés révén az adminisztrátorok ezt a tárgyat más gyűjteményekhez is hozzárendelhetik anélkül, hogy az adott elem duplikálásra kerülne. Az alábbi részen egyrészt böngészheti azon gyűjtemények listáját, amelyhez jelenleg a tartalmazó gyűjteményen kívül is már hozzá van rendelve, illetve gyűjtemények keresése révén új gyűjteményekhez rendelheti az aktuális elemet.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Elem hozzárendelése - A tárgy gyűjteményi hozzárendelése",
@@ -3625,7 +3625,7 @@
   "item.edit.metadata.edit.buttons.confirm": "Megerősít",
 
   // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Húzza a sorrend módosításához",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Szerkesztés",
@@ -3879,7 +3879,7 @@
   "item.edit.tabs.curate.title": "Tárgy szerkesztése - Gondozás",
 
   // "item.edit.curate.title": "Curate Item: {{item}}",
-  "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Elem gondozása: {{item}}",
 
   // "item.edit.tabs.access-control.head": "Access Control",
   "item.edit.tabs.access-control.head": "Hozzáférés kontroll",
@@ -4381,7 +4381,7 @@
   "item.version.history.selected": "A kiválasztott verzió",
 
   // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
-  "item.version.history.selected.alert": "Ön jelenleg az aktuális elem {{version}}.verzióját tekinti meg.",
+  "item.version.history.selected.alert": "Ön jelenleg az aktuális elem {{version}}. verzióját tekinti meg.",
 
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Verzió",
@@ -4426,7 +4426,7 @@
   "item.version.history.table.action.deleteVersion": "Verzió törlése",
 
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
-  "item.version.history.table.action.hasDraft": "Az új verzió létrehozása sikertelen, mert egy folyamatban lévő feltöltés található a verziók történetében",
+  "item.version.history.table.action.hasDraft": "Az új verzió nem hozható létre, mert egy folyamatban lévő feltöltés található a verziók történetében",
 
   // "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": "A jelen verzió ennek az elemnek nem a legutóbbi változata. A legutóbbi változat <a href='{{destination}}'>itt</a> található.",
@@ -4435,10 +4435,10 @@
   "item.version.create.modal.header": "Új verzió",
 
   // "item.qa.withdrawn.modal.header": "Request withdrawal",
-  "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Visszavonás kérvényezése",
 
   // "item.qa.reinstate.modal.header": "Request reinstate",
-  "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Visszaállítás kérvényezése",
 
   // "item.qa.reinstate.create.modal.header": "New version",
   "item.qa.reinstate.create.modal.header": "Új verzió",
@@ -4447,7 +4447,7 @@
   "item.version.create.modal.text": "Új verzió készítése ehhez az elemhez",
 
   // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
-  "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "kiindulva a {{version}}. verzióból",
 
   // "item.version.create.modal.button.confirm": "Create",
   "item.version.create.modal.button.confirm": "Létrehoz",
@@ -4459,10 +4459,10 @@
   "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
 
   // "qa-withdrown.create.modal.button.confirm": "Withdraw",
-  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Visszavonás",
 
   // "qa-reinstate.create.modal.button.confirm": "Reinstate",
-  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Visszaállítás",
 
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Mégse",
@@ -4471,61 +4471,61 @@
   "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Mégse",
 
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
-  "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Ne hozzon létre új verziót",
 
   // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
-  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Ne küldjön kérelmet",
 
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Összefoglaló",
 
   // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
-  "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Ezen elem visszavonásának kérvényezése",
 
   // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
-  "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Kérjük adja meg a visszavonás okát",
 
   // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
-  "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Ezen elem visszaállításának kérvényezése",
 
   // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
-  "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Kérjük adja meg a visszaállítás okát",
 
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "Kérjük adja meg az új verzió összefoglalóját",
 
   // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
-  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Adja meg a visszavonás okát",
 
   // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
-  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Adja meg a visszaállítás okát",
 
   // "item.version.create.modal.submitted.header": "Creating new version...",
-  "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Új verzió készítése...",
 
   // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
-  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Visszavonás kérvényezése...",
 
   // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
-  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Visszaállítás kérelem elküldve.",
 
   // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
-  "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Visszavonási kérelem elküldve.",
 
   // "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": "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": "Az új verzió létrehozása folyamatban van. Ez eltarthat egy ideig, ha az elemhez sok kapcsolódó elem tartozik.",
 
   // "item.version.create.notification.success": "New version has been created with version number {{version}}",
-  "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Az új verzió elkészült a következő verziószámmal {{version}}",
 
   // "item.version.create.notification.failure": "New version has not been created",
-  "item.version.create.notification.failure": "New version has not been created",
+  "item.version.create.notification.failure": "Az új verzió nem jött létre",
 
   // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
-  "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
+  "item.version.create.notification.inProgress": "Az új verzió nem hozható létre, mert egy folyamatban lévő feltöltés található a verziók történetében",
 
   // "item.version.delete.modal.header": "Delete version",
-  "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Verzió törlése",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
   "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
@@ -4570,7 +4570,7 @@
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Megerősít",
 
   // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
-  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Húzza a sorrend módosításához",
 
   // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
   "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
@@ -5056,7 +5056,7 @@
   "menu.section.quality-assurance": "Quality Assurance",
 
   // "menu.section.notifications_publication-claim": "Publication Claim",
-  "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Publikáció igénylése",
 
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Oldalsáv rögzítése",
@@ -6036,10 +6036,10 @@
   "suggestion.loading": "Loading ...",
 
   // "suggestion.title": "Publication Claim",
-  "suggestion.title": "Publication Claim",
+  "suggestion.title": "Publikáció igénylése",
 
   // "suggestion.title.breadcrumbs": "Publication Claim",
-  "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Publikáció igénylése",
 
   // "suggestion.targets.description": "Below you can see all the suggestions ",
   "suggestion.targets.description": "Below you can see all the suggestions ",
@@ -6123,7 +6123,7 @@
   "suggestion.from.source": "from the ",
 
   // "suggestion.count.missing": "You have no publication claims left",
-  "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Nincs több igényelhető publikációja",
 
   // "suggestion.totalScore": "Total Score",
   "suggestion.totalScore": "Total Score",
@@ -9216,10 +9216,10 @@
   "vocabulary-treeview.search.form.add": "Hozzáadás",
 
   // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
-  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Publikáció igénylése",
 
   // "admin.notifications.publicationclaim.page.title": "Publication Claim",
-  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Publikáció igénylése",
 
   // "coar-notify-support.title": "COAR Notify Protocol",
   "coar-notify-support.title": "COAR Notify Protocol",
@@ -10347,5 +10347,5 @@
 
   // "browse.search-form.placeholder": "Search the repository",
   // TODO New key - Add a translation
-  "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Keresés a repozitóriumban",
 }

From 446280b59a65c8c0ce24a796ffd14b5eef6eafd0 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 22 Jun 2024 17:32:34 +0200
Subject: [PATCH 0902/1286] Fixed search facet deadlock

Also fixed minor issue in MetadataService, but this doesn't cause any issues in the current code
---
 src/app/core/metadata/metadata.service.ts                     | 2 +-
 .../shared/input-suggestions/input-suggestions.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 1aacb76295..dcc355edd0 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -27,7 +27,7 @@ export class MetadataService {
    * Returns undefined otherwise.
    */
   public virtualValue(metadataValue: MetadataValue | undefined): string {
-    if (this.isVirtual) {
+    if (this.isVirtual(metadataValue)) {
       return metadataValue.authority.substring(metadataValue.authority.indexOf(VIRTUAL_METADATA_PREFIX) + VIRTUAL_METADATA_PREFIX.length);
     } else {
       return undefined;
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index a0717a3259..0ef8d753e0 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -182,11 +182,11 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   }
 
   /**
-   * When any key is pressed (except for the Enter button) the query input should move to the input field
+   * When any key is pressed (except for the Enter & Tab button) the query input should move to the input field
    * @param {KeyboardEvent} event The keyboard event
    */
   onKeydown(event: KeyboardEvent) {
-    if (event.key !== 'Enter') {
+    if (event.key !== 'Enter' && event.key !== 'Tab') {
       this.queryInput.nativeElement.focus();
     }
   }

From 9c843b62d463a3206c01738c348c4487b919835d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 16:35:45 +0100
Subject: [PATCH 0903/1286] 120109: Fixed BaseDataService not emitting when the
 request is too fast and the ResponsePending are not emitted

(cherry picked from commit 0f4d71eb58d63c9c73af2e098126437da0f266c4)
---
 .../core/data/base/base-data.service.spec.ts  | 96 +++++++++++++------
 src/app/core/data/base/base-data.service.ts   |  6 +-
 2 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 3f44ad5e5a..fc3704bce5 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -65,6 +65,7 @@ describe('BaseDataService', () => {
   let selfLink;
   let linksToFollow;
   let testScheduler;
+  let remoteDataTimestamp: number;
   let remoteDataMocks: { [responseType: string]: RemoteData<any> };
   let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
 
@@ -85,7 +86,9 @@ describe('BaseDataService', () => {
       expect(actual).toEqual(expected);
     });
 
-    const timeStamp = new Date().getTime();
+    // The response's lastUpdated equals the time of 60 seconds after the test started, ensuring they are not perceived
+    // as cached values.
+    remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
     const payload = {
       foo: 'bar',
@@ -112,22 +115,22 @@ describe('BaseDataService', () => {
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
     remoteDataPageMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
 
     return new TestService(
@@ -361,11 +364,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
+        // Old cached value from 1 minute before the test started
+        const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+          timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+          lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+        } as RemoteData<any>);
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -383,6 +390,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
@@ -411,17 +434,12 @@ describe('BaseDataService', () => {
     it('should link all the followLinks of a cached object by calling addDependency', () => {
       spyOn(objectCache, 'addDependency').and.callThrough();
       testScheduler.run(({ cold, expectObservable, flush }) => {
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d', {
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', {
           a: remoteDataMocks.Success,
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
         }));
-        const expected = '--b-c-d';
+        const expected = 'a';
         const values = {
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
+          a: remoteDataMocks.Success,
         };
 
         expectObservable(service.findByHref(selfLink, false, false, ...linksToFollow)).toBe(expected, values);
@@ -570,11 +588,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
         testScheduler.run(({ cold, expectObservable }) => {
+          // Old cached value from 1 minute before the test started
+          const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+            timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+            lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+          } as RemoteData<any>);
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataPageMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataPageMocks.RequestPending,
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
@@ -592,6 +614,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b', {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index d09ee21ee0..979379e95b 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -285,6 +285,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<T>> = this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
@@ -292,7 +293,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -338,6 +339,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<PaginatedList<T>>> = this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
@@ -345,7 +347,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );

From c9ba47b9afa030dba3d572009780f67f1355fc0b Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:14:12 +0100
Subject: [PATCH 0904/1286] 120109: Fixed "no elements in sequence" sometimes
 being thrown on the item bitstream & relationship tabs

(cherry picked from commit decacec40437e891c672d1842598dfabd55f204a)
---
 .../abstract-item-update/abstract-item-update.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 1e963a5cca..254c44ad46 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -16,9 +16,9 @@ import {
   Subscription,
 } from 'rxjs';
 import {
-  first,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
@@ -102,7 +102,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     super.ngOnInit();
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.hasChanges().pipe(first()).subscribe((hasChanges) => {
+    this.hasChanges().pipe(take(1)).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
       } else {
@@ -187,7 +187,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   private checkLastModified() {
     const currentVersion = this.item.lastModified;
-    this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
+    this.objectUpdatesService.getLastModified(this.url).pipe(take(1)).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));

From 970544c130042e27b46ec078f479a1326daba84e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:45:16 +0100
Subject: [PATCH 0905/1286] 120109: Updated the route configuration to only
 resolve the dsoEditMenuResolver on pages who use the DsoEditMenuComponent

(cherry picked from commit 5c9f494f7692ae7d664cf89d970c330528878abe)
---
 cypress/e2e/item-edit.cy.ts                               | 5 -----
 src/app/browse-by/browse-by-page-routes.ts                | 2 --
 src/app/collection-page/collection-page-routes.ts         | 4 +++-
 src/app/community-page/community-page-routes.ts           | 4 +++-
 src/app/item-page/item-page-routes.ts                     | 7 ++++++-
 src/app/shared/dso-page/dso-edit-menu-resolver.service.ts | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 45131baace..604aab9d04 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,11 +9,6 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-
-  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
-  // This because the edit item page causes often tests to fails due to timeout.
-  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
-  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {
diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts
index 9c7e16ab39..3843a50f6e 100644
--- a/src/app/browse-by/browse-by-page-routes.ts
+++ b/src/app/browse-by/browse-by-page-routes.ts
@@ -1,6 +1,5 @@
 import { Route } from '@angular/router';
 
-import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { browseByGuard } from './browse-by-guard';
 import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
@@ -11,7 +10,6 @@ export const ROUTES: Route[] = [
     path: '',
     resolve: {
       breadcrumb: browseByDSOBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     children: [
       {
diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts
index f2dadc3fbe..e20e3ba8af 100644
--- a/src/app/collection-page/collection-page-routes.ts
+++ b/src/app/collection-page/collection-page-routes.ts
@@ -54,7 +54,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: collectionPageResolver,
       breadcrumb: collectionBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -83,6 +82,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCollectionPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts
index d9505c53b1..2c8a7942a4 100644
--- a/src/app/community-page/community-page-routes.ts
+++ b/src/app/community-page/community-page-routes.ts
@@ -51,7 +51,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: communityPageResolver,
       breadcrumb: communityBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -70,6 +69,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCommunityPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts
index 684ea56459..854d66fabe 100644
--- a/src/app/item-page/item-page-routes.ts
+++ b/src/app/item-page/item-page-routes.ts
@@ -27,7 +27,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: itemPageResolver,
       breadcrumb: itemBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -35,10 +34,16 @@ export const ROUTES: Route[] = [
         path: '',
         component: ThemedItemPageComponent,
         pathMatch: 'full',
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: 'full',
         component: ThemedFullItemPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: ITEM_EDIT_PATH,
diff --git a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
index e6bbeac619..8c4fd15b7e 100644
--- a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
+++ b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
@@ -155,7 +155,7 @@ export class DSOEditMenuResolverService  {
         this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
         this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
         this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
-        this.correctionTypeDataService.findByItem(dso.uuid, false).pipe(
+        this.correctionTypeDataService.findByItem(dso.uuid, true).pipe(
           getFirstCompletedRemoteData(),
           getRemoteDataPayload()),
       ]).pipe(

From 987ea5104adda0f7887a4fef710a11b6fa165989 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 16:35:45 +0100
Subject: [PATCH 0906/1286] 120109: Fixed BaseDataService not emitting when the
 request is too fast and the ResponsePending are not emitted

(cherry picked from commit 0f4d71eb58d63c9c73af2e098126437da0f266c4)
---
 .../core/data/base/base-data.service.spec.ts  | 69 +++++++++++++++----
 src/app/core/data/base/base-data.service.ts   |  6 +-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 098f075c10..9ec31b376e 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -50,6 +50,7 @@ describe('BaseDataService', () => {
   let selfLink;
   let linksToFollow;
   let testScheduler;
+  let remoteDataTimestamp: number;
   let remoteDataMocks;
 
   function initTestService(): TestService {
@@ -86,19 +87,21 @@ describe('BaseDataService', () => {
       expect(actual).toEqual(expected);
     });
 
-    const timeStamp = new Date().getTime();
+    // The response's lastUpdated equals the time of 60 seconds after the test started, ensuring they are not perceived
+    // as cached values.
+    remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
     const payload = { foo: 'bar' };
     const statusCodeSuccess = 200;
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
 
     return new TestService(
@@ -330,11 +333,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
+        // Old cached value from 1 minute before the test started
+        const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataMocks.Success, {
+          timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+          lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+        } as RemoteData<any>);
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -352,6 +359,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
@@ -514,11 +537,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
         testScheduler.run(({ cold, expectObservable }) => {
+          // Old cached value from 1 minute before the test started
+          const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataMocks.Success, {
+            timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+            lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+          } as RemoteData<any>);
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -536,6 +563,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index edd6d9e2a4..18131dea63 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -266,6 +266,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     return this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
@@ -273,7 +274,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -300,6 +301,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     return this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
@@ -307,7 +309,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => useCachedVersionIfAvailable ? rd.isStale : rd.hasCompleted),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );

From 91acc957b13675ab8c1fdab141579b8794afd2d2 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:14:12 +0100
Subject: [PATCH 0907/1286] 120109: Fixed "no elements in sequence" sometimes
 being thrown on the item bitstream & relationship tabs

(cherry picked from commit decacec40437e891c672d1842598dfabd55f204a)
---
 .../abstract-item-update/abstract-item-update.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 80002f614b..3745b972d6 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -6,7 +6,7 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u
 import { ActivatedRoute, Router, Data } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { first, map, switchMap, tap } from 'rxjs/operators';
+import { take, map, switchMap, tap } from 'rxjs/operators';
 import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 import { environment } from '../../../../environments/environment';
@@ -85,7 +85,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     if (this.url.indexOf('?') > 0) {
       this.url = this.url.substr(0, this.url.indexOf('?'));
     }
-    this.hasChanges().pipe(first()).subscribe((hasChanges) => {
+    this.hasChanges().pipe(take(1)).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
       } else {
@@ -170,7 +170,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   private checkLastModified() {
     const currentVersion = this.item.lastModified;
-    this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
+    this.objectUpdatesService.getLastModified(this.url).pipe(take(1)).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));

From ce17d23c08c2e5eef9f318c4095e95abbe626108 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 19 Nov 2024 18:45:16 +0100
Subject: [PATCH 0908/1286] 120109: Updated the route configuration to only
 resolve the dsoEditMenuResolver on pages who use the DsoEditMenuComponent

(cherry picked from commit 5c9f494f7692ae7d664cf89d970c330528878abe)
---
 src/app/collection-page/collection-page-routing.module.ts | 4 +++-
 src/app/community-page/community-page-routing.module.ts   | 4 +++-
 src/app/item-page/item-page-routing.module.ts             | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 9dc25b778e..6d07c467e6 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -36,7 +36,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         resolve: {
           dso: CollectionPageResolver,
           breadcrumb: CollectionBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -66,6 +65,9 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedCollectionPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+            },
           }
         ],
         data: {
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
index c37f8832f8..6412eb9f8e 100644
--- a/src/app/community-page/community-page-routing.module.ts
+++ b/src/app/community-page/community-page-routing.module.ts
@@ -29,7 +29,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         resolve: {
           dso: CommunityPageResolver,
           breadcrumb: CommunityBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -49,6 +48,9 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedCommunityPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+            },
           }
         ],
         data: {
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index 0c855ab34d..5fb11f7056 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -28,7 +28,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         resolve: {
           dso: ItemPageResolver,
           breadcrumb: ItemBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -36,10 +35,16 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
             path: '',
             component: ThemedItemPageComponent,
             pathMatch: 'full',
+            resolve: {
+              menu: DSOEditMenuResolver,
+            },
           },
           {
             path: 'full',
             component: ThemedFullItemPageComponent,
+            resolve: {
+              menu: DSOEditMenuResolver,
+            },
           },
           {
             path: ITEM_EDIT_PATH,

From b5a8b564730a68b382eaa4951c8fea89eb479c7a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 18:33:01 +0100
Subject: [PATCH 0909/1286] 117287: Prevent /api/eperson/epersons/undefined
 from being fired on the create ePerson page

(cherry picked from commit 0cb5b76159ce41b8b15192010ff7c89ab9911d21)
---
 .../eperson-form/eperson-form.component.ts                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 97a0a13727..9526725200 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -223,9 +223,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-    this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
-      this.epersonService.editEPerson(ePersonRD.payload);
-    }));
+    if (this.route.snapshot.params.id) {
+      this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+        this.epersonService.editEPerson(ePersonRD.payload);
+      }));
+    }
     this.firstName = new DynamicInputModel({
       id: 'firstName',
       label: this.translateService.instant(`${this.messagePrefix}.firstName`),

From 830ada37f5ce502cea50a7772779d657cd4d0b3d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 6 Nov 2024 14:07:58 +0100
Subject: [PATCH 0910/1286] 119915: Restored functionality to hide the research
 profile section on the profile page

(cherry picked from commit ded0079f24e0f6670f357e545e9ff14219aa4913)
---
 src/app/profile-page/profile-page.component.html    | 2 +-
 src/app/profile-page/profile-page.component.spec.ts | 6 +++---
 src/app/profile-page/profile-page.component.ts      | 7 -------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 331c360054..e2769b38ec 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
     <h1>{{'profile.title' | translate}}</h1>
-    <ng-container>
+    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 709ed56790..ec07cddd9d 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -320,7 +320,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return true', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: true
         });
@@ -336,7 +336,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false
         });
@@ -352,7 +352,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false
         });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index d49bdedb83..6e693461d2 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -192,13 +192,6 @@ export class ProfilePageComponent implements OnInit {
     this.updateProfile();
   }
 
-  /**
-   * Returns true if the researcher profile feature is enabled, false otherwise.
-   */
-  isResearcherProfileEnabled(): Observable<boolean> {
-    return this.isResearcherProfileEnabled$.asObservable();
-  }
-
   /**
    * Returns an error message from a password validation request with a specific reason or
    * a default message without specific reason.

From 71de4b600b8ed268cbc88a1191f6c2f931e23705 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:34:37 +0100
Subject: [PATCH 0911/1286] fix value of selector in component annotation

---
 .../org-unit-search-result-list-submission-element.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b2e62fcb37..cff764d744 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
@@ -33,7 +33,7 @@ import { OrgUnitInputSuggestionsComponent } from './org-unit-suggestions/org-uni
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
-  selector: 'ds-person-search-result-list-submission-element',
+  selector: 'ds-org-unit-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html',
   standalone: true,

From 394ecea1186c01f4edcf43b1f656a4e55cb56591 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:47:14 +0100
Subject: [PATCH 0912/1286] fix nested span element in templates

---
 .../journal-volume-search-result-list-element.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 4a6ffb412d..b161874fdf 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>

From 84878ede6770d4d9b9417757f738d6371541e79d Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:56:50 +0100
Subject: [PATCH 0913/1286] fix nested span element

---
 .../journal-issue-search-result-list-element.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 59d2ea4dc9..ef99e23256 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -26,12 +26,13 @@
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-issues">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
                     </span>
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
                         <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>
             </span>

From 8509096c320f37fffbc6893e89461d364feb91e5 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:59:56 +0100
Subject: [PATCH 0914/1286] fix nested span element

---
 .../journal/journal-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index bd119493d3..8acdfed9b5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>

From 15d3f257b348fb0d37adbcde64316f2acf62632c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:00:47 +0100
Subject: [PATCH 0915/1286] fix nested span element

---
 .../project/project-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 34d5588c2d..65cf6fa1f8 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->

From 2e174cd9e67037e777608df1db8ce2f5ef13cc14 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:01:37 +0100
Subject: [PATCH 0916/1286] fix nested span element

---
 .../person/person-item-metadata-list-element.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..b78202d0fe 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>

From e9a28c6d3dd94101bc1ff5e06a8d3a08783bc3c3 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:02:43 +0100
Subject: [PATCH 0917/1286] fix nested span element

---
 ...rch-result-list-submission-element.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 66db99a6af..122c8bb59e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>

From 97b5e0cc92420366355c00f5013550ce7715801d Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:05:07 +0100
Subject: [PATCH 0918/1286] fix nested span element

---
 ...-unit-search-result-list-submission-element.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e264958738..1f020d127f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>

From 5ee721f2c4b11c1d25c974d2e7c5880e7b9c45de Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 6 Dec 2024 18:08:57 +0100
Subject: [PATCH 0919/1286] 117287: Embed the communities/collections on the
 EPerson groups

---
 .../epeople-registry/eperson-form/eperson-form.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 296038ca2b..2e13671178 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -279,7 +279,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, {
           currentPage: 1,
           elementsPerPage: this.config.pageSize
-        });
+        }, undefined, undefined, followLink('object'));
       }
       this.formGroup.patchValue({
         firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',

From acb7c9bd33bb678766ab219851999f217f7b81d5 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:09:02 +0100
Subject: [PATCH 0920/1286] remove nested span element

---
 .../journal-issue-search-result-list-element.component.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index ef99e23256..277ece3657 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -31,7 +31,6 @@
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
                     <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                         <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>

From dbd67f056ebff2b5dd62264f8724c64cc11b5d4a Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:12:44 +0100
Subject: [PATCH 0921/1286] fix indentation

---
 ...-search-result-list-element.component.html | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 277ece3657..961cbfd8c4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -22,21 +22,21 @@
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>

From e4b2ebe7aaaa8afe9ca775bde51679fba20fc09c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 6 Dec 2024 23:29:21 +0100
Subject: [PATCH 0922/1286] fix: replace 'any' with specific types

---
 src/app/core/data/base/base-data.service.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 2146ba2475..2d4eceb41b 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -40,7 +40,6 @@ import { ObjectCacheService } from '../../cache/object-cache.service';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
-import { HALResource } from '../../shared/hal-resource.model';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
 import { FindListOptions } from '../find-list-options.model';
@@ -307,9 +306,9 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
       tap((remoteDataObject: RemoteData<T>) => {
         if (hasValue(remoteDataObject?.payload?._links)) {
-          for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
+          for (const followLinkName of Object.keys(remoteDataObject.payload._links) as (keyof typeof remoteDataObject.payload._links)[]) {
             // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
-            const linkDefinition = this.getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+            const linkDefinition: LinkDefinition<T> = getLinkDefinition(remoteDataObject.payload.constructor as GenericConstructor<T>, followLinkName);
             if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
               // followLink can be either an individual HALLink or a HALLink[]
               const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
@@ -364,9 +363,9 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
         if (hasValue(remoteDataObject?.payload?.page)) {
           for (const object of remoteDataObject.payload.page) {
             if (hasValue(object?._links)) {
-              for (const followLinkName of Object.keys(object._links)) {
+              for (const followLinkName of Object.keys(object._links) as (keyof typeof object._links)[]) {
                 // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
-                const linkDefinition = this.getLinkDefinition((remoteDataObject.payload as any).constructor, followLinkName);
+                const linkDefinition: LinkDefinition<PaginatedList<T>> = getLinkDefinition(remoteDataObject.payload.constructor as GenericConstructor<PaginatedList<T>>, followLinkName);
                 if (linkDefinition?.propertyName && followLinkName !== 'self' && hasValue(object[linkDefinition.propertyName])) {
                   // followLink can be either an individual HALLink or a HALLink[]
                   const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
@@ -522,9 +521,4 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     return done$;
   }
-
-  getLinkDefinition<D extends HALResource>(source: GenericConstructor<D>, linkName: keyof D['_links']): LinkDefinition<D> {
-    return getLinkDefinition(source, linkName);
-  }
-
 }

From 7ca4d8f2b13b68cbcedddae5d212caf8f00247f7 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 7 Dec 2024 02:21:41 +0100
Subject: [PATCH 0923/1286] fix: ensure findListByHref correctly calls
 addDependency

---
 .../core/data/base/base-data.service.spec.ts  | 54 ++++++++++++-------
 src/app/core/data/base/base-data.service.ts   |  2 +-
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index b17e024a54..6f32395667 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -5,6 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
+// eslint-disable-next-line max-classes-per-file
 import {
   fakeAsync,
   tick,
@@ -26,14 +27,20 @@ import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-ser
 import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { LinkDefinition } from '../../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { BITSTREAM } from '../../shared/bitstream.resource-type';
+import { COLLECTION } from '../../shared/collection.resource-type';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
-import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
 import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
@@ -58,6 +65,25 @@ class TestService extends BaseDataService<any> {
   }
 }
 
+@typedObject
+class BaseData {
+  static type = new ResourceType('test');
+
+  foo: string;
+
+  _links: {
+    followLink1: HALLink;
+    followLink2: HALLink[];
+    self: HALLink;
+  };
+
+  @link(COLLECTION)
+  followLink1: Observable<any>;
+
+  @link(BITSTREAM, true, 'followLink2')
+  followLink2CustomVariableName: Observable<PaginatedList<any>>;
+}
+
 describe('BaseDataService', () => {
   let service: TestService;
   let requestService;
@@ -68,8 +94,8 @@ describe('BaseDataService', () => {
   let linksToFollow;
   let testScheduler;
   let remoteDataTimestamp: number;
-  let remoteDataMocks: { [responseType: string]: RemoteData<any> };
-  let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
+  let remoteDataMocks: { [responseType: string]: RemoteData<BaseData> };
+  let remoteDataPageMocks: { [responseType: string]: RemoteData<PaginatedList<BaseData>> };
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
@@ -92,10 +118,10 @@ describe('BaseDataService', () => {
     // as cached values.
     remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
-    const payload = {
+    const payload: BaseData = Object.assign(new BaseData(), {
       foo: 'bar',
-      followLink1: {},
-      followLink2: {},
+      followLink1: observableOf({}),
+      followLink2CustomVariableName: observableOf(createPaginatedList()),
       _links: {
         self: Object.assign(new HALLink(), {
           href: 'self-test-link',
@@ -112,7 +138,7 @@ describe('BaseDataService', () => {
           }),
         ],
       },
-    };
+    });
     const statusCodeSuccess = 200;
     const statusCodeError = 404;
     const errorMessage = 'not found';
@@ -439,11 +465,6 @@ describe('BaseDataService', () => {
         spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', {
           a: remoteDataMocks.Success,
         }));
-        spyOn(service, 'getLinkDefinition').and.callFake((source, linkName) => {
-          return {
-            propertyName: linkName,
-          } as any as LinkDefinition<HALResource>;
-        });
         const expected = 'a';
         const values = {
           a: remoteDataMocks.Success,
@@ -670,19 +691,16 @@ describe('BaseDataService', () => {
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
           }));
-          spyOn(service, 'getLinkDefinition').and.callFake((source, linkName) => {
-            return {
-              propertyName: linkName,
-            } as any as LinkDefinition<HALResource>;
-          });
           const expected = '--b-c-d';
           const values = {
             b: remoteDataPageMocks.RequestPending,
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
           };
+
           expectObservable(service.findListByHref(selfLink, findListOptions, false, false, ...linksToFollow)).toBe(expected, values);
           flush();
+          expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
         });
       });
     });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 2d4eceb41b..df4e9b7a48 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -365,7 +365,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
             if (hasValue(object?._links)) {
               for (const followLinkName of Object.keys(object._links) as (keyof typeof object._links)[]) {
                 // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
-                const linkDefinition: LinkDefinition<PaginatedList<T>> = getLinkDefinition(remoteDataObject.payload.constructor as GenericConstructor<PaginatedList<T>>, followLinkName);
+                const linkDefinition: LinkDefinition<PaginatedList<T>> = getLinkDefinition(object.constructor as GenericConstructor<PaginatedList<T>>, followLinkName);
                 if (linkDefinition?.propertyName && followLinkName !== 'self' && hasValue(object[linkDefinition.propertyName])) {
                   // followLink can be either an individual HALLink or a HALLink[]
                   const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);

From 297fc018922b213cc41e645e444562b562284719 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 02:29:01 +0000
Subject: [PATCH 0924/1286] Bump axios from 1.7.7 to 1.7.9

Bumps [axios](https://github.com/axios/axios) from 1.7.7 to 1.7.9.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.7...v1.7.9)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 f8f725fafc..fe1adc036e 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.1",
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index 0106427952..8064831647 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3416,10 +3416,10 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.7.7:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
-  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
+axios@^1.7.9:
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
+  integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

From 838ffc5b6d63adb3093426b01051800f7e41f616 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 02:55:53 +0000
Subject: [PATCH 0925/1286] Bump axios from 1.7.7 to 1.7.9

Bumps [axios](https://github.com/axios/axios) from 1.7.7 to 1.7.9.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.7...v1.7.9)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 afa9988b15..36372dcc25 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.7.4",
+    "axios": "^1.7.9",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index 110451dba6..faeaaf101a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3709,10 +3709,10 @@ axe-core@^4.10.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
   integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
-axios@^1.7.4:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
-  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
+axios@^1.7.9:
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
+  integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"

From 1a48a6c853d95699403d5a3f2de23cd1704e4e13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 02:56:11 +0000
Subject: [PATCH 0926/1286] Bump axios from 1.7.7 to 1.7.9

Bumps [axios](https://github.com/axios/axios) from 1.7.7 to 1.7.9.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.7...v1.7.9)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 79455f7256..e902d8318f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "@ngx-translate/core": "^14.0.0",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
-        "axios": "^1.7.4",
+        "axios": "^1.7.9",
         "bootstrap": "^4.6.1",
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
@@ -8369,10 +8369,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
-      "license": "MIT",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index 206b025da3..d0862de2cd 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.7.4",
+    "axios": "^1.7.9",
     "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",

From c67dc4d8e4d276a56e6700160a7c503f58f33bcd Mon Sep 17 00:00:00 2001
From: nwoodward <woodward.nicholas@gmail.com>
Date: Mon, 9 Dec 2024 11:27:00 -0600
Subject: [PATCH 0927/1286] fixed typo in descrption

---
 src/assets/i18n/en.json5    | 4 ++--
 src/assets/i18n/pt-BR.json5 | 8 ++++----
 src/assets/i18n/pt-PT.json5 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 532fc849ff..beaab27336 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1034,11 +1034,11 @@
 
   "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
 
-  "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
 
   "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
 
-  "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
 
   "browse.metadata.title.breadcrumbs": "Browse by Title",
 
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 951f988093..2b7d028b92 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1547,14 +1547,14 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Navegue por Categoria de Assunto",
 
-  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
-  "browse.metadata.srsc.tree.descrption": "Selecione um assunto para adicionar como filtro de pesquisa",
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Selecione um assunto para adicionar como filtro de pesquisa",
 
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Navegue pelo Índice de Ciência Norueguês",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecione um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecione um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 2db0996707..7a3d326eca 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1568,8 +1568,8 @@
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecionar um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecionar um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",

From 5dcc90c1cd84b234f7b538d5e58bbd5bd29cd0d2 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 17:36:33 +0100
Subject: [PATCH 0928/1286] 117287: Fixed UI freezing on withdrawn item pages

(cherry picked from commit 976ac7604be2458c31f92b6af05e94df453a74ea)
---
 .../alerts/item-alerts.component.html         |  2 +-
 .../alerts/item-alerts.component.spec.ts      |  2 +-
 .../item-page/alerts/item-alerts.component.ts | 27 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index f6304340f3..b964327e39 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -8,7 +8,7 @@
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
                 <div class="gap-2 d-flex">
                   <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
-                  <a *ngIf="showReinstateButton$() | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+                  <a *ngIf="showReinstateButton$ | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
                 </div>
             </div>
         </ds-alert>
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
index d2541f9d0d..ef788c47ec 100644
--- a/src/app/item-page/alerts/item-alerts.component.spec.ts
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -161,7 +161,7 @@ describe('ItemAlertsComponent', () => {
         (authorizationService.isAuthorized).and.returnValue(isAdmin$);
         (correctionTypeDataService.findByItem).and.returnValue(correction$);
 
-        expectObservable(component.showReinstateButton$()).toBe(expectedMarble, expectedValues);
+        expectObservable(component.shouldShowReinstateButton()).toBe(expectedMarble, expectedValues);
       });
     });
 
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index 1984de0324..bcf940e69d 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -5,6 +5,8 @@ import {
 import {
   Component,
   Input,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -45,12 +47,17 @@ import {
 /**
  * Component displaying alerts for an item
  */
-export class ItemAlertsComponent {
+export class ItemAlertsComponent implements OnChanges {
   /**
    * The Item to display alerts for
    */
   @Input() item: Item;
 
+  /**
+   * Whether the reinstate button should be shown
+   */
+  showReinstateButton$: Observable<boolean>;
+
   /**
    * The AlertType enumeration
    * @type {AlertType}
@@ -58,18 +65,24 @@ export class ItemAlertsComponent {
   public AlertTypeEnum = AlertType;
 
   constructor(
-    private authService: AuthorizationDataService,
-    private dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
-    private correctionTypeDataService: CorrectionTypeDataService,
+    protected authService: AuthorizationDataService,
+    protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    protected correctionTypeDataService: CorrectionTypeDataService,
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item?.currentValue.withdrawn && this.showReinstateButton$) {
+      this.showReinstateButton$ = this.shouldShowReinstateButton();
+    }
+  }
+
   /**
    * Determines whether to show the reinstate button.
    * The button is shown if the user is not an admin and the item has a reinstate request.
    * @returns An Observable that emits a boolean value indicating whether to show the reinstate button.
    */
-  showReinstateButton$(): Observable<boolean>  {
+  shouldShowReinstateButton(): Observable<boolean>  {
     const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe(
       getFirstCompletedRemoteData(),
       map((correctionTypeRD: RemoteData<PaginatedList<CorrectionType>>) => correctionTypeRD.hasSucceeded ? correctionTypeRD.payload.page : []),
@@ -78,8 +91,8 @@ export class ItemAlertsComponent {
     return combineLatest([isAdmin$, correction$]).pipe(
       map(([isAdmin, correction]) => {
         return !isAdmin && correction.some((correctionType) => correctionType.topic === REQUEST_REINSTATE);
-      },
-      ));
+      }),
+    );
   }
 
   /**

From d740b5df6b2b2e8e42f3f562095ed01f506d7d93 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 29 Oct 2024 18:33:01 +0100
Subject: [PATCH 0929/1286] 117287: Prevent /api/eperson/epersons/undefined
 from being fired on the create ePerson page

(cherry picked from commit 0cb5b76159ce41b8b15192010ff7c89ab9911d21)
---
 .../eperson-form/eperson-form.component.ts                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 315138b583..942481c4fd 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -278,9 +278,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-    this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
-      this.epersonService.editEPerson(ePersonRD.payload);
-    }));
+    if (this.route.snapshot.params.id) {
+      this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+        this.epersonService.editEPerson(ePersonRD.payload);
+      }));
+    }
     this.firstName = new DynamicInputModel({
       id: 'firstName',
       label: this.translateService.instant(`${this.messagePrefix}.firstName`),

From 5ff475046f3c9617dc2a10c72998488890de548f Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 6 Nov 2024 14:07:58 +0100
Subject: [PATCH 0930/1286] 119915: Restored functionality to hide the research
 profile section on the profile page

(cherry picked from commit ded0079f24e0f6670f357e545e9ff14219aa4913)
---
 src/app/profile-page/profile-page.component.html    | 2 +-
 src/app/profile-page/profile-page.component.spec.ts | 6 +++---
 src/app/profile-page/profile-page.component.ts      | 7 -------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index b5703c47a3..3dc7c9d489 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngVar="(user$ | async) as user">
   <div class="container" *ngIf="user">
     <h1>{{'profile.title' | translate}}</h1>
-    <ng-container>
+    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 810cf63389..82a0a9d67b 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -369,7 +369,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return true', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: true,
         });
@@ -385,7 +385,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false,
         });
@@ -401,7 +401,7 @@ describe('ProfilePageComponent', () => {
       });
 
       it('should return false', () => {
-        const result = component.isResearcherProfileEnabled();
+        const result = component.isResearcherProfileEnabled$;
         const expected = cold('a', {
           a: false,
         });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index afa89360b2..75760105e0 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -235,13 +235,6 @@ export class ProfilePageComponent implements OnInit {
     this.updateProfile();
   }
 
-  /**
-   * Returns true if the researcher profile feature is enabled, false otherwise.
-   */
-  isResearcherProfileEnabled(): Observable<boolean> {
-    return this.isResearcherProfileEnabled$.asObservable();
-  }
-
   /**
    * Returns an error message from a password validation request with a specific reason or
    * a default message without specific reason.

From 5a88cedc22e2f8a3264d03795ccf3cb718d52962 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 11 Dec 2024 11:17:01 +0100
Subject: [PATCH 0931/1286] 118223: Remove console.log

---
 .../edit-item-page/item-bitstreams/item-bitstreams.service.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
index 9bbf380487..bc771971d3 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -318,7 +318,6 @@ export class ItemBitstreamsService {
       switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
       take(1),
     ).subscribe(() => {
-      console.log('got here!');
       this.isPerformingMoveRequest.next(false);
       finish?.();
     });

From 8572bfb1b1d1b053547047344e92bdae753ee44e Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 11 Dec 2024 13:07:48 -0300
Subject: [PATCH 0932/1286] Addition of unit tests for the getLinkAttributes()
 method

---
 .../metadata-values.component.spec.ts            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 8e93175c46..5670128733 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -83,4 +83,20 @@ describe('MetadataValuesComponent', () => {
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
+  it('should return correct target and rel for internal links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(true);
+    const urlValue = '/internal-link';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_self');
+    expect(result.rel).toBe('');
+  });
+
+  it('should return correct target and rel for external links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(false);
+    const urlValue = 'https://www.dspace.org';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_blank');
+    expect(result.rel).toBe('noopener noreferrer');
+  });
+
 });

From 494771c0da9ef1a8752080df9d4960bfe68b6267 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 13:34:09 +0000
Subject: [PATCH 0933/1286] Bump nanoid from 3.3.7 to 3.3.8

Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

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

diff --git a/package-lock.json b/package-lock.json
index 79455f7256..cd8ef437e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16776,9 +16776,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",

From 4575c3d7afd15d433a023e209b7bcb5e776e2adb Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:06:50 -0600
Subject: [PATCH 0934/1286] Use fully qualified image names in Dockerfiles.
 Minor syntax fixes to ENV variables

---
 Dockerfile      | 4 ++--
 Dockerfile.dist | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd29d762f8..a2a7841396 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:18-alpine
+FROM docker.io/node:18-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -22,5 +22,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV development
+ENV NODE_ENV=development
 CMD npm run serve -- --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index cb6e1bbd30..9bb7b1519b 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
-FROM node:18-alpine AS build
+FROM docker.io/node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
 WORKDIR /app
 USER node
-ENV NODE_ENV production
+ENV NODE_ENV=production
 EXPOSE 4000
 CMD pm2-runtime start dspace-ui.json --json

From 0d516bfe9c706ec10ed9ebe9a936210999232912 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:12:01 -0600
Subject: [PATCH 0935/1286] Allow for other Docker registries to be used with
 all Docker compose scripts

---
 docker/cli.yml                 | 2 +-
 docker/db.entities.yml         | 2 +-
 docker/docker-compose-ci.yml   | 6 +++---
 docker/docker-compose-dist.yml | 2 +-
 docker/docker-compose-rest.yml | 6 +++---
 docker/docker-compose.yml      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/cli.yml b/docker/cli.yml
index 9b1973426f..bbb9bd5619 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -21,7 +21,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index b3cf5bd86f..c532d15857 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index c5c419a4a7..98825605d3 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,7 +60,7 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
@@ -81,7 +81,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 67eba16785..5b06faa6a2 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 09dfcf2a5f..e650f09eb5 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -68,7 +68,7 @@ services:
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -85,7 +85,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1c268b84b7..b13ab505f1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}"
     build:
       context: ..
       dockerfile: Dockerfile

From bad57def74b6ade16b4a1fb164d14394c5bc6618 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:15:52 -0600
Subject: [PATCH 0936/1286] Update GitHub Actions for Docker & normal build to
 use GitHub Container Registry

---
 .github/workflows/build.yml  | 3 +++
 .github/workflows/docker.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b26f5a7c06..a4fd83c375 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,6 +35,9 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d0b4cd0939..41b5f2e002 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,6 +17,7 @@ on:
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)
+  packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
   #############################################################

From dab6b1c12e3dd0f960145dde230fd6d6108af58e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 15:09:13 -0600
Subject: [PATCH 0937/1286] Login to GHCR in order to have access to private
 Docker images for e2e tests.

---
 .github/workflows/build.yml  | 11 ++++++++++-
 .github/workflows/docker.yml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4fd83c375..ab03cb3885 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -117,6 +118,14 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 41b5f2e002..bae8c01300 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ on:
   pull_request:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
   packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:

From 969eef91509e750e88afb8cace2434d7c0a43101 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:06:50 -0600
Subject: [PATCH 0938/1286] Use fully qualified image names in Dockerfiles.
 Minor syntax fixes to ENV variables

---
 Dockerfile      | 4 ++--
 Dockerfile.dist | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8fac7495e1..e395e4b90e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:18-alpine
+FROM docker.io/node:18-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -24,5 +24,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV development
+ENV NODE_ENV=development
 CMD yarn serve --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 98e2e32ab5..be72de4afc 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
 
-FROM node:18-alpine AS build
+FROM docker.io/node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
 WORKDIR /app
 USER node
-ENV NODE_ENV production
+ENV NODE_ENV=production
 EXPOSE 4000
 CMD pm2-runtime start dspace-ui.json --json

From a027bb2d5d23bbd198a2a204eb06daf9c548292b Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:12:01 -0600
Subject: [PATCH 0939/1286] Allow for other Docker registries to be used with
 all Docker compose scripts

---
 docker/cli.yml                 | 2 +-
 docker/db.entities.yml         | 2 +-
 docker/docker-compose-ci.yml   | 6 +++---
 docker/docker-compose-dist.yml | 2 +-
 docker/docker-compose-rest.yml | 6 +++---
 docker/docker-compose.yml      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/cli.yml b/docker/cli.yml
index 93fb0f5ee2..7c17b14b1b 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -21,7 +21,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-8_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index 17414eb992..464253f07b 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 6ff2a509c9..d2589bb3f3 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,7 +60,7 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
@@ -82,7 +82,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index de28699c01..03e5e9da70 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-8_x}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index a35bfdfd09..37a5d23e77 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-8_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -68,7 +68,7 @@ services:
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-8_x}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -85,7 +85,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-8_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e98f6f9599..8e85520f9f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-dspace-8_x}
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-8_x}"
     build:
       context: ..
       dockerfile: Dockerfile

From ffda455d4f9010af9048694186c640ab6a487b99 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:15:52 -0600
Subject: [PATCH 0940/1286] Update GitHub Actions for Docker & normal build to
 use GitHub Container Registry

---
 .github/workflows/build.yml  | 3 +++
 .github/workflows/docker.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f2a84ce8a..20c6b8bf94 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,6 +35,9 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d0b4cd0939..41b5f2e002 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,6 +17,7 @@ on:
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)
+  packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
   #############################################################

From c9800e7bffe911284505d32c5ac9f6d83bd70242 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 15:09:13 -0600
Subject: [PATCH 0941/1286] Login to GHCR in order to have access to private
 Docker images for e2e tests.

---
 .github/workflows/build.yml  | 11 ++++++++++-
 .github/workflows/docker.yml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20c6b8bf94..20791be6f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -117,6 +118,14 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 41b5f2e002..bae8c01300 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ on:
   pull_request:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
   packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:

From c9d6c9556337c4875cfa5d83ede37f0e720d910a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:06:50 -0600
Subject: [PATCH 0942/1286] Use fully qualified image names in Dockerfiles.
 Minor syntax fixes to ENV variables

---
 Dockerfile      | 4 ++--
 Dockerfile.dist | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8fac7495e1..e395e4b90e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:18-alpine
+FROM docker.io/node:18-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -24,5 +24,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV development
+ENV NODE_ENV=development
 CMD yarn serve --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index 641c765cf2..c3ea539e04 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-7_x-dist .
 
-FROM node:18-alpine AS build
+FROM docker.io/node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
 WORKDIR /app
 USER node
-ENV NODE_ENV production
+ENV NODE_ENV=production
 EXPOSE 4000
 CMD pm2-runtime start dspace-ui.json --json

From 996c877412a15483313bd7ae9f3c7f125a36f570 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:12:01 -0600
Subject: [PATCH 0943/1286] Allow for other Docker registries to be used with
 all Docker compose scripts

---
 docker/cli.yml                 | 2 +-
 docker/db.entities.yml         | 2 +-
 docker/docker-compose-ci.yml   | 6 +++---
 docker/docker-compose-dist.yml | 2 +-
 docker/docker-compose-rest.yml | 6 +++---
 docker/docker-compose.yml      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/cli.yml b/docker/cli.yml
index 890fbde956..11fe2ee662 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -21,7 +21,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index 5c0a15c8f6..26d848e022 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+    image: ${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}-loadsql
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index 9431a02a87..e09d88b472 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,7 +60,7 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x-loadsql}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
@@ -81,7 +81,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 1f4d2d7f5e..88e5be16a5 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: demo.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x-dist
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-7_x}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 37bccee364..19d4d3c604 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
     depends_on:
     - dspacedb
     networks:
@@ -67,7 +67,7 @@ services:
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -84,7 +84,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8bce9548ab..90a1d0c21c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-dspace-7_x}"
     build:
       context: ..
       dockerfile: Dockerfile

From 686b61915a39c53880af0c75c6e2fae72c90d094 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 14:15:52 -0600
Subject: [PATCH 0944/1286] Update GitHub Actions for Docker & normal build to
 use GitHub Container Registry

---
 .github/workflows/build.yml  | 3 +++
 .github/workflows/docker.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6ffa5e004..d0a03cf413 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,6 +35,9 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index db42a36d3b..6b299ba6f1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,6 +17,7 @@ on:
 
 permissions:
   contents: read  #  to fetch code (actions/checkout)
+  packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
   #############################################################

From cd500007b66b239322918beaedcea028491ea13f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 16 Dec 2024 15:09:13 -0600
Subject: [PATCH 0945/1286] Login to GHCR in order to have access to private
 Docker images for e2e tests.

---
 .github/workflows/build.yml  | 11 ++++++++++-
 .github/workflows/docker.yml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d0a03cf413..bb641bea1e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -111,6 +112,14 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6b299ba6f1..c9671bcac0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ on:
   pull_request:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
   packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:

From 253b2e84d18d55eca4481d479274c54916e96cd4 Mon Sep 17 00:00:00 2001
From: Giuseppe <giuseppe.digilio@gmail.com>
Date: Wed, 18 Dec 2024 21:13:44 +0100
Subject: [PATCH 0946/1286] Fix issue with submission sections visibility
 (#3276)

* Removing position-fixed bootstrap class so that navbar links are available again

(cherry picked from commit 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9)

* A new approach so that the elements of the ds-file-dropzone-no-uploader component don't overlap the navbar and make it inaccessible

(cherry picked from commit 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d)

* [DURACOM-291] fix submission section visibility in order to rely on the configured section scope

* Removing position-fixed bootstrap class so that navbar links are available again

(cherry picked from commit 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9)

* A new approach so that the elements of the ds-file-dropzone-no-uploader component don't overlap the navbar and make it inaccessible

(cherry picked from commit 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d)

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
---
 .../models/config-submission-section.model.ts |  22 +-
 .../form/submission-form.component.ts         |   8 +-
 .../objects/section-visibility.model.ts       |   6 +
 .../objects/submission-objects.actions.ts     |  11 +-
 .../submission-objects.effects.spec.ts        |   1 +
 .../objects/submission-objects.effects.ts     |   1 +
 .../submission-objects.reducer.spec.ts        |   2 +
 .../objects/submission-objects.reducer.ts     |   1 +
 .../submission-section-object.model.ts        |  10 +-
 .../sections/sections.service.spec.ts         | 293 ++++++++++++++++--
 .../submission/sections/sections.service.ts   |  13 +-
 src/app/submission/submission.service.spec.ts | 239 ++++++++++++--
 src/app/submission/submission.service.ts      |  13 +-
 13 files changed, 534 insertions(+), 86 deletions(-)

diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index feb4fc9cb0..13e19544dc 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -4,20 +4,16 @@ import {
   inheritSerialization,
 } from 'cerialize';
 
+import {
+  SectionScope,
+  SectionVisibility,
+} from '../../../submission/objects/section-visibility.model';
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { SUBMISSION_SECTION_TYPE } from './config-type';
 
-/**
- * An interface that define section visibility and its properties.
- */
-export interface SubmissionSectionVisibility {
-  main: any;
-  other: any;
-}
-
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionSectionModel extends ConfigObject {
@@ -35,6 +31,12 @@ export class SubmissionSectionModel extends ConfigObject {
   @autoserialize
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  @autoserialize
+  scope: SectionScope;
+
   /**
    * A string representing the kind of section object
    */
@@ -42,10 +44,10 @@ export class SubmissionSectionModel extends ConfigObject {
   sectionType: SectionsType;
 
   /**
-   * The [SubmissionSectionVisibility] object for this section
+   * The [SectionVisibility] object for this section
    */
   @autoserialize
-  visibility: SubmissionSectionVisibility;
+  visibility: SectionVisibility;
 
   /**
    * The {@link HALLink}s for this SubmissionSectionModel
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 2e97c2df63..74c262befc 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -22,10 +22,7 @@ import {
 
 import { AuthService } from '../../core/auth/auth.service';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import {
-  SubmissionSectionModel,
-  SubmissionSectionVisibility,
-} from '../../core/config/models/config-submission-section.model';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
 import { Collection } from '../../core/shared/collection.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { Item } from '../../core/shared/item.model';
@@ -38,6 +35,7 @@ import {
 } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { SectionVisibility } from '../objects/section-visibility.model';
 import { SubmissionError } from '../objects/submission-error.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
@@ -233,7 +231,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
   /**
    *  Returns the visibility object of the collection section
    */
-  private getCollectionVisibility(): SubmissionSectionVisibility {
+  private getCollectionVisibility(): SectionVisibility {
     const submissionSectionModel: SubmissionSectionModel =
       this.submissionDefinition.sections.page.find(
         (section) => isEqual(section.sectionType, SectionsType.Collection),
diff --git a/src/app/submission/objects/section-visibility.model.ts b/src/app/submission/objects/section-visibility.model.ts
index c41735178c..16cf16b2ab 100644
--- a/src/app/submission/objects/section-visibility.model.ts
+++ b/src/app/submission/objects/section-visibility.model.ts
@@ -5,3 +5,9 @@ export interface SectionVisibility {
   main: any;
   other: any;
 }
+
+
+export enum SectionScope {
+  Submission = 'SUBMISSION',
+  Workflow = 'WORKFLOW',
+}
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index e075ce5e5b..956c8f9533 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -11,7 +11,10 @@ import {
 } from '../../core/submission/models/workspaceitem-sections.model';
 import { type } from '../../shared/ngrx/type';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionError } from './submission-error.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
@@ -120,6 +123,7 @@ export class InitSectionAction implements Action {
     header: string;
     config: string;
     mandatory: boolean;
+    scope: SectionScope;
     sectionType: SectionsType;
     visibility: SectionVisibility;
     enabled: boolean;
@@ -140,6 +144,8 @@ export class InitSectionAction implements Action {
    *    the section's config
    * @param mandatory
    *    the section's mandatory
+   * @param scope
+   *    the section's scope
    * @param sectionType
    *    the section's type
    * @param visibility
@@ -156,12 +162,13 @@ export class InitSectionAction implements Action {
     header: string,
     config: string,
     mandatory: boolean,
+    scope: SectionScope,
     sectionType: SectionsType,
     visibility: SectionVisibility,
     enabled: boolean,
     data: WorkspaceitemSectionDataType,
     errors: SubmissionSectionError[]) {
-    this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
+    this.payload = { submissionId, sectionId, header, config, mandatory, scope, sectionType, visibility, enabled, data, errors };
   }
 }
 
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index 4a3e08384d..a16dc365f2 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -167,6 +167,7 @@ describe('SubmissionObjectEffects test suite', () => {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 9afb6cec40..ef1610794c 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -116,6 +116,7 @@ export class SubmissionObjectEffects {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 2389a5600c..2bbb875c3c 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -237,6 +237,7 @@ describe('submissionReducer test suite', () => {
       header: 'submit.progressbar.describe.stepone',
       config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       mandatory: true,
+      scope: null,
       sectionType: 'submission-form',
       visibility: undefined,
       collapsed: false,
@@ -257,6 +258,7 @@ describe('submissionReducer test suite', () => {
       'submit.progressbar.describe.stepone',
       'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       true,
+      null,
       SectionsType.SubmissionForm,
       undefined,
       true,
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index 82e33062cd..a34cf236b9 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -565,6 +565,7 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             header: action.payload.header,
             config: action.payload.config,
             mandatory: action.payload.mandatory,
+            scope: action.payload.scope,
             sectionType: action.payload.sectionType,
             visibility: action.payload.visibility,
             collapsed: false,
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
index 7338539607..5d8a14c745 100644
--- a/src/app/submission/objects/submission-section-object.model.ts
+++ b/src/app/submission/objects/submission-section-object.model.ts
@@ -1,6 +1,9 @@
 import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
@@ -22,6 +25,11 @@ export interface SubmissionSectionObject {
    */
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  scope: SectionScope;
+
   /**
    * The section type
    */
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index d8644a0db8..0241564ab7 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -35,6 +35,7 @@ import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -265,46 +266,282 @@ describe('SectionsService test suite', () => {
   });
 
   describe('isSectionReadOnly', () => {
-    it('should return an observable of true when it\'s a readonly section and scope is not workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workspace', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: true,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is workflow', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+
+      });
+
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+      });
     });
 
-    it('should return an observable of false when it\'s a readonly section and scope is workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workflow', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
-    });
+      describe('and section scope is workflow', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
 
-    it('should return an observable of false when it\'s not a readonly section', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: null,
-      }));
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+      });
     });
   });
 
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 6cc064283e..cec60a9cdf 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -36,6 +36,7 @@ import { FormClearErrorsAction } from '../../shared/form/form.actions';
 import { FormError } from '../../shared/form/form.reducer';
 import { FormService } from '../../shared/form/form.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -347,10 +348,14 @@ export class SectionsService {
     return this.store.select(submissionSectionFromIdSelector(submissionId, sectionId)).pipe(
       filter((sectionObj) => hasValue(sectionObj)),
       map((sectionObj: SubmissionSectionObject) => {
-        return isNotEmpty(sectionObj.visibility)
-          && ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
-              || (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
-          );
+        if (isEmpty(submissionScope) || isEmpty(sectionObj.visibility) || isEmpty(sectionObj.scope)) {
+          return false;
+        }
+        const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+          SectionScope.Submission : SectionScope.Workflow;
+        const visibility = convertedSubmissionScope.valueOf() === sectionObj.scope.valueOf() ?
+          sectionObj.visibility.main : sectionObj.visibility.other;
+        return visibility ===  'READONLY';
       }),
       distinctUntilChanged());
   }
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index 0ba8e5d9a2..b8f982101c 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -52,6 +52,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { createFailedRemoteDataObject } from '../shared/remote-data.utils';
 import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
+import { SectionScope } from './objects/section-visibility.model';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -82,6 +83,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -98,6 +100,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -237,6 +240,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -253,6 +257,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -590,6 +595,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionSections', () => {
     it('should return submission form sections', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('a|', {
         a: subState.objects[826],
       }));
@@ -759,6 +765,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionStatus', () => {
     it('should return properly submission status', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('-a-b', {
         a: subState,
         b: validSubState,
@@ -818,41 +825,207 @@ describe('SubmissionService test suite', () => {
   });
 
   describe('isSectionHidden', () => {
-    it('should return true/false when section is hidden/visible', () => {
-      let section: any = {
-        config: '',
-        header: '',
-        mandatory: true,
-        sectionType: 'collection' as any,
-        visibility: {
-          main: 'HIDDEN',
-          other: 'HIDDEN',
-        },
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeTruthy();
+    describe('when submission scope is workspace', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
 
-      section = {
-        header: 'submit.progressbar.describe.keyinformation',
-        config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/keyinformation',
-        mandatory: true,
-        sectionType: 'submission-form',
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeFalsy();
     });
+
+    describe('when submission scope is workflow', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkflowItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+    });
+
+
   });
 
   describe('isSubmissionLoading', () => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 19c8893a7e..ba8eff4f38 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -50,6 +50,7 @@ import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
+import { SectionScope } from './objects/section-visibility.model';
 import { SubmissionError } from './objects/submission-error.model';
 import {
   CancelSubmissionFormAction,
@@ -504,9 +505,15 @@ export class SubmissionService {
    *    true if section is hidden, false otherwise
    */
   isSectionHidden(sectionData: SubmissionSectionObject): boolean {
-    return (isNotUndefined(sectionData.visibility)
-      && sectionData.visibility.main === 'HIDDEN'
-      && sectionData.visibility.other === 'HIDDEN');
+    const submissionScope: SubmissionScopeType = this.getSubmissionScope();
+    if (isEmpty(submissionScope) || isEmpty(sectionData.visibility) || isEmpty(sectionData.scope)) {
+      return false;
+    }
+    const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+      SectionScope.Submission : SectionScope.Workflow;
+    const visibility = convertedSubmissionScope.valueOf() === sectionData.scope.valueOf() ?
+      sectionData.visibility.main : sectionData.visibility.other;
+    return visibility ===  'HIDDEN';
   }
 
   /**

From 3bd84a66f256a73df2a00ff16590b929c45f7bc8 Mon Sep 17 00:00:00 2001
From: DSpace Bot <68393067+dspace-bot@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:17:07 -0600
Subject: [PATCH 0947/1286] [CST-15590] Close user profile menu after menu
 entry is selected (#3760)

(cherry picked from commit fa0ec0bf0c375b2d55a72c0792eb7f2666dbd8da)

Co-authored-by: Alisa Ismailati <alisa.ismailati@4science.com>
---
 .../auth-nav-menu/auth-nav-menu.component.html     |  4 ++--
 .../user-menu/themed-user-menu.component.ts        |  9 ++++++++-
 .../user-menu/user-menu.component.html             |  6 +++---
 .../user-menu/user-menu.component.spec.ts          | 11 +++++++++++
 .../auth-nav-menu/user-menu/user-menu.component.ts | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 74ae821634..70d7a382f6 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -19,7 +19,7 @@
     </div>
   </div>
   <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+    <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
       <a href="javascript:void(0);"
          role="menuitem"
          [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
@@ -30,7 +30,7 @@
          ngbDropdownToggle>
         <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
       <div id="logoutDropdownMenu" ngbDropdownMenu>
-        <ds-user-menu [inExpandableNavbar]="false"></ds-user-menu>
+        <ds-user-menu [inExpandableNavbar]="false" (changedRoute)="loggedInDrop.close()"></ds-user-menu>
       </div>
     </div>
   </div>
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
index 38112cfa7c..6b5e509393 100644
--- a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -1,6 +1,8 @@
 import {
   Component,
+  EventEmitter,
   Input,
+  Output,
 } from '@angular/core';
 
 import { ThemedComponent } from '../../theme-support/themed.component';
@@ -23,7 +25,12 @@ export class ThemedUserMenuComponent extends ThemedComponent<UserMenuComponent>{
    */
   @Input() inExpandableNavbar: boolean;
 
-  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
+  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar', 'changedRoute'];
 
   protected getComponentName(): string {
     return 'UserMenuComponent';
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 4c36cc2f24..130c01c049 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -6,17 +6,17 @@
     {{dsoNameService.getName(user$ | async)}}<br>
     <span class="text-muted">{{(user$ | async)?.email}}</span>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[profileRoute]"
        routerLinkActive="active">{{'nav.profile' | translate}}</a>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[mydspaceRoute]"
        routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
   </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
+  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
     <a class="ds-menu-item" role="menuitem"
        [routerLink]="[subscriptionsRoute]"
        routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index c7ddf2ac34..f0758ce1c2 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -203,6 +203,17 @@ describe('UserMenuComponent', () => {
       expect(components).toBeFalsy();
     });
 
+    it('should call onMenuItemClick when li is clicked', () => {
+      spyOn(component, 'onMenuItemClick');
+      const lis = fixture.debugElement.queryAll(By.css('.ds-menu-item-wrapper'));
+      const secondLi = lis[1];
+      secondLi.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        },
+      });
+      expect(component.onMenuItemClick).toHaveBeenCalled();
+    });
+
   });
 
 });
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 51590e8c8a..6a601bd9a3 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -5,8 +5,10 @@ import {
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Input,
   OnInit,
+  Output,
 } from '@angular/core';
 import {
   RouterLink,
@@ -49,6 +51,11 @@ export class UserMenuComponent implements OnInit {
    */
   @Input() inExpandableNavbar = false;
 
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * True if the authentication is loading.
    * @type {Observable<boolean>}
@@ -96,4 +103,11 @@ export class UserMenuComponent implements OnInit {
     this.user$ = this.authService.getAuthenticatedUserFromStore();
 
   }
+
+  /**
+   * Emits an event when the menu item is clicked
+   */
+  onMenuItemClick() {
+    this.changedRoute.emit();
+  }
 }

From f16015abc2e81ed2d98e9d05bd0e0362a15d8eec Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:18:24 -0300
Subject: [PATCH 0948/1286] More accessible file download link for users who
 use a screen reader (#3264)

* More accessible file download link for users who use a screen reader

* Refactoring implementation - More accessible file download link for users who use a screen reader

* Fixing import error

* Solving the spaces error

* Solving the spaces error

* Solving the spaces error in file pt-BR.json5

---------

Co-authored-by: andreaNeki <root@TI-03.OHB.LOCAL>
---
 .../file-download-link/file-download-link.component.html    | 6 +++++-
 .../file-download-link/file-download-link.component.ts      | 2 ++
 src/assets/i18n/en.json5                                    | 2 ++
 src/assets/i18n/es.json5                                    | 5 +++--
 src/assets/i18n/pt-BR.json5                                 | 3 +++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index d649c0ad4e..aea5c4562c 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,4 +1,8 @@
-<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
+<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out"
+   [queryParams]="(bitstreamPath$| async)?.queryParams"
+   [target]="isBlank ? '_blank': '_self'"
+   [ngClass]="cssClasses"
+   [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
   <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index 9b01cd799d..3080a94bd3 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -22,6 +22,7 @@ import {
   getBitstreamDownloadRoute,
   getBitstreamRequestACopyRoute,
 } from '../../app-routing-paths';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Bitstream } from '../../core/shared/bitstream.model';
@@ -73,6 +74,7 @@ export class FileDownloadLinkComponent implements OnInit {
 
   constructor(
     private authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 54d2bbd00f..249544cbd5 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6752,6 +6752,8 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
+  "file-download-link.download": "Download ",
+
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index ba2674a5f1..7ee24fd2af 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8134,11 +8134,12 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
-
-
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 951f988093..1a41a28829 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10232,6 +10232,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Baixar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Digite seu e-mail",
 

From beef2aca17af4283ecda4109fe03973a22e12274 Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:18:24 -0300
Subject: [PATCH 0949/1286] More accessible file download link for users who
 use a screen reader (#3264)

* More accessible file download link for users who use a screen reader

* Refactoring implementation - More accessible file download link for users who use a screen reader

* Fixing import error

* Solving the spaces error

* Solving the spaces error

* Solving the spaces error in file pt-BR.json5

---------

Co-authored-by: andreaNeki <root@TI-03.OHB.LOCAL>
---
 .../file-download-link/file-download-link.component.html    | 6 +++++-
 .../file-download-link/file-download-link.component.ts      | 2 ++
 src/assets/i18n/en.json5                                    | 2 ++
 src/assets/i18n/es.json5                                    | 5 +++--
 src/assets/i18n/pt-BR.json5                                 | 3 +++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index d649c0ad4e..aea5c4562c 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,4 +1,8 @@
-<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
+<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out"
+   [queryParams]="(bitstreamPath$| async)?.queryParams"
+   [target]="isBlank ? '_blank': '_self'"
+   [ngClass]="cssClasses"
+   [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
   <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index 9b01cd799d..3080a94bd3 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -22,6 +22,7 @@ import {
   getBitstreamDownloadRoute,
   getBitstreamRequestACopyRoute,
 } from '../../app-routing-paths';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Bitstream } from '../../core/shared/bitstream.model';
@@ -73,6 +74,7 @@ export class FileDownloadLinkComponent implements OnInit {
 
   constructor(
     private authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index fc8b3ce21f..497949c5d4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6758,6 +6758,8 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
+  "file-download-link.download": "Download ",
+
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 25dfb54ca2..e15a120f12 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8152,11 +8152,12 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
-
-
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 9ebdc5fbbf..ad738401af 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10250,6 +10250,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Baixar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Digite seu e-mail",
 

From 4bf4e18389abb26cecbef78760081b47cc4f95f4 Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Wed, 18 Dec 2024 17:18:24 -0300
Subject: [PATCH 0950/1286] More accessible file download link for users who
 use a screen reader (#3264)

* More accessible file download link for users who use a screen reader

* Refactoring implementation - More accessible file download link for users who use a screen reader

* Fixing import error

* Solving the spaces error

* Solving the spaces error

* Solving the spaces error in file pt-BR.json5

---------

Co-authored-by: andreaNeki <root@TI-03.OHB.LOCAL>
---
 .../file-download-link/file-download-link.component.html    | 6 +++++-
 .../file-download-link/file-download-link.component.ts      | 2 ++
 src/assets/i18n/en.json5                                    | 2 ++
 src/assets/i18n/es.json5                                    | 5 +++--
 src/assets/i18n/pt-BR.json5                                 | 3 +++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 7a5729cc2d..59f255a652 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,4 +1,8 @@
-<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
+<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" 
+   [queryParams]="(bitstreamPath$| async)?.queryParams" 
+   [target]="isBlank ? '_blank': '_self'" 
+   [ngClass]="cssClasses"
+   [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
   <span *ngIf="!(canDownload$ |async)" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index a79a71b634..1488401ab1 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { hasValue, isNotEmpty } from '../empty.util';
@@ -48,6 +49,7 @@ export class FileDownloadLinkComponent implements OnInit {
 
   constructor(
     private authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a3c98f7346..a56f1cd4f2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5386,6 +5386,8 @@
 
   "browse.search-form.placeholder": "Search the repository",
 
+  "file-download-link.download": "Download ",
+
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index dfdf4ca628..51bd9c833c 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7831,11 +7831,12 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
-
-
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index eebf896889..13a6b652a6 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -7858,6 +7858,9 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Baixar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Digite seu e-mail",
 

From 819e693cfc01084a12b8cba96e7ed43e3092764f Mon Sep 17 00:00:00 2001
From: DSpace Bot <68393067+dspace-bot@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:57:30 -0600
Subject: [PATCH 0951/1286] [Port dspace-8_x] Fix issue with submission
 sections visibility (#3761)

* Removing position-fixed bootstrap class so that navbar links are available again

(cherry picked from commit 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9)
(cherry picked from commit 5c4df8765ef65a975c769839188cce0432aa9bab)

* A new approach so that the elements of the ds-file-dropzone-no-uploader component don't overlap the navbar and make it inaccessible

(cherry picked from commit 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d)
(cherry picked from commit ee5af8f7d17e2ec34561bc128f8e80508b68d9fa)

* [DURACOM-291] fix submission section visibility in order to rely on the configured section scope

(cherry picked from commit 8e8979a27ab608dac62edc52a7dd53ddecbd28fb)

* Removing position-fixed bootstrap class so that navbar links are available again

(cherry picked from commit 351abaa5c2071c3bc56c72abf2bdc8cfb22062a9)
(cherry picked from commit 3ecec3af51a16e8aa503b63d32d985d606b26abe)

* A new approach so that the elements of the ds-file-dropzone-no-uploader component don't overlap the navbar and make it inaccessible

(cherry picked from commit 2c259f5ae937a26f37b0dd00ea46b70f4fef7e0d)
(cherry picked from commit 25e2c763be3bf1f8e435b405be0936acce6927a6)

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.com>
---
 .../models/config-submission-section.model.ts |  22 +-
 .../form/submission-form.component.ts         |   8 +-
 .../objects/section-visibility.model.ts       |   6 +
 .../objects/submission-objects.actions.ts     |  11 +-
 .../submission-objects.effects.spec.ts        |   1 +
 .../objects/submission-objects.effects.ts     |   1 +
 .../submission-objects.reducer.spec.ts        |   2 +
 .../objects/submission-objects.reducer.ts     |   1 +
 .../submission-section-object.model.ts        |  10 +-
 .../sections/sections.service.spec.ts         | 293 ++++++++++++++++--
 .../submission/sections/sections.service.ts   |  13 +-
 src/app/submission/submission.service.spec.ts | 239 ++++++++++++--
 src/app/submission/submission.service.ts      |  13 +-
 13 files changed, 534 insertions(+), 86 deletions(-)

diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index feb4fc9cb0..13e19544dc 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -4,20 +4,16 @@ import {
   inheritSerialization,
 } from 'cerialize';
 
+import {
+  SectionScope,
+  SectionVisibility,
+} from '../../../submission/objects/section-visibility.model';
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { SUBMISSION_SECTION_TYPE } from './config-type';
 
-/**
- * An interface that define section visibility and its properties.
- */
-export interface SubmissionSectionVisibility {
-  main: any;
-  other: any;
-}
-
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionSectionModel extends ConfigObject {
@@ -35,6 +31,12 @@ export class SubmissionSectionModel extends ConfigObject {
   @autoserialize
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  @autoserialize
+  scope: SectionScope;
+
   /**
    * A string representing the kind of section object
    */
@@ -42,10 +44,10 @@ export class SubmissionSectionModel extends ConfigObject {
   sectionType: SectionsType;
 
   /**
-   * The [SubmissionSectionVisibility] object for this section
+   * The [SectionVisibility] object for this section
    */
   @autoserialize
-  visibility: SubmissionSectionVisibility;
+  visibility: SectionVisibility;
 
   /**
    * The {@link HALLink}s for this SubmissionSectionModel
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 2e97c2df63..74c262befc 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -22,10 +22,7 @@ import {
 
 import { AuthService } from '../../core/auth/auth.service';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import {
-  SubmissionSectionModel,
-  SubmissionSectionVisibility,
-} from '../../core/config/models/config-submission-section.model';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
 import { Collection } from '../../core/shared/collection.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { Item } from '../../core/shared/item.model';
@@ -38,6 +35,7 @@ import {
 } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { SectionVisibility } from '../objects/section-visibility.model';
 import { SubmissionError } from '../objects/submission-error.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
@@ -233,7 +231,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
   /**
    *  Returns the visibility object of the collection section
    */
-  private getCollectionVisibility(): SubmissionSectionVisibility {
+  private getCollectionVisibility(): SectionVisibility {
     const submissionSectionModel: SubmissionSectionModel =
       this.submissionDefinition.sections.page.find(
         (section) => isEqual(section.sectionType, SectionsType.Collection),
diff --git a/src/app/submission/objects/section-visibility.model.ts b/src/app/submission/objects/section-visibility.model.ts
index c41735178c..16cf16b2ab 100644
--- a/src/app/submission/objects/section-visibility.model.ts
+++ b/src/app/submission/objects/section-visibility.model.ts
@@ -5,3 +5,9 @@ export interface SectionVisibility {
   main: any;
   other: any;
 }
+
+
+export enum SectionScope {
+  Submission = 'SUBMISSION',
+  Workflow = 'WORKFLOW',
+}
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index e075ce5e5b..956c8f9533 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -11,7 +11,10 @@ import {
 } from '../../core/submission/models/workspaceitem-sections.model';
 import { type } from '../../shared/ngrx/type';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionError } from './submission-error.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
@@ -120,6 +123,7 @@ export class InitSectionAction implements Action {
     header: string;
     config: string;
     mandatory: boolean;
+    scope: SectionScope;
     sectionType: SectionsType;
     visibility: SectionVisibility;
     enabled: boolean;
@@ -140,6 +144,8 @@ export class InitSectionAction implements Action {
    *    the section's config
    * @param mandatory
    *    the section's mandatory
+   * @param scope
+   *    the section's scope
    * @param sectionType
    *    the section's type
    * @param visibility
@@ -156,12 +162,13 @@ export class InitSectionAction implements Action {
     header: string,
     config: string,
     mandatory: boolean,
+    scope: SectionScope,
     sectionType: SectionsType,
     visibility: SectionVisibility,
     enabled: boolean,
     data: WorkspaceitemSectionDataType,
     errors: SubmissionSectionError[]) {
-    this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
+    this.payload = { submissionId, sectionId, header, config, mandatory, scope, sectionType, visibility, enabled, data, errors };
   }
 }
 
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index 4a3e08384d..a16dc365f2 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -167,6 +167,7 @@ describe('SubmissionObjectEffects test suite', () => {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 9afb6cec40..ef1610794c 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -116,6 +116,7 @@ export class SubmissionObjectEffects {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 2389a5600c..2bbb875c3c 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -237,6 +237,7 @@ describe('submissionReducer test suite', () => {
       header: 'submit.progressbar.describe.stepone',
       config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       mandatory: true,
+      scope: null,
       sectionType: 'submission-form',
       visibility: undefined,
       collapsed: false,
@@ -257,6 +258,7 @@ describe('submissionReducer test suite', () => {
       'submit.progressbar.describe.stepone',
       'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       true,
+      null,
       SectionsType.SubmissionForm,
       undefined,
       true,
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index 82e33062cd..a34cf236b9 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -565,6 +565,7 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             header: action.payload.header,
             config: action.payload.config,
             mandatory: action.payload.mandatory,
+            scope: action.payload.scope,
             sectionType: action.payload.sectionType,
             visibility: action.payload.visibility,
             collapsed: false,
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
index 7338539607..5d8a14c745 100644
--- a/src/app/submission/objects/submission-section-object.model.ts
+++ b/src/app/submission/objects/submission-section-object.model.ts
@@ -1,6 +1,9 @@
 import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
@@ -22,6 +25,11 @@ export interface SubmissionSectionObject {
    */
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  scope: SectionScope;
+
   /**
    * The section type
    */
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index d8644a0db8..0241564ab7 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -35,6 +35,7 @@ import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -265,46 +266,282 @@ describe('SectionsService test suite', () => {
   });
 
   describe('isSectionReadOnly', () => {
-    it('should return an observable of true when it\'s a readonly section and scope is not workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workspace', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: true,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is workflow', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+
+      });
+
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+      });
     });
 
-    it('should return an observable of false when it\'s a readonly section and scope is workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workflow', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
-    });
+      describe('and section scope is workflow', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
 
-    it('should return an observable of false when it\'s not a readonly section', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: null,
-      }));
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+      });
     });
   });
 
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 8d86ee84b5..034484581a 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -36,6 +36,7 @@ import { FormClearErrorsAction } from '../../shared/form/form.actions';
 import { FormError } from '../../shared/form/form.reducer';
 import { FormService } from '../../shared/form/form.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -347,10 +348,14 @@ export class SectionsService {
     return this.store.select(submissionSectionFromIdSelector(submissionId, sectionId)).pipe(
       filter((sectionObj) => hasValue(sectionObj)),
       map((sectionObj: SubmissionSectionObject) => {
-        return isNotEmpty(sectionObj.visibility)
-          && ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
-              || (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
-          );
+        if (isEmpty(submissionScope) || isEmpty(sectionObj.visibility) || isEmpty(sectionObj.scope)) {
+          return false;
+        }
+        const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+          SectionScope.Submission : SectionScope.Workflow;
+        const visibility = convertedSubmissionScope.valueOf() === sectionObj.scope.valueOf() ?
+          sectionObj.visibility.main : sectionObj.visibility.other;
+        return visibility ===  'READONLY';
       }),
       distinctUntilChanged());
   }
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index 0ba8e5d9a2..b8f982101c 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -52,6 +52,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { createFailedRemoteDataObject } from '../shared/remote-data.utils';
 import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
+import { SectionScope } from './objects/section-visibility.model';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -82,6 +83,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -98,6 +100,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -237,6 +240,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -253,6 +257,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -590,6 +595,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionSections', () => {
     it('should return submission form sections', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('a|', {
         a: subState.objects[826],
       }));
@@ -759,6 +765,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionStatus', () => {
     it('should return properly submission status', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('-a-b', {
         a: subState,
         b: validSubState,
@@ -818,41 +825,207 @@ describe('SubmissionService test suite', () => {
   });
 
   describe('isSectionHidden', () => {
-    it('should return true/false when section is hidden/visible', () => {
-      let section: any = {
-        config: '',
-        header: '',
-        mandatory: true,
-        sectionType: 'collection' as any,
-        visibility: {
-          main: 'HIDDEN',
-          other: 'HIDDEN',
-        },
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeTruthy();
+    describe('when submission scope is workspace', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
 
-      section = {
-        header: 'submit.progressbar.describe.keyinformation',
-        config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/keyinformation',
-        mandatory: true,
-        sectionType: 'submission-form',
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeFalsy();
     });
+
+    describe('when submission scope is workflow', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkflowItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+    });
+
+
   });
 
   describe('isSubmissionLoading', () => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 19c8893a7e..ba8eff4f38 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -50,6 +50,7 @@ import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
+import { SectionScope } from './objects/section-visibility.model';
 import { SubmissionError } from './objects/submission-error.model';
 import {
   CancelSubmissionFormAction,
@@ -504,9 +505,15 @@ export class SubmissionService {
    *    true if section is hidden, false otherwise
    */
   isSectionHidden(sectionData: SubmissionSectionObject): boolean {
-    return (isNotUndefined(sectionData.visibility)
-      && sectionData.visibility.main === 'HIDDEN'
-      && sectionData.visibility.other === 'HIDDEN');
+    const submissionScope: SubmissionScopeType = this.getSubmissionScope();
+    if (isEmpty(submissionScope) || isEmpty(sectionData.visibility) || isEmpty(sectionData.scope)) {
+      return false;
+    }
+    const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+      SectionScope.Submission : SectionScope.Workflow;
+    const visibility = convertedSubmissionScope.valueOf() === sectionData.scope.valueOf() ?
+      sectionData.visibility.main : sectionData.visibility.other;
+    return visibility ===  'HIDDEN';
   }
 
   /**

From a105bcd6f45d8e85844cd473964670e1461b29cf Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 2 Dec 2024 14:51:08 +0100
Subject: [PATCH 0952/1286] 121787: Get rid of multiple unnecessary requests on
 browse by pages

---
 .../browse-by-date.component.ts               | 21 ++++++++++++-------
 .../browse-by-metadata.component.ts           | 13 ++++++++++--
 .../browse-by-page.component.ts               |  4 ++--
 .../browse-by-switcher.component.spec.ts      |  2 +-
 .../browse-by-switcher.component.ts           |  4 ++--
 .../browse-by-title.component.ts              | 16 +++++++++-----
 src/app/menu-resolver.service.ts              | 17 ++++++++++++---
 src/app/menu.resolver.spec.ts                 |  9 +++++---
 8 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index ee33ee533c..11818ff5f1 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -18,7 +18,10 @@ import {
   combineLatest as observableCombineLatest,
   Observable,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -53,7 +56,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -104,15 +106,18 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
       ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 29bc48b1bd..d17c2a1a7b 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -23,7 +23,10 @@ import {
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -216,7 +219,13 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
         map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
index 1a204264d1..670b5a7711 100644
--- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -23,7 +23,7 @@ import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switc
 })
 export class BrowseByPageComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   constructor(
     protected route: ActivatedRoute,
@@ -35,7 +35,7 @@ export class BrowseByPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
   }
 
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index d56671577e..8539365f66 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -85,7 +85,7 @@ describe('BrowseBySwitcherComponent', () => {
   types.forEach((type: NonHierarchicalBrowseDefinition) => {
     describe(`when switching to a browse-by page for "${type.id}"`, () => {
       beforeEach(async () => {
-        comp.browseByType = type.dataType;
+        comp.browseByType = type as any;
         comp.ngOnChanges({
           browseByType: new SimpleChange(undefined, type.dataType, true),
         });
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index c1e3dae79f..53be5fa786 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -24,7 +24,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
 
   @Input() context: Context;
 
-  @Input() browseByType: BrowseByDataType;
+  @Input() browseByType: { type: BrowseByDataType };
 
   @Input() displayTitle: boolean;
 
@@ -43,7 +43,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
   ];
 
   public getComponent(): GenericConstructor<Component> {
-    return getComponentByBrowseByType(this.browseByType, this.context, this.themeService.getThemeName());
+    return getComponentByBrowseByType(this.browseByType.type, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index aa5daa3166..296386d9d9 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -9,7 +9,10 @@ import {
 import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
 import {
   SortDirection,
@@ -28,7 +31,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -58,12 +60,16 @@ export class BrowseByTitleComponent extends BrowseByMetadataComponent implements
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
         map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
diff --git a/src/app/menu-resolver.service.ts b/src/app/menu-resolver.service.ts
index 144cad4547..683111b32a 100644
--- a/src/app/menu-resolver.service.ts
+++ b/src/app/menu-resolver.service.ts
@@ -7,7 +7,9 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   combineLatest,
   combineLatest as observableCombineLatest,
+  mergeMap,
   Observable,
+  of as observableOf,
 } from 'rxjs';
 import {
   filter,
@@ -17,6 +19,7 @@ import {
 } from 'rxjs/operators';
 
 import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { AuthService } from './core/auth/auth.service';
 import { BrowseService } from './core/browse/browse.service';
 import { ConfigurationDataService } from './core/data/configuration-data.service';
 import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
@@ -62,6 +65,7 @@ export class MenuResolverService  {
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
     protected configurationDataService: ConfigurationDataService,
+    protected authService: AuthService,
   ) {
   }
 
@@ -71,7 +75,7 @@ export class MenuResolverService  {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return combineLatest([
       this.createPublicMenu$(),
-      this.createAdminMenu$(),
+      this.createAdminMenuIfLoggedIn$(),
     ]).pipe(
       map((menusDone: boolean[]) => menusDone.every(Boolean)),
     );
@@ -147,6 +151,15 @@ export class MenuResolverService  {
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  /**
+   * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in.
+   */
+  createAdminMenuIfLoggedIn$() {
+    return this.authService.isAuthenticated().pipe(
+      mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)),
+    );
+  }
+
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */
@@ -156,8 +169,6 @@ export class MenuResolverService  {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
-    this.createReportMenuSections();
-
     return this.waitForMenu$(MenuID.ADMIN);
   }
 
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 386bbb0cae..720c071104 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -26,7 +26,9 @@ import { ConfigurationDataServiceStub } from './shared/testing/configuration-dat
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { createPaginatedList } from './shared/testing/utils.test';
 import createSpy = jasmine.createSpy;
+import { AuthService } from './core/auth/auth.service';
 import { MenuResolverService } from './menu-resolver.service';
+import { AuthServiceStub } from './shared/testing/auth-service.stub';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -80,6 +82,7 @@ describe('menuResolver', () => {
         { provide: ScriptDataService, useValue: scriptService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: NgbModal, useValue: mockNgbModal },
+        { provide: AuthService, useValue: AuthServiceStub },
         MenuResolverService,
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -94,19 +97,19 @@ describe('menuResolver', () => {
   describe('resolve', () => {
     it('should create all menus', (done) => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true));
 
       resolver.resolve(null, null).subscribe(resolved => {
         expect(resolved).toBeTrue();
         expect(resolver.createPublicMenu$).toHaveBeenCalled();
-        expect(resolver.createAdminMenu$).toHaveBeenCalled();
+        expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled();
         done();
       });
     });
 
     it('should return an Observable that emits true as soon as all menus are created', () => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN));
 
       expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN));
     });

From a938a4f44c9bbda45258b63bd020b97a399f41c8 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koen.pauwels@atmire.com>
Date: Mon, 2 Dec 2024 14:51:08 +0100
Subject: [PATCH 0953/1286] 121787: Get rid of multiple unnecessary requests on
 browse by pages

(cherry picked from commit a105bcd6f45d8e85844cd473964670e1461b29cf)
---
 .../browse-by-date.component.ts               | 21 ++++++++++++-------
 .../browse-by-metadata.component.ts           | 13 ++++++++++--
 .../browse-by-page.component.ts               |  4 ++--
 .../browse-by-switcher.component.spec.ts      |  2 +-
 .../browse-by-switcher.component.ts           |  4 ++--
 .../browse-by-title.component.ts              | 16 +++++++++-----
 src/app/menu-resolver.service.ts              | 17 ++++++++++++---
 src/app/menu.resolver.spec.ts                 |  9 +++++---
 8 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index ee33ee533c..11818ff5f1 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -18,7 +18,10 @@ import {
   combineLatest as observableCombineLatest,
   Observable,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -53,7 +56,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -104,15 +106,18 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
       ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 29bc48b1bd..d17c2a1a7b 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -23,7 +23,10 @@ import {
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -216,7 +219,13 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
         map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
index 1a204264d1..670b5a7711 100644
--- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -23,7 +23,7 @@ import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switc
 })
 export class BrowseByPageComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   constructor(
     protected route: ActivatedRoute,
@@ -35,7 +35,7 @@ export class BrowseByPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
   }
 
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index d56671577e..8539365f66 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -85,7 +85,7 @@ describe('BrowseBySwitcherComponent', () => {
   types.forEach((type: NonHierarchicalBrowseDefinition) => {
     describe(`when switching to a browse-by page for "${type.id}"`, () => {
       beforeEach(async () => {
-        comp.browseByType = type.dataType;
+        comp.browseByType = type as any;
         comp.ngOnChanges({
           browseByType: new SimpleChange(undefined, type.dataType, true),
         });
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index c1e3dae79f..53be5fa786 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -24,7 +24,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
 
   @Input() context: Context;
 
-  @Input() browseByType: BrowseByDataType;
+  @Input() browseByType: { type: BrowseByDataType };
 
   @Input() displayTitle: boolean;
 
@@ -43,7 +43,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
   ];
 
   public getComponent(): GenericConstructor<Component> {
-    return getComponentByBrowseByType(this.browseByType, this.context, this.themeService.getThemeName());
+    return getComponentByBrowseByType(this.browseByType.type, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index aa5daa3166..296386d9d9 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -9,7 +9,10 @@ import {
 import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
 import {
   SortDirection,
@@ -28,7 +31,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -58,12 +60,16 @@ export class BrowseByTitleComponent extends BrowseByMetadataComponent implements
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.scope$,
+          this.currentPagination$,
+          this.currentSort$,
+        ]).pipe(
         map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
         }),
diff --git a/src/app/menu-resolver.service.ts b/src/app/menu-resolver.service.ts
index 144cad4547..683111b32a 100644
--- a/src/app/menu-resolver.service.ts
+++ b/src/app/menu-resolver.service.ts
@@ -7,7 +7,9 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   combineLatest,
   combineLatest as observableCombineLatest,
+  mergeMap,
   Observable,
+  of as observableOf,
 } from 'rxjs';
 import {
   filter,
@@ -17,6 +19,7 @@ import {
 } from 'rxjs/operators';
 
 import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { AuthService } from './core/auth/auth.service';
 import { BrowseService } from './core/browse/browse.service';
 import { ConfigurationDataService } from './core/data/configuration-data.service';
 import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
@@ -62,6 +65,7 @@ export class MenuResolverService  {
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
     protected configurationDataService: ConfigurationDataService,
+    protected authService: AuthService,
   ) {
   }
 
@@ -71,7 +75,7 @@ export class MenuResolverService  {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return combineLatest([
       this.createPublicMenu$(),
-      this.createAdminMenu$(),
+      this.createAdminMenuIfLoggedIn$(),
     ]).pipe(
       map((menusDone: boolean[]) => menusDone.every(Boolean)),
     );
@@ -147,6 +151,15 @@ export class MenuResolverService  {
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  /**
+   * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in.
+   */
+  createAdminMenuIfLoggedIn$() {
+    return this.authService.isAuthenticated().pipe(
+      mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)),
+    );
+  }
+
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */
@@ -156,8 +169,6 @@ export class MenuResolverService  {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
-    this.createReportMenuSections();
-
     return this.waitForMenu$(MenuID.ADMIN);
   }
 
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 386bbb0cae..720c071104 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -26,7 +26,9 @@ import { ConfigurationDataServiceStub } from './shared/testing/configuration-dat
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { createPaginatedList } from './shared/testing/utils.test';
 import createSpy = jasmine.createSpy;
+import { AuthService } from './core/auth/auth.service';
 import { MenuResolverService } from './menu-resolver.service';
+import { AuthServiceStub } from './shared/testing/auth-service.stub';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -80,6 +82,7 @@ describe('menuResolver', () => {
         { provide: ScriptDataService, useValue: scriptService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: NgbModal, useValue: mockNgbModal },
+        { provide: AuthService, useValue: AuthServiceStub },
         MenuResolverService,
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -94,19 +97,19 @@ describe('menuResolver', () => {
   describe('resolve', () => {
     it('should create all menus', (done) => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true));
 
       resolver.resolve(null, null).subscribe(resolved => {
         expect(resolved).toBeTrue();
         expect(resolver.createPublicMenu$).toHaveBeenCalled();
-        expect(resolver.createAdminMenu$).toHaveBeenCalled();
+        expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled();
         done();
       });
     });
 
     it('should return an Observable that emits true as soon as all menus are created', () => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN));
 
       expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN));
     });

From d13d8860f24dd641e1408904430f65d0e65df7b9 Mon Sep 17 00:00:00 2001
From: Nathan Buckingham <nate1898@gmail.com>
Date: Thu, 19 Dec 2024 12:03:52 -0500
Subject: [PATCH 0954/1286] RSS feed from search results (Angular) (#3227)

* Port rss to 7.6 and upgrades to search functionality

* 116466: add missing imports

* 116466: fix tests and lint issues

* 116466: rss component use activated route data

* 116466: lint fixes

* 116466: More Lint fixes

---------

Co-authored-by: Nathan Buckingham <nathan.buckingham@atmire.com>
---
 src/app/app-routes.ts                         |  8 ++-
 src/app/shared/rss-feed/rss.component.html    | 10 ++-
 src/app/shared/rss-feed/rss.component.spec.ts | 53 ++++++++++++---
 src/app/shared/rss-feed/rss.component.ts      | 64 +++++++++++++++----
 4 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts
index 29a78364b5..51101f5a2d 100644
--- a/src/app/app-routes.ts
+++ b/src/app/app-routes.ts
@@ -63,7 +63,7 @@ export const APP_ROUTES: Route[] = [
         path: 'home',
         loadChildren: () => import('./home-page/home-page-routes')
           .then((m) => m.ROUTES),
-        data: { showBreadcrumbs: false },
+        data: { showBreadcrumbs: false,  enableRSS: true },
         providers: [provideSuggestionNotificationsState()],
         canActivate: [endUserAgreementCurrentUserGuard],
       },
@@ -101,12 +101,14 @@ export const APP_ROUTES: Route[] = [
         path: COMMUNITY_MODULE_PATH,
         loadChildren: () => import('./community-page/community-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
         path: COLLECTION_MODULE_PATH,
         loadChildren: () => import('./collection-page/collection-page-routes')
           .then((m) => m.ROUTES),
+        data: { showBreadcrumbs: false,  enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
@@ -137,6 +139,7 @@ export const APP_ROUTES: Route[] = [
         path: 'mydspace',
         loadChildren: () => import('./my-dspace-page/my-dspace-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         providers: [provideSuggestionNotificationsState()],
         canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
       },
@@ -144,6 +147,7 @@ export const APP_ROUTES: Route[] = [
         path: 'search',
         loadChildren: () => import('./search-page/search-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
@@ -156,6 +160,7 @@ export const APP_ROUTES: Route[] = [
         path: ADMIN_MODULE_PATH,
         loadChildren: () => import('./admin/admin-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [siteAdministratorGuard, endUserAgreementCurrentUserGuard],
       },
       {
@@ -200,6 +205,7 @@ export const APP_ROUTES: Route[] = [
         providers: [provideSubmissionState()],
         loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html
index 91140c50c5..133880c593 100644
--- a/src/app/shared/rss-feed/rss.component.html
+++ b/src/app/shared/rss-feed/rss.component.html
@@ -1,5 +1,9 @@
-<ng-container *ngIf="(isEnabled$ | async) && (hasRoute('home') || hasRoute('collections') || hasRoute('communities'))">
+<ng-container
+  *ngIf="(isEnabled$ | async) && (isActivated$ | async)">
   <div *ngIf="route$ | async as route" class="d-inline-block float-right margin-right">
-    <a [href]="route" class="btn btn-secondary" [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate"><i class="fas fa-rss-square"></i></a>
+    <a target="_blank" rel="noopener noreferrer" [href]="route" class="btn btn-secondary"
+      [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate">
+      <i class="fas fa-rss-square"></i>
+    </a>
   </div>
-</ng-container>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts
index 724d0abf4a..60de4caef6 100644
--- a/src/app/shared/rss-feed/rss.component.spec.ts
+++ b/src/app/shared/rss-feed/rss.component.spec.ts
@@ -3,9 +3,17 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -14,22 +22,24 @@ import { LinkHeadService } from '../../core/services/link-head.service';
 import { Collection } from '../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { MockActivatedRoute } from '../mocks/active-router.mock';
 import { RouterMock } from '../mocks/router.mock';
+import { getMockTranslateService } from '../mocks/translate.service.mock';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$,
 } from '../remote-data.utils';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
+import { SearchFilter } from '../search/models/search-filter.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { RSSComponent } from './rss.component';
 
-
-
 describe('RssComponent', () => {
   let comp: RSSComponent;
+  let options: SortOptions;
   let fixture: ComponentFixture<RSSComponent>;
   let uuid: string;
   let query: string;
@@ -69,6 +79,7 @@ describe('RssComponent', () => {
         pageSize: 10,
         currentPage: 1,
       }),
+      sort: new SortOptions('dc.title', SortDirection.ASC),
     }));
     groupDataService = jasmine.createSpyObj('groupsDataService', {
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -80,7 +91,6 @@ describe('RssComponent', () => {
       paginatedSearchOptions: mockSearchOptions,
     };
     TestBed.configureTestingModule({
-      imports: [RSSComponent],
       providers: [
         { provide: GroupDataService, useValue: groupDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
@@ -88,11 +98,15 @@ describe('RssComponent', () => {
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute },
+        { provide: TranslateService, useValue: getMockTranslateService() },
       ],
+      declarations: [],
     }).compileComponents();
   }));
 
   beforeEach(() => {
+    options = new SortOptions('dc.title', SortDirection.DESC);
     uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
     query = 'test';
     fixture = TestBed.createComponent(RSSComponent);
@@ -100,18 +114,37 @@ describe('RssComponent', () => {
   });
 
   it('should formulate the correct url given params in url', () => {
-    const route = comp.formulateRoute(uuid, 'opensearch/search', query);
-    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test');
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test');
   });
 
   it('should skip uuid if its null', () => {
-    const route = comp.formulateRoute(null, 'opensearch/search', query);
-    expect(route).toBe('/opensearch/search?format=atom&query=test');
+    const route = comp.formulateRoute(null, 'opensearch/search', options, query);
+    expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=test');
   });
 
   it('should default to query * if none provided', () => {
-    const route = comp.formulateRoute(null, 'opensearch/search', null);
-    expect(route).toBe('/opensearch/search?format=atom&query=*');
+    const route = comp.formulateRoute(null, 'opensearch/search', options, null);
+    expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=*');
+  });
+
+  it('should include filters in opensearch url if provided', () => {
+    const filters = [
+      new SearchFilter('f.test', ['value','another value'], 'contains'), // should be split into two arguments, spaces should be URI-encoded
+      new SearchFilter('f.range', ['[1987 TO 1988]'], 'equals'), // value should be URI-encoded, ',equals' should not
+    ];
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, filters);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&f.test=value,contains&f.test=another%20value,contains&f.range=%5B1987%20TO%201988%5D,equals');
+  });
+
+  it('should include configuration in opensearch url if provided', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, null, 'adminConfiguration');
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&configuration=adminConfiguration');
+  });
+
+  it('should include rpp in opensearch url if provided', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, null, null, 50);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&rpp=50');
   });
 });
 
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index e089525a72..7d0338ba97 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -9,11 +9,16 @@ import {
   OnInit,
   ViewEncapsulation,
 } from '@angular/core';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
   BehaviorSubject,
-  Observable,
   Subscription,
 } from 'rxjs';
 import {
@@ -21,7 +26,8 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
-import { environment } from '../../../../src/environments/environment';
+import { environment } from '../../../environments/environment';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -29,9 +35,12 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { LinkHeadService } from '../../core/services/link-head.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isUndefined,
+} from '../empty.util';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-
-
+import { SearchFilter } from '../search/models/search-filter.model';
 /**
  * The Rss feed button component.
  */
@@ -51,8 +60,9 @@ export class RSSComponent implements OnInit, OnDestroy  {
 
   isEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
 
+  isActivated$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   uuid: string;
-  configuration$: Observable<string>;
 
   subs: Subscription[] = [];
 
@@ -61,7 +71,9 @@ export class RSSComponent implements OnInit, OnDestroy  {
               private configurationService: ConfigurationDataService,
               private searchConfigurationService: SearchConfigurationService,
               private router: Router,
-              protected paginationService: PaginationService) {
+              private route: ActivatedRoute,
+              protected paginationService: PaginationService,
+              protected translateService: TranslateService) {
   }
   /**
    * Removes the linktag created when the component gets removed from the page.
@@ -78,8 +90,11 @@ export class RSSComponent implements OnInit, OnDestroy  {
    * Generates the link tags and the url to opensearch when the component is loaded.
    */
   ngOnInit(): void {
-    this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default');
-
+    if (hasValue(this.route.snapshot.data?.enableRSS)) {
+      this.isActivated$.next(this.route.snapshot.data.enableRSS);
+    } else if (isUndefined(this.route.snapshot.data?.enableRSS)) {
+      this.isActivated$.next(false);
+    }
     this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((result) => {
@@ -106,7 +121,7 @@ export class RSSComponent implements OnInit, OnDestroy  {
         return null;
       }
       this.uuid = this.groupDataService.getUUIDFromString(this.router.url);
-      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.query);
+      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query, searchOptions.filters, searchOptions.configuration, searchOptions.pagination?.pageSize, searchOptions.fixedFilter);
       this.addLinks(route);
       this.linkHeadService.addTag({
         href: environment.rest.baseUrl + '/' + openSearchUri + '/service',
@@ -122,20 +137,40 @@ export class RSSComponent implements OnInit, OnDestroy  {
    * Function created a route given the different params available to opensearch
    * @param uuid The uuid if a scope is present
    * @param opensearch openSearch uri
+   * @param sort The sort options for the opensearch request
    * @param query The query string that was provided in the search
    * @returns The combine URL to opensearch
    */
-  formulateRoute(uuid: string, opensearch: string, query: string): string {
-    let route = '?format=atom';
+  formulateRoute(uuid: string, opensearch: string, sort?: SortOptions, query?: string, searchFilters?: SearchFilter[], configuration?: string, pageSize?: number, fixedFilter?: string): string {
+    let route = 'format=atom';
     if (uuid) {
       route += `&scope=${uuid}`;
     }
+    if (sort && sort.direction && sort.field && sort.field !== 'id') {
+      route += `&sort=${sort.field}&sort_direction=${sort.direction}`;
+    }
     if (query) {
       route += `&query=${query}`;
     } else {
       route += `&query=*`;
     }
-    route = '/' + opensearch + route;
+    if (configuration) {
+      route += `&configuration=${configuration}`;
+    }
+    if (pageSize) {
+      route += `&rpp=${pageSize}`;
+    }
+    if (searchFilters) {
+      for (const filter of searchFilters) {
+        for (const val of filter.values) {
+          route += '&' + filter.key + '=' + encodeURIComponent(val) + (filter.operator ? ',' + filter.operator : '');
+        }
+      }
+    }
+    if (fixedFilter) {
+      route += '&' + fixedFilter;
+    }
+    route = '/' + opensearch + '?' + route;
     return route;
   }
 
@@ -169,4 +204,5 @@ export class RSSComponent implements OnInit, OnDestroy  {
       title: 'Sitewide RSS feed',
     });
   }
+
 }

From 5173b28b5adeac5a55c42f6f3e2b5c6ed7c321ba Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 14:48:59 -0300
Subject: [PATCH 0955/1286] Configuring the URI link target

(cherry picked from commit 0ef2db146bc6c965e15582713e3a16ab4136c04b)
---
 .../metadata-values/metadata-values.component.html   |  5 ++++-
 .../metadata-values/metadata-values.component.ts     | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 44a3657fa5..4fc0b41136 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -18,7 +18,10 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
+    <a class="dont-break-out ds-simple-metadata-link"
+      [href]="value"
+      [attr.target]="getLinkAttributes(value).target"
+      [attr.rel]="getLinkAttributes(value).rel">
       {{value}}
     </a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 1a73d692eb..9a6f184414 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -134,4 +134,16 @@ export class MetadataValuesComponent implements OnChanges {
   hasInternalLink(linkValue: string): boolean {
     return linkValue.startsWith(environment.ui.baseUrl);
   }
+
+  /**
+   * This method performs a validation and determines the target of the url.
+   * @returns - Returns the target url.
+   */
+ getLinkAttributes(urlValue: string): { target: string, rel: string } {
+    if (this.hasInternalLink(urlValue)) {
+      return { target: '_self', rel: '' };
+    } else {
+      return { target: '_blank', rel: 'noopener noreferrer' };
+    }
+  }
 }

From f8431dbdd7f74e70457a397e4c99e42168f8cba2 Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 15:15:26 -0300
Subject: [PATCH 0956/1286] fix identation

(cherry picked from commit d7869f408ef221bc614547534a57b9b63a0aeef3)
---
 .../metadata-values/metadata-values.component.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 9a6f184414..354879de2b 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -139,7 +139,7 @@ export class MetadataValuesComponent implements OnChanges {
    * This method performs a validation and determines the target of the url.
    * @returns - Returns the target url.
    */
- getLinkAttributes(urlValue: string): { target: string, rel: string } {
+  getLinkAttributes(urlValue: string): { target: string, rel: string } {
     if (this.hasInternalLink(urlValue)) {
       return { target: '_self', rel: '' };
     } else {

From 8a778f6c3d57507b9b707dc368366971e7a3462c Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 11 Dec 2024 13:07:48 -0300
Subject: [PATCH 0957/1286] Addition of unit tests for the getLinkAttributes()
 method

(cherry picked from commit 8572bfb1b1d1b053547047344e92bdae753ee44e)
---
 .../metadata-values.component.spec.ts            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 8e93175c46..5670128733 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -83,4 +83,20 @@ describe('MetadataValuesComponent', () => {
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
+  it('should return correct target and rel for internal links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(true);
+    const urlValue = '/internal-link';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_self');
+    expect(result.rel).toBe('');
+  });
+
+  it('should return correct target and rel for external links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(false);
+    const urlValue = 'https://www.dspace.org';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_blank');
+    expect(result.rel).toBe('noopener noreferrer');
+  });
+
 });

From 25ab69ff213f80e1cc48704317abeee92a6071dc Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 14:48:59 -0300
Subject: [PATCH 0958/1286] Configuring the URI link target

---
 .../metadata-values.component.html            |  5 ++++-
 .../metadata-values.component.ts              | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index a598815d4c..a9576da26a 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -18,7 +18,10 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
+    <a class="dont-break-out ds-simple-metadata-link"
+      [href]="value"
+      [attr.target]="getLinkAttributes(value).target"
+      [attr.rel]="getLinkAttributes(value).rel">
       {{value}}
     </a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index cbbae9006d..20df92099f 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -4,6 +4,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
 import { hasValue } from '../../../shared/empty.util';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
+import { environment } from '../../../../environments/environment';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -90,4 +91,25 @@ export class MetadataValuesComponent implements OnChanges {
     }
     return queryParams;
   }
+
+  /**
+   * Checks if the given link value is an internal link.
+   * @param linkValue - The link value to check.
+   * @returns True if the link value starts with the base URL defined in the environment configuration, false otherwise.
+   */
+  hasInternalLink(linkValue: string): boolean {
+    return linkValue.startsWith(environment.ui.baseUrl);
+  }
+
+  /**
+   * This method performs a validation and determines the target of the url.
+   * @returns - Returns the target url.
+   */
+ getLinkAttributes(urlValue: string): { target: string, rel: string } {
+    if (this.hasInternalLink(urlValue)) {
+      return { target: '_self', rel: '' };
+    } else {
+      return { target: '_blank', rel: 'noopener noreferrer' };
+    }
+  }
 }

From 2a1ef02d7583eacb2e59d58c33486102ba6e2f17 Mon Sep 17 00:00:00 2001
From: igorbaptist4 <igor.baptista@neki-it.com.br>
Date: Wed, 11 Sep 2024 15:15:26 -0300
Subject: [PATCH 0959/1286] fix identation

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

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 20df92099f..a902e48ed1 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -105,7 +105,7 @@ export class MetadataValuesComponent implements OnChanges {
    * This method performs a validation and determines the target of the url.
    * @returns - Returns the target url.
    */
- getLinkAttributes(urlValue: string): { target: string, rel: string } {
+  getLinkAttributes(urlValue: string): { target: string, rel: string } {
     if (this.hasInternalLink(urlValue)) {
       return { target: '_self', rel: '' };
     } else {

From c6ef2f1bd095e5e1bd417600cc817198cd8fd494 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Wed, 11 Dec 2024 13:07:48 -0300
Subject: [PATCH 0960/1286] Addition of unit tests for the getLinkAttributes()
 method

---
 .../metadata-values.component.spec.ts            | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 23f8098207..de46cd9e4c 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -73,4 +73,20 @@ describe('MetadataValuesComponent', () => {
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
+  it('should return correct target and rel for internal links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(true);
+    const urlValue = '/internal-link';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_self');
+    expect(result.rel).toBe('');
+  });
+
+  it('should return correct target and rel for external links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(false);
+    const urlValue = 'https://www.dspace.org';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_blank');
+    expect(result.rel).toBe('noopener noreferrer');
+  });
+
 });

From 6425ec7d5e5407be1fadd4e5346f84e465feca14 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 13:44:31 -0300
Subject: [PATCH 0961/1286] Adding the aria-label attribute to buttons

(cherry picked from commit 9565f9b9ee96b763ea22c39a0faf4e49cdab84ae)
---
 .../vocabulary-treeview.component.html         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 758d1426e0..6a4d9ea87d 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -6,16 +6,20 @@
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
-        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
+        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -91,13 +95,15 @@
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>

From e173153e7da09e9c451ca22abf383dd94f0be76a Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 14:01:44 -0300
Subject: [PATCH 0962/1286] Adding focus to the input after the reset button is
 clicked

(cherry picked from commit e54b1ce274febd27e6a3c47bfa14e8be82eb5d8e)
---
 .../vocabulary-treeview.component.html                    | 2 +-
 .../vocabulary-treeview/vocabulary-treeview.component.ts  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 6a4d9ea87d..782eb24be4 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -2,7 +2,7 @@
 <div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+      <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
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 cd836a4a47..8ed1c769e5 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -8,6 +8,7 @@ import {
 } from '@angular/common';
 import {
   Component,
+  ElementRef,
   EventEmitter,
   Input,
   OnChanges,
@@ -15,6 +16,7 @@ import {
   OnInit,
   Output,
   SimpleChanges,
+  ViewChild,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -70,6 +72,11 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
+  /**
+   * Implemented to manage focus on input
+   */
+  @ViewChild('searchInput') searchInput: ElementRef;
+
   /**
    * The {@link VocabularyOptions} object
    */
@@ -332,6 +339,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
+    this.searchInput.nativeElement.focus();
   }
 
   add() {

From 8e25c178eb43b3c4db8ab2b9e6da1d5095fad472 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 15:08:53 -0300
Subject: [PATCH 0963/1286] =?UTF-8?q?Ensuring=20that=20the=20message=20?=
 =?UTF-8?q?=E2=80=9CThere=20were=20no=20items=20to=20show=E2=80=9D=20is=20?=
 =?UTF-8?q?announced=20to=20the=20screen=20reader=20when=20necessary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3658ad1ec09ce6a314dad7e8c5339c2a18cff6e4)
---
 .../vocabulary-treeview.component.html                    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 782eb24be4..f55f26aa68 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -28,9 +28,11 @@
 </div>
 <div class="treeview-container">
   <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
-  <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
-    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h2>
+  <div aria-live="polite">
+    <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
+      <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+    </h2>
+  </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">

From 5d410b7c533324ef2fe1e33e31a173ee0bc17613 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 16:18:56 -0300
Subject: [PATCH 0964/1286] Trying to correct an error in the focus
 implementation

(cherry picked from commit 73d39abfe562a3ecd8b6e4ed20e8744a177ea1de)
---
 .../vocabulary-treeview/vocabulary-treeview.component.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 8ed1c769e5..89d908ec7f 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -75,7 +75,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
   /**
    * Implemented to manage focus on input
    */
-  @ViewChild('searchInput') searchInput: ElementRef;
+  @ViewChild('searchInput') searchInput!: ElementRef;
 
   /**
    * The {@link VocabularyOptions} object
@@ -339,7 +339,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
-    this.searchInput.nativeElement.focus();
+    if (this.searchInput) {
+      this.searchInput.nativeElement.focus();
+    }
   }
 
   add() {

From b601405e564bf6c668a3cd6086c6c9d9a56eb2f8 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 13:44:31 -0300
Subject: [PATCH 0965/1286] Adding the aria-label attribute to buttons

---
 .../vocabulary-treeview.component.html            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index a0d320a854..a37b26e348 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -6,13 +6,16 @@
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
-        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()"
+                [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed"
+                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -88,13 +91,15 @@
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
+              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>

From 14680b013e5c7ced5d4243806a7d7a027111620d Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 14:01:44 -0300
Subject: [PATCH 0966/1286] Adding focus to the input after the reset button is
 clicked

---
 .../vocabulary-treeview.component.html                    | 2 +-
 .../vocabulary-treeview/vocabulary-treeview.component.ts  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index a37b26e348..a216384c9c 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -2,7 +2,7 @@
 <div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+      <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
              [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
              [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
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 b1edda461e..2602cfd75e 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -1,5 +1,5 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
 
 import { Observable, Subscription } from 'rxjs';
 import { Store } from '@ngrx/store';
@@ -29,6 +29,11 @@ import { AlertType } from '../../alert/alert-type';
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
+  /**
+   * Implemented to manage focus on input
+   */
+  @ViewChild('searchInput') searchInput: ElementRef;
+
   /**
    * The {@link VocabularyOptions} object
    */
@@ -294,6 +299,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
+    this.searchInput.nativeElement.focus();
   }
 
   add() {

From 75260b00d95d6bf3024a9387127ebab65e64b368 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 15:08:53 -0300
Subject: [PATCH 0967/1286] =?UTF-8?q?Ensuring=20that=20the=20message=20?=
 =?UTF-8?q?=E2=80=9CThere=20were=20no=20items=20to=20show=E2=80=9D=20is=20?=
 =?UTF-8?q?announced=20to=20the=20screen=20reader=20when=20necessary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vocabulary-treeview.component.html                    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index a216384c9c..ad894328a6 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -24,9 +24,11 @@
 </div>
 <div class="treeview-container">
   <ds-themed-loading *ngIf="loading | async" [showMessage]="false"></ds-themed-loading>
-  <h2 *ngIf="!(loading | async) && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
-    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h2>
+  <div aria-live="polite">
+    <h2 *ngIf="!(loading | async) && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
+      <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+    </h2>
+  </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">

From a8ff6a41e051cb68c6083da2df588888d37e2903 Mon Sep 17 00:00:00 2001
From: andreaNeki <andrea.montoya@neki-it.com.br>
Date: Fri, 27 Sep 2024 16:18:56 -0300
Subject: [PATCH 0968/1286] Trying to correct an error in the focus
 implementation

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

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 2602cfd75e..5695644040 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -32,7 +32,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
   /**
    * Implemented to manage focus on input
    */
-  @ViewChild('searchInput') searchInput: ElementRef;
+  @ViewChild('searchInput') searchInput!: ElementRef;
 
   /**
    * The {@link VocabularyOptions} object
@@ -299,7 +299,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
-    this.searchInput.nativeElement.focus();
+    if (this.searchInput) {
+      this.searchInput.nativeElement.focus();
+    }
   }
 
   add() {

From abc3c41c635e5d8df49c75cddab40aa2951bcbb2 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 18 Nov 2024 14:07:34 +0100
Subject: [PATCH 0969/1286] [DURACOM-297] fix changing values in submission
 form after ordering

(cherry picked from commit 1c9272107c427e3c1210c9df2c3f859da2463278)
---
 .../array-group/dynamic-form-array.component.html   |  6 +++---
 .../array-group/dynamic-form-array.component.ts     | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index dd19e6158d..a7a6b103e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -7,9 +7,9 @@
       <!-- Draggable Container -->
       <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups; let idx = index"
+        <div *ngFor="let groupModel of model.groups"
              role="group"
-             [formGroupName]="idx"
+             [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
              cdkDrag
              [cdkDragDisabled]="dragDisabled"
@@ -25,7 +25,7 @@
                                              [formGroup]="group"
                                              [formModel]="formModel"
                                              [context]="groupModel"
-                                             [group]="control.get([idx])"
+                                             [group]="getControlOfGroup(groupModel)"
                                              [hidden]="_model.hidden"
                                              [class.d-none]="_model.hidden"
                                              [layout]="formLayout"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 9d48bdac21..1cbee3eb90 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -81,4 +81,17 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   get dragDisabled(): boolean {
     return this.model.groups.length === 1 || !this.model.isDraggable;
   }
+
+  /**
+   * Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
+   * already have it. This ensures that the controls are always linked to the correct group model.
+   * @param groupModel The group model to get the control for.
+   * @returns The form control of the specified group model.
+   */
+  getControlOfGroup(groupModel: any) {
+    if (!groupModel.hasOwnProperty('startingIndex')) {
+      groupModel.startingIndex = groupModel.index;
+    }
+    return this.control.get([groupModel.startingIndex]);
+  }
 }

From bb608d919f5957f01e9d64de826ee82f0b6ce7f6 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 18 Nov 2024 14:07:34 +0100
Subject: [PATCH 0970/1286] [DURACOM-297] fix changing values in submission
 form after ordering

(cherry picked from commit 1c9272107c427e3c1210c9df2c3f859da2463278)
---
 .../array-group/dynamic-form-array.component.html   |  6 +++---
 .../array-group/dynamic-form-array.component.ts     | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index dd19e6158d..a7a6b103e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -7,9 +7,9 @@
       <!-- Draggable Container -->
       <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups; let idx = index"
+        <div *ngFor="let groupModel of model.groups"
              role="group"
-             [formGroupName]="idx"
+             [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
              cdkDrag
              [cdkDragDisabled]="dragDisabled"
@@ -25,7 +25,7 @@
                                              [formGroup]="group"
                                              [formModel]="formModel"
                                              [context]="groupModel"
-                                             [group]="control.get([idx])"
+                                             [group]="getControlOfGroup(groupModel)"
                                              [hidden]="_model.hidden"
                                              [class.d-none]="_model.hidden"
                                              [layout]="formLayout"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 4c45393c92..0ae397ce61 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -114,4 +114,17 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   get dragDisabled(): boolean {
     return this.model.groups.length === 1 || !this.model.isDraggable;
   }
+
+  /**
+   * Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
+   * already have it. This ensures that the controls are always linked to the correct group model.
+   * @param groupModel The group model to get the control for.
+   * @returns The form control of the specified group model.
+   */
+  getControlOfGroup(groupModel: any) {
+    if (!groupModel.hasOwnProperty('startingIndex')) {
+      groupModel.startingIndex = groupModel.index;
+    }
+    return this.control.get([groupModel.startingIndex]);
+  }
 }

From 85a120da62a8d00729f9826a8fc1142688830e01 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 20 Dec 2024 14:28:22 +0100
Subject: [PATCH 0971/1286] add German translation of process view related keys

---
 src/assets/i18n/de.json5 | 50 +++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 29f2ebe2c1..189a599cf0 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4203,33 +4203,67 @@
 
 
 
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.finish": "Finish time",
   "process.overview.table.finish": "Schlusszeit",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Prozess ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Name",
 
-  // "process.overview.table.start" : "Start time",
+  // "process.overview.table.start": "Start time",
   "process.overview.table.start": "Startzeit",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Benutzer:in",
 
   // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Überblick der Prozesse",
+  "process.overview.title": "Übersicht der Prozesse",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs": "Überblick der Prozesse",
+  "process.overview.breadcrumbs": "Übersicht der Prozesse",
 
   // "process.overview.new": "New",
   "process.overview.new": "Neu",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Aktionen",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Lösche {{count}} Prozesse",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Lösche Prozess",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Auswahl aufheben",
+
+  // "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": "Es werden {{count}} Prozesse gelöscht. Diese Aktion kann einige Zeit dauern. Bitte warten Sie bis zum Abschluss der Aktion.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Wollen Sie tatsächlich {{count}} Prozesse löschen?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Prozess löschen",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Unbekannt",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Fehler beim Löschen des Prozesses",
+
+  // "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": "Der Prozess mit ID {{processId}} konnte nicht gelöscht werden. Es wird versucht, die verbleibenden Prozesse zu löschen.",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "Es wurden {{count}} Prozesse erfolgreich gelöscht.",
+
+
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil aktualisieren",

From a18225aa4d38ce481cb75476fa16b0bcebce8b5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 02:28:39 +0000
Subject: [PATCH 0972/1286] Bump mirador from 3.3.0 to 3.4.2

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.3.0 to 3.4.2.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.3.0...v3.4.2)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 93c54cc7b7..613def9edf 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.2",
     "markdown-it-mathjax3": "^4.3.2",
-    "mirador": "^3.3.0",
+    "mirador": "^3.4.2",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index f1fcbe2cc2..fc1475cd45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1864,7 +1864,7 @@
   resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@material-ui/core@^4.11.0", "@material-ui/core@^4.12.4":
+"@material-ui/core@^4.12.3", "@material-ui/core@^4.12.4":
   version "4.12.4"
   resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz"
   integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
@@ -8212,12 +8212,12 @@ mirador-share-plugin@^0.16.0:
   dependencies:
     notistack "^3.0.1"
 
-mirador@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz"
-  integrity sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==
+mirador@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.2.tgz#51ec7ca1b9854792bbe2fa5e13b3692c92e97102"
+  integrity sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==
   dependencies:
-    "@material-ui/core" "^4.11.0"
+    "@material-ui/core" "^4.12.3"
     "@material-ui/icons" "^4.9.1"
     "@material-ui/lab" "^4.0.0-alpha.53"
     "@researchgate/react-intersection-observer" "^1.0.0"
@@ -8234,7 +8234,7 @@ mirador@^3.3.0:
     lodash "^4.17.11"
     manifesto.js "^4.2.0"
     normalize-url "^4.5.0"
-    openseadragon "^2.4.2"
+    openseadragon "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0"
     prop-types "^15.6.2"
     re-reselect "^4.0.0"
     react-aria-live "^2.0.5"
@@ -8764,10 +8764,10 @@ open@8.4.2, open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-openseadragon@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz"
-  integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
+"openseadragon@^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-5.0.1.tgz#ad3aaccc6c0f733c3153131e9af05bc2e17a1952"
+  integrity sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==
 
 openurl@1.1.1:
   version "1.1.1"

From 5c8eabddab7c4432942bdf1c52b5175481c1f233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 02:28:53 +0000
Subject: [PATCH 0973/1286] Bump @fortawesome/fontawesome-free from 6.6.0 to
 6.7.2

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.6.0 to 6.7.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.6.0...6.7.2)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 93c54cc7b7..dc984272f9 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "@angular/compiler-cli": "^15.2.10",
     "@angular/language-service": "^15.2.10",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.6.0",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@ngrx/store-devtools": "^15.4.0",
diff --git a/yarn.lock b/yarn.lock
index f1fcbe2cc2..ce0490ec10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1749,10 +1749,10 @@
   resolved "https://registry.yarnpkg.com/@fastify/deepmerge/-/deepmerge-1.3.0.tgz#8116858108f0c7d9fd460d05a7d637a13fe3239a"
   integrity sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==
 
-"@fortawesome/fontawesome-free@^6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224"
-  integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==
+"@fortawesome/fontawesome-free@^6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"

From 36701bcf205eb56db494b3e2a8908217cb4d147b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:00:12 +0000
Subject: [PATCH 0974/1286] Bump webpack from 5.96.1 to 5.97.1 in the webpack
 group

Bumps the webpack group with 1 update: [webpack](https://github.com/webpack/webpack).


Updates `webpack` from 5.96.1 to 5.97.1
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.96.1...v5.97.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: webpack
...

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

diff --git a/package.json b/package.json
index 4ff9e864e6..da3728913b 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.96.1",
+    "webpack": "5.97.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 3ff9257102..7002f593f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3180,125 +3180,125 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz#8b840305a6b48e8764803435ec0c716fa27d3802"
   integrity sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
+"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.12.1", "@webassemblyjs/ast@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
+  integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-numbers" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+"@webassemblyjs/floating-point-hex-parser@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb"
+  integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==
 
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+"@webassemblyjs/helper-api-error@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7"
+  integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==
 
-"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
+"@webassemblyjs/helper-buffer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b"
+  integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==
 
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+"@webassemblyjs/helper-numbers@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d"
+  integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/floating-point-hex-parser" "1.13.2"
+    "@webassemblyjs/helper-api-error" "1.13.2"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
+"@webassemblyjs/helper-wasm-bytecode@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b"
+  integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==
 
-"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
+"@webassemblyjs/helper-wasm-section@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348"
+  integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/wasm-gen" "1.14.1"
 
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
+"@webassemblyjs/ieee754@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba"
+  integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
+"@webassemblyjs/leb128@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0"
+  integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+"@webassemblyjs/utf8@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1"
+  integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
 
-"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
+"@webassemblyjs/wasm-edit@^1.12.1", "@webassemblyjs/wasm-edit@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597"
+  integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.12.1"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/helper-wasm-section" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-opt" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+    "@webassemblyjs/wast-printer" "1.14.1"
 
-"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+"@webassemblyjs/wasm-gen@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570"
+  integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
 
-"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
+"@webassemblyjs/wasm-opt@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b"
+  integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
+"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.12.1", "@webassemblyjs/wasm-parser@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb"
+  integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
 
-"@webassemblyjs/wast-printer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
+"@webassemblyjs/wast-printer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07"
+  integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/ast" "1.14.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.1":
@@ -11153,16 +11153,16 @@ webpack@5.94.0:
     watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
-webpack@5.96.1:
-  version "5.96.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.1.tgz#3676d1626d8312b6b10d0c18cc049fba7ac01f0c"
-  integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==
+webpack@5.97.1:
+  version "5.97.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58"
+  integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.6"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
+    "@webassemblyjs/ast" "^1.14.1"
+    "@webassemblyjs/wasm-edit" "^1.14.1"
+    "@webassemblyjs/wasm-parser" "^1.14.1"
     acorn "^8.14.0"
     browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"

From 4223abd601e970542ebe1fcedae8539d16ff55f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:00:27 +0000
Subject: [PATCH 0975/1286] Bump @fortawesome/fontawesome-free from 6.6.0 to
 6.7.2

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.6.0 to 6.7.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.6.0...6.7.2)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 4ff9e864e6..35a2c0a79d 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.11",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@ngrx/store-devtools": "^17.1.1",
diff --git a/yarn.lock b/yarn.lock
index 3ff9257102..89352f8605 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1849,10 +1849,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@fortawesome/fontawesome-free@^6.4.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz#0e984f0f2344ee513c185d87d77defac4c0c8224"
-  integrity sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==
+"@fortawesome/fontawesome-free@^6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
 
 "@gar/promisify@^1.0.1":
   version "1.1.3"

From c67861692a35ad3c0ac1be7e5d921dc785042180 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:00:28 +0000
Subject: [PATCH 0976/1286] Bump cypress in the testing group across 1
 directory

Bumps the testing group with 1 update in the / directory: [cypress](https://github.com/cypress-io/cypress).


Updates `cypress` from 13.16.0 to 13.17.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.16.0...v13.17.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
...

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 4ff9e864e6..9231c4a063 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.3",
-    "cypress": "^13.16.0",
+    "cypress": "^13.17.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
diff --git a/yarn.lock b/yarn.lock
index 3ff9257102..46c05a93a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4594,10 +4594,10 @@ cypress-axe@^1.5.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@^13.16.0:
-  version "13.16.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.16.0.tgz#7674ca33941f9da58f15fd4e3456856d87730970"
-  integrity sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==
+cypress@^13.17.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.17.0.tgz#34c3d68080c4497eace0f353bd1629587a5f600d"
+  integrity sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==
   dependencies:
     "@cypress/request" "^3.0.6"
     "@cypress/xvfb" "^1.2.4"

From d4d36f010539943f88b0f0eaf23ab75d5d29b3c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:00:49 +0000
Subject: [PATCH 0977/1286] Bump postcss in the postcss group across 1
 directory

Bumps the postcss group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.47 to 8.4.49
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.47...8.4.49)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: postcss
...

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

diff --git a/yarn.lock b/yarn.lock
index 3ff9257102..a3dbce3ef6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8571,7 +8571,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -8950,12 +8950,12 @@ postcss@8.4.35:
     source-map-js "^1.0.2"
 
 postcss@^8.2.14, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
-  version "8.4.47"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
-  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.1.0"
+    picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:

From 3f8ef9be9ddb9a0a6be09919b7a1d92ec09b1c5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:01:29 +0000
Subject: [PATCH 0978/1286] Bump mirador from 3.3.0 to 3.4.2

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.3.0 to 3.4.2.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.3.0...v3.4.2)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 4ff9e864e6..91bfc28fe4 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "mirador": "^3.3.0",
+    "mirador": "^3.4.2",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 3ff9257102..e8927f0835 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1970,7 +1970,7 @@
   dependencies:
     call-bind "^1.0.7"
 
-"@material-ui/core@^4.11.0", "@material-ui/core@^4.12.4":
+"@material-ui/core@^4.12.3", "@material-ui/core@^4.12.4":
   version "4.12.4"
   resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
   integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
@@ -7816,12 +7816,12 @@ mirador-share-plugin@^0.16.0:
   dependencies:
     notistack "^3.0.1"
 
-mirador@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.3.0.tgz#7a957a1db1a5388b2b8cafab00db4eb9f97557b9"
-  integrity sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==
+mirador@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.2.tgz#51ec7ca1b9854792bbe2fa5e13b3692c92e97102"
+  integrity sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==
   dependencies:
-    "@material-ui/core" "^4.11.0"
+    "@material-ui/core" "^4.12.3"
     "@material-ui/icons" "^4.9.1"
     "@material-ui/lab" "^4.0.0-alpha.53"
     "@researchgate/react-intersection-observer" "^1.0.0"
@@ -7838,7 +7838,7 @@ mirador@^3.3.0:
     lodash "^4.17.11"
     manifesto.js "^4.2.0"
     normalize-url "^4.5.0"
-    openseadragon "^2.4.2"
+    openseadragon "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0"
     prop-types "^15.6.2"
     re-reselect "^4.0.0"
     react-aria-live "^2.0.5"
@@ -8306,10 +8306,10 @@ open@8.4.2, open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-openseadragon@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c"
-  integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
+"openseadragon@^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-5.0.1.tgz#ad3aaccc6c0f733c3153131e9af05bc2e17a1952"
+  integrity sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==
 
 optionator@^0.9.3:
   version "0.9.4"

From b583e1788075917b644e3f88da07fa6458d3e7d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:03:54 +0000
Subject: [PATCH 0979/1286] Bump @fortawesome/fontawesome-free from 6.6.0 to
 6.7.2

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.6.0 to 6.7.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.6.0...6.7.2)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 5d9f49d1f6..8363dd25ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -90,7 +90,7 @@
         "@angular/compiler-cli": "^17.3.11",
         "@angular/language-service": "^17.3.12",
         "@cypress/schematic": "^1.5.0",
-        "@fortawesome/fontawesome-free": "^6.6.0",
+        "@fortawesome/fontawesome-free": "^6.7.2",
         "@ngrx/store-devtools": "^17.1.1",
         "@ngtools/webpack": "^16.2.16",
         "@types/deep-freeze": "0.1.5",
@@ -4993,9 +4993,9 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
-      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
       "dev": true,
       "engines": {
         "node": ">=6"
diff --git a/package.json b/package.json
index 3a78d5e05f..b9d752e2b8 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.12",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.6.0",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@ngrx/store-devtools": "^17.1.1",
     "@ngtools/webpack": "^16.2.16",
     "@types/deep-freeze": "0.1.5",

From 741cf66518bd18797911d1996115598cd1dba001 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:04:05 +0000
Subject: [PATCH 0980/1286] Bump mirador from 3.3.0 to 3.4.2

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.3.0 to 3.4.2.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.3.0...v3.4.2)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 5d9f49d1f6..1d7b147eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,7 +59,7 @@
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
-        "mirador": "^3.3.0",
+        "mirador": "^3.4.2",
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
@@ -16596,11 +16596,11 @@
       }
     },
     "node_modules/mirador": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz",
-      "integrity": "sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.2.tgz",
+      "integrity": "sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==",
       "dependencies": {
-        "@material-ui/core": "^4.11.0",
+        "@material-ui/core": "^4.12.3",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
         "@researchgate/react-intersection-observer": "^1.0.0",
@@ -16617,7 +16617,7 @@
         "lodash": "^4.17.11",
         "manifesto.js": "^4.2.0",
         "normalize-url": "^4.5.0",
-        "openseadragon": "^2.4.2",
+        "openseadragon": "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0",
         "prop-types": "^15.6.2",
         "re-reselect": "^4.0.0",
         "react-aria-live": "^2.0.5",
diff --git a/package.json b/package.json
index 3a78d5e05f..d97c476128 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "mirador": "^3.3.0",
+    "mirador": "^3.4.2",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",

From d61cb33f9a116d1e669d0f5ee6310755e5bd697f Mon Sep 17 00:00:00 2001
From: "Gantner, Florian Klaus" <florian.gantner@uni-bamberg.de>
Date: Fri, 27 Dec 2024 13:14:30 +0100
Subject: [PATCH 0981/1286] change search filter isOpenByDefault
 autoserialization

https://github.com/DSpace/DSpace/issues/9404
---
 src/app/shared/search/models/search-filter-config.model.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/search/models/search-filter-config.model.ts b/src/app/shared/search/models/search-filter-config.model.ts
index 4498ba5763..5ec6b0720f 100644
--- a/src/app/shared/search/models/search-filter-config.model.ts
+++ b/src/app/shared/search/models/search-filter-config.model.ts
@@ -52,7 +52,7 @@ export class SearchFilterConfig implements CacheableObject {
     /**
      * Defines if the item facet is collapsed by default or not on the search page
      */
-    @autoserialize
+    @autoserializeAs(Boolean, 'openByDefault')
       isOpenByDefault: boolean;
 
     /**

From 4dcc7c282d08a2fdc36cadeedb3a603979d282b6 Mon Sep 17 00:00:00 2001
From: "Gantner, Florian Klaus" <florian.gantner@uni-bamberg.de>
Date: Sat, 28 Dec 2024 12:58:18 +0100
Subject: [PATCH 0982/1286] translation keys for datacite project import

https://github.com/DSpace/DSpace/issues/9636
---
 src/assets/i18n/en.json5 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 249544cbd5..48234a6322 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2808,6 +2808,8 @@
 
   "item.preview.dc.date.issued": "Published date:",
 
+  "item.preview.dc.description": "Description:",
+
   "item.preview.dc.description.abstract": "Abstract:",
 
   "item.preview.dc.identifier.other": "Other identifier:",
@@ -2846,6 +2848,8 @@
 
   "item.preview.project.funder.identifier": "Funder Identifier:",
 
+  "item.preview.project.investigator": "Project Investigator",
+
   "item.preview.oaire.awardNumber": "Funding ID:",
 
   "item.preview.dc.title.alternative": "Acronym:",
@@ -4792,6 +4796,8 @@
 
   "submission.import-external.source.datacite": "DataCite",
 
+  "submission.import-external.source.dataciteProject": "DataCite",
+
   "submission.import-external.source.doi": "DOI",
 
   "submission.import-external.source.scielo": "SciELO",

From 33fdee554ec4921cc5b11e00cebbc41b6fddcd2a Mon Sep 17 00:00:00 2001
From: jensvannerum <78496674+jensvannerum@users.noreply.github.com>
Date: Wed, 1 Jan 2025 10:50:30 +0100
Subject: [PATCH 0983/1286] [Port dspace-7_x] Get rid of unnecessary and
 failing REST requests when navigating between different browse indexes
 (#3788)

Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Jens Vannerum <jens.vannerum@atmire.com>
---
 .../browse-by-date-page.component.ts           | 18 +++++++++---------
 .../browse-by-metadata-page.component.ts       |  8 ++++++--
 .../browse-by-title-page.component.ts          |  8 +++-----
 src/app/menu.resolver.spec.ts                  | 11 +++++++----
 src/app/menu.resolver.ts                       | 17 ++++++++++++++---
 5 files changed, 39 insertions(+), 23 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 d3c832d3e2..7e0b6f0f88 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,8 +1,7 @@
 import { ChangeDetectorRef, Component, Inject } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions,
-  getBrowseSearchOptions
+  browseParamsToOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
@@ -11,7 +10,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
@@ -52,15 +51,16 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   ngOnInit(): void {
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), currentPage, currentSort];
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.currentPagination$,
+          this.currentSort$]).pipe(
+        map(([routeParams, queryParams, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), currentPage, currentSort];
         })
       ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
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 c03cf03429..fe407a2fb0 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,7 @@ 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 { filter, map, mergeMap } from 'rxjs/operators';
+import { filter, map, mergeMap, take } 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';
@@ -152,7 +152,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest(
+        [ this.route.params.pipe(take(1)),
+          this.route.queryParams,
+          this.currentPagination$,
+          this.currentSort$]).pipe(
         map(([routeParams, queryParams, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
         })
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 58df79ebe8..11dc2a2a6a 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -4,13 +4,13 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
   BrowseByMetadataPageComponent,
-  browseParamsToOptions, getBrowseSearchOptions
+  browseParamsToOptions
 } from '../browse-by-metadata-page/browse-by-metadata-page.component';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -38,12 +38,10 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
+      observableCombineLatest([this.route.params.pipe(take(1)), this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
         map(([routeParams, queryParams, currentPage, currentSort]) => {
           return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
         })
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 838d5a53c5..12d5efa24e 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -16,9 +16,11 @@ import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { MenuID } from './shared/menu/menu-id.model';
 import { BrowseService } from './core/browse/browse.service';
 import { cold } from 'jasmine-marbles';
-import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
+import createSpy = jasmine.createSpy;
+import { AuthService } from './core/auth/auth.service';
+import { AuthServiceStub } from './shared/testing/auth-service.stub';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -61,6 +63,7 @@ describe('MenuResolver', () => {
         { provide: BrowseService, useValue: browseService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: AuthService, useValue: AuthServiceStub },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
@@ -80,19 +83,19 @@ describe('MenuResolver', () => {
   describe('resolve', () => {
     it('should create all menus', (done) => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true));
 
       resolver.resolve(null, null).subscribe(resolved => {
         expect(resolved).toBeTrue();
         expect(resolver.createPublicMenu$).toHaveBeenCalled();
-        expect(resolver.createAdminMenu$).toHaveBeenCalled();
+        expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled();
         done();
       });
     });
 
     it('should return an Observable that emits true as soon as all menus are created', () => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN));
 
       expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN));
     });
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index cad6a6ec57..83c9351c7f 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest as observableCombineLatest, combineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { MenuID } from './shared/menu/menu-id.model';
 import { MenuState } from './shared/menu/menu-state.model';
 import { MenuItemType } from './shared/menu/menu-item-type.model';
@@ -12,7 +12,7 @@ import { RemoteData } from './core/data/remote-data';
 import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
 import { BrowseService } from './core/browse/browse.service';
 import { MenuService } from './shared/menu/menu.service';
-import { filter, find, map, take } from 'rxjs/operators';
+import { filter, find, map, mergeMap, take } from 'rxjs/operators';
 import { hasValue } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
@@ -47,6 +47,7 @@ import {
 import {
   ExportBatchSelectorComponent
 } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { AuthService } from './core/auth/auth.service';
 
 /**
  * Creates all of the app's menus
@@ -61,6 +62,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected authorizationService: AuthorizationDataService,
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
+    protected authService: AuthService,
   ) {
   }
 
@@ -70,7 +72,7 @@ export class MenuResolver implements Resolve<boolean> {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return combineLatest([
       this.createPublicMenu$(),
-      this.createAdminMenu$(),
+      this.createAdminMenuIfLoggedIn$(),
     ]).pipe(
       map((menusDone: boolean[]) => menusDone.every(Boolean)),
     );
@@ -146,6 +148,15 @@ export class MenuResolver implements Resolve<boolean> {
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  /**
+   * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in.
+   */
+  createAdminMenuIfLoggedIn$() {
+    return this.authService.isAuthenticated().pipe(
+      mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)),
+    );
+  }
+
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */

From ecf3298345373aa51cb7c6523761b0f9d4f0a6f7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:34:37 +0100
Subject: [PATCH 0984/1286] fix value of selector in component annotation

(cherry picked from commit 71de4b600b8ed268cbc88a1191f6c2f931e23705)
---
 .../org-unit-search-result-list-submission-element.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ef58007bae..76a5618292 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
@@ -22,7 +22,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.inter
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
-  selector: 'ds-person-search-result-list-submission-element',
+  selector: 'ds-org-unit-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html'
 })

From d61d223d56dfddff4fdec5612d112cdc65c3e7d2 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:34:37 +0100
Subject: [PATCH 0985/1286] fix value of selector in component annotation

(cherry picked from commit 71de4b600b8ed268cbc88a1191f6c2f931e23705)
---
 .../org-unit-search-result-list-submission-element.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b2e62fcb37..cff764d744 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
@@ -33,7 +33,7 @@ import { OrgUnitInputSuggestionsComponent } from './org-unit-suggestions/org-uni
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
-  selector: 'ds-person-search-result-list-submission-element',
+  selector: 'ds-org-unit-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html',
   standalone: true,

From 323370ee0408e7e55afe962d787e8479d375e6a2 Mon Sep 17 00:00:00 2001
From: nwoodward <woodward.nicholas@gmail.com>
Date: Mon, 9 Dec 2024 11:27:00 -0600
Subject: [PATCH 0986/1286] fixed typo in descrption

(cherry picked from commit c67dc4d8e4d276a56e6700160a7c503f58f33bcd)
---
 src/assets/i18n/en.json5    | 4 ++--
 src/assets/i18n/pt-BR.json5 | 8 ++++----
 src/assets/i18n/pt-PT.json5 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 497949c5d4..d279b666a2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1034,11 +1034,11 @@
 
   "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
 
-  "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
 
   "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
 
-  "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
 
   "browse.metadata.title.breadcrumbs": "Browse by Title",
 
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index ad738401af..2a326cf181 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1547,14 +1547,14 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Navegue por Categoria de Assunto",
 
-  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
-  "browse.metadata.srsc.tree.descrption": "Selecione um assunto para adicionar como filtro de pesquisa",
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Selecione um assunto para adicionar como filtro de pesquisa",
 
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Navegue pelo Índice de Ciência Norueguês",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecione um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecione um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 0683f242e9..43027abe0f 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1568,8 +1568,8 @@
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecionar um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecionar um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",

From 2cde0d3f213873d62bf6c71ddbeaa4b042c60ba1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 3 Jan 2025 07:09:44 +0100
Subject: [PATCH 0987/1286] Fixed dropdown/lookup & lookup-name fields being
 reset when hitting enter (#3724)

---
 .../models/lookup/dynamic-lookup.component.html           | 7 ++++---
 .../dynamic-scrollable-dropdown.component.html            | 8 +++++---
 src/app/shared/form/form.service.ts                       | 3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 89e7af9aa6..79f2756b24 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -94,11 +94,12 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled"
+      <button class="dropdown-item disabled" type="button"
               *ngIf="optionsList && optionsList.length === 0"
-              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
+              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">
+        {{ 'form.no-results' | translate }}
       </button>
-      <button class="dropdown-item lookup-item"
+      <button class="dropdown-item lookup-item" type="button"
               *ngFor="let listEntry of optionsList"
               (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
               title="{{ listEntry.display }}">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index b4e6ac2c44..bcb83cea11 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -40,17 +40,19 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      <button class="dropdown-item disabled" type="button" *ngIf="optionsList && optionsList.length === 0">
+        {{ 'form.no-results' | translate }}
+      </button>
       <button class="dropdown-item collection-item text-truncate"
               (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
               title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
-      >
+              type="button">
         <i>{{ 'dropdown.clear' | translate }}</i>
       </button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option"
+              title="{{ listEntry.display }}" role="option" type="button"
               [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index 1ca844d690..11fe5c54de 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -153,6 +153,9 @@ export class FormService {
   }
 
   public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
+    if (field.errors === null) {
+      return;
+    }
     const errors: string[] = Object.keys(field.errors)
       .filter((errorKey) => field.errors[errorKey] === true)
       .map((errorKey) => `error.validation.${errorKey}`);

From d1d9f2f7f9b17b19fa6cedb87e4d0cd46c6418d2 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 3 Jan 2025 10:25:37 +0300
Subject: [PATCH 0988/1286] README.md: update Node.js and NPM versions

Angular 17.x needs Node.js 18.x or 20.x, which come with NPM v10.

See: https://angular.dev/reference/versions
See: https://nodejs.org/en/about/previous-releases#looking-for-latest-release-of-a-version-branch
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 783e60efba..c5ad7fc7ed 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x`**
+**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x`**
 
 ```bash
 # clone the repo
@@ -90,7 +90,7 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org)
--	Ensure you're running node `v16.x` or `v18.x`
+-	Ensure you're running node `v18.x` or `v20.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 

From f993ced1b71711e100584718721546873f3c3c2c Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 3 Jan 2025 10:30:30 +0300
Subject: [PATCH 0989/1286] README.md: update Node.js and NPM versions

Angular 17.x needs Node.js 18.x or 20.x, which come with NPM v10.

See: https://angular.dev/reference/versions
See: https://nodejs.org/en/about/previous-releases#looking-for-latest-release-of-a-version-branch
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ebc24f8b91..fe2af85aa4 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x` and [yarn](https://yarnpkg.com) == `v1.x`**
 
 ```bash
 # clone the repo
@@ -90,7 +90,7 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.x`
+-	Ensure you're running node `v18.x` or `v20.x` and yarn == `v1.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 

From 01cb2c7429a99c8e8fba23fbd17a1436a71f0ed7 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Fri, 3 Jan 2025 10:14:47 -0300
Subject: [PATCH 0990/1286] Fixing space error and adding new translation keys

---
 src/assets/i18n/es.json5 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 3766ebdca1..859fa5e8ad 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8133,7 +8133,7 @@
 
   // "browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
-  
+
   // "file-download-link.download": "Download ",
   "file-download-link.download": "Descargar ",
 
@@ -8721,4 +8721,13 @@
 
   // "quality-assurance.event.reason": "Reason",
   "quality-assurance.event.reason": "Motivo",
+
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidad",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "colección",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
 }

From e04cdef4297c34d8a27cfe407e6ada870ec78296 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 30 Dec 2024 08:00:05 +0100
Subject: [PATCH 0991/1286] Update ca.json5

---
 src/assets/i18n/ca.json5 | 4022 +++++++++++++++++++++++++++++++-------
 1 file changed, 3328 insertions(+), 694 deletions(-)

diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index c382a90a81..019cef8dab 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -6,10 +6,8 @@
   // "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",
-
-
+  // "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.",
@@ -17,10 +15,10 @@
   // "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",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibit",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "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.",
@@ -29,27 +27,26 @@
   // "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",
+  // "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.401": "Unauthorized",
+  "error-page.description.401": "No autoritzat",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibit",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibit",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "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.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",
@@ -90,7 +87,7 @@
   // "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": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear format de fitxer",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -194,7 +191,11 @@
 
   // "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.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formats de fitxer seleccionats",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -215,7 +216,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registre de format Fitxer",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registre de metadades",
@@ -241,9 +246,18 @@
   // "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.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionat",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemes seleccionats",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -256,14 +270,18 @@
   // "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.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Camps de metadades de l'esquema",
 
@@ -275,7 +293,11 @@
 
   // "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.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Camps de metadades seleccionats",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -335,7 +357,29 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre d'esquemes de metadades",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestió d'accés massiu",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultats de la cerca",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Pas 1: Seleccionar objectes",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Cerca",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecció actual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Pas 2: Operació a realitzar",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Eliminar usuari",
@@ -355,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuaris",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nou usuari",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nou usuari",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Afegir usuari",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Afegir usuari",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuaris",
 
@@ -367,7 +423,7 @@
   // "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": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -385,7 +441,7 @@
   // "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": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -415,10 +471,10 @@
   // "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": "Email",
   "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": "Must be a valid email 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",
@@ -472,14 +528,12 @@
   // "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.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "S'ha produït un error en intentar eliminar l'usuari amb id \"{{id}}\" amb codi: \"{{statusCode}}\" i missatge: \"{{restResponse.errorMessage}}\"",
 
   // "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",
 
@@ -549,8 +603,6 @@
   // "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.",
 
@@ -626,12 +678,6 @@
   // "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",
 
@@ -716,9 +762,6 @@
   // "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 }}\"",
 
@@ -746,410 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Enrere",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Assegurament de la Qualitat",
 
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Assegurament de la Qualitat",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Assegurament de la Qualitat",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "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.editGroupPage": "En aquesta pàgina, podeu modificar les propietats i els membres d'un grup. A la secció superior, podeu editar el nom i la descripció del grup, tret que sigui un grup d'administració d'una col·lecció o comunitat, en aquest cas el nom i la descripció del grup es generen automàticament i no es poden editar. A les seccions següents, podeu editar la pertinença al grup. Consulteu [el wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) per a més detalls.",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per afegir o eliminar un usuari d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar usuaris (utilitzeu el menú desplegable a l'esquerra de la barra de cerca per triar si voleu cercar per metadades o per correu electrònic). A continuació, feu clic a la icona de més per a cada usuari que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada usuari que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per afegir o eliminar un subgrup d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar grups. A continuació, feu clic a la icona de més per a cada grup que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada grup que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar col·leccions",
 
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de col·lecció",
 
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultats d'ítems",
 
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunitat",
 
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Col·lecció",
 
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. Ítems",
 
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidint amb tots els filtres seleccionats",
 
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de consulta de metadades",
 
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de consulta de metadades",
 
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Executar consulta d'ítems",
 
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selector de col·lecció",
 
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultes de camps de metadades",
 
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultes predefinides",
 
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.exists": "exists",
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Consulta paginada",
 
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límit/",
 
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.equals": "equals",
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplaçament",
 
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Tot el repositori",
 
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.like": "like",
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Qualsevol camp",
 
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.notLike": "not like",
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existeix",
 
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.contains": "contains",
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existeix",
 
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "igual a",
 
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.matches": "matches",
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no és igual a",
 
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "com",
 
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "no com",
 
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "conté",
 
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no conté",
 
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincideix",
 
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincideix",
 
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nova consulta",
 
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "No té títol",
 
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "No té dc.identifier.uri",
 
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Té matèria composta",
 
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Té autor compost dc.contributor.author",
 
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Té creador compost dc.creator",
 
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Té URL a dc.description",
 
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "Té text complet a dc.description.provenance",
 
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Té text no complet a dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Té metadades buides",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Té metadades ininterrompudes a la descripció",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Té entitat XML a les metadades",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Té caràcter no ASCII a les metadades",
+
+  // "admin.reports.items.number": "No.",
   "admin.reports.items.number": "No.",
 
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
+  // "admin.reports.items.id": "UUID",
   "admin.reports.items.id": "UUID",
 
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Col·lecció",
 
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
+  // "admin.reports.items.handle": "URI",
   "admin.reports.items.handle": "URI",
 
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Títol",
 
 
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtres",
 
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
-  "admin.reports.commons.additional-data": "Additional data to return",
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Dades addicionals a retornar",
 
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pàgina anterior",
 
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pàgina següent",
 
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Pàgina",
 
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
-  "admin.reports.commons.of": "of",
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
 
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar per a l'actualització de metadades",
 
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Deseleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Seleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincideix amb tots els filtres especificats",
 
 
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property": "Item Property Filters",
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtres de propietats d'ítems",
 
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "És ítem - sempre cert",
 
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirats",
 
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - No retirats",
 
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems descobribles - No privats",
 
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "No descobrible - Ítem privat",
 
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtres bàsics de fitxers",
 
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "L'ítem té múltiples fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "L'ítem no té fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "L'ítem té un fitxer original",
 
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtres de fitxers per tipus MIME",
 
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "L'ítem té un fitxer original de document (PDF, Office, Text, HTML, XML, etc)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "L'ítem té un fitxer original d'imatge",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Té altres tipus de fitxers (no document o imatge)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "L'ítem té múltiples tipus de fitxers originals (document, imatge, altres)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "L'ítem té un fitxer original PDF",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "L'ítem té un fitxer original JPG",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Té un PDF inusualment petit",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Té un PDF inusualment gran",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Té fitxer de document sense ítem de TEXT",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtres de tipus MIME suportats",
 
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Els fitxers d'imatge de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "L'ítem té un fitxer d'imatge que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Els fitxers de document de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "L'ítem té un fitxer de document que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtres de paquets de fitxers",
 
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Té fitxer en un paquet no suportat",
 
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Té una miniatura inusualment petita",
 
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Té fitxer original sense miniatura",
 
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Té un nom de miniatura invàlid (suposa una miniatura per a cada original)",
 
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Té una miniatura no generada",
 
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No té llicència",
 
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Té documentació en el paquet de llicència",
 
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtres de permisos",
 
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "L'ítem té un fitxer original restringit",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "L'ítem té almenys un fitxer original que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "L'ítem té una miniatura restringida",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "L'ítem té almenys una miniatura que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "L'ítem té metadades restringides",
 
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "L'ítem té metadades que no són accessibles per a l'usuari anònim",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Cerca administrativa",
@@ -1187,9 +1148,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Cerca administrativa",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Administrar flux de treball",
 
@@ -1199,13 +1157,20 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Flux de treball",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Espai 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.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Polítiques",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisió",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importa metadades",
@@ -1231,6 +1196,9 @@
   // "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.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "És possible realitzar la importació amb la càrrega de fitxers o mitjançant URL, utilitzeu el camp superior per establir la font d'entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Deixeu anar un CSV de metadades per importar",
 
@@ -1255,15 +1223,114 @@
   // "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.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Introduïu primer l'URL del fitxer!",
+
+  // "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.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Pujar",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Introduïu l'URL del fitxer ZIP per importar",
+
   // "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.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Valoració",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Heu de valorar l'ítem",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisió",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Heu d'introduir una revisió per enviar aquesta valoració",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Seleccioneu una valoració a continuació",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Seleccioneu una valoració a continuació i afegiu també una revisió",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Seleccioneu un únic revisor a continuació abans d'enviar",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Seleccioneu un o més revisors a continuació abans d'enviar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Afegir usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Examinar tot",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membres actuals",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Cerca",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nom",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Correu electrònic",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Eliminar / Afegir",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Eliminar membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membre afegit correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "No s'ha pogut afegir el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membre eliminat correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "No s'ha pogut eliminar el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Afegir membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No hi ha un grup actiu actual, envieu primer un nom.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Encara no hi ha membres al grup, cerqueu i afegiu.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No s'han trobat usuaris en aquesta cerca",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No s'ha seleccionat cap revisor.",
+
   // "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.",
 
@@ -1279,15 +1346,12 @@
   // "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": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Descarregant {{ bitstream }}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "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",
 
@@ -1324,7 +1388,7 @@
   // "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": "Primary File",
   "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\".",
@@ -1339,6 +1403,9 @@
   // "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.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "S'ha produït un error en desar el fitxer principal",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -1363,7 +1430,6 @@
   // "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.",
 
@@ -1387,6 +1453,7 @@
 
   // "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. ",
 
@@ -1396,7 +1463,7 @@
   // "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": "Your email 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.",
@@ -1429,8 +1496,6 @@
   // "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",
 
@@ -1443,6 +1508,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Per matèria",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Per categoria de matèria",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Per Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Per títol",
 
@@ -1464,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Títol",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoria de matèria",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Cerca per autor",
 
@@ -1473,6 +1547,18 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Examinar per matèria",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Examinar per categoria de matèria",
+
+  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.descrption": "Seleccioneu una matèria per afegir com a filtre de cerca",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar per Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.descrption": "Seleccioneu un índex per afegir com a filtre de cerca",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar per títol",
 
@@ -1485,6 +1571,9 @@
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
   "pagination.next.button.disabled.tooltip": "No hi ha més pàgines de resultats",
 
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control per a la navegació de pàgines, relativa a l'element amb ID: ",
+
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", començant per {{ startsWith }}",
 
@@ -1554,17 +1643,38 @@
   // "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.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinant {{ collection }} per {{ field }} {{ value }}",
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Examinar",
 
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinant per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinant per {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Tornar als resultats",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Treu xip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Aprovat",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Rebutjat, retornat al remitent",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Rebutjat, retornat al flux de treball del gestor de revisions",
+
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear col·lecció",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Cerca un logotip de col·lecció",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una col·lecció",
@@ -1599,8 +1709,6 @@
   // "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ó",
 
@@ -1610,8 +1718,6 @@
   // "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",
 
@@ -1672,7 +1778,6 @@
   // "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",
 
@@ -1700,15 +1805,17 @@
   // "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.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Control d'accés",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Edició de col·lecció - Control d'accés",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curar",
@@ -1797,8 +1904,6 @@
   // "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",
 
@@ -1835,8 +1940,6 @@
   // "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ó",
 
@@ -1864,18 +1967,14 @@
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "Tipus d'Entitat",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Col·lecció",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotip de la 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.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Cerca",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar aquesta col·lecció",
@@ -1889,7 +1988,8 @@
   // "collection.page.news": "News",
   "collection.page.news": "Notícies",
 
-
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultats de la cerca",
 
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar selecció",
@@ -1897,66 +1997,93 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hi ha col·leccions per mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Col·leccions seleccionades",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar col·lecció",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar col·lecció",
+
   // "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",
 
@@ -1969,7 +2096,20 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar més",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Contraure {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Cerca un logotip de comunitat",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunitats i col·leccions",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunitat",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunitat",
@@ -2013,20 +2153,25 @@
   // "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-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminació",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Desfer eliminació",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.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": "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": "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",
@@ -2038,31 +2183,33 @@
   // "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": "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": "An error occurred 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.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Control d'accés",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Edició de la comunitat - Control d'accés",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadades",
 
@@ -2081,12 +2228,11 @@
   // "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",
 
-
+  // "community.logo": "Community logo",
+  "community.logo": "Logotip de la comunitat",
 
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Cap",
@@ -2106,28 +2252,24 @@
   // "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",
 
@@ -2137,38 +2279,38 @@
   // "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.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuaris i Grups que poden llegir nous fitxers enviats a aquesta col·lecció. Els canvis en aquest rol no són retroactius. Els fitxers 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.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.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Revisors de puntuació",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Els revisors poden donar una puntuació als enviaments entrants, això definirà si l'enviament serà rebutjat o no.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Breu descripció",
@@ -2203,14 +2345,15 @@
   // "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.search.results.head": "Search Results",
+  "community.search.results.head": "Resultats de la cerca",
+
+  // "community.sub-collection-list.head": "Collections in 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": "Communities in this Community",
   "community.sub-community-list.head": "Comunitats d'aquesta comunitat",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Acceptar tot",
 
@@ -2241,14 +2384,17 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Declinar",
 
+  // "cookies.consent.decline-all": "Decline all",
+  "cookies.consent.decline-all": "Rebutjar tot",
+
   // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "D'acord",
 
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Guardar",
 
-  // "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": "We collect and process your personal information for the following purposes: {purposes}",
+  "cookies.consent.content-notice.description": "Recopilem i processem la vostra informació personal amb les finalitats següents: {purposes}",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalitzar",
@@ -2262,6 +2408,9 @@
   // "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.no-privacy-policy.text": "",
+  "cookies.consent.content-modal.no-privacy-policy.text": "",
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informació que recopilem",
 
@@ -2271,38 +2420,30 @@
   // "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",
 
@@ -2315,10 +2456,10 @@
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Compartició",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "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": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprovar enllaços a metadades",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2339,8 +2480,6 @@
   // "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:",
 
@@ -2356,7 +2495,7 @@
   // "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": "An error occurred 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",
@@ -2368,8 +2507,6 @@
   // "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 }}>",
 
@@ -2388,12 +2525,17 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Sol·licitud de còpia de document denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Esborrar selecció",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Esborrar l'opció seleccionada",
 
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sense títol",
 
-
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sense nom",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova col·lecció",
@@ -2449,6 +2591,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Cerca un/a {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunitat",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "col·lecció",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccionar una col·lecció",
 
@@ -2479,6 +2630,45 @@
   // "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 ↻",
 
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selector de grup de supervisió",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "CAP",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleccioneu un grup",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Cancel·lar",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Guardar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Seleccioneu un grup",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ordre de supervisió creada correctament per al grup {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Error",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Ja existeix una ordre de supervisió en aquest ítem per al grup seleccionat",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exporta metadades per a {{ dsoName }}",
 
@@ -2515,6 +2705,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Esteu segur que voleu eliminar el logotip?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Esborrar Perfil",
 
@@ -2527,6 +2720,17 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Eliminar subscripció",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Esteu segur que voleu eliminar la subscripció per a \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Cancel·lar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Eliminar",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Error en obtenir el fitxer",
@@ -2582,6 +2786,9 @@
   // "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.cclicense.required": "You must grant this cclicense to complete your submission. If you are unable to grant the cclicense at this time, you may save your work and return later or remove the submission.",
+  "error.validation.cclicense.required": "Heu de concedir aquesta llicència CC per completar l'enviament. Si no podeu concedir aquesta llicència CC 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 }}.",
 
@@ -2591,25 +2798,45 @@
   // "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": "This 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": "This email 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",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu els camps Element i Qualificador en lloc d'això",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Aquest camp no pot contenir més de 32 caràcters",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Aquest camp no pot contenir més de 256 caràcters",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu el camp Qualificador en lloc d'això",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Aquest camp no pot contenir més de 64 caràcters",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Aquest camp no pot contenir més de 64 caràcters",
 
   // "feed.description": "Syndication feed",
   "feed.description": "Fil de sindicació",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Fitxer restringit",
 
   // "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 }}",
 
@@ -2625,13 +2852,14 @@
   // "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": "End User Agreement",
   "footer.link.end-user-agreement": "Acord d'usuari final",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Suggeriments",
 
-
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Oblit de contrasenya",
@@ -2645,8 +2873,8 @@
   // "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.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "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.",
@@ -2663,10 +2891,8 @@
   // "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-email.form.error.content": "An error occurred 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 en intentar restablir la contrasenya del compte associat a la següent adreça de correu electrònic: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Oblit de contrasenya",
@@ -2692,8 +2918,8 @@
   // "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.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "Introduïu una contrasenya al camp a continuació.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Les contrasenyes no coincideixen.",
@@ -2710,7 +2936,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Envia contrasenya",
 
-
   // "form.add": "Add more",
   "form.add": "Afegir més",
 
@@ -2771,6 +2996,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No s'ha introduït cap valor",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Correu electrònic",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nom",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Al index de Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institució",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Cognoms",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Eliminar",
 
@@ -2789,19 +3032,26 @@
   // "form.submit": "Save",
   "form.submit": "Guardar",
 
+  // "form.create": "Create",
+  "form.create": "Crear",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Disminuir {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "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": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Missatge opcional addicional",
 
   // "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",
@@ -2839,11 +3089,6 @@
   // "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",
 
@@ -2853,23 +3098,22 @@
   // "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.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "S'enviarà un missatge al sol·licitant de la petició. S'adjuntaran els documents sol·licitats.",
 
   // "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": "Health",
   "health-page.heading": "Revisió de salut",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Informació",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Estat",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2920,7 +3164,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No s'han detectat problemes",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2939,8 +3182,6 @@
   // "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.",
 
@@ -2965,6 +3206,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Acord d'usuari final",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "els Estats Units",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Declaració de privadesa",
 
@@ -2998,22 +3242,26 @@
   // "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": "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.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": "A comment is required",
   "info.feedback.error.message.required": "Es requereix un comentari",
 
-  // "info.feedback.page-label" : "Page",
+  // "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": "The page related to your feedback",
   "info.feedback.page_help": "La pàgina relacionada amb el vostre suggeriment",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Suport COAR Notify",
 
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Suport COAR Notify",
 
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Aquest ítem és privat",
@@ -3021,7 +3269,11 @@
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Aquest ítem ha estat retirat",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Sol·licitar reintegració",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Sol·licitat per",
 
   // "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.",
@@ -3029,16 +3281,12 @@
   // "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",
 
@@ -3072,8 +3320,6 @@
   // "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",
 
@@ -3089,6 +3335,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "PAQUET: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Fitxers en el paquet {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Podeu moure un fitxer a una pàgina diferent deixant-lo anar al número de pàgina.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3107,9 +3359,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Desfer canvis",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha estat retornat a la posició {{ toIndex }} i ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperant que es completi el moviment.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ara està en la posició {{ toIndex }}.",
+
   // "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.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Els fitxers es poden reordenar dins dels seus paquets mantenint el mànec d'arrossegament i movent el ratolí. Alternativament, els fitxers es poden moure utilitzant el teclat de la següent manera: seleccioneu el fitxer prement enter quan el mànec d'arrossegament del fitxer estigui enfocat. Moveu el fitxer cap amunt o cap avall utilitzant les tecles de fletxa. Premeu enter de nou per confirmar la posició actual del fitxer.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Accions",
 
@@ -3164,8 +3434,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Pujar",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancel·lar",
 
@@ -3193,13 +3461,75 @@
   // "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.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconegut",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En cua per a registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "En cua per a reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrat",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservat",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En cua per a actualització i registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "En cua per a eliminació",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminat",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Pendent (no registrat)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Creat (no registrat)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrar un DOI nou o pendent",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrar DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registrar un DOI nou o pendent",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Reviseu qualsevol identificador pendent i les metadades de l'ítem a continuació i feu clic a Confirmar per continuar amb el registre del DOI, o Cancel·lar per sortir",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Cancel·lar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI en cua per a registre amb èxit.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Error en registrar el DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "El següent DOI ja ha estat creat i es posarà en cua per a registre en línia",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Assignar ítem a col·leccions seleccionades",
 
@@ -3254,14 +3584,27 @@
   // "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.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clau d'autoritat",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
 
@@ -3274,6 +3617,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
 
+  // "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.edit.buttons.virtual": "Aquest és un valor de metadada virtual, és a dir, un valor heretat d'una entitat relacionada. No es pot modificar directament. Afegiu o elimineu la relació corresponent a la pestanya \"Relacions\"",
+
   // "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.",
 
@@ -3289,6 +3635,12 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar camp",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
 
@@ -3322,10 +3674,20 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Desfer reordenació",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoritat: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquejar el valor de la clau d'autoritat per a l'edició manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquejar el valor de la clau d'autoritat per a l'edició manual",
 
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Camp",
@@ -3336,8 +3698,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Enrere",
 
@@ -3362,6 +3722,9 @@
   // "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.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertència: Quan està habilitat, la política d'accés de lectura per a l'ítem i qualsevol fitxer associat amb l'ítem serà reemplaçada per la política d'accés de lectura predeterminada de la col·lecció. Això no es pot desfer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Moure",
 
@@ -3377,8 +3740,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Moure ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancel·lar",
 
@@ -3397,8 +3758,6 @@
   // "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",
 
@@ -3417,8 +3776,6 @@
   // "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",
 
@@ -3437,8 +3794,6 @@
   // "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",
 
@@ -3484,11 +3839,9 @@
   // "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",
 
@@ -3501,6 +3854,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Edició d'ítem: Curar",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar ítem: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Control d'accés",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Edició d'ítem: Control d'accés",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadades",
 
@@ -3531,8 +3893,8 @@
   // "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.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Moure aquest ítem a una col·lecció diferent",
 
   // "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ó",
@@ -3558,8 +3920,8 @@
   // "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.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar aquest ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositori",
@@ -3600,8 +3962,6 @@
   // "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",
 
@@ -3623,7 +3983,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Enrere",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3657,7 +4016,68 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraure",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
 
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Veure",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Veure",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Esteu segur que voleu eliminar l'ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel·lar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Eliminar",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "S'ha eliminat correctament l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "No s'ha pogut eliminar l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisat per:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Eliminar grup de supervisió",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Aquest valor d'autoritat ha estat confirmat com a exacte per un usuari interactiu",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor és singular i vàlid, però no ha estat vist i acceptat per un humà, per tant, encara és incert",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hi ha múltiples valors d'autoritat coincidents amb igual validesa",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hi ha respostes coincidents a l'autoritat",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "L'autoritat ha trobat un error intern",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "L'autoritat recomana que aquest enviament sigui rebutjat",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "No s'ha retornat cap valor de confiança raonable de l'autoritat",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Mai es va registrar la confiança per aquest valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confiança desconegut",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resum",
@@ -3749,10 +4169,13 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraure",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
+  // "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": "License bundle",
   "item.page.filesection.license.bundle": "Paquet de llicències",
 
   // "item.page.return": "Back",
@@ -3761,6 +4184,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nova versió",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Sol·licitar la retirada d'aquest ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Sol·licitar la reintegració",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress 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",
 
@@ -3770,6 +4199,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclamar aquest ítem com a perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR logo",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -3797,27 +4229,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipus:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "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.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "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": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista o Sèrie",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editorial:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Cognoms:",
 
@@ -3845,13 +4280,44 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línia de finançament:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
 
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Data de fundació",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nom legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipus d'entitat:",
 
   // "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.empty": "No hi ha ítems per mostrar",
+
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionats",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3862,7 +4328,6 @@
   // "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.",
 
@@ -3923,14 +4388,21 @@
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress 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.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Sol·licitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Sol·licitar reintegració",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.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",
 
@@ -3943,34 +4415,75 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nova versió",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar sol·licitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancel·lar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.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.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar sol·licitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resum",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Està sol·licitant retirar aquest ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Està sol·licitant reintegrar aquest ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Introduïu el motiu de la reintegració",
+
   // "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ó",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduïu el motiu de la reintegració",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creant nova versió...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviant sol·licitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Sol·licitud de reintegració enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Sol·licitud de retirada enviada.",
+
   // "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": "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": "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 in-progress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress 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ó",
 
@@ -3989,20 +4502,107 @@
   // "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": "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": "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": "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": "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}}",
 
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Afegir",
 
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Eliminar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfer canvis",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "La plantilla d'ítem actualment no conté cap metadada. Feu clic a Afegir per començar a afegir un valor de metadades.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Camp",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar camp",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Els teus canvis han sigut descartats. Per restaurar els teus canvis feu clic al botó 'Desfer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Canvis descartats",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "S'ha produït un error",
+
+  // "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.content": "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadades invàlides",
+
+  // "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.content": "Un altre usuari ha canviat la plantilla d'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "S'han desat els canvis a les metadades d'aquesta plantilla d'ítem.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadades desades",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Desfer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Desfer reordenació",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Guardar",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
@@ -4034,8 +4634,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Cerca de revistes",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Número de la revista",
 
@@ -4063,7 +4661,8 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
-
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultats de la cerca de números de la revista",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volum de la revista",
@@ -4083,6 +4682,8 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volum",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultats de la cerca de volums de la revista",
 
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Suport del document",
@@ -4117,7 +4718,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripció: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Carregant fitxer...",
 
@@ -4172,8 +4772,6 @@
   // "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",
 
@@ -4186,9 +4784,6 @@
   // "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",
 
@@ -4210,8 +4805,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Iniciar sessió",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Tancar sessió a DSpace",
 
@@ -4221,7 +4814,8 @@
   // "logout.title": "Logout",
   "logout.title": "Tancar sessió",
 
-
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegació d'administració",
 
   // "menu.header.admin": "Management",
   "menu.header.admin": "Administració",
@@ -4232,41 +4826,33 @@
   // "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_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestió massiva d'accés",
+
   // "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.reports": "Reports",
-  // TODO New key - Add a translation
-  "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
 
   // "menu.section.reports.collections": "Filtered Collections",
-  // TODO New key - Add a translation
-  "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Col·leccions filtrades",
 
   // "menu.section.reports.queries": "Metadata Query",
-  // TODO New key - Add a translation
-  "menu.section.reports.queries": "Metadata Query",
-
-
+  "menu.section.reports.queries": "Consulta de metadades",
 
   // "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",
 
@@ -4291,22 +4877,24 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Per tema",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Per categoria de matèria",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Per Norwegian Science Index",
+
   // "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",
 
@@ -4319,8 +4907,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Ítem",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
 
@@ -4339,13 +4925,11 @@
   // "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.reports": "Reports menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
+  "menu.section.icon.reports": "Secció del menú d'informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Secció del menú de cerca d'administrador",
@@ -4392,7 +4976,8 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Secció del menú de notificacions",
 
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
@@ -4403,8 +4988,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadades",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nou",
 
@@ -4423,7 +5006,14 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Procés",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificacions",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assegurament de la Qualitat",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamació de Publicació",
 
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Ancorar barra lateral",
@@ -4431,16 +5021,12 @@
   // "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",
 
@@ -4450,23 +5036,18 @@
   // "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.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secció de Control d'accés",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar secció d'Informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la secció del Panell de control",
 
@@ -4494,19 +5075,18 @@
   // "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",
 
@@ -4585,18 +5165,21 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sense títol",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sense URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "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": "Your submissions",
   "mydspace.show.workspace": "Els seus enviaments",
 
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Ítems supervisats",
+
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Arxivat",
 
@@ -4630,7 +5213,17 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Veure",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hem trobat <b>{{count}} publicacions</b> a {{source}} que semblen estar relacionades amb el vostre perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar les suggerències",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Si us plau",
 
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tot DSpace",
@@ -4638,13 +5231,16 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Per comunitat",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Alternar ajuda contextual",
+
   // "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": "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",
@@ -4662,21 +5258,236 @@
   // "nav.search": "Search",
   "nav.search": "Cerca",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Enviar 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.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscripcions",
+
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegació",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil d'usuari",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Assegurament de la Qualitat",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuació podeu veure totes les fonts de notificació.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temes actuals",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fonts actuals",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Font",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Últim esdeveniment",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Accions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostra temes per a {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostra suggeriments per a {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No s'han trobat temes.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No s'han trobat fonts.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Suggeriments d'assegurament de la qualitat",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "S'ha produït un error en carregar els temes d'assegurament de la qualitat",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "S'ha produït un error en carregar la font d'assegurament de la qualitat",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Carregant ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No s'han trobat suggeriments.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confiança",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicació",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalls",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalls del projecte",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Raons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Accions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Acceptar suggeriment",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar suggeriment",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Eliminar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rebutjar suggeriment",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar projecte i acceptar suggeriment",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipus de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor de PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resum:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Dades del projecte suggerit per OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Títol del projecte:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrònim:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Codi:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Finançador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de finançament:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicció:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Tornar als temes",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Tornar a les fonts",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menys",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar més",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No s'ha trobat cap registre local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Estàs segur?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Aquesta operació no es pot desfer. Ignorar aquest suggeriment?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "Aquesta operació no es pot desfer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Aquesta operació no es pot desfer. Rebutjar aquest suggeriment?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No s'ha seleccionat cap projecte DSpace. Es crearà un nou projecte basat en les dades del suggeriment.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "La vostra decisió s'ha desat correctament.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "S'ha produït un error. La vostra decisió no s'ha desat.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Trieu un projecte per enllaçar",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicació:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Cerca de projectes",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Cerca",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Netejar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Projecte enllaçat",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduïu un nom de projecte",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No s'ha trobat cap projecte.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El projecte s'ha enllaçat correctament.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El projecte s'ha desvinculat correctament.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "S'ha produït un error. No s'ha realitzat cap operació.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Raó",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unitat organitzativa",
@@ -4705,7 +5516,11 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unitat organitzativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opcions de paginació",
@@ -4722,8 +5537,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opcions d'ordenació",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
 
@@ -4772,11 +5585,21 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Cerca de persones",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Paràmetres",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar paràmetre",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Afegir un paràmetre...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar paràmetre",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del paràmetre",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancel·lar",
 
@@ -4822,6 +5645,9 @@
   // "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.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "El fitxer supera la mida màxima de càrrega",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Crea un nou procés",
 
@@ -4831,18 +5657,16 @@
   // "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": "Arguments",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any 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": "Back",
   "process.detail.back": "Enrere",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Sortida del procés",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4854,28 +5678,28 @@
   // "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": "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": "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.script": "Script",
+  "process.detail.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Procés: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora d'inici",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de finalització",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Estat",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Crear un procés similar",
 
   // "process.detail.actions": "Actions",
@@ -4902,24 +5726,52 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Alguna cosa ha fallat eliminant el procés",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualització automàtica…",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalització (UTC)",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processos completats amb èxit",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No s'han trobat processos coincidents.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalització (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processos fallits",
+
+  // "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": "Process ID",
   "process.overview.table.id": "ID de procés",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora d'inici (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processos en execució",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creació (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processos programats",
+
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora d'inici (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Estat",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuari",
 
   // "process.overview.title": "Processes Overview",
@@ -4937,6 +5789,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} processos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar procés",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Netejar la selecció",
 
@@ -4949,6 +5804,9 @@
   // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "Elimina processos",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconegut",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminant procés",
 
@@ -4958,8 +5816,6 @@
   // "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",
 
@@ -4978,9 +5834,6 @@
   // "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",
 
@@ -5089,8 +5942,6 @@
   // "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ó",
 
@@ -5124,7 +5975,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Cerca de publicacions",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Següent",
 
@@ -5134,6 +5984,104 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Llista de reproducció",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Carregant ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamació de Publicació",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamació de Publicació",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuació podeu veure totes les suggerències ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Suggeriments actuals",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nom del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Accions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} suggeriment(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} suggeriment(s) per a ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "No s'ha trobat cap objectiu.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "S'ha produït un error en carregar els objectius de suggeriment",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipus",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuació",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprovar i importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "El suggeriment s'ha importat correctament. <a href='{{ url }}'>Veure.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprovar i importar seleccionats",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggeriments s'han importat correctament ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggeriments no s'han importat a causa d'errors inesperats del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar suggeriment",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "El suggeriment ha estat descartat",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar suggeriments seleccionats",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggeriments han estat descartats ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggeriments no han estat descartats a causa d'errors inesperats del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Veure evidència",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Amagar evidència",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Suggeriments per a",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Suggeriments per a {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gràfic OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "de la ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "No tens reclamacions de publicació restants",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuació total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Registre de nou usuari",
@@ -5198,7 +6146,6 @@
   // "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",
 
@@ -5211,8 +6158,11 @@
   // "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.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Si us plau, introduïu una adreça de correu electrònic vàlida.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilitzeu correu electrònic amb dominis permesos: {{ domains }}",
 
   // "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ó.",
@@ -5229,7 +6179,7 @@
   // "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": "An error occurred 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",
@@ -5238,6 +6188,9 @@
   // "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.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Aquesta adreça de correu electrònic no està a la llista de dominis que es poden registrar. Els dominis permesos són {{ domains }}",
+
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
   "register-page.registration.google-recaptcha.open-cookie-settings": "Obrir configuració de cookies",
 
@@ -5250,6 +6203,9 @@
   // "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.",
 
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Es poden registrar comptes per a adreces de correu electrònic dels dominis",
+
   // "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",
 
@@ -5271,12 +6227,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistes",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volum de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unitats organitzatives",
 
@@ -5301,6 +6263,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volums de revistes",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volum de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Col·laboradors",
 
@@ -5313,16 +6278,14 @@
   // "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 ::",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositori DSpace",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositori DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Afegir",
@@ -5441,7 +6404,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Màxim 30 caràcters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5474,6 +6437,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grup",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar tot",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar tot",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5498,7 +6473,8 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Polítiques per a la col·lecció",
 
-
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contingut principal",
 
   // "search.description": "",
   "search.description": "",
@@ -5515,6 +6491,11 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Cerca al repositori ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtre de tipus {{ type }} amb valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Títol",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
@@ -5537,6 +6518,12 @@
   // "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.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nom del fitxer",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripció del fitxer",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipus",
 
@@ -5558,10 +6545,41 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Data de naixement, inicial",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisat per",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirat",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no igual",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " no autoritat",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " conté",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no conté",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Títol",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Títol",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Cerca per Títol",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -5665,6 +6683,24 @@
   // "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.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Cerca per Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Cerca per Descripció del fitxer",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipus",
 
@@ -5773,6 +6809,20 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Navega per l'arbre {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Finançament",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Finançament",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Cerca Supervisat per",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
@@ -5783,6 +6833,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unitat organitzativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projecte",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicació",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -5795,13 +6854,27 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Arxivat",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validació",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "Esperant el revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flux de treball",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espai de treball",
+
   // "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",
 
@@ -5811,7 +6884,26 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Iguals",
 
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No iguals",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoritat",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "No autoritat",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Conté",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No conté",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
 
   // "search.form.search": "Search",
   "search.form.search": "Cerca",
@@ -5822,8 +6914,6 @@
   // "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",
 
@@ -5848,7 +6938,6 @@
   // "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",
 
@@ -5867,11 +6956,24 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar per",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Cerca avançada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar per",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtres",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadors",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Afegir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configuració",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detall",
 
@@ -5881,7 +6983,11 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostra com a llista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
 
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendent",
@@ -5919,6 +7025,23 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificació Descendent",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Cognoms Ascendent",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Cognoms Descendent",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nom Ascendent",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nom Descendent",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Data de naixement Ascendent",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Data de naixement Descendent",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Estadístiques",
@@ -5953,7 +7076,8 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visites",
 
-
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(no s'ha pogut carregar el nom de l'objecte)",
 
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar enviament",
@@ -5964,7 +7088,7 @@
   // "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": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "No teniu els permisos per fer un enviament nou.",
 
   // "submission.general.deposit": "Deposit",
@@ -5985,6 +7109,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Enrere",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardat",
 
@@ -5997,7 +7124,6 @@
   // "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",
 
@@ -6061,6 +7187,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6091,8 +7220,14 @@
   // "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.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Cerca OpenAIRE per Autors",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Cerca OpenAIRE per Títol",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Cerca OpenAIRE per Finançador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6106,6 +7241,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Noms de la Biblioteca del Congrés",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista prèvia de l'ítem",
 
@@ -6196,9 +7334,6 @@
   // "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",
 
@@ -6232,11 +7367,20 @@
   // "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.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Important des d'OpenAIRE",
+
   // "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.sherpaJournal": "Importa 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.sherpaPublisher": "Importa 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",
@@ -6244,6 +7388,9 @@
   // "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.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importa des de ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6277,6 +7424,15 @@
   // "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.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importació remota d'Organització",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organització local afegida amb èxit a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organització externa importada i afegida amb èxit a la selecció",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar tot",
 
@@ -6309,6 +7465,7 @@
 
   // "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 }})",
 
@@ -6332,11 +7489,13 @@
 
   // "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 }})",
 
@@ -6358,6 +7517,30 @@
   // "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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Cerca per Autors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Cerca per Títol ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Cerca per Finançador ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Revistes per ISSN ({{ 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",
 
@@ -6367,9 +7550,6 @@
   // "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",
 
@@ -6379,8 +7559,8 @@
   // "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.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unitat organitzativa del Projecte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projecte",
@@ -6391,22 +7571,24 @@
   // "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.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "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",
 
@@ -6418,6 +7600,7 @@
 
   // "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",
 
@@ -6448,6 +7631,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicació",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6465,6 +7651,7 @@
 
   // "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",
 
@@ -6488,6 +7675,7 @@
 
   // "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",
 
@@ -6496,6 +7684,7 @@
 
   // "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",
 
@@ -6514,6 +7703,15 @@
   // "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.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "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",
 
@@ -6538,6 +7736,9 @@
   // "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.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "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",
 
@@ -6601,6 +7802,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No s'ha trobat cap col·lecció",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No s'han trobat tipus d'entitat",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hi ha opcions disponibles",
 
@@ -6616,7 +7820,23 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Hi ha seccions incompletes.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Es crearan els següents identificadors per al vostre ítem:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "No s'han creat handles per a aquest ítem.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "No s'han creat DOIs per a aquest ítem.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Altres identificadors: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condicions d'accés a l'ítem",
@@ -6636,8 +7856,11 @@
   // "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.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Possibles duplicats",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificadors",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Llicència de dipòsit",
@@ -6651,7 +7874,6 @@
   // "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.",
 
@@ -6691,6 +7913,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraure secció {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Fer {{fileName}} el fitxer principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Treure {{fileName}} com el fitxer principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancel·lar",
 
@@ -6826,16 +8054,27 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Fins",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No s'han detectat duplicats.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "S'han detectat possibles duplicats. Si us plau, reviseu la llista a continuació.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Aquest ítem està en l'espai de treball",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Aquest ítem està en el flux de treball",
+
   // "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": "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ó",
 
@@ -6914,21 +8153,17 @@
   // "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.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Seleccioneu aquesta opció per descartar aquest ítem. Després se us demanarà que ho confirmeu.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
@@ -6942,7 +8177,17 @@
   // "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.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleccionar revisor",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Qualificar",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprovar",
@@ -6956,6 +8201,12 @@
   // "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.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Declinar",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "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.",
 
@@ -6980,8 +8231,6 @@
   // "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ó...",
 
@@ -6994,8 +8243,6 @@
   // "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",
 
@@ -7008,6 +8255,8 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalls",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "s'han detectat possibles duplicats per a aquest ítem. Reclameu i editeu aquest ítem per veure els detalls.",
 
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Veure",
@@ -7015,6 +8264,113 @@
   // "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.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/D",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Subscripcions",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Subscripcions per a ítems",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Subscripcions per a col·leccions",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Subscripcions per a comunitats",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Freqüència de subscripció",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Diària",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensual",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Setmanal",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Subscriure's",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Subscripcions",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipus i freqüència",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Tancar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Per eliminar aquesta subscripció, visiteu la pàgina de \"Subscripcions\" al vostre perfil d'usuari",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contingut",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diària",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Setmanal",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensual",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Processant...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Subscrit a {{ type }} correctament.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Subscripció eliminada correctament",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Subscripció a {{ type }} actualitzada correctament",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "S'ha produït un error durant la creació de la subscripció",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "S'ha produït un error durant l'eliminació de la subscripció",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "S'ha produït un error durant l'actualització de la subscripció",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Assumpte",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Freqüència de subscripció",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Acció",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Eliminar",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "No disponible",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'ítem subscrit ha estat eliminat o actualment no teniu permís per veure'l",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Actualment no teniu cap subscripció. Per subscriure's a les actualitzacions per correu electrònic d'una Comunitat o Col·lecció, utilitzeu el botó de subscripció a la pàgina de l'objecte.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Miniatura",
@@ -7040,13 +8396,9 @@
   // "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",
 
@@ -7059,6 +8411,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Cerca",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtra els resultats escrivint les primeres lletres",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No hi havia elements per mostrar",
 
@@ -7098,7 +8453,8 @@
   // "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",
 
-
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Ítems supervisats",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Els teus enviaments",
@@ -7109,7 +8465,11 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tasques del flux de treball",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Tasques del flux de treball i Workspace",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flux de treball",
@@ -7141,7 +8501,6 @@
   // "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",
 
@@ -7175,6 +8534,81 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Vista del flux de treball",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Eliminar Workspace",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Eliminar ítem del workspace",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Eliminar",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Cancel·lar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Eliminat",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Aquest ítem del workspace s'ha eliminat correctament",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "No s'ha pogut eliminar l'ítem del workspace",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Flux de treball avançat",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisor seleccionat",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "El revisor per a aquest ítem del flux de treball s'ha seleccionat correctament",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "No s'ha pogut seleccionar el revisor per a aquest ítem del flux de treball",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Revisió de qualificació",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La qualificació per a aquest ítem del flux de treball s'ha enviat correctament",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "No s'ha pogut qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sessió caducarà aviat",
 
@@ -7187,7 +8621,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sessió",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processant...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7220,10 +8654,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Veure",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVAT",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLIC",
 
   // "researcher.profile.status": "Status:",
@@ -7232,16 +8666,16 @@
   // "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": "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.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "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": "Success",
   "researcherprofile.success.claim.title": "Èxit",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7250,7 +8684,7 @@
   // "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": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Concedir autoritzacions",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7298,43 +8732,43 @@
   // "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": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliació",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "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": "Education",
   "person.page.orcid.sync-profile.education": "Titulació",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "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": "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": "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": "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": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Deshabilitat",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "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": "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": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicacions seleccionades",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "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": "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",
@@ -7346,13 +8780,13 @@
   // "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": "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": "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": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Acció",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -7418,7 +8852,7 @@
   // "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": "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.",
@@ -7472,8 +8906,8 @@
   // "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.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ó",
@@ -7552,11 +8986,1211 @@
 
   // "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",
 
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "S'ha produït un error en recuperar el banner d'alerta del sistema",
 
-}
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "En",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} dia(es),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora(es) i",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut(s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Alerta del sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Alerta del sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "S'ha produït un error en recuperar l'alerta del sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Cancel·lar",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Guardar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIU",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIU",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "L'alerta del sistema ha de tenir un missatge",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Missatge d'alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Habilitar un temporitzador de compte enrere",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Consell: Configureu un temporitzador de compte enrere. Quan estigui habilitat, es pot establir una data en el futur i el banner d'alerta del sistema farà un compte enrere fins a la data establerta. Quan aquest temporitzador acabi, desapareixerà de l'alerta. El servidor NO s'aturarà automàticament.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccioneu la data utilitzant el calendari",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Vista prèvia de l'alerta del sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "L'alerta del sistema s'ha actualitzat correctament",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "S'ha produït un error en actualitzar l'alerta del sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "L'alerta del sistema s'ha creat correctament",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "S'ha produït un error en crear l'alerta del sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Alertes del sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Alertes del sistema",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descobrir",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de les metadades de l'ítem o dels seus fitxers.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat d'aquesta col·lecció. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat de qualsevol col·lecció sota aquesta comunitat. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadades de l'ítem",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Fitxers",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condicions d'accés",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Actualment, no s'especifiquen condicions d'accés a continuació. Si s'executa, això substituirà les condicions d'accés actuals per les condicions d'accés predeterminades heretades de la col·lecció propietària.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Substituir condicions d'accés",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Afegir a les existents",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar els canvis a fitxers específics",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Actualitzar tots els fitxers de l'ítem",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "fitxers seleccionats",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar fitxers",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancel·lar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Afegir més",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condició d'accés",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Seleccionar fitxers",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No hi ha ítems per mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Tancar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipus de condició d'accés",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Trieu una condició d'accés per aplicar als objectes seleccionats.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Permetre accés des de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Seleccioneu la data a partir de la qual s'aplica la condició d'accés relacionada",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Permetre accés fins",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Seleccioneu la data fins a la qual s'aplica la condició d'accés relacionada",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Afegir",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamació de Publicació",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamació de Publicació",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocol COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, donem suport complet al protocol COAR Notify, que està dissenyat per millorar la comunicació entre repositoris. Per obtenir més informació sobre el protocol COAR Notify, visiteu el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">lloc web de COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Per a la vostra comoditat, la nostra LDN (Linked Data Notifications) InBox és fàcilment accessible a {{ ldnInboxUrl }}. La LDN InBox permet una comunicació i intercanvi de dades sense problemes, garantint una col·laboració eficient i efectiva.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderació de Missatges",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Per garantir un entorn segur i productiu, tots els missatges LDN entrants són moderats. Si teniu previst intercanviar informació amb nosaltres, poseu-vos en contacte a través del nostre",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulari de suggeriments.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servei",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Serveis Registrats",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nom",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripció",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estat",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acció",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOU",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Serveis Registrats",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitat",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitat",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Feu clic per habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Feu clic per deshabilitar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servei",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servei",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servei",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Si us plau, confirmeu la creació d'aquest servei.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estat",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancel·lar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nou servei",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nom",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripció",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servei",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rang d'IP del Servei",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivell de confiança",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Si us plau, proporcioneu el nom del servei",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Si us plau, proporcioneu una descripció del vostre servei",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Si us plau, introduïu l'URL perquè els usuaris puguin obtenir més informació sobre el servei",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límit inferior del rang IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límit superior del rang IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Si us plau, especifiqueu l'URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Si us plau, introduïu un valor entre 0 i 1. Utilitzeu el “.” com a separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccioneu un patró",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconèixer i Acceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar una sol·licitud (oferta). Implica una intenció d'actuar sobre la sol·licitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconèixer i Rebutjar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar una sol·licitud (oferta). Significa que no hi haurà més accions respecte a la sol·licitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconèixer i Acceptar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar tentativament una sol·licitud (oferta). Implica una intenció d'actuar, que pot canviar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconèixer i Rebutjar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar tentativament una sol·licitud (oferta). Significa que no hi haurà més accions, subjecte a canvis.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar Suport",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Aquest patró s'utilitza per anunciar l'existència d'un suport, referenciant el recurs recolzat.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar Ingestió",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Aquest patró s'utilitza per anunciar que un recurs ha estat ingerit.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar Relació",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Aquest patró s'utilitza per anunciar una relació entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar Revisió",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Aquest patró s'utilitza per anunciar l'existència d'una revisió, referenciant el recurs revisat.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar Resultat del Servei",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Aquest patró s'utilitza per anunciar l'existència d'un 'resultat del servei', referenciant el recurs rellevant.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncis",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Sol·licitar Suport",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Aquest patró s'utilitza per sol·licitar el suport d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Sol·licitar Ingestió",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Aquest patró s'utilitza per sol·licitar que el sistema objectiu ingereixi un recurs.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Sol·licitar Revisió",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Aquest patró s'utilitza per sol·licitar una revisió d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Desfer Oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Aquest patró s'utilitza per desfer (retirar) una oferta feta prèviament.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Desfer",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No s'ha seleccionat cap filtre d'ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtre d'ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automàtic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Es requereix un nom",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Es requereix una URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Si us plau, introduïu un rang d'IP vàlid",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Si us plau, introduïu un IpV4 vàlid en ambdós límits del rang (nota: per a una IP única, introduïu el mateix valor en ambdós camps)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Es requereix una URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Es requereix almenys un patró",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Si us plau, introduïu una puntuació vàlida (entre 0 i 1). Utilitzeu el “.” com a separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patró Suportat",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Afegir més",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nou Servei",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Esteu segur que voleu eliminar aquest servei?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirmeu els canvis?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar Servei",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancel·lar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Esteu segur que voleu descartar els canvis i sortir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar Canvis",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edició Exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servei ha estat editat",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edició Fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servei no ha estat editat",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creació Exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servei ha estat creat",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creació Fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servei no ha estat creat",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Si us plau, seleccioneu almenys un patró d'entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estat actualitzat amb èxit",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "L'estat del servei ha estat actualitzat",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminació Exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servei ha estat eliminat",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminació Fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servei no ha estat eliminat",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancel·lar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servei",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servei",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nom",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripció",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del Servei",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patró d'Entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sense Patró d'Entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtre d'Ítem Seleccionat",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sense Filtre d'Ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automàtic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Afegir més",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar Servei",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "No seleccionar cap",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "S'ha produït un error en crear aquest procés",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Èxit",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El procés s'ha creat correctament",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servei seleccionat és compatible amb l'ítem segons el seu estat actual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Suport",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisió",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciat Per",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementat Per",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visió general dels serveis LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Serveis LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servei LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}} en relació amb el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b> i ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del Servei:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enllaç:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancel·lar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servei",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servei",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Esteu segur que voleu eliminar el servei actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servei",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servei s'ha eliminat correctament.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "S'ha produït un error en eliminar el servei",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID dels Serveis",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nom",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora d'inici (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estat",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuari",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visió General dels Serveis",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visió General dels Serveis",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Accions",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripció",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Podeu sol·licitar una revisió a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Podeu sol·licitar un Suport a una de les següents revistes superposades",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Podeu sol·licitar ingerir una còpia del vostre enviament a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hi ha dades disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "No seleccionar cap",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccioneu un servei per a {{ pattern }} d'aquest ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripció del servei seleccionat:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hi ha més informació disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servei seleccionat no és adequat per a l'ítem actual. Si us plau, consulteu la descripció per obtenir detalls sobre quins registres poden ser gestionats per aquest servei.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No s'han trobat patrons configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtre invàlid, intenteu seleccionar un altre servei o cap.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat acceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat rebutjada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> està pendent.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patró suportat per a eliminació",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patró suportat per a eliminació",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccioneu el filtre d'ítem per al patró",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccioneu un patró per al servei",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccioneu el servei per a eliminació",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servei LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Tancar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipus d'ítem és Article de Revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Sempre cert",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Processament automàtic",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI conté DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtre DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipus de document és conductor",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Té almenys un Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Té Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Té un Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Està arxivat",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Està retirat",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "L'ítem és públic",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestió de revistes",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El títol comença amb el patró",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipus és Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipus és Article de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Cap",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Panell de control",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Panell de control",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Panell de control de notificacions",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El panell de control de notificacions supervisa l'ús general del protocol COAR Notify a tot el repositori. A la pestanya “Mètriques” hi ha estadístiques sobre l'ús del protocol COAR Notify. A les pestanyes “Registres/Entrants” i “Registres/Sortints” és possible cercar i comprovar l'estat individual de cada missatge LDN, ja sigui rebut o enviat.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Mètriques",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Nombre de LDN rebuts",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Nombre de LDN generats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Acceptat",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificacions entrants acceptades",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Actualment mostrant: Notificacions acceptades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN processats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificacions entrants processades",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Actualment mostrant: LDN processats",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificacions entrants fallides",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificacions sortints fallides",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Actualment mostrant: Notificacions no fiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No fiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificacions entrants no fiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificacions entrants lliurades amb èxit",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Lliurat",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificacions sortints lliurades amb èxit",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Actualment mostrant: Notificacions en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificacions actualment en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cua",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Actualment mostrant: Notificacions en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificacions actualment en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionats amb notificacions entrants",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionats amb notificacions sortints",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Panell de control",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Missatges entrants",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Registres/Entrants",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtre: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionats",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servei LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificar Revisió",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificar Suport",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificar Relació",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de processament ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Rang mínim",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Rang màxim",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rang mínim",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rang màxim",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Missatges sortints",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Registres/Sortints",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrants",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionat",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servei LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Objectiu",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipus de notificació",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Cerca ítems relacionats",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Cerca estat de la cua",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Cerca objectiu",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Cerca tipus de flux d'activitat",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estat de la cua",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "IP no fiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cua",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Processant",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processat",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallat",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No fiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acció no mapejada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cua per reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipus de flux d'activitat",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipus de COAR Notify",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipus de notificació",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Cerca tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Cerca tipus de notificació",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionats",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Objectiu",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Cerca font",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Font",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Cerca Servei LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servei LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificació",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Cerca Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificar Relació",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Cerca Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificar Revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acció de revisió",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acció de suport",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acció d'ingestió",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acció de relació",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última cua iniciada Descendent",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última cua iniciada Ascendent",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Cua intentada Descendent",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Cua intentada Ascendent",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems implicats en LDN entrant",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems implicats en LDN sortint",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipus",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipus de COAR Notify",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipus de flux d'activitat",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En resposta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositori",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositori",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Cua d'intents",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vegada que es va iniciar la cua",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servei LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servei LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estat de la cua",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Temps d'espera de la cua",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detall del missatge",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar missatge",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de temps",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositori",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servei LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipus",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estat",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acció",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detall",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocessar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processat",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallat",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cua per reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acció no mapejada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Processant",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cua",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No fiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servei LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionat",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Cercar suport de notificació",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Llicència Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepte on s'indiqui el contrari, la llicència d'aquest ítem es descriu com",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Cerca al repositori",
+
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descarregar ",
+
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+
+}
\ No newline at end of file

From c1a1fe7443ac1b07ead497ca216ad54d1bcccf5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 02:38:29 +0000
Subject: [PATCH 0992/1286] Bump postcss in the postcss group across 1
 directory

Bumps the postcss group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.47 to 8.4.49
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.47...8.4.49)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: postcss
...

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

diff --git a/package-lock.json b/package-lock.json
index 5d9f49d1f6..d49f62ea00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18386,9 +18386,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
       "funding": [
         {
           "type": "opencollective",
@@ -18405,7 +18405,7 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {

From 9d4542c2a40cdf4f94ccd9e2bd7deb85959c40a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 02:38:49 +0000
Subject: [PATCH 0993/1286] Bump cypress in the testing group across 1
 directory

Bumps the testing group with 1 update in the / directory: [cypress](https://github.com/cypress-io/cypress).


Updates `cypress` from 13.16.0 to 13.17.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.16.0...v13.17.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
...

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

diff --git a/package-lock.json b/package-lock.json
index 5d9f49d1f6..454620fd3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -109,7 +109,7 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.16.0",
+        "cypress": "^13.17.0",
         "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
@@ -10271,9 +10271,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.16.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.0.tgz",
-      "integrity": "sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
+      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
diff --git a/package.json b/package.json
index 3a78d5e05f..cae4fa1140 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,7 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "^13.16.0",
+    "cypress": "^13.17.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",

From 894448e3dc6e161b947c6affb301d4047d9c6607 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 03:04:09 +0000
Subject: [PATCH 0994/1286] Bump postcss in the postcss group across 1
 directory

Bumps the postcss group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.47 to 8.4.49
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.47...8.4.49)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: postcss
...

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

diff --git a/yarn.lock b/yarn.lock
index f1fcbe2cc2..42cdc77d95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9051,7 +9051,7 @@ performance-now@^2.1.0:
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^1.0.0, picocolors@^1.1.0:
+picocolors@^1.0.0, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -9425,12 +9425,12 @@ postcss@8.4.31:
     source-map-js "^1.0.2"
 
 postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
-  version "8.4.47"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
-  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.1.0"
+    picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:

From fda933022101311a12308b50209719eec7520cd2 Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Mon, 6 Jan 2025 08:21:04 -0300
Subject: [PATCH 0995/1286] Advanced search translation keys

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

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 859fa5e8ad..250f003b1d 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8730,4 +8730,16 @@
 
   // "dso-selector.placeholder.type.item": "item",
   "dso-selector.placeholder.type.item": "ítem",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Añadir",
 }

From da6447aefdb50b7e214c13e7eb476ba9391d450f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 6 Jan 2025 09:42:17 -0600
Subject: [PATCH 0996/1286] Port of 3192 by @Andrea-Guevara

---
 src/assets/i18n/es.json5 | 602 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 601 insertions(+), 1 deletion(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index e15a120f12..61cb4e1760 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -8149,7 +8149,7 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  //"browse.search-form.placeholder": "Search the repository",
+  // "browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
   // "file-download-link.download": "Download ",
@@ -8160,4 +8160,604 @@
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no es igual a",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " sin autoridad",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contiene",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no contiene",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Proyecto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicación",
+
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validación",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Es igual a",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No es igual a",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridad",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Sin autoridad",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contiene",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No contiene",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descubrir",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Buscar por título",
+
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiación",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiación",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de procesamiento ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Alcance mínimo",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Alcance máximo",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionado",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servicio LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Destino",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipo de notificación",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Buscar ítems relacionados",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Estado de la fila de búsqueda",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Buscar por destino",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Buscar por tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Buscar por COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Buscar por tipo de notificación",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionados",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Destino",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Buscar fuente",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Fuente",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Buscar por servicio LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servicio LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificación",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificación de relación",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Buscar por notificación de relación",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificación de relación",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificación de revisión",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Buscar por notificación de Revisión",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificación de revisión",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
+
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificaciones",
+
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Control de calidad",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar sugerencias",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
+
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Cargando ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamo de publicación",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamo de publicación",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugerencias actuales",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nombre del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Acciones",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Ningún destino encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuación",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprobar e importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver pruebas",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar pruebas",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugerencias para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gráfico OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "del ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuación total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Control de calidad",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Control de calidad",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Control de calidad",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Solicitado por",
+
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Control de calidad",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temas actuales",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fuentes actuales",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fuente",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último acontecimiento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Acciones",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No se han encontrado temas.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No se han encontrado fuentes.",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Cargando ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confíe en",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicación",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalles",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalles del proyecto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razones",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Acciones",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceptar sugerencia",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Borrar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor del PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumen:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título del proyecto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Volver a los temas",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar más",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado al registro local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "¿Seguro?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicación:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Buscar proyectos",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Buscar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpiar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Motivo",
+
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidad",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "colección",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Añadir",
 }

From dda5ee1123d02b5d20f79c4e33ba20ca027d6a24 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 20 Dec 2024 14:28:22 +0100
Subject: [PATCH 0997/1286] add German translation of process view related keys

(cherry picked from commit 85a120da62a8d00729f9826a8fc1142688830e01)
---
 src/assets/i18n/de.json5 | 50 +++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 640352c4fa..041bf02374 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4197,33 +4197,67 @@
 
 
 
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.finish": "Finish time",
   "process.overview.table.finish": "Schlusszeit",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Prozess ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Name",
 
-  // "process.overview.table.start" : "Start time",
+  // "process.overview.table.start": "Start time",
   "process.overview.table.start": "Startzeit",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Benutzer:in",
 
   // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Überblick der Prozesse",
+  "process.overview.title": "Übersicht der Prozesse",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs": "Überblick der Prozesse",
+  "process.overview.breadcrumbs": "Übersicht der Prozesse",
 
   // "process.overview.new": "New",
   "process.overview.new": "Neu",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Aktionen",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Lösche {{count}} Prozesse",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Lösche Prozess",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Auswahl aufheben",
+
+  // "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": "Es werden {{count}} Prozesse gelöscht. Diese Aktion kann einige Zeit dauern. Bitte warten Sie bis zum Abschluss der Aktion.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Wollen Sie tatsächlich {{count}} Prozesse löschen?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Prozess löschen",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Unbekannt",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Fehler beim Löschen des Prozesses",
+
+  // "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": "Der Prozess mit ID {{processId}} konnte nicht gelöscht werden. Es wird versucht, die verbleibenden Prozesse zu löschen.",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "Es wurden {{count}} Prozesse erfolgreich gelöscht.",
+
+
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil aktualisieren",

From e4a464d44f3a667bedc3649e11a0413edd49e38c Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 26 Jun 2024 08:32:43 +0200
Subject: [PATCH 0998/1286] 115284: Add repeatable based on relationship max
 cardinality

(cherry picked from commit 105547598feef61d28a65832283665ff76c213db)
---
 .../edit-relationship-list.component.ts         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 2b3e35c229..7f1d9fc5db 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -264,6 +264,22 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     return update && update.field ? update.field.uuid : undefined;
   }
 
+  /**
+   * Check whether the current entity can have multiple relationships of this type
+   * This is based on the max cardinality of the relationship
+   * @private
+   */
+  private isRepeatable(): boolean {
+    const isLeft = this.currentItemIsLeftItem$.getValue();
+    if (isLeft) {
+      const leftMaxCardinality = this.relationshipType.leftMaxCardinality;
+      return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1;
+    } else {
+      const rightMaxCardinality = this.relationshipType.rightMaxCardinality;
+      return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1;
+    }
+  }
+
   /**
    * Open the dynamic lookup modal to search for items to add as relationships
    */
@@ -281,6 +297,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.repeatable = this.isRepeatable();
     modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(

From 48f7e516959c98e5a60b7761fc8cdaad085bdf1d Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 2 Oct 2024 09:23:26 +0200
Subject: [PATCH 0999/1286] 115284: Add tests for isRepeatable

(cherry picked from commit 161daffcc08e3c9ebcc209ba3115111243d2e6ae)
---
 .../edit-relationship-list.component.spec.ts  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 48415000be..4784e8fc5c 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -110,7 +110,7 @@ describe('EditRelationshipListComponent', () => {
     },
   };
 
-  function init(leftType: string, rightType: string): void {
+  function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void {
     entityTypeLeft = Object.assign(new ItemType(), {
       id: leftType,
       uuid: leftType,
@@ -130,6 +130,8 @@ describe('EditRelationshipListComponent', () => {
       rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
       leftwardType: `is${rightType}Of${leftType}`,
       rightwardType: `is${leftType}Of${rightType}`,
+      leftMaxCardinality: leftMaxCardinality,
+      rightMaxCardinality: rightMaxCardinality,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -402,4 +404,31 @@ describe('EditRelationshipListComponent', () => {
       }));
     });
   });
+
+  describe('Is repeatable relationship', () => {
+    beforeEach(waitForAsync(() => {
+      currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+    }));
+    describe('when max cardinality is 1', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined)));
+      it('should return false', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeFalse();
+      });
+    });
+    describe('when max cardinality is 2', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+    describe('when max cardinality is undefined', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+  });
 });

From c925424ceddd87d04d9abd7753a8a4f831b52f82 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 7 Dec 2024 20:58:52 +0100
Subject: [PATCH 1000/1286] 119799: Prevent the lookup/lookup-name fields from
 resetting when hitting the enter key in another input field

(cherry picked from commit c8694e1a87ab6ad70ef0f984a77f3e12dbd5605d)
---
 .../models/lookup/dynamic-lookup.component.html            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 89e7af9aa6..79f2756b24 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -94,11 +94,12 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled"
+      <button class="dropdown-item disabled" type="button"
               *ngIf="optionsList && optionsList.length === 0"
-              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
+              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">
+        {{ 'form.no-results' | translate }}
       </button>
-      <button class="dropdown-item lookup-item"
+      <button class="dropdown-item lookup-item" type="button"
               *ngFor="let listEntry of optionsList"
               (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
               title="{{ listEntry.display }}">

From d3d86f4f2d5da2c184eea4c522d0f6b163855a2e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sat, 7 Dec 2024 20:58:52 +0100
Subject: [PATCH 1001/1286] 119799: Prevent the lookup/lookup-name fields from
 resetting when hitting the enter key in another input field

(cherry picked from commit c8694e1a87ab6ad70ef0f984a77f3e12dbd5605d)
---
 .../models/lookup/dynamic-lookup.component.html               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 0ecddf9278..1920209368 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -94,11 +94,11 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled"
+      <button class="dropdown-item disabled" type="button"
               *ngIf="optionsList && optionsList.length == 0"
               (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
       </button>
-      <button class="dropdown-item lookup-item"
+      <button class="dropdown-item lookup-item" type="button"
               *ngFor="let listEntry of optionsList"
               (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
               title="{{ listEntry.display }}">

From da3af31ac2d0f8c1d6b956a8ce31b8b5b4e1f594 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:20:49 +0000
Subject: [PATCH 1002/1286] Bump express from 4.21.1 to 4.21.2

Bumps [express](https://github.com/expressjs/express) from 4.21.1 to 4.21.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 8367d9ba18..7003f139bd 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 21a313d953..ec77a5b230 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5609,10 +5609,10 @@ express-static-gzip@^2.2.0:
     parseurl "^1.3.3"
     serve-static "^1.16.2"
 
-express@^4.17.3, express@^4.21.1:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
-  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
+express@^4.17.3, express@^4.21.2:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
@@ -5633,7 +5633,7 @@ express@^4.17.3, express@^4.21.1:
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.10"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
     qs "6.13.0"
     range-parser "~1.2.1"
@@ -8542,10 +8542,10 @@ path-scurry@^1.11.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
-  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-type@^4.0.0:
   version "4.0.0"

From 8515de3d10917700ba5ce7baadd648a55372abd3 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:47:14 +0100
Subject: [PATCH 1003/1286] fix nested span element in templates

(cherry picked from commit 394ecea1186c01f4edcf43b1f656a4e55cb56591)
---
 .../journal-volume-search-result-list-element.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 8d7fbda4af..a50b500fce 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>

From fbaa5068afb893fdba2d70d666d56284c0f4c7bb Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:56:50 +0100
Subject: [PATCH 1004/1286] fix nested span element

(cherry picked from commit 84878ede6770d4d9b9417757f738d6371541e79d)
---
 .../journal-issue-search-result-list-element.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index e3293be3a0..2dd721b8f3 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -26,12 +26,13 @@
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-issues">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
                     </span>
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
                         <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>
             </span>

From 9c859b1fdc8d229d532d34e98c50006f345f5095 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:59:56 +0100
Subject: [PATCH 1005/1286] fix nested span element

(cherry picked from commit 8509096c320f37fffbc6893e89461d364feb91e5)
---
 .../journal/journal-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 6d7f9293ec..f549f06580 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>

From cefeb6a1d623f1e762f465056ed6f5754e9c2fcb Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:00:47 +0100
Subject: [PATCH 1006/1286] fix nested span element

(cherry picked from commit 15d3f257b348fb0d37adbcde64316f2acf62632c)
---
 .../project/project-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 93289aa525..dd809999ab 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->

From 68372b2cb87b87cb6a3ea5f498a3775a4eabcec5 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:01:37 +0100
Subject: [PATCH 1007/1286] fix nested span element

(cherry picked from commit 2e174cd9e67037e777608df1db8ce2f5ef13cc14)
---
 .../person/person-item-metadata-list-element.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..b78202d0fe 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>

From 86a6897861c4256d5d5b3f5e471ada3fa9e67642 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:02:43 +0100
Subject: [PATCH 1008/1286] fix nested span element

(cherry picked from commit e9a28c6d3dd94101bc1ff5e06a8d3a08783bc3c3)
---
 ...rch-result-list-submission-element.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index dd2589c726..0de1c93d9e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>

From 60586f6c33b37c1b3c874839d98f4a31e759c94b Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:05:07 +0100
Subject: [PATCH 1009/1286] fix nested span element

(cherry picked from commit 97b5e0cc92420366355c00f5013550ce7715801d)
---
 ...-unit-search-result-list-submission-element.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e264958738..1f020d127f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>

From 7538f49a36c4b8971387de4ea884597ec5fcaeb8 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:09:02 +0100
Subject: [PATCH 1010/1286] remove nested span element

(cherry picked from commit acb7c9bd33bb678766ab219851999f217f7b81d5)
---
 .../journal-issue-search-result-list-element.component.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 2dd721b8f3..2de765d712 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -31,7 +31,6 @@
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
                     <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                         <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>

From 04123f92aae4b654c98ebc7eed5c9b68d7342a24 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:12:44 +0100
Subject: [PATCH 1011/1286] fix indentation

(cherry picked from commit dbd67f056ebff2b5dd62264f8724c64cc11b5d4a)
---
 ...-search-result-list-element.component.html | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 2de765d712..3d1d7c3e09 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -22,21 +22,21 @@
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>

From 5f32b643b36b30ea38de76ad414f05e0d0c53a76 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:47:14 +0100
Subject: [PATCH 1012/1286] fix nested span element in templates

(cherry picked from commit 394ecea1186c01f4edcf43b1f656a4e55cb56591)
---
 .../journal-volume-search-result-list-element.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 4a6ffb412d..b161874fdf 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>

From 43d4e976955c66b94da5c6b9183b555a085d276c Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:56:50 +0100
Subject: [PATCH 1013/1286] fix nested span element

(cherry picked from commit 84878ede6770d4d9b9417757f738d6371541e79d)
---
 .../journal-issue-search-result-list-element.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 59d2ea4dc9..ef99e23256 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -26,12 +26,13 @@
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-issues">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
                     </span>
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
                         <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>
             </span>

From e41e8b2847d07314e4aba734647767a0a9a91559 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 17:59:56 +0100
Subject: [PATCH 1014/1286] fix nested span element

(cherry picked from commit 8509096c320f37fffbc6893e89461d364feb91e5)
---
 .../journal/journal-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index bd119493d3..8acdfed9b5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>

From 483214d8e29986fe38467be4df332dc67cfade57 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:00:47 +0100
Subject: [PATCH 1015/1286] fix nested span element

(cherry picked from commit 15d3f257b348fb0d37adbcde64316f2acf62632c)
---
 .../project/project-search-result-list-element.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 34d5588c2d..65cf6fa1f8 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->

From 1322d0ad69589dc1ce22a203b511ae51bb4da51e Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:01:37 +0100
Subject: [PATCH 1016/1286] fix nested span element

(cherry picked from commit 2e174cd9e67037e777608df1db8ce2f5ef13cc14)
---
 .../person/person-item-metadata-list-element.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..b78202d0fe 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>

From 00a514b9696f2e16421e31105e7f02484dc3e332 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:02:43 +0100
Subject: [PATCH 1017/1286] fix nested span element

(cherry picked from commit e9a28c6d3dd94101bc1ff5e06a8d3a08783bc3c3)
---
 ...rch-result-list-submission-element.component.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 66db99a6af..122c8bb59e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>

From 2029156e499c41edac4f8f87e63b09ef09707c96 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:05:07 +0100
Subject: [PATCH 1018/1286] fix nested span element

(cherry picked from commit 97b5e0cc92420366355c00f5013550ce7715801d)
---
 ...-unit-search-result-list-submission-element.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e264958738..1f020d127f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>

From 05dce42f872e1d4111672b5adb2a3611ca2c6814 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:09:02 +0100
Subject: [PATCH 1019/1286] remove nested span element

(cherry picked from commit acb7c9bd33bb678766ab219851999f217f7b81d5)
---
 .../journal-issue-search-result-list-element.component.html      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index ef99e23256..277ece3657 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -31,7 +31,6 @@
                 <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
                       class="item-list-journal-issue-numbers">
                     <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                         <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
                 </span>

From 25de1e48f3694c1dfeef9f96348d083ba762fbd7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 6 Dec 2024 18:12:44 +0100
Subject: [PATCH 1020/1286] fix indentation

(cherry picked from commit dbd67f056ebff2b5dd62264f8724c64cc11b5d4a)
---
 ...-search-result-list-element.component.html | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 277ece3657..961cbfd8c4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -22,21 +22,21 @@
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>                        
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                        <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>

From 8a62deb90b58b3d94c8895dcef5f0795a058ddfa Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koenpauwels2@gmail.com>
Date: Tue, 7 Jan 2025 22:23:48 +0100
Subject: [PATCH 1021/1286] Reduce browse definition requests on simple item
 page (#3701)

* 121561 Reduce the number of browse definition requests on Item pages by reusing the navbar request for all browse indexes

* Fix test issues.

---------

Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
---
 .../core/shared/browse-definition.model.ts    |  8 +-
 .../hierarchical-browse-definition.model.ts   |  4 -
 .../non-hierarchical-browse-definition.ts     |  3 -
 ...item-page-abstract-field.component.spec.ts |  3 +
 .../item-page-author-field.component.spec.ts  |  3 +
 .../item-page-date-field.component.spec.ts    |  4 +-
 .../generic-item-page-field.component.spec.ts |  3 +
 .../img/item-page-img-field.component.spec.ts |  3 +
 .../item-page-field.component.spec.ts         |  3 +
 .../item-page-field.component.ts              | 39 ++++++--
 .../uri/item-page-uri-field.component.spec.ts |  3 +
 src/app/shared/testing/browse-service.stub.ts | 91 +++++++++++++++++++
 12 files changed, 152 insertions(+), 15 deletions(-)
 create mode 100644 src/app/shared/testing/browse-service.stub.ts

diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index 6de81727fa..5fe5d02ecb 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,7 @@
-import { autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+} from 'cerialize';
 
 import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
@@ -11,6 +14,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserializeAs('metadata')
+  metadataKeys: string[];
+
   /**
    * Get the render type of the BrowseDefinition model
    */
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index e7c06a5372..eb606b7bbe 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,6 +1,5 @@
 import {
   autoserialize,
-  autoserializeAs,
   deserialize,
   inheritSerialization,
 } from 'cerialize';
@@ -33,9 +32,6 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserialize
   vocabulary: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   get self(): string {
     return this._links.self.href;
   }
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index 7f8c6d0e5f..07083f7a8a 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -21,9 +21,6 @@ export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   @autoserialize
   dataType: BrowseByDataType;
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 979b79eafc..2e17d09fc1 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -15,8 +15,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
 
@@ -38,6 +40,7 @@ describe('ItemPageAbstractFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAbstractFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 1f38317aca..a9dfe998bc 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,6 +43,7 @@ describe('ItemPageAuthorFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index 23e4492602..264ae5ddbc 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,8 +43,8 @@ describe('ItemPageDateFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageDateFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index f46b8fb0f8..a1ac655660 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -43,6 +45,7 @@ describe('GenericItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
index da1320370a..18c02d95f6 100644
--- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { GenericItemPageFieldComponent } from '../generic/generic-item-page-field.component';
@@ -49,6 +51,7 @@ describe('ItemPageImgFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 5815f18180..6d654effe7 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -16,6 +16,7 @@ import {
 
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MathService } from '../../../../core/shared/math.service';
@@ -26,6 +27,7 @@ import {
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { MarkdownDirective } from '../../../../shared/utils/markdown.directive';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
@@ -66,6 +68,7 @@ describe('ItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: MathService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 58521569f1..fd3506c91e 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -3,17 +3,26 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import intersectionWith from 'lodash/intersectionWith';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  filter,
+  mergeAll,
+  take,
+} from 'rxjs/operators';
 
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
 import { ImageField } from './image-field';
 
-
 /**
  * This component can be used to represent metadata on a simple item page.
  * It expects one input parameter of type Item to which the metadata belongs.
@@ -30,7 +39,8 @@ import { ImageField } from './image-field';
 })
 export class ItemPageFieldComponent {
 
-  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService,
+              protected browseService: BrowseService) {
   }
 
     /**
@@ -74,9 +84,26 @@ export class ItemPageFieldComponent {
      * link in dspace.cfg (webui.browse.link.<n>)
      */
     get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+      return this.browseService.getBrowseDefinitions().pipe(
         getFirstCompletedRemoteData(),
-        map((def) => def.payload),
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+        mergeAll(),
+        filter((def: BrowseDefinition) =>
+          intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0,
+        ),
+        take(1),
       );
     }
+
+    /**
+     * Returns true iff the spec and field match.
+     * @param spec  Specification of a metadata field name: either a metadata field, or a prefix ending in ".*".
+     * @param field A metadata field name.
+     * @private
+     */
+    private static fieldMatch(spec: string, field: string): boolean {
+      return field === spec
+        || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1));
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index 4b86504789..53edcab28e 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -40,6 +42,7 @@ describe('ItemPageUriFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageUriFieldComponent, {
diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts
new file mode 100644
index 0000000000..85ca717cb0
--- /dev/null
+++ b/src/app/shared/testing/browse-service.stub.ts
@@ -0,0 +1,91 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const mockData = [
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType': 'date',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.date.issued',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'author',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.contributor.*',
+      'dc.creator',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'title',
+    'browseType': 'flatBrowse',
+    'dataType': 'title',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.title',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'subject',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject.*',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new HierarchicalBrowseDefinition(), {
+    'id': 'srsc',
+    'browseType': 'hierarchicalBrowse',
+    'facetType': 'subject',
+    'vocabulary': 'srsc',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject',
+    ],
+    '_links': EMPTY,
+  }),
+];
+export const BrowseServiceStub: any = {
+  /**
+   * Get all browse definitions.
+   */
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockData));
+  },
+};

From 0120896135ed0d3c4eb6b7115f9183ce5c2acc23 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koenpauwels2@gmail.com>
Date: Tue, 7 Jan 2025 22:23:48 +0100
Subject: [PATCH 1022/1286] Reduce browse definition requests on simple item
 page (#3701)

* 121561 Reduce the number of browse definition requests on Item pages by reusing the navbar request for all browse indexes

* Fix test issues.

---------

Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
---
 .../core/shared/browse-definition.model.ts    |  8 +-
 .../hierarchical-browse-definition.model.ts   |  4 -
 .../non-hierarchical-browse-definition.ts     |  3 -
 ...item-page-abstract-field.component.spec.ts |  3 +
 .../item-page-author-field.component.spec.ts  |  3 +
 .../item-page-date-field.component.spec.ts    |  4 +-
 .../generic-item-page-field.component.spec.ts |  3 +
 .../img/item-page-img-field.component.spec.ts |  3 +
 .../item-page-field.component.spec.ts         |  3 +
 .../item-page-field.component.ts              | 39 ++++++--
 .../uri/item-page-uri-field.component.spec.ts |  3 +
 src/app/shared/testing/browse-service.stub.ts | 91 +++++++++++++++++++
 12 files changed, 152 insertions(+), 15 deletions(-)
 create mode 100644 src/app/shared/testing/browse-service.stub.ts

diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index 6de81727fa..5fe5d02ecb 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,7 @@
-import { autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+} from 'cerialize';
 
 import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
@@ -11,6 +14,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserializeAs('metadata')
+  metadataKeys: string[];
+
   /**
    * Get the render type of the BrowseDefinition model
    */
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index e7c06a5372..eb606b7bbe 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,6 +1,5 @@
 import {
   autoserialize,
-  autoserializeAs,
   deserialize,
   inheritSerialization,
 } from 'cerialize';
@@ -33,9 +32,6 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserialize
   vocabulary: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   get self(): string {
     return this._links.self.href;
   }
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index 7f8c6d0e5f..07083f7a8a 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -21,9 +21,6 @@ export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   @autoserialize
   dataType: BrowseByDataType;
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 979b79eafc..2e17d09fc1 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -15,8 +15,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
 
@@ -38,6 +40,7 @@ describe('ItemPageAbstractFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAbstractFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 1f38317aca..a9dfe998bc 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,6 +43,7 @@ describe('ItemPageAuthorFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index 23e4492602..264ae5ddbc 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,8 +43,8 @@ describe('ItemPageDateFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageDateFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index f46b8fb0f8..a1ac655660 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -43,6 +45,7 @@ describe('GenericItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
index da1320370a..18c02d95f6 100644
--- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { GenericItemPageFieldComponent } from '../generic/generic-item-page-field.component';
@@ -49,6 +51,7 @@ describe('ItemPageImgFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 5815f18180..6d654effe7 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -16,6 +16,7 @@ import {
 
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MathService } from '../../../../core/shared/math.service';
@@ -26,6 +27,7 @@ import {
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { MarkdownDirective } from '../../../../shared/utils/markdown.directive';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
@@ -66,6 +68,7 @@ describe('ItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: MathService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 58521569f1..fd3506c91e 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -3,17 +3,26 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import intersectionWith from 'lodash/intersectionWith';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  filter,
+  mergeAll,
+  take,
+} from 'rxjs/operators';
 
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
 import { ImageField } from './image-field';
 
-
 /**
  * This component can be used to represent metadata on a simple item page.
  * It expects one input parameter of type Item to which the metadata belongs.
@@ -30,7 +39,8 @@ import { ImageField } from './image-field';
 })
 export class ItemPageFieldComponent {
 
-  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService,
+              protected browseService: BrowseService) {
   }
 
     /**
@@ -74,9 +84,26 @@ export class ItemPageFieldComponent {
      * link in dspace.cfg (webui.browse.link.<n>)
      */
     get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+      return this.browseService.getBrowseDefinitions().pipe(
         getFirstCompletedRemoteData(),
-        map((def) => def.payload),
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+        mergeAll(),
+        filter((def: BrowseDefinition) =>
+          intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0,
+        ),
+        take(1),
       );
     }
+
+    /**
+     * Returns true iff the spec and field match.
+     * @param spec  Specification of a metadata field name: either a metadata field, or a prefix ending in ".*".
+     * @param field A metadata field name.
+     * @private
+     */
+    private static fieldMatch(spec: string, field: string): boolean {
+      return field === spec
+        || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1));
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index 4b86504789..53edcab28e 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -40,6 +42,7 @@ describe('ItemPageUriFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageUriFieldComponent, {
diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts
new file mode 100644
index 0000000000..85ca717cb0
--- /dev/null
+++ b/src/app/shared/testing/browse-service.stub.ts
@@ -0,0 +1,91 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const mockData = [
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType': 'date',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.date.issued',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'author',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.contributor.*',
+      'dc.creator',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'title',
+    'browseType': 'flatBrowse',
+    'dataType': 'title',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.title',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'subject',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject.*',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new HierarchicalBrowseDefinition(), {
+    'id': 'srsc',
+    'browseType': 'hierarchicalBrowse',
+    'facetType': 'subject',
+    'vocabulary': 'srsc',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject',
+    ],
+    '_links': EMPTY,
+  }),
+];
+export const BrowseServiceStub: any = {
+  /**
+   * Get all browse definitions.
+   */
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockData));
+  },
+};

From 76539dd8a18953f897148f484b8fdd45dc6f4dd9 Mon Sep 17 00:00:00 2001
From: Koen Pauwels <koenpauwels2@gmail.com>
Date: Tue, 7 Jan 2025 22:23:48 +0100
Subject: [PATCH 1023/1286] Reduce browse definition requests on simple item
 page (#3701)

* 121561 Reduce the number of browse definition requests on Item pages by reusing the navbar request for all browse indexes

* Fix test issues.

---------

Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
---
 .../core/shared/browse-definition.model.ts    |  8 +-
 .../hierarchical-browse-definition.model.ts   |  5 +-
 .../non-hierarchical-browse-definition.ts     |  3 -
 .../journal/journal.component.spec.ts         |  5 +-
 ...item-page-abstract-field.component.spec.ts |  5 +-
 .../item-page-author-field.component.spec.ts  |  5 +-
 .../item-page-date-field.component.spec.ts    |  5 +-
 .../generic-item-page-field.component.spec.ts |  5 +-
 .../item-page-field.component.spec.ts         |  5 +-
 .../item-page-field.component.ts              | 38 +++++++-
 .../uri/item-page-uri-field.component.spec.ts |  5 +-
 .../publication/publication.component.spec.ts |  3 +
 .../item-types/shared/item.component.spec.ts  |  3 +
 .../untyped-item.component.spec.ts            |  3 +
 src/app/shared/testing/browse-service.stub.ts | 91 +++++++++++++++++++
 15 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 src/app/shared/testing/browse-service.stub.ts

diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index a5bed53c9f..bd7e4862ce 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,7 @@
-import { autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+} from 'cerialize';
 import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
@@ -9,6 +12,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserializeAs('metadata')
+  metadataKeys: string[];
+
   /**
    * Get the render type of the BrowseDefinition model
    */
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index d561fff643..b64ecabdf2 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,4 +1,4 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { HIERARCHICAL_BROWSE_DEFINITION } from './hierarchical-browse-definition.resource-type';
@@ -26,9 +26,6 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserialize
   vocabulary: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   get self(): string {
     return this._links.self.href;
   }
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index d5481fcc8d..cba6f3ecd6 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -16,9 +16,6 @@ export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   @autoserialize
   dataType: BrowseByDataType;
 }
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 6e2ded334b..ace7a69f9a 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
@@ -39,6 +39,8 @@ import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -105,7 +107,8 @@ describe('JournalComponent', () => {
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 4fb8889440..6bbee90945 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -6,6 +6,8 @@ import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loa
 import { SharedModule } from '../../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { By } from '@angular/platform-browser';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
@@ -27,7 +29,8 @@ describe('ItemPageAbstractFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageAbstractFieldComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 855a995142..d45261b85b 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -27,7 +29,8 @@ describe('ItemPageAuthorFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index be124dab82..a88e9f74a7 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -27,7 +29,8 @@ describe('ItemPageDateFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageDateFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index fdf5ac1bb5..606f43ed9a 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -7,6 +7,8 @@ import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component
 import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -29,7 +31,8 @@ describe('GenericItemPageFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [GenericItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 15b7a9df21..f0bddbc695 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -13,6 +13,8 @@ import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
 import { SharedModule } from '../../../../shared/shared.module';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { By } from '@angular/platform-browser';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -51,7 +53,8 @@ describe('ItemPageFieldComponent', () => {
       ],
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageFieldComponent, MetadataValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 3a18666a81..aa1e78f229 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -1,10 +1,20 @@
 import { Component, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
-import { map } from 'rxjs/operators';
+import intersectionWith from 'lodash/intersectionWith';
+import {
+  filter,
+  mergeAll,
+  take,
+} from 'rxjs/operators';
 import { Observable } from 'rxjs';
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -17,7 +27,8 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 })
 export class ItemPageFieldComponent {
 
-    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+    constructor(protected browseDefinitionDataService: BrowseDefinitionDataService,
+                protected browseService: BrowseService) {
     }
 
     /**
@@ -56,9 +67,26 @@ export class ItemPageFieldComponent {
      * link in dspace.cfg (webui.browse.link.<n>)
      */
     get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+      return this.browseService.getBrowseDefinitions().pipe(
         getFirstCompletedRemoteData(),
-        map((def) => def.payload)
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+        mergeAll(),
+        filter((def: BrowseDefinition) =>
+          intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0,
+        ),
+        take(1),
       );
     }
+
+    /**
+     * Returns true iff the spec and field match.
+     * @param spec  Specification of a metadata field name: either a metadata field, or a prefix ending in ".*".
+     * @param field A metadata field name.
+     * @private
+     */
+    private static fieldMatch(spec: string, field: string): boolean {
+      return field === spec
+        || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1));
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index cc55b76e3e..7b969737db 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -7,6 +7,8 @@ import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { environment } from '../../../../../../environments/environment';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { BrowseService } from '../../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
 
@@ -28,7 +30,8 @@ describe('ItemPageUriFieldComponent', () => {
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
-        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent],
       schemas: [NO_ERRORS_SCHEMA]
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 211ec102bc..98db2da7f0 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
@@ -40,6 +40,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -93,6 +95,7 @@ describe('PublicationComponent', () => {
         { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
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 5bf08fc004..558cd6d379 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
@@ -44,6 +44,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -133,6 +135,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: AuthorizationDataService, useValue: authorizationService },
           { provide: ResearcherProfileDataService, useValue: {} },
           { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+          { provide: BrowseService, useValue: BrowseServiceStub },
         ],
 
         schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index 4b7da40abe..3d72ec2360 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
@@ -41,6 +41,8 @@ import { BrowseDefinitionDataService } from '../../../../core/browse/browse-defi
 import {
   BrowseDefinitionDataServiceStub
 } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseService } from '../../../../core/browse/browse.service';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 
 const noMetadata = new MetadataMap();
 
@@ -96,6 +98,7 @@ describe('UntypedItemComponent', () => {
         { provide: ItemVersionsSharedService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(UntypedItemComponent, {
diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts
new file mode 100644
index 0000000000..85ca717cb0
--- /dev/null
+++ b/src/app/shared/testing/browse-service.stub.ts
@@ -0,0 +1,91 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const mockData = [
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType': 'date',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.date.issued',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'author',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.contributor.*',
+      'dc.creator',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'title',
+    'browseType': 'flatBrowse',
+    'dataType': 'title',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.title',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'subject',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject.*',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new HierarchicalBrowseDefinition(), {
+    'id': 'srsc',
+    'browseType': 'hierarchicalBrowse',
+    'facetType': 'subject',
+    'vocabulary': 'srsc',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject',
+    ],
+    '_links': EMPTY,
+  }),
+];
+export const BrowseServiceStub: any = {
+  /**
+   * Get all browse definitions.
+   */
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockData));
+  },
+};

From 050cde3735e7f5b7b91fcde12fe2a6ec0d1bd850 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Wed, 8 Jan 2025 22:51:25 +0100
Subject: [PATCH 1024/1286] Update es.json5

---
 src/assets/i18n/es.json5 | 3191 +++++++++++++++++++++++++++-----------
 1 file changed, 2321 insertions(+), 870 deletions(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 250f003b1d..6ce558741c 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -6,8 +6,8 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Llévame a la página de inicio",
 
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "no autorizado",
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "No autorizado",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
@@ -15,10 +15,10 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Llévame a la página de inicio",
 
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "prohibido",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibido",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "500.page-internal-server-error": "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.",
@@ -33,20 +33,20 @@
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Llévame a la página de inicio",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "página no encontrada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Página no encontrada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "no autorizado",
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "No autorizado",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibido",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibido",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Servicio no disponible",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "página no encontrada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Página no encontrada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
   "error-page.orcid.generic-error": "Hubo un error en el login vía ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
@@ -87,7 +87,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Fallo",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear formato de archivo",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -192,6 +192,9 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
 
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formatos de archivo seleccionados",
+
   // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
@@ -213,6 +216,12 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
@@ -237,9 +246,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemas seleccionados",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -258,8 +276,14 @@
   // "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.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
+  "admin.registries.schema.fields.head": "Campos de metadatos del esquema",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.",
@@ -270,6 +294,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Campos de metadatos seleccionados",
+
   // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
@@ -372,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuarios",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nuevo usuario",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nuevo usuario",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Agregar usuario",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Agregar usuario",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuarios",
 
@@ -384,7 +423,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadatos",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -402,7 +441,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nombre",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -432,10 +471,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apellidos",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Correo electrónico",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -489,8 +528,8 @@
   // "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 el usuario: \"{{ name }}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocurrió un error al intentar eliminar el usuario con id \"{{id}}\" con el código: \"{{statusCode}}\" y el mensaje: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
@@ -639,12 +678,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Miembros actuales",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Buscar",
 
@@ -729,312 +762,6 @@
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
-
-  //"admin.reports.collections.title": "Collection Filter Report",
-  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.head": "Collection Filter Report",
-  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.button.show-collections": "Show Collections",
-  "admin.reports.button.show-collections": "Mostrar Colecciones",
-
-  //"admin.reports.collections.collections-report": "Collection Report",
-  "admin.reports.collections.collections-report": "Informe de Colecciones",
-
-  //"admin.reports.collections.item-results": "Item Results",
-  "admin.reports.collections.item-results": "Resultados de Ítem",
-
-  //"admin.reports.collections.community": "Community",
-  "admin.reports.collections.community": "Comunidad",
-
-  //"admin.reports.collections.collection": "Collection",
-  "admin.reports.collections.collection": "Colección",
-
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  "admin.reports.collections.nb_items": "Nº Ítems",
-
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  "admin.reports.items.title": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.head": "Metadata Query Report",
-  "admin.reports.items.head": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.run": "Run Item Query",
-  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
-
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
-
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
-
-  //"admin.reports.items.limit": "Limit/",
-  "admin.reports.items.limit": "Límite/",
-
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  "admin.reports.items.wholeRepo": "Todo el repositorio",
-
-  //"admin.reports.items.anyField": "Any field",
-  "admin.reports.items.anyField": "Cualquier campo",
-
-  //"admin.reports.items.predicate.exists": "exists",
-  "admin.reports.items.predicate.exists": "existe",
-
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  "admin.reports.items.predicate.doesNotExist": "no existe",
-
-  //"admin.reports.items.predicate.equals": "equals",
-  "admin.reports.items.predicate.equals": "idéntico",
-
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
-
-  //"admin.reports.items.predicate.like": "like",
-  "admin.reports.items.predicate.like": "parecido",
-
-  //"admin.reports.items.predicate.notLike": "not like",
-  "admin.reports.items.predicate.notLike": "distinto",
-
-  //"admin.reports.items.predicate.contains": "contains",
-  "admin.reports.items.predicate.contains": "contiene",
-
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  "admin.reports.items.predicate.doesNotContain": "no contiene",
-
-  //"admin.reports.items.predicate.matches": "matches",
-  "admin.reports.items.predicate.matches": "coincide",
-
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  "admin.reports.items.predicate.doesNotMatch": "no coincide",
-
-  //"admin.reports.items.preset.new": "New Query",
-  "admin.reports.items.preset.new": "Nueva Consulta",
-
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  "admin.reports.items.preset.hasNoTitle": "Sin Título",
-
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
-
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
-
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
-
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
-
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
-
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
-
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
-
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
-
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
-
-  //"admin.reports.items.number": "No.",
-  "admin.reports.items.number": "Nº.",
-
-  //"admin.reports.items.id": "UUID",
-  "admin.reports.items.id": "UUID",
-
-  //"admin.reports.items.collection": "Collection",
-  "admin.reports.items.collection": "Colección",
-
-  //"admin.reports.items.handle": "URI",
-  "admin.reports.items.handle": "URI",
-
-  //"admin.reports.items.title": "Title",
-  "admin.reports.items.title": "Título",
-
-  //"admin.reports.commons.filters": "Filters",
-  "admin.reports.commons.filters": "Filtros",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
-
-  //"admin.reports.commons.previous-page": "Prev Page",
-  "admin.reports.commons.previous-page": "Pág. ant.",
-
-  //"admin.reports.commons.next-page": "Next Page",
-  "admin.reports.commons.next-page": "Pág. sig.",
-
-  //"admin.reports.commons.page": "Page",
-  "admin.reports.commons.page": "Página",
-
-  //"admin.reports.commons.of": "of",
-  "admin.reports.commons.of": "de",
-
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  "admin.reports.commons.export": "Exportar para actualizar metadatos",
-
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
-
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
-
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
-
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
-
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
-
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
-
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  "admin.reports.commons.filters.property.all_filters.tooltip": "Este filtro incluye todos los Ítems que cumplen con TODOS los filtros especificados",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
-
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
-
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
-
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
-
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
-
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
-
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
-
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
-
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
-
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
-
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
-
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  "admin.reports.commons.filters.permission": "Filtros de Permisos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
-
-  // "admin.search.breadcrumbs": "Administrative Search",
-  "admin.search.breadcrumbs": "Búsqueda administrativa",
-
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }}\"",
 
@@ -1062,14 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Atrás",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Control de calidad",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Control de calidad",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Control de calidad",
+
   // "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.editGroupPage": "En esta página, puede modificar las propiedades y miembros de un grupo. En la sección superior, puede editar el nombre del grupo y la descripción, a menos que este sea un grupo de administración de una colección o comunidad, en cuyo caso el nombre y descripción del grupo fueron auto-generadas y no podrán ser editadas. En las secciones siguientes, puede editar la afiliación al grupo. Para más detalles ver [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
-  // "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.addEpeople": "Para agregar o remover una persona en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los usuario (Use el desplegable que se encuentra a la derecha de la barra de búsqueda para seleccionar entre buscar por metadato o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para agregar o eliminar un usuario en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar usuarios (use el menú desplegable a la izquierda de la barra de búsqueda para elegir si buscar por metadatos o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
 
-  // "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.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un sub-grupo en este grupo, pulse el botón 'Examinar todo' o utilice la barra de búsqueda de abajo para buscar los subgrupos- Posteriormente pulse el botón con el icono más por cada sub-grupo que desea agregar a la lista, o el icono de papelera por cada sub-grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un subgrupo en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los grupos. Posteriormente pulse el botón con el icono más por cada grupo que desea agregar a la lista, o el icono de papelera por cada grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar Colecciones",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de Colecciones",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultados de ítem",
+
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunidad",
+
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Colección",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nº Ítems",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
+
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límite/",
+
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplazamiento",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Todo el repositorio",
+
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Cualquier campo",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existe",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "idéntico",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
+
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "parecido",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "distinto",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contiene",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no contiene",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincide",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincide",
+
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nueva Consulta",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Sin Título",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
+
+  // "admin.reports.items.number": "No.",
+  "admin.reports.items.number": "Nº.",
+
+  // "admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Colección",
+
+  // "admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Título",
+
+
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtros",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pág. ant.",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pág. sig.",
+
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Página",
+
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar para actualizar metadatos",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtros de Permisos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Búsqueda administrativa",
@@ -1182,10 +1223,10 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
-  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
   "admin.metadata-import.page.error.addFileUrl": "¡Seleccione primero la URL del archivo!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "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.toggle.upload": "Upload",
@@ -1239,12 +1280,6 @@
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Miembros actuales",
 
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadatos",
-
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Buscar",
 
@@ -1353,7 +1388,7 @@
   // "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.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "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\".",
@@ -1428,7 +1463,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "Se requiere un Nombre",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "Su dirección de correo electrónico *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1476,6 +1511,9 @@
   // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "Por categoría",
 
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Por Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por título",
 
@@ -1497,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Título",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoría de materia",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Buscar por autor",
 
@@ -1509,6 +1550,15 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Examinar por categoría",
 
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Seleccione una materia para añadir como filtro de búsqueda",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar por Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Seleccione un índice para añadir como filtro de búsqueda",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar por título",
 
@@ -1519,7 +1569,10 @@
   "pagination.previous.button": "Anterior",
 
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
-  "pagination.next.button.disabled.tooltip": "No hay mas páginas de resultados",
+  "pagination.next.button.disabled.tooltip": "No hay más páginas de resultados",
+
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control para la navegación de páginas, relativa al elemento con ID: ",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", comenzando por {{ startsWith }}",
@@ -1596,11 +1649,11 @@
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Examinar",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinando por {{ field }} {{ value }}",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinando por {{ field }} {{ value }}",
 
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Volver a los resultados",
@@ -1617,6 +1670,12 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, enviar de vuelta al Administrador de Revisión del flujo de trabajo",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear colección",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Buscar un logotipo de colección",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una colección",
 
@@ -1911,11 +1970,11 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Colección",
 
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Envíos recientes",
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotipo de la colección",
 
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "No hay ítems para mostrar",
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Buscar",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta colección",
@@ -1929,12 +1988,24 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultados de la búsqueda",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hay colecciones para mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Colecciones seleccionadas",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar colección",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar colección",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
@@ -2025,6 +2096,21 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Colapsar {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Buscar un logotipo de la comunidad",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunidades y colecciones",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunidad",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
@@ -2070,17 +2156,23 @@
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminación",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Deshacer eliminación",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Deshacer eliminación",
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logotipo de la comunidad",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Subida correcta del logotipo de la comunidad.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
@@ -2091,7 +2183,7 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
@@ -2100,7 +2192,7 @@
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occurred while editing the community",
   "community.edit.notifications.error": "Se produjo un error al editar la comunidad.",
 
   // "community.edit.return": "Back",
@@ -2139,6 +2231,9 @@
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidad",
 
+  // "community.logo": "Community logo",
+  "community.logo": "Logotipo de la comunidad",
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ninguno",
 
@@ -2187,8 +2282,8 @@
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "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 í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.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuarios y Grupos que pueden leer nuevos archivos enviados a esta colección. Los cambios en este rol no son retroactivos. Los archivos 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.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.",
@@ -2250,6 +2345,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultados de la búsqueda",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
@@ -2286,14 +2384,17 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Rechazar",
 
+  // "cookies.consent.decline-all": "Decline all",
+  "cookies.consent.decline-all": "Rechazar todo",
+
   // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "Aceptar",
 
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Guardar",
 
-  // "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": "We collect and process your personal information for the following purposes: {purposes}",
+  "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: {purposes}",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizar",
@@ -2307,6 +2408,9 @@
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Para más información, lea por favor nuestra {privacyPolicy}.",
 
+  // "cookies.consent.content-modal.no-privacy-policy.text": "",
+  "cookies.consent.content-modal.no-privacy-policy.text": "",
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Información que recopilamos",
 
@@ -2391,7 +2495,7 @@
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Error al ejecutar la tarea de curación",
 
-  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  // "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
   "curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de curación.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
@@ -2421,6 +2525,12 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Borrar selección",
+
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Borrar la opción seleccionada",
+
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sin título",
 
@@ -2481,6 +2591,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Busque un {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidad",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "colección",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccione una colección",
 
@@ -2586,6 +2705,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Borrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "¿Está seguro de que desea eliminar el logotipo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Borrar Perfil",
 
@@ -2664,6 +2786,9 @@
   // "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 conceder 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.cclicense.required": "You must grant this cclicense to complete your submission. If you are unable to grant the cclicense at this time, you may save your work and return later or remove the submission.",
+  "error.validation.cclicense.required": "Debe conceder esta licencia CC para completar su envío. Si no puede conceder esta licencia CC 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: {{ pattern }}.",
 
@@ -2673,10 +2798,10 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Se requiere este campo",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Este no es un correo electrónico válido",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Este correo electrónico ya está en uso",
 
   // "error.validation.groupExists": "This group already exists",
@@ -2706,6 +2831,9 @@
   // "feed.description": "Syndication feed",
   "feed.description": "Hilo de sindicación",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Archivo restringido",
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error al obtener archivos para este ítem",
 
@@ -2730,6 +2858,9 @@
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Sugerencias",
 
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
 
@@ -2760,8 +2891,8 @@
   // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "Error al intentar restablecer la contraseña",
 
-  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
+  // "forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Se produjo un error al intentar restablecer la contraseña de la cuenta asociada con la siguiente dirección de correo electrónico: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Olvido de contraseña",
@@ -2787,7 +2918,7 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Reescriba para confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
   "forgot-password.form.error.empty-password": "Introduzca una contraseña en el cuadro a continuación.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
@@ -2904,6 +3035,12 @@
   // "form.create": "Create",
   "form.create": "Crear",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrementar {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
@@ -3117,15 +3254,27 @@
   // "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": "The page related to your feedback",
   "info.feedback.page_help": "La página relacionada con su sugerencia",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Soporte COAR Notify",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Soporte COAR Notify",
+
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Solicitar reintegración",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Solicitado por",
+
   // "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 í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.",
 
@@ -3186,6 +3335,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Archivos en el bloque {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Puede mover un archivo a una página diferente soltándolo en el número de página.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3204,9 +3359,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha sido devuelto a la posición {{ toIndex }} y ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperando a que se complete el movimiento.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ahora está en la posición {{ toIndex }}.",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "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.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Los archivos pueden reordenarse dentro de sus bloques manteniendo el asa de arrastre y moviendo el ratón. Alternativamente, los archivos pueden moverse usando el teclado de la siguiente manera: Seleccione el archivo presionando enter cuando el asa de arrastre del archivo esté en foco. Mueva el archivo hacia arriba o hacia abajo usando las teclas de flecha. Presione enter nuevamente para confirmar la posición actual del archivo.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Acciones",
 
@@ -3417,6 +3590,15 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clave de autoridad",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3453,6 +3635,9 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar campo",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "item.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -3495,6 +3680,15 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoridad: ",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquear el valor de la clave de autoridad para la edición manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquear el valor de la clave de autoridad para la edición manual",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3528,6 +3722,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertencia: Cuando está habilitado, la política de acceso de lectura para el ítem y cualquier archivo asociado con el ítem será reemplazada por la política de acceso de lectura predeterminada de la colección. Esto no se puede deshacer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
 
@@ -3819,6 +4016,18 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraer",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Ver",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Ver",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "Borrar Orden de Supervisión",
 
@@ -3843,6 +4052,33 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Borrar grupo de supervisión",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Este valor de autoridad ha sido confirmado como preciso por un usuario interactivo",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor es singular y válido, pero no ha sido visto y aceptado por un humano, por lo que aún es incierto",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hay múltiples valores de autoridad coincidentes de igual validez",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hay respuestas coincidentes en la autoridad",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "La autoridad encontró una falla interna",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "La autoridad recomienda que se rechace esta presentación",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "La autoridad no devolvió un valor de confianza razonable",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Nunca se registró la confianza para este valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confianza desconocido",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumen",
 
@@ -3885,18 +4121,6 @@
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamaño:",
 
-  // "menu.section.reports": "Reports",
-  "menu.section.reports": "Informes",
-
-  // "menu.section.reports.collections": "Filtered Collections",
-  "menu.section.reports.collections": "Colecciones filtradas",
-
-  // "menu.section.reports.queries": "Metadata Query",
-  "menu.section.reports.queries": "Consulta de metadatos",
-
-  // "menu.section.admin_search": "Admin Search",
-  "menu.section.admin_search": "Búsqueda de administrador",
-
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Ítems de esta revista",
 
@@ -3945,6 +4169,9 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraer",
 
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
   // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bloque original",
 
@@ -3957,6 +4184,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nueva version",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Solicitar la retirada de este ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Solicitar la reintegración",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
@@ -3966,6 +4199,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclame este item como perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "Logotipo de ROR",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -4044,12 +4280,45 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línea de financiación:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Fecha de fundación",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nombre legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipo de entidad:",
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionado",
 
   // "item.select.empty": "No items to show",
   "item.select.empty": "No hay ítems para mostrar",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionados",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
 
@@ -4125,6 +4394,15 @@
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nueva versión",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Solicitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Solicitar reintegración",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nueva versión",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Crear una nueva versión de este ítem",
 
@@ -4137,21 +4415,63 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nueva versión",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar solicitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancelar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "No crear una nueva versión",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar solicitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resumen",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Está solicitando retirar este ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Por favor, introduzca la razón para la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Está solicitando reintegrar este ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Por favor, introduzca la razón para la reintegración",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "Introduzca el resumen de esta nueva versión",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduzca la razón para la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduzca la razón para la reintegración",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creando nueva versión...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviando solicitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Solicitud de reintegración enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Solicitud de retirada enviada.",
+
   // "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.",
 
@@ -4200,6 +4520,12 @@
   // "itemtemplate.edit.metadata.discard-button": "Discard",
   "itemtemplate.edit.metadata.discard-button": "Descartar",
 
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -4233,6 +4559,9 @@
   // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "Valor",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar campo",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "itemtemplate.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -4332,6 +4661,9 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados de la búsqueda de números de revistas",
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
 
@@ -4350,6 +4682,9 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultados de la búsqueda de volúmenes de revistas",
+
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -4449,9 +4784,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "¿Nuevo Usuario? Pulse aquí para registrarse",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "o",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Iniciar sesión con OIDC",
 
@@ -4482,6 +4814,9 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegación de administración",
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -4506,6 +4841,15 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuarios",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Colecciones filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consulta de metadatos",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Búsqueda de administrador",
 
@@ -4536,6 +4880,9 @@
   // "menu.section.browse_global_by_srsc": "By Subject Category",
   "menu.section.browse_global_by_srsc": "Por categoría",
 
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Por Norwegian Science Index",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por titulo",
 
@@ -4581,7 +4928,7 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
-  //"menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Sección del menú de informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -4629,6 +4976,9 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4656,6 +5006,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificaciones",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Control de calidad",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Anclar barra lateral",
 
@@ -4683,12 +5042,12 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarea de estadísticas",
 
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  "menu.section.toggle.reports": "Alternar sección de informes",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar sección de informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
@@ -4806,16 +5165,16 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sin título",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sin URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Tareas del flujo de trabajo",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Sus envíos",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
@@ -4854,6 +5213,18 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar sugerencias",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
 
@@ -4869,7 +5240,7 @@
   // "nav.login": "Log In",
   "nav.login": "Iniciar sesión",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "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",
@@ -4908,6 +5279,216 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Control de calidad",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temas actuales",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fuentes actuales",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fuente",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último acontecimiento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Acciones",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No se han encontrado temas.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No se han encontrado fuentes.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugerencias para el control de calidad",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Cargando ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confíe en",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicación",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalles",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalles del proyecto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razones",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Acciones",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceptar sugerencia",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Borrar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor del PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumen:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título del proyecto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Volver a los temas",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar más",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado al registro local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "¿Seguro?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicación:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Buscar proyectos",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Buscar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpiar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Motivo",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
@@ -4935,6 +5516,12 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unidad organizativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
 
@@ -5001,6 +5588,18 @@
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar parámetro",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Agregar un parámetro...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar parámetro",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del parámetro",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
 
@@ -5089,7 +5688,6 @@
   "process.detail.script": "Secuencia de comandos",
 
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
-
   "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
   // "process.detail.start-time": "Start time",
@@ -5128,6 +5726,24 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo falló eliminando el proceso",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualización automática…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Procesos exitosos",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No se encontraron procesos coincidentes.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Procesos fallidos",
+
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalización (UTC)",
 
@@ -5137,6 +5753,18 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nombre",
 
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora de inicio (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Procesos en ejecución",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creación (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Procesos programados",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de inicio (UTC)",
 
@@ -5161,6 +5789,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} procesos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar proceso",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Limpiar la selección",
 
@@ -5171,7 +5802,10 @@
   "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.overview.delete.header": "Eliminar procesos",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconocido",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminando proceso",
@@ -5200,9 +5834,6 @@
   // "profile.special.groups.head": "Authorization special groups you belong to",
   "profile.special.groups.head": "Grupos especiales de autorización a los que pertenece",
 
-  // "profile.head": "Update Profile",
-  "profile.head": "Actualización del perfil",
-
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Se requiere el nombre",
 
@@ -5353,6 +5984,105 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Lista de reproducción",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Cargando ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamo de publicación",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamo de publicación",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugerencias actuales",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nombre del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Acciones",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Ningún destino encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuación",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprobar e importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver pruebas",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar pruebas",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugerencias para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gráfico OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "del ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuación total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
+
   // "register-email.title": "New user registration",
   "register-email.title": "Registro de nuevo usuario",
 
@@ -5449,7 +6179,7 @@
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Error al intentar registrar el correo electrónico",
 
-  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  // "register-page.registration.error.content": "An error occurred 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",
@@ -5497,12 +6227,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistas",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volumen de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unidades organizativas",
 
@@ -5527,6 +6263,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volúmenes de revistas",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volumen de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Colaboradores",
 
@@ -5665,7 +6404,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nombre",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Máximo 30 caracteres",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5698,6 +6437,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar todo",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar todo",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5722,6 +6473,9 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contenido principal",
+
   // "search.description": "",
   "search.description": "",
 
@@ -5737,6 +6491,12 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Buscar en el repositorio ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5758,6 +6518,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
 
@@ -5785,6 +6551,36 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no es igual a",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " sin autoridad",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contiene",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no contiene",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Buscar por título",
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5887,6 +6683,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo",
 
@@ -5995,6 +6809,12 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Examinar árbol {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiación",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiación",
+
   // "search.filters.filter.supervisedBy.head": "Supervised By",
   "search.filters.filter.supervisedBy.head": "Supervisado Por",
 
@@ -6013,6 +6833,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unidad organizativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Proyecto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicación",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -6025,6 +6854,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validación",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sí",
 
@@ -6040,6 +6884,27 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Es igual a",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No es igual a",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridad",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Sin autoridad",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contiene",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No contiene",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -6091,6 +6956,21 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Añadir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ajustes",
 
@@ -6103,6 +6983,12 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -6139,6 +7025,24 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Apellido Ascendente",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Apellido Descendente",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nombre Ascendente",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nombre Descendente",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Fecha de nacimiento Ascendente",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Fecha de nacimiento Descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -6205,6 +7109,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Atrás",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardado",
 
@@ -6280,6 +7187,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6310,8 +7220,14 @@
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "Editores SHERPA",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "API de Financiamiento de OpenAIRE",
+  // "submission.import-external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Búsqueda de OpenAIRE por autores",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Búsqueda de OpenAIRE por título",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Búsqueda de OpenAIRE por financiador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6325,6 +7241,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista previa del ítem",
 
@@ -6415,9 +7334,6 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "API OpenAIRE de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importación remota de autor",
 
@@ -6451,6 +7367,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importando desde OpenAIRE",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal",
 
@@ -6463,6 +7388,9 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importar desde ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6496,6 +7424,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importación remota de organización",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organización local agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organización externa importada y agregada con éxito a la selección",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo",
 
@@ -6580,6 +7517,30 @@
   // "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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Búsqueda por financiador OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Revistas Sherpa por ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación",
 
@@ -6589,9 +7550,6 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos",
 
@@ -6601,8 +7559,8 @@
   // "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",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unidad organizativa del proyecto",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto",
@@ -6619,6 +7577,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
 
@@ -6670,6 +7631,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicación",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "Unidad organizativa",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6739,6 +7703,15 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda",
 
@@ -6763,6 +7736,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados de la búsqueda",
 
@@ -6826,6 +7802,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No se encontró ninguna colección",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No se encontraron tipos de entidad",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hay opciones disponibles",
 
@@ -6877,8 +7856,8 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Describir",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Posibles duplicados",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "Identificadores",
@@ -6934,6 +7913,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraer sección {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Hacer {{fileName}} el archivo principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Eliminar {{fileName}} como el archivo principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
@@ -7069,6 +8054,18 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Hasta",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No se detectaron duplicados.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Se detectaron posibles duplicados. Por favor, revise la lista a continuación.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Este ítem está en el espacio de trabajo",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Este ítem está en el flujo de trabajo",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo la licencia",
 
@@ -7258,6 +8255,9 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "se detectaron posibles duplicados para este ítem. Reclame y edite este ítem para ver los detalles.",
+
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Ver",
 
@@ -7411,6 +8411,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Buscar",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados escribiendo las primeras letras",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No había ítems para mostrar",
 
@@ -7465,6 +8468,9 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Tareas del flujo de trabajo y del espacio de trabajo",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
 
@@ -8035,6 +9041,9 @@
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Sugerencia: Configure un temporizador. Cuando esté habilitado, se puede establecer una fecha en el futuro y el banner del sistema de alerta realizara una cuenta regresiva hasta la fecha establecida. Cuando finalice el temporizador, este desaparecerá de la alerta. El servidor NO se detendrá automáticamente..",
 
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccionar fecha usando el calendario",
+
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
   "system-wide-alert.form.label.preview": "Vista preliminar de la alerta del sistema",
 
@@ -8056,6 +9065,9 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas del sistema",
 
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descubrir",
+
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
   "item-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso a los metadatos o a los archivos del ítem.",
 
@@ -8068,9 +9080,21 @@
   // "access-control-item-header-toggle": "Item's Metadata",
   "access-control-item-header-toggle": "Metadatos del ítem",
 
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar opción para realizar cambios en los metadatos del ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar opción para realizar cambios en los metadatos del ítem",
+
   // "access-control-bitstream-header-toggle": "Bitstreams",
   "access-control-bitstream-header-toggle": "Archivos",
 
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar opción para realizar cambios en los archivos",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar opción para realizar cambios en los archivos",
+
   // "access-control-mode": "Mode",
   "access-control-mode": "Modo",
 
@@ -8095,6 +9119,9 @@
   // "access-control-bitstreams-selected": "bitstreams selected",
   "access-control-bitstreams-selected": "archivos seleccionados",
 
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar archivos",
+
   // "access-control-cancel": "Cancel",
   "access-control-cancel": "Cancelar",
 
@@ -8104,6 +9131,9 @@
   // "access-control-add-more": "Add more",
   "access-control-add-more": "Añadir mas",
 
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condición de acceso",
+
   // "access-control-select-bitstreams-modal.title": "Select bitstreams",
   "access-control-select-bitstreams-modal.title": "Seleccionar archivos",
 
@@ -8131,134 +9161,661 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  // "browse.search-form.placeholder": "Search the repository",
-  "browse.search-form.placeholder": "Buscar en el repositorio",
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Añadir",
 
-  // "file-download-link.download": "Download ",
-  "file-download-link.download": "Descargar ",
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
 
-  // "register-page.registration.aria.label": "Enter your e-mail address",
-  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
 
-  // "forgot-email.form.aria.label": "Enter your e-mail address",
-  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocolo COAR Notify",
 
-  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
-  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, apoyamos completamente el protocolo COAR Notify, que está diseñado para mejorar la comunicación entre repositorios. Para obtener más información sobre el protocolo COAR Notify, visite el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">sitio web de COAR Notify</a>.",
 
-  // "search.filters.applied.f.title": "Title",
-  "search.filters.applied.f.title": "Título",
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Buzón LDN",
 
-  // "search.filters.applied.f.original_bundle_filenames": "File name",
-  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Para su conveniencia, nuestro Buzón LDN (Linked Data Notifications) es fácilmente accesible en {{ ldnInboxUrl }}. El Buzón LDN permite una comunicación e intercambio de datos sin problemas, asegurando una colaboración eficiente y efectiva.",
 
-  // "search.filters.applied.f.original_bundle_descriptions": "File description",
-  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderación de mensajes",
 
-  // "search.filters.applied.operator.equals": "",
-  "search.filters.applied.operator.equals": "",
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Para asegurar un entorno seguro y productivo, todos los mensajes LDN entrantes son moderados. Si planea intercambiar información con nosotros, por favor contáctenos a través de nuestro",
 
-  // "search.filters.applied.operator.notequals": " not equals",
-  "search.filters.applied.operator.notequals": " no es igual a",
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulario de comentarios.",
 
-  // "search.filters.applied.operator.authority": "",
-  "search.filters.applied.operator.authority": "",
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servicio",
 
-  // "search.filters.applied.operator.notauthority": " not authority",
-  "search.filters.applied.operator.notauthority": " sin autoridad",
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Servicios Registrados",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nombre",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripción",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estado",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acción",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NUEVO",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Servicios Registrados",
 
-  // "search.filters.applied.operator.contains": " contains",
-  "search.filters.applied.operator.contains": " contiene",
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitado",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitado",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Haga clic para habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Haga clic para deshabilitar",
 
-  // "search.filters.applied.operator.notcontains": " not contains",
-  "search.filters.applied.operator.notcontains": " no contiene",
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servicio",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servicio",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servicio",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Por favor confirme la creación de este servicio.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estado",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancelar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nuevo servicio",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nombre",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripción",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servicio",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rango de IP del Servicio",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivel de confianza",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Por favor proporcione el nombre del servicio",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Por favor proporcione una descripción sobre su servicio",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Por favor ingrese la URL para que los usuarios puedan obtener más información sobre el servicio",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límite inferior del rango IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límite superior del rango IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Por favor especifique la URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Por favor ingrese un valor entre 0 y 1. Use el “.” como separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccione un patrón",
 
-  // "search.filters.applied.operator.query": "",
-  "search.filters.applied.operator.query": "",
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconocer y aceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Este patrón se usa para reconocer y aceptar una solicitud (oferta). Implica una intención de actuar sobre la solicitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconocimientos",
 
-  // "search.filters.entityType.Person": "Person",
-  "search.filters.entityType.Person": "Persona",
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconocer y rechazar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Este patrón se usa para reconocer y rechazar una solicitud (oferta). Significa que no habrá más acciones con respecto a la solicitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconocimientos",
 
-  // "search.filters.entityType.Project": "Project",
-  "search.filters.entityType.Project": "Proyecto",
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconocer y Aceptar Tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Este patrón se usa para reconocer y aceptar tentativamente una solicitud (oferta). Implica una intención de actuar, que puede cambiar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconocimientos",
 
-  // "search.filters.entityType.Publication": "Publication",
-  "search.filters.entityType.Publication": "Publicación",
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconocer y rechazar tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Este patrón se usa para reconocer y rechazar tentativamente una solicitud (oferta). Significa que no habrá más acciones, sujeto a cambios.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconocimientos",
 
-  // "search.filters.namedresourcetype.Archived": "Archived",
-  "search.filters.namedresourcetype.Archived": "Archivado",
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar aprobación",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Este patrón se usa para anunciar la existencia de una aprobación, haciendo referencia al recurso aprobado.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Validation": "Validation",
-  "search.filters.namedresourcetype.Validation": "Validación",
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar ingestión",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Este patrón se usa para anunciar que un recurso ha sido ingerido.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
-  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar relación",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Este patrón se usa para anunciar una relación entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Workflow": "Workflow",
-  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar revisión",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Este patrón se usa para anunciar la existencia de una revisión, haciendo referencia al recurso revisado.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Workspace": "Workspace",
-  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar resultado del servicio",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Este patrón se usa para anunciar la existencia de un 'resultado del servicio', haciendo referencia al recurso relevante.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncios",
 
-  // "search.filters.operator.equals.text": "Equals",
-  "search.filters.operator.equals.text": "Es igual a",
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Solicitar aprobación",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Este patrón se usa para solicitar la aprobación de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Solicitudes",
 
-  // "search.filters.operator.notequals.text": "Not Equals",
-  "search.filters.operator.notequals.text": "No es igual a",
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Solicitar ingestión",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Este patrón se usa para solicitar que el sistema de destino ingiera un recurso.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Solicitudes",
 
-  // "search.filters.operator.authority.text": "Authority",
-  "search.filters.operator.authority.text": "Autoridad",
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Solicitar revisión",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Este patrón se usa para solicitar una revisión de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Solicitudes",
 
-  // "search.filters.operator.notauthority.text": "Not Authority",
-  "search.filters.operator.notauthority.text": "Sin autoridad",
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Deshacer oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Este patrón se usa para deshacer (retractar) una oferta previamente realizada.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Deshacer",
 
-  // "search.filters.operator.contains.text": "Contains",
-  "search.filters.operator.contains.text": "Contiene",
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No se seleccionó filtro de ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtro de ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automático",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Se requiere el nombre",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Se requiere la URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Por favor, ingrese un rango de IP válido",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Por favor, ingrese un IpV4 válido en ambos límites del rango (nota: para una sola IP, ingrese el mismo valor en ambos campos)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Se requiere la URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Se requiere al menos un patrón",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Por favor, ingrese una puntuación válida (entre 0 y 1). Use el “.” como separador decimal",
 
-  // "search.filters.operator.notcontains.text": "Not Contains",
-  "search.filters.operator.notcontains.text": "No contiene",
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patrón soportado",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Añadir más",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nuevo servicio",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "¿Está seguro de que desea eliminar este servicio?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "¿Confirma los cambios?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar servicio",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancelar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "¿Está seguro de que desea descartar los cambios y salir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar cambios",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edición exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servicio ha sido editado",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edición fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servicio no ha sido editado",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creación exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servicio ha sido creado",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creación fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servicio no ha sido creado",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Por favor, seleccione al menos un patrón de entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estado actualizado con éxito",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "El estado del servicio ha sido actualizado",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminación exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servicio ha sido eliminado",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminación fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servicio no ha sido eliminado",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancelar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servicio",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servicio",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nombre",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripción",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del servicio",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL del buzón LDN",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patrón de entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sin patrón de entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtro de ítem seleccionado",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sin filtro de ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automático",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Añadir más",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar servicio",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Seleccionar ninguno",
 
-  // "search.filters.operator.query.text": "Query",
-  "search.filters.operator.query.text": "Consulta",
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Ocurrió un error al crear este proceso",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Éxito",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El proceso se creó con éxito",
 
-  // "search.sidebar.advanced-search.title": "Advanced Search",
-  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servicio seleccionado es compatible con el ítem según su estado actual. {{ service.name }}: {{ service.description }}",
 
-  // "discover.filters.head": "Discover",
-  "discover.filters.head": "Descubrir",
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Aprobación",
 
-  // "search.filters.filter.title.head": "Title",
-  "search.filters.filter.title.head": "Título",
+  // "item.page.review": "Review",
+  "item.page.review": "Revisión",
 
-  // "search.filters.filter.title.placeholder": "Title",
-  "search.filters.filter.title.placeholder": "Título",
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciado por",
 
-  // "search.filters.filter.title.label": "Search Title",
-  "search.filters.filter.title.label": "Buscar por título",
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementado por",
 
-  // "search.filters.filter.original_bundle_filenames.head": "File name",
-  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visión general de Servicios LDN",
 
-  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
-  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Servicios LDN",
 
-  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
-  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servicio LDN",
 
-  // "search.filters.filter.original_bundle_descriptions.head": "File description",
-  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuación puede ver todos los temas recibidos de las suscripciones a {{source}} en relación con el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b>.",
 
-  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
-  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b> y ",
 
-  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
-  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del servicio:",
 
-  // "search.filters.filter.funding.head": "Funding",
-  "search.filters.filter.funding.head": "Financiación",
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enlace:",
 
-  // "search.filters.filter.funding.placeholder": "Funding",
-  "search.filters.filter.funding.placeholder": "Financiación",
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancelar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servicio",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servicio",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "¿Está seguro de que desea eliminar el servicio actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servicio",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servicio se eliminó con éxito.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Algo salió mal al eliminar el servicio",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID de servicios",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nombre",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora de inicio (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estado",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuario",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visión general de servicios",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visión general de servicios",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Acciones",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripción",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Puede solicitar una revisión a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Puede solicitar una aprobación a una de las siguientes revistas superpuestas",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Puede solicitar la ingestión de una copia de su envío a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hay datos disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Seleccionar ninguno",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccione un servicio para {{ pattern }} de este ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripción del servicio seleccionado:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hay más información disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servicio seleccionado no es adecuado para el ítem actual. Por favor, consulte la descripción para obtener detalles sobre qué registro puede ser gestionado por este servicio.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No se encontraron patrones configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtro inválido, intente seleccionar otro servicio o ninguno.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido aceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido rechazada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> está pendiente.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patrón soportado para eliminación",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patrón soportado para eliminación",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccione filtro de ítem para el patrón",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccione un patrón para el servicio",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccione servicio para eliminación",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servicio LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Cerrar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipo de ítem es Artículo de revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Siempre verdadero",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Procesamiento automático",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contiene DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtro DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipo de documento es igual a driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Tiene al menos un archivo",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Tiene archivo",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Tiene un archivo",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Está archivado",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Está retirado",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "El ítem es público",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestión de revistas",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El título comienza con el patrón",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipo es igual a Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipo es igual a Artículo de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Ninguno",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Dashboard de Notificaciones",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El dashboard de Notificaciones monitorea el uso general del protocolo COAR Notify en todo el repositorio. En la pestaña “Métricas” hay estadísticas sobre el uso del protocolo COAR Notify. En las pestañas “Logs/Entrantes” y “Logs/Salientes” es posible buscar y verificar el estado individual de cada mensaje LDN, ya sea recibido o enviado.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Métricas",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Número de LDN recibidos",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Número de LDN generados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Aceptado",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificaciones entrantes aceptadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Mostrando actualmente: Notificaciones aceptadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN procesados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificaciones entrantes procesadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Mostrando actualmente: LDN procesados",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificaciones entrantes fallidas",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificaciones salientes fallidas",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Mostrando actualmente: Notificaciones no confiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No confiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificaciones entrantes no confiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificaciones entrantes entregadas con éxito",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Entregado",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificaciones salientes entregadas con éxito",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Mostrando actualmente: Notificaciones en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificaciones actualmente en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cola",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Mostrando actualmente: Notificaciones en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificaciones actualmente en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionados con notificaciones entrantes",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionados con notificaciones salientes",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Mensajes entrantes",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Logs/Entrantes",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtro: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionados",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servicio LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificación de Revisión",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificación de Aprobación",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificación de Relación",
 
   // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
   "search.filters.filter.queue_last_start_time.head": "Última hora de procesamiento ",
@@ -8269,6 +9826,21 @@
   // "search.filters.filter.queue_last_start_time.max.label": "Max range",
   "search.filters.filter.queue_last_start_time.max.label": "Alcance máximo",
 
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rango mínimo",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rango máximo",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Mensajes salientes",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Logs/Salientes",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrantes",
+
   // "search.filters.filter.relateditem.head": "Related item",
   "search.filters.filter.relateditem.head": "Ítem relacionado",
 
@@ -8305,8 +9877,44 @@
   // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
   "search.filters.filter.activity_stream_type.label": "Buscar por tipo de flujo de actividad",
 
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estado de la cola",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "Ip no confiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cola",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Procesando",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Procesado",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallido",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No confiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acción no mapeada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cola para reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipo de flujo de actividad",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipo de notificación COAR",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipo de notificación",
+
   // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
-  "search.filters.filter.coar_notify_type.label": "Buscar por COAR Tipo de notificación",
+  "search.filters.filter.coar_notify_type.label": "Buscar por Tipo de notificación COAR",
 
   // "search.filters.filter.notification_type.label": "Search notification type",
   "search.filters.filter.notification_type.label": "Buscar por tipo de notificación",
@@ -8359,6 +9967,204 @@
   // "search.filters.filter.notifyReview.placeholder": "Notify Review",
   "search.filters.filter.notifyReview.placeholder": "Notificación de revisión",
 
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acción de revisión",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acción de aprobación",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acción de ingestión",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acción de relación",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última hora de procesamiento descendente",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última hora de procesamiento ascendente",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Intentos de cola descendente",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Intentos de cola ascendente",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems involucrados en LDN entrantes",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems involucrados en LDN salientes",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipo",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipo de notificación COAR",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipo de flujo de actividad",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En respuesta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositorio",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositorio",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Intentos de cola",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vez que se inició la cola",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servicio LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servicio LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estado de la cola",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Tiempo de espera de la cola",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detalle del mensaje",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar mensaje",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de tiempo",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositorio",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servicio LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipo",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estado",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acción",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detalle",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocesar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Procesado",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallido",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cola para reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acción no mapeada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Procesando",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cola",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No confiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servicio LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionado",
+
   // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
   "search.filters.filter.notifyEndorsement.head": "Notificación de aprobación",
 
@@ -8368,378 +10174,23 @@
   // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
   "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
 
-  // "menu.section.notifications": "Notifications",
-  "menu.section.notifications": "Notificaciones",
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licencia Creative Commons",
 
-  // "menu.section.icon.notifications": "Notifications menu section",
-  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepto donde se indique lo contrario, la licencia de este ítem se describe como",
 
-  // "menu.section.notifications_publication-claim": "Publication Claim",
-  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar en el repositorio",
 
-  // "menu.section.quality-assurance": "Quality Assurance",
-  "menu.section.quality-assurance": "Control de calidad",
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
 
-  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
-  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
-  // "notification.suggestion.review": "review the suggestions",
-  "notification.suggestion.review": "revisar sugerencias",
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
-  // "notification.suggestion.please": "Please",
-  "notification.suggestion.please": "Por favor",
 
-  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
-  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
-
-  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
-  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
-
-  // "suggestion.loading": "Loading ...",
-  "suggestion.loading": "Cargando ...",
-
-  // "suggestion.title": "Publication Claim",
-  "suggestion.title": "Reclamo de publicación",
-
-  // "suggestion.title.breadcrumbs": "Publication Claim",
-  "suggestion.title.breadcrumbs": "Reclamo de publicación",
-
-  // "suggestion.targets.description": "Below you can see all the suggestions ",
-  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
-
-  // "suggestion.targets": "Current Suggestions",
-  "suggestion.targets": "Sugerencias actuales",
-
-  // "suggestion.table.name": "Researcher Name",
-  "suggestion.table.name": "Nombre del investigador",
-
-  // "suggestion.table.actions": "Actions",
-  "suggestion.table.actions": "Acciones",
-
-  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
-  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
-
-  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
-  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
-
-  // "suggestion.noTargets": "No target found.",
-  "suggestion.noTargets": "Ningún destino encontrado.",
-
-  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
-  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
-
-  // "suggestion.evidence.type": "Type",
-  "suggestion.evidence.type": "Tipo",
-
-  // "suggestion.evidence.score": "Score",
-  "suggestion.evidence.score": "Puntuación",
-
-  // "suggestion.evidence.notes": "Notes",
-  "suggestion.evidence.notes": "Notas",
-
-  // "suggestion.approveAndImport": "Approve & import",
-  "suggestion.approveAndImport": "Aprobar e importar",
-
-  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
-  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
-
-  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
-  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
-
-  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
-  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
-
-  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
-  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
-
-  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
-  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
-
-  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
-  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
-
-  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
-  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
-
-  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
-  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
-
-  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
-  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
-
-  // "suggestion.seeEvidence": "See evidence",
-  "suggestion.seeEvidence": "Ver pruebas",
-
-  // "suggestion.hideEvidence": "Hide evidence",
-  "suggestion.hideEvidence": "Ocultar pruebas",
-
-  // "suggestion.suggestionFor": "Suggestions for",
-  "suggestion.suggestionFor": "Sugerencias para",
-
-  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
-  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
-
-  // "suggestion.source.openaire": "OpenAIRE Graph",
-  "suggestion.source.openaire": "Gráfico OpenAIRE",
-
-  // "suggestion.from.source": "from the ",
-  "suggestion.from.source": "del ",
-
-  // "suggestion.count.missing": "You have no publication claims left",
-  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
-
-  // "suggestion.totalScore": "Total Score",
-  "suggestion.totalScore": "Puntuación total",
-
-  // "suggestion.type.openaire": "OpenAIRE",
-  "suggestion.type.openaire": "OpenAIRE",
-
-  // "notifications.events.title": "Quality Assurance Suggestions",
-  "notifications.events.title": "Sugerencias para el control de calidad",
-
-  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
-  "admin.quality-assurance.breadcrumbs": "Control de calidad",
-
-  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
-  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
-
-  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
-  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
-
-  // "admin.quality-assurance.page.title": "Quality Assurance",
-  "admin.quality-assurance.page.title": "Control de calidad",
-
-  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
-  "admin.notifications.source.breadcrumbs": "Control de calidad",
-
-  // "quality-assurance.event.table.person-who-requested": "Requested by",
-  "quality-assurance.event.table.person-who-requested": "Solicitado por",
-
-  // "quality-assurance.title": "Quality Assurance",
-  "quality-assurance.title": "Control de calidad",
-
-  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
-  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
-
-  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
-  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
-
-  // "quality-assurance.topics": "Current Topics",
-  "quality-assurance.topics": "Temas actuales",
-
-  // "quality-assurance.source": "Current Sources",
-  "quality-assurance.source": "Fuentes actuales",
-
-  // "quality-assurance.table.topic": "Topic",
-  "quality-assurance.table.topic": "Tema",
-
-  // "quality-assurance.table.source": "Source",
-  "quality-assurance.table.source": "Fuente",
-
-  // "quality-assurance.table.last-event": "Last Event",
-  "quality-assurance.table.last-event": "Último acontecimiento",
-
-  // "quality-assurance.table.actions": "Actions",
-  "quality-assurance.table.actions": "Acciones",
-
-  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
-  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
-
-  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
-  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
-
-  // "quality-assurance.noTopics": "No topics found.",
-  "quality-assurance.noTopics": "No se han encontrado temas.",
-
-  // "quality-assurance.noSource": "No sources found.",
-  "quality-assurance.noSource": "No se han encontrado fuentes.",
-
-  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
-  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
-
-  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
-  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
-
-  // "quality-assurance.loading": "Loading ...",
-  "quality-assurance.loading": "Cargando ...",
-
-  // "quality-assurance.events.topic": "Topic:",
-  "quality-assurance.events.topic": "Tema:",
-
-  // "quality-assurance.noEvents": "No suggestions found.",
-  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
-
-  // "quality-assurance.event.table.trust": "Trust",
-  "quality-assurance.event.table.trust": "Confíe en",
-
-  // "quality-assurance.event.table.publication": "Publication",
-  "quality-assurance.event.table.publication": "Publicación",
-
-  // "quality-assurance.event.table.details": "Details",
-  "quality-assurance.event.table.details": "Detalles",
-
-  // "quality-assurance.event.table.project-details": "Project details",
-  "quality-assurance.event.table.project-details": "Detalles del proyecto",
-
-  // "quality-assurance.event.table.reasons": "Reasons",
-  "quality-assurance.event.table.reasons": "Razones",
-
-  // "quality-assurance.event.table.actions": "Actions",
-  "quality-assurance.event.table.actions": "Acciones",
-
-  // "quality-assurance.event.action.accept": "Accept suggestion",
-  "quality-assurance.event.action.accept": "Aceptar sugerencia",
-
-  // "quality-assurance.event.action.ignore": "Ignore suggestion",
-  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
-
-  // "quality-assurance.event.action.undo": "Delete",
-  "quality-assurance.event.action.undo": "Borrar",
-
-  // "quality-assurance.event.action.reject": "Reject suggestion",
-  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
-
-  // "quality-assurance.event.action.import": "Import project and accept suggestion",
-  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
-
-  // "quality-assurance.event.table.pidtype": "PID Type:",
-  "quality-assurance.event.table.pidtype": "Tipo de PID:",
-
-  // "quality-assurance.event.table.pidvalue": "PID Value:",
-  "quality-assurance.event.table.pidvalue": "Valor del PID:",
-
-  // "quality-assurance.event.table.subjectValue": "Subject Value:",
-  "quality-assurance.event.table.subjectValue": "Valor del tema:",
-
-  // "quality-assurance.event.table.abstract": "Abstract:",
-  "quality-assurance.event.table.abstract": "Resumen:",
-
-  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
-  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
-
-  // "quality-assurance.event.table.project": "Project title:",
-  "quality-assurance.event.table.project": "Título del proyecto:",
-
-  // "quality-assurance.event.table.acronym": "Acronym:",
-  "quality-assurance.event.table.acronym": "Acrónimo:",
-
-  // "quality-assurance.event.table.code": "Code:",
-  "quality-assurance.event.table.code": "Código:",
-
-  // "quality-assurance.event.table.funder": "Funder:",
-  "quality-assurance.event.table.funder": "Financiador:",
-
-  // "quality-assurance.event.table.fundingProgram": "Funding program:",
-  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
-
-  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
-  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
-
-  // "quality-assurance.events.back": "Back to topics",
-  "quality-assurance.events.back": "Volver a los temas",
-
-  // "quality-assurance.events.back-to-sources": "Back to sources",
-  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
-
-  // "quality-assurance.event.table.less": "Show less",
-  "quality-assurance.event.table.less": "Mostrar menos",
-
-  // "quality-assurance.event.table.more": "Show more",
-  "quality-assurance.event.table.more": "Mostrar más",
-
-  // "quality-assurance.event.project.found": "Bound to the local record:",
-  "quality-assurance.event.project.found": "Vinculado al registro local:",
-
-  // "quality-assurance.event.project.notFound": "No local record found",
-  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
-
-  // "quality-assurance.event.sure": "Are you sure?",
-  "quality-assurance.event.sure": "¿Seguro?",
-
-  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
-  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
-
-  // "quality-assurance.event.undo.description": "This operation can't be undone!",
-  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
-
-  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
-  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
-
-  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
-  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
-
-  // "quality-assurance.event.action.cancel": "Cancel",
-  "quality-assurance.event.action.cancel": "Cancelar",
-
-  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
-  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
-
-  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
-  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
-
-  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
-  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
-
-  // "quality-assurance.event.modal.project.publication": "Publication:",
-  "quality-assurance.event.modal.project.publication": "Publicación:",
-
-  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
-  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
-
-  // "quality-assurance.event.modal.project.select": "Project search",
-  "quality-assurance.event.modal.project.select": "Buscar proyectos",
-
-  // "quality-assurance.event.modal.project.search": "Search",
-  "quality-assurance.event.modal.project.search": "Buscar",
-
-  // "quality-assurance.event.modal.project.clear": "Clear",
-  "quality-assurance.event.modal.project.clear": "Limpiar",
-
-  // "quality-assurance.event.modal.project.cancel": "Cancel",
-  "quality-assurance.event.modal.project.cancel": "Cancelar",
-
-  // "quality-assurance.event.modal.project.bound": "Bound project",
-  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
-
-  // "quality-assurance.event.modal.project.remove": "Remove",
-  "quality-assurance.event.modal.project.remove": "Eliminar",
-
-  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
-  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
-
-  // "quality-assurance.event.modal.project.notFound": "No project found.",
-  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
-
-  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
-  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
-
-  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
-  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
-
-  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
-  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
-
-  // "quality-assurance.event.reason": "Reason",
-  "quality-assurance.event.reason": "Motivo",
-
-  // "dso-selector.placeholder.type.community": "community",
-  "dso-selector.placeholder.type.community": "comunidad",
-
-  // "dso-selector.placeholder.type.collection": "collection",
-  "dso-selector.placeholder.type.collection": "colección",
-
-  // "dso-selector.placeholder.type.item": "item",
-  "dso-selector.placeholder.type.item": "ítem",
-
-  // "search.sidebar.advanced-search.filter-by": "Filter by",
-  "search.sidebar.advanced-search.filter-by": "Filtrar por",
-
-  // "search.sidebar.advanced-search.filters": "Filters",
-  "search.sidebar.advanced-search.filters": "Filtros",
-
-  // "search.sidebar.advanced-search.operators": "Operators",
-  "search.sidebar.advanced-search.operators": "Operadores",
-
-  // "search.sidebar.advanced-search.add": "Add",
-  "search.sidebar.advanced-search.add": "Añadir",
-}
+}
\ No newline at end of file

From 3ecdfe422df3b31b20d257f9197d0b2e7d250920 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 9 Jan 2025 18:46:10 +0100
Subject: [PATCH 1025/1286] 122357: Ensure the request href$ observable aren't
 triggered multiple times

---
 src/app/core/data/base/base-data.service.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 85603580a4..2b69e5791b 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import { AsyncSubject, from as observableFrom, Observable, of as observableOf, shareReplay } from 'rxjs';
 import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
@@ -264,6 +264,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
@@ -298,6 +299,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);

From 1c4818820022457e247e1ceccce693541ccc1496 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Thu, 9 Jan 2025 20:02:39 +0100
Subject: [PATCH 1026/1286] Update es.json5

---
 src/assets/i18n/es.json5 | 3178 +++++++++++++++++++++++++++-----------
 1 file changed, 2310 insertions(+), 868 deletions(-)

diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 61cb4e1760..75677ee18e 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -6,8 +6,8 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Llévame a la página de inicio",
 
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "no autorizado",
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "No autorizado",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
@@ -15,10 +15,10 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Llévame a la página de inicio",
 
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "prohibido",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibido",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "500.page-internal-server-error": "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.",
@@ -33,20 +33,20 @@
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Llévame a la página de inicio",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "página no encontrada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Página no encontrada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "no autorizado",
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "No autorizado",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibido",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibido",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Servicio no disponible",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "página no encontrada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Página no encontrada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
   "error-page.orcid.generic-error": "Hubo un error en el login vía ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
@@ -87,7 +87,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Fallo",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear formato de archivo",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -192,6 +192,9 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
 
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formatos de archivo seleccionados",
+
   // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
@@ -213,6 +216,12 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
@@ -237,9 +246,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemas seleccionados",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -258,8 +276,14 @@
   // "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.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
+  "admin.registries.schema.fields.head": "Campos de metadatos del esquema",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.",
@@ -270,6 +294,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Campos de metadatos seleccionados",
+
   // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
@@ -372,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuarios",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nuevo usuario",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nuevo usuario",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Agregar usuario",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Agregar usuario",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuarios",
 
@@ -384,7 +423,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadatos",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -402,7 +441,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nombre",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -432,10 +471,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apellidos",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Correo electrónico",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -489,8 +528,8 @@
   // "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 el usuario: \"{{ name }}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocurrió un error al intentar eliminar el usuario con id \"{{id}}\" con el código: \"{{statusCode}}\" y el mensaje: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
@@ -639,12 +678,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Miembros actuales",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Buscar",
 
@@ -729,312 +762,6 @@
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
-
-  //"admin.reports.collections.title": "Collection Filter Report",
-  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.head": "Collection Filter Report",
-  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.button.show-collections": "Show Collections",
-  "admin.reports.button.show-collections": "Mostrar Colecciones",
-
-  //"admin.reports.collections.collections-report": "Collection Report",
-  "admin.reports.collections.collections-report": "Informe de Colecciones",
-
-  //"admin.reports.collections.item-results": "Item Results",
-  "admin.reports.collections.item-results": "Resultados de Ítem",
-
-  //"admin.reports.collections.community": "Community",
-  "admin.reports.collections.community": "Comunidad",
-
-  //"admin.reports.collections.collection": "Collection",
-  "admin.reports.collections.collection": "Colección",
-
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  "admin.reports.collections.nb_items": "Nº Ítems",
-
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  "admin.reports.items.title": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.head": "Metadata Query Report",
-  "admin.reports.items.head": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.run": "Run Item Query",
-  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
-
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
-
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
-
-  //"admin.reports.items.limit": "Limit/",
-  "admin.reports.items.limit": "Límite/",
-
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  "admin.reports.items.wholeRepo": "Todo el repositorio",
-
-  //"admin.reports.items.anyField": "Any field",
-  "admin.reports.items.anyField": "Cualquier campo",
-
-  //"admin.reports.items.predicate.exists": "exists",
-  "admin.reports.items.predicate.exists": "existe",
-
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  "admin.reports.items.predicate.doesNotExist": "no existe",
-
-  //"admin.reports.items.predicate.equals": "equals",
-  "admin.reports.items.predicate.equals": "idéntico",
-
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
-
-  //"admin.reports.items.predicate.like": "like",
-  "admin.reports.items.predicate.like": "parecido",
-
-  //"admin.reports.items.predicate.notLike": "not like",
-  "admin.reports.items.predicate.notLike": "distinto",
-
-  //"admin.reports.items.predicate.contains": "contains",
-  "admin.reports.items.predicate.contains": "contiene",
-
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  "admin.reports.items.predicate.doesNotContain": "no contiene",
-
-  //"admin.reports.items.predicate.matches": "matches",
-  "admin.reports.items.predicate.matches": "coincide",
-
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  "admin.reports.items.predicate.doesNotMatch": "no coincide",
-
-  //"admin.reports.items.preset.new": "New Query",
-  "admin.reports.items.preset.new": "Nueva Consulta",
-
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  "admin.reports.items.preset.hasNoTitle": "Sin Título",
-
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
-
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
-
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
-
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
-
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
-
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
-
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
-
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
-
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
-
-  //"admin.reports.items.number": "No.",
-  "admin.reports.items.number": "Nº.",
-
-  //"admin.reports.items.id": "UUID",
-  "admin.reports.items.id": "UUID",
-
-  //"admin.reports.items.collection": "Collection",
-  "admin.reports.items.collection": "Colección",
-
-  //"admin.reports.items.handle": "URI",
-  "admin.reports.items.handle": "URI",
-
-  //"admin.reports.items.title": "Title",
-  "admin.reports.items.title": "Título",
-
-  //"admin.reports.commons.filters": "Filters",
-  "admin.reports.commons.filters": "Filtros",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
-
-  //"admin.reports.commons.previous-page": "Prev Page",
-  "admin.reports.commons.previous-page": "Pág. ant.",
-
-  //"admin.reports.commons.next-page": "Next Page",
-  "admin.reports.commons.next-page": "Pág. sig.",
-
-  //"admin.reports.commons.page": "Page",
-  "admin.reports.commons.page": "Página",
-
-  //"admin.reports.commons.of": "of",
-  "admin.reports.commons.of": "de",
-
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  "admin.reports.commons.export": "Exportar para actualizar metadatos",
-
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
-
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
-
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
-
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
-
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
-
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
-
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  "admin.reports.commons.filters.property.all_filters.tooltip": "Este filtro incluye todos los Ítems que cumplen con TODOS los filtros especificados",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
-
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
-
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
-
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
-
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
-
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
-
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
-
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
-
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
-
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
-
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
-
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  "admin.reports.commons.filters.permission": "Filtros de Permisos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
-
-  // "admin.search.breadcrumbs": "Administrative Search",
-  "admin.search.breadcrumbs": "Búsqueda administrativa",
-
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }}\"",
 
@@ -1062,14 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Atrás",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Control de calidad",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Control de calidad",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Control de calidad",
+
   // "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.editGroupPage": "En esta página, puede modificar las propiedades y miembros de un grupo. En la sección superior, puede editar el nombre del grupo y la descripción, a menos que este sea un grupo de administración de una colección o comunidad, en cuyo caso el nombre y descripción del grupo fueron auto-generadas y no podrán ser editadas. En las secciones siguientes, puede editar la afiliación al grupo. Para más detalles ver [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
-  // "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.addEpeople": "Para agregar o remover una persona en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los usuario (Use el desplegable que se encuentra a la derecha de la barra de búsqueda para seleccionar entre buscar por metadato o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para agregar o eliminar un usuario en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar usuarios (use el menú desplegable a la izquierda de la barra de búsqueda para elegir si buscar por metadatos o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
 
-  // "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.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un sub-grupo en este grupo, pulse el botón 'Examinar todo' o utilice la barra de búsqueda de abajo para buscar los subgrupos- Posteriormente pulse el botón con el icono más por cada sub-grupo que desea agregar a la lista, o el icono de papelera por cada sub-grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un subgrupo en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los grupos. Posteriormente pulse el botón con el icono más por cada grupo que desea agregar a la lista, o el icono de papelera por cada grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar Colecciones",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de Colecciones",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultados de ítem",
+
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunidad",
+
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Colección",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nº Ítems",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
+
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límite/",
+
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplazamiento",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Todo el repositorio",
+
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Cualquier campo",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existe",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "idéntico",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
+
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "parecido",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "distinto",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contiene",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no contiene",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincide",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincide",
+
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nueva Consulta",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Sin Título",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
+
+  // "admin.reports.items.number": "No.",
+  "admin.reports.items.number": "Nº.",
+
+  // "admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Colección",
+
+  // "admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Título",
+
+
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtros",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pág. ant.",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pág. sig.",
+
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Página",
+
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar para actualizar metadatos",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtros de Permisos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Búsqueda administrativa",
@@ -1182,10 +1223,10 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
-  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
   "admin.metadata-import.page.error.addFileUrl": "¡Seleccione primero la URL del archivo!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "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.toggle.upload": "Upload",
@@ -1239,12 +1280,6 @@
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Miembros actuales",
 
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadatos",
-
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Buscar",
 
@@ -1353,7 +1388,7 @@
   // "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.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "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\".",
@@ -1428,7 +1463,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "Se requiere un Nombre",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "Su dirección de correo electrónico *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1476,6 +1511,9 @@
   // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "Por categoría",
 
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Por Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por título",
 
@@ -1497,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Título",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoría de materia",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Buscar por autor",
 
@@ -1509,6 +1550,15 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Examinar por categoría",
 
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Seleccione una materia para añadir como filtro de búsqueda",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar por Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Seleccione un índice para añadir como filtro de búsqueda",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar por título",
 
@@ -1519,7 +1569,10 @@
   "pagination.previous.button": "Anterior",
 
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
-  "pagination.next.button.disabled.tooltip": "No hay mas páginas de resultados",
+  "pagination.next.button.disabled.tooltip": "No hay más páginas de resultados",
+
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control para la navegación de páginas, relativa al elemento con ID: ",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", comenzando por {{ startsWith }}",
@@ -1596,11 +1649,11 @@
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Examinar",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinando por {{ field }} {{ value }}",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinando por {{ field }} {{ value }}",
 
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Volver a los resultados",
@@ -1617,6 +1670,12 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, enviar de vuelta al Administrador de Revisión del flujo de trabajo",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear colección",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Buscar un logotipo de colección",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una colección",
 
@@ -1911,11 +1970,11 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Colección",
 
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Envíos recientes",
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotipo de la colección",
 
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "No hay ítems para mostrar",
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Buscar",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta colección",
@@ -1929,12 +1988,24 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultados de la búsqueda",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hay colecciones para mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Colecciones seleccionadas",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar colección",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar colección",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
@@ -2025,6 +2096,21 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Colapsar {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Buscar un logotipo de la comunidad",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunidades y colecciones",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunidad",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
@@ -2070,17 +2156,23 @@
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminación",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Deshacer eliminación",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Deshacer eliminación",
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logotipo de la comunidad",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Subida correcta del logotipo de la comunidad.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
@@ -2091,7 +2183,7 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
@@ -2100,7 +2192,7 @@
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occurred while editing the community",
   "community.edit.notifications.error": "Se produjo un error al editar la comunidad.",
 
   // "community.edit.return": "Back",
@@ -2139,6 +2231,9 @@
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidad",
 
+  // "community.logo": "Community logo",
+  "community.logo": "Logotipo de la comunidad",
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ninguno",
 
@@ -2187,8 +2282,8 @@
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "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 í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.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuarios y Grupos que pueden leer nuevos archivos enviados a esta colección. Los cambios en este rol no son retroactivos. Los archivos 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.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.",
@@ -2250,6 +2345,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultados de la búsqueda",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
@@ -2409,7 +2507,7 @@
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Error al ejecutar la tarea de curación",
 
-  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  // "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
   "curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de curación.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
@@ -2439,6 +2537,12 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Borrar selección",
+
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Borrar la opción seleccionada",
+
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sin título",
 
@@ -2499,6 +2603,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Busque un {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidad",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "colección",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccione una colección",
 
@@ -2604,6 +2717,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Borrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "¿Está seguro de que desea eliminar el logotipo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Borrar Perfil",
 
@@ -2691,10 +2807,10 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Se requiere este campo",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Este no es un correo electrónico válido",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Este correo electrónico ya está en uso",
 
   // "error.validation.groupExists": "This group already exists",
@@ -2724,6 +2840,9 @@
   // "feed.description": "Syndication feed",
   "feed.description": "Hilo de sindicación",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Archivo restringido",
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error al obtener archivos para este ítem",
 
@@ -2748,6 +2867,9 @@
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Sugerencias",
 
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
 
@@ -2778,8 +2900,8 @@
   // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "Error al intentar restablecer la contraseña",
 
-  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
+  // "forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Se produjo un error al intentar restablecer la contraseña de la cuenta asociada con la siguiente dirección de correo electrónico: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Olvido de contraseña",
@@ -2805,7 +2927,7 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Reescriba para confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
   "forgot-password.form.error.empty-password": "Introduzca una contraseña en el cuadro a continuación.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
@@ -2922,6 +3044,12 @@
   // "form.create": "Create",
   "form.create": "Crear",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrementar {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
@@ -3135,15 +3263,27 @@
   // "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": "The page related to your feedback",
   "info.feedback.page_help": "La página relacionada con su sugerencia",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Soporte COAR Notify",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Soporte COAR Notify",
+
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Solicitar reintegración",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Solicitado por",
+
   // "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 í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.",
 
@@ -3204,6 +3344,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Archivos en el bloque {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Puede mover un archivo a una página diferente soltándolo en el número de página.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3222,9 +3368,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha sido devuelto a la posición {{ toIndex }} y ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperando a que se complete el movimiento.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ahora está en la posición {{ toIndex }}.",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "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.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Los archivos pueden reordenarse dentro de sus bloques manteniendo el asa de arrastre y moviendo el ratón. Alternativamente, los archivos pueden moverse usando el teclado de la siguiente manera: Seleccione el archivo presionando enter cuando el asa de arrastre del archivo esté en foco. Mueva el archivo hacia arriba o hacia abajo usando las teclas de flecha. Presione enter nuevamente para confirmar la posición actual del archivo.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Acciones",
 
@@ -3435,6 +3599,15 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clave de autoridad",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3471,6 +3644,9 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar campo",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "item.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -3513,6 +3689,15 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoridad: ",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquear el valor de la clave de autoridad para la edición manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquear el valor de la clave de autoridad para la edición manual",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3546,6 +3731,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertencia: Cuando está habilitado, la política de acceso de lectura para el ítem y cualquier archivo asociado con el ítem será reemplazada por la política de acceso de lectura predeterminada de la colección. Esto no se puede deshacer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
 
@@ -3837,6 +4025,18 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraer",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Ver",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Ver",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "Borrar Orden de Supervisión",
 
@@ -3861,6 +4061,33 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Borrar grupo de supervisión",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Este valor de autoridad ha sido confirmado como preciso por un usuario interactivo",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor es singular y válido, pero no ha sido visto y aceptado por un humano, por lo que aún es incierto",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hay múltiples valores de autoridad coincidentes de igual validez",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hay respuestas coincidentes en la autoridad",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "La autoridad encontró una falla interna",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "La autoridad recomienda que se rechace esta presentación",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "La autoridad no devolvió un valor de confianza razonable",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Nunca se registró la confianza para este valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confianza desconocido",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumen",
 
@@ -3903,18 +4130,6 @@
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamaño:",
 
-  // "menu.section.reports": "Reports",
-  "menu.section.reports": "Informes",
-
-  // "menu.section.reports.collections": "Filtered Collections",
-  "menu.section.reports.collections": "Colecciones filtradas",
-
-  // "menu.section.reports.queries": "Metadata Query",
-  "menu.section.reports.queries": "Consulta de metadatos",
-
-  // "menu.section.admin_search": "Admin Search",
-  "menu.section.admin_search": "Búsqueda de administrador",
-
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Ítems de esta revista",
 
@@ -3963,6 +4178,9 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraer",
 
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
   // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bloque original",
 
@@ -3975,6 +4193,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nueva version",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Solicitar la retirada de este ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Solicitar la reintegración",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
@@ -3984,6 +4208,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclame este item como perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "Logotipo de ROR",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -4062,12 +4289,45 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línea de financiación:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Fecha de fundación",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nombre legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipo de entidad:",
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionado",
 
   // "item.select.empty": "No items to show",
   "item.select.empty": "No hay ítems para mostrar",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionados",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
 
@@ -4143,6 +4403,15 @@
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nueva versión",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Solicitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Solicitar reintegración",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nueva versión",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Crear una nueva versión de este ítem",
 
@@ -4155,21 +4424,63 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nueva versión",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar solicitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancelar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "No crear una nueva versión",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar solicitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resumen",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Está solicitando retirar este ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Por favor, introduzca la razón para la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Está solicitando reintegrar este ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Por favor, introduzca la razón para la reintegración",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "Introduzca el resumen de esta nueva versión",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduzca la razón para la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduzca la razón para la reintegración",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creando nueva versión...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviando solicitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Solicitud de reintegración enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Solicitud de retirada enviada.",
+
   // "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.",
 
@@ -4218,6 +4529,12 @@
   // "itemtemplate.edit.metadata.discard-button": "Discard",
   "itemtemplate.edit.metadata.discard-button": "Descartar",
 
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -4251,6 +4568,9 @@
   // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "Valor",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar campo",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "itemtemplate.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -4350,6 +4670,9 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados de la búsqueda de números de revistas",
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
 
@@ -4368,6 +4691,9 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultados de la búsqueda de volúmenes de revistas",
+
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -4467,9 +4793,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "¿Nuevo Usuario? Pulse aquí para registrarse",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "o",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Iniciar sesión con OIDC",
 
@@ -4500,6 +4823,9 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegación de administración",
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -4524,6 +4850,15 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuarios",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Colecciones filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consulta de metadatos",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Búsqueda de administrador",
 
@@ -4554,6 +4889,9 @@
   // "menu.section.browse_global_by_srsc": "By Subject Category",
   "menu.section.browse_global_by_srsc": "Por categoría",
 
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Por Norwegian Science Index",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por titulo",
 
@@ -4599,7 +4937,7 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
-  //"menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Sección del menú de informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -4647,6 +4985,9 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4674,6 +5015,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificaciones",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Control de calidad",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Anclar barra lateral",
 
@@ -4701,12 +5051,12 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarea de estadísticas",
 
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  "menu.section.toggle.reports": "Alternar sección de informes",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar sección de informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
@@ -4824,16 +5174,16 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sin título",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sin URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Tareas del flujo de trabajo",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Sus envíos",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
@@ -4872,6 +5222,18 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar sugerencias",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
 
@@ -4887,7 +5249,7 @@
   // "nav.login": "Log In",
   "nav.login": "Iniciar sesión",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "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",
@@ -4926,6 +5288,216 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Control de calidad",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temas actuales",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fuentes actuales",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fuente",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último acontecimiento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Acciones",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No se han encontrado temas.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No se han encontrado fuentes.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugerencias para el control de calidad",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Cargando ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confíe en",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicación",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalles",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalles del proyecto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razones",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Acciones",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceptar sugerencia",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Borrar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor del PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumen:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título del proyecto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Volver a los temas",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar más",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado al registro local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "¿Seguro?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicación:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Buscar proyectos",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Buscar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpiar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Motivo",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
@@ -4953,6 +5525,12 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unidad organizativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
 
@@ -5019,6 +5597,18 @@
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar parámetro",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Agregar un parámetro...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar parámetro",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del parámetro",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
 
@@ -5107,7 +5697,6 @@
   "process.detail.script": "Secuencia de comandos",
 
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
-
   "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
   // "process.detail.start-time": "Start time",
@@ -5146,6 +5735,24 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo falló eliminando el proceso",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualización automática…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Procesos exitosos",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No se encontraron procesos coincidentes.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Procesos fallidos",
+
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalización (UTC)",
 
@@ -5155,6 +5762,18 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nombre",
 
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora de inicio (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Procesos en ejecución",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creación (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Procesos programados",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de inicio (UTC)",
 
@@ -5179,6 +5798,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} procesos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar proceso",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Limpiar la selección",
 
@@ -5189,7 +5811,10 @@
   "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.overview.delete.header": "Eliminar procesos",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconocido",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminando proceso",
@@ -5218,9 +5843,6 @@
   // "profile.special.groups.head": "Authorization special groups you belong to",
   "profile.special.groups.head": "Grupos especiales de autorización a los que pertenece",
 
-  // "profile.head": "Update Profile",
-  "profile.head": "Actualización del perfil",
-
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Se requiere el nombre",
 
@@ -5371,6 +5993,105 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Lista de reproducción",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Cargando ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamo de publicación",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamo de publicación",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugerencias actuales",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nombre del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Acciones",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Ningún destino encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuación",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprobar e importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver pruebas",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar pruebas",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugerencias para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gráfico OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "del ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuación total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
+
   // "register-email.title": "New user registration",
   "register-email.title": "Registro de nuevo usuario",
 
@@ -5467,7 +6188,7 @@
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Error al intentar registrar el correo electrónico",
 
-  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  // "register-page.registration.error.content": "An error occurred 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",
@@ -5515,12 +6236,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistas",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volumen de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unidades organizativas",
 
@@ -5545,6 +6272,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volúmenes de revistas",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volumen de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Colaboradores",
 
@@ -5683,7 +6413,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nombre",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Máximo 30 caracteres",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5716,6 +6446,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar todo",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar todo",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5740,6 +6482,9 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contenido principal",
+
   // "search.description": "",
   "search.description": "",
 
@@ -5755,6 +6500,12 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Buscar en el repositorio ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5776,6 +6527,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
 
@@ -5803,6 +6560,36 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no es igual a",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " sin autoridad",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contiene",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no contiene",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Buscar por título",
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5905,6 +6692,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo",
 
@@ -6013,6 +6818,12 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Examinar árbol {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiación",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiación",
+
   // "search.filters.filter.supervisedBy.head": "Supervised By",
   "search.filters.filter.supervisedBy.head": "Supervisado Por",
 
@@ -6031,6 +6842,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unidad organizativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Proyecto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicación",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -6043,6 +6863,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validación",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sí",
 
@@ -6058,6 +6893,27 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Es igual a",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No es igual a",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridad",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Sin autoridad",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contiene",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No contiene",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -6109,6 +6965,21 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Añadir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ajustes",
 
@@ -6121,6 +6992,12 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -6157,6 +7034,24 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Apellido Ascendente",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Apellido Descendente",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nombre Ascendente",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nombre Descendente",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Fecha de nacimiento Ascendente",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Fecha de nacimiento Descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -6223,6 +7118,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Atrás",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardado",
 
@@ -6298,6 +7196,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6328,8 +7229,14 @@
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "Editores SHERPA",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "API de Financiamiento de OpenAIRE",
+  // "submission.import-external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Búsqueda de OpenAIRE por autores",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Búsqueda de OpenAIRE por título",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Búsqueda de OpenAIRE por financiador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6343,6 +7250,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista previa del ítem",
 
@@ -6433,9 +7343,6 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "API OpenAIRE de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importación remota de autor",
 
@@ -6469,6 +7376,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importando desde OpenAIRE",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal",
 
@@ -6481,6 +7397,9 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importar desde ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6514,6 +7433,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importación remota de organización",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organización local agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organización externa importada y agregada con éxito a la selección",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo",
 
@@ -6598,6 +7526,30 @@
   // "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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Búsqueda por financiador OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Revistas Sherpa por ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación",
 
@@ -6607,9 +7559,6 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos",
 
@@ -6619,8 +7568,8 @@
   // "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",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unidad organizativa del proyecto",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto",
@@ -6637,6 +7586,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
 
@@ -6688,6 +7640,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicación",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "Unidad organizativa",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6757,6 +7712,15 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda",
 
@@ -6781,6 +7745,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados de la búsqueda",
 
@@ -6844,6 +7811,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No se encontró ninguna colección",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No se encontraron tipos de entidad",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hay opciones disponibles",
 
@@ -6895,8 +7865,8 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Describir",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Posibles duplicados",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "Identificadores",
@@ -6952,6 +7922,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraer sección {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Hacer {{fileName}} el archivo principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Eliminar {{fileName}} como el archivo principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
@@ -7087,6 +8063,18 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Hasta",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No se detectaron duplicados.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Se detectaron posibles duplicados. Por favor, revise la lista a continuación.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Este ítem está en el espacio de trabajo",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Este ítem está en el flujo de trabajo",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo la licencia",
 
@@ -7276,6 +8264,9 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "se detectaron posibles duplicados para este ítem. Reclame y edite este ítem para ver los detalles.",
+
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Ver",
 
@@ -7429,6 +8420,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Buscar",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados escribiendo las primeras letras",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No había ítems para mostrar",
 
@@ -7483,6 +8477,9 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Tareas del flujo de trabajo y del espacio de trabajo",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
 
@@ -8053,6 +9050,9 @@
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Sugerencia: Configure un temporizador. Cuando esté habilitado, se puede establecer una fecha en el futuro y el banner del sistema de alerta realizara una cuenta regresiva hasta la fecha establecida. Cuando finalice el temporizador, este desaparecerá de la alerta. El servidor NO se detendrá automáticamente..",
 
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccionar fecha usando el calendario",
+
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
   "system-wide-alert.form.label.preview": "Vista preliminar de la alerta del sistema",
 
@@ -8074,6 +9074,9 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas del sistema",
 
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descubrir",
+
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
   "item-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso a los metadatos o a los archivos del ítem.",
 
@@ -8086,9 +9089,21 @@
   // "access-control-item-header-toggle": "Item's Metadata",
   "access-control-item-header-toggle": "Metadatos del ítem",
 
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar opción para realizar cambios en los metadatos del ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar opción para realizar cambios en los metadatos del ítem",
+
   // "access-control-bitstream-header-toggle": "Bitstreams",
   "access-control-bitstream-header-toggle": "Archivos",
 
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar opción para realizar cambios en los archivos",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar opción para realizar cambios en los archivos",
+
   // "access-control-mode": "Mode",
   "access-control-mode": "Modo",
 
@@ -8113,6 +9128,9 @@
   // "access-control-bitstreams-selected": "bitstreams selected",
   "access-control-bitstreams-selected": "archivos seleccionados",
 
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar archivos",
+
   // "access-control-cancel": "Cancel",
   "access-control-cancel": "Cancelar",
 
@@ -8122,6 +9140,9 @@
   // "access-control-add-more": "Add more",
   "access-control-add-more": "Añadir mas",
 
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condición de acceso",
+
   // "access-control-select-bitstreams-modal.title": "Select bitstreams",
   "access-control-select-bitstreams-modal.title": "Seleccionar archivos",
 
@@ -8149,134 +9170,661 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  // "browse.search-form.placeholder": "Search the repository",
-  "browse.search-form.placeholder": "Buscar en el repositorio",
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Añadir",
 
-  // "file-download-link.download": "Download ",
-  "file-download-link.download": "Descargar ",
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
 
-  // "register-page.registration.aria.label": "Enter your e-mail address",
-  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
 
-  // "forgot-email.form.aria.label": "Enter your e-mail address",
-  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocolo COAR Notify",
 
-  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
-  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, apoyamos completamente el protocolo COAR Notify, que está diseñado para mejorar la comunicación entre repositorios. Para obtener más información sobre el protocolo COAR Notify, visite el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">sitio web de COAR Notify</a>.",
 
-  // "search.filters.applied.f.title": "Title",
-  "search.filters.applied.f.title": "Título",
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Buzón LDN",
 
-  // "search.filters.applied.f.original_bundle_filenames": "File name",
-  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Para su conveniencia, nuestro Buzón LDN (Linked Data Notifications) es fácilmente accesible en {{ ldnInboxUrl }}. El Buzón LDN permite una comunicación e intercambio de datos sin problemas, asegurando una colaboración eficiente y efectiva.",
 
-  // "search.filters.applied.f.original_bundle_descriptions": "File description",
-  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderación de mensajes",
 
-  // "search.filters.applied.operator.equals": "",
-  "search.filters.applied.operator.equals": "",
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Para asegurar un entorno seguro y productivo, todos los mensajes LDN entrantes son moderados. Si planea intercambiar información con nosotros, por favor contáctenos a través de nuestro",
 
-  // "search.filters.applied.operator.notequals": " not equals",
-  "search.filters.applied.operator.notequals": " no es igual a",
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulario de comentarios.",
 
-  // "search.filters.applied.operator.authority": "",
-  "search.filters.applied.operator.authority": "",
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servicio",
 
-  // "search.filters.applied.operator.notauthority": " not authority",
-  "search.filters.applied.operator.notauthority": " sin autoridad",
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Servicios Registrados",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nombre",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripción",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estado",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acción",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NUEVO",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Servicios Registrados",
 
-  // "search.filters.applied.operator.contains": " contains",
-  "search.filters.applied.operator.contains": " contiene",
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitado",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitado",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Haga clic para habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Haga clic para deshabilitar",
 
-  // "search.filters.applied.operator.notcontains": " not contains",
-  "search.filters.applied.operator.notcontains": " no contiene",
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servicio",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servicio",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servicio",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Por favor confirme la creación de este servicio.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estado",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancelar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nuevo servicio",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nombre",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripción",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servicio",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rango de IP del Servicio",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivel de confianza",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Por favor proporcione el nombre del servicio",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Por favor proporcione una descripción sobre su servicio",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Por favor ingrese la URL para que los usuarios puedan obtener más información sobre el servicio",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límite inferior del rango IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límite superior del rango IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Por favor especifique la URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Por favor ingrese un valor entre 0 y 1. Use el “.” como separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccione un patrón",
 
-  // "search.filters.applied.operator.query": "",
-  "search.filters.applied.operator.query": "",
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconocer y aceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Este patrón se usa para reconocer y aceptar una solicitud (oferta). Implica una intención de actuar sobre la solicitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconocimientos",
 
-  // "search.filters.entityType.Person": "Person",
-  "search.filters.entityType.Person": "Persona",
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconocer y rechazar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Este patrón se usa para reconocer y rechazar una solicitud (oferta). Significa que no habrá más acciones con respecto a la solicitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconocimientos",
 
-  // "search.filters.entityType.Project": "Project",
-  "search.filters.entityType.Project": "Proyecto",
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconocer y Aceptar Tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Este patrón se usa para reconocer y aceptar tentativamente una solicitud (oferta). Implica una intención de actuar, que puede cambiar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconocimientos",
 
-  // "search.filters.entityType.Publication": "Publication",
-  "search.filters.entityType.Publication": "Publicación",
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconocer y rechazar tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Este patrón se usa para reconocer y rechazar tentativamente una solicitud (oferta). Significa que no habrá más acciones, sujeto a cambios.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconocimientos",
 
-  // "search.filters.namedresourcetype.Archived": "Archived",
-  "search.filters.namedresourcetype.Archived": "Archivado",
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar aprobación",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Este patrón se usa para anunciar la existencia de una aprobación, haciendo referencia al recurso aprobado.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Validation": "Validation",
-  "search.filters.namedresourcetype.Validation": "Validación",
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar ingestión",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Este patrón se usa para anunciar que un recurso ha sido ingerido.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
-  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar relación",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Este patrón se usa para anunciar una relación entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Workflow": "Workflow",
-  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar revisión",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Este patrón se usa para anunciar la existencia de una revisión, haciendo referencia al recurso revisado.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncios",
 
-  // "search.filters.namedresourcetype.Workspace": "Workspace",
-  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar resultado del servicio",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Este patrón se usa para anunciar la existencia de un 'resultado del servicio', haciendo referencia al recurso relevante.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncios",
 
-  // "search.filters.operator.equals.text": "Equals",
-  "search.filters.operator.equals.text": "Es igual a",
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Solicitar aprobación",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Este patrón se usa para solicitar la aprobación de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Solicitudes",
 
-  // "search.filters.operator.notequals.text": "Not Equals",
-  "search.filters.operator.notequals.text": "No es igual a",
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Solicitar ingestión",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Este patrón se usa para solicitar que el sistema de destino ingiera un recurso.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Solicitudes",
 
-  // "search.filters.operator.authority.text": "Authority",
-  "search.filters.operator.authority.text": "Autoridad",
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Solicitar revisión",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Este patrón se usa para solicitar una revisión de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Solicitudes",
 
-  // "search.filters.operator.notauthority.text": "Not Authority",
-  "search.filters.operator.notauthority.text": "Sin autoridad",
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Deshacer oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Este patrón se usa para deshacer (retractar) una oferta previamente realizada.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Deshacer",
 
-  // "search.filters.operator.contains.text": "Contains",
-  "search.filters.operator.contains.text": "Contiene",
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No se seleccionó filtro de ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtro de ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automático",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Se requiere el nombre",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Se requiere la URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Por favor, ingrese un rango de IP válido",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Por favor, ingrese un IpV4 válido en ambos límites del rango (nota: para una sola IP, ingrese el mismo valor en ambos campos)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Se requiere la URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Se requiere al menos un patrón",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Por favor, ingrese una puntuación válida (entre 0 y 1). Use el “.” como separador decimal",
 
-  // "search.filters.operator.notcontains.text": "Not Contains",
-  "search.filters.operator.notcontains.text": "No contiene",
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patrón soportado",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Añadir más",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nuevo servicio",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "¿Está seguro de que desea eliminar este servicio?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "¿Confirma los cambios?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar servicio",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancelar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "¿Está seguro de que desea descartar los cambios y salir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar cambios",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edición exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servicio ha sido editado",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edición fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servicio no ha sido editado",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creación exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servicio ha sido creado",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creación fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servicio no ha sido creado",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Por favor, seleccione al menos un patrón de entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estado actualizado con éxito",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "El estado del servicio ha sido actualizado",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminación exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servicio ha sido eliminado",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminación fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servicio no ha sido eliminado",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancelar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servicio",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servicio",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nombre",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripción",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del servicio",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL del buzón LDN",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patrón de entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sin patrón de entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtro de ítem seleccionado",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sin filtro de ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automático",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Añadir más",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar servicio",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Seleccionar ninguno",
 
-  // "search.filters.operator.query.text": "Query",
-  "search.filters.operator.query.text": "Consulta",
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Ocurrió un error al crear este proceso",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Éxito",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El proceso se creó con éxito",
 
-  // "search.sidebar.advanced-search.title": "Advanced Search",
-  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servicio seleccionado es compatible con el ítem según su estado actual. {{ service.name }}: {{ service.description }}",
 
-  // "discover.filters.head": "Discover",
-  "discover.filters.head": "Descubrir",
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Aprobación",
 
-  // "search.filters.filter.title.head": "Title",
-  "search.filters.filter.title.head": "Título",
+  // "item.page.review": "Review",
+  "item.page.review": "Revisión",
 
-  // "search.filters.filter.title.placeholder": "Title",
-  "search.filters.filter.title.placeholder": "Título",
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciado por",
 
-  // "search.filters.filter.title.label": "Search Title",
-  "search.filters.filter.title.label": "Buscar por título",
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementado por",
 
-  // "search.filters.filter.original_bundle_filenames.head": "File name",
-  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visión general de Servicios LDN",
 
-  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
-  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Servicios LDN",
 
-  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
-  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servicio LDN",
 
-  // "search.filters.filter.original_bundle_descriptions.head": "File description",
-  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuación puede ver todos los temas recibidos de las suscripciones a {{source}} en relación con el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b>.",
 
-  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
-  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b> y ",
 
-  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
-  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del servicio:",
 
-  // "search.filters.filter.funding.head": "Funding",
-  "search.filters.filter.funding.head": "Financiación",
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enlace:",
 
-  // "search.filters.filter.funding.placeholder": "Funding",
-  "search.filters.filter.funding.placeholder": "Financiación",
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancelar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servicio",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servicio",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "¿Está seguro de que desea eliminar el servicio actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servicio",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servicio se eliminó con éxito.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Algo salió mal al eliminar el servicio",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID de servicios",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nombre",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora de inicio (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estado",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuario",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visión general de servicios",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visión general de servicios",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Acciones",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripción",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Puede solicitar una revisión a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Puede solicitar una aprobación a una de las siguientes revistas superpuestas",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Puede solicitar la ingestión de una copia de su envío a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hay datos disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Seleccionar ninguno",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccione un servicio para {{ pattern }} de este ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripción del servicio seleccionado:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hay más información disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servicio seleccionado no es adecuado para el ítem actual. Por favor, consulte la descripción para obtener detalles sobre qué registro puede ser gestionado por este servicio.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No se encontraron patrones configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtro inválido, intente seleccionar otro servicio o ninguno.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido aceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido rechazada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> está pendiente.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patrón soportado para eliminación",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patrón soportado para eliminación",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccione filtro de ítem para el patrón",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccione un patrón para el servicio",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccione servicio para eliminación",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servicio LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Cerrar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipo de ítem es Artículo de revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Siempre verdadero",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Procesamiento automático",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contiene DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtro DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipo de documento es igual a driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Tiene al menos un archivo",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Tiene archivo",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Tiene un archivo",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Está archivado",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Está retirado",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "El ítem es público",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestión de revistas",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El título comienza con el patrón",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipo es igual a Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipo es igual a Artículo de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Ninguno",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Dashboard de Notificaciones",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El dashboard de Notificaciones monitorea el uso general del protocolo COAR Notify en todo el repositorio. En la pestaña “Métricas” hay estadísticas sobre el uso del protocolo COAR Notify. En las pestañas “Logs/Entrantes” y “Logs/Salientes” es posible buscar y verificar el estado individual de cada mensaje LDN, ya sea recibido o enviado.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Métricas",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Número de LDN recibidos",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Número de LDN generados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Aceptado",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificaciones entrantes aceptadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Mostrando actualmente: Notificaciones aceptadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN procesados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificaciones entrantes procesadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Mostrando actualmente: LDN procesados",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificaciones entrantes fallidas",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificaciones salientes fallidas",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Mostrando actualmente: Notificaciones no confiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No confiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificaciones entrantes no confiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificaciones entrantes entregadas con éxito",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Entregado",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificaciones salientes entregadas con éxito",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Mostrando actualmente: Notificaciones en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificaciones actualmente en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cola",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Mostrando actualmente: Notificaciones en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificaciones actualmente en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionados con notificaciones entrantes",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionados con notificaciones salientes",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Mensajes entrantes",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Logs/Entrantes",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtro: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionados",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servicio LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificación de Revisión",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificación de Aprobación",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificación de Relación",
 
   // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
   "search.filters.filter.queue_last_start_time.head": "Última hora de procesamiento ",
@@ -8287,6 +9835,21 @@
   // "search.filters.filter.queue_last_start_time.max.label": "Max range",
   "search.filters.filter.queue_last_start_time.max.label": "Alcance máximo",
 
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rango mínimo",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rango máximo",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Mensajes salientes",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Logs/Salientes",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrantes",
+
   // "search.filters.filter.relateditem.head": "Related item",
   "search.filters.filter.relateditem.head": "Ítem relacionado",
 
@@ -8323,8 +9886,44 @@
   // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
   "search.filters.filter.activity_stream_type.label": "Buscar por tipo de flujo de actividad",
 
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estado de la cola",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "Ip no confiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cola",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Procesando",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Procesado",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallido",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No confiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acción no mapeada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cola para reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipo de flujo de actividad",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipo de notificación COAR",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipo de notificación",
+
   // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
-  "search.filters.filter.coar_notify_type.label": "Buscar por COAR Tipo de notificación",
+  "search.filters.filter.coar_notify_type.label": "Buscar por Tipo de notificación COAR",
 
   // "search.filters.filter.notification_type.label": "Search notification type",
   "search.filters.filter.notification_type.label": "Buscar por tipo de notificación",
@@ -8377,6 +9976,204 @@
   // "search.filters.filter.notifyReview.placeholder": "Notify Review",
   "search.filters.filter.notifyReview.placeholder": "Notificación de revisión",
 
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acción de revisión",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acción de aprobación",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acción de ingestión",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acción de relación",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última hora de procesamiento descendente",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última hora de procesamiento ascendente",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Intentos de cola descendente",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Intentos de cola ascendente",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems involucrados en LDN entrantes",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems involucrados en LDN salientes",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipo",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipo de notificación COAR",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipo de flujo de actividad",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En respuesta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositorio",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositorio",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Intentos de cola",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vez que se inició la cola",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servicio LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servicio LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estado de la cola",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Tiempo de espera de la cola",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detalle del mensaje",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar mensaje",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de tiempo",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositorio",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servicio LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipo",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estado",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acción",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detalle",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocesar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Procesado",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallido",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cola para reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acción no mapeada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Procesando",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cola",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No confiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servicio LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionado",
+
   // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
   "search.filters.filter.notifyEndorsement.head": "Notificación de aprobación",
 
@@ -8386,378 +10183,23 @@
   // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
   "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
 
-  // "menu.section.notifications": "Notifications",
-  "menu.section.notifications": "Notificaciones",
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licencia Creative Commons",
 
-  // "menu.section.icon.notifications": "Notifications menu section",
-  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepto donde se indique lo contrario, la licencia de este ítem se describe como",
 
-  // "menu.section.notifications_publication-claim": "Publication Claim",
-  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Buscar en el repositorio",
 
-  // "menu.section.quality-assurance": "Quality Assurance",
-  "menu.section.quality-assurance": "Control de calidad",
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
 
-  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
-  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
-  // "notification.suggestion.review": "review the suggestions",
-  "notification.suggestion.review": "revisar sugerencias",
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
-  // "notification.suggestion.please": "Please",
-  "notification.suggestion.please": "Por favor",
 
-  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
-  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
-
-  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
-  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
-
-  // "suggestion.loading": "Loading ...",
-  "suggestion.loading": "Cargando ...",
-
-  // "suggestion.title": "Publication Claim",
-  "suggestion.title": "Reclamo de publicación",
-
-  // "suggestion.title.breadcrumbs": "Publication Claim",
-  "suggestion.title.breadcrumbs": "Reclamo de publicación",
-
-  // "suggestion.targets.description": "Below you can see all the suggestions ",
-  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
-
-  // "suggestion.targets": "Current Suggestions",
-  "suggestion.targets": "Sugerencias actuales",
-
-  // "suggestion.table.name": "Researcher Name",
-  "suggestion.table.name": "Nombre del investigador",
-
-  // "suggestion.table.actions": "Actions",
-  "suggestion.table.actions": "Acciones",
-
-  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
-  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
-
-  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
-  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
-
-  // "suggestion.noTargets": "No target found.",
-  "suggestion.noTargets": "Ningún destino encontrado.",
-
-  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
-  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
-
-  // "suggestion.evidence.type": "Type",
-  "suggestion.evidence.type": "Tipo",
-
-  // "suggestion.evidence.score": "Score",
-  "suggestion.evidence.score": "Puntuación",
-
-  // "suggestion.evidence.notes": "Notes",
-  "suggestion.evidence.notes": "Notas",
-
-  // "suggestion.approveAndImport": "Approve & import",
-  "suggestion.approveAndImport": "Aprobar e importar",
-
-  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
-  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
-
-  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
-  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
-
-  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
-  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
-
-  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
-  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
-
-  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
-  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
-
-  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
-  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
-
-  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
-  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
-
-  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
-  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
-
-  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
-  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
-
-  // "suggestion.seeEvidence": "See evidence",
-  "suggestion.seeEvidence": "Ver pruebas",
-
-  // "suggestion.hideEvidence": "Hide evidence",
-  "suggestion.hideEvidence": "Ocultar pruebas",
-
-  // "suggestion.suggestionFor": "Suggestions for",
-  "suggestion.suggestionFor": "Sugerencias para",
-
-  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
-  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
-
-  // "suggestion.source.openaire": "OpenAIRE Graph",
-  "suggestion.source.openaire": "Gráfico OpenAIRE",
-
-  // "suggestion.from.source": "from the ",
-  "suggestion.from.source": "del ",
-
-  // "suggestion.count.missing": "You have no publication claims left",
-  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
-
-  // "suggestion.totalScore": "Total Score",
-  "suggestion.totalScore": "Puntuación total",
-
-  // "suggestion.type.openaire": "OpenAIRE",
-  "suggestion.type.openaire": "OpenAIRE",
-
-  // "notifications.events.title": "Quality Assurance Suggestions",
-  "notifications.events.title": "Sugerencias para el control de calidad",
-
-  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
-  "admin.quality-assurance.breadcrumbs": "Control de calidad",
-
-  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
-  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
-
-  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
-  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
-
-  // "admin.quality-assurance.page.title": "Quality Assurance",
-  "admin.quality-assurance.page.title": "Control de calidad",
-
-  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
-  "admin.notifications.source.breadcrumbs": "Control de calidad",
-
-  // "quality-assurance.event.table.person-who-requested": "Requested by",
-  "quality-assurance.event.table.person-who-requested": "Solicitado por",
-
-  // "quality-assurance.title": "Quality Assurance",
-  "quality-assurance.title": "Control de calidad",
-
-  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
-  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
-
-  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
-  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
-
-  // "quality-assurance.topics": "Current Topics",
-  "quality-assurance.topics": "Temas actuales",
-
-  // "quality-assurance.source": "Current Sources",
-  "quality-assurance.source": "Fuentes actuales",
-
-  // "quality-assurance.table.topic": "Topic",
-  "quality-assurance.table.topic": "Tema",
-
-  // "quality-assurance.table.source": "Source",
-  "quality-assurance.table.source": "Fuente",
-
-  // "quality-assurance.table.last-event": "Last Event",
-  "quality-assurance.table.last-event": "Último acontecimiento",
-
-  // "quality-assurance.table.actions": "Actions",
-  "quality-assurance.table.actions": "Acciones",
-
-  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
-  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
-
-  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
-  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
-
-  // "quality-assurance.noTopics": "No topics found.",
-  "quality-assurance.noTopics": "No se han encontrado temas.",
-
-  // "quality-assurance.noSource": "No sources found.",
-  "quality-assurance.noSource": "No se han encontrado fuentes.",
-
-  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
-  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
-
-  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
-  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
-
-  // "quality-assurance.loading": "Loading ...",
-  "quality-assurance.loading": "Cargando ...",
-
-  // "quality-assurance.events.topic": "Topic:",
-  "quality-assurance.events.topic": "Tema:",
-
-  // "quality-assurance.noEvents": "No suggestions found.",
-  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
-
-  // "quality-assurance.event.table.trust": "Trust",
-  "quality-assurance.event.table.trust": "Confíe en",
-
-  // "quality-assurance.event.table.publication": "Publication",
-  "quality-assurance.event.table.publication": "Publicación",
-
-  // "quality-assurance.event.table.details": "Details",
-  "quality-assurance.event.table.details": "Detalles",
-
-  // "quality-assurance.event.table.project-details": "Project details",
-  "quality-assurance.event.table.project-details": "Detalles del proyecto",
-
-  // "quality-assurance.event.table.reasons": "Reasons",
-  "quality-assurance.event.table.reasons": "Razones",
-
-  // "quality-assurance.event.table.actions": "Actions",
-  "quality-assurance.event.table.actions": "Acciones",
-
-  // "quality-assurance.event.action.accept": "Accept suggestion",
-  "quality-assurance.event.action.accept": "Aceptar sugerencia",
-
-  // "quality-assurance.event.action.ignore": "Ignore suggestion",
-  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
-
-  // "quality-assurance.event.action.undo": "Delete",
-  "quality-assurance.event.action.undo": "Borrar",
-
-  // "quality-assurance.event.action.reject": "Reject suggestion",
-  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
-
-  // "quality-assurance.event.action.import": "Import project and accept suggestion",
-  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
-
-  // "quality-assurance.event.table.pidtype": "PID Type:",
-  "quality-assurance.event.table.pidtype": "Tipo de PID:",
-
-  // "quality-assurance.event.table.pidvalue": "PID Value:",
-  "quality-assurance.event.table.pidvalue": "Valor del PID:",
-
-  // "quality-assurance.event.table.subjectValue": "Subject Value:",
-  "quality-assurance.event.table.subjectValue": "Valor del tema:",
-
-  // "quality-assurance.event.table.abstract": "Abstract:",
-  "quality-assurance.event.table.abstract": "Resumen:",
-
-  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
-  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
-
-  // "quality-assurance.event.table.project": "Project title:",
-  "quality-assurance.event.table.project": "Título del proyecto:",
-
-  // "quality-assurance.event.table.acronym": "Acronym:",
-  "quality-assurance.event.table.acronym": "Acrónimo:",
-
-  // "quality-assurance.event.table.code": "Code:",
-  "quality-assurance.event.table.code": "Código:",
-
-  // "quality-assurance.event.table.funder": "Funder:",
-  "quality-assurance.event.table.funder": "Financiador:",
-
-  // "quality-assurance.event.table.fundingProgram": "Funding program:",
-  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
-
-  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
-  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
-
-  // "quality-assurance.events.back": "Back to topics",
-  "quality-assurance.events.back": "Volver a los temas",
-
-  // "quality-assurance.events.back-to-sources": "Back to sources",
-  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
-
-  // "quality-assurance.event.table.less": "Show less",
-  "quality-assurance.event.table.less": "Mostrar menos",
-
-  // "quality-assurance.event.table.more": "Show more",
-  "quality-assurance.event.table.more": "Mostrar más",
-
-  // "quality-assurance.event.project.found": "Bound to the local record:",
-  "quality-assurance.event.project.found": "Vinculado al registro local:",
-
-  // "quality-assurance.event.project.notFound": "No local record found",
-  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
-
-  // "quality-assurance.event.sure": "Are you sure?",
-  "quality-assurance.event.sure": "¿Seguro?",
-
-  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
-  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
-
-  // "quality-assurance.event.undo.description": "This operation can't be undone!",
-  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
-
-  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
-  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
-
-  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
-  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
-
-  // "quality-assurance.event.action.cancel": "Cancel",
-  "quality-assurance.event.action.cancel": "Cancelar",
-
-  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
-  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
-
-  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
-  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
-
-  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
-  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
-
-  // "quality-assurance.event.modal.project.publication": "Publication:",
-  "quality-assurance.event.modal.project.publication": "Publicación:",
-
-  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
-  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
-
-  // "quality-assurance.event.modal.project.select": "Project search",
-  "quality-assurance.event.modal.project.select": "Buscar proyectos",
-
-  // "quality-assurance.event.modal.project.search": "Search",
-  "quality-assurance.event.modal.project.search": "Buscar",
-
-  // "quality-assurance.event.modal.project.clear": "Clear",
-  "quality-assurance.event.modal.project.clear": "Limpiar",
-
-  // "quality-assurance.event.modal.project.cancel": "Cancel",
-  "quality-assurance.event.modal.project.cancel": "Cancelar",
-
-  // "quality-assurance.event.modal.project.bound": "Bound project",
-  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
-
-  // "quality-assurance.event.modal.project.remove": "Remove",
-  "quality-assurance.event.modal.project.remove": "Eliminar",
-
-  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
-  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
-
-  // "quality-assurance.event.modal.project.notFound": "No project found.",
-  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
-
-  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
-  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
-
-  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
-  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
-
-  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
-  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
-
-  // "quality-assurance.event.reason": "Reason",
-  "quality-assurance.event.reason": "Motivo",
-
-  // "dso-selector.placeholder.type.community": "community",
-  "dso-selector.placeholder.type.community": "comunidad",
-
-  // "dso-selector.placeholder.type.collection": "collection",
-  "dso-selector.placeholder.type.collection": "colección",
-
-  // "dso-selector.placeholder.type.item": "item",
-  "dso-selector.placeholder.type.item": "ítem",
-
-  // "search.sidebar.advanced-search.filter-by": "Filter by",
-  "search.sidebar.advanced-search.filter-by": "Filtrar por",
-
-  // "search.sidebar.advanced-search.filters": "Filters",
-  "search.sidebar.advanced-search.filters": "Filtros",
-
-  // "search.sidebar.advanced-search.operators": "Operators",
-  "search.sidebar.advanced-search.operators": "Operadores",
-
-  // "search.sidebar.advanced-search.add": "Add",
-  "search.sidebar.advanced-search.add": "Añadir",
-}
+}
\ No newline at end of file

From eb51b7986dd2460aedb9f6c723537bad22043188 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Fri, 3 Jan 2025 19:24:14 +0100
Subject: [PATCH 1027/1286] Update ca.json5

---
 src/assets/i18n/ca.json5 | 4009 +++++++++++++++++++++++++++++++-------
 1 file changed, 3317 insertions(+), 692 deletions(-)

diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index e257ebafc5..47c7d7d63b 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -6,10 +6,8 @@
   // "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",
-
-
+  // "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.",
@@ -17,10 +15,10 @@
   // "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",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibit",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "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.",
@@ -29,27 +27,26 @@
   // "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",
+  // "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.401": "Unauthorized",
+  "error-page.description.401": "No autoritzat",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibit",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibit",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "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.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",
@@ -90,7 +87,7 @@
   // "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": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear format de fitxer",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -194,7 +191,11 @@
 
   // "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.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formats de fitxer seleccionats",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -215,7 +216,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registre de format Fitxer",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registre de metadades",
@@ -241,9 +246,18 @@
   // "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.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionat",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemes seleccionats",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -256,14 +270,18 @@
   // "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.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Camps de metadades de l'esquema",
 
@@ -275,7 +293,11 @@
 
   // "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.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Camps de metadades seleccionats",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -335,7 +357,29 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre d'esquemes de metadades",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestió d'accés massiu",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultats de la cerca",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Pas 1: Seleccionar objectes",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Cerca",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecció actual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Pas 2: Operació a realitzar",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Eliminar usuari",
@@ -355,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuaris",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nou usuari",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nou usuari",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Afegir usuari",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Afegir usuari",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuaris",
 
@@ -367,7 +423,7 @@
   // "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": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -385,7 +441,7 @@
   // "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": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -415,10 +471,10 @@
   // "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": "Email",
   "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": "Must be a valid email 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",
@@ -472,14 +528,12 @@
   // "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.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "S'ha produït un error en intentar eliminar l'usuari amb id \"{{id}}\" amb codi: \"{{statusCode}}\" i missatge: \"{{restResponse.errorMessage}}\"",
 
   // "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",
 
@@ -549,8 +603,6 @@
   // "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.",
 
@@ -626,12 +678,6 @@
   // "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",
 
@@ -716,9 +762,6 @@
   // "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 }}\"",
 
@@ -746,410 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Enrere",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Assegurament de la Qualitat",
 
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Assegurament de la Qualitat",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Assegurament de la Qualitat",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "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.editGroupPage": "En aquesta pàgina, podeu modificar les propietats i els membres d'un grup. A la secció superior, podeu editar el nom i la descripció del grup, tret que sigui un grup d'administració d'una col·lecció o comunitat, en aquest cas el nom i la descripció del grup es generen automàticament i no es poden editar. A les seccions següents, podeu editar la pertinença al grup. Consulteu [el wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) per a més detalls.",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
+  // "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.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per afegir o eliminar un usuari d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar usuaris (utilitzeu el menú desplegable a l'esquerra de la barra de cerca per triar si voleu cercar per metadades o per correu electrònic). A continuació, feu clic a la icona de més per a cada usuari que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada usuari que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
+  // "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 groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per afegir o eliminar un subgrup d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar grups. A continuació, feu clic a la icona de més per a cada grup que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada grup que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar col·leccions",
 
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de col·lecció",
 
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultats d'ítems",
 
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunitat",
 
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Col·lecció",
 
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. Ítems",
 
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidint amb tots els filtres seleccionats",
 
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de consulta de metadades",
 
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de consulta de metadades",
 
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Executar consulta d'ítems",
 
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selector de col·lecció",
 
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultes de camps de metadades",
 
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultes predefinides",
 
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.exists": "exists",
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Consulta paginada",
 
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límit/",
 
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.equals": "equals",
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplaçament",
 
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Tot el repositori",
 
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.like": "like",
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Qualsevol camp",
 
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.notLike": "not like",
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existeix",
 
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.contains": "contains",
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existeix",
 
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "igual a",
 
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.matches": "matches",
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no és igual a",
 
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "com",
 
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "no com",
 
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "conté",
 
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no conté",
 
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincideix",
 
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincideix",
 
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nova consulta",
 
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "No té títol",
 
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "No té dc.identifier.uri",
 
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Té matèria composta",
 
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Té autor compost dc.contributor.author",
 
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Té creador compost dc.creator",
 
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Té URL a dc.description",
 
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "Té text complet a dc.description.provenance",
 
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Té text no complet a dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Té metadades buides",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Té metadades ininterrompudes a la descripció",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Té entitat XML a les metadades",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Té caràcter no ASCII a les metadades",
+
+  // "admin.reports.items.number": "No.",
   "admin.reports.items.number": "No.",
 
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
+  // "admin.reports.items.id": "UUID",
   "admin.reports.items.id": "UUID",
 
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Col·lecció",
 
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
+  // "admin.reports.items.handle": "URI",
   "admin.reports.items.handle": "URI",
 
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Títol",
 
 
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtres",
 
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
-  "admin.reports.commons.additional-data": "Additional data to return",
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Dades addicionals a retornar",
 
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pàgina anterior",
 
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pàgina següent",
 
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Pàgina",
 
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
-  "admin.reports.commons.of": "of",
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
 
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar per a l'actualització de metadades",
 
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Deseleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Seleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincideix amb tots els filtres especificats",
 
 
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property": "Item Property Filters",
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtres de propietats d'ítems",
 
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "És ítem - sempre cert",
 
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirats",
 
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - No retirats",
 
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems descobribles - No privats",
 
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "No descobrible - Ítem privat",
 
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtres bàsics de fitxers",
 
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "L'ítem té múltiples fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "L'ítem no té fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "L'ítem té un fitxer original",
 
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtres de fitxers per tipus MIME",
 
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "L'ítem té un fitxer original de document (PDF, Office, Text, HTML, XML, etc)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "L'ítem té un fitxer original d'imatge",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Té altres tipus de fitxers (no document o imatge)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "L'ítem té múltiples tipus de fitxers originals (document, imatge, altres)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "L'ítem té un fitxer original PDF",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "L'ítem té un fitxer original JPG",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Té un PDF inusualment petit",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Té un PDF inusualment gran",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Té fitxer de document sense ítem de TEXT",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtres de tipus MIME suportats",
 
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Els fitxers d'imatge de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "L'ítem té un fitxer d'imatge que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Els fitxers de document de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "L'ítem té un fitxer de document que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtres de paquets de fitxers",
 
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Té fitxer en un paquet no suportat",
 
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Té una miniatura inusualment petita",
 
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Té fitxer original sense miniatura",
 
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Té un nom de miniatura invàlid (suposa una miniatura per a cada original)",
 
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Té una miniatura no generada",
 
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No té llicència",
 
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Té documentació en el paquet de llicència",
 
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtres de permisos",
 
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "L'ítem té un fitxer original restringit",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "L'ítem té almenys un fitxer original que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "L'ítem té una miniatura restringida",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "L'ítem té almenys una miniatura que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "L'ítem té metadades restringides",
 
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "L'ítem té metadades que no són accessibles per a l'usuari anònim",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Cerca administrativa",
@@ -1187,9 +1148,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Cerca administrativa",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Administrar flux de treball",
 
@@ -1199,13 +1157,20 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Flux de treball",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Espai 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.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Polítiques",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisió",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importa metadades",
@@ -1231,6 +1196,9 @@
   // "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.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "És possible realitzar la importació amb la càrrega de fitxers o mitjançant URL, utilitzeu el camp superior per establir la font d'entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Deixeu anar un CSV de metadades per importar",
 
@@ -1255,15 +1223,114 @@
   // "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.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Introduïu primer l'URL del fitxer!",
+
+  // "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.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Pujar",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Introduïu l'URL del fitxer ZIP per importar",
+
   // "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.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Valoració",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Heu de valorar l'ítem",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisió",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Heu d'introduir una revisió per enviar aquesta valoració",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Seleccioneu una valoració a continuació",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Seleccioneu una valoració a continuació i afegiu també una revisió",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Seleccioneu un únic revisor a continuació abans d'enviar",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Seleccioneu un o més revisors a continuació abans d'enviar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Afegir usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Examinar tot",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membres actuals",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Cerca",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nom",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Correu electrònic",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Eliminar / Afegir",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Eliminar membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membre afegit correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "No s'ha pogut afegir el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membre eliminat correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "No s'ha pogut eliminar el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Afegir membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No hi ha un grup actiu actual, envieu primer un nom.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Encara no hi ha membres al grup, cerqueu i afegiu.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No s'han trobat usuaris en aquesta cerca",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No s'ha seleccionat cap revisor.",
+
   // "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.",
 
@@ -1279,15 +1346,12 @@
   // "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": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Descarregant {{ bitstream }}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "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",
 
@@ -1324,7 +1388,7 @@
   // "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": "Primary File",
   "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\".",
@@ -1339,6 +1403,9 @@
   // "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.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "S'ha produït un error en desar el fitxer principal",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -1363,7 +1430,6 @@
   // "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.",
 
@@ -1387,6 +1453,7 @@
 
   // "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. ",
 
@@ -1396,7 +1463,7 @@
   // "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": "Your email 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.",
@@ -1429,8 +1496,6 @@
   // "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",
 
@@ -1443,6 +1508,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Per matèria",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Per categoria de matèria",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Per Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Per títol",
 
@@ -1464,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Títol",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoria de matèria",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Cerca per autor",
 
@@ -1473,6 +1547,18 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Examinar per matèria",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Examinar per categoria de matèria",
+
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Seleccioneu una matèria per afegir com a filtre de cerca",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar per Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Seleccioneu un índex per afegir com a filtre de cerca",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar per títol",
 
@@ -1485,6 +1571,9 @@
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
   "pagination.next.button.disabled.tooltip": "No hi ha més pàgines de resultats",
 
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control per a la navegació de pàgines, relativa a l'element amb ID: ",
+
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", començant per {{ startsWith }}",
 
@@ -1554,17 +1643,38 @@
   // "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.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinant {{ collection }} per {{ field }} {{ value }}",
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Examinar",
 
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinant per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinant per {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Tornar als resultats",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Treu xip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Aprovat",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Rebutjat, retornat al remitent",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Rebutjat, retornat al flux de treball del gestor de revisions",
+
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear col·lecció",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Cerca un logotip de col·lecció",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una col·lecció",
@@ -1599,8 +1709,6 @@
   // "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ó",
 
@@ -1610,8 +1718,6 @@
   // "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",
 
@@ -1672,7 +1778,6 @@
   // "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",
 
@@ -1700,15 +1805,17 @@
   // "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.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Control d'accés",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Edició de col·lecció - Control d'accés",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curar",
@@ -1797,8 +1904,6 @@
   // "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",
 
@@ -1835,8 +1940,6 @@
   // "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ó",
 
@@ -1864,18 +1967,14 @@
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "Tipus d'Entitat",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Col·lecció",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotip de la 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.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Cerca",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar aquesta col·lecció",
@@ -1889,7 +1988,8 @@
   // "collection.page.news": "News",
   "collection.page.news": "Notícies",
 
-
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultats de la cerca",
 
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar selecció",
@@ -1897,66 +1997,93 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hi ha col·leccions per mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Col·leccions seleccionades",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar col·lecció",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar col·lecció",
+
   // "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",
 
@@ -1969,7 +2096,20 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar més",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Contraure {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Cerca un logotip de comunitat",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunitats i col·leccions",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunitat",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunitat",
@@ -2013,20 +2153,25 @@
   // "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-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminació",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Desfer eliminació",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.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": "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": "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",
@@ -2038,31 +2183,33 @@
   // "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": "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": "An error occurred 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.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Control d'accés",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Edició de la comunitat - Control d'accés",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadades",
 
@@ -2081,12 +2228,11 @@
   // "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",
 
-
+  // "community.logo": "Community logo",
+  "community.logo": "Logotip de la comunitat",
 
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Cap",
@@ -2106,28 +2252,24 @@
   // "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",
 
@@ -2137,38 +2279,38 @@
   // "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.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuaris i Grups que poden llegir nous fitxers enviats a aquesta col·lecció. Els canvis en aquest rol no són retroactius. Els fitxers 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.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.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Revisors de puntuació",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Els revisors poden donar una puntuació als enviaments entrants, això definirà si l'enviament serà rebutjat o no.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Breu descripció",
@@ -2203,14 +2345,15 @@
   // "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.search.results.head": "Search Results",
+  "community.search.results.head": "Resultats de la cerca",
+
+  // "community.sub-collection-list.head": "Collections in 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": "Communities in this Community",
   "community.sub-community-list.head": "Comunitats d'aquesta comunitat",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Acceptar tot",
 
@@ -2289,38 +2432,30 @@
   // "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",
 
@@ -2333,10 +2468,10 @@
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Compartició",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "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": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprovar enllaços a metadades",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2357,8 +2492,6 @@
   // "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:",
 
@@ -2374,7 +2507,7 @@
   // "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": "An error occurred 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",
@@ -2386,8 +2519,6 @@
   // "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 }}>",
 
@@ -2406,12 +2537,17 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Sol·licitud de còpia de document denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Esborrar selecció",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Esborrar l'opció seleccionada",
 
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sense títol",
 
-
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sense nom",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova col·lecció",
@@ -2467,6 +2603,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Cerca un/a {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunitat",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "col·lecció",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccionar una col·lecció",
 
@@ -2497,6 +2642,45 @@
   // "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 ↻",
 
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selector de grup de supervisió",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "CAP",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleccioneu un grup",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Cancel·lar",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Guardar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Seleccioneu un grup",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ordre de supervisió creada correctament per al grup {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Error",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Ja existeix una ordre de supervisió en aquest ítem per al grup seleccionat",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exporta metadades per a {{ dsoName }}",
 
@@ -2533,6 +2717,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Esteu segur que voleu eliminar el logotip?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Esborrar Perfil",
 
@@ -2545,6 +2732,17 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Eliminar subscripció",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Esteu segur que voleu eliminar la subscripció per a \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Cancel·lar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Eliminar",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Error en obtenir el fitxer",
@@ -2609,25 +2807,45 @@
   // "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": "This 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": "This email 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",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu els camps Element i Qualificador en lloc d'això",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Aquest camp no pot contenir més de 32 caràcters",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Aquest camp no pot contenir més de 256 caràcters",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu el camp Qualificador en lloc d'això",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Aquest camp no pot contenir més de 64 caràcters",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Aquest camp no pot contenir més de 64 caràcters",
 
   // "feed.description": "Syndication feed",
   "feed.description": "Fil de sindicació",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Fitxer restringit",
 
   // "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 }}",
 
@@ -2643,13 +2861,14 @@
   // "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": "End User Agreement",
   "footer.link.end-user-agreement": "Acord d'usuari final",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Suggeriments",
 
-
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Oblit de contrasenya",
@@ -2663,8 +2882,8 @@
   // "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.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "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.",
@@ -2681,10 +2900,8 @@
   // "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-email.form.error.content": "An error occurred 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 en intentar restablir la contrasenya del compte associat a la següent adreça de correu electrònic: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Oblit de contrasenya",
@@ -2710,8 +2927,8 @@
   // "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.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "Introduïu una contrasenya al camp a continuació.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Les contrasenyes no coincideixen.",
@@ -2728,7 +2945,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Envia contrasenya",
 
-
   // "form.add": "Add more",
   "form.add": "Afegir més",
 
@@ -2789,6 +3005,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No s'ha introduït cap valor",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Correu electrònic",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nom",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Al index de Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institució",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Cognoms",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Eliminar",
 
@@ -2807,19 +3041,26 @@
   // "form.submit": "Save",
   "form.submit": "Guardar",
 
+  // "form.create": "Create",
+  "form.create": "Crear",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Disminuir {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "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": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Missatge opcional addicional",
 
   // "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",
@@ -2857,11 +3098,6 @@
   // "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",
 
@@ -2871,23 +3107,22 @@
   // "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.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "S'enviarà un missatge al sol·licitant de la petició. S'adjuntaran els documents sol·licitats.",
 
   // "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": "Health",
   "health-page.heading": "Revisió de salut",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Informació",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Estat",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2938,7 +3173,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No s'han detectat problemes",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2957,8 +3191,6 @@
   // "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.",
 
@@ -2983,6 +3215,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Acord d'usuari final",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "els Estats Units",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Declaració de privadesa",
 
@@ -3016,22 +3251,26 @@
   // "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": "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.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": "A comment is required",
   "info.feedback.error.message.required": "Es requereix un comentari",
 
-  // "info.feedback.page-label" : "Page",
+  // "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": "The page related to your feedback",
   "info.feedback.page_help": "La pàgina relacionada amb el vostre suggeriment",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Suport COAR Notify",
 
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Suport COAR Notify",
 
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Aquest ítem és privat",
@@ -3039,7 +3278,11 @@
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Aquest ítem ha estat retirat",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Sol·licitar reintegració",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Sol·licitat per",
 
   // "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.",
@@ -3047,16 +3290,12 @@
   // "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",
 
@@ -3090,8 +3329,6 @@
   // "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",
 
@@ -3107,6 +3344,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "PAQUET: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Fitxers en el paquet {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Podeu moure un fitxer a una pàgina diferent deixant-lo anar al número de pàgina.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3125,9 +3368,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Desfer canvis",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha estat retornat a la posició {{ toIndex }} i ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperant que es completi el moviment.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ara està en la posició {{ toIndex }}.",
+
   // "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.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Els fitxers es poden reordenar dins dels seus paquets mantenint el mànec d'arrossegament i movent el ratolí. Alternativament, els fitxers es poden moure utilitzant el teclat de la següent manera: seleccioneu el fitxer prement enter quan el mànec d'arrossegament del fitxer estigui enfocat. Moveu el fitxer cap amunt o cap avall utilitzant les tecles de fletxa. Premeu enter de nou per confirmar la posició actual del fitxer.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Accions",
 
@@ -3182,8 +3443,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Pujar",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancel·lar",
 
@@ -3211,13 +3470,75 @@
   // "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.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconegut",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En cua per a registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "En cua per a reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrat",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservat",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En cua per a actualització i registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "En cua per a eliminació",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminat",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Pendent (no registrat)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Creat (no registrat)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrar un DOI nou o pendent",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrar DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registrar un DOI nou o pendent",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Reviseu qualsevol identificador pendent i les metadades de l'ítem a continuació i feu clic a Confirmar per continuar amb el registre del DOI, o Cancel·lar per sortir",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Cancel·lar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI en cua per a registre amb èxit.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Error en registrar el DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "El següent DOI ja ha estat creat i es posarà en cua per a registre en línia",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Assignar ítem a col·leccions seleccionades",
 
@@ -3272,14 +3593,27 @@
   // "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.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clau d'autoritat",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
 
@@ -3292,6 +3626,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
 
+  // "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.edit.buttons.virtual": "Aquest és un valor de metadada virtual, és a dir, un valor heretat d'una entitat relacionada. No es pot modificar directament. Afegiu o elimineu la relació corresponent a la pestanya \"Relacions\"",
+
   // "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.",
 
@@ -3307,6 +3644,12 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar camp",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
 
@@ -3340,10 +3683,20 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Desfer reordenació",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoritat: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquejar el valor de la clau d'autoritat per a l'edició manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquejar el valor de la clau d'autoritat per a l'edició manual",
 
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Camp",
@@ -3354,8 +3707,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Enrere",
 
@@ -3380,6 +3731,9 @@
   // "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.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertència: Quan està habilitat, la política d'accés de lectura per a l'ítem i qualsevol fitxer associat amb l'ítem serà reemplaçada per la política d'accés de lectura predeterminada de la col·lecció. Això no es pot desfer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Moure",
 
@@ -3395,8 +3749,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Moure ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancel·lar",
 
@@ -3415,8 +3767,6 @@
   // "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",
 
@@ -3435,8 +3785,6 @@
   // "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",
 
@@ -3455,8 +3803,6 @@
   // "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",
 
@@ -3502,11 +3848,9 @@
   // "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",
 
@@ -3519,6 +3863,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Edició d'ítem: Curar",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar ítem: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Control d'accés",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Edició d'ítem: Control d'accés",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadades",
 
@@ -3549,8 +3902,8 @@
   // "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.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Moure aquest ítem a una col·lecció diferent",
 
   // "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ó",
@@ -3576,8 +3929,8 @@
   // "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.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar aquest ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositori",
@@ -3618,8 +3971,6 @@
   // "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",
 
@@ -3641,7 +3992,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Enrere",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3675,7 +4025,68 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraure",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
 
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Veure",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Veure",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Esteu segur que voleu eliminar l'ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel·lar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Eliminar",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "S'ha eliminat correctament l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "No s'ha pogut eliminar l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisat per:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Eliminar grup de supervisió",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Aquest valor d'autoritat ha estat confirmat com a exacte per un usuari interactiu",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor és singular i vàlid, però no ha estat vist i acceptat per un humà, per tant, encara és incert",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hi ha múltiples valors d'autoritat coincidents amb igual validesa",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hi ha respostes coincidents a l'autoritat",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "L'autoritat ha trobat un error intern",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "L'autoritat recomana que aquest enviament sigui rebutjat",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "No s'ha retornat cap valor de confiança raonable de l'autoritat",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Mai es va registrar la confiança per aquest valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confiança desconegut",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resum",
@@ -3767,10 +4178,13 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraure",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
+  // "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": "License bundle",
   "item.page.filesection.license.bundle": "Paquet de llicències",
 
   // "item.page.return": "Back",
@@ -3779,6 +4193,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nova versió",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Sol·licitar la retirada d'aquest ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Sol·licitar la reintegració",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress 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",
 
@@ -3788,6 +4208,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclamar aquest ítem com a perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR logo",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -3815,27 +4238,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipus:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "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.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "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": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista o Sèrie",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editorial:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Cognoms:",
 
@@ -3863,13 +4289,44 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línia de finançament:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
 
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Data de fundació",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nom legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipus d'entitat:",
 
   // "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.empty": "No hi ha ítems per mostrar",
+
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionats",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3880,7 +4337,6 @@
   // "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.",
 
@@ -3941,14 +4397,21 @@
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress 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.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Sol·licitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Sol·licitar reintegració",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.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",
 
@@ -3961,34 +4424,75 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nova versió",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar sol·licitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancel·lar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.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.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar sol·licitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resum",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Està sol·licitant retirar aquest ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Està sol·licitant reintegrar aquest ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Introduïu el motiu de la reintegració",
+
   // "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ó",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduïu el motiu de la reintegració",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creant nova versió...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviant sol·licitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Sol·licitud de reintegració enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Sol·licitud de retirada enviada.",
+
   // "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": "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": "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 in-progress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress 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ó",
 
@@ -4007,20 +4511,107 @@
   // "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": "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": "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": "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": "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}}",
 
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Afegir",
 
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Eliminar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfer canvis",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "La plantilla d'ítem actualment no conté cap metadada. Feu clic a Afegir per començar a afegir un valor de metadades.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Camp",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar camp",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Els teus canvis han sigut descartats. Per restaurar els teus canvis feu clic al botó 'Desfer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Canvis descartats",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "S'ha produït un error",
+
+  // "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.content": "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadades invàlides",
+
+  // "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.content": "Un altre usuari ha canviat la plantilla d'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "S'han desat els canvis a les metadades d'aquesta plantilla d'ítem.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadades desades",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Desfer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Desfer reordenació",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Guardar",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
@@ -4052,8 +4643,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Cerca de revistes",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Número de la revista",
 
@@ -4081,7 +4670,8 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
-
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultats de la cerca de números de la revista",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volum de la revista",
@@ -4101,6 +4691,8 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volum",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultats de la cerca de volums de la revista",
 
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Suport del document",
@@ -4135,7 +4727,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripció: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Carregant fitxer...",
 
@@ -4190,8 +4781,6 @@
   // "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",
 
@@ -4204,9 +4793,6 @@
   // "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",
 
@@ -4228,8 +4814,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Iniciar sessió",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Tancar sessió a DSpace",
 
@@ -4239,7 +4823,8 @@
   // "logout.title": "Logout",
   "logout.title": "Tancar sessió",
 
-
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegació d'administració",
 
   // "menu.header.admin": "Management",
   "menu.header.admin": "Administració",
@@ -4250,41 +4835,33 @@
   // "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_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestió massiva d'accés",
+
   // "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.reports": "Reports",
-  // TODO New key - Add a translation
-  "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
 
   // "menu.section.reports.collections": "Filtered Collections",
-  // TODO New key - Add a translation
-  "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Col·leccions filtrades",
 
   // "menu.section.reports.queries": "Metadata Query",
-  // TODO New key - Add a translation
-  "menu.section.reports.queries": "Metadata Query",
-
-
+  "menu.section.reports.queries": "Consulta de metadades",
 
   // "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",
 
@@ -4309,22 +4886,24 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Per tema",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Per categoria de matèria",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Per Norwegian Science Index",
+
   // "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",
 
@@ -4337,8 +4916,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Ítem",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
 
@@ -4357,13 +4934,11 @@
   // "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.reports": "Reports menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
+  "menu.section.icon.reports": "Secció del menú d'informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Secció del menú de cerca d'administrador",
@@ -4410,7 +4985,8 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Secció del menú de notificacions",
 
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
@@ -4421,8 +4997,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadades",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nou",
 
@@ -4441,7 +5015,14 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Procés",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificacions",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assegurament de la Qualitat",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamació de Publicació",
 
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Ancorar barra lateral",
@@ -4449,16 +5030,12 @@
   // "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",
 
@@ -4468,23 +5045,18 @@
   // "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.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secció de Control d'accés",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar secció d'Informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la secció del Panell de control",
 
@@ -4512,19 +5084,18 @@
   // "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",
 
@@ -4603,18 +5174,21 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sense títol",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sense URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "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": "Your submissions",
   "mydspace.show.workspace": "Els seus enviaments",
 
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Ítems supervisats",
+
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Arxivat",
 
@@ -4648,7 +5222,17 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Veure",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hem trobat <b>{{count}} publicacions</b> a {{source}} que semblen estar relacionades amb el vostre perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar les suggerències",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Si us plau",
 
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tot DSpace",
@@ -4656,13 +5240,16 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Per comunitat",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Alternar ajuda contextual",
+
   // "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": "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",
@@ -4680,21 +5267,236 @@
   // "nav.search": "Search",
   "nav.search": "Cerca",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Enviar 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.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscripcions",
+
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegació",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil d'usuari",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Assegurament de la Qualitat",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuació podeu veure totes les fonts de notificació.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temes actuals",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fonts actuals",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Font",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Últim esdeveniment",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Accions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostra temes per a {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostra suggeriments per a {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No s'han trobat temes.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No s'han trobat fonts.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Suggeriments d'assegurament de la qualitat",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "S'ha produït un error en carregar els temes d'assegurament de la qualitat",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "S'ha produït un error en carregar la font d'assegurament de la qualitat",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Carregant ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No s'han trobat suggeriments.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confiança",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicació",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalls",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalls del projecte",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Raons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Accions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Acceptar suggeriment",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar suggeriment",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Eliminar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rebutjar suggeriment",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar projecte i acceptar suggeriment",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipus de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor de PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resum:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Dades del projecte suggerit per OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Títol del projecte:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrònim:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Codi:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Finançador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de finançament:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicció:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Tornar als temes",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Tornar a les fonts",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menys",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar més",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No s'ha trobat cap registre local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Estàs segur?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Aquesta operació no es pot desfer. Ignorar aquest suggeriment?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "Aquesta operació no es pot desfer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Aquesta operació no es pot desfer. Rebutjar aquest suggeriment?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No s'ha seleccionat cap projecte DSpace. Es crearà un nou projecte basat en les dades del suggeriment.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "La vostra decisió s'ha desat correctament.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "S'ha produït un error. La vostra decisió no s'ha desat.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Trieu un projecte per enllaçar",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicació:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Cerca de projectes",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Cerca",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Netejar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Projecte enllaçat",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduïu un nom de projecte",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No s'ha trobat cap projecte.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El projecte s'ha enllaçat correctament.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El projecte s'ha desvinculat correctament.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "S'ha produït un error. No s'ha realitzat cap operació.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Raó",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unitat organitzativa",
@@ -4723,7 +5525,11 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unitat organitzativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opcions de paginació",
@@ -4740,8 +5546,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opcions d'ordenació",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
 
@@ -4790,11 +5594,21 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Cerca de persones",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Paràmetres",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar paràmetre",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Afegir un paràmetre...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar paràmetre",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del paràmetre",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancel·lar",
 
@@ -4840,6 +5654,9 @@
   // "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.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "El fitxer supera la mida màxima de càrrega",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Crea un nou procés",
 
@@ -4849,18 +5666,16 @@
   // "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": "Arguments",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any 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": "Back",
   "process.detail.back": "Enrere",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Sortida del procés",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4872,28 +5687,28 @@
   // "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": "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": "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.script": "Script",
+  "process.detail.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Procés: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora d'inici",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de finalització",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Estat",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Crear un procés similar",
 
   // "process.detail.actions": "Actions",
@@ -4920,24 +5735,52 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Alguna cosa ha fallat eliminant el procés",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualització automàtica…",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalització (UTC)",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processos completats amb èxit",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No s'han trobat processos coincidents.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalització (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processos fallits",
+
+  // "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": "Process ID",
   "process.overview.table.id": "ID de procés",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora d'inici (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processos en execució",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creació (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processos programats",
+
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora d'inici (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Estat",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuari",
 
   // "process.overview.title": "Processes Overview",
@@ -4955,6 +5798,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} processos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar procés",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Netejar la selecció",
 
@@ -4967,6 +5813,9 @@
   // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "Elimina processos",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconegut",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminant procés",
 
@@ -4976,8 +5825,6 @@
   // "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",
 
@@ -4996,9 +5843,6 @@
   // "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",
 
@@ -5107,8 +5951,6 @@
   // "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ó",
 
@@ -5142,7 +5984,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Cerca de publicacions",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Següent",
 
@@ -5152,6 +5993,104 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Llista de reproducció",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Carregant ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamació de Publicació",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamació de Publicació",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuació podeu veure totes les suggerències ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Suggeriments actuals",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nom del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Accions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} suggeriment(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} suggeriment(s) per a ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "No s'ha trobat cap objectiu.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "S'ha produït un error en carregar els objectius de suggeriment",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipus",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuació",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprovar i importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "El suggeriment s'ha importat correctament. <a href='{{ url }}'>Veure.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprovar i importar seleccionats",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggeriments s'han importat correctament ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggeriments no s'han importat a causa d'errors inesperats del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar suggeriment",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "El suggeriment ha estat descartat",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar suggeriments seleccionats",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggeriments han estat descartats ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggeriments no han estat descartats a causa d'errors inesperats del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Veure evidència",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Amagar evidència",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Suggeriments per a",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Suggeriments per a {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gràfic OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "de la ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "No tens reclamacions de publicació restants",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuació total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Registre de nou usuari",
@@ -5216,7 +6155,6 @@
   // "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",
 
@@ -5229,8 +6167,11 @@
   // "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.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Si us plau, introduïu una adreça de correu electrònic vàlida.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilitzeu correu electrònic amb dominis permesos: {{ domains }}",
 
   // "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ó.",
@@ -5247,7 +6188,7 @@
   // "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": "An error occurred 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",
@@ -5256,6 +6197,9 @@
   // "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.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Aquesta adreça de correu electrònic no està a la llista de dominis que es poden registrar. Els dominis permesos són {{ domains }}",
+
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
   "register-page.registration.google-recaptcha.open-cookie-settings": "Obrir configuració de cookies",
 
@@ -5268,6 +6212,9 @@
   // "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.",
 
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Es poden registrar comptes per a adreces de correu electrònic dels dominis",
+
   // "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",
 
@@ -5289,12 +6236,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistes",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volum de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unitats organitzatives",
 
@@ -5319,6 +6272,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volums de revistes",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volum de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Col·laboradors",
 
@@ -5331,16 +6287,14 @@
   // "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 ::",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositori DSpace",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositori DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Afegir",
@@ -5459,7 +6413,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Màxim 30 caràcters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5492,6 +6446,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grup",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar tot",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar tot",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5516,7 +6482,8 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Polítiques per a la col·lecció",
 
-
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contingut principal",
 
   // "search.description": "",
   "search.description": "",
@@ -5533,6 +6500,11 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Cerca al repositori ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtre de tipus {{ type }} amb valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Títol",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
@@ -5555,6 +6527,12 @@
   // "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.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nom del fitxer",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripció del fitxer",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipus",
 
@@ -5576,10 +6554,41 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Data de naixement, inicial",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisat per",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirat",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no igual",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " no autoritat",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " conté",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no conté",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Títol",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Títol",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Cerca per Títol",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -5683,6 +6692,24 @@
   // "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.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Cerca per Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Cerca per Descripció del fitxer",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipus",
 
@@ -5791,6 +6818,20 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Navega per l'arbre {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Finançament",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Finançament",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Cerca Supervisat per",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
@@ -5801,6 +6842,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unitat organitzativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projecte",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicació",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -5813,13 +6863,27 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Arxivat",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validació",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "Esperant el revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flux de treball",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espai de treball",
+
   // "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",
 
@@ -5829,7 +6893,26 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Iguals",
 
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No iguals",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoritat",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "No autoritat",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Conté",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No conté",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
 
   // "search.form.search": "Search",
   "search.form.search": "Cerca",
@@ -5840,8 +6923,6 @@
   // "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",
 
@@ -5866,7 +6947,6 @@
   // "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",
 
@@ -5885,11 +6965,24 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar per",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Cerca avançada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar per",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtres",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadors",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Afegir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configuració",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detall",
 
@@ -5899,7 +6992,11 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostra com a llista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
 
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendent",
@@ -5937,6 +7034,23 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificació Descendent",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Cognoms Ascendent",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Cognoms Descendent",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nom Ascendent",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nom Descendent",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Data de naixement Ascendent",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Data de naixement Descendent",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Estadístiques",
@@ -5971,7 +7085,8 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visites",
 
-
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(no s'ha pogut carregar el nom de l'objecte)",
 
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar enviament",
@@ -5982,7 +7097,7 @@
   // "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": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "No teniu els permisos per fer un enviament nou.",
 
   // "submission.general.deposit": "Deposit",
@@ -6003,6 +7118,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Enrere",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardat",
 
@@ -6015,7 +7133,6 @@
   // "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",
 
@@ -6079,6 +7196,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6109,8 +7229,14 @@
   // "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.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Cerca OpenAIRE per Autors",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Cerca OpenAIRE per Títol",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Cerca OpenAIRE per Finançador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6124,6 +7250,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Noms de la Biblioteca del Congrés",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista prèvia de l'ítem",
 
@@ -6214,9 +7343,6 @@
   // "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",
 
@@ -6250,11 +7376,20 @@
   // "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.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Important des d'OpenAIRE",
+
   // "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.sherpaJournal": "Importa 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.sherpaPublisher": "Importa 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",
@@ -6262,6 +7397,9 @@
   // "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.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importa des de ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6295,6 +7433,15 @@
   // "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.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importació remota d'Organització",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organització local afegida amb èxit a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organització externa importada i afegida amb èxit a la selecció",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar tot",
 
@@ -6327,6 +7474,7 @@
 
   // "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 }})",
 
@@ -6350,11 +7498,13 @@
 
   // "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 }})",
 
@@ -6376,6 +7526,30 @@
   // "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.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Cerca per Autors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Cerca per Títol ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Cerca per Finançador ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Revistes per ISSN ({{ 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",
 
@@ -6385,9 +7559,6 @@
   // "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",
 
@@ -6397,8 +7568,8 @@
   // "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.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unitat organitzativa del Projecte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projecte",
@@ -6409,22 +7580,24 @@
   // "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.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "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",
 
@@ -6436,6 +7609,7 @@
 
   // "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",
 
@@ -6466,6 +7640,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicació",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6483,6 +7660,7 @@
 
   // "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",
 
@@ -6506,6 +7684,7 @@
 
   // "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",
 
@@ -6514,6 +7693,7 @@
 
   // "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",
 
@@ -6532,6 +7712,15 @@
   // "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.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "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",
 
@@ -6556,6 +7745,9 @@
   // "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.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "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",
 
@@ -6619,6 +7811,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No s'ha trobat cap col·lecció",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No s'han trobat tipus d'entitat",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hi ha opcions disponibles",
 
@@ -6634,7 +7829,23 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Hi ha seccions incompletes.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Es crearan els següents identificadors per al vostre ítem:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "No s'han creat handles per a aquest ítem.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "No s'han creat DOIs per a aquest ítem.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Altres identificadors: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condicions d'accés a l'ítem",
@@ -6654,8 +7865,11 @@
   // "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.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Possibles duplicats",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificadors",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Llicència de dipòsit",
@@ -6669,7 +7883,6 @@
   // "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.",
 
@@ -6709,6 +7922,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraure secció {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Fer {{fileName}} el fitxer principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Treure {{fileName}} com el fitxer principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancel·lar",
 
@@ -6844,16 +8063,27 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Fins",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No s'han detectat duplicats.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "S'han detectat possibles duplicats. Si us plau, reviseu la llista a continuació.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Aquest ítem està en l'espai de treball",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Aquest ítem està en el flux de treball",
+
   // "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": "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ó",
 
@@ -6932,21 +8162,17 @@
   // "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.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Seleccioneu aquesta opció per descartar aquest ítem. Després se us demanarà que ho confirmeu.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
@@ -6960,7 +8186,17 @@
   // "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.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleccionar revisor",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Qualificar",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprovar",
@@ -6974,6 +8210,12 @@
   // "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.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Declinar",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "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.",
 
@@ -6998,8 +8240,6 @@
   // "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ó...",
 
@@ -7012,8 +8252,6 @@
   // "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",
 
@@ -7026,6 +8264,8 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalls",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "s'han detectat possibles duplicats per a aquest ítem. Reclameu i editeu aquest ítem per veure els detalls.",
 
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Veure",
@@ -7033,6 +8273,113 @@
   // "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.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/D",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Subscripcions",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Subscripcions per a ítems",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Subscripcions per a col·leccions",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Subscripcions per a comunitats",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Freqüència de subscripció",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Diària",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensual",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Setmanal",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Subscriure's",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Subscripcions",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipus i freqüència",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Tancar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Per eliminar aquesta subscripció, visiteu la pàgina de \"Subscripcions\" al vostre perfil d'usuari",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contingut",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diària",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Setmanal",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensual",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Processant...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Subscrit a {{ type }} correctament.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Subscripció eliminada correctament",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Subscripció a {{ type }} actualitzada correctament",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "S'ha produït un error durant la creació de la subscripció",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "S'ha produït un error durant l'eliminació de la subscripció",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "S'ha produït un error durant l'actualització de la subscripció",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Assumpte",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Freqüència de subscripció",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Acció",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Eliminar",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "No disponible",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'ítem subscrit ha estat eliminat o actualment no teniu permís per veure'l",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Actualment no teniu cap subscripció. Per subscriure's a les actualitzacions per correu electrònic d'una Comunitat o Col·lecció, utilitzeu el botó de subscripció a la pàgina de l'objecte.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Miniatura",
@@ -7058,13 +8405,9 @@
   // "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",
 
@@ -7077,6 +8420,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Cerca",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtra els resultats escrivint les primeres lletres",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No hi havia elements per mostrar",
 
@@ -7116,7 +8462,8 @@
   // "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",
 
-
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Ítems supervisats",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Els teus enviaments",
@@ -7127,7 +8474,11 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tasques del flux de treball",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Tasques del flux de treball i Workspace",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flux de treball",
@@ -7159,7 +8510,6 @@
   // "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",
 
@@ -7193,6 +8543,81 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Vista del flux de treball",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Eliminar Workspace",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Eliminar ítem del workspace",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Eliminar",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Cancel·lar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Eliminat",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Aquest ítem del workspace s'ha eliminat correctament",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "No s'ha pogut eliminar l'ítem del workspace",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Flux de treball avançat",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisor seleccionat",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "El revisor per a aquest ítem del flux de treball s'ha seleccionat correctament",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "No s'ha pogut seleccionar el revisor per a aquest ítem del flux de treball",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Revisió de qualificació",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La qualificació per a aquest ítem del flux de treball s'ha enviat correctament",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "No s'ha pogut qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sessió caducarà aviat",
 
@@ -7205,7 +8630,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sessió",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processant...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7238,10 +8663,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Veure",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVAT",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLIC",
 
   // "researcher.profile.status": "Status:",
@@ -7250,16 +8675,16 @@
   // "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": "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.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "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": "Success",
   "researcherprofile.success.claim.title": "Èxit",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7268,7 +8693,7 @@
   // "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": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Concedir autoritzacions",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7316,43 +8741,43 @@
   // "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": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliació",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "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": "Education",
   "person.page.orcid.sync-profile.education": "Titulació",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "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": "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": "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": "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": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Deshabilitat",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "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": "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": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicacions seleccionades",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "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": "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",
@@ -7364,13 +8789,13 @@
   // "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": "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": "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": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Acció",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -7436,7 +8861,7 @@
   // "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": "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.",
@@ -7490,8 +8915,8 @@
   // "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.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ó",
@@ -7570,11 +8995,1211 @@
 
   // "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",
 
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "S'ha produït un error en recuperar el banner d'alerta del sistema",
 
-}
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "En",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} dia(es),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora(es) i",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut(s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Alerta del sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Alerta del sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "S'ha produït un error en recuperar l'alerta del sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Cancel·lar",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Guardar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIU",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIU",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "L'alerta del sistema ha de tenir un missatge",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Missatge d'alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Habilitar un temporitzador de compte enrere",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Consell: Configureu un temporitzador de compte enrere. Quan estigui habilitat, es pot establir una data en el futur i el banner d'alerta del sistema farà un compte enrere fins a la data establerta. Quan aquest temporitzador acabi, desapareixerà de l'alerta. El servidor NO s'aturarà automàticament.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccioneu la data utilitzant el calendari",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Vista prèvia de l'alerta del sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "L'alerta del sistema s'ha actualitzat correctament",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "S'ha produït un error en actualitzar l'alerta del sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "L'alerta del sistema s'ha creat correctament",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "S'ha produït un error en crear l'alerta del sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Alertes del sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Alertes del sistema",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descobrir",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de les metadades de l'ítem o dels seus fitxers.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat d'aquesta col·lecció. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat de qualsevol col·lecció sota aquesta comunitat. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadades de l'ítem",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Fitxers",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condicions d'accés",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Actualment, no s'especifiquen condicions d'accés a continuació. Si s'executa, això substituirà les condicions d'accés actuals per les condicions d'accés predeterminades heretades de la col·lecció propietària.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Substituir condicions d'accés",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Afegir a les existents",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar els canvis a fitxers específics",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Actualitzar tots els fitxers de l'ítem",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "fitxers seleccionats",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar fitxers",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancel·lar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Afegir més",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condició d'accés",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Seleccionar fitxers",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No hi ha ítems per mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Tancar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipus de condició d'accés",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Trieu una condició d'accés per aplicar als objectes seleccionats.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Permetre accés des de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Seleccioneu la data a partir de la qual s'aplica la condició d'accés relacionada",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Permetre accés fins",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Seleccioneu la data fins a la qual s'aplica la condició d'accés relacionada",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Afegir",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamació de Publicació",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamació de Publicació",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocol COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, donem suport complet al protocol COAR Notify, que està dissenyat per millorar la comunicació entre repositoris. Per obtenir més informació sobre el protocol COAR Notify, visiteu el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">lloc web de COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Per a la vostra comoditat, la nostra LDN (Linked Data Notifications) InBox és fàcilment accessible a {{ ldnInboxUrl }}. La LDN InBox permet una comunicació i intercanvi de dades sense problemes, garantint una col·laboració eficient i efectiva.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderació de Missatges",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Per garantir un entorn segur i productiu, tots els missatges LDN entrants són moderats. Si teniu previst intercanviar informació amb nosaltres, poseu-vos en contacte a través del nostre",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulari de suggeriments.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servei",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Serveis Registrats",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nom",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripció",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estat",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acció",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOU",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Serveis Registrats",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitat",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitat",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Feu clic per habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Feu clic per deshabilitar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servei",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servei",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servei",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Si us plau, confirmeu la creació d'aquest servei.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estat",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancel·lar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nou servei",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nom",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripció",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servei",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rang d'IP del Servei",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivell de confiança",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Si us plau, proporcioneu el nom del servei",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Si us plau, proporcioneu una descripció del vostre servei",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Si us plau, introduïu l'URL perquè els usuaris puguin obtenir més informació sobre el servei",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límit inferior del rang IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límit superior del rang IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Si us plau, especifiqueu l'URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Si us plau, introduïu un valor entre 0 i 1. Utilitzeu el “.” com a separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccioneu un patró",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconèixer i Acceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar una sol·licitud (oferta). Implica una intenció d'actuar sobre la sol·licitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconèixer i Rebutjar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar una sol·licitud (oferta). Significa que no hi haurà més accions respecte a la sol·licitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconèixer i Acceptar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar tentativament una sol·licitud (oferta). Implica una intenció d'actuar, que pot canviar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconèixer i Rebutjar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar tentativament una sol·licitud (oferta). Significa que no hi haurà més accions, subjecte a canvis.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar Suport",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Aquest patró s'utilitza per anunciar l'existència d'un suport, referenciant el recurs recolzat.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar Ingestió",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Aquest patró s'utilitza per anunciar que un recurs ha estat ingerit.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar Relació",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Aquest patró s'utilitza per anunciar una relació entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar Revisió",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Aquest patró s'utilitza per anunciar l'existència d'una revisió, referenciant el recurs revisat.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar Resultat del Servei",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Aquest patró s'utilitza per anunciar l'existència d'un 'resultat del servei', referenciant el recurs rellevant.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncis",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Sol·licitar Suport",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Aquest patró s'utilitza per sol·licitar el suport d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Sol·licitar Ingestió",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Aquest patró s'utilitza per sol·licitar que el sistema objectiu ingereixi un recurs.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Sol·licitar Revisió",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Aquest patró s'utilitza per sol·licitar una revisió d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Desfer Oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Aquest patró s'utilitza per desfer (retirar) una oferta feta prèviament.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Desfer",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No s'ha seleccionat cap filtre d'ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtre d'ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automàtic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Es requereix un nom",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Es requereix una URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Si us plau, introduïu un rang d'IP vàlid",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Si us plau, introduïu un IpV4 vàlid en ambdós límits del rang (nota: per a una IP única, introduïu el mateix valor en ambdós camps)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Es requereix una URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Es requereix almenys un patró",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Si us plau, introduïu una puntuació vàlida (entre 0 i 1). Utilitzeu el “.” com a separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patró Suportat",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Afegir més",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nou Servei",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Esteu segur que voleu eliminar aquest servei?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirmeu els canvis?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar Servei",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancel·lar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Esteu segur que voleu descartar els canvis i sortir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar Canvis",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edició Exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servei ha estat editat",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edició Fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servei no ha estat editat",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creació Exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servei ha estat creat",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creació Fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servei no ha estat creat",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Si us plau, seleccioneu almenys un patró d'entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estat actualitzat amb èxit",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "L'estat del servei ha estat actualitzat",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminació Exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servei ha estat eliminat",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminació Fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servei no ha estat eliminat",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancel·lar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servei",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servei",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nom",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripció",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del Servei",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patró d'Entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sense Patró d'Entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtre d'Ítem Seleccionat",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sense Filtre d'Ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automàtic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Afegir més",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar Servei",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "No seleccionar cap",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "S'ha produït un error en crear aquest procés",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Èxit",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El procés s'ha creat correctament",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servei seleccionat és compatible amb l'ítem segons el seu estat actual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Suport",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisió",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciat Per",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementat Per",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visió general dels serveis LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Serveis LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servei LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}} en relació amb el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b> i ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del Servei:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enllaç:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancel·lar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servei",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servei",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Esteu segur que voleu eliminar el servei actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servei",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servei s'ha eliminat correctament.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "S'ha produït un error en eliminar el servei",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID dels Serveis",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nom",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora d'inici (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estat",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuari",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visió General dels Serveis",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visió General dels Serveis",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Accions",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripció",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Podeu sol·licitar una revisió a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Podeu sol·licitar un Suport a una de les següents revistes superposades",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Podeu sol·licitar ingerir una còpia del vostre enviament a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hi ha dades disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "No seleccionar cap",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccioneu un servei per a {{ pattern }} d'aquest ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripció del servei seleccionat:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hi ha més informació disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servei seleccionat no és adequat per a l'ítem actual. Si us plau, consulteu la descripció per obtenir detalls sobre quins registres poden ser gestionats per aquest servei.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No s'han trobat patrons configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtre invàlid, intenteu seleccionar un altre servei o cap.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat acceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat rebutjada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> està pendent.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patró suportat per a eliminació",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patró suportat per a eliminació",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccioneu el filtre d'ítem per al patró",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccioneu un patró per al servei",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccioneu el servei per a eliminació",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servei LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Tancar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipus d'ítem és Article de Revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Sempre cert",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Processament automàtic",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI conté DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtre DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipus de document és conductor",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Té almenys un Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Té Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Té un Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Està arxivat",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Està retirat",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "L'ítem és públic",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestió de revistes",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El títol comença amb el patró",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipus és Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipus és Article de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Cap",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Panell de control",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Panell de control",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Panell de control de notificacions",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El panell de control de notificacions supervisa l'ús general del protocol COAR Notify a tot el repositori. A la pestanya “Mètriques” hi ha estadístiques sobre l'ús del protocol COAR Notify. A les pestanyes “Registres/Entrants” i “Registres/Sortints” és possible cercar i comprovar l'estat individual de cada missatge LDN, ja sigui rebut o enviat.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Mètriques",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Nombre de LDN rebuts",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Nombre de LDN generats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Acceptat",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificacions entrants acceptades",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Actualment mostrant: Notificacions acceptades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN processats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificacions entrants processades",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Actualment mostrant: LDN processats",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificacions entrants fallides",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificacions sortints fallides",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Actualment mostrant: Notificacions no fiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No fiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificacions entrants no fiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificacions entrants lliurades amb èxit",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Lliurat",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificacions sortints lliurades amb èxit",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Actualment mostrant: Notificacions en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificacions actualment en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cua",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Actualment mostrant: Notificacions en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificacions actualment en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionats amb notificacions entrants",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionats amb notificacions sortints",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Panell de control",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Missatges entrants",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Registres/Entrants",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtre: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionats",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servei LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificar Revisió",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificar Suport",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificar Relació",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de processament ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Rang mínim",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Rang màxim",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rang mínim",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rang màxim",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Missatges sortints",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Registres/Sortints",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrants",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionat",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servei LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Objectiu",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipus de notificació",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Cerca ítems relacionats",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Cerca estat de la cua",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Cerca objectiu",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Cerca tipus de flux d'activitat",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estat de la cua",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "IP no fiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cua",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Processant",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processat",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallat",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No fiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acció no mapejada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cua per reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipus de flux d'activitat",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipus de COAR Notify",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipus de notificació",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Cerca tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Cerca tipus de notificació",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionats",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Objectiu",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Cerca font",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Font",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Cerca Servei LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servei LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificació",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Cerca Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificar Relació",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Cerca Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificar Revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acció de revisió",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acció de suport",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acció d'ingestió",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acció de relació",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última cua iniciada Descendent",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última cua iniciada Ascendent",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Cua intentada Descendent",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Cua intentada Ascendent",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems implicats en LDN entrant",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems implicats en LDN sortint",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipus",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipus de COAR Notify",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipus de flux d'activitat",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En resposta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositori",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositori",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Cua d'intents",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vegada que es va iniciar la cua",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servei LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servei LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estat de la cua",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Temps d'espera de la cua",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detall del missatge",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar missatge",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de temps",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositori",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servei LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipus",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estat",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acció",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detall",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocessar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processat",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallat",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cua per reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acció no mapejada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Processant",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cua",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No fiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servei LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionat",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Cercar suport de notificació",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Llicència Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepte on s'indiqui el contrari, la llicència d'aquest ítem es descriu com",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Cerca al repositori",
+
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descarregar ",
+
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+
+}
\ No newline at end of file

From 496ce6450512d1b98e29f2226368b7c88771db00 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Thu, 31 Oct 2024 21:31:27 +0100
Subject: [PATCH 1028/1286] Add button to enable free-text editing in dropdown
 fields during item edition and fix error when clicking "Clear selection"
 option

(cherry picked from commit 28c8550ef5c23e0a6c3b08d274970e5522aecb4e)
---
 .../dso-edit-metadata-value.component.html    | 10 ++++-
 .../dso-edit-metadata-value.component.ts      | 37 ++++++++++++++++---
 src/assets/i18n/en.json5                      |  4 ++
 3 files changed, 44 insertions(+), 7 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 25b82b9b43..da6a00bf48 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,15 +3,21 @@
      [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 flex-column" *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 && (isAuthorityControlled() | async) !== true" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || enabledFreeTextEditing)" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing"
                                     [bindId]="mdField"
                                     [group]="group"
                                     [model]="getModel()"
                                     (change)="onChangeAuthorityField($event)">
     </ds-dynamic-scrollable-dropdown>
+    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+        [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
+        (click)="toggleFreeTextEdition()">
+    <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
+    {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
+    </button>
     <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
                       [group]="group"
                       [model]="getModel()"
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 11bbcfd9d5..69bdf41787 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
@@ -191,6 +191,12 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    */
   public editingAuthority = false;
 
+
+  /**
+   * Whether or not the free-text editing is enabled when scrollable dropdown vocabulary is used
+   */
+  public enabledFreeTextEditing = false;
+
   /**
    * Field group used by authority field
    * @type {UntypedFormGroup}
@@ -438,15 +444,23 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    * Process the change of authority field value updating the authority key and confidence as necessary
    */
   onChangeAuthorityField(event): void {
-    this.mdValue.newValue.value = event.value;
-    if (event.authority) {
-      this.mdValue.newValue.authority = event.authority;
-      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+    if (event) {
+      this.mdValue.newValue.value = event.value;
+      if (event.authority) {
+        this.mdValue.newValue.authority = event.authority;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+      } else {
+        this.mdValue.newValue.authority = null;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      }
+      this.confirm.emit(false);
     } else {
+      // The event is undefined when the user clears the selection in scrollable dropdown
+      this.mdValue.newValue.value = '';
       this.mdValue.newValue.authority = null;
       this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      this.confirm.emit(false);
     }
-    this.confirm.emit(false);
   }
 
   /**
@@ -480,4 +494,17 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
     }
   }
 
+  /**
+   * Toggles the free-text ediitng mode
+   */
+  toggleFreeTextEdition() {
+    if (this.enabledFreeTextEditing) {
+      if (this.getModel().value !== this.mdValue.newValue.value) {
+        // Reload the model to adapt it to the new possible value modified during free text editing
+        this.initAuthorityProperties();
+      }
+    }
+    this.enabledFreeTextEditing = !this.enabledFreeTextEditing;
+  }
+
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d279b666a2..ee9844070e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2406,6 +2406,10 @@
 
   "item.edit.metadata.edit.authority.key": "Edit authority key",
 
+  "item.edit.metadata.edit.buttons.enable-free-text-editing": "Enable free-text editing",
+
+  "item.edit.metadata.edit.buttons.disable-free-text-editing": "Disable free-text editing",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",

From 08257cb9f241e5454a25e9dd938600e7896f398b Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Tue, 5 Nov 2024 22:01:05 +0100
Subject: [PATCH 1029/1286] Allow free-text editing for hierarchical vocabulary
 fields as well

(cherry picked from commit 67f9623cf4878bdc33e60b952cea1e5e0f89418a)
---
 .../dso-edit-metadata-value.component.html         | 14 +++++++-------
 .../dso-edit-metadata-value.component.ts           |  2 +-
 2 files changed, 8 insertions(+), 8 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 da6a00bf48..f3bbef3a4d 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 flex-column" *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 && ((isAuthorityControlled() | async) !== true || enabledFreeTextEditing)" [(ngModel)]="mdValue.newValue.value"
+    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
     <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing"
@@ -12,17 +12,17 @@
                                     [model]="getModel()"
                                     (change)="onChangeAuthorityField($event)">
     </ds-dynamic-scrollable-dropdown>
-    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+    <ds-dynamic-onebox *ngIf="mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))"
+                      [group]="group"
+                      [model]="getModel()"
+                      (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-onebox>
+    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))"
         [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
         (click)="toggleFreeTextEdition()">
     <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
     {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
     </button>
-    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
-                      [group]="group"
-                      [model]="getModel()"
-                      (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-onebox>
     <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
       <span class="badge badge-light border" >
         <i dsAuthorityConfidenceState
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 69bdf41787..12c2dce966 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
@@ -193,7 +193,7 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
 
 
   /**
-   * Whether or not the free-text editing is enabled when scrollable dropdown vocabulary is used
+   * Whether or not the free-text editing is enabled when scrollable dropdown or hierarchical vocabulary is used
    */
   public enabledFreeTextEditing = false;
 

From f52aac879aa259afb6a28e7afd3db473646e15c9 Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:17:08 -0600
Subject: [PATCH 1030/1286] Change - Metadata field selector, add infinite
 scroll for data paginated (#3096)

* Change - Metadata field selector add infinite scroll for data paginated

* Update change on new BRANCH

* Fix - LINT ERRORS

* Fix - LINT ERRORS
---
 .../metadata-field-selector.component.html    |  29 ++++-
 .../metadata-field-selector.component.scss    |   5 +
 .../metadata-field-selector.component.spec.ts |   9 +-
 .../metadata-field-selector.component.ts      | 119 +++++++++++++-----
 4 files changed, 124 insertions(+), 38 deletions(-)

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 3f5af76051..a82f31b953 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,13 +6,30 @@
          [formControl]="input"
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();" />
+         (click)="$event.stopPropagation();"
+         (keyup)="this.selectedValueLoading = false"
+  />
   <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)">
-        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
-          <span [innerHTML]="mdFieldOption"></span>
+  <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div  class="dropdown-list">
+      <div
+        infiniteScroll
+        [infiniteScrollDistance]="1"
+        [infiniteScrollThrottle]="0"
+        [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
+        [fromRoot]="true"
+        (scrolled)="onScrollDown()">
+        <ng-container *ngIf="mdFieldOptions$ | async">
+          <button *ngFor="let listEntry of (mdFieldOptions$ | async)"
+                  class="d-block dropdown-item"
+                  dsHoverClass="ds-hover"
+                  (click)="select(listEntry)" #listEntryElement>
+            <span [innerHTML]="listEntry"></span>
+          </button>
+        </ng-container>
+        <button *ngIf="loading"
+                class="list-group-item list-group-item-action border-0 list-entry">
+          <ds-loading [showMessage]="false"></ds-loading>
         </button>
       </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
index e69de29bb2..e4c20f130d 100644
--- 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
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dso-selector-list-max-height);
+  overflow: scroll;
+}
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 3342cec154..198a6f102d 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
@@ -39,7 +39,8 @@ describe('MetadataFieldSelectorComponent', () => {
     metadataSchema = Object.assign(new MetadataSchema(), {
       id: 0,
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+      namespace: 'https://schema.org/CreativeWork',
+      field: '.',
     });
     metadataFields = [
       Object.assign(new MetadataField(), {
@@ -78,10 +79,10 @@ describe('MetadataFieldSelectorComponent', () => {
   });
 
   describe('when a query is entered', () => {
-    const query = 'test query';
+    const query = 'dc.d';
 
     beforeEach(() => {
-      component.showInvalid = true;
+      component.showInvalid = false;
       component.query$.next(query);
     });
 
@@ -90,7 +91,7 @@ describe('MetadataFieldSelectorComponent', () => {
     });
 
     it('should query the registry service for metadata fields and include the schema', () => {
-      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema'));
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC), currentPage: 1 }, true, false, followLink('schema'));
     });
   });
 
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 87dfe2200c..abdf2f14d8 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
@@ -24,16 +24,18 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   BehaviorSubject,
+  combineLatest as observableCombineLatest,
   Observable,
   of,
   Subscription,
 } from 'rxjs';
 import {
   debounceTime,
-  distinctUntilChanged,
   map,
+  startWith,
   switchMap,
   take,
   tap,
@@ -50,6 +52,7 @@ import {
   metadataFieldsToString,
 } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ClickOutsideDirective } from '../../../shared/utils/click-outside.directive';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -59,7 +62,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
 })
 /**
  * Component displaying a searchable input for metadata-fields
@@ -96,7 +99,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * 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[]>;
+  mdFieldOptions$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * FormControl for the input
@@ -131,6 +134,30 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not new results are currently loading
+   */
+  loading = false;
+
+  /**
+   * Default page option for this feature
+   */
+  pageOptions = { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC) };
+
+
   constructor(protected registryService: RegistryService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
@@ -141,32 +168,33 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Update the mdFieldOptions$ depending on the query$ fired by querying the server
    */
   ngOnInit(): void {
+    this.subs.push(this.input.valueChanges.pipe(
+      debounceTime(this.debounceTime),
+      startWith(''),
+    ).subscribe((valueChange) => {
+      this.currentPage$.next(1);
+      if (!this.selectedValueLoading) {
+        this.query$.next(valueChange);
+      }
+      this.mdField = valueChange;
+      this.mdFieldChange.emit(this.mdField);
+    }));
     this.subs.push(
-      this.input.valueChanges.pipe(
-        debounceTime(this.debounceTime),
-      ).subscribe((valueChange) => {
-        if (!this.selectedValueLoading) {
-          this.query$.next(valueChange);
-        }
-        this.selectedValueLoading = false;
-        this.mdField = valueChange;
-        this.mdFieldChange.emit(this.mdField);
-      }),
-    );
-    this.mdFieldOptions$ = this.query$.pipe(
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        this.showInvalid = false;
-        if (query !== null) {
-          return this.registryService.queryMetadataFields(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema')).pipe(
-            getAllSucceededRemoteData(),
-            metadataFieldsToString(),
-          );
-        } else {
-          return [[]];
-        }
-      }),
-    );
+      observableCombineLatest(
+        this.query$,
+        this.currentPage$,
+      )
+        .pipe(
+          switchMap(([query, page]: [string, number]) => {
+            this.loading = true;
+            if (page === 1) {
+              this.mdFieldOptions$.next([]);
+            }
+            return this.search(query as string, page as number);
+          }),
+        ).subscribe((rd ) => {
+          if (!this.selectedValueLoading) {this.updateList(rd);}
+        }));
   }
 
   /**
@@ -210,6 +238,41 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     this.input.setValue(mdFieldOption);
   }
 
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage && !this.loading) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
+  }
+
+  /**
+   * @Description It update the mdFieldOptions$ according the query result page
+   * */
+  updateList(list: string[]) {
+    this.loading = false;
+    this.hasNextPage = list.length > 0;
+    const currentEntries = this.mdFieldOptions$.getValue();
+    this.mdFieldOptions$.next([...currentEntries, ...list]);
+    this.selectedValueLoading = false;
+  }
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true)  {
+    return this.registryService.queryMetadataFields(query,{
+      elementsPerPage: this.pageOptions.elementsPerPage, sort: this.pageOptions.sort,
+      currentPage: page }, useCache, false, followLink('schema'))
+      .pipe(
+        getAllSucceededRemoteData(),
+        metadataFieldsToString(),
+      );
+  }
   /**
    * Unsubscribe from any open subscriptions
    */

From eaa239c7643569209de39d1d0cac421711e7d58d Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:17:08 -0600
Subject: [PATCH 1031/1286] Change - Metadata field selector, add infinite
 scroll for data paginated (#3096)

* Change - Metadata field selector add infinite scroll for data paginated

* Update change on new BRANCH

* Fix - LINT ERRORS

* Fix - LINT ERRORS
---
 .../metadata-field-selector.component.html    |  29 ++++-
 .../metadata-field-selector.component.scss    |   5 +
 .../metadata-field-selector.component.spec.ts |   9 +-
 .../metadata-field-selector.component.ts      | 119 +++++++++++++-----
 4 files changed, 124 insertions(+), 38 deletions(-)

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 3f5af76051..a82f31b953 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,13 +6,30 @@
          [formControl]="input"
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();" />
+         (click)="$event.stopPropagation();"
+         (keyup)="this.selectedValueLoading = false"
+  />
   <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)">
-        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
-          <span [innerHTML]="mdFieldOption"></span>
+  <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div  class="dropdown-list">
+      <div
+        infiniteScroll
+        [infiniteScrollDistance]="1"
+        [infiniteScrollThrottle]="0"
+        [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
+        [fromRoot]="true"
+        (scrolled)="onScrollDown()">
+        <ng-container *ngIf="mdFieldOptions$ | async">
+          <button *ngFor="let listEntry of (mdFieldOptions$ | async)"
+                  class="d-block dropdown-item"
+                  dsHoverClass="ds-hover"
+                  (click)="select(listEntry)" #listEntryElement>
+            <span [innerHTML]="listEntry"></span>
+          </button>
+        </ng-container>
+        <button *ngIf="loading"
+                class="list-group-item list-group-item-action border-0 list-entry">
+          <ds-loading [showMessage]="false"></ds-loading>
         </button>
       </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
index e69de29bb2..e4c20f130d 100644
--- 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
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dso-selector-list-max-height);
+  overflow: scroll;
+}
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 3342cec154..198a6f102d 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
@@ -39,7 +39,8 @@ describe('MetadataFieldSelectorComponent', () => {
     metadataSchema = Object.assign(new MetadataSchema(), {
       id: 0,
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+      namespace: 'https://schema.org/CreativeWork',
+      field: '.',
     });
     metadataFields = [
       Object.assign(new MetadataField(), {
@@ -78,10 +79,10 @@ describe('MetadataFieldSelectorComponent', () => {
   });
 
   describe('when a query is entered', () => {
-    const query = 'test query';
+    const query = 'dc.d';
 
     beforeEach(() => {
-      component.showInvalid = true;
+      component.showInvalid = false;
       component.query$.next(query);
     });
 
@@ -90,7 +91,7 @@ describe('MetadataFieldSelectorComponent', () => {
     });
 
     it('should query the registry service for metadata fields and include the schema', () => {
-      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema'));
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC), currentPage: 1 }, true, false, followLink('schema'));
     });
   });
 
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 87dfe2200c..abdf2f14d8 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
@@ -24,16 +24,18 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   BehaviorSubject,
+  combineLatest as observableCombineLatest,
   Observable,
   of,
   Subscription,
 } from 'rxjs';
 import {
   debounceTime,
-  distinctUntilChanged,
   map,
+  startWith,
   switchMap,
   take,
   tap,
@@ -50,6 +52,7 @@ import {
   metadataFieldsToString,
 } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ClickOutsideDirective } from '../../../shared/utils/click-outside.directive';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -59,7 +62,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
 })
 /**
  * Component displaying a searchable input for metadata-fields
@@ -96,7 +99,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * 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[]>;
+  mdFieldOptions$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * FormControl for the input
@@ -131,6 +134,30 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not new results are currently loading
+   */
+  loading = false;
+
+  /**
+   * Default page option for this feature
+   */
+  pageOptions = { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC) };
+
+
   constructor(protected registryService: RegistryService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
@@ -141,32 +168,33 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Update the mdFieldOptions$ depending on the query$ fired by querying the server
    */
   ngOnInit(): void {
+    this.subs.push(this.input.valueChanges.pipe(
+      debounceTime(this.debounceTime),
+      startWith(''),
+    ).subscribe((valueChange) => {
+      this.currentPage$.next(1);
+      if (!this.selectedValueLoading) {
+        this.query$.next(valueChange);
+      }
+      this.mdField = valueChange;
+      this.mdFieldChange.emit(this.mdField);
+    }));
     this.subs.push(
-      this.input.valueChanges.pipe(
-        debounceTime(this.debounceTime),
-      ).subscribe((valueChange) => {
-        if (!this.selectedValueLoading) {
-          this.query$.next(valueChange);
-        }
-        this.selectedValueLoading = false;
-        this.mdField = valueChange;
-        this.mdFieldChange.emit(this.mdField);
-      }),
-    );
-    this.mdFieldOptions$ = this.query$.pipe(
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        this.showInvalid = false;
-        if (query !== null) {
-          return this.registryService.queryMetadataFields(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema')).pipe(
-            getAllSucceededRemoteData(),
-            metadataFieldsToString(),
-          );
-        } else {
-          return [[]];
-        }
-      }),
-    );
+      observableCombineLatest(
+        this.query$,
+        this.currentPage$,
+      )
+        .pipe(
+          switchMap(([query, page]: [string, number]) => {
+            this.loading = true;
+            if (page === 1) {
+              this.mdFieldOptions$.next([]);
+            }
+            return this.search(query as string, page as number);
+          }),
+        ).subscribe((rd ) => {
+          if (!this.selectedValueLoading) {this.updateList(rd);}
+        }));
   }
 
   /**
@@ -210,6 +238,41 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     this.input.setValue(mdFieldOption);
   }
 
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage && !this.loading) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
+  }
+
+  /**
+   * @Description It update the mdFieldOptions$ according the query result page
+   * */
+  updateList(list: string[]) {
+    this.loading = false;
+    this.hasNextPage = list.length > 0;
+    const currentEntries = this.mdFieldOptions$.getValue();
+    this.mdFieldOptions$.next([...currentEntries, ...list]);
+    this.selectedValueLoading = false;
+  }
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true)  {
+    return this.registryService.queryMetadataFields(query,{
+      elementsPerPage: this.pageOptions.elementsPerPage, sort: this.pageOptions.sort,
+      currentPage: page }, useCache, false, followLink('schema'))
+      .pipe(
+        getAllSucceededRemoteData(),
+        metadataFieldsToString(),
+      );
+  }
   /**
    * Unsubscribe from any open subscriptions
    */

From c5f07daab741bd4a4affc8e2325bc0de4475eee2 Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:35:41 -0600
Subject: [PATCH 1032/1286] Fix for User profile (/profile): only 20 group
 memberships shown instead of all (#3105)

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Fix UPDATE - Add pagination message error and loader

* Update BRANCH

* Fix - LINT ERRORS

* Fix: Error declaring variable for group pagination

* Fix: Remove unnecessary translations for paging groups

* Fix: Lint erros

* Fix: Remove unnecessary translations

---------

Co-authored-by: VictorDuranEscire <victor@escire.lat>
---
 .../profile-page/profile-page.component.html  | 30 ++++++++++++----
 .../profile-page.component.spec.ts            |  8 +++++
 .../profile-page/profile-page.component.ts    | 34 ++++++++++++++++++-
 src/assets/i18n/en.json5                      |  2 ++
 .../profile-page/profile-page.component.ts    |  6 ++++
 5 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 3dc7c9d489..d56c4b10f3 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -33,13 +33,29 @@
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
-    <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
-      <div *ngIf="groups?.length > 0">
-        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-        </ul>
-      </div>
+    <ng-container *ngIf="(groupsRD$ | async) as groupsRD;">
+      <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+      <ng-template #content>
+        <ds-pagination *ngIf="groupsRD?.payload"
+                       [hideGear]="true"
+                       [hidePagerWhenSinglePage]="true"
+                       [hidePaginationDetail]="true"
+                       [paginationOptions]="optionsGroupsPagination"
+                       [collectionSize]="groupsRD?.payload?.totalElements">
+          <ng-container *ngIf="groupsRD?.payload?.page as groups">
+            <div *ngIf="groups?.length > 0">
+              <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+              <ul class="list-group list-group-flush">
+                <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+              </ul>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </ng-template>
+      <ng-template #loader>
+        <ds-loading [showMessage]="false"></ds-loading>
+      </ng-template>
+      <ds-error *ngIf="groupsRD?.hasFailed" message="{{ 'error.profile-groups' | translate }}"></ds-error>
     </ng-container>
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 82a0a9d67b..ebd3939432 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -1,3 +1,4 @@
+import { NgTemplateOutlet } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,7 +30,10 @@ import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$,
@@ -134,6 +138,10 @@ describe('ProfilePageComponent', () => {
             ProfilePageSecurityFormComponent,
             ProfilePageResearcherFormComponent,
             SuggestionsNotificationComponent,
+            NgTemplateOutlet,
+            PaginationComponent,
+            ThemedLoadingComponent,
+            ErrorComponent,
           ],
         },
       })
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 75760105e0..a8ac070e70 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -2,6 +2,7 @@ import {
   AsyncPipe,
   NgForOf,
   NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import {
   Component,
@@ -33,8 +34,10 @@ import { RemoteData } from '../core/data/remote-data';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { Group } from '../core/eperson/models/group.model';
+import { PaginationService } from '../core/pagination/pagination.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import {
+  getAllCompletedRemoteData,
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
@@ -44,7 +47,11 @@ import {
   hasValue,
   isNotEmpty,
 } from '../shared/empty.util';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { VarDirective } from '../shared/utils/var.directive';
 import { ThemedProfilePageMetadataFormComponent } from './profile-page-metadata-form/themed-profile-page-metadata-form.component';
@@ -65,6 +72,10 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
   standalone: true,
 })
@@ -122,6 +133,15 @@ export class ProfilePageComponent implements OnInit {
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
 
+  /**
+   * Default configuration for group pagination
+   **/
+  optionsGroupsPagination = Object.assign(new PaginationComponentOptions(),{
+    id: 'page_groups',
+    currentPage: 1,
+    pageSize: 20,
+  });
+
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private authService: AuthService,
@@ -131,6 +151,7 @@ export class ProfilePageComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private configurationService: ConfigurationDataService,
               public dsoNameService: DSONameService,
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -142,7 +163,18 @@ export class ProfilePageComponent implements OnInit {
       getRemoteDataPayload(),
       tap((user: EPerson) => this.currentUser = user),
     );
-    this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
+    this.groupsRD$ = this.paginationService.getCurrentPagination(this.optionsGroupsPagination.id, this.optionsGroupsPagination).pipe(
+      switchMap((pageOptions: PaginationComponentOptions) => {
+        return this.epersonService.findById(this.currentUser.id, true, true, followLink('groups',{
+          findListOptions: {
+            elementsPerPage: pageOptions.pageSize,
+            currentPage: pageOptions.currentPage,
+          } }));
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((user: EPerson) => user?.groups),
+    );
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ade0e080f1..8c71e9b739 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1844,6 +1844,8 @@
 
   "error.recent-submissions": "Error fetching recent submissions",
 
+  "error.profile-groups": "Error retrieving profile groups",
+
   "error.search-results": "Error fetching search results",
 
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index 74a88fdba6..e810ca09da 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -11,6 +11,9 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
 import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component';
 import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { ErrorComponent } from '../../../../app/shared/error/error.component';
+import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component';
+import { PaginationComponent } from '../../../../app/shared/pagination/pagination.component';
 import { VarDirective } from '../../../../app/shared/utils/var.directive';
 
 @Component({
@@ -30,6 +33,9 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
 })
 /**

From 05d5a0816d121c31c73edb606edb4f8c5aed9b83 Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:17:08 -0600
Subject: [PATCH 1033/1286] Change - Metadata field selector, add infinite
 scroll for data paginated (#3096)

* Change - Metadata field selector add infinite scroll for data paginated

* Update change on new BRANCH

* Fix - LINT ERRORS

* Fix - LINT ERRORS
---
 .../metadata-field-selector.component.html    |  29 +++-
 .../metadata-field-selector.component.scss    |   5 +
 .../metadata-field-selector.component.spec.ts |   9 +-
 .../metadata-field-selector.component.ts      | 127 +++++++++++++-----
 4 files changed, 128 insertions(+), 42 deletions(-)

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 3f5af76051..a82f31b953 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,13 +6,30 @@
          [formControl]="input"
          (focusin)="query$.next(mdField)"
          (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();" />
+         (click)="$event.stopPropagation();"
+         (keyup)="this.selectedValueLoading = false"
+  />
   <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)">
-        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
-          <span [innerHTML]="mdFieldOption"></span>
+  <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div  class="dropdown-list">
+      <div
+        infiniteScroll
+        [infiniteScrollDistance]="1"
+        [infiniteScrollThrottle]="0"
+        [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
+        [fromRoot]="true"
+        (scrolled)="onScrollDown()">
+        <ng-container *ngIf="mdFieldOptions$ | async">
+          <button *ngFor="let listEntry of (mdFieldOptions$ | async)"
+                  class="d-block dropdown-item"
+                  dsHoverClass="ds-hover"
+                  (click)="select(listEntry)" #listEntryElement>
+            <span [innerHTML]="listEntry"></span>
+          </button>
+        </ng-container>
+        <button *ngIf="loading"
+                class="list-group-item list-group-item-action border-0 list-entry">
+          <ds-loading [showMessage]="false"></ds-loading>
         </button>
       </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
index e69de29bb2..e4c20f130d 100644
--- 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
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dso-selector-list-max-height);
+  overflow: scroll;
+}
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 de8736df94..999012a7fe 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
@@ -28,7 +28,8 @@ describe('MetadataFieldSelectorComponent', () => {
     metadataSchema = Object.assign(new MetadataSchema(), {
       id: 0,
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+      namespace: 'https://schema.org/CreativeWork',
+      field: '.',
     });
     metadataFields = [
       Object.assign(new MetadataField(), {
@@ -68,10 +69,10 @@ describe('MetadataFieldSelectorComponent', () => {
   });
 
   describe('when a query is entered', () => {
-    const query = 'test query';
+    const query = 'dc.d';
 
     beforeEach(() => {
-      component.showInvalid = true;
+      component.showInvalid = false;
       component.query$.next(query);
     });
 
@@ -80,7 +81,7 @@ describe('MetadataFieldSelectorComponent', () => {
     });
 
     it('should query the registry service for metadata fields and include the schema', () => {
-      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema'));
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC), currentPage: 1 }, true, false, followLink('schema'));
     });
   });
 
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 fc0d57046d..ec9ebabcf9 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
@@ -9,20 +9,23 @@ import {
   Output,
   ViewChild
 } from '@angular/core';
-import { debounceTime, distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators';
+import { debounceTime, map, startWith, switchMap, take, tap } from 'rxjs/operators';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   metadataFieldsToString
 } from '../../../core/shared/operators';
-import { Observable } from 'rxjs/internal/Observable';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { UntypedFormControl } 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';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
@@ -30,7 +33,7 @@ import { SortDirection, SortOptions } from '../../../core/cache/models/sort-opti
 @Component({
   selector: 'ds-metadata-field-selector',
   styleUrls: ['./metadata-field-selector.component.scss'],
-  templateUrl: './metadata-field-selector.component.html'
+  templateUrl: './metadata-field-selector.component.html',
 })
 /**
  * Component displaying a searchable input for metadata-fields
@@ -67,7 +70,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * 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[]>;
+  mdFieldOptions$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * FormControl for the input
@@ -102,6 +105,30 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not new results are currently loading
+   */
+  loading = false;
+
+  /**
+   * Default page option for this feature
+   */
+  pageOptions = { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC) };
+
+
   constructor(protected registryService: RegistryService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
@@ -112,32 +139,33 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Update the mdFieldOptions$ depending on the query$ fired by querying the server
    */
   ngOnInit(): void {
+    this.subs.push(this.input.valueChanges.pipe(
+      debounceTime(this.debounceTime),
+      startWith(''),
+    ).subscribe((valueChange) => {
+      this.currentPage$.next(1);
+      if (!this.selectedValueLoading) {
+        this.query$.next(valueChange);
+      }
+      this.mdField = valueChange;
+      this.mdFieldChange.emit(this.mdField);
+    }));
     this.subs.push(
-      this.input.valueChanges.pipe(
-        debounceTime(this.debounceTime),
-      ).subscribe((valueChange) => {
-        if (!this.selectedValueLoading) {
-          this.query$.next(valueChange);
-        }
-        this.selectedValueLoading = false;
-        this.mdField = valueChange;
-        this.mdFieldChange.emit(this.mdField);
-      }),
-    );
-    this.mdFieldOptions$ = this.query$.pipe(
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        this.showInvalid = false;
-        if (query !== null) {
-          return this.registryService.queryMetadataFields(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema')).pipe(
-            getAllSucceededRemoteData(),
-            metadataFieldsToString(),
-          );
-        } else {
-          return [[]];
-        }
-      }),
-    );
+      observableCombineLatest(
+        this.query$,
+        this.currentPage$,
+      )
+        .pipe(
+          switchMap(([query, page]: [string, number]) => {
+            this.loading = true;
+            if (page === 1) {
+              this.mdFieldOptions$.next([]);
+            }
+            return this.search(query as string, page as number);
+          }),
+        ).subscribe((rd ) => {
+          if (!this.selectedValueLoading) {this.updateList(rd);}
+        }));
   }
 
   /**
@@ -181,6 +209,41 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     this.input.setValue(mdFieldOption);
   }
 
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage && !this.loading) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
+  }
+
+  /**
+   * @Description It update the mdFieldOptions$ according the query result page
+   * */
+  updateList(list: string[]) {
+    this.loading = false;
+    this.hasNextPage = list.length > 0;
+    const currentEntries = this.mdFieldOptions$.getValue();
+    this.mdFieldOptions$.next([...currentEntries, ...list]);
+    this.selectedValueLoading = false;
+  }
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true)  {
+    return this.registryService.queryMetadataFields(query,{
+      elementsPerPage: this.pageOptions.elementsPerPage, sort: this.pageOptions.sort,
+      currentPage: page }, useCache, false, followLink('schema'))
+      .pipe(
+        getAllSucceededRemoteData(),
+        metadataFieldsToString(),
+      );
+  }
   /**
    * Unsubscribe from any open subscriptions
    */

From 87125043769bd9140901670370cc22ef859209e0 Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:35:41 -0600
Subject: [PATCH 1034/1286] Fix for User profile (/profile): only 20 group
 memberships shown instead of all (#3105)

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Fix UPDATE - Add pagination message error and loader

* Update BRANCH

* Fix - LINT ERRORS

* Fix: Error declaring variable for group pagination

* Fix: Remove unnecessary translations for paging groups

* Fix: Lint erros

* Fix: Remove unnecessary translations

---------

Co-authored-by: VictorDuranEscire <victor@escire.lat>
---
 .../profile-page/profile-page.component.html  | 30 ++++++++++++----
 .../profile-page.component.spec.ts            |  8 +++++
 .../profile-page/profile-page.component.ts    | 34 ++++++++++++++++++-
 src/assets/i18n/en.json5                      |  2 ++
 .../profile-page/profile-page.component.ts    |  6 ++++
 5 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 3dc7c9d489..d56c4b10f3 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -33,13 +33,29 @@
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
-    <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
-      <div *ngIf="groups?.length > 0">
-        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-        </ul>
-      </div>
+    <ng-container *ngIf="(groupsRD$ | async) as groupsRD;">
+      <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+      <ng-template #content>
+        <ds-pagination *ngIf="groupsRD?.payload"
+                       [hideGear]="true"
+                       [hidePagerWhenSinglePage]="true"
+                       [hidePaginationDetail]="true"
+                       [paginationOptions]="optionsGroupsPagination"
+                       [collectionSize]="groupsRD?.payload?.totalElements">
+          <ng-container *ngIf="groupsRD?.payload?.page as groups">
+            <div *ngIf="groups?.length > 0">
+              <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+              <ul class="list-group list-group-flush">
+                <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+              </ul>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </ng-template>
+      <ng-template #loader>
+        <ds-loading [showMessage]="false"></ds-loading>
+      </ng-template>
+      <ds-error *ngIf="groupsRD?.hasFailed" message="{{ 'error.profile-groups' | translate }}"></ds-error>
     </ng-container>
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 82a0a9d67b..ebd3939432 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -1,3 +1,4 @@
+import { NgTemplateOutlet } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,7 +30,10 @@ import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$,
@@ -134,6 +138,10 @@ describe('ProfilePageComponent', () => {
             ProfilePageSecurityFormComponent,
             ProfilePageResearcherFormComponent,
             SuggestionsNotificationComponent,
+            NgTemplateOutlet,
+            PaginationComponent,
+            ThemedLoadingComponent,
+            ErrorComponent,
           ],
         },
       })
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 75760105e0..a8ac070e70 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -2,6 +2,7 @@ import {
   AsyncPipe,
   NgForOf,
   NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import {
   Component,
@@ -33,8 +34,10 @@ import { RemoteData } from '../core/data/remote-data';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { Group } from '../core/eperson/models/group.model';
+import { PaginationService } from '../core/pagination/pagination.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import {
+  getAllCompletedRemoteData,
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
@@ -44,7 +47,11 @@ import {
   hasValue,
   isNotEmpty,
 } from '../shared/empty.util';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { VarDirective } from '../shared/utils/var.directive';
 import { ThemedProfilePageMetadataFormComponent } from './profile-page-metadata-form/themed-profile-page-metadata-form.component';
@@ -65,6 +72,10 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
   standalone: true,
 })
@@ -122,6 +133,15 @@ export class ProfilePageComponent implements OnInit {
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
 
+  /**
+   * Default configuration for group pagination
+   **/
+  optionsGroupsPagination = Object.assign(new PaginationComponentOptions(),{
+    id: 'page_groups',
+    currentPage: 1,
+    pageSize: 20,
+  });
+
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private authService: AuthService,
@@ -131,6 +151,7 @@ export class ProfilePageComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private configurationService: ConfigurationDataService,
               public dsoNameService: DSONameService,
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -142,7 +163,18 @@ export class ProfilePageComponent implements OnInit {
       getRemoteDataPayload(),
       tap((user: EPerson) => this.currentUser = user),
     );
-    this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
+    this.groupsRD$ = this.paginationService.getCurrentPagination(this.optionsGroupsPagination.id, this.optionsGroupsPagination).pipe(
+      switchMap((pageOptions: PaginationComponentOptions) => {
+        return this.epersonService.findById(this.currentUser.id, true, true, followLink('groups',{
+          findListOptions: {
+            elementsPerPage: pageOptions.pageSize,
+            currentPage: pageOptions.currentPage,
+          } }));
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((user: EPerson) => user?.groups),
+    );
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ee9844070e..7d07f070ec 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1852,6 +1852,8 @@
 
   "error.recent-submissions": "Error fetching recent submissions",
 
+  "error.profile-groups": "Error retrieving profile groups",
+
   "error.search-results": "Error fetching search results",
 
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index 74a88fdba6..e810ca09da 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -11,6 +11,9 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
 import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component';
 import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { ErrorComponent } from '../../../../app/shared/error/error.component';
+import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component';
+import { PaginationComponent } from '../../../../app/shared/pagination/pagination.component';
 import { VarDirective } from '../../../../app/shared/utils/var.directive';
 
 @Component({
@@ -30,6 +33,9 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
 })
 /**

From 112bed787af3b24d130f2ced0be96a0a3c917118 Mon Sep 17 00:00:00 2001
From: VictorHugoDuranS <victorhugodurans@gmail.com>
Date: Fri, 10 Jan 2025 15:35:41 -0600
Subject: [PATCH 1035/1286] Fix for User profile (/profile): only 20 group
 memberships shown instead of all (#3105)

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Add - groups paginated on profile page

* Fix UPDATE - Add pagination message error and loader

* Update BRANCH

* Fix - LINT ERRORS

* Fix: Error declaring variable for group pagination

* Fix: Remove unnecessary translations for paging groups

* Fix: Lint erros

* Fix: Remove unnecessary translations

---------

Co-authored-by: VictorDuranEscire <victor@escire.lat>
---
 .../profile-page/profile-page.component.html  | 30 +++++++++++++----
 .../profile-page/profile-page.component.ts    | 32 +++++++++++++++++--
 src/assets/i18n/en.json5                      |  2 ++
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index e2769b38ec..29ccefa209 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -32,13 +32,29 @@
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
-    <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
-      <div *ngIf="groups?.length > 0">
-        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-        </ul>
-      </div>
+    <ng-container *ngIf="(groupsRD$ | async) as groupsRD;">
+      <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+      <ng-template #content>
+        <ds-pagination *ngIf="groupsRD?.payload"
+                       [hideGear]="true"
+                       [hidePagerWhenSinglePage]="true"
+                       [hidePaginationDetail]="true"
+                       [paginationOptions]="optionsGroupsPagination"
+                       [collectionSize]="groupsRD?.payload?.totalElements">
+          <ng-container *ngIf="groupsRD?.payload?.page as groups">
+            <div *ngIf="groups?.length > 0">
+              <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+              <ul class="list-group list-group-flush">
+                <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+              </ul>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </ng-template>
+      <ng-template #loader>
+        <ds-loading [showMessage]="false"></ds-loading>
+      </ng-template>
+      <ds-error *ngIf="groupsRD?.hasFailed" message="{{ 'error.profile-groups' | translate }}"></ds-error>
     </ng-container>
 
     <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 6e693461d2..f8cb30a447 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -9,7 +9,12 @@ import { RemoteData } from '../core/data/remote-data';
 import { PaginatedList } from '../core/data/paginated-list.model';
 import { filter, switchMap, tap } from 'rxjs/operators';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData, getRemoteDataPayload } from '../core/shared/operators';
+import {
+  getAllCompletedRemoteData,
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload
+} from '../core/shared/operators';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { AuthService } from '../core/auth/auth.service';
@@ -19,6 +24,8 @@ import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-profile-page',
@@ -79,6 +86,15 @@ export class ProfilePageComponent implements OnInit {
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
 
+  /**
+   * Default configuration for group pagination
+   **/
+  optionsGroupsPagination = Object.assign(new PaginationComponentOptions(),{
+    id: 'page_groups',
+    currentPage: 1,
+    pageSize: 20,
+  });
+
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private authService: AuthService,
@@ -88,6 +104,7 @@ export class ProfilePageComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private configurationService: ConfigurationDataService,
               public dsoNameService: DSONameService,
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -99,7 +116,18 @@ export class ProfilePageComponent implements OnInit {
       getRemoteDataPayload(),
       tap((user: EPerson) => this.currentUser = user)
     );
-    this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
+    this.groupsRD$ = this.paginationService.getCurrentPagination(this.optionsGroupsPagination.id, this.optionsGroupsPagination).pipe(
+      switchMap((pageOptions: PaginationComponentOptions) => {
+        return this.epersonService.findById(this.currentUser.id, true, true, followLink('groups',{
+          findListOptions: {
+            elementsPerPage: pageOptions.pageSize,
+            currentPage: pageOptions.currentPage,
+          } }));
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((user: EPerson) => user?.groups),
+    );
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a56f1cd4f2..f53670c4e3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1622,6 +1622,8 @@
 
   "error.recent-submissions": "Error fetching recent submissions",
 
+  "error.profile-groups": "Error retrieving profile groups",
+
   "error.search-results": "Error fetching search results",
 
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",

From a57fd1a069a32375b4e5177969c076e93537657a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:39:03 +0000
Subject: [PATCH 1036/1286] Bump sass from 1.80.6 to 1.83.1 in the sass group
 across 1 directory

Bumps the sass group with 1 update in the / directory: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.6 to 1.83.1
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.83.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index 15b2bb9779..8929f9ddb1 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.6",
+    "sass": "~1.83.1",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 63a2fbbba5..89561983f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6620,6 +6620,11 @@ immutable@^4.0.0:
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
   integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
 
+immutable@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1"
+  integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
@@ -10235,13 +10240,13 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.6:
-  version "1.80.6"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.6.tgz#5d0aa55763984effe41e40019c9571ab73e6851f"
-  integrity sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==
+sass@^1.25.0, sass@~1.83.1:
+  version "1.83.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
+  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
   optionalDependencies:
     "@parcel/watcher" "^2.4.1"

From 3c16537fe46a0d9eeeec5eb7fe8438aeb3399442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 02:39:41 +0000
Subject: [PATCH 1037/1286] Bump express from 4.21.1 to 4.21.2

Bumps [express](https://github.com/expressjs/express) from 4.21.1 to 4.21.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package.json b/package.json
index 15b2bb9779..483358b029 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 63a2fbbba5..e9c821cb60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5617,10 +5617,10 @@ express-static-gzip@^2.2.0:
     parseurl "^1.3.3"
     serve-static "^1.16.2"
 
-express@^4.17.3, express@^4.18.2, express@^4.21.1:
-  version "4.21.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
-  integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
+express@^4.17.3, express@^4.18.2, express@^4.21.2:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
@@ -5641,7 +5641,7 @@ express@^4.17.3, express@^4.18.2, express@^4.21.1:
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.10"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
     qs "6.13.0"
     range-parser "~1.2.1"
@@ -9022,10 +9022,10 @@ path-scurry@^1.6.1:
     lru-cache "^9.0.0"
     minipass "^5.0.0"
 
-path-to-regexp@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
-  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -10807,20 +10807,20 @@ statuses@2.0.1:
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2", statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"
   integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
-statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"

From ccdf5498d82ecd8d5a05ac4ab679f5a9efa26eff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:07:14 +0000
Subject: [PATCH 1038/1286] Bump sass from 1.80.6 to 1.83.1 in the sass group
 across 1 directory

Bumps the sass group with 1 update in the / directory: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.6 to 1.83.1
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.83.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index f63be88170..557f4627e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.80.6",
+        "sass": "~1.83.1",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -20456,13 +20456,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.80.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
-      "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
+      "version": "1.83.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
+      "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
       "dev": true,
       "dependencies": {
         "chokidar": "^4.0.0",
-        "immutable": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -20625,9 +20625,9 @@
       }
     },
     "node_modules/sass/node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
       "dev": true
     },
     "node_modules/sass/node_modules/readdirp": {
diff --git a/package.json b/package.json
index e13d825f4c..c5cc35ff47 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,7 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.6",
+    "sass": "~1.83.1",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From 096c5bdedd0fd91083d323355b0f619cc7b51a15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:07:30 +0000
Subject: [PATCH 1039/1286] Bump ng-mocks from 14.13.1 to 14.13.2 in the
 testing group

Bumps the testing group with 1 update: [ng-mocks](https://github.com/help-me-mom/ng-mocks).


Updates `ng-mocks` from 14.13.1 to 14.13.2
- [Release notes](https://github.com/help-me-mom/ng-mocks/releases)
- [Changelog](https://github.com/help-me-mom/ng-mocks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/help-me-mom/ng-mocks/compare/v14.13.1...v14.13.2)

---
updated-dependencies:
- dependency-name: ng-mocks
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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

diff --git a/package-lock.json b/package-lock.json
index f63be88170..7ced665ad1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,7 +134,7 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
-        "ng-mocks": "^14.13.1",
+        "ng-mocks": "^14.13.2",
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
         "postcss": "^8.4",
@@ -16844,18 +16844,18 @@
       "dev": true
     },
     "node_modules/ng-mocks": {
-      "version": "14.13.1",
-      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
-      "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
+      "version": "14.13.2",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.2.tgz",
+      "integrity": "sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
       "peerDependencies": {
-        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18"
+        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19"
       }
     },
     "node_modules/ng2-file-upload": {
diff --git a/package.json b/package.json
index e13d825f4c..d944cb62a5 100644
--- a/package.json
+++ b/package.json
@@ -221,7 +221,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ng-mocks": "^14.13.1",
+    "ng-mocks": "^14.13.2",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",

From e02326510fbe28fb7b14df2cd35c6cfab6dc4f92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:08:15 +0000
Subject: [PATCH 1040/1286] Bump @types/lodash from 4.17.13 to 4.17.14

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index f63be88170..124b128319 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,7 +99,7 @@
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.13",
+        "@types/lodash": "^4.17.14",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -6897,9 +6897,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==",
       "dev": true
     },
     "node_modules/@types/mime": {
diff --git a/package.json b/package.json
index e13d825f4c..d7a3faacc8 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",

From d8a73c362cef7c57fb14f54260ee339b5d0968b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:08:38 +0000
Subject: [PATCH 1041/1286] Bump isbot from 5.1.17 to 5.1.21

Bumps [isbot](https://github.com/omrilotan/isbot) from 5.1.17 to 5.1.21.
- [Changelog](https://github.com/omrilotan/isbot/blob/main/CHANGELOG.md)
- [Commits](https://github.com/omrilotan/isbot/compare/v5.1.17...v5.1.21)

---
updated-dependencies:
- dependency-name: isbot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index f63be88170..986153edd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
-        "isbot": "^5.1.17",
+        "isbot": "^5.1.21",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
@@ -14453,9 +14453,9 @@
       }
     },
     "node_modules/isbot": {
-      "version": "5.1.17",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz",
-      "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==",
+      "version": "5.1.21",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.21.tgz",
+      "integrity": "sha512-0q3naRVpENL0ReKHeNcwn/G7BDynp0DqZUckKyFtM9+hmpnPqgm8+8wbjiVZ0XNhq1wPQV28/Pb8Snh5adeUHA==",
       "engines": {
         "node": ">=18"
       }
diff --git a/package.json b/package.json
index e13d825f4c..e4034bdfbc 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.17",
+    "isbot": "^5.1.21",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",

From f067eb9aae5f30eeb38664848fd9869f296305f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:08:41 +0000
Subject: [PATCH 1042/1286] Bump eslint-plugin-jsonc in the eslint group across
 1 directory

Bumps the eslint group with 1 update in the / directory: [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc).


Updates `eslint-plugin-jsonc` from 2.16.0 to 2.18.2
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.16.0...v2.18.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package-lock.json b/package-lock.json
index f63be88170..f038310f9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -119,7 +119,7 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
-        "eslint-plugin-jsonc": "^2.6.0",
+        "eslint-plugin-jsonc": "^2.18.2",
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
@@ -11585,9 +11585,9 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
-      "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
+      "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
       "dev": true,
       "dependencies": {
         "semver": "^7.5.4"
@@ -11634,6 +11634,27 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-json-compat-utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz",
+      "integrity": "sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==",
+      "dev": true,
+      "dependencies": {
+        "esquery": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "jsonc-eslint-parser": "^2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@eslint/json": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-module-utils": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
@@ -11964,13 +11985,14 @@
       }
     },
     "node_modules/eslint-plugin-jsonc": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz",
-      "integrity": "sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz",
+      "integrity": "sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "eslint-compat-utils": "^0.5.0",
+        "eslint-compat-utils": "^0.6.0",
+        "eslint-json-compat-utils": "^0.2.1",
         "espree": "^9.6.1",
         "graphemer": "^1.4.0",
         "jsonc-eslint-parser": "^2.0.4",
@@ -12349,9 +12371,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
diff --git a/package.json b/package.json
index e13d825f4c..66709b8993 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-jsonc": "^2.18.2",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",

From fb3a10250ddaebe67169ea460686c024ee5aac5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:47:21 +0000
Subject: [PATCH 1043/1286] Bump sass from 1.80.6 to 1.83.1 in the sass group
 across 1 directory

Bumps the sass group with 1 update in the / directory: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.80.6 to 1.83.1
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.83.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package.json b/package.json
index 98284459f5..41e702957c 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.6",
+    "sass": "~1.83.1",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index b8f4a4740c..7084c33fa2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6458,6 +6458,11 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
   integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
 
+immutable@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1"
+  integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==
+
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -9737,13 +9742,13 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.80.6:
-  version "1.80.6"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.6.tgz#5d0aa55763984effe41e40019c9571ab73e6851f"
-  integrity sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==
+sass@^1.25.0, sass@~1.83.1:
+  version "1.83.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
+  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
   optionalDependencies:
     "@parcel/watcher" "^2.4.1"

From ed660cb8f73b4adac5cf25abbc8f595c9bfcd4da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:49:07 +0000
Subject: [PATCH 1044/1286] Bump jsonschema from 1.4.1 to 1.5.0

Bumps [jsonschema](https://github.com/tdegrunt/jsonschema) from 1.4.1 to 1.5.0.
- [Commits](https://github.com/tdegrunt/jsonschema/commits)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 98284459f5..4a3dc2ccc8 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
-    "jsonschema": "1.4.1",
+    "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.18",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index b8f4a4740c..4d43265187 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7100,10 +7100,10 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsonschema@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
-  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
+jsonschema@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.5.0.tgz#f6aceb1ab9123563dd901d05f81f9d4883d3b7d8"
+  integrity sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==
 
 jsprim@^2.0.2:
   version "2.0.2"

From 5623cc9221ef55f073d54b30efcf42684e9a4455 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:30:46 -0600
Subject: [PATCH 1045/1286] Ensure Admin sidebar link is visible before
 clicking links

---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 9 ++++++---
 cypress/e2e/admin-export-modals.cy.ts  | 6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index c783972b75..5c40f77eca 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Add New Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
@@ -25,6 +26,7 @@ describe('Admin Add New Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
@@ -38,6 +40,7 @@ describe('Admin Add New Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index f2f18de877..fd28a8247c 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -12,7 +12,8 @@ describe('Admin Edit Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_community"]').click();
 
@@ -25,7 +26,8 @@ describe('Admin Edit Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_collection"]').click();
 
@@ -38,7 +40,8 @@ describe('Admin Edit Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_item"]').click();
 
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 0efe040fc8..d0a48cac23 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -12,7 +12,8 @@ describe('Admin Export Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_metadata"]').click();
 
@@ -25,7 +26,8 @@ describe('Admin Export Modals', () => {
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_batch"]').click();
 

From 7feb9fc617f88f57927eb7d6de7b4ed8fa0ce870 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:31:10 -0600
Subject: [PATCH 1046/1286] Ensure Item Edit page tab is visible before & after
 clicking it.

---
 cypress/e2e/item-edit.cy.ts | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 604aab9d04..ad5d8ea093 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -13,9 +13,11 @@ beforeEach(() => {
 
 describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').should('have.class', 'active');
 
     // <ds-edit-item-page> tag must be loaded
@@ -34,9 +36,11 @@ describe('Edit Item > Edit Metadata tab', () => {
 describe('Edit Item > Status tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').should('have.class', 'active');
 
     // <ds-item-status> tag must be loaded
@@ -50,9 +54,11 @@ describe('Edit Item > Status tab', () => {
 describe('Edit Item > Bitstreams tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
 
     // <ds-item-bitstreams> tag must be loaded
@@ -77,9 +83,11 @@ describe('Edit Item > Bitstreams tab', () => {
 describe('Edit Item > Curate tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').should('have.class', 'active');
 
     // <ds-item-curate> tag must be loaded
@@ -93,9 +101,11 @@ describe('Edit Item > Curate tab', () => {
 describe('Edit Item > Relationships tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').should('have.class', 'active');
 
     // <ds-item-relationships> tag must be loaded
@@ -109,9 +119,11 @@ describe('Edit Item > Relationships tab', () => {
 describe('Edit Item > Version History tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
 
     // <ds-item-version-history> tag must be loaded
@@ -125,9 +137,11 @@ describe('Edit Item > Version History tab', () => {
 describe('Edit Item > Access Control tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').should('have.class', 'active');
 
     // <ds-item-access-control> tag must be loaded
@@ -141,9 +155,11 @@ describe('Edit Item > Access Control tab', () => {
 describe('Edit Item > Collection Mapper tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').should('have.class', 'active');
 
     // <ds-item-collection-mapper> tag must be loaded

From ecceaf9ee1bac2b22a9d50c3a4daf2a9b893cddc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:30:46 -0600
Subject: [PATCH 1047/1286] Ensure Admin sidebar link is visible before
 clicking links

---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 3 +++
 cypress/e2e/admin-export-modals.cy.ts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 565ae154f1..0179ca7a7c 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
@@ -25,6 +26,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
@@ -38,6 +40,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index e96d6ce898..79190bfce9 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_community"]').click();
@@ -25,6 +26,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_collection"]').click();
@@ -38,6 +40,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_item"]').click();
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index c5b0b0908f..55d952cad8 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Export Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
     cy.get('#admin-menu-section-export-title').click();
 
     cy.get('a[data-test="menu.section.export_metadata"]').click();
@@ -25,6 +26,7 @@ describe('Admin Export Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
     cy.get('#admin-menu-section-export-title').click();
 
     cy.get('a[data-test="menu.section.export_batch"]').click();

From 9e1ce916f655cccc82c51fdf71487cafa615697c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:31:10 -0600
Subject: [PATCH 1048/1286] Ensure Item Edit page tab is visible before & after
 clicking it.

---
 cypress/e2e/item-edit.cy.ts | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 604aab9d04..ad5d8ea093 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -13,9 +13,11 @@ beforeEach(() => {
 
 describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').should('have.class', 'active');
 
     // <ds-edit-item-page> tag must be loaded
@@ -34,9 +36,11 @@ describe('Edit Item > Edit Metadata tab', () => {
 describe('Edit Item > Status tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').should('have.class', 'active');
 
     // <ds-item-status> tag must be loaded
@@ -50,9 +54,11 @@ describe('Edit Item > Status tab', () => {
 describe('Edit Item > Bitstreams tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
 
     // <ds-item-bitstreams> tag must be loaded
@@ -77,9 +83,11 @@ describe('Edit Item > Bitstreams tab', () => {
 describe('Edit Item > Curate tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').should('have.class', 'active');
 
     // <ds-item-curate> tag must be loaded
@@ -93,9 +101,11 @@ describe('Edit Item > Curate tab', () => {
 describe('Edit Item > Relationships tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').should('have.class', 'active');
 
     // <ds-item-relationships> tag must be loaded
@@ -109,9 +119,11 @@ describe('Edit Item > Relationships tab', () => {
 describe('Edit Item > Version History tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
 
     // <ds-item-version-history> tag must be loaded
@@ -125,9 +137,11 @@ describe('Edit Item > Version History tab', () => {
 describe('Edit Item > Access Control tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').should('have.class', 'active');
 
     // <ds-item-access-control> tag must be loaded
@@ -141,9 +155,11 @@ describe('Edit Item > Access Control tab', () => {
 describe('Edit Item > Collection Mapper tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').should('have.class', 'active');
 
     // <ds-item-collection-mapper> tag must be loaded

From b0924b5d983583f320ed2a2ed537e80aceaef5d6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:30:46 -0600
Subject: [PATCH 1049/1286] Ensure Admin sidebar link is visible before
 clicking links

---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 3 +++
 cypress/e2e/admin-export-modals.cy.ts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 565ae154f1..0179ca7a7c 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
@@ -25,6 +26,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
@@ -38,6 +40,7 @@ describe('Admin Add New Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-new-title').should('be.visible');
     cy.get('#admin-menu-section-new-title').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index e96d6ce898..79190bfce9 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_community"]').click();
@@ -25,6 +26,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_collection"]').click();
@@ -38,6 +40,7 @@ describe('Admin Edit Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-edit-title').should('be.visible');
     cy.get('#admin-menu-section-edit-title').click();
 
     cy.get('a[data-test="menu.section.edit_item"]').click();
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 9f69764d19..0466920eee 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -12,6 +12,7 @@ describe('Admin Export Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
     cy.get('#admin-menu-section-export-title').click();
 
     cy.get('a[data-test="menu.section.export_metadata"]').click();
@@ -25,6 +26,7 @@ describe('Admin Export Modals', () => {
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
+    cy.get('#admin-menu-section-export-title').should('be.visible');
     cy.get('#admin-menu-section-export-title').click();
 
     cy.get('a[data-test="menu.section.export_batch"]').click();

From dde029df7f9ebfc995e36fb6ceb5b335a0a7f3a0 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 15 Jan 2025 10:31:10 -0600
Subject: [PATCH 1050/1286] Ensure Item Edit page tab is visible before & after
 clicking it.

---
 cypress/e2e/item-edit.cy.ts | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 604aab9d04..ad5d8ea093 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -13,9 +13,11 @@ beforeEach(() => {
 
 describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').should('have.class', 'active');
 
     // <ds-edit-item-page> tag must be loaded
@@ -34,9 +36,11 @@ describe('Edit Item > Edit Metadata tab', () => {
 describe('Edit Item > Status tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').should('have.class', 'active');
 
     // <ds-item-status> tag must be loaded
@@ -50,9 +54,11 @@ describe('Edit Item > Status tab', () => {
 describe('Edit Item > Bitstreams tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
 
     // <ds-item-bitstreams> tag must be loaded
@@ -77,9 +83,11 @@ describe('Edit Item > Bitstreams tab', () => {
 describe('Edit Item > Curate tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').should('have.class', 'active');
 
     // <ds-item-curate> tag must be loaded
@@ -93,9 +101,11 @@ describe('Edit Item > Curate tab', () => {
 describe('Edit Item > Relationships tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').should('have.class', 'active');
 
     // <ds-item-relationships> tag must be loaded
@@ -109,9 +119,11 @@ describe('Edit Item > Relationships tab', () => {
 describe('Edit Item > Version History tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
 
     // <ds-item-version-history> tag must be loaded
@@ -125,9 +137,11 @@ describe('Edit Item > Version History tab', () => {
 describe('Edit Item > Access Control tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').should('have.class', 'active');
 
     // <ds-item-access-control> tag must be loaded
@@ -141,9 +155,11 @@ describe('Edit Item > Access Control tab', () => {
 describe('Edit Item > Collection Mapper tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').should('have.class', 'active');
 
     // <ds-item-collection-mapper> tag must be loaded

From e4bb42bb307805fa565f6215ac1c721daab7183d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 19:49:39 +0000
Subject: [PATCH 1051/1286] Bump eslint-plugin-jsonc in the eslint group across
 1 directory

Bumps the eslint group with 1 update in the / directory: [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc).


Updates `eslint-plugin-jsonc` from 2.16.0 to 2.18.2
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.16.0...v2.18.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package.json b/package.json
index ad0e77c49e..8a5001a78a 100644
--- a/package.json
+++ b/package.json
@@ -167,7 +167,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-jsonc": "^2.18.2",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
diff --git a/yarn.lock b/yarn.lock
index 304e2a46e3..09d6c2f695 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5270,10 +5270,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-compat-utils@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
-  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
+eslint-compat-utils@^0.6.0:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz#173d305132da755ac3612cccab03e1b2e14235ed"
+  integrity sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==
   dependencies:
     semver "^7.5.4"
 
@@ -5295,6 +5295,13 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
+eslint-json-compat-utils@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz#32931d42c723da383712f25177a2c57b9ef5f079"
+  integrity sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==
+  dependencies:
+    esquery "^1.6.0"
+
 eslint-module-utils@^2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
@@ -5361,13 +5368,14 @@ eslint-plugin-jsdoc@^45.0.0:
     semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsonc@^2.6.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
-  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
+eslint-plugin-jsonc@^2.18.2:
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz#893520feb35d343e7438e2fb57fad179ef3ff6aa"
+  integrity sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.5.0"
+    eslint-compat-utils "^0.6.0"
+    eslint-json-compat-utils "^0.2.1"
     espree "^9.6.1"
     graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
@@ -5505,7 +5513,7 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.2, esquery@^1.5.0:
+esquery@^1.4.2, esquery@^1.5.0, esquery@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
   integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==

From fd166fe79a24ddf15d04961b0cb1c4150a3faeec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 19:51:07 +0000
Subject: [PATCH 1052/1286] Bump eslint-plugin-jsonc in the eslint group across
 1 directory

Bumps the eslint group with 1 update in the / directory: [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc).


Updates `eslint-plugin-jsonc` from 2.16.0 to 2.18.2
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.16.0...v2.18.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package.json b/package.json
index 3128aeb917..1b326f1221 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.16.0",
+    "eslint-plugin-jsonc": "^2.18.2",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "express-static-gzip": "^2.2.0",
diff --git a/yarn.lock b/yarn.lock
index 1ad8fc2f35..4b6faaa9ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5299,10 +5299,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-compat-utils@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
-  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
+eslint-compat-utils@^0.6.0:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz#173d305132da755ac3612cccab03e1b2e14235ed"
+  integrity sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==
   dependencies:
     semver "^7.5.4"
 
@@ -5315,6 +5315,13 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
+eslint-json-compat-utils@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz#32931d42c723da383712f25177a2c57b9ef5f079"
+  integrity sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==
+  dependencies:
+    esquery "^1.6.0"
+
 eslint-module-utils@^2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
@@ -5370,13 +5377,14 @@ eslint-plugin-jsdoc@^45.0.0:
     semver "^7.5.1"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsonc@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
-  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
+eslint-plugin-jsonc@^2.18.2:
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz#893520feb35d343e7438e2fb57fad179ef3ff6aa"
+  integrity sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.5.0"
+    eslint-compat-utils "^0.6.0"
+    eslint-json-compat-utils "^0.2.1"
     espree "^9.6.1"
     graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
@@ -5520,6 +5528,13 @@ esquery@^1.4.2, esquery@^1.5.0:
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"

From 31c9b854c628863af65a9a8b7ef46d4e59c87af1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 22:54:06 +0000
Subject: [PATCH 1053/1286] Bump the testing group across 1 directory with 2
 updates

Bumps the testing group with 2 updates in the / directory: [cypress](https://github.com/cypress-io/cypress) and [ng-mocks](https://github.com/help-me-mom/ng-mocks).


Updates `cypress` from 13.15.1 to 13.17.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.15.1...v13.17.0)

Updates `ng-mocks` from 14.13.1 to 14.13.2
- [Release notes](https://github.com/help-me-mom/ng-mocks/releases)
- [Changelog](https://github.com/help-me-mom/ng-mocks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/help-me-mom/ng-mocks/compare/v14.13.1...v14.13.2)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
- dependency-name: ng-mocks
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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

diff --git a/package.json b/package.json
index f7c2431009..aa09e1bb81 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.3",
-    "cypress": "^13.15.1",
+    "cypress": "^13.17.0",
     "cypress-axe": "^1.5.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
@@ -174,7 +174,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ng-mocks": "^14.13.1",
+    "ng-mocks": "^14.13.2",
     "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
diff --git a/yarn.lock b/yarn.lock
index 3548e550bd..d742d70c13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1534,10 +1534,10 @@
   resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@cypress/request@^3.0.4":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.5.tgz#d893a6e68ce2636c085fcd8d7283c3186499ba63"
-  integrity sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==
+"@cypress/request@^3.0.6":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.7.tgz#6a74a4da98d9e5ae9121d6e2d9c14780c9b5cf1a"
+  integrity sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1552,9 +1552,9 @@
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "6.13.0"
+    qs "6.13.1"
     safe-buffer "^5.1.2"
-    tough-cookie "^4.1.3"
+    tough-cookie "^5.0.0"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
@@ -3940,10 +3940,10 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^3.2.0:
-  version "3.8.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+ci-info@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
+  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
 
 classnames@^2.2.6:
   version "2.3.2"
@@ -4465,12 +4465,12 @@ cypress-axe@^1.5.0:
   resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
   integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
 
-cypress@^13.15.1:
-  version "13.15.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.1.tgz#d85074e07cc576eb30068617d529719ef6093b69"
-  integrity sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==
+cypress@^13.17.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.17.0.tgz#34c3d68080c4497eace0f353bd1629587a5f600d"
+  integrity sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==
   dependencies:
-    "@cypress/request" "^3.0.4"
+    "@cypress/request" "^3.0.6"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
@@ -4481,6 +4481,7 @@ cypress@^13.15.1:
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
+    ci-info "^4.0.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
     commander "^6.2.1"
@@ -4495,7 +4496,6 @@ cypress@^13.15.1:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.1"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -6832,13 +6832,6 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-ci@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
-  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
-  dependencies:
-    ci-info "^3.2.0"
-
 is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.8.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
@@ -8382,10 +8375,10 @@ neo-async@^2.6.2:
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^14.13.1:
-  version "14.13.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.1.tgz#9fef8cc902a0d9d3250550d83514f9c65d4cd366"
-  integrity sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==
+ng-mocks@^14.13.2:
+  version "14.13.2"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.2.tgz#ddd675d675eb16dfa85834e28dd42343853a6622"
+  integrity sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==
 
 ng2-file-upload@1.4.0:
   version "1.4.0"
@@ -9564,6 +9557,13 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
+qs@6.13.1:
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
+  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
+  dependencies:
+    side-channel "^1.0.6"
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
@@ -11081,6 +11081,18 @@ tiny-warning@^1.0.2:
   resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tldts-core@^6.1.72:
+  version "6.1.72"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.72.tgz#32b38e1843f4adab57d2414a9ec4af9a81826bc0"
+  integrity sha512-FW3H9aCaGTJ8l8RVCR3EX8GxsxDbQXuwetwwgXA2chYdsX+NY1ytCBl61narjjehWmCw92tc1AxlcY3668CU8g==
+
+tldts@^6.1.32:
+  version "6.1.72"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.72.tgz#9b85f47e451e2ff079fab5801b4fa156ecda69f4"
+  integrity sha512-QNtgIqSUb9o2CoUjX9T5TwaIvUUJFU1+12PJkgt42DFV2yf9J6549yTF2uGloQsJ/JOC8X+gIB81ind97hRiIQ==
+  dependencies:
+    tldts-core "^6.1.72"
+
 tmp@0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
@@ -11129,7 +11141,7 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@^4.1.3:
+tough-cookie@^4.0.0, tough-cookie@^4.1.2:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
   integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
@@ -11139,6 +11151,13 @@ tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@^4.1.3:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.0.tgz#0667b0f2fbb5901fe6f226c3e0b710a9a4292f87"
+  integrity sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==
+  dependencies:
+    tldts "^6.1.32"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"

From 9f9ca860e09a85d7d666e6516b7b7a760153d51c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:44:13 +0000
Subject: [PATCH 1054/1286] Bump @types/lodash from 4.17.13 to 4.17.14

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 42e41726a1..65fd7b09a2 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 43a7f45583..469315f334 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2768,10 +2768,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.17.13":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
-  integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
+"@types/lodash@^4.17.14":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff"
+  integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==
 
 "@types/mime@^1":
   version "1.3.5"

From 2abdf122b49dcbc2b895641a8a6da672b4227372 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:46:54 +0000
Subject: [PATCH 1055/1286] Bump sanitize-html from 2.13.1 to 2.14.0

Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.13.1 to 2.14.0.
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.13.1...2.14.0)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 f7c2431009..13385f027f 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "pem": "1.14.8",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.13.1",
+    "sanitize-html": "^2.14.0",
     "sortablejs": "1.15.6",
     "uuid": "^8.3.2",
     "zone.js": "~0.13.3"
diff --git a/yarn.lock b/yarn.lock
index 3548e550bd..3854d68bbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10208,10 +10208,10 @@ safe-stable-stringify@^2.4.3:
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.1.tgz#b4639b0a09574ab62b1b353cb99b1b87af742834"
-  integrity sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg==
+sanitize-html@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.14.0.tgz#bd2a7b97ee1d86a7f0e0babf3a4468f639c3a429"
+  integrity sha512-CafX+IUPxZshXqqRaG9ZClSlfPVjSxI0td7n07hk8QO2oO+9JDnlcL8iM8TWeOXOIBFgIOx6zioTzM53AOMn3g==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"

From ce5ab70fd42868de51742ec5d88856199dd3cb56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:48:52 +0000
Subject: [PATCH 1056/1286] Bump isbot from 5.1.17 to 5.1.21

Bumps [isbot](https://github.com/omrilotan/isbot) from 5.1.17 to 5.1.21.
- [Changelog](https://github.com/omrilotan/isbot/blob/main/CHANGELOG.md)
- [Commits](https://github.com/omrilotan/isbot/compare/v5.1.17...v5.1.21)

---
updated-dependencies:
- dependency-name: isbot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 f7c2431009..fffa4a5f5b 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.17",
+    "isbot": "^5.1.21",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 3548e550bd..6f752b2d39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7087,10 +7087,10 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
-isbot@^5.1.17:
-  version "5.1.17"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
-  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
+isbot@^5.1.21:
+  version "5.1.21"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.21.tgz#4e27526a71c8b9c243b1c7a6445ad4267fa83728"
+  integrity sha512-0q3naRVpENL0ReKHeNcwn/G7BDynp0DqZUckKyFtM9+hmpnPqgm8+8wbjiVZ0XNhq1wPQV28/Pb8Snh5adeUHA==
 
 isexe@^2.0.0:
   version "2.0.0"

From 32fae27c7a34297e16cab7f01c37064bd9ed1ba0 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 16 Jan 2025 12:28:48 +0100
Subject: [PATCH 1057/1286] 124382: fix issue where scoped browse by would not
 init correct components

---
 .../sections/comcol-browse-by/comcol-browse-by.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
index 35d292c5f7..67fc9ae792 100644
--- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
@@ -26,7 +26,7 @@ import { BrowseDefinition } from '../../../../core/shared/browse-definition.mode
 })
 export class ComcolBrowseByComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   scope$: Observable<string>;
 
@@ -40,7 +40,7 @@ export class ComcolBrowseByComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
     this.scope$ = this.route.data.pipe(
       map((data: Data) => data.scope),

From 0570542b1eb2874617deac27f38c4ecec7bbc1c3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 9 Jan 2025 15:18:24 +0100
Subject: [PATCH 1058/1286] 122357: Reduced the amount of times the browse
 observables are fired again

---
 .../browse-by-date.component.ts               | 24 +++++++++------
 .../browse-by-metadata.component.ts           | 29 ++++++++++++-------
 src/app/browse-by/browse-by-routing.module.ts |  2 --
 .../browse-by-title.component.ts              | 26 ++++++++++-------
 4 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index e655d88cc9..ed904df8e8 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
-import { BrowseByMetadataComponent, browseParamsToOptions, getBrowseSearchOptions } from '../browse-by-metadata/browse-by-metadata.component';
+import { BrowseByMetadataComponent, browseParamsToOptions } from '../browse-by-metadata/browse-by-metadata.component';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { ActivatedRoute, Params, Router } from '@angular/router';
@@ -7,7 +7,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
@@ -53,16 +53,22 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
     // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
-        })
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index af1645daa3..b4ef750e66 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,5 +1,5 @@
 import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
-import { Component, Inject, OnInit, OnDestroy, Input, OnChanges } from '@angular/core';
+import { Component, Inject, OnInit, OnDestroy, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -14,7 +14,7 @@ import { getFirstSucceededRemoteData } from '../../core/shared/operators';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
@@ -158,15 +158,22 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
   ngOnInit(): void {
 
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.authority === curr.authority && prev.value === curr.value && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
-        })
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         this.browseId = params.id || this.defaultBrowseId;
           this.authority = params.authority;
 
@@ -190,8 +197,10 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
   }
 
-  ngOnChanges(): void {
-    this.scope$.next(this.scope);
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.scope)) {
+      this.scope$.next(this.scope);
+    }
   }
 
   /**
diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index f07df26b32..d5143351e0 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -4,7 +4,6 @@ import { BrowseByGuard } from './browse-by-guard';
 import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
 import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
-import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 
 @NgModule({
   imports: [
@@ -13,7 +12,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
         path: '',
         resolve: {
           breadcrumb: BrowseByDSOBreadcrumbResolver,
-          menu: DSOEditMenuResolver
         },
         children: [
           {
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index 7b603af48b..22b4bf4780 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,12 +1,12 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { Params } from '@angular/router';
 import {
   BrowseByMetadataComponent,
-  browseParamsToOptions, getBrowseSearchOptions
+  browseParamsToOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { map } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
@@ -24,16 +24,22 @@ export class BrowseByTitleComponent extends BrowseByMetadataComponent implements
 
   ngOnInit(): void {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
-        })
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);

From 5b3b3bfb9c84b013b8bda81e0ff23ae2b0986a42 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 22 Nov 2024 12:29:32 +0300
Subject: [PATCH 1059/1286] Restrict SSR to paths in the sitemap

Because Angular SSR is not very efficient, after discussion with
the Google Scholar team we realized a compromise would be to only
use SSR for pages in the DSpace sitemap (and the home page).
---
 config/config.example.yml                  | 2 ++
 server.ts                                  | 2 +-
 src/config/ssr-config.interface.ts         | 5 +++++
 src/environments/environment.production.ts | 1 +
 src/environments/environment.test.ts       | 1 +
 src/environments/environment.ts            | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 3b46b8403f..3ae2c51cae 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -23,6 +23,8 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
+  # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/server.ts b/server.ts
index 07a05656d8..1276621e9d 100644
--- a/server.ts
+++ b/server.ts
@@ -218,7 +218,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res, next) {
-  if (environment.ssr.enabled) {
+  if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || environment.ssr.paths.some(pathPrefix => req.path.startsWith(pathPrefix)))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res, next);
   } else {
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 37b8b4a0d2..1a01e4d125 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -20,4 +20,9 @@ export interface SSRConfig extends Config {
    * For improved SSR performance, DSpace defaults this to false (disabled).
    */
   inlineCriticalCss: boolean;
+
+  /**
+   * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
+   */
+  paths: Array<string>;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 90b219cdbd..35b0d39408 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,5 +8,6 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index c7146dfb07..84229aa659 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,7 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 
   // Angular express server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0292c19200..a02ef4a2a9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 };
 

From f0ea13288ac3bb901c214a51a70503a6c68342a7 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 16 Jan 2025 12:28:48 +0100
Subject: [PATCH 1060/1286] 124382: fix issue where scoped browse by would not
 init correct components

(cherry picked from commit 32fae27c7a34297e16cab7f01c37064bd9ed1ba0)
---
 .../sections/comcol-browse-by/comcol-browse-by.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
index 35d292c5f7..67fc9ae792 100644
--- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
@@ -26,7 +26,7 @@ import { BrowseDefinition } from '../../../../core/shared/browse-definition.mode
 })
 export class ComcolBrowseByComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   scope$: Observable<string>;
 
@@ -40,7 +40,7 @@ export class ComcolBrowseByComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
     this.scope$ = this.route.data.pipe(
       map((data: Data) => data.scope),

From bb412469c7cb1f6c38482063ed370a95e79b41f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:54:02 +0000
Subject: [PATCH 1061/1286] Bump webpack from 5.96.1 to 5.97.1 in the webpack
 group

Bumps the webpack group with 1 update: [webpack](https://github.com/webpack/webpack).


Updates `webpack` from 5.96.1 to 5.97.1
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.96.1...v5.97.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: webpack
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..904bcc5c74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -147,7 +147,7 @@
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.96.1",
+        "webpack": "5.97.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -7587,148 +7587,148 @@
       "dev": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -22624,16 +22624,16 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.96.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.14.0",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
diff --git a/package.json b/package.json
index ad795082ca..482a400bcb 100644
--- a/package.json
+++ b/package.json
@@ -234,7 +234,7 @@
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.96.1",
+    "webpack": "5.97.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }

From f02f8bab88d5b40b6c4e3b9a6e3b3568ec7a5f0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:56:06 +0000
Subject: [PATCH 1062/1286] Bump postcss from 8.4.49 to 8.5.1 in the postcss
 group

Bumps the postcss group with 1 update: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.49 to 8.5.1
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.49...8.5.1)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: postcss
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..12ef4f0436 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -137,7 +137,7 @@
         "ng-mocks": "^14.13.2",
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
-        "postcss": "^8.4",
+        "postcss": "^8.5",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
@@ -18408,9 +18408,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -18426,7 +18426,7 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
diff --git a/package.json b/package.json
index ad795082ca..d81cf89689 100644
--- a/package.json
+++ b/package.json
@@ -224,7 +224,7 @@
     "ng-mocks": "^14.13.2",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
-    "postcss": "^8.4",
+    "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",

From 9708c06372c3ddb3b4b57159e1fa5d07c7668d48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:56:46 +0000
Subject: [PATCH 1063/1286] Bump express from 4.21.1 to 4.21.2

Bumps [express](https://github.com/expressjs/express) from 4.21.1 to 4.21.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..76ab2f161a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.21.1",
+        "express": "^4.21.2",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
@@ -12486,9 +12486,9 @@
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -12509,7 +12509,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -12524,6 +12524,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express-rate-limit": {
@@ -18188,9 +18192,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index ad795082ca..3333ea6710 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",

From 98fd9e71826a97b04562ebc57262acfdff98e601 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:57:40 +0000
Subject: [PATCH 1064/1286] Bump jsonschema from 1.4.1 to 1.5.0

Bumps [jsonschema](https://github.com/tdegrunt/jsonschema) from 1.4.1 to 1.5.0.
- [Commits](https://github.com/tdegrunt/jsonschema/commits)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..775c509601 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
-        "jsonschema": "1.4.1",
+        "jsonschema": "1.5.0",
         "jwt-decode": "^3.1.2",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
@@ -15016,9 +15016,9 @@
       ]
     },
     "node_modules/jsonschema": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
-      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz",
+      "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==",
       "engines": {
         "node": "*"
       }
diff --git a/package.json b/package.json
index ad795082ca..624b3a2953 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
-    "jsonschema": "1.4.1",
+    "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",

From 7472be009855376edccb5ac5242673f1bb44e75c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:57:43 +0000
Subject: [PATCH 1065/1286] Bump @types/lodash from 4.17.13 to 4.17.14

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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 ce5449fa33..8ac4635e79 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.14",
     "@types/node": "^14.18.63",
     "@types/sanitize-html": "^2.13.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..8b9b52a4e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2539,10 +2539,10 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.17.13":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
-  integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
+"@types/lodash@^4.17.14":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff"
+  integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==
 
 "@types/mime@*":
   version "3.0.1"

From 9741ce3e697a75ec5955c8b2d2b00282fe815790 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:57:54 +0000
Subject: [PATCH 1066/1286] Bump mirador from 3.4.2 to 3.4.3

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 ce5449fa33..3d7e9c0ec7 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.2",
     "markdown-it-mathjax3": "^4.3.2",
-    "mirador": "^3.4.2",
+    "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..48ca8c3da3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8226,10 +8226,10 @@ mirador-share-plugin@^0.16.0:
   dependencies:
     notistack "^3.0.1"
 
-mirador@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.2.tgz#51ec7ca1b9854792bbe2fa5e13b3692c92e97102"
-  integrity sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==
+mirador@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.3.tgz#1b083bd037b851d1389758f3c86eb94832b00ec6"
+  integrity sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==
   dependencies:
     "@material-ui/core" "^4.12.3"
     "@material-ui/icons" "^4.9.1"

From 6eabe425c46902eefd9d39308fca0cd2244b51cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:57:55 +0000
Subject: [PATCH 1067/1286] Bump mirador from 3.4.2 to 3.4.3

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..729fbb46bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,7 +59,7 @@
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
-        "mirador": "^3.4.2",
+        "mirador": "^3.4.3",
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
@@ -16618,9 +16618,9 @@
       }
     },
     "node_modules/mirador": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.2.tgz",
-      "integrity": "sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.3.tgz",
+      "integrity": "sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==",
       "dependencies": {
         "@material-ui/core": "^4.12.3",
         "@material-ui/icons": "^4.9.1",
diff --git a/package.json b/package.json
index ad795082ca..1f90aa3583 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "mirador": "^3.4.2",
+    "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",

From b65f1ee5e3e218515048d81376ae0815a000ea32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:58:18 +0000
Subject: [PATCH 1068/1286] Bump core-js from 3.39.0 to 3.40.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.39.0 to 3.40.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.40.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package-lock.json b/package-lock.json
index 00306a1108..fabff3c6fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "colors": "^1.4.0",
         "compression": "^1.7.5",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.39.0",
+        "core-js": "^3.40.0",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
@@ -9920,9 +9920,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.39.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
-      "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
+      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
diff --git a/package.json b/package.json
index ad795082ca..e899d6ab8f 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.39.0",
+    "core-js": "^3.40.0",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",

From 9bc65b99a65051bdc4d1d16115ea12c774d8c974 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:58:20 +0000
Subject: [PATCH 1069/1286] Bump core-js from 3.39.0 to 3.40.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.39.0 to 3.40.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.40.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 ce5449fa33..7e8f57e977 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.39.0",
+    "core-js": "^3.40.0",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..88a5116990 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4272,10 +4272,10 @@ core-js-compat@^3.25.1:
   dependencies:
     browserslist "^4.21.5"
 
-core-js@^3.39.0:
-  version "3.39.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83"
-  integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==
+core-js@^3.40.0:
+  version "3.40.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.40.0.tgz#2773f6b06877d8eda102fc42f828176437062476"
+  integrity sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==
 
 core-util-is@1.0.2:
   version "1.0.2"

From 39ddc5cbcd6bae6dd9a1bb2397be6f4a5ef334d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 22:58:28 +0000
Subject: [PATCH 1070/1286] Bump jsonschema from 1.4.1 to 1.5.0

Bumps [jsonschema](https://github.com/tdegrunt/jsonschema) from 1.4.1 to 1.5.0.
- [Commits](https://github.com/tdegrunt/jsonschema/commits)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 ce5449fa33..2306326435 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
-    "jsonschema": "1.4.1",
+    "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
     "klaro": "^0.7.21",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..8de93af4f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7398,10 +7398,10 @@ jsonparse@^1.3.1:
   resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsonschema@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
-  integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
+jsonschema@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.5.0.tgz#f6aceb1ab9123563dd901d05f81f9d4883d3b7d8"
+  integrity sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==
 
 jsprim@^2.0.2:
   version "2.0.2"

From 44b900f5db6c2d759e392307719e93b65656d59f Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 20 Jan 2025 15:27:32 +0100
Subject: [PATCH 1071/1286] [CST-15077] improve orcid logo image alt

---
 .../orcid-badge-and-tooltip.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
index fc34aee970..9f4821e780 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -2,7 +2,7 @@
      [ngbTooltip]="orcidTooltipTemplate"
      class="orcid-icon"
      [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
-     alt="orcid-logo"
+     alt="ORCID {{ orcidTooltip }}"
      src="assets/images/orcid.logo.icon.svg"
      data-test="orcidIcon"/>
 

From 0a7307a515c1a62aa0d8a7993ce35a4aa7580171 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 20 Jan 2025 15:28:59 +0100
Subject: [PATCH 1072/1286] [CST-15078] improve orcid logo image alt

---
 .../orcid-badge-and-tooltip.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
index fc34aee970..9f4821e780 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -2,7 +2,7 @@
      [ngbTooltip]="orcidTooltipTemplate"
      class="orcid-icon"
      [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
-     alt="orcid-logo"
+     alt="ORCID {{ orcidTooltip }}"
      src="assets/images/orcid.logo.icon.svg"
      data-test="orcidIcon"/>
 

From d0b65719544a0938859a10c795dd846a30eeee42 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Mon, 20 Jan 2025 15:31:31 +0100
Subject: [PATCH 1073/1286] [CST-14904] improve orcid logo image alt

---
 .../orcid-badge-and-tooltip.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
index fc34aee970..9f4821e780 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -2,7 +2,7 @@
      [ngbTooltip]="orcidTooltipTemplate"
      class="orcid-icon"
      [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
-     alt="orcid-logo"
+     alt="ORCID {{ orcidTooltip }}"
      src="assets/images/orcid.logo.icon.svg"
      data-test="orcidIcon"/>
 

From 74d6dbb454cf40d5c418cc0c6cde05ea04de2103 Mon Sep 17 00:00:00 2001
From: Mohana Sarmiento <mo.sarmiento@utoronto.ca>
Date: Mon, 20 Jan 2025 18:13:35 -0500
Subject: [PATCH 1074/1286] Fix double encoding of bitstream filenames in URL

---
 src/app/core/data/bitstream-data.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bf8e3585df..bb4ec28166 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -171,7 +171,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
       searchParams.push(new RequestParam('sequenceId', sequenceId));
     }
     if (hasValue(filename)) {
-      searchParams.push(new RequestParam('filename', encodeURIComponent(filename)));
+      searchParams.push(new RequestParam('filename', filename));
     }
 
     const hrefObs = this.getSearchByHref(

From 5d04e44ff31593ec7c17635d0053d3b8b615fb07 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 21 Jan 2025 18:29:10 +0100
Subject: [PATCH 1075/1286] remove duplicated line

---
 src/styles/_bootstrap_variables_mapping.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 5a64be7e2a..944166399e 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -220,7 +220,6 @@
   --bs-table-dark-hover-color: #{$table-dark-hover-color};
   --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
   --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-dark-color: #{$table-dark-color};
   --bs-table-striped-order: #{$table-striped-order};
   --bs-table-caption-color: #{$table-caption-color};
   --bs-table-bg-level: #{$table-bg-level};

From 6035d9e925b66589a49fb2074b5e3d3f9b852586 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 21 Jan 2025 18:29:10 +0100
Subject: [PATCH 1076/1286] remove duplicated line

(cherry picked from commit 5d04e44ff31593ec7c17635d0053d3b8b615fb07)
---
 src/styles/_bootstrap_variables_mapping.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 5a64be7e2a..944166399e 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -220,7 +220,6 @@
   --bs-table-dark-hover-color: #{$table-dark-hover-color};
   --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
   --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-dark-color: #{$table-dark-color};
   --bs-table-striped-order: #{$table-striped-order};
   --bs-table-caption-color: #{$table-caption-color};
   --bs-table-bg-level: #{$table-bg-level};

From 351c4decef5dc491c81f27207a7b9f523f89eed7 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 21 Jan 2025 18:29:10 +0100
Subject: [PATCH 1077/1286] remove duplicated line

(cherry picked from commit 5d04e44ff31593ec7c17635d0053d3b8b615fb07)
---
 src/styles/_bootstrap_variables_mapping.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 5a64be7e2a..944166399e 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -220,7 +220,6 @@
   --bs-table-dark-hover-color: #{$table-dark-hover-color};
   --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
   --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-dark-color: #{$table-dark-color};
   --bs-table-striped-order: #{$table-striped-order};
   --bs-table-caption-color: #{$table-caption-color};
   --bs-table-bg-level: #{$table-bg-level};

From e9cd0f4c64ad7293afde482b9f59ddc22b5f90cc Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 21 Jan 2025 14:16:29 -0600
Subject: [PATCH 1078/1286] Ensure admin menu e2e tests hover over admin menu
 before clicking on it. Attempt to stabilize tests which open this menu.

---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 3 +++
 cypress/e2e/admin-export-modals.cy.ts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 0179ca7a7c..332d44da13 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index 79190bfce9..8ba524d5be 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 0466920eee..884db4ed33 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu

From 2bd53d822abe8b811bcde9d613f68001a35ef3bf Mon Sep 17 00:00:00 2001
From: Mohana Sarmiento <mo.sarmiento@utoronto.ca>
Date: Tue, 21 Jan 2025 16:26:01 -0500
Subject: [PATCH 1079/1286] Add unit test

---
 .../core/data/bitstream-data.service.spec.ts  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 89178f8dd2..1f4b2efaf6 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -21,6 +21,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import objectContaining = jasmine.objectContaining;
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../cache/models/request-param.model';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -132,4 +133,30 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
     });
   });
+
+  describe('findByItemHandle', () => {
+    it('should encode the filename correctly in the search parameters', () => {
+      const handle = '123456789/1234';
+      const sequenceId = '5';
+      const filename = 'file with spaces.pdf';
+      const searchParams = [
+        new RequestParam('handle', handle),
+        new RequestParam('sequenceId', sequenceId),
+        new RequestParam('filename', filename)
+      ];
+      const linksToFollow: FollowLinkConfig<Bitstream>[] = [];
+
+      spyOn(service as any, 'getSearchByHref').and.callThrough();
+
+      service.getSearchByHref('byItemHandle', { searchParams }, ...linksToFollow).subscribe((href) => {
+        expect(service.getSearchByHref).toHaveBeenCalledWith(
+          'byItemHandle',
+          { searchParams },
+          ...linksToFollow
+        );
+
+        expect(href).toBe(`${url}/bitstreams/search/byItemHandle?handle=123456789%2F1234&sequenceId=5&filename=file%20with%20spaces.pdf`);
+      });
+    });
+  });
 });

From 026703d17093789a01f516bbcd0b88fbab2cbe48 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 22 Nov 2024 12:29:32 +0300
Subject: [PATCH 1080/1286] Restrict SSR to paths in the sitemap

Because Angular SSR is not very efficient, after discussion with
the Google Scholar team we realized a compromise would be to only
use SSR for pages in the DSpace sitemap (and the home page).

(cherry picked from commit 5b3b3bfb9c84b013b8bda81e0ff23ae2b0986a42)
---
 config/config.example.yml                  | 2 ++
 server.ts                                  | 2 +-
 src/config/ssr-config.interface.ts         | 5 +++++
 src/environments/environment.production.ts | 1 +
 src/environments/environment.test.ts       | 1 +
 src/environments/environment.ts            | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 25949ba491..139c4e7ebc 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -23,6 +23,8 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
+  # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/server.ts b/server.ts
index 032b79b8f2..8c5978937f 100644
--- a/server.ts
+++ b/server.ts
@@ -218,7 +218,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res, next) {
-  if (environment.ssr.enabled) {
+  if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || environment.ssr.paths.some(pathPrefix => req.path.startsWith(pathPrefix)))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res, next);
   } else {
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 37b8b4a0d2..1a01e4d125 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -20,4 +20,9 @@ export interface SSRConfig extends Config {
    * For improved SSR performance, DSpace defaults this to false (disabled).
    */
   inlineCriticalCss: boolean;
+
+  /**
+   * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
+   */
+  paths: Array<string>;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 90b219cdbd..35b0d39408 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,5 +8,6 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index c7146dfb07..84229aa659 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,7 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 
   // Angular express server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0292c19200..a02ef4a2a9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 };
 

From e3f13f8c54f6054765848c5f8f95e79fa3c7fd9d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 21 Jan 2025 14:16:29 -0600
Subject: [PATCH 1081/1286] Ensure admin menu e2e tests hover over admin menu
 before clicking on it. Attempt to stabilize tests which open this menu.

(cherry picked from commit e9cd0f4c64ad7293afde482b9f59ddc22b5f90cc)
---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 3 +++
 cypress/e2e/admin-export-modals.cy.ts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 0179ca7a7c..332d44da13 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index 79190bfce9..8ba524d5be 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 55d952cad8..24a184fd35 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('#sidebar-collapse-toggle').trigger('mouseover');
     cy.get('#sidebar-collapse-toggle').click();
 
     // Click on entry of menu

From b839252ed7fef45d9e7851012f4dc9c99e7f4c0c Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 22 Jan 2025 11:02:35 +0300
Subject: [PATCH 1082/1286] Restrict SSR to paths in the sitemap

Because Angular SSR is not very efficient, after discussion with
the Google Scholar team we realized a compromise would be to only
use SSR for pages in the DSpace sitemap (and the home page).
---
 config/config.example.yml                  | 2 ++
 server.ts                                  | 2 +-
 src/config/universal-config.interface.ts   | 5 +++++
 src/environments/environment.production.ts | 1 +
 src/environments/environment.test.ts       | 1 +
 src/environments/environment.ts            | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 42e13038d0..c1d7f967a4 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -23,6 +23,8 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
+  # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/server.ts b/server.ts
index 23d29723c6..82417f17dc 100644
--- a/server.ts
+++ b/server.ts
@@ -238,7 +238,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res) {
-  if (environment.universal.preboot) {
+  if (environment.universal.preboot && req.method === 'GET' && (req.path === '/' || environment.universal.paths.some(pathPrefix => req.path.startsWith(pathPrefix)))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res);
   } else {
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index eb89264e37..e54168823f 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -13,4 +13,9 @@ export interface UniversalConfig extends Config {
    * loading smoothness.
    */
   inlineCriticalCss?: boolean;
+
+  /**
+   * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
+   */
+  paths: Array<string>;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 931dd422e3..46a93519df 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,5 +9,6 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   }
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index cfd54781e6..e872285f61 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,7 @@ export const environment: BuildConfig = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   },
 
   // Angular Universal server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 7c09793790..25af371e47 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,6 +14,7 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
   }
 };
 

From 5c50faa319da6312e036a4dca7a51c0bca43d933 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 21 Jan 2025 14:16:29 -0600
Subject: [PATCH 1083/1286] Ensure admin menu e2e tests hover over admin menu
 before clicking on it. Attempt to stabilize tests which open this menu.

---
 cypress/e2e/admin-add-new-modals.cy.ts | 3 +++
 cypress/e2e/admin-edit-modals.cy.ts    | 3 +++
 cypress/e2e/admin-export-modals.cy.ts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index 5c40f77eca..e2ade53488 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index fd28a8247c..d4e2438061 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index d0a48cac23..873d16535f 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu

From 0475c0b2d9d295a465bf41b0f56d82c28afbfacd Mon Sep 17 00:00:00 2001
From: Mohana Sarmiento <mo.sarmiento@utoronto.ca>
Date: Tue, 21 Jan 2025 16:26:01 -0500
Subject: [PATCH 1084/1286] Add unit test

---
 .../core/data/bitstream-data.service.spec.ts  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 91b5132ce0..6aa75065d4 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -16,6 +16,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
@@ -176,4 +177,30 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
     });
   });
+
+  describe('findByItemHandle', () => {
+    it('should encode the filename correctly in the search parameters', () => {
+      const handle = '123456789/1234';
+      const sequenceId = '5';
+      const filename = 'file with spaces.pdf';
+      const searchParams = [
+        new RequestParam('handle', handle),
+        new RequestParam('sequenceId', sequenceId),
+        new RequestParam('filename', filename),
+      ];
+      const linksToFollow: FollowLinkConfig<Bitstream>[] = [];
+
+      spyOn(service as any, 'getSearchByHref').and.callThrough();
+
+      service.getSearchByHref('byItemHandle', { searchParams }, ...linksToFollow).subscribe((href) => {
+        expect(service.getSearchByHref).toHaveBeenCalledWith(
+          'byItemHandle',
+          { searchParams },
+          ...linksToFollow,
+        );
+
+        expect(href).toBe(`${url}/bitstreams/search/byItemHandle?handle=123456789%2F1234&sequenceId=5&filename=file%20with%20spaces.pdf`);
+      });
+    });
+  });
 });

From 2904ca28a1f25d68c488cec0686da9bdfb3f1633 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 22:38:17 +0000
Subject: [PATCH 1085/1286] Bump core-js from 3.39.0 to 3.40.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.39.0 to 3.40.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.40.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 f1fb80645d..44ae79082a 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.39.0",
+    "core-js": "^3.40.0",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index 65804167db..27109489c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4417,10 +4417,10 @@ core-js-compat@^3.31.0, core-js-compat@^3.34.0:
   dependencies:
     browserslist "^4.23.3"
 
-core-js@^3.39.0:
-  version "3.39.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83"
-  integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==
+core-js@^3.40.0:
+  version "3.40.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.40.0.tgz#2773f6b06877d8eda102fc42f828176437062476"
+  integrity sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==
 
 core-util-is@1.0.2:
   version "1.0.2"

From 2d0d9bb9db72dab0cc2ec68cbeb3111250f6bf0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 22:38:19 +0000
Subject: [PATCH 1086/1286] Bump ng-mocks from 14.13.1 to 14.13.2 in the
 testing group

Bumps the testing group with 1 update: [ng-mocks](https://github.com/help-me-mom/ng-mocks).


Updates `ng-mocks` from 14.13.1 to 14.13.2
- [Release notes](https://github.com/help-me-mom/ng-mocks/releases)
- [Changelog](https://github.com/help-me-mom/ng-mocks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/help-me-mom/ng-mocks/compare/v14.13.1...v14.13.2)

---
updated-dependencies:
- dependency-name: ng-mocks
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: testing
...

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 f1fb80645d..8801756605 100644
--- a/package.json
+++ b/package.json
@@ -182,7 +182,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ng-mocks": "^14.13.1",
+    "ng-mocks": "^14.13.2",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
diff --git a/yarn.lock b/yarn.lock
index 65804167db..bcbdad11d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7963,10 +7963,10 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^14.13.1:
-  version "14.13.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.1.tgz#9fef8cc902a0d9d3250550d83514f9c65d4cd366"
-  integrity sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==
+ng-mocks@^14.13.2:
+  version "14.13.2"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.13.2.tgz#ddd675d675eb16dfa85834e28dd42343853a6622"
+  integrity sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==
 
 ng2-file-upload@5.0.0:
   version "5.0.0"

From 19db3faf6524b63dbe88b7bf9411d1536bb127ce Mon Sep 17 00:00:00 2001
From: Mohana Sarmiento <mo.sarmiento@utoronto.ca>
Date: Tue, 21 Jan 2025 16:26:01 -0500
Subject: [PATCH 1087/1286] Add unit test

---
 .../core/data/bitstream-data.service.spec.ts  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 95fe5f593f..35fb398980 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -16,6 +16,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
@@ -176,4 +177,30 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
     });
   });
+
+  describe('findByItemHandle', () => {
+    it('should encode the filename correctly in the search parameters', () => {
+      const handle = '123456789/1234';
+      const sequenceId = '5';
+      const filename = 'file with spaces.pdf';
+      const searchParams = [
+        new RequestParam('handle', handle),
+        new RequestParam('sequenceId', sequenceId),
+        new RequestParam('filename', filename),
+      ];
+      const linksToFollow: FollowLinkConfig<Bitstream>[] = [];
+
+      spyOn(service as any, 'getSearchByHref').and.callThrough();
+
+      service.getSearchByHref('byItemHandle', { searchParams }, ...linksToFollow).subscribe((href) => {
+        expect(service.getSearchByHref).toHaveBeenCalledWith(
+          'byItemHandle',
+          { searchParams },
+          ...linksToFollow,
+        );
+
+        expect(href).toBe(`${url}/bitstreams/search/byItemHandle?handle=123456789%2F1234&sequenceId=5&filename=file%20with%20spaces.pdf`);
+      });
+    });
+  });
 });

From 09d7a7f257bd1c8f3ed8cd0eeaf99baeb2b88a3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:45:08 +0000
Subject: [PATCH 1088/1286] Bump sass from 1.83.1 to 1.83.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.83.1 to 1.83.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.83.1...1.83.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index 904bcc5c74..27c012e3a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.83.1",
+        "sass": "~1.83.4",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -20477,10 +20477,11 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.83.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
-      "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
+      "version": "1.83.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
+      "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
diff --git a/package.json b/package.json
index 482a400bcb..b207bb87c4 100644
--- a/package.json
+++ b/package.json
@@ -229,7 +229,7 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.83.1",
+    "sass": "~1.83.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From 6cb3e8bbfb3e7356e5a9f18b15c7e477be8cb23a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:47:21 +0000
Subject: [PATCH 1089/1286] Bump postcss from 8.4.49 to 8.5.1 in the postcss
 group

Bumps the postcss group with 1 update: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.49 to 8.5.1
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.49...8.5.1)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: postcss
...

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

diff --git a/package.json b/package.json
index ce5449fa33..980a98c209 100644
--- a/package.json
+++ b/package.json
@@ -177,7 +177,7 @@
     "ng-mocks": "^14.13.2",
     "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
-    "postcss": "^8.4",
+    "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..39c6f0378d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8336,10 +8336,10 @@ mute-stream@0.0.8:
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.6, nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+nanoid@^3.3.6, nanoid@^3.3.8:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -9438,12 +9438,12 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4.19, postcss@^8.5:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
+  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
   dependencies:
-    nanoid "^3.3.7"
+    nanoid "^3.3.8"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 

From fc2d3f0a233b70b5bbf0857fa22c7fb7a3c4951e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:47:29 +0000
Subject: [PATCH 1090/1286] Bump sass from 1.83.1 to 1.83.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.83.1 to 1.83.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.83.1...1.83.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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 ce5449fa33..758d467bf6 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.83.1",
+    "sass": "~1.83.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 96b6665499..7e9df932cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10255,10 +10255,10 @@ sass@1.58.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.83.1:
-  version "1.83.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
-  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
+sass@^1.25.0, sass@~1.83.4:
+  version "1.83.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.4.tgz#5ccf60f43eb61eeec300b780b8dcb85f16eec6d1"
+  integrity sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==
   dependencies:
     chokidar "^4.0.0"
     immutable "^5.0.2"

From d9269c7d28e7a93b10b4a874e3a55fa830ee564b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 23:47:29 +0000
Subject: [PATCH 1091/1286] Bump sass from 1.83.1 to 1.83.4 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.83.1 to 1.83.4
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.83.1...1.83.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: sass
...

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 f1fb80645d..20af278c83 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "sass": "~1.83.1",
+    "sass": "~1.83.4",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
diff --git a/yarn.lock b/yarn.lock
index 65804167db..971f5a5751 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9750,10 +9750,10 @@ sass@1.71.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@^1.25.0, sass@~1.83.1:
-  version "1.83.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
-  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
+sass@^1.25.0, sass@~1.83.4:
+  version "1.83.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.4.tgz#5ccf60f43eb61eeec300b780b8dcb85f16eec6d1"
+  integrity sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==
   dependencies:
     chokidar "^4.0.0"
     immutable "^5.0.2"

From bef9ff1ee00abe93467b68c4fd4fa06552e2238d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:45:23 +0000
Subject: [PATCH 1092/1286] Bump isbot from 5.1.17 to 5.1.21

Bumps [isbot](https://github.com/omrilotan/isbot) from 5.1.17 to 5.1.21.
- [Changelog](https://github.com/omrilotan/isbot/blob/main/CHANGELOG.md)
- [Commits](https://github.com/omrilotan/isbot/compare/v5.1.17...v5.1.21)

---
updated-dependencies:
- dependency-name: isbot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 f1fb80645d..dff306a94a 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.17",
+    "isbot": "^5.1.21",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 65804167db..7c337d69db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6830,10 +6830,10 @@ isbinaryfile@^4.0.8:
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
-isbot@^5.1.17:
-  version "5.1.17"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
-  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
+isbot@^5.1.21:
+  version "5.1.21"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.21.tgz#4e27526a71c8b9c243b1c7a6445ad4267fa83728"
+  integrity sha512-0q3naRVpENL0ReKHeNcwn/G7BDynp0DqZUckKyFtM9+hmpnPqgm8+8wbjiVZ0XNhq1wPQV28/Pb8Snh5adeUHA==
 
 isexe@^2.0.0:
   version "2.0.0"

From e24e72c3bb0909d4cecb785090f090c0e98f9dc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:45:40 +0000
Subject: [PATCH 1093/1286] Bump mirador from 3.4.2 to 3.4.3

Bumps [mirador](https://github.com/ProjectMirador/mirador) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/ProjectMirador/mirador/releases)
- [Commits](https://github.com/ProjectMirador/mirador/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: mirador
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 f1fb80645d..7312cd8cda 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "mirador": "^3.4.2",
+    "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 65804167db..576362fa89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7830,10 +7830,10 @@ mirador-share-plugin@^0.16.0:
   dependencies:
     notistack "^3.0.1"
 
-mirador@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.2.tgz#51ec7ca1b9854792bbe2fa5e13b3692c92e97102"
-  integrity sha512-Gd7G4NkXq6/qD/De5soYspSo9VykAzrGFunKqUI3x9WShoZP23pYIEPoC/96tvfk3KMv+UbAUxDp99Xeo7vnVQ==
+mirador@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/mirador/-/mirador-3.4.3.tgz#1b083bd037b851d1389758f3c86eb94832b00ec6"
+  integrity sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==
   dependencies:
     "@material-ui/core" "^4.12.3"
     "@material-ui/icons" "^4.9.1"

From 6a1e1bfa8bb1a1e10ffb4d782b515db5757758e4 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <152612515+FrancescoMolinaro@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:07:15 +0100
Subject: [PATCH 1094/1286] Exclude search and browse from Angular SSR (#3709)

* [DURACOM-303] prevent possibly long-lasting search and browse calls in SSR

* [DURACOM-303] implement skeleton component for search results

* [DURACOM-303] add skeleton loader for search results and filters

* [DURACOM-303] minor restyle of skeleton for mobile

* [DURACOM-303] fix lint and tests

* [DURACOM-303] adapt tests

* [DURACOM-303] restyle skeleton, add filter badge skeleton

* [DURACOM-303] add loop for filters count

* [DURACOM-303] add grid layout, make SSR enabling configurable, minor restyle of skeletons

* [DURACOM-303] refactor param, add example of configuration

* [DURACOM-303] rename variable, minor code refactor

* [DURACOM-303] add override possibility with input

* [DURACOM-303] fix SSR check on template and on components missing the environment config. Add descriptive comment for skeleton component. Fix JS error on SSR.

* [DURACOM-303] refactor thumbnail's skeleton style
---
 config/config.example.yml                     | 14 ++++
 package.json                                  |  1 +
 .../browse-by-date.component.spec.ts          | 34 +++++++++
 .../browse-by-date.component.ts               | 11 ++-
 .../browse-by-metadata.component.html         |  2 +-
 .../browse-by-metadata.component.spec.ts      | 37 +++++++++-
 .../browse-by-metadata.component.ts           | 20 +++++-
 .../browse-by-title.component.spec.ts         | 35 ++++++++++
 .../browse-by-title.component.ts              | 11 ++-
 .../configuration-search-page.component.ts    |  4 +-
 .../search-filter/search-filter.component.ts  | 30 ++++++--
 .../search-filters.component.html             | 34 ++++++---
 .../search-filters.component.scss             | 12 +++-
 .../search-filters.component.spec.ts          |  3 +
 .../search-filters.component.ts               | 28 ++++++--
 .../search-results-skeleton.component.html    | 38 ++++++++++
 .../search-results-skeleton.component.scss    | 56 +++++++++++++++
 .../search-results-skeleton.component.spec.ts | 32 +++++++++
 .../search-results-skeleton.component.ts      | 70 +++++++++++++++++++
 .../search-results.component.html             | 20 +++++-
 .../search-results.component.scss             | 17 +++++
 .../search-results.component.spec.ts          | 15 +++-
 .../search-results.component.ts               | 38 ++++++++--
 .../shared/search/search.component.spec.ts    | 31 ++++++++
 src/app/shared/search/search.component.ts     | 18 +++++
 .../search-configuration-service.stub.ts      |  4 ++
 src/config/default-app-config.ts              |  1 +
 src/config/search-page-config.interface.ts    |  8 ++-
 src/config/ssr-config.interface.ts            | 10 +++
 src/environments/environment.production.ts    |  2 +
 src/environments/environment.test.ts          |  2 +
 src/environments/environment.ts               |  2 +
 src/styles/_custom_variables.scss             | 12 ++++
 .../search-filters.component.ts               | 10 +--
 .../search-results.component.ts               | 12 ++--
 src/themes/custom/lazy-theme.module.ts        |  3 +
 .../styles/_theme_css_variable_overrides.scss |  1 +
 yarn.lock                                     |  7 ++
 38 files changed, 634 insertions(+), 51 deletions(-)
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
 create mode 100644 src/app/shared/search/search-results/search-results.component.scss

diff --git a/config/config.example.yml b/config/config.example.yml
index 139c4e7ebc..40ce9af094 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -25,6 +25,14 @@ ssr:
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
   paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false,
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false,
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
@@ -450,6 +458,12 @@ search:
     enabled: false
     # List of filters to enable in "Advanced Search" dropdown
     filter: [ 'title', 'author', 'subject', 'entityType' ]
+  #
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
 
 
 # Notify metrics
diff --git a/package.json b/package.json
index f1fb80645d..a677cdeff8 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,7 @@
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",
     "ngx-pagination": "6.0.3",
+    "ngx-skeleton-loader": "^9.0.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.8",
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
index edd7cd951a..fad573705c 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
@@ -2,10 +2,13 @@ import { CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -26,6 +29,7 @@ import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -123,6 +127,7 @@ describe('BrowseByDateComponent', () => {
         { provide: ChangeDetectorRef, useValue: mockCdRef },
         { provide: Store, useValue: {} },
         { provide: APP_CONFIG, useValue: environment },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -172,4 +177,33 @@ describe('BrowseByDateComponent', () => {
     //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
     expect(comp.startsWithOptions[0]).toEqual(1960);
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index 11818ff5f1..5c14f2109c 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -7,6 +8,7 @@ import {
   Component,
   Inject,
   OnInit,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -17,6 +19,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
   combineLatest as observableCombineLatest,
   Observable,
+  of as observableOf,
 } from 'rxjs';
 import {
   map,
@@ -28,6 +31,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import {
@@ -99,11 +103,16 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     public dsoNameService: DSONameService,
     protected cdRef: ChangeDetectorRef,
+    @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
index 22e564ac27..6642b724bb 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -1,4 +1,4 @@
-<section class="comcol-page-browse-section">
+<section class="comcol-page-browse-section" *ngIf="(!ssrRenderingDisabled)">
   <div class="browse-by-metadata w-100">
     <ds-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
                          title="{{'browse.title' | translate:{
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
index b6babc97cf..623f1af8aa 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
@@ -1,8 +1,13 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -147,6 +152,7 @@ describe('BrowseByMetadataComponent', () => {
         { provide: ThemeService, useValue: getMockThemeService() },
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: {} },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -259,6 +265,35 @@ describe('BrowseByMetadataComponent', () => {
       expect(result.fetchThumbnail).toBeTrue();
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = true;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = false;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index d17c2a1a7b..1ec1cfd35c 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -9,6 +10,7 @@ import {
   OnChanges,
   OnDestroy,
   OnInit,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -33,6 +35,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
@@ -114,6 +117,11 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() displayTitle = true;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
   /**
@@ -194,6 +202,10 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    * Observable determining if the loading animation needs to be shown
    */
   loading$ = observableOf(true);
+  /**
+   * Whether this component should be rendered or not in SSR
+   */
+  ssrRenderingDisabled = false;
 
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
@@ -202,6 +214,7 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
@@ -209,11 +222,15 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
       currentPage: 1,
       pageSize: this.appConfig.browseBy.pageSize,
     });
+    this.ssrRenderingDisabled = !this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId);
   }
 
 
   ngOnInit(): void {
-
+    if (this.ssrRenderingDisabled) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
@@ -336,7 +353,6 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
     this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
-
 }
 
 /**
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
index e2e022391a..1b6d96d3f8 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
@@ -5,7 +5,9 @@ import {
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -23,6 +25,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -81,6 +84,7 @@ describe('BrowseByTitleComponent', () => {
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
+    queryParams: observableOf({}),
     data: observableOf({ metadata: 'title' }),
   });
 
@@ -127,4 +131,35 @@ describe('BrowseByTitleComponent', () => {
       expect(result.payload.page).toEqual(mockItems);
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+      fixture.detectChanges();
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      fixture.detectChanges();
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index 296386d9d9..1e8f822b11 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -8,12 +9,16 @@ import {
 } from '@angular/core';
 import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+} from 'rxjs';
 import {
   map,
   take,
 } from 'rxjs/operators';
 
+import { environment } from '../../../environments/environment';
 import {
   SortDirection,
   SortOptions,
@@ -59,6 +64,10 @@ import {
 export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index afbe34d550..89d408542a 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  PLATFORM_ID,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -57,7 +58,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig, platformId);
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index cc8d05e459..734e372e5b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -6,11 +6,13 @@ import {
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Inject,
   Input,
   OnChanges,
   OnDestroy,
   OnInit,
+  Output,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -78,6 +80,8 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() scope: string;
 
+  @Output() isVisibilityComputed = new EventEmitter<boolean>();
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -136,11 +140,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
     this.active$ = this.isActive();
     this.collapsed$ = this.isCollapsed();
     this.initializeFilter();
-    this.subs.push(this.appliedFilters$.pipe(take(1)).subscribe((selectedValues: AppliedFilter[]) => {
-      if (isNotEmpty(selectedValues)) {
-        this.filterService.expand(this.filter.name);
-      }
-    }));
+    this.subs.push(
+      this.appliedFilters$.subscribe((selectedValues: AppliedFilter[]) => {
+        if (isNotEmpty(selectedValues)) {
+          this.filterService.expand(this.filter.name);
+        }
+      }),
+      this.getIsActive().pipe(take(1)).subscribe(() => {
+        this.isVisibilityComputed.emit(true);
+      }),
+    );
   }
 
   ngOnChanges(): void {
@@ -223,6 +232,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
    */
   isActive(): Observable<boolean> {
+    return this.getIsActive().pipe(
+      startWith(true),
+    );
+  }
+
+  /**
+   * Return current filter visibility
+   * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
+   */
+  private getIsActive():  Observable<boolean> {
     return combineLatest([
       this.appliedFilters$,
       this.searchConfigService.searchOptions,
@@ -243,7 +262,6 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
           );
         }
       }),
-      startWith(true),
     );
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index dc2ab1f6da..a9afaf7e5e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,10 +1,24 @@
-<h3 *ngIf="inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h3>
-<h2 *ngIf="!inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h2>
-<div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
-    </div>
-</div>
-<button *ngIf="inPlaceSearch" class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
-  <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
-</button>
+@if (inPlaceSearch) {
+  <h3>{{filterLabel+'.filters.head' | translate}}</h3>
+} @else {
+  <h2>{{filterLabel+'.filters.head' | translate}}</h2>
+}
+
+@if ((filters | async)?.hasSucceeded) {
+  <div [class.visually-hidden]="filtersWithComputedVisibility !== (filters | async)?.payload?.length">
+    @for (filter of (filters | async)?.payload; track filter.name) {
+      <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+    }
+  </div>
+}
+
+@if(filtersWithComputedVisibility !== (filters | async)?.payload?.length) {
+  <ngx-skeleton-loader [count]="defaultFilterCount"/>
+}
+
+@if (inPlaceSearch) {
+  <button class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
+    <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
+  </button>
+}
+
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index b5b2816e89..6170b9281c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -1,2 +1,12 @@
 @import '../../../../styles/variables';
-@import '../../../../styles/mixins';
\ No newline at end of file
+@import '../../../../styles/mixins';
+
+:host ::ng-deep {
+  ngx-skeleton-loader .skeleton-loader {
+    height: var(--ds-filters-skeleton-height);
+    margin-bottom: var(--ds-filters-skeleton-spacing);
+    padding: var(--ds-filters-skeleton-spacing);
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 0277551eea..878b3a5f7e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -11,6 +11,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@@ -41,6 +43,7 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFilters },
+        { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).overrideComponent(SearchFiltersComponent, {
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 97358ea8e9..dad3bffb75 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -14,19 +10,23 @@ import {
   RouterLink,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
 import { RemoteData } from '../../../core/data/remote-data';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { currentPath } from '../../utils/route.utils';
-import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component';
 import { AppliedFilter } from '../models/applied-filter.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
 import { SearchFilterComponent } from './search-filter/search-filter.component';
@@ -36,7 +36,7 @@ import { SearchFilterComponent } from './search-filter/search-filter.component';
   styleUrls: ['./search-filters.component.scss'],
   templateUrl: './search-filters.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 /**
@@ -81,15 +81,23 @@ export class SearchFiltersComponent implements OnInit {
    */
   searchLink: string;
 
+  /**
+   * Filters for which visibility has been computed
+   */
+  filtersWithComputedVisibility = 0;
+
   subs = [];
   filterLabel = 'search';
+  defaultFilterCount: number;
 
   constructor(
     protected searchService: SearchService,
     protected searchFilterService: SearchFilterService,
     protected router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) protected searchConfigService: SearchConfigurationService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
+    this.defaultFilterCount = this.appConfig.search.filterPlaceholdersCount ?? 5;
   }
 
   ngOnInit(): void {
@@ -125,4 +133,10 @@ export class SearchFiltersComponent implements OnInit {
       this.searchFilterService.minimizeAll();
     }
   }
+
+  countFiltersWithComputedVisibility(computed: boolean) {
+    if (computed) {
+      this.filtersWithComputedVisibility += 1;
+    }
+  }
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
new file mode 100644
index 0000000000..a42bda0674
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -0,0 +1,38 @@
+<div class="row flex-nowrap">
+  <div [class.mb-2]="(viewMode$ | async) === ViewMode.ListElement" class="info-skeleton col-12">
+    <ngx-skeleton-loader/>
+  </div>
+</div>
+
+@if((viewMode$ | async) === ViewMode.ListElement) {
+  @for (result of loadingResults; track result; let first = $first) {
+      <div [class.my-4]="!first" class="row">
+      @if(showThumbnails) {
+        <div class="col-3 col-md-2">
+          <div class="thumbnail-skeleton position-relative">
+            <ngx-skeleton-loader/>
+          </div>
+        </div>
+      }
+      <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
+        <div class="badge-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+        <div class="text-skeleton">
+          <ngx-skeleton-loader [count]="textLineCount"/>
+        </div>
+      </div>
+    </div>
+  }
+} @else if ((viewMode$ | async) === ViewMode.GridElement) {
+  <div class="card-columns row">
+    @for (result of loadingResults; track result) {
+      <div class="card-column col col-sm-6 col-lg-4">
+        <div class="card-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+      </div>
+    }
+
+  </div>
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
new file mode 100644
index 0000000000..9345f1ab43
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -0,0 +1,56 @@
+:host ::ng-deep {
+  --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
+
+  .info-skeleton, .badge-skeleton, .text-skeleton{
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+
+  .badge-skeleton, .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-badge-width);
+    }
+  }
+
+  .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-info-width);
+    }
+  }
+
+  .thumbnail-skeleton {
+    max-width: var(--ds-thumbnail-max-width);
+    height: 100%;
+
+    ngx-skeleton-loader .skeleton-loader {
+      margin-right: var(--ds-search-skeleton-thumbnail-margin);
+      border-radius: 0;
+      height: 100%;
+    }
+  }
+
+  .card-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-card-height);
+    }
+  }
+
+  ngx-skeleton-loader .skeleton-loader {
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+
+  .card-columns {
+    margin-left: calc(-1 * var(--ds-wrapper-grid-spacing));
+    margin-right: calc(-1 * var(--ds-wrapper-grid-spacing));
+    column-gap: 0;
+
+    .card-column {
+      padding-left: var(--ds-wrapper-grid-spacing);
+      padding-right: var(--ds-wrapper-grid-spacing);
+    }
+  }
+}
+
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
new file mode 100644
index 0000000000..68c8db5a8e
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -0,0 +1,32 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
+
+describe('SearchResultsSkeletonComponent', () => {
+  let component: SearchResultsSkeletonComponent;
+  let fixture: ComponentFixture<SearchResultsSkeletonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+      providers: [
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SearchResultsSkeletonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
new file mode 100644
index 0000000000..3fba70b119
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -0,0 +1,70 @@
+import {
+  AsyncPipe,
+  NgForOf,
+} from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { Observable } from 'rxjs';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { hasValue } from '../../../empty.util';
+
+@Component({
+  selector: 'ds-search-results-skeleton',
+  standalone: true,
+  imports: [
+    NgxSkeletonLoaderModule,
+    AsyncPipe,
+    NgForOf,
+  ],
+  templateUrl: './search-results-skeleton.component.html',
+  styleUrl: './search-results-skeleton.component.scss',
+})
+/**
+ * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
+ */
+export class SearchResultsSkeletonComponent implements OnInit {
+  /**
+   * Whether the search result contains thumbnail
+   */
+  @Input()
+  showThumbnails: boolean;
+  /**
+   * The number of search result loaded in the current page
+   */
+  @Input()
+  numberOfResults = 0;
+  /**
+   * How many placeholder are displayed for the search result text
+   */
+  @Input()
+  textLineCount = 2;
+  /**
+   * The view mode of the search page
+   */
+  public viewMode$: Observable<ViewMode>;
+  /**
+   * Array built from numberOfResults to count and iterate based on index
+   */
+  public loadingResults: number[];
+
+  protected readonly ViewMode = ViewMode;
+
+  constructor(private searchService: SearchService) {
+    this.viewMode$ = this.searchService.getViewMode();
+  }
+
+  ngOnInit() {
+    this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
+
+    if (!hasValue(this.showThumbnails)) {
+      // this is needed as the default value of show thumbnails is true but set in lower levels of the DOM.
+      this.showThumbnails = true;
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 871b2b2ca8..d56d69761b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,3 +1,15 @@
+@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
+  <div class="row">
+    <div class="col-12">
+      <div class="filters-badge-skeleton-container">
+          <div class="filter-badge-skeleton">
+            <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
+          </div>
+      </div>
+    </div>
+  </div>
+}
+
 <div class="d-flex justify-content-between">
     <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
@@ -19,7 +31,13 @@
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
-<ds-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-loading>
+
+<ds-search-results-skeleton
+  *ngIf="isLoading()"
+  [showThumbnails]="showThumbnails"
+  [numberOfResults]="searchConfig.pagination.pageSize"
+></ds-search-results-skeleton>
+
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..6e369c729b
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -0,0 +1,17 @@
+:host ::ng-deep {
+  .filter-badge-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      background-color: var(--bs-light);
+      box-shadow: none;
+      width: var(--ds-search-skeleton-filter-badge-width);
+      height: var(--ds-search-skeleton-badge-height);
+      margin-bottom: 0;
+      margin-right: calc(var(--bs-spacer) / 4);
+    }
+  }
+
+  .filters-badge-skeleton-container {
+    display: flex;
+    max-height: var(--ds-search-skeleton-badge-height);
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index fedea57e07..33b8432b74 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -13,16 +13,20 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { Community } from '../../../core/shared/community.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { getMockThemeService } from '../../mocks/theme-service.mock';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
 import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 import { ThemeService } from '../../theme-support/theme.service';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
 import { SearchResultsComponent } from './search-results.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -35,6 +39,11 @@ describe('SearchResultsComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         { provide: ThemeService, useValue: getMockThemeService() },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+        {
+          provide: SearchConfigurationService,
+          useValue: new SearchConfigurationServiceStub(),
+        },
       ],
       imports: [
         TranslateModule.forRoot(),
@@ -48,8 +57,8 @@ describe('SearchResultsComponent', () => {
           imports: [
             SearchExportCsvComponent,
             ObjectCollectionComponent,
-            ThemedLoadingComponent,
             ErrorComponent,
+            SearchResultsSkeletonComponent,
           ],
         },
         add: { imports: [QueryParamsDirectiveStub] },
@@ -96,7 +105,7 @@ describe('SearchResultsComponent', () => {
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
-    (comp as any).searchConfig = { query: 'foobar' };
+    (comp as any).searchConfig = { query: 'foobar', pagination: { pageSize: 10 } };
     fixture.detectChanges();
 
     const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 09186e8c6c..f9da77ed75 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,4 +1,7 @@
-import { NgIf } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -7,12 +10,19 @@ import {
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import {
   fadeIn,
@@ -23,13 +33,15 @@ import {
   isNotEmpty,
 } from '../../empty.util';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { AppliedFilter } from '../models/applied-filter.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 import { SearchResult } from '../models/search-result.model';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -39,12 +51,13 @@ export interface SelectionConfig {
 @Component({
   selector: 'ds-base-search-results',
   templateUrl: './search-results.component.html',
+  styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
 })
 
 /**
@@ -52,6 +65,15 @@ export interface SelectionConfig {
  */
 export class SearchResultsComponent {
   hasNoValue = hasNoValue;
+  /**
+   * Currently active filters in url
+   */
+  activeFilters$: Observable<SearchFilter[]>;
+
+  /**
+   * Filter applied to show labels, once populated the activeFilters$ will be loaded
+   */
+  appliedFilters$: BehaviorSubject<AppliedFilter[]>;
 
   /**
    * The link type of the listed search results
@@ -125,10 +147,18 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  constructor(
+    protected searchConfigService: SearchConfigurationService,
+    protected searchService: SearchService,
+  ) {
+    this.activeFilters$ = this.searchConfigService.getCurrentFilters();
+    this.appliedFilters$ = this.searchService.appliedFilters$;
+  }
+
   /**
    * Check if search results are loading
    */
-  isLoading() {
+  isLoading(): boolean {
     return !this.showError() && (hasNoValue(this.searchResults) || hasNoValue(this.searchResults.payload) || this.searchResults.isLoading);
   }
 
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 31c8a6e9b8..8b533b4105 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectionStrategy,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -246,6 +247,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       },
       { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       { provide: APP_CONFIG, useValue: environment },
+      { provide: PLATFORM_ID, useValue: 'browser' },
     ],
     schemas: [NO_ERRORS_SCHEMA],
   }).overrideComponent(compType, {
@@ -415,5 +417,34 @@ describe('SearchComponent', () => {
         expect(result).toBeNull();
       });
     });
+
+    describe('when rendered in SSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'server';
+      });
+
+      it('should not call search method on init', (done) => {
+        comp.ngOnInit();
+        //Check that the first method from which the search depend upon is not being called
+        expect(searchConfigurationServiceStub.getCurrentConfiguration).not.toHaveBeenCalled();
+        comp.initialized$.subscribe((res) => {
+          expect(res).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('when rendered in CSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'browser';
+      });
+
+      it('should call search method on init', fakeAsync(() => {
+        comp.ngOnInit();
+        tick(100);
+        //Check that the last method from which the search depend upon is being called
+        expect(searchServiceStub.search).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 337cb67171..45c7eb6f7e 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
@@ -12,6 +13,7 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   NavigationStart,
@@ -37,6 +39,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { SortOptions } from '../../core/cache/models/sort-options.model';
@@ -236,6 +239,11 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   @Input() hideScopeInUrl: boolean;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   /**
    * The current configuration used during the search
    */
@@ -251,6 +259,7 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   currentScope$: Observable<string>;
 
+
   /**
    * The current sort options used
    */
@@ -345,6 +354,7 @@ export class SearchComponent implements OnDestroy, OnInit {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
@@ -357,6 +367,14 @@ export class SearchComponent implements OnDestroy, OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableSearchComponent && isPlatformServer(this.platformId)) {
+      this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
+        this.searchOptions$.next(options);
+      }));
+      this.initialized$.next(true);
+      return;
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index c567808e87..426dc72930 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -26,6 +26,10 @@ export class SearchConfigurationServiceStub {
     return observableOf([]);
   }
 
+  getCurrentFilters() {
+    return observableOf([]);
+  }
+
   getCurrentScope(a) {
     return observableOf('test-id');
   }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3455ef5f92..3c5e0ef0da 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -516,6 +516,7 @@ export class DefaultAppConfig implements AppConfig {
       enabled: false,
       filter: ['title', 'author', 'subject', 'entityType'],
     },
+    filterPlaceholdersCount: 5,
   };
 
   notifyMetrics: AdminNotifyMetricsRow[] = [
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index 699e3fd61f..55733c98e4 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -8,5 +8,11 @@ export interface SearchConfig extends Config {
      * Used by {@link UploadBitstreamComponent}.
      */
     advancedFilters: AdvancedSearchConfig;
-
+    /**
+     * Number used to render n UI elements called loading skeletons that act as placeholders.
+     * These elements indicate that some content will be loaded in their stead.
+     * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+     * For instance if we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+     */
+    filterPlaceholdersCount?: number;
 }
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 1a01e4d125..4def73962a 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -25,4 +25,14 @@ export interface SSRConfig extends Config {
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
   paths: Array<string>;
+
+  /**
+   * Whether to enable rendering of search component on SSR
+   */
+  enableSearchComponent: boolean;
+
+  /**
+   * Whether to enable rendering of browse component on SSR
+   */
+  enableBrowseComponent: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 35b0d39408..8159fff2ea 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,5 +9,7 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 84229aa659..17d4e8ed10 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -13,6 +13,8 @@ export const environment: BuildConfig = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 
   // Angular express server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a02ef4a2a9..4ac586d899 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,6 +14,8 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 770afc8aa0..35f361e0f6 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -151,4 +151,16 @@
   --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
   --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
   --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
+
+  --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-badge-height: 18px;
+  --ds-search-skeleton-thumbnail-margin: 1em;
+  --ds-search-skeleton-text-line-count: 2;
+  --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-filter-badge-width: 200px;
+  --ds-search-skeleton-info-width: 200px;
+  --ds-search-skeleton-card-height: 435px;
+
+  --ds-filters-skeleton-height: 40px;
+  --ds-filters-skeleton-spacing: 12px;
 }
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
index 5b10c84145..3e86e16c01 100644
--- a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
@@ -5,18 +5,14 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
-import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component';
 import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component';
 import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';
 
@@ -34,7 +30,7 @@ import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/s
     },
   ],
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 export class SearchFiltersComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index b72297f32f..e2c4427744 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,29 +1,33 @@
-import { NgIf } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import {
   fadeIn,
   fadeInOut,
 } from '../../../../../../app/shared/animations/fade';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
-import { ThemedLoadingComponent } from '../../../../../../app/shared/loading/themed-loading.component';
 import { ObjectCollectionComponent } from '../../../../../../app/shared/object-collection/object-collection.component';
 import { SearchExportCsvComponent } from '../../../../../../app/shared/search/search-export-csv/search-export-csv.component';
 import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
+import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 
 @Component({
   selector: 'ds-themed-search-results',
   // templateUrl: './search-results.component.html',
   templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html',
-  // styleUrls: ['./search-results.component.scss'],
+  styleUrls: ['../../../../../../app/shared/search/search-results/search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent,  SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index cb80948daf..0394c672f6 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -12,6 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { RootModule } from '../../app/root.module';
+import { SearchResultsSkeletonComponent } from '../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
@@ -103,6 +104,7 @@ import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workf
 import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 import { WorkspaceItemsDeletePageComponent } from './app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
 
+
 const DECLARATIONS = [
   FileSectionComponent,
   HomePageComponent,
@@ -194,6 +196,7 @@ const DECLARATIONS = [
   ProfilePageMetadataFormComponent,
   SubmissionUploadFilesComponent,
   ComcolPageContentComponent,
+  SearchResultsSkeletonComponent,
 ];
 
 @NgModule({
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 63a5535d95..863db57833 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -18,6 +18,7 @@
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
   in order to keep the bottom border of the header when navbar is expanded */
+
   --ds-expandable-navbar-border-top-color: #{$white};
   --ds-expandable-navbar-border-top-height: 0;
   --ds-expandable-navbar-padding-top: 0;
diff --git a/yarn.lock b/yarn.lock
index 65804167db..6ed7d5a72d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8003,6 +8003,13 @@ ngx-pagination@6.0.3:
   dependencies:
     tslib "^2.3.0"
 
+ngx-skeleton-loader@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-skeleton-loader/-/ngx-skeleton-loader-9.0.0.tgz#43f3235130c3b81c7191aa363aba12f4d7cd1b29"
+  integrity sha512-aO4/V6oGdZGNcTjasTg/fwzJJYl/ZmNKgCukOEQdUK3GSFOZtB/3GGULMJuZ939hk3Hzqh1OBiLfIM1SqTfhqg==
+  dependencies:
+    tslib "^2.0.0"
+
 ngx-ui-switch@^14.1.0:
   version "14.1.0"
   resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"

From 17ecc592f3b43b4cb1f83655e735ff44340580b8 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <152612515+FrancescoMolinaro@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:07:15 +0100
Subject: [PATCH 1095/1286] Exclude search and browse from Angular SSR (#3709)

* [DURACOM-303] prevent possibly long-lasting search and browse calls in SSR

* [DURACOM-303] implement skeleton component for search results

* [DURACOM-303] add skeleton loader for search results and filters

* [DURACOM-303] minor restyle of skeleton for mobile

* [DURACOM-303] fix lint and tests

* [DURACOM-303] adapt tests

* [DURACOM-303] restyle skeleton, add filter badge skeleton

* [DURACOM-303] add loop for filters count

* [DURACOM-303] add grid layout, make SSR enabling configurable, minor restyle of skeletons

* [DURACOM-303] refactor param, add example of configuration

* [DURACOM-303] rename variable, minor code refactor

* [DURACOM-303] add override possibility with input

* [DURACOM-303] fix SSR check on template and on components missing the environment config. Add descriptive comment for skeleton component. Fix JS error on SSR.

* [DURACOM-303] refactor thumbnail's skeleton style
---
 config/config.example.yml                     | 14 ++++
 package-lock.json                             | 14 ++++
 package.json                                  |  1 +
 .../browse-by-date.component.spec.ts          | 34 +++++++++
 .../browse-by-date.component.ts               | 11 ++-
 .../browse-by-metadata.component.html         |  2 +-
 .../browse-by-metadata.component.spec.ts      | 37 +++++++++-
 .../browse-by-metadata.component.ts           | 20 +++++-
 .../browse-by-title.component.spec.ts         | 35 ++++++++++
 .../browse-by-title.component.ts              | 11 ++-
 .../configuration-search-page.component.ts    |  4 +-
 .../search-filter/search-filter.component.ts  | 30 ++++++--
 .../search-filters.component.html             | 34 ++++++---
 .../search-filters.component.scss             | 12 +++-
 .../search-filters.component.spec.ts          |  3 +
 .../search-filters.component.ts               | 28 ++++++--
 .../search-results-skeleton.component.html    | 38 ++++++++++
 .../search-results-skeleton.component.scss    | 56 +++++++++++++++
 .../search-results-skeleton.component.spec.ts | 32 +++++++++
 .../search-results-skeleton.component.ts      | 70 +++++++++++++++++++
 .../search-results.component.html             | 20 +++++-
 .../search-results.component.scss             | 17 +++++
 .../search-results.component.spec.ts          | 15 +++-
 .../search-results.component.ts               | 38 ++++++++--
 .../shared/search/search.component.spec.ts    | 31 ++++++++
 src/app/shared/search/search.component.ts     | 18 +++++
 .../search-configuration-service.stub.ts      |  4 ++
 src/config/default-app-config.ts              |  1 +
 src/config/search-page-config.interface.ts    |  8 ++-
 src/config/ssr-config.interface.ts            | 10 +++
 src/environments/environment.production.ts    |  2 +
 src/environments/environment.test.ts          |  2 +
 src/environments/environment.ts               |  2 +
 src/styles/_custom_variables.scss             | 12 ++++
 .../search-filters.component.ts               | 10 +--
 .../search-results.component.ts               | 12 ++--
 src/themes/custom/lazy-theme.module.ts        |  3 +
 .../styles/_theme_css_variable_overrides.scss |  1 +
 38 files changed, 641 insertions(+), 51 deletions(-)
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
 create mode 100644 src/app/shared/search/search-results/search-results.component.scss

diff --git a/config/config.example.yml b/config/config.example.yml
index 3ae2c51cae..099bea2614 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -25,6 +25,14 @@ ssr:
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
   paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false,
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false,
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
@@ -450,6 +458,12 @@ search:
     enabled: false
     # List of filters to enable in "Advanced Search" dropdown
     filter: [ 'title', 'author', 'subject', 'entityType' ]
+  #
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
 
 
 # Notify metrics
diff --git a/package-lock.json b/package-lock.json
index 904bcc5c74..48ef9fa63b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,6 +67,7 @@
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^16.0.0",
         "ngx-pagination": "6.0.3",
+        "ngx-skeleton-loader": "^9.0.0",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
         "orejime": "^2.3.1",
@@ -16941,6 +16942,19 @@
         "@angular/core": ">=13.0.0"
       }
     },
+    "node_modules/ngx-skeleton-loader": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-9.0.0.tgz",
+      "integrity": "sha512-aO4/V6oGdZGNcTjasTg/fwzJJYl/ZmNKgCukOEQdUK3GSFOZtB/3GGULMJuZ939hk3Hzqh1OBiLfIM1SqTfhqg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=16.0.0",
+        "@angular/core": ">=16.0.0"
+      }
+    },
     "node_modules/ngx-ui-switch": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz",
diff --git a/package.json b/package.json
index 482a400bcb..e56780a76d 100644
--- a/package.json
+++ b/package.json
@@ -154,6 +154,7 @@
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",
     "ngx-pagination": "6.0.3",
+    "ngx-skeleton-loader": "^9.0.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "orejime": "^2.3.1",
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
index edd7cd951a..fad573705c 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
@@ -2,10 +2,13 @@ import { CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -26,6 +29,7 @@ import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -123,6 +127,7 @@ describe('BrowseByDateComponent', () => {
         { provide: ChangeDetectorRef, useValue: mockCdRef },
         { provide: Store, useValue: {} },
         { provide: APP_CONFIG, useValue: environment },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -172,4 +177,33 @@ describe('BrowseByDateComponent', () => {
     //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
     expect(comp.startsWithOptions[0]).toEqual(1960);
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index 11818ff5f1..5c14f2109c 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -7,6 +8,7 @@ import {
   Component,
   Inject,
   OnInit,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -17,6 +19,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
   combineLatest as observableCombineLatest,
   Observable,
+  of as observableOf,
 } from 'rxjs';
 import {
   map,
@@ -28,6 +31,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import {
@@ -99,11 +103,16 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     public dsoNameService: DSONameService,
     protected cdRef: ChangeDetectorRef,
+    @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
index 22e564ac27..6642b724bb 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -1,4 +1,4 @@
-<section class="comcol-page-browse-section">
+<section class="comcol-page-browse-section" *ngIf="(!ssrRenderingDisabled)">
   <div class="browse-by-metadata w-100">
     <ds-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
                          title="{{'browse.title' | translate:{
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
index b6babc97cf..623f1af8aa 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
@@ -1,8 +1,13 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -147,6 +152,7 @@ describe('BrowseByMetadataComponent', () => {
         { provide: ThemeService, useValue: getMockThemeService() },
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: {} },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -259,6 +265,35 @@ describe('BrowseByMetadataComponent', () => {
       expect(result.fetchThumbnail).toBeTrue();
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = true;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = false;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index d17c2a1a7b..1ec1cfd35c 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -9,6 +10,7 @@ import {
   OnChanges,
   OnDestroy,
   OnInit,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -33,6 +35,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
@@ -114,6 +117,11 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() displayTitle = true;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
   /**
@@ -194,6 +202,10 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    * Observable determining if the loading animation needs to be shown
    */
   loading$ = observableOf(true);
+  /**
+   * Whether this component should be rendered or not in SSR
+   */
+  ssrRenderingDisabled = false;
 
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
@@ -202,6 +214,7 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
@@ -209,11 +222,15 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
       currentPage: 1,
       pageSize: this.appConfig.browseBy.pageSize,
     });
+    this.ssrRenderingDisabled = !this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId);
   }
 
 
   ngOnInit(): void {
-
+    if (this.ssrRenderingDisabled) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
@@ -336,7 +353,6 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
     this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
-
 }
 
 /**
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
index e2e022391a..1b6d96d3f8 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
@@ -5,7 +5,9 @@ import {
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -23,6 +25,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -81,6 +84,7 @@ describe('BrowseByTitleComponent', () => {
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
+    queryParams: observableOf({}),
     data: observableOf({ metadata: 'title' }),
   });
 
@@ -127,4 +131,35 @@ describe('BrowseByTitleComponent', () => {
       expect(result.payload.page).toEqual(mockItems);
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+      fixture.detectChanges();
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      fixture.detectChanges();
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index 296386d9d9..1e8f822b11 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
 } from '@angular/common';
 import {
@@ -8,12 +9,16 @@ import {
 } from '@angular/core';
 import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+} from 'rxjs';
 import {
   map,
   take,
 } from 'rxjs/operators';
 
+import { environment } from '../../../environments/environment';
 import {
   SortDirection,
   SortOptions,
@@ -59,6 +64,10 @@ import {
 export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index afbe34d550..89d408542a 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -7,6 +7,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  PLATFORM_ID,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -57,7 +58,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig, platformId);
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index cc8d05e459..734e372e5b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -6,11 +6,13 @@ import {
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Inject,
   Input,
   OnChanges,
   OnDestroy,
   OnInit,
+  Output,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -78,6 +80,8 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() scope: string;
 
+  @Output() isVisibilityComputed = new EventEmitter<boolean>();
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -136,11 +140,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
     this.active$ = this.isActive();
     this.collapsed$ = this.isCollapsed();
     this.initializeFilter();
-    this.subs.push(this.appliedFilters$.pipe(take(1)).subscribe((selectedValues: AppliedFilter[]) => {
-      if (isNotEmpty(selectedValues)) {
-        this.filterService.expand(this.filter.name);
-      }
-    }));
+    this.subs.push(
+      this.appliedFilters$.subscribe((selectedValues: AppliedFilter[]) => {
+        if (isNotEmpty(selectedValues)) {
+          this.filterService.expand(this.filter.name);
+        }
+      }),
+      this.getIsActive().pipe(take(1)).subscribe(() => {
+        this.isVisibilityComputed.emit(true);
+      }),
+    );
   }
 
   ngOnChanges(): void {
@@ -223,6 +232,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
    */
   isActive(): Observable<boolean> {
+    return this.getIsActive().pipe(
+      startWith(true),
+    );
+  }
+
+  /**
+   * Return current filter visibility
+   * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
+   */
+  private getIsActive():  Observable<boolean> {
     return combineLatest([
       this.appliedFilters$,
       this.searchConfigService.searchOptions,
@@ -243,7 +262,6 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
           );
         }
       }),
-      startWith(true),
     );
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index dc2ab1f6da..a9afaf7e5e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,10 +1,24 @@
-<h3 *ngIf="inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h3>
-<h2 *ngIf="!inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h2>
-<div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
-    </div>
-</div>
-<button *ngIf="inPlaceSearch" class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
-  <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
-</button>
+@if (inPlaceSearch) {
+  <h3>{{filterLabel+'.filters.head' | translate}}</h3>
+} @else {
+  <h2>{{filterLabel+'.filters.head' | translate}}</h2>
+}
+
+@if ((filters | async)?.hasSucceeded) {
+  <div [class.visually-hidden]="filtersWithComputedVisibility !== (filters | async)?.payload?.length">
+    @for (filter of (filters | async)?.payload; track filter.name) {
+      <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+    }
+  </div>
+}
+
+@if(filtersWithComputedVisibility !== (filters | async)?.payload?.length) {
+  <ngx-skeleton-loader [count]="defaultFilterCount"/>
+}
+
+@if (inPlaceSearch) {
+  <button class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
+    <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
+  </button>
+}
+
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index b5b2816e89..6170b9281c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -1,2 +1,12 @@
 @import '../../../../styles/variables';
-@import '../../../../styles/mixins';
\ No newline at end of file
+@import '../../../../styles/mixins';
+
+:host ::ng-deep {
+  ngx-skeleton-loader .skeleton-loader {
+    height: var(--ds-filters-skeleton-height);
+    margin-bottom: var(--ds-filters-skeleton-spacing);
+    padding: var(--ds-filters-skeleton-spacing);
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 0277551eea..878b3a5f7e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -11,6 +11,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@@ -41,6 +43,7 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFilters },
+        { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).overrideComponent(SearchFiltersComponent, {
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 97358ea8e9..dad3bffb75 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -14,19 +10,23 @@ import {
   RouterLink,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
 import { RemoteData } from '../../../core/data/remote-data';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { currentPath } from '../../utils/route.utils';
-import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component';
 import { AppliedFilter } from '../models/applied-filter.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
 import { SearchFilterComponent } from './search-filter/search-filter.component';
@@ -36,7 +36,7 @@ import { SearchFilterComponent } from './search-filter/search-filter.component';
   styleUrls: ['./search-filters.component.scss'],
   templateUrl: './search-filters.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 /**
@@ -81,15 +81,23 @@ export class SearchFiltersComponent implements OnInit {
    */
   searchLink: string;
 
+  /**
+   * Filters for which visibility has been computed
+   */
+  filtersWithComputedVisibility = 0;
+
   subs = [];
   filterLabel = 'search';
+  defaultFilterCount: number;
 
   constructor(
     protected searchService: SearchService,
     protected searchFilterService: SearchFilterService,
     protected router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) protected searchConfigService: SearchConfigurationService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
+    this.defaultFilterCount = this.appConfig.search.filterPlaceholdersCount ?? 5;
   }
 
   ngOnInit(): void {
@@ -125,4 +133,10 @@ export class SearchFiltersComponent implements OnInit {
       this.searchFilterService.minimizeAll();
     }
   }
+
+  countFiltersWithComputedVisibility(computed: boolean) {
+    if (computed) {
+      this.filtersWithComputedVisibility += 1;
+    }
+  }
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
new file mode 100644
index 0000000000..a42bda0674
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -0,0 +1,38 @@
+<div class="row flex-nowrap">
+  <div [class.mb-2]="(viewMode$ | async) === ViewMode.ListElement" class="info-skeleton col-12">
+    <ngx-skeleton-loader/>
+  </div>
+</div>
+
+@if((viewMode$ | async) === ViewMode.ListElement) {
+  @for (result of loadingResults; track result; let first = $first) {
+      <div [class.my-4]="!first" class="row">
+      @if(showThumbnails) {
+        <div class="col-3 col-md-2">
+          <div class="thumbnail-skeleton position-relative">
+            <ngx-skeleton-loader/>
+          </div>
+        </div>
+      }
+      <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
+        <div class="badge-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+        <div class="text-skeleton">
+          <ngx-skeleton-loader [count]="textLineCount"/>
+        </div>
+      </div>
+    </div>
+  }
+} @else if ((viewMode$ | async) === ViewMode.GridElement) {
+  <div class="card-columns row">
+    @for (result of loadingResults; track result) {
+      <div class="card-column col col-sm-6 col-lg-4">
+        <div class="card-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+      </div>
+    }
+
+  </div>
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
new file mode 100644
index 0000000000..9345f1ab43
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -0,0 +1,56 @@
+:host ::ng-deep {
+  --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
+
+  .info-skeleton, .badge-skeleton, .text-skeleton{
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+
+  .badge-skeleton, .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-badge-width);
+    }
+  }
+
+  .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-info-width);
+    }
+  }
+
+  .thumbnail-skeleton {
+    max-width: var(--ds-thumbnail-max-width);
+    height: 100%;
+
+    ngx-skeleton-loader .skeleton-loader {
+      margin-right: var(--ds-search-skeleton-thumbnail-margin);
+      border-radius: 0;
+      height: 100%;
+    }
+  }
+
+  .card-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-card-height);
+    }
+  }
+
+  ngx-skeleton-loader .skeleton-loader {
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+
+  .card-columns {
+    margin-left: calc(-1 * var(--ds-wrapper-grid-spacing));
+    margin-right: calc(-1 * var(--ds-wrapper-grid-spacing));
+    column-gap: 0;
+
+    .card-column {
+      padding-left: var(--ds-wrapper-grid-spacing);
+      padding-right: var(--ds-wrapper-grid-spacing);
+    }
+  }
+}
+
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
new file mode 100644
index 0000000000..68c8db5a8e
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -0,0 +1,32 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
+
+describe('SearchResultsSkeletonComponent', () => {
+  let component: SearchResultsSkeletonComponent;
+  let fixture: ComponentFixture<SearchResultsSkeletonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+      providers: [
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SearchResultsSkeletonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
new file mode 100644
index 0000000000..3fba70b119
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -0,0 +1,70 @@
+import {
+  AsyncPipe,
+  NgForOf,
+} from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { Observable } from 'rxjs';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { hasValue } from '../../../empty.util';
+
+@Component({
+  selector: 'ds-search-results-skeleton',
+  standalone: true,
+  imports: [
+    NgxSkeletonLoaderModule,
+    AsyncPipe,
+    NgForOf,
+  ],
+  templateUrl: './search-results-skeleton.component.html',
+  styleUrl: './search-results-skeleton.component.scss',
+})
+/**
+ * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
+ */
+export class SearchResultsSkeletonComponent implements OnInit {
+  /**
+   * Whether the search result contains thumbnail
+   */
+  @Input()
+  showThumbnails: boolean;
+  /**
+   * The number of search result loaded in the current page
+   */
+  @Input()
+  numberOfResults = 0;
+  /**
+   * How many placeholder are displayed for the search result text
+   */
+  @Input()
+  textLineCount = 2;
+  /**
+   * The view mode of the search page
+   */
+  public viewMode$: Observable<ViewMode>;
+  /**
+   * Array built from numberOfResults to count and iterate based on index
+   */
+  public loadingResults: number[];
+
+  protected readonly ViewMode = ViewMode;
+
+  constructor(private searchService: SearchService) {
+    this.viewMode$ = this.searchService.getViewMode();
+  }
+
+  ngOnInit() {
+    this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
+
+    if (!hasValue(this.showThumbnails)) {
+      // this is needed as the default value of show thumbnails is true but set in lower levels of the DOM.
+      this.showThumbnails = true;
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 871b2b2ca8..d56d69761b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,3 +1,15 @@
+@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
+  <div class="row">
+    <div class="col-12">
+      <div class="filters-badge-skeleton-container">
+          <div class="filter-badge-skeleton">
+            <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
+          </div>
+      </div>
+    </div>
+  </div>
+}
+
 <div class="d-flex justify-content-between">
     <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
@@ -19,7 +31,13 @@
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
-<ds-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-loading>
+
+<ds-search-results-skeleton
+  *ngIf="isLoading()"
+  [showThumbnails]="showThumbnails"
+  [numberOfResults]="searchConfig.pagination.pageSize"
+></ds-search-results-skeleton>
+
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..6e369c729b
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -0,0 +1,17 @@
+:host ::ng-deep {
+  .filter-badge-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      background-color: var(--bs-light);
+      box-shadow: none;
+      width: var(--ds-search-skeleton-filter-badge-width);
+      height: var(--ds-search-skeleton-badge-height);
+      margin-bottom: 0;
+      margin-right: calc(var(--bs-spacer) / 4);
+    }
+  }
+
+  .filters-badge-skeleton-container {
+    display: flex;
+    max-height: var(--ds-search-skeleton-badge-height);
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index fedea57e07..33b8432b74 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -13,16 +13,20 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { Community } from '../../../core/shared/community.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { getMockThemeService } from '../../mocks/theme-service.mock';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
 import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 import { ThemeService } from '../../theme-support/theme.service';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
 import { SearchResultsComponent } from './search-results.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -35,6 +39,11 @@ describe('SearchResultsComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         { provide: ThemeService, useValue: getMockThemeService() },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+        {
+          provide: SearchConfigurationService,
+          useValue: new SearchConfigurationServiceStub(),
+        },
       ],
       imports: [
         TranslateModule.forRoot(),
@@ -48,8 +57,8 @@ describe('SearchResultsComponent', () => {
           imports: [
             SearchExportCsvComponent,
             ObjectCollectionComponent,
-            ThemedLoadingComponent,
             ErrorComponent,
+            SearchResultsSkeletonComponent,
           ],
         },
         add: { imports: [QueryParamsDirectiveStub] },
@@ -96,7 +105,7 @@ describe('SearchResultsComponent', () => {
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
-    (comp as any).searchConfig = { query: 'foobar' };
+    (comp as any).searchConfig = { query: 'foobar', pagination: { pageSize: 10 } };
     fixture.detectChanges();
 
     const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 09186e8c6c..f9da77ed75 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,4 +1,7 @@
-import { NgIf } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -7,12 +10,19 @@ import {
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import {
   fadeIn,
@@ -23,13 +33,15 @@ import {
   isNotEmpty,
 } from '../../empty.util';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { AppliedFilter } from '../models/applied-filter.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 import { SearchResult } from '../models/search-result.model';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -39,12 +51,13 @@ export interface SelectionConfig {
 @Component({
   selector: 'ds-base-search-results',
   templateUrl: './search-results.component.html',
+  styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
 })
 
 /**
@@ -52,6 +65,15 @@ export interface SelectionConfig {
  */
 export class SearchResultsComponent {
   hasNoValue = hasNoValue;
+  /**
+   * Currently active filters in url
+   */
+  activeFilters$: Observable<SearchFilter[]>;
+
+  /**
+   * Filter applied to show labels, once populated the activeFilters$ will be loaded
+   */
+  appliedFilters$: BehaviorSubject<AppliedFilter[]>;
 
   /**
    * The link type of the listed search results
@@ -125,10 +147,18 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  constructor(
+    protected searchConfigService: SearchConfigurationService,
+    protected searchService: SearchService,
+  ) {
+    this.activeFilters$ = this.searchConfigService.getCurrentFilters();
+    this.appliedFilters$ = this.searchService.appliedFilters$;
+  }
+
   /**
    * Check if search results are loading
    */
-  isLoading() {
+  isLoading(): boolean {
     return !this.showError() && (hasNoValue(this.searchResults) || hasNoValue(this.searchResults.payload) || this.searchResults.isLoading);
   }
 
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 31c8a6e9b8..8b533b4105 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectionStrategy,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -246,6 +247,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       },
       { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       { provide: APP_CONFIG, useValue: environment },
+      { provide: PLATFORM_ID, useValue: 'browser' },
     ],
     schemas: [NO_ERRORS_SCHEMA],
   }).overrideComponent(compType, {
@@ -415,5 +417,34 @@ describe('SearchComponent', () => {
         expect(result).toBeNull();
       });
     });
+
+    describe('when rendered in SSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'server';
+      });
+
+      it('should not call search method on init', (done) => {
+        comp.ngOnInit();
+        //Check that the first method from which the search depend upon is not being called
+        expect(searchConfigurationServiceStub.getCurrentConfiguration).not.toHaveBeenCalled();
+        comp.initialized$.subscribe((res) => {
+          expect(res).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('when rendered in CSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'browser';
+      });
+
+      it('should call search method on init', fakeAsync(() => {
+        comp.ngOnInit();
+        tick(100);
+        //Check that the last method from which the search depend upon is being called
+        expect(searchServiceStub.search).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 337cb67171..45c7eb6f7e 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformServer,
   NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
@@ -12,6 +13,7 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   NavigationStart,
@@ -37,6 +39,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { SortOptions } from '../../core/cache/models/sort-options.model';
@@ -236,6 +239,11 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   @Input() hideScopeInUrl: boolean;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   /**
    * The current configuration used during the search
    */
@@ -251,6 +259,7 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   currentScope$: Observable<string>;
 
+
   /**
    * The current sort options used
    */
@@ -345,6 +354,7 @@ export class SearchComponent implements OnDestroy, OnInit {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
@@ -357,6 +367,14 @@ export class SearchComponent implements OnDestroy, OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableSearchComponent && isPlatformServer(this.platformId)) {
+      this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
+        this.searchOptions$.next(options);
+      }));
+      this.initialized$.next(true);
+      return;
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index c567808e87..426dc72930 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -26,6 +26,10 @@ export class SearchConfigurationServiceStub {
     return observableOf([]);
   }
 
+  getCurrentFilters() {
+    return observableOf([]);
+  }
+
   getCurrentScope(a) {
     return observableOf('test-id');
   }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3455ef5f92..3c5e0ef0da 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -516,6 +516,7 @@ export class DefaultAppConfig implements AppConfig {
       enabled: false,
       filter: ['title', 'author', 'subject', 'entityType'],
     },
+    filterPlaceholdersCount: 5,
   };
 
   notifyMetrics: AdminNotifyMetricsRow[] = [
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index 699e3fd61f..55733c98e4 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -8,5 +8,11 @@ export interface SearchConfig extends Config {
      * Used by {@link UploadBitstreamComponent}.
      */
     advancedFilters: AdvancedSearchConfig;
-
+    /**
+     * Number used to render n UI elements called loading skeletons that act as placeholders.
+     * These elements indicate that some content will be loaded in their stead.
+     * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+     * For instance if we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+     */
+    filterPlaceholdersCount?: number;
 }
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 1a01e4d125..4def73962a 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -25,4 +25,14 @@ export interface SSRConfig extends Config {
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
   paths: Array<string>;
+
+  /**
+   * Whether to enable rendering of search component on SSR
+   */
+  enableSearchComponent: boolean;
+
+  /**
+   * Whether to enable rendering of browse component on SSR
+   */
+  enableBrowseComponent: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 35b0d39408..8159fff2ea 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,5 +9,7 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 84229aa659..17d4e8ed10 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -13,6 +13,8 @@ export const environment: BuildConfig = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 
   // Angular express server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a02ef4a2a9..4ac586d899 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,6 +14,8 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
 
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 6bddfd58e9..6bd2bef378 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -150,4 +150,16 @@
 
   --green1: #1c710a;  // This variable represents the success color for the Orejime cookie banner
   --button-text-color-cookie: #fff; // This variable represents the text color for buttons in the Orejime cookie banner
+
+  --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-badge-height: 18px;
+  --ds-search-skeleton-thumbnail-margin: 1em;
+  --ds-search-skeleton-text-line-count: 2;
+  --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-filter-badge-width: 200px;
+  --ds-search-skeleton-info-width: 200px;
+  --ds-search-skeleton-card-height: 435px;
+
+  --ds-filters-skeleton-height: 40px;
+  --ds-filters-skeleton-spacing: 12px;
 }
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
index 5b10c84145..3e86e16c01 100644
--- a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
@@ -5,18 +5,14 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
-import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component';
 import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component';
 import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';
 
@@ -34,7 +30,7 @@ import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/s
     },
   ],
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 export class SearchFiltersComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index b72297f32f..e2c4427744 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,29 +1,33 @@
-import { NgIf } from '@angular/common';
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import {
   fadeIn,
   fadeInOut,
 } from '../../../../../../app/shared/animations/fade';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
-import { ThemedLoadingComponent } from '../../../../../../app/shared/loading/themed-loading.component';
 import { ObjectCollectionComponent } from '../../../../../../app/shared/object-collection/object-collection.component';
 import { SearchExportCsvComponent } from '../../../../../../app/shared/search/search-export-csv/search-export-csv.component';
 import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
+import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 
 @Component({
   selector: 'ds-themed-search-results',
   // templateUrl: './search-results.component.html',
   templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html',
-  // styleUrls: ['./search-results.component.scss'],
+  styleUrls: ['../../../../../../app/shared/search/search-results/search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent,  SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 4ea749794e..14e42d09e4 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -12,6 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { RootModule } from '../../app/root.module';
+import { SearchResultsSkeletonComponent } from '../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
 import { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
@@ -105,6 +106,7 @@ import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workf
 import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 import { WorkspaceItemsDeletePageComponent } from './app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
 
+
 const DECLARATIONS = [
   FileSectionComponent,
   HomePageComponent,
@@ -198,6 +200,7 @@ const DECLARATIONS = [
   ComcolPageContentComponent,
   AdminSearchPageComponent,
   AdminWorkflowPageComponent,
+  SearchResultsSkeletonComponent,
 ];
 
 @NgModule({
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 63a5535d95..863db57833 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -18,6 +18,7 @@
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
   in order to keep the bottom border of the header when navbar is expanded */
+
   --ds-expandable-navbar-border-top-color: #{$white};
   --ds-expandable-navbar-border-top-height: 0;
   --ds-expandable-navbar-padding-top: 0;

From 2e685b9e05a1b15c62dd710ad718a6cefd65fab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 17:19:37 +0000
Subject: [PATCH 1096/1286] Bump postcss from 8.4.49 to 8.5.1 in the postcss
 group

Bumps the postcss group with 1 update: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.49 to 8.5.1
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.49...8.5.1)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: postcss
...

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

diff --git a/package.json b/package.json
index a0339e275a..08188e2e23 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "ng-mocks": "^14.13.2",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
-    "postcss": "^8.4",
+    "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
diff --git a/yarn.lock b/yarn.lock
index 3d190d939b..3b0610ab60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7930,10 +7930,10 @@ mute-stream@1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e"
   integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==
 
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+nanoid@^3.3.7, nanoid@^3.3.8:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -8970,12 +8970,12 @@ postcss@8.4.35:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.2.14, postcss@^8.4, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+postcss@^8.2.14, postcss@^8.4.23, postcss@^8.4.33, postcss@^8.4.35, postcss@^8.5:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
+  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
   dependencies:
-    nanoid "^3.3.7"
+    nanoid "^3.3.8"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 

From 33a091d6301a476e94d9eb9b0ca0d2d704fe44cb Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <152612515+FrancescoMolinaro@users.noreply.github.com>
Date: Thu, 23 Jan 2025 19:26:36 +0100
Subject: [PATCH 1097/1286] Prevent request with page size of 9999 (#3694)

* [DURACOM-304] Refactored item-bitstreams.component by removing page size of 9999

* [DURACOM-304] Refactored edit-bitstream-page.component by removing page size of 9999

* [DURACOM-304] Refactored scripts-select.component by using infinite scroll instead of page size 9999

* [DURACOM-304] Refactored dynamic-list.component.ts by removing page size of 9999

* [DURACOM-304] Refactored relationship-type-data.service.ts by removing page size of 9999

* [DURACOM-304] removed unneeded selectAll method (dynamic-lookup-relation-search-tab.component)

* [DURACOM-304] Refactored submission-section-cc-licenses.component.ts by removing page size of 9999

* [DURACOM-304] lint fix

* [DURACOM-304] test fix

* [DURACOM-304] fix accessibility issue on scripts-select

* [DURACOM-304] Refactor of bundle-data.service.ts by removing page size of 9999

* [DURACOM-304] other fix related to accessibility

* [DURACOM-304] lint fix

* [DURACOM-304] resolve conflicts

* [DURACOM-304] fix lint

* [DURACOM-304] add support for findAll method in dynamic-scrollable-dropdown.component.ts

* [DURACOM-304] refactor to use lazy data provider

* [DURACOM-304] improve loading logic for cc-licenses section and dynamic-list

* [DURACOM-304] refactor, fix dynamic-list.component loading

* [DURACOM-304] remove br

---------

Co-authored-by: Alisa Ismailati <alisa.ismailati@4science.com>
---
 .../edit-bitstream-page.component.html        |   6 +-
 .../edit-bitstream-page.component.spec.ts     |  17 ++-
 .../edit-bitstream-page.component.ts          | 124 ++++++++---------
 src/app/core/data/bitstream-data.service.ts   |   5 +-
 src/app/core/data/bundle-data.service.ts      |   8 +-
 src/app/core/metadata/head-tag.service.ts     |   2 +
 .../item-bitstreams.component.html            |   3 +
 .../item-bitstreams.component.ts              | 129 ++++++++++++++++--
 .../scripts-select.component.html             |  59 +++++---
 .../scripts-select.component.scss             |  23 ++++
 .../scripts-select.component.spec.ts          |   4 +-
 .../scripts-select.component.ts               | 113 +++++++++------
 .../models/list/dynamic-list.component.html   |   8 +-
 .../models/list/dynamic-list.component.ts     | 111 +++++++++++----
 ...dynamic-scrollable-dropdown.component.html |   4 +-
 ...amic-scrollable-dropdown.component.spec.ts |   4 +
 .../dynamic-scrollable-dropdown.component.ts  |  82 +++++++++--
 .../dynamic-scrollable-dropdown.model.ts      |  18 ++-
 ...okup-relation-search-tab.component.spec.ts |  12 --
 ...ic-lookup-relation-search-tab.component.ts |  38 +-----
 ...mission-section-cc-licenses.component.html |  69 +++++-----
 ...mission-section-cc-licenses.component.scss |  10 ++
 ...sion-section-cc-licenses.component.spec.ts |   8 +-
 ...ubmission-section-cc-licenses.component.ts |  71 ++++++++--
 src/assets/i18n/en.json5                      |   4 +
 25 files changed, 638 insertions(+), 294 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index f7d2c60832..259ab599cb 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
-  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
+  <div class="container">
+    <div class="row" *ngIf="bitstreamRD?.hasSucceeded">
       <div class="col-md-2">
         <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
       </div>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+    <ds-loading *ngIf="!bitstreamRD || bitstreamRD?.isLoading"
                 message="{{'loading.bitstream' | translate}}"></ds-loading>
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index 9243a36491..7da9e040ce 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -261,7 +261,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should select the correct format', () => {
-        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.shortDescription);
       });
 
       it('should put the \"New Format\" input on invisible', () => {
@@ -292,7 +292,13 @@ describe('EditBitstreamPageComponent', () => {
 
     describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.updateNewFormatLayout(allFormats[0].id);
+        comp.onChange({
+          model: {
+            id: 'selectedFormat',
+            value: allFormats[0],
+          },
+        });
+        comp.updateNewFormatLayout();
       });
 
       it('should remove the invisible class from the \"New Format\" input', () => {
@@ -394,9 +400,10 @@ describe('EditBitstreamPageComponent', () => {
 
       describe('when selected format has changed', () => {
         beforeEach(() => {
-          comp.formGroup.patchValue({
-            formatContainer: {
-              selectedFormat: allFormats[2].id,
+          comp.onChange({
+            model: {
+              id: 'selectedFormat',
+              value: allFormats[2],
             },
           });
           fixture.detectChanges();
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 36b0816ade..9f1a84c19d 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -21,7 +21,6 @@ import {
   DynamicFormLayout,
   DynamicFormService,
   DynamicInputModel,
-  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
 import {
   TranslateModule,
@@ -39,23 +38,24 @@ import {
   filter,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { FindAllDataImpl } from '../../core/data/base/find-all-data';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
-import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BITSTREAM_FORMAT } from '../../core/shared/bitstream-format.resource-type';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
 import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
 import { Metadata } from '../../core/shared/metadata.utils';
 import {
-  getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
@@ -72,6 +72,7 @@ import { ErrorComponent } from '../../shared/error/error.component';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { DynamicScrollableDropdownModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormComponent } from '../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -109,12 +110,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-  /**
-   * The formats their remote data observable
-   * Tracks changes and updates the view
-   */
-  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
-
   /**
    * The UUID of the primary bitstream for this bundle
    */
@@ -130,11 +125,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   originalFormat: BitstreamFormat;
 
-  /**
-   * A list of all available bitstream formats
-   */
-  formats: BitstreamFormat[];
-
   /**
    * @type {string} Key prefix used to generate form messages
    */
@@ -178,7 +168,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * Options for fetching all bitstream formats
    */
-  findAllOptions = { elementsPerPage: 9999 };
+  findAllOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
 
   /**
    * The Dynamic Input Model for the file's name
@@ -218,9 +211,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the selected format
    */
-  selectedFormatModel = new DynamicSelectModel({
+  selectedFormatModel = new DynamicScrollableDropdownModel({
     id: 'selectedFormat',
     name: 'selectedFormat',
+    displayKey: 'shortDescription',
+    repeatable: false,
+    metadataFields: [],
+    submissionId: '',
+    hasSelectableMetadata: false,
+    resourceType: BITSTREAM_FORMAT,
+    formatFunction: (format: BitstreamFormat | string) => {
+      if (format instanceof  BitstreamFormat) {
+        return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription;
+      } else {
+        return format;
+      }
+    },
   });
 
   /**
@@ -438,6 +444,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * @private
    */
   private bundle: Bundle;
+  /**
+   * The currently selected format
+   * @private
+   */
+  private selectedFormat: BitstreamFormat;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -463,18 +474,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
     const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     );
 
-    const allFormats$ = this.bitstreamFormatsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
-
     const bundle$ = bitstream$.pipe(
       switchMap((bitstream: Bitstream) => bitstream.bundle),
       getFirstSucceededRemoteDataPayload(),
@@ -490,24 +495,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       switchMap((bundle: Bundle) => bundle.item),
       getFirstSucceededRemoteDataPayload(),
     );
+    const format$ = bitstream$.pipe(
+      switchMap(bitstream => bitstream.format),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$,
         bundle$,
         primaryBitstream$,
         item$,
-      ).pipe()
-        .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
-          this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats.page;
-          this.bundle = bundle;
-          // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
-          // be a success response, but empty
-          this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
-          this.itemId = item.uuid;
-          this.setIiifStatus(this.bitstream);
-        }),
+        format$,
+      ).subscribe(([bitstream, bundle, primaryBitstream, item, format]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.bundle = bundle;
+        this.selectedFormat = format;
+        // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
+        // be a success response, but empty
+        this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
+        this.itemId = item.uuid;
+        this.setIiifStatus(this.bitstream);
+      }),
+      format$.pipe(take(1)).subscribe(
+        (format) => this.originalFormat = format,
+      ),
     );
 
     this.subs.push(
@@ -523,7 +535,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   setForm() {
     this.formGroup = this.formService.createFormGroup(this.formModel);
-    this.updateFormatModel();
     this.updateForm(this.bitstream);
     this.updateFieldTranslations();
   }
@@ -542,6 +553,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         description: bitstream.firstMetadataValue('dc.description'),
       },
       formatContainer: {
+        selectedFormat: this.selectedFormat.shortDescription,
         newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
       },
     });
@@ -561,36 +573,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         },
       });
     }
-    this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload(),
-    ).subscribe((format: BitstreamFormat) => {
-      this.originalFormat = format;
-      this.formGroup.patchValue({
-        formatContainer: {
-          selectedFormat: format.id,
-        },
-      });
-      this.updateNewFormatLayout(format.id);
-    });
+    this.updateNewFormatLayout();
   }
 
-  /**
-   * Create the list of unknown format IDs an add options to the selectedFormatModel
-   */
-  updateFormatModel() {
-    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
-      Object.assign({
-        value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription,
-      }));
-  }
 
   /**
    * Update the layout of the "Other Format" input depending on the selected format
    * @param selectedId
    */
-  updateNewFormatLayout(selectedId: string) {
-    if (this.isUnknownFormat(selectedId)) {
+  updateNewFormatLayout() {
+    if (this.isUnknownFormat()) {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
     } else {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
@@ -601,9 +593,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * Is the provided format (id) part of the list of unknown formats?
    * @param id
    */
-  isUnknownFormat(id: string): boolean {
-    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
-    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  isUnknownFormat(): boolean {
+    return hasValue(this.selectedFormat) &&  this.selectedFormat.supportLevel === BitstreamFormatSupportLevel.Unknown;
   }
 
   /**
@@ -635,7 +626,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onChange(event) {
     const model = event.model;
     if (model.id === this.selectedFormatModel.id) {
-      this.updateNewFormatLayout(model.value);
+      this.selectedFormat = model.value;
+      this.updateNewFormatLayout();
     }
   }
 
@@ -645,8 +637,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
     const updatedBitstream = this.formToBitstream(updatedValues);
-    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
-    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+    const isNewFormat = this.selectedFormat.id !== this.originalFormat.id;
     const isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
     const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
@@ -698,7 +689,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       bundle$ = observableOf(this.bundle);
     }
     if (isNewFormat) {
-      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, this.selectedFormat).pipe(
         getFirstCompletedRemoteData(),
         map((formatResponse: RemoteData<Bitstream>) => {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
@@ -856,4 +847,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
+  findAllFormatsServiceFactory() {
+    return () => this.bitstreamFormatService as any as FindAllDataImpl<BitstreamFormat>;
+  }
 }
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index b8776d2530..9455a456fa 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -241,11 +241,12 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
    *                                    requested after the response becomes stale
+   * @param options                     the {@link FindListOptions} for the request
    * @return {Observable<Bitstream | null>}
    *    Return an observable that contains primary bitstream information or null
    */
-  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
-    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, options, followLink('primaryBitstream')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((rd: RemoteData<Bundle>) => {
         if (!rd.hasSucceeded) {
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 5d552c9bf0..79f877fadd 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -78,10 +78,14 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param options                     the {@link FindListOptions} for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: 9999 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+    //Since we filter by bundleName where the pagination options are not indicated we need to load all the possible bundles.
+    // This is a workaround, in substitution of the previously recursive call with expand
+    const paginationOptions = options ?? { elementsPerPage: 9999 };
+    return this.findAllByItem(item, paginationOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
diff --git a/src/app/core/metadata/head-tag.service.ts b/src/app/core/metadata/head-tag.service.ts
index 270e5fde72..8041bb3a4a 100644
--- a/src/app/core/metadata/head-tag.service.ts
+++ b/src/app/core/metadata/head-tag.service.ts
@@ -50,6 +50,7 @@ import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 import { BundleDataService } from '../data/bundle-data.service';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RootDataService } from '../data/root-data.service';
@@ -331,6 +332,7 @@ export class HeadTagService {
         'ORIGINAL',
         true,
         true,
+        new FindListOptions(),
         followLink('primaryBitstream'),
         followLink('bitstreams', {
           findListOptions: {
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 9d8f384e16..6ac44b5ac2 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -39,6 +39,9 @@
                                    [isFirstTable]="isFirst"
                                    aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
+    <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
+      <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
+    </div>
   </div>
   <div *ngIf="bundles?.length === 0"
        class="alert alert-info w-100 d-inline-block mt-4" role="alert">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 143723d447..205c67fa61 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,4 +1,9 @@
-import { CommonModule } from '@angular/common';
+import {
+  AsyncPipe,
+  CommonModule,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -15,16 +20,22 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import {
+  BehaviorSubject,
   combineLatest,
   Observable,
   Subscription,
 } from 'rxjs';
 import {
+  filter,
   map,
   switchMap,
   take,
+  tap,
 } from 'rxjs/operators';
+import { AlertComponent } from 'src/app/shared/alert/alert.component';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
@@ -40,10 +51,13 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { AlertComponent } from '../../../shared/alert/alert.component';
-import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
@@ -58,10 +72,13 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
   templateUrl: './item-bitstreams.component.html',
   imports: [
     CommonModule,
+    AsyncPipe,
     TranslateModule,
     ItemEditBitstreamBundleComponent,
     RouterLink,
+    NgIf,
     VarDirective,
+    NgForOf,
     ThemedLoadingComponent,
     AlertComponent,
   ],
@@ -77,9 +94,18 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   protected readonly AlertType = AlertType;
 
   /**
-   * The currently listed bundles
+   * All bundles for the current item
    */
-  bundles$: Observable<Bundle[]>;
+  private bundlesSubject = new BehaviorSubject<Bundle[]>([]);
+
+  /**
+   * The page options to use for fetching the bundles
+   */
+  bundlesOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'bundles-pagination-options',
+    currentPage: 1,
+    pageSize: 10,
+  });
 
   /**
    * The bootstrap sizes used for the columns within this table
@@ -98,6 +124,18 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   itemUpdateSubscription: Subscription;
 
+  /**
+   * The flag indicating to show the load more link
+   */
+  showLoadMoreLink$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The list of bundles for the current item as an observable
+   */
+  get bundles$(): Observable<Bundle[]> {
+    return this.bundlesSubject.asObservable();
+  }
+
   /**
    * An observable which emits a boolean which represents whether the service is currently handling a 'move' request
    */
@@ -127,14 +165,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
-    this.isProcessingMoveRequest = this.itemBitstreamsService.getPerformingMoveRequest$();
-
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: bundlesOptions })).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
-    );
+    this.loadBundles(1);
   }
 
   /**
@@ -199,6 +230,26 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.notificationsPrefix = 'item.edit.bitstreams.notifications.';
   }
 
+  /**
+   * Load bundles for the current item
+   * @param currentPage The current page to load
+   */
+  loadBundles(currentPage?: number) {
+    this.bundlesOptions = Object.assign(new PaginationComponentOptions(), this.bundlesOptions, {
+      currentPage: currentPage || this.bundlesOptions.currentPage + 1,
+    });
+    this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      tap((bundlesPL: PaginatedList<Bundle>) =>
+        this.showLoadMoreLink$.next(bundlesPL.pageInfo.currentPage < bundlesPL.pageInfo.totalPages),
+      ),
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
+    ).subscribe((bundles: Bundle[]) => {
+      this.bundlesSubject.next([...this.bundlesSubject.getValue(), ...bundles]);
+    });
+  }
+
 
   /**
    * Submit the current changes
@@ -208,7 +259,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   submit() {
     this.submitting = true;
 
-    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$);
+    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$.pipe(take(1)));
 
     // Perform the setup actions from above in order and display notifications
     removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
@@ -217,6 +268,56 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     });
   }
 
+  /**
+   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
+   * navigate the user to the correct page)
+   * @param bundle  The bundle to send patch requests to
+   * @param event   The event containing the index the bitstream came from and was dropped to
+   */
+  dropBitstream(bundle: Bundle, event: any) {
+    this.zone.runOutsideAngular(() => {
+      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
+        const moveOperation = {
+          op: 'move',
+          from: `/_links/bitstreams/${event.fromIndex}/href`,
+          path: `/_links/bitstreams/${event.toIndex}/href`,
+        } as Operation;
+        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
+          this.zone.run(() => {
+            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
+            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
+            this.requestService.removeByHrefSubstring(bundle.self).pipe(
+              filter((isCached) => isCached),
+              take(1),
+            ).subscribe(() => event.finish());
+          });
+        });
+      }
+    });
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayNotifications(key: string, responses: RemoteData<any>[]) {
+    if (isNotEmpty(responses)) {
+      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+
+      failedResponses.forEach((response: RemoteData<Bundle>) => {
+        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
+      });
+      if (successfulResponses.length > 0) {
+        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+      }
+    }
+  }
+
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 9cd86d1a6d..5c161f8d8d 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -1,20 +1,47 @@
-<div class="form-group" *ngIf="scripts$ | async">
-    <label for="process-script">{{'process.new.select-script' | translate}}</label>
-    <select required id="process-script"
-            class="form-control"
-            name="script"
-            [(ngModel)]="selectedScript"
-            #script="ngModel">
-        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
-        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
-            {{script.name}}
-        </option>
-    </select>
-
+<div class="d-flex w-100 flex-column gap-3">
+  <div>
+    <div ngbDropdown class="d-flex">
+      <input id="process-script"
+             class="form-control"
+             required
+             [ngModel]="selectedScript"
+             placeholder="{{'process.new.select-script.placeholder' | translate}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
+            role="menu"
+            (scroll)="onScroll($event)"
+            infiniteScroll
+            [infiniteScrollDistance]="5"
+            [infiniteScrollThrottle]="300"
+            [infiniteScrollUpDistance]="1.5"
+            [fromRoot]="true"
+            [scrollWindow]="false">
+            <button class="dropdown-item"
+                    *ngFor="let script of scripts"
+                    role="menuitem"
+                    type="button"
+                    title="{{ script.name }}"
+                    (click)="onSelect(script);">
+              <span class="text-truncate">{{ script.name }}</span>
+            </button>
+          <ng-container *ngIf="(isLoading$ | async)">
+            <button class="dropdown-item disabled" role="menuitem">
+              <ds-loading message="{{'loading.default' | translate}}">
+              </ds-loading>
+            </button>
+          </ng-container>
+      </div>
+    </div>
+  </div>
+  <div>
     <div *ngIf="script.invalid && (script.dirty || script.touched)"
          class="alert alert-danger validation-error">
-        <div *ngIf="script.errors.required">
-            {{'process.new.select-script.required' | translate}}
-        </div>
+      <div *ngIf="script.errors.required">
+        {{ 'process.new.select-script.required' | translate }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
index e69de29bb2..4f9ca62310 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.scss
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.scss
@@ -0,0 +1,23 @@
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
+
+li:not(:last-of-type) .dropdown-item {
+  border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
+}
+
+#entityControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 6b8c39eb8f..7b095926fb 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -87,7 +87,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
@@ -101,7 +101,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 63c11bd91a..9eccb7ceff 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -19,32 +19,29 @@ import {
 } from '@angular/forms';
 import {
   ActivatedRoute,
-  Params,
   Router,
 } from '@angular/router';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
-  Observable,
+  BehaviorSubject,
   Subscription,
 } from 'rxjs';
 import {
-  distinctUntilChanged,
-  filter,
   map,
-  switchMap,
-  take,
+  tap,
 } from 'rxjs/operators';
 
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import {
-  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import {
-  hasNoValue,
-  hasValue,
-} from '../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { Script } from '../../scripts/script.model';
 import { controlContainerFactory } from '../process-form-factory';
 
@@ -61,7 +58,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule, InfiniteScrollModule, ThemedLoadingComponent, NgbDropdownModule],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
@@ -71,9 +68,19 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
    * All available scripts
    */
-  scripts$: Observable<Script[]>;
+  scripts: Script[] = [];
+
   private _selectedScript: Script;
-  private routeSub: Subscription;
+  private subscription: Subscription;
+
+  private _isLastPage = false;
+
+  scriptOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     private scriptService: ScriptDataService,
@@ -87,31 +94,46 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Checks if the route contains a script ID and auto selects this scripts
    */
   ngOnInit() {
-    this.scripts$ = this.scriptService.findAll({ elementsPerPage: 9999 })
-      .pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page),
-      );
+    this.loadScripts();
+  }
 
-    this.routeSub = this.route.queryParams
-      .pipe(
-        filter((params: Params) => hasNoValue(params.id)),
-        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
-        distinctUntilChanged(),
-        switchMap((id: string) =>
-          this.scripts$
-            .pipe(
-              take(1),
-              map((scripts) =>
-                scripts.find((script) => script.id === id),
-              ),
-            ),
-        ),
-      ).subscribe((script: Script) => {
-        this._selectedScript = script;
-        this.select.emit(script);
-      });
+  /**
+   * Load the scripts and check if the route contains a script
+   */
+  loadScripts() {
+    if (this.isLoading$.value) {return;}
+    this.isLoading$.next(true);
+
+    this.subscription = this.scriptService.findAll(this.scriptOptions).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((paginatedList: PaginatedList<Script>) => {
+        this._isLastPage = paginatedList?.pageInfo?.currentPage >= paginatedList?.pageInfo?.totalPages;
+      }),
+      map((paginatedList: PaginatedList<Script>) => paginatedList.page),
+    ).subscribe((newScripts: Script[]) => {
+      this.scripts = [...this.scripts, ...newScripts];
+      this.isLoading$.next(false);
+
+      const param = this.route.snapshot.queryParams[SCRIPT_QUERY_PARAMETER];
+      if (hasValue(param)) {
+        this._selectedScript = this.scripts.find((script) => script.id === param);
+        this.select.emit(this._selectedScript);
+      }
+    });
+  }
+
+  /**
+   * Load more scripts when the user scrolls to the bottom of the list
+   * @param event The scroll event
+   */
+  onScroll(event: any) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading$.value && !this._isLastPage) {
+        this.scriptOptions.currentPage++;
+        this.loadScripts();
+      }
+    }
   }
 
   /**
@@ -133,14 +155,25 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     );
   }
 
+  selectScript(script: Script) {
+    this._selectedScript = script;
+  }
+
+  onSelect(newScript: Script) {
+    this.selectScript(newScript);
+    // this._selectedScript = newScript;
+    this.select.emit(newScript);
+    this.selectedScript = newScript.name;
+  }
+
   @Input()
   set script(value: Script) {
     this._selectedScript = value;
   }
 
   ngOnDestroy(): void {
-    if (hasValue(this.routeSub)) {
-      this.routeSub.unsubscribe();
+    if (hasValue(this.subscription)) {
+      this.subscription.unsubscribe();
     }
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 728c59aa46..c2f35861fe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -28,9 +28,7 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
 
   <div *ngIf="!model.repeatable"
@@ -60,8 +58,10 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
+  <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
+    <ds-loading></ds-loading>
+  </div>
+
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 8dc19267e8..c1964db1e7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,4 +1,5 @@
 import {
+  AsyncPipe,
   NgClass,
   NgForOf,
   NgIf,
@@ -8,6 +9,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -25,7 +27,16 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import findKey from 'lodash/findKey';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
@@ -36,6 +47,7 @@ import {
   hasValue,
   isNotEmpty,
 } from '../../../../../empty.util';
+import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component';
 import { FormBuilderService } from '../../../form-builder.service';
 import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
@@ -60,10 +72,13 @@ export interface ListItem {
     NgbButtonsModule,
     NgForOf,
     ReactiveFormsModule,
+    AsyncPipe,
+    TranslateModule,
+    ThemedLoadingComponent,
   ],
   standalone: true,
 })
-export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
 
   @Input() group: UntypedFormGroup;
   @Input() model: any;
@@ -73,7 +88,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: VocabularyEntry[];
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  protected optionsList: VocabularyEntry[] = [];
+  private nextPageInfo: PageInfo;
+  private subs: Subscription[] = [];
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -89,7 +107,13 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   ngOnInit() {
     if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
-      this.setOptionsFromVocabulary();
+      this.initOptionsFromVocabulary();
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subs.length > 0) {
+      this.subs.forEach(sub => sub.unsubscribe());
     }
   }
 
@@ -136,34 +160,76 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   /**
    * Setting up the field options from vocabulary
    */
-  protected setOptionsFromVocabulary() {
+  protected initOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
-      const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1,
+
+      this.nextPageInfo = new PageInfo({
+        elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
+
+      this.loadEntries(listGroup);
+    }
+  }
+
+  /**
+   * Checks if at least one {@link VocabularyEntry} has been selected.
+   */
+  hasAtLeastOneVocabularyEntry(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
+    };
+  }
+
+  /**
+   * Update current page state to keep track of which one to load next
+   * @param response
+   */
+  setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
+    if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
+      this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
+      this.isLoading$.next(true);
+    } else {
+      this.isLoading$.next(false);
+    }
+  }
+
+  /**
+   * Load entries page
+   *
+   * @param listGroup
+   */
+  loadEntries(listGroup?: UntypedFormGroup) {
+    if (!hasValue(listGroup)) {
+      listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
+    }
+
+    this.subs.push(
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
-      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
-        let groupCounter = 0;
+        tap((response) => this.setPaginationInfo(response)),
+        map(entries => entries.page),
+      ).subscribe((allEntries: VocabularyEntry[]) => {
+        this.optionsList = [...this.optionsList, ...allEntries];
+        let groupCounter = this.items.length;
         let itemsPerGroup = 0;
         let tempList: ListItem[] = [];
-        this.optionsList = entries.page;
+
         // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        entries.page.forEach((option: VocabularyEntry, key: number) => {
+        allEntries.forEach((option: VocabularyEntry) => {
           const value = option.authority || option.value;
           const checked: boolean = isNotEmpty(findKey(
             this.model.value,
-            (v) => v.value === option.value));
+            (v) => v?.value === option.value));
 
           const item: ListItem = {
             id: `${this.model.id}_${value}`,
             label: option.display,
             value: checked,
-            index: key,
+            index: this.optionsList.indexOf(option),
           };
           if (this.model.repeatable) {
             this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
@@ -183,18 +249,11 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
           }
         });
         this.cdr.markForCheck();
-      });
-
-    }
+        // If the paginated request did not reach the end keep loading the entries in the background
+        if (this.isLoading$.value) {
+          this.loadEntries();
+        }
+      }),
+    );
   }
-
-  /**
-   * Checks if at least one {@link VocabularyEntry} has been selected.
-   */
-  hasAtLeastOneVocabularyEntry(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
-    };
-  }
-
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index bcb83cea11..d5d202d22a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -52,8 +52,8 @@
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option" type="button"
-              [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+              title="{{ inputFormatter(listEntry) }}" role="option" type="button"
+              [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 539c1608a1..b7e974ce69 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -3,6 +3,7 @@ import {
   ChangeDetectorRef,
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
+  Injector,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,6 +30,7 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
+import { APP_DATA_SERVICES_MAP } from '../../../../../../../config/app-config.interface';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
@@ -96,11 +98,13 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         TestComponent,
       ],
       providers: [
+        Injector,
         ChangeDetectorRef,
         DsDynamicScrollableDropdownComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 051bb3f225..6d319b14d1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -8,6 +8,8 @@ import {
   Component,
   ElementRef,
   EventEmitter,
+  Inject,
+  Injector,
   Input,
   OnInit,
   Output,
@@ -27,23 +29,35 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
+  of,
 } from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   map,
+  take,
   tap,
 } from 'rxjs/operators';
+import {
+  APP_DATA_SERVICES_MAP,
+  LazyDataServicesMap,
+} from 'src/config/app-config.interface';
 
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
+import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data';
 import {
   buildPaginatedList,
   PaginatedList,
 } from '../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { lazyDataService } from '../../../../../../core/lazy-data-service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { isEmpty } from '../../../../../empty.util';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
@@ -84,10 +98,28 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public selectedIndex = 0;
   public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
-  constructor(protected vocabularyService: VocabularyService,
-              protected cdr: ChangeDetectorRef,
-              protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService,
+  /**
+   * If true the component can rely on the findAll method for data loading.
+   * This is a behaviour activated by dependency injection through the dropdown config.
+   * If a service that implements findAll is not provided in the config the component falls back on the standard vocabulary service.
+   *
+   * @private
+   */
+  private useFindAllService: boolean;
+  /**
+   * A service that implements FindAllData.
+   * If is provided in the config will be used for data loading in stead of the VocabularyService
+   * @private
+   */
+  private findAllService: FindAllDataImpl<CacheableObject>;
+
+  constructor(
+    protected vocabularyService: VocabularyService,
+    protected cdr: ChangeDetectorRef,
+    protected layoutService: DynamicFormLayoutService,
+    protected validationService: DynamicFormValidationService,
+    protected parentInjector: Injector,
+    @Inject(APP_DATA_SERVICES_MAP) private dataServiceMap: LazyDataServicesMap,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -96,21 +128,41 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    * Initialize the component, setting up the init form value
    */
   ngOnInit() {
-    this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions(true);
+    const lazyProvider$: Observable<Cache> = hasValue(this.model.resourceType) ?
+      lazyDataService(this.dataServiceMap, this.model.resourceType.value, this.parentInjector) : of(null);
+
+    lazyProvider$.pipe(take(1)).subscribe((dataService) => {
+      this.findAllService = dataService as unknown as FindAllDataImpl<CacheableObject>;
+      this.useFindAllService = hasValue(this.findAllService?.findAll) && typeof this.findAllService.findAll === 'function';
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions(true);
+    });
+
+
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
   }
 
+  /**
+   * Get service and method to use to retrieve dropdown options
+   */
+  getDataFromService(): Observable<RemoteData<PaginatedList<CacheableObject>>> {
+    if (this.useFindAllService) {
+      return this.findAllService.findAll({ elementsPerPage: this.pageInfo.elementsPerPage, currentPage: this.pageInfo.currentPage });
+    } else {
+      return this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo);
+    }
+  }
+
   loadOptions(fromInit: boolean) {
     this.loading = true;
-    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.getDataFromService().pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
       tap(() => this.loading = false),
-    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+    ).subscribe((list: PaginatedList<CacheableObject>) => {
       this.optionsList = list.page;
       if (fromInit && this.model.value) {
         this.setCurrentValue(this.model.value, true);
@@ -130,7 +182,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
-  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
+  inputFormatter = (x: any): string => (this.model.formatFunction ? this.model.formatFunction(x) : (x.display || x.value));
 
   /**
    * Opens dropdown menu
@@ -233,7 +285,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages,
       );
-      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.getDataFromService().pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
@@ -241,7 +293,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         )),
         ),
         tap(() => this.loading = false))
-        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        .subscribe((list: PaginatedList<any>) => {
           this.optionsList = this.optionsList.concat(list.page);
           this.updatePageInfo(
             list.pageInfo.elementsPerPage,
@@ -272,7 +324,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   setCurrentValue(value: any, init = false): void {
     let result: Observable<string>;
 
-    if (init) {
+    if (init && !this.useFindAllService) {
       result = this.getInitValueFromModel().pipe(
         map((formValue: FormFieldMetadataValueObject) => formValue.display),
       );
@@ -281,6 +333,8 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         result = observableOf('');
       } else if (typeof value === 'string') {
         result = observableOf(value);
+      } else if (this.useFindAllService) {
+        result = observableOf(value[this.model.displayKey]);
       } else {
         result = observableOf(value.display);
       }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index 870cd12cf6..8454186801 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -4,6 +4,7 @@ import {
   serializable,
 } from '@ng-dynamic-forms/core';
 
+import { ResourceType } from '../../../../../../core/shared/resource-type';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import {
   DsDynamicInputModel,
@@ -13,15 +14,27 @@ import {
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  vocabularyOptions: VocabularyOptions;
+  vocabularyOptions?: VocabularyOptions;
   maxOptions?: number;
   value?: any;
+  displayKey?: string;
+  formatFunction?: (value: any) => string;
+  resourceType?: ResourceType;
 }
 
 export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
 
   @serializable() maxOptions: number;
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN;
+  @serializable() displayKey: string;
+  /**
+   * Configurable function for display value formatting in input
+   */
+  formatFunction: (value: any) => string;
+  /**
+   * Resource type to match data service
+   */
+  resourceType: ResourceType;
 
   constructor(config: DynamicScrollableDropdownModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -30,6 +43,9 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     this.autoComplete = AUTOCOMPLETE_OFF;
     this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
+    this.displayKey = config.displayKey || 'display';
+    this.formatFunction = config.formatFunction;
+    this.resourceType = config.resourceType;
   }
 
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index fdc1f6de01..e21f8328d2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -164,18 +164,6 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     });
   });
 
-  describe('selectAll', () => {
-    beforeEach(() => {
-      spyOn(component.selectObject, 'emit');
-      component.selectAll();
-    });
-
-    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
-      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
-      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
-    });
-  });
-
   describe('deselectAll', () => {
     beforeEach(() => {
       spyOn(component.deselectObject, 'emit');
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index b72fbf40a8..ceee05fee0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -16,13 +16,7 @@ import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
-import {
-  map,
-  mapTo,
-  switchMap,
-  take,
-  tap,
-} from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
@@ -44,7 +38,6 @@ import { hasValue } from '../../../../../empty.util';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { SearchObjects } from '../../../../../search/models/search-objects.model';
 import { SearchResult } from '../../../../../search/models/search-result.model';
 import { ThemedSearchComponent } from '../../../../../search/themed-search.component';
@@ -240,35 +233,6 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectableListService.deselect(this.listId, page);
   }
 
-  /**
-   * Select all items that were found using the current search query
-   */
-  selectAll() {
-    this.allSelected = true;
-    this.selectAllLoading = true;
-    const fullPagination = Object.assign(new PaginationComponentOptions(), {
-      currentPage: 1,
-      pageSize: 9999,
-    });
-    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search<Item>(fullSearchConfig);
-    results$.pipe(
-      getFirstSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page),
-      tap(() => this.selectAllLoading = false),
-      switchMap((results) => this.selection$.pipe(
-        take(1),
-        tap((selection: SearchResult<Item>[]) => {
-          const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
-          this.selectObject.emit(...filteredResults);
-        }),
-        mapTo(results),
-      )),
-    ).subscribe((results) => {
-      this.selectableListService.select(this.listId, results);
-    });
-  }
-
   /**
    * setSelectedIds select all the items from the results that have relationship
    * @param idOfItems the uuid of items that are being checked
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0c8c1abeeb..a8d6ef3262 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,38 +1,39 @@
-<div class="mb-4 ccLicense-select">
-  <ds-select
-    [disabled]="!submissionCcLicenses">
+@if (submissionCcLicenses) {
+  <div class="mb-4 ccLicense-select">
+    <div ngbDropdown>
+      <input id="cc-license-dropdown"
+             class="form-control"
+             [(ngModel)]="selectedCcLicense.name"
+             placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
+           role="menu"
+           infiniteScroll
+           (scroll)="onScroll($event)"
+           [infiniteScrollDistance]="5"
+           [infiniteScrollThrottle]="300"
+           [infiniteScrollUpDistance]="1.5"
+           [fromRoot]="true"
+           [scrollWindow]="false">
 
-    <ng-container class="selection">
-      <span *ngIf="!submissionCcLicenses">
-        <ds-loading></ds-loading>
-      </span>
-      <span *ngIf="getSelectedCcLicense()">
-        {{ getSelectedCcLicense().name }}
-      </span>
-      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
-        <ng-container *ngIf="storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.change' | translate }}
-        </ng-container>
-        <ng-container *ngIf="!storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.select' | translate }}
-        </ng-container>
-      </span>
-    </ng-container>
-
-    <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length === 0"
-              class="dropdown-item disabled">
-        {{ 'submission.sections.ccLicense.none' | translate }}
-      </button>
-      <button *ngFor="let license of submissionCcLicenses"
-              class="dropdown-item"
-              (click)="selectCcLicense(license)">
-        {{ license.name }}
-      </button>
-    </ng-container>
-
-  </ds-select>
-</div>
+        @if(submissionCcLicenses?.length === 0) {
+          <button class="dropdown-item disabled">
+            {{ 'submission.sections.ccLicense.none' | translate }}
+          </button>
+        } @else {
+          @for(license of submissionCcLicenses; track license.id) {
+            <button class="dropdown-item" (click)="selectCcLicense(license)">
+              {{ license.name }}
+            </button>
+          }
+        }
+      </div>
+  </div>
+  </div>
+}
 
 <ng-container *ngIf="getSelectedCcLicense()">
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
index 62a902b79a..142cd82822 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -1,3 +1,13 @@
 .options-select-menu {
   max-height: 25vh;
 }
+
+.ccLicense-select {
+  width: fit-content;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index 7b540ecd91..2e82948c14 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -209,10 +209,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -226,9 +226,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     });
 
     it('should display the selected cc license', () => {
-      expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText,
-      ).toContain('test license name 2');
+      expect(component.selectedCcLicense.name).toContain('test license name 2');
     });
 
     it('should display all field labels of the selected cc license only', () => {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index d286a830e2..cc1925a4a6 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -4,14 +4,18 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  ChangeDetectorRef,
   Component,
   Inject,
 } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import {
+  NgbDropdownModule,
   NgbModal,
   NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
@@ -22,14 +26,16 @@ import {
   filter,
   map,
   take,
+  tap,
 } from 'rxjs/operators';
 
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import {
@@ -64,6 +70,9 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
+    NgbDropdownModule,
+    FormsModule,
+    InfiniteScrollModule,
   ],
   standalone: true,
 })
@@ -95,7 +104,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   /**
    * Cache of the available Creative Commons licenses.
    */
-  submissionCcLicenses: SubmissionCcLicence[];
+  submissionCcLicenses: SubmissionCcLicence[] = [];
 
   /**
    * Reference to NgbModal
@@ -107,6 +116,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   defaultJurisdiction: string;
 
+  /**
+   * The currently selected cc licence
+   */
+  selectedCcLicense: SubmissionCcLicence = new SubmissionCcLicence();
+
+  /**
+   * Options for paginated data loading
+   */
+  ccLicenceOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+  /**
+   * Check to stop paginated search
+   *
+   * @private
+   */
+  private _isLastPage: boolean;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -131,6 +159,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
     protected configService: ConfigurationDataService,
+    protected ref: ChangeDetectorRef,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
     @Inject('submissionIdProvider') public injectedSubmissionId: string,
@@ -154,9 +183,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param ccLicense the Creative Commons license to select.
    */
   selectCcLicense(ccLicense: SubmissionCcLicence) {
-    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+    if (this.selectedCcLicense.id === ccLicense.id) {
       return;
     }
+    this.selectedCcLicense = ccLicense;
     this.setAccepted(false);
     this.updateSectionData({
       ccLicense: {
@@ -300,13 +330,6 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ elementsPerPage: 9999 }).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((list) => list.page),
-      ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses,
-      ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
         getRemoteDataPayload(),
@@ -319,6 +342,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
       }),
     );
+    this.loadCcLicences();
   }
 
   /**
@@ -338,4 +362,31 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
     this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
   }
+
+  onScroll(event) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading && !this._isLastPage) {
+        this.ccLicenceOptions.currentPage++;
+        this.loadCcLicences();
+      }
+    }
+  }
+
+  loadCcLicences() {
+    this.isLoading = true;
+
+    this.subscriptions.push(
+      this.submissionCcLicensesDataService.findAll(this.ccLicenceOptions).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this._isLastPage = response.pageInfo.currentPage === response.pageInfo.totalPages),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => {
+          this.submissionCcLicenses = [...this.submissionCcLicenses, ...licenses];
+          this.isLoading = false;
+          this.ref.detectChanges();
+        },
+      ),
+    );
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 37fb2daaf6..8820d557e0 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1684,6 +1684,8 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dynamic-list.load-more": "Load more",
+
   "dropdown.clear": "Clear selection",
 
   "dropdown.clear.tooltip": "Clear the selected option",
@@ -2292,6 +2294,8 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
+  "item.edit.bitstreams.load-more.link": "Load more",
+
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",

From ff304f3314bfa04bea928c1cb72ac1526e793881 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <152612515+FrancescoMolinaro@users.noreply.github.com>
Date: Thu, 23 Jan 2025 19:26:36 +0100
Subject: [PATCH 1098/1286] Prevent request with page size of 9999 (#3694)

* [DURACOM-304] Refactored item-bitstreams.component by removing page size of 9999

* [DURACOM-304] Refactored edit-bitstream-page.component by removing page size of 9999

* [DURACOM-304] Refactored scripts-select.component by using infinite scroll instead of page size 9999

* [DURACOM-304] Refactored dynamic-list.component.ts by removing page size of 9999

* [DURACOM-304] Refactored relationship-type-data.service.ts by removing page size of 9999

* [DURACOM-304] removed unneeded selectAll method (dynamic-lookup-relation-search-tab.component)

* [DURACOM-304] Refactored submission-section-cc-licenses.component.ts by removing page size of 9999

* [DURACOM-304] lint fix

* [DURACOM-304] test fix

* [DURACOM-304] fix accessibility issue on scripts-select

* [DURACOM-304] Refactor of bundle-data.service.ts by removing page size of 9999

* [DURACOM-304] other fix related to accessibility

* [DURACOM-304] lint fix

* [DURACOM-304] resolve conflicts

* [DURACOM-304] fix lint

* [DURACOM-304] add support for findAll method in dynamic-scrollable-dropdown.component.ts

* [DURACOM-304] refactor to use lazy data provider

* [DURACOM-304] improve loading logic for cc-licenses section and dynamic-list

* [DURACOM-304] refactor, fix dynamic-list.component loading

* [DURACOM-304] remove br

---------

Co-authored-by: Alisa Ismailati <alisa.ismailati@4science.com>
---
 .../edit-bitstream-page.component.html        |   6 +-
 .../edit-bitstream-page.component.spec.ts     |  17 ++-
 .../edit-bitstream-page.component.ts          | 124 ++++++++---------
 src/app/core/data/bitstream-data.service.ts   |   5 +-
 src/app/core/data/bundle-data.service.ts      |   8 +-
 src/app/core/metadata/head-tag.service.ts     |   2 +
 .../item-bitstreams.component.html            |   3 +
 .../item-bitstreams.component.ts              | 129 ++++++++++++++++--
 .../scripts-select.component.html             |  59 +++++---
 .../scripts-select.component.scss             |  23 ++++
 .../scripts-select.component.spec.ts          |   4 +-
 .../scripts-select.component.ts               | 113 +++++++++------
 .../models/list/dynamic-list.component.html   |   8 +-
 .../models/list/dynamic-list.component.ts     | 111 +++++++++++----
 ...dynamic-scrollable-dropdown.component.html |   4 +-
 ...amic-scrollable-dropdown.component.spec.ts |   4 +
 .../dynamic-scrollable-dropdown.component.ts  |  82 +++++++++--
 .../dynamic-scrollable-dropdown.model.ts      |  18 ++-
 ...okup-relation-search-tab.component.spec.ts |  12 --
 ...ic-lookup-relation-search-tab.component.ts |  38 +-----
 ...mission-section-cc-licenses.component.html |  69 +++++-----
 ...mission-section-cc-licenses.component.scss |  10 ++
 ...sion-section-cc-licenses.component.spec.ts |   8 +-
 ...ubmission-section-cc-licenses.component.ts |  71 ++++++++--
 src/assets/i18n/en.json5                      |   4 +
 25 files changed, 638 insertions(+), 294 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index f7d2c60832..259ab599cb 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
-  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
+  <div class="container">
+    <div class="row" *ngIf="bitstreamRD?.hasSucceeded">
       <div class="col-md-2">
         <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
       </div>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+    <ds-loading *ngIf="!bitstreamRD || bitstreamRD?.isLoading"
                 message="{{'loading.bitstream' | translate}}"></ds-loading>
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index 9243a36491..7da9e040ce 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -261,7 +261,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should select the correct format', () => {
-        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.shortDescription);
       });
 
       it('should put the \"New Format\" input on invisible', () => {
@@ -292,7 +292,13 @@ describe('EditBitstreamPageComponent', () => {
 
     describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.updateNewFormatLayout(allFormats[0].id);
+        comp.onChange({
+          model: {
+            id: 'selectedFormat',
+            value: allFormats[0],
+          },
+        });
+        comp.updateNewFormatLayout();
       });
 
       it('should remove the invisible class from the \"New Format\" input', () => {
@@ -394,9 +400,10 @@ describe('EditBitstreamPageComponent', () => {
 
       describe('when selected format has changed', () => {
         beforeEach(() => {
-          comp.formGroup.patchValue({
-            formatContainer: {
-              selectedFormat: allFormats[2].id,
+          comp.onChange({
+            model: {
+              id: 'selectedFormat',
+              value: allFormats[2],
             },
           });
           fixture.detectChanges();
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 36b0816ade..9f1a84c19d 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -21,7 +21,6 @@ import {
   DynamicFormLayout,
   DynamicFormService,
   DynamicInputModel,
-  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
 import {
   TranslateModule,
@@ -39,23 +38,24 @@ import {
   filter,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { FindAllDataImpl } from '../../core/data/base/find-all-data';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
-import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BITSTREAM_FORMAT } from '../../core/shared/bitstream-format.resource-type';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
 import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
 import { Metadata } from '../../core/shared/metadata.utils';
 import {
-  getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
@@ -72,6 +72,7 @@ import { ErrorComponent } from '../../shared/error/error.component';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { DynamicScrollableDropdownModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormComponent } from '../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -109,12 +110,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-  /**
-   * The formats their remote data observable
-   * Tracks changes and updates the view
-   */
-  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
-
   /**
    * The UUID of the primary bitstream for this bundle
    */
@@ -130,11 +125,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   originalFormat: BitstreamFormat;
 
-  /**
-   * A list of all available bitstream formats
-   */
-  formats: BitstreamFormat[];
-
   /**
    * @type {string} Key prefix used to generate form messages
    */
@@ -178,7 +168,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * Options for fetching all bitstream formats
    */
-  findAllOptions = { elementsPerPage: 9999 };
+  findAllOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
 
   /**
    * The Dynamic Input Model for the file's name
@@ -218,9 +211,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the selected format
    */
-  selectedFormatModel = new DynamicSelectModel({
+  selectedFormatModel = new DynamicScrollableDropdownModel({
     id: 'selectedFormat',
     name: 'selectedFormat',
+    displayKey: 'shortDescription',
+    repeatable: false,
+    metadataFields: [],
+    submissionId: '',
+    hasSelectableMetadata: false,
+    resourceType: BITSTREAM_FORMAT,
+    formatFunction: (format: BitstreamFormat | string) => {
+      if (format instanceof  BitstreamFormat) {
+        return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription;
+      } else {
+        return format;
+      }
+    },
   });
 
   /**
@@ -438,6 +444,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * @private
    */
   private bundle: Bundle;
+  /**
+   * The currently selected format
+   * @private
+   */
+  private selectedFormat: BitstreamFormat;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -463,18 +474,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
     const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     );
 
-    const allFormats$ = this.bitstreamFormatsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
-
     const bundle$ = bitstream$.pipe(
       switchMap((bitstream: Bitstream) => bitstream.bundle),
       getFirstSucceededRemoteDataPayload(),
@@ -490,24 +495,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       switchMap((bundle: Bundle) => bundle.item),
       getFirstSucceededRemoteDataPayload(),
     );
+    const format$ = bitstream$.pipe(
+      switchMap(bitstream => bitstream.format),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$,
         bundle$,
         primaryBitstream$,
         item$,
-      ).pipe()
-        .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
-          this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats.page;
-          this.bundle = bundle;
-          // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
-          // be a success response, but empty
-          this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
-          this.itemId = item.uuid;
-          this.setIiifStatus(this.bitstream);
-        }),
+        format$,
+      ).subscribe(([bitstream, bundle, primaryBitstream, item, format]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.bundle = bundle;
+        this.selectedFormat = format;
+        // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
+        // be a success response, but empty
+        this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
+        this.itemId = item.uuid;
+        this.setIiifStatus(this.bitstream);
+      }),
+      format$.pipe(take(1)).subscribe(
+        (format) => this.originalFormat = format,
+      ),
     );
 
     this.subs.push(
@@ -523,7 +535,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   setForm() {
     this.formGroup = this.formService.createFormGroup(this.formModel);
-    this.updateFormatModel();
     this.updateForm(this.bitstream);
     this.updateFieldTranslations();
   }
@@ -542,6 +553,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         description: bitstream.firstMetadataValue('dc.description'),
       },
       formatContainer: {
+        selectedFormat: this.selectedFormat.shortDescription,
         newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
       },
     });
@@ -561,36 +573,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         },
       });
     }
-    this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload(),
-    ).subscribe((format: BitstreamFormat) => {
-      this.originalFormat = format;
-      this.formGroup.patchValue({
-        formatContainer: {
-          selectedFormat: format.id,
-        },
-      });
-      this.updateNewFormatLayout(format.id);
-    });
+    this.updateNewFormatLayout();
   }
 
-  /**
-   * Create the list of unknown format IDs an add options to the selectedFormatModel
-   */
-  updateFormatModel() {
-    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
-      Object.assign({
-        value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription,
-      }));
-  }
 
   /**
    * Update the layout of the "Other Format" input depending on the selected format
    * @param selectedId
    */
-  updateNewFormatLayout(selectedId: string) {
-    if (this.isUnknownFormat(selectedId)) {
+  updateNewFormatLayout() {
+    if (this.isUnknownFormat()) {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
     } else {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
@@ -601,9 +593,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * Is the provided format (id) part of the list of unknown formats?
    * @param id
    */
-  isUnknownFormat(id: string): boolean {
-    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
-    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  isUnknownFormat(): boolean {
+    return hasValue(this.selectedFormat) &&  this.selectedFormat.supportLevel === BitstreamFormatSupportLevel.Unknown;
   }
 
   /**
@@ -635,7 +626,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onChange(event) {
     const model = event.model;
     if (model.id === this.selectedFormatModel.id) {
-      this.updateNewFormatLayout(model.value);
+      this.selectedFormat = model.value;
+      this.updateNewFormatLayout();
     }
   }
 
@@ -645,8 +637,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
     const updatedBitstream = this.formToBitstream(updatedValues);
-    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
-    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+    const isNewFormat = this.selectedFormat.id !== this.originalFormat.id;
     const isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
     const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
@@ -698,7 +689,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       bundle$ = observableOf(this.bundle);
     }
     if (isNewFormat) {
-      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, this.selectedFormat).pipe(
         getFirstCompletedRemoteData(),
         map((formatResponse: RemoteData<Bitstream>) => {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
@@ -856,4 +847,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
+  findAllFormatsServiceFactory() {
+    return () => this.bitstreamFormatService as any as FindAllDataImpl<BitstreamFormat>;
+  }
 }
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 81d1d74535..cb9d487020 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -241,11 +241,12 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
    *                                    requested after the response becomes stale
+   * @param options                     the {@link FindListOptions} for the request
    * @return {Observable<Bitstream | null>}
    *    Return an observable that constains primary bitstream information or null
    */
-  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
-    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, options, followLink('primaryBitstream')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((rd: RemoteData<Bundle>) => {
         if (!rd.hasSucceeded) {
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 5d552c9bf0..79f877fadd 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -78,10 +78,14 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param options                     the {@link FindListOptions} for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: 9999 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+    //Since we filter by bundleName where the pagination options are not indicated we need to load all the possible bundles.
+    // This is a workaround, in substitution of the previously recursive call with expand
+    const paginationOptions = options ?? { elementsPerPage: 9999 };
+    return this.findAllByItem(item, paginationOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
diff --git a/src/app/core/metadata/head-tag.service.ts b/src/app/core/metadata/head-tag.service.ts
index 270e5fde72..8041bb3a4a 100644
--- a/src/app/core/metadata/head-tag.service.ts
+++ b/src/app/core/metadata/head-tag.service.ts
@@ -50,6 +50,7 @@ import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 import { BundleDataService } from '../data/bundle-data.service';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RootDataService } from '../data/root-data.service';
@@ -331,6 +332,7 @@ export class HeadTagService {
         'ORIGINAL',
         true,
         true,
+        new FindListOptions(),
         followLink('primaryBitstream'),
         followLink('bitstreams', {
           findListOptions: {
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 9d8f384e16..6ac44b5ac2 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -39,6 +39,9 @@
                                    [isFirstTable]="isFirst"
                                    aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
+    <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
+      <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
+    </div>
   </div>
   <div *ngIf="bundles?.length === 0"
        class="alert alert-info w-100 d-inline-block mt-4" role="alert">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 143723d447..205c67fa61 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,4 +1,9 @@
-import { CommonModule } from '@angular/common';
+import {
+  AsyncPipe,
+  CommonModule,
+  NgForOf,
+  NgIf,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -15,16 +20,22 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import {
+  BehaviorSubject,
   combineLatest,
   Observable,
   Subscription,
 } from 'rxjs';
 import {
+  filter,
   map,
   switchMap,
   take,
+  tap,
 } from 'rxjs/operators';
+import { AlertComponent } from 'src/app/shared/alert/alert.component';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
@@ -40,10 +51,13 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import { AlertComponent } from '../../../shared/alert/alert.component';
-import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
@@ -58,10 +72,13 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
   templateUrl: './item-bitstreams.component.html',
   imports: [
     CommonModule,
+    AsyncPipe,
     TranslateModule,
     ItemEditBitstreamBundleComponent,
     RouterLink,
+    NgIf,
     VarDirective,
+    NgForOf,
     ThemedLoadingComponent,
     AlertComponent,
   ],
@@ -77,9 +94,18 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   protected readonly AlertType = AlertType;
 
   /**
-   * The currently listed bundles
+   * All bundles for the current item
    */
-  bundles$: Observable<Bundle[]>;
+  private bundlesSubject = new BehaviorSubject<Bundle[]>([]);
+
+  /**
+   * The page options to use for fetching the bundles
+   */
+  bundlesOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'bundles-pagination-options',
+    currentPage: 1,
+    pageSize: 10,
+  });
 
   /**
    * The bootstrap sizes used for the columns within this table
@@ -98,6 +124,18 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   itemUpdateSubscription: Subscription;
 
+  /**
+   * The flag indicating to show the load more link
+   */
+  showLoadMoreLink$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The list of bundles for the current item as an observable
+   */
+  get bundles$(): Observable<Bundle[]> {
+    return this.bundlesSubject.asObservable();
+  }
+
   /**
    * An observable which emits a boolean which represents whether the service is currently handling a 'move' request
    */
@@ -127,14 +165,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
-    this.isProcessingMoveRequest = this.itemBitstreamsService.getPerformingMoveRequest$();
-
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: bundlesOptions })).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
-    );
+    this.loadBundles(1);
   }
 
   /**
@@ -199,6 +230,26 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.notificationsPrefix = 'item.edit.bitstreams.notifications.';
   }
 
+  /**
+   * Load bundles for the current item
+   * @param currentPage The current page to load
+   */
+  loadBundles(currentPage?: number) {
+    this.bundlesOptions = Object.assign(new PaginationComponentOptions(), this.bundlesOptions, {
+      currentPage: currentPage || this.bundlesOptions.currentPage + 1,
+    });
+    this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      tap((bundlesPL: PaginatedList<Bundle>) =>
+        this.showLoadMoreLink$.next(bundlesPL.pageInfo.currentPage < bundlesPL.pageInfo.totalPages),
+      ),
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
+    ).subscribe((bundles: Bundle[]) => {
+      this.bundlesSubject.next([...this.bundlesSubject.getValue(), ...bundles]);
+    });
+  }
+
 
   /**
    * Submit the current changes
@@ -208,7 +259,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   submit() {
     this.submitting = true;
 
-    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$);
+    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$.pipe(take(1)));
 
     // Perform the setup actions from above in order and display notifications
     removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
@@ -217,6 +268,56 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     });
   }
 
+  /**
+   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
+   * navigate the user to the correct page)
+   * @param bundle  The bundle to send patch requests to
+   * @param event   The event containing the index the bitstream came from and was dropped to
+   */
+  dropBitstream(bundle: Bundle, event: any) {
+    this.zone.runOutsideAngular(() => {
+      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
+        const moveOperation = {
+          op: 'move',
+          from: `/_links/bitstreams/${event.fromIndex}/href`,
+          path: `/_links/bitstreams/${event.toIndex}/href`,
+        } as Operation;
+        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
+          this.zone.run(() => {
+            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
+            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
+            this.requestService.removeByHrefSubstring(bundle.self).pipe(
+              filter((isCached) => isCached),
+              take(1),
+            ).subscribe(() => event.finish());
+          });
+        });
+      }
+    });
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayNotifications(key: string, responses: RemoteData<any>[]) {
+    if (isNotEmpty(responses)) {
+      const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+      const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+
+      failedResponses.forEach((response: RemoteData<Bundle>) => {
+        this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), response.errorMessage);
+      });
+      if (successfulResponses.length > 0) {
+        this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+      }
+    }
+  }
+
   /**
    * Request the object updates service to discard all current changes to this item
    * Shows a notification to remind the user that they can undo this
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 9cd86d1a6d..5c161f8d8d 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -1,20 +1,47 @@
-<div class="form-group" *ngIf="scripts$ | async">
-    <label for="process-script">{{'process.new.select-script' | translate}}</label>
-    <select required id="process-script"
-            class="form-control"
-            name="script"
-            [(ngModel)]="selectedScript"
-            #script="ngModel">
-        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
-        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
-            {{script.name}}
-        </option>
-    </select>
-
+<div class="d-flex w-100 flex-column gap-3">
+  <div>
+    <div ngbDropdown class="d-flex">
+      <input id="process-script"
+             class="form-control"
+             required
+             [ngModel]="selectedScript"
+             placeholder="{{'process.new.select-script.placeholder' | translate}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
+            role="menu"
+            (scroll)="onScroll($event)"
+            infiniteScroll
+            [infiniteScrollDistance]="5"
+            [infiniteScrollThrottle]="300"
+            [infiniteScrollUpDistance]="1.5"
+            [fromRoot]="true"
+            [scrollWindow]="false">
+            <button class="dropdown-item"
+                    *ngFor="let script of scripts"
+                    role="menuitem"
+                    type="button"
+                    title="{{ script.name }}"
+                    (click)="onSelect(script);">
+              <span class="text-truncate">{{ script.name }}</span>
+            </button>
+          <ng-container *ngIf="(isLoading$ | async)">
+            <button class="dropdown-item disabled" role="menuitem">
+              <ds-loading message="{{'loading.default' | translate}}">
+              </ds-loading>
+            </button>
+          </ng-container>
+      </div>
+    </div>
+  </div>
+  <div>
     <div *ngIf="script.invalid && (script.dirty || script.touched)"
          class="alert alert-danger validation-error">
-        <div *ngIf="script.errors.required">
-            {{'process.new.select-script.required' | translate}}
-        </div>
+      <div *ngIf="script.errors.required">
+        {{ 'process.new.select-script.required' | translate }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
index e69de29bb2..4f9ca62310 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.scss
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.scss
@@ -0,0 +1,23 @@
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
+
+li:not(:last-of-type) .dropdown-item {
+  border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
+}
+
+#entityControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 6b8c39eb8f..7b095926fb 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -87,7 +87,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
@@ -101,7 +101,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 63c11bd91a..9eccb7ceff 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -19,32 +19,29 @@ import {
 } from '@angular/forms';
 import {
   ActivatedRoute,
-  Params,
   Router,
 } from '@angular/router';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
-  Observable,
+  BehaviorSubject,
   Subscription,
 } from 'rxjs';
 import {
-  distinctUntilChanged,
-  filter,
   map,
-  switchMap,
-  take,
+  tap,
 } from 'rxjs/operators';
 
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import {
-  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import {
-  hasNoValue,
-  hasValue,
-} from '../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { Script } from '../../scripts/script.model';
 import { controlContainerFactory } from '../process-form-factory';
 
@@ -61,7 +58,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule, InfiniteScrollModule, ThemedLoadingComponent, NgbDropdownModule],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
@@ -71,9 +68,19 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
    * All available scripts
    */
-  scripts$: Observable<Script[]>;
+  scripts: Script[] = [];
+
   private _selectedScript: Script;
-  private routeSub: Subscription;
+  private subscription: Subscription;
+
+  private _isLastPage = false;
+
+  scriptOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     private scriptService: ScriptDataService,
@@ -87,31 +94,46 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Checks if the route contains a script ID and auto selects this scripts
    */
   ngOnInit() {
-    this.scripts$ = this.scriptService.findAll({ elementsPerPage: 9999 })
-      .pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page),
-      );
+    this.loadScripts();
+  }
 
-    this.routeSub = this.route.queryParams
-      .pipe(
-        filter((params: Params) => hasNoValue(params.id)),
-        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
-        distinctUntilChanged(),
-        switchMap((id: string) =>
-          this.scripts$
-            .pipe(
-              take(1),
-              map((scripts) =>
-                scripts.find((script) => script.id === id),
-              ),
-            ),
-        ),
-      ).subscribe((script: Script) => {
-        this._selectedScript = script;
-        this.select.emit(script);
-      });
+  /**
+   * Load the scripts and check if the route contains a script
+   */
+  loadScripts() {
+    if (this.isLoading$.value) {return;}
+    this.isLoading$.next(true);
+
+    this.subscription = this.scriptService.findAll(this.scriptOptions).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((paginatedList: PaginatedList<Script>) => {
+        this._isLastPage = paginatedList?.pageInfo?.currentPage >= paginatedList?.pageInfo?.totalPages;
+      }),
+      map((paginatedList: PaginatedList<Script>) => paginatedList.page),
+    ).subscribe((newScripts: Script[]) => {
+      this.scripts = [...this.scripts, ...newScripts];
+      this.isLoading$.next(false);
+
+      const param = this.route.snapshot.queryParams[SCRIPT_QUERY_PARAMETER];
+      if (hasValue(param)) {
+        this._selectedScript = this.scripts.find((script) => script.id === param);
+        this.select.emit(this._selectedScript);
+      }
+    });
+  }
+
+  /**
+   * Load more scripts when the user scrolls to the bottom of the list
+   * @param event The scroll event
+   */
+  onScroll(event: any) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading$.value && !this._isLastPage) {
+        this.scriptOptions.currentPage++;
+        this.loadScripts();
+      }
+    }
   }
 
   /**
@@ -133,14 +155,25 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     );
   }
 
+  selectScript(script: Script) {
+    this._selectedScript = script;
+  }
+
+  onSelect(newScript: Script) {
+    this.selectScript(newScript);
+    // this._selectedScript = newScript;
+    this.select.emit(newScript);
+    this.selectedScript = newScript.name;
+  }
+
   @Input()
   set script(value: Script) {
     this._selectedScript = value;
   }
 
   ngOnDestroy(): void {
-    if (hasValue(this.routeSub)) {
-      this.routeSub.unsubscribe();
+    if (hasValue(this.subscription)) {
+      this.subscription.unsubscribe();
     }
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 728c59aa46..c2f35861fe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -28,9 +28,7 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
 
   <div *ngIf="!model.repeatable"
@@ -60,8 +58,10 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
+  <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
+    <ds-loading></ds-loading>
+  </div>
+
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 8dc19267e8..c1964db1e7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,4 +1,5 @@
 import {
+  AsyncPipe,
   NgClass,
   NgForOf,
   NgIf,
@@ -8,6 +9,7 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -25,7 +27,16 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import findKey from 'lodash/findKey';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
@@ -36,6 +47,7 @@ import {
   hasValue,
   isNotEmpty,
 } from '../../../../../empty.util';
+import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component';
 import { FormBuilderService } from '../../../form-builder.service';
 import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
@@ -60,10 +72,13 @@ export interface ListItem {
     NgbButtonsModule,
     NgForOf,
     ReactiveFormsModule,
+    AsyncPipe,
+    TranslateModule,
+    ThemedLoadingComponent,
   ],
   standalone: true,
 })
-export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
 
   @Input() group: UntypedFormGroup;
   @Input() model: any;
@@ -73,7 +88,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: VocabularyEntry[];
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  protected optionsList: VocabularyEntry[] = [];
+  private nextPageInfo: PageInfo;
+  private subs: Subscription[] = [];
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -89,7 +107,13 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   ngOnInit() {
     if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
-      this.setOptionsFromVocabulary();
+      this.initOptionsFromVocabulary();
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subs.length > 0) {
+      this.subs.forEach(sub => sub.unsubscribe());
     }
   }
 
@@ -136,34 +160,76 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   /**
    * Setting up the field options from vocabulary
    */
-  protected setOptionsFromVocabulary() {
+  protected initOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
-      const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1,
+
+      this.nextPageInfo = new PageInfo({
+        elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
+
+      this.loadEntries(listGroup);
+    }
+  }
+
+  /**
+   * Checks if at least one {@link VocabularyEntry} has been selected.
+   */
+  hasAtLeastOneVocabularyEntry(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
+    };
+  }
+
+  /**
+   * Update current page state to keep track of which one to load next
+   * @param response
+   */
+  setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
+    if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
+      this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
+      this.isLoading$.next(true);
+    } else {
+      this.isLoading$.next(false);
+    }
+  }
+
+  /**
+   * Load entries page
+   *
+   * @param listGroup
+   */
+  loadEntries(listGroup?: UntypedFormGroup) {
+    if (!hasValue(listGroup)) {
+      listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
+    }
+
+    this.subs.push(
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
-      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
-        let groupCounter = 0;
+        tap((response) => this.setPaginationInfo(response)),
+        map(entries => entries.page),
+      ).subscribe((allEntries: VocabularyEntry[]) => {
+        this.optionsList = [...this.optionsList, ...allEntries];
+        let groupCounter = this.items.length;
         let itemsPerGroup = 0;
         let tempList: ListItem[] = [];
-        this.optionsList = entries.page;
+
         // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        entries.page.forEach((option: VocabularyEntry, key: number) => {
+        allEntries.forEach((option: VocabularyEntry) => {
           const value = option.authority || option.value;
           const checked: boolean = isNotEmpty(findKey(
             this.model.value,
-            (v) => v.value === option.value));
+            (v) => v?.value === option.value));
 
           const item: ListItem = {
             id: `${this.model.id}_${value}`,
             label: option.display,
             value: checked,
-            index: key,
+            index: this.optionsList.indexOf(option),
           };
           if (this.model.repeatable) {
             this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
@@ -183,18 +249,11 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
           }
         });
         this.cdr.markForCheck();
-      });
-
-    }
+        // If the paginated request did not reach the end keep loading the entries in the background
+        if (this.isLoading$.value) {
+          this.loadEntries();
+        }
+      }),
+    );
   }
-
-  /**
-   * Checks if at least one {@link VocabularyEntry} has been selected.
-   */
-  hasAtLeastOneVocabularyEntry(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
-    };
-  }
-
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index ba7a8f50d7..6236028f2e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -50,8 +50,8 @@
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option" type="button"
-              [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+              title="{{ inputFormatter(listEntry) }}" role="option" type="button"
+              [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 539c1608a1..b7e974ce69 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -3,6 +3,7 @@ import {
   ChangeDetectorRef,
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
+  Injector,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,6 +30,7 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
+import { APP_DATA_SERVICES_MAP } from '../../../../../../../config/app-config.interface';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
@@ -96,11 +98,13 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         TestComponent,
       ],
       providers: [
+        Injector,
         ChangeDetectorRef,
         DsDynamicScrollableDropdownComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 051bb3f225..6d319b14d1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -8,6 +8,8 @@ import {
   Component,
   ElementRef,
   EventEmitter,
+  Inject,
+  Injector,
   Input,
   OnInit,
   Output,
@@ -27,23 +29,35 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
+  of,
 } from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   map,
+  take,
   tap,
 } from 'rxjs/operators';
+import {
+  APP_DATA_SERVICES_MAP,
+  LazyDataServicesMap,
+} from 'src/config/app-config.interface';
 
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
+import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data';
 import {
   buildPaginatedList,
   PaginatedList,
 } from '../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { lazyDataService } from '../../../../../../core/lazy-data-service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { isEmpty } from '../../../../../empty.util';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
@@ -84,10 +98,28 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public selectedIndex = 0;
   public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
-  constructor(protected vocabularyService: VocabularyService,
-              protected cdr: ChangeDetectorRef,
-              protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService,
+  /**
+   * If true the component can rely on the findAll method for data loading.
+   * This is a behaviour activated by dependency injection through the dropdown config.
+   * If a service that implements findAll is not provided in the config the component falls back on the standard vocabulary service.
+   *
+   * @private
+   */
+  private useFindAllService: boolean;
+  /**
+   * A service that implements FindAllData.
+   * If is provided in the config will be used for data loading in stead of the VocabularyService
+   * @private
+   */
+  private findAllService: FindAllDataImpl<CacheableObject>;
+
+  constructor(
+    protected vocabularyService: VocabularyService,
+    protected cdr: ChangeDetectorRef,
+    protected layoutService: DynamicFormLayoutService,
+    protected validationService: DynamicFormValidationService,
+    protected parentInjector: Injector,
+    @Inject(APP_DATA_SERVICES_MAP) private dataServiceMap: LazyDataServicesMap,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -96,21 +128,41 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    * Initialize the component, setting up the init form value
    */
   ngOnInit() {
-    this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions(true);
+    const lazyProvider$: Observable<Cache> = hasValue(this.model.resourceType) ?
+      lazyDataService(this.dataServiceMap, this.model.resourceType.value, this.parentInjector) : of(null);
+
+    lazyProvider$.pipe(take(1)).subscribe((dataService) => {
+      this.findAllService = dataService as unknown as FindAllDataImpl<CacheableObject>;
+      this.useFindAllService = hasValue(this.findAllService?.findAll) && typeof this.findAllService.findAll === 'function';
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions(true);
+    });
+
+
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
   }
 
+  /**
+   * Get service and method to use to retrieve dropdown options
+   */
+  getDataFromService(): Observable<RemoteData<PaginatedList<CacheableObject>>> {
+    if (this.useFindAllService) {
+      return this.findAllService.findAll({ elementsPerPage: this.pageInfo.elementsPerPage, currentPage: this.pageInfo.currentPage });
+    } else {
+      return this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo);
+    }
+  }
+
   loadOptions(fromInit: boolean) {
     this.loading = true;
-    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.getDataFromService().pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
       tap(() => this.loading = false),
-    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+    ).subscribe((list: PaginatedList<CacheableObject>) => {
       this.optionsList = list.page;
       if (fromInit && this.model.value) {
         this.setCurrentValue(this.model.value, true);
@@ -130,7 +182,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
-  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
+  inputFormatter = (x: any): string => (this.model.formatFunction ? this.model.formatFunction(x) : (x.display || x.value));
 
   /**
    * Opens dropdown menu
@@ -233,7 +285,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages,
       );
-      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.getDataFromService().pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
@@ -241,7 +293,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         )),
         ),
         tap(() => this.loading = false))
-        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        .subscribe((list: PaginatedList<any>) => {
           this.optionsList = this.optionsList.concat(list.page);
           this.updatePageInfo(
             list.pageInfo.elementsPerPage,
@@ -272,7 +324,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   setCurrentValue(value: any, init = false): void {
     let result: Observable<string>;
 
-    if (init) {
+    if (init && !this.useFindAllService) {
       result = this.getInitValueFromModel().pipe(
         map((formValue: FormFieldMetadataValueObject) => formValue.display),
       );
@@ -281,6 +333,8 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         result = observableOf('');
       } else if (typeof value === 'string') {
         result = observableOf(value);
+      } else if (this.useFindAllService) {
+        result = observableOf(value[this.model.displayKey]);
       } else {
         result = observableOf(value.display);
       }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index 870cd12cf6..8454186801 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -4,6 +4,7 @@ import {
   serializable,
 } from '@ng-dynamic-forms/core';
 
+import { ResourceType } from '../../../../../../core/shared/resource-type';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import {
   DsDynamicInputModel,
@@ -13,15 +14,27 @@ import {
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  vocabularyOptions: VocabularyOptions;
+  vocabularyOptions?: VocabularyOptions;
   maxOptions?: number;
   value?: any;
+  displayKey?: string;
+  formatFunction?: (value: any) => string;
+  resourceType?: ResourceType;
 }
 
 export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
 
   @serializable() maxOptions: number;
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN;
+  @serializable() displayKey: string;
+  /**
+   * Configurable function for display value formatting in input
+   */
+  formatFunction: (value: any) => string;
+  /**
+   * Resource type to match data service
+   */
+  resourceType: ResourceType;
 
   constructor(config: DynamicScrollableDropdownModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -30,6 +43,9 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     this.autoComplete = AUTOCOMPLETE_OFF;
     this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
+    this.displayKey = config.displayKey || 'display';
+    this.formatFunction = config.formatFunction;
+    this.resourceType = config.resourceType;
   }
 
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index fdc1f6de01..e21f8328d2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -164,18 +164,6 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     });
   });
 
-  describe('selectAll', () => {
-    beforeEach(() => {
-      spyOn(component.selectObject, 'emit');
-      component.selectAll();
-    });
-
-    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
-      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
-      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
-    });
-  });
-
   describe('deselectAll', () => {
     beforeEach(() => {
       spyOn(component.deselectObject, 'emit');
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index b72fbf40a8..ceee05fee0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -16,13 +16,7 @@ import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
-import {
-  map,
-  mapTo,
-  switchMap,
-  take,
-  tap,
-} from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
@@ -44,7 +38,6 @@ import { hasValue } from '../../../../../empty.util';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { SearchObjects } from '../../../../../search/models/search-objects.model';
 import { SearchResult } from '../../../../../search/models/search-result.model';
 import { ThemedSearchComponent } from '../../../../../search/themed-search.component';
@@ -240,35 +233,6 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectableListService.deselect(this.listId, page);
   }
 
-  /**
-   * Select all items that were found using the current search query
-   */
-  selectAll() {
-    this.allSelected = true;
-    this.selectAllLoading = true;
-    const fullPagination = Object.assign(new PaginationComponentOptions(), {
-      currentPage: 1,
-      pageSize: 9999,
-    });
-    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search<Item>(fullSearchConfig);
-    results$.pipe(
-      getFirstSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page),
-      tap(() => this.selectAllLoading = false),
-      switchMap((results) => this.selection$.pipe(
-        take(1),
-        tap((selection: SearchResult<Item>[]) => {
-          const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
-          this.selectObject.emit(...filteredResults);
-        }),
-        mapTo(results),
-      )),
-    ).subscribe((results) => {
-      this.selectableListService.select(this.listId, results);
-    });
-  }
-
   /**
    * setSelectedIds select all the items from the results that have relationship
    * @param idOfItems the uuid of items that are being checked
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0c8c1abeeb..a8d6ef3262 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,38 +1,39 @@
-<div class="mb-4 ccLicense-select">
-  <ds-select
-    [disabled]="!submissionCcLicenses">
+@if (submissionCcLicenses) {
+  <div class="mb-4 ccLicense-select">
+    <div ngbDropdown>
+      <input id="cc-license-dropdown"
+             class="form-control"
+             [(ngModel)]="selectedCcLicense.name"
+             placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
+           role="menu"
+           infiniteScroll
+           (scroll)="onScroll($event)"
+           [infiniteScrollDistance]="5"
+           [infiniteScrollThrottle]="300"
+           [infiniteScrollUpDistance]="1.5"
+           [fromRoot]="true"
+           [scrollWindow]="false">
 
-    <ng-container class="selection">
-      <span *ngIf="!submissionCcLicenses">
-        <ds-loading></ds-loading>
-      </span>
-      <span *ngIf="getSelectedCcLicense()">
-        {{ getSelectedCcLicense().name }}
-      </span>
-      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
-        <ng-container *ngIf="storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.change' | translate }}
-        </ng-container>
-        <ng-container *ngIf="!storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.select' | translate }}
-        </ng-container>
-      </span>
-    </ng-container>
-
-    <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length === 0"
-              class="dropdown-item disabled">
-        {{ 'submission.sections.ccLicense.none' | translate }}
-      </button>
-      <button *ngFor="let license of submissionCcLicenses"
-              class="dropdown-item"
-              (click)="selectCcLicense(license)">
-        {{ license.name }}
-      </button>
-    </ng-container>
-
-  </ds-select>
-</div>
+        @if(submissionCcLicenses?.length === 0) {
+          <button class="dropdown-item disabled">
+            {{ 'submission.sections.ccLicense.none' | translate }}
+          </button>
+        } @else {
+          @for(license of submissionCcLicenses; track license.id) {
+            <button class="dropdown-item" (click)="selectCcLicense(license)">
+              {{ license.name }}
+            </button>
+          }
+        }
+      </div>
+  </div>
+  </div>
+}
 
 <ng-container *ngIf="getSelectedCcLicense()">
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
index 62a902b79a..142cd82822 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -1,3 +1,13 @@
 .options-select-menu {
   max-height: 25vh;
 }
+
+.ccLicense-select {
+  width: fit-content;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index 7b540ecd91..2e82948c14 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -209,10 +209,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -226,9 +226,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     });
 
     it('should display the selected cc license', () => {
-      expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText,
-      ).toContain('test license name 2');
+      expect(component.selectedCcLicense.name).toContain('test license name 2');
     });
 
     it('should display all field labels of the selected cc license only', () => {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index d286a830e2..cc1925a4a6 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -4,14 +4,18 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  ChangeDetectorRef,
   Component,
   Inject,
 } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import {
+  NgbDropdownModule,
   NgbModal,
   NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
@@ -22,14 +26,16 @@ import {
   filter,
   map,
   take,
+  tap,
 } from 'rxjs/operators';
 
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import {
@@ -64,6 +70,9 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
+    NgbDropdownModule,
+    FormsModule,
+    InfiniteScrollModule,
   ],
   standalone: true,
 })
@@ -95,7 +104,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   /**
    * Cache of the available Creative Commons licenses.
    */
-  submissionCcLicenses: SubmissionCcLicence[];
+  submissionCcLicenses: SubmissionCcLicence[] = [];
 
   /**
    * Reference to NgbModal
@@ -107,6 +116,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   defaultJurisdiction: string;
 
+  /**
+   * The currently selected cc licence
+   */
+  selectedCcLicense: SubmissionCcLicence = new SubmissionCcLicence();
+
+  /**
+   * Options for paginated data loading
+   */
+  ccLicenceOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+  /**
+   * Check to stop paginated search
+   *
+   * @private
+   */
+  private _isLastPage: boolean;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -131,6 +159,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
     protected configService: ConfigurationDataService,
+    protected ref: ChangeDetectorRef,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
     @Inject('submissionIdProvider') public injectedSubmissionId: string,
@@ -154,9 +183,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param ccLicense the Creative Commons license to select.
    */
   selectCcLicense(ccLicense: SubmissionCcLicence) {
-    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+    if (this.selectedCcLicense.id === ccLicense.id) {
       return;
     }
+    this.selectedCcLicense = ccLicense;
     this.setAccepted(false);
     this.updateSectionData({
       ccLicense: {
@@ -300,13 +330,6 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ elementsPerPage: 9999 }).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((list) => list.page),
-      ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses,
-      ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
         getRemoteDataPayload(),
@@ -319,6 +342,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
       }),
     );
+    this.loadCcLicences();
   }
 
   /**
@@ -338,4 +362,31 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
     this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
   }
+
+  onScroll(event) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading && !this._isLastPage) {
+        this.ccLicenceOptions.currentPage++;
+        this.loadCcLicences();
+      }
+    }
+  }
+
+  loadCcLicences() {
+    this.isLoading = true;
+
+    this.subscriptions.push(
+      this.submissionCcLicensesDataService.findAll(this.ccLicenceOptions).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this._isLastPage = response.pageInfo.currentPage === response.pageInfo.totalPages),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => {
+          this.submissionCcLicenses = [...this.submissionCcLicenses, ...licenses];
+          this.isLoading = false;
+          this.ref.detectChanges();
+        },
+      ),
+    );
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4892358405..a6525f16c9 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1692,6 +1692,8 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dynamic-list.load-more": "Load more",
+
   "dropdown.clear": "Clear selection",
 
   "dropdown.clear.tooltip": "Clear the selected option",
@@ -2298,6 +2300,8 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
+  "item.edit.bitstreams.load-more.link": "Load more",
+
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",

From 8cfc61c7f3a7bb9ade15eec8da5dcaff64fca5c2 Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Fri, 24 Jan 2025 12:12:45 -0300
Subject: [PATCH 1099/1286] Improving the color contrast of home news content
 (#3880)

* Improving the color contrast of home news content

* Improved color contrast

* Adjusting font color changes

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
---
 .../dspace/app/home-page/home-news/home-news.component.scss | 6 ++++++
 src/themes/dspace/styles/_theme_css_variable_overrides.scss | 2 +-
 .../dspace/styles/_theme_sass_variable_overrides.scss       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 3c3aa8b445..d00b0ec959 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -4,6 +4,7 @@
   div.background-image-container {
     color: white;
     position: relative;
+    font-weight: 600;
 
     .background-image > img {
       background-color: var(--bs-info);
@@ -68,6 +69,11 @@
       color: var(--ds-home-news-link-hover-color);
     }
   }
+
+  .lead {
+    font-size: 1.25rem;
+    font-weight: 400;
+  }
 }
 
 
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 863db57833..5763979e94 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -11,7 +11,7 @@
     --ds-header-height: 90px;
   }
 
-  --ds-banner-text-background: rgba(0, 0, 0, 0.45);
+  --ds-banner-text-background: rgba(0, 0, 0, 0.58);
   --ds-banner-background-gradient-width: 300px;
 
   --ds-header-navbar-border-bottom-height: 5px;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index a9231d37e5..9fcb540ab6 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -83,7 +83,7 @@ $navbar-dark-color: #fff;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
-$ds-home-news-link-color: #92c642;
+$ds-home-news-link-color: #D2FC93;
 $ds-header-navbar-border-bottom-color: #92c642;
 
 $ds-breadcrumb-link-color: #154E66 !default;

From c5fd4426cd5e688ff65b38d2e4c177831e8ecc5c Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 21 Nov 2024 16:28:41 +0100
Subject: [PATCH 1100/1286] [DURACOM-303] prevent possibly long-lasting search
 and browse calls in SSR

---
 .../browse-by-date-page.component.spec.ts     | 39 +++++++++++++++++--
 .../browse-by-date-page.component.ts          | 11 +++++-
 .../browse-by-metadata-page.component.spec.ts | 36 +++++++++++++++--
 .../browse-by-metadata-page.component.ts      | 13 +++++--
 .../browse-by-title-page.component.spec.ts    | 32 ++++++++++++++-
 .../configuration-search-page.component.ts    |  5 ++-
 .../shared/search/search.component.spec.ts    | 32 ++++++++++++++-
 src/app/shared/search/search.component.ts     | 24 +++++++++++-
 8 files changed, 176 insertions(+), 16 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index b19250edae..ac572c7b86 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -1,5 +1,5 @@
 import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { Community } from '../../core/shared/community.model';
@@ -24,6 +24,7 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { cold } from 'jasmine-marbles';
+import { Store } from "@ngrx/store";
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -95,7 +96,10 @@ describe('BrowseByDatePageComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
         { provide: ChangeDetectorRef, useValue: mockCdRef },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: Store, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -131,4 +135,33 @@ describe('BrowseByDatePageComponent', () => {
     //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
     expect(comp.startsWithOptions[0]).toEqual(1960);
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
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 7e0b6f0f88..62bba4d86c 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject, PLATFORM_ID } from '@angular/core';
 import {
   BrowseByMetadataPageComponent,
   browseParamsToOptions
@@ -11,6 +11,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map, take } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { isValidDate } from '../../shared/date.util';
@@ -18,6 +19,7 @@ import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from "@angular/common";
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -44,11 +46,16 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
                      protected cdRef: ChangeDetectorRef,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
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 2bdecc2670..8eda34cd62 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
@@ -3,7 +3,7 @@ import {
   browseParamsToOptions,
   getBrowseSearchOptions
 } from './browse-by-metadata-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { BrowseService } from '../../core/browse/browse.service';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -13,7 +13,7 @@ import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { Observable, of as observableOf } from 'rxjs';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
@@ -111,7 +111,8 @@ describe('BrowseByMetadataPageComponent', () => {
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environmentMock }
+        { provide: APP_CONFIG, useValue: environmentMock },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -224,6 +225,35 @@ describe('BrowseByMetadataPageComponent', () => {
       expect(result.fetchThumbnail).toBeTrue();
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
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 fe407a2fb0..4629982e65 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
-import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
+import { Component, Inject, OnInit, OnDestroy, Input, PLATFORM_ID } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
@@ -37,7 +37,10 @@ export const BBM_PAGINATION_ID = 'bbm';
  * 'dc.contributor.*'
  */
 export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
-
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide = false;
   /**
    * The list of browse-entries to display
    */
@@ -134,6 +137,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
 
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
@@ -146,7 +150,10 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
 
 
   ngOnInit(): void {
-
+    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index e32c0ac430..9c9586032d 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Item } from '../../core/shared/item.model';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
@@ -22,6 +22,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { BrowseEntry } from "../../core/shared/browse-entry.model";
 
 
 describe('BrowseByTitlePageComponent', () => {
@@ -97,4 +98,33 @@ describe('BrowseByTitlePageComponent', () => {
       expect(result.payload.page).toEqual(mockItems);
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 9196dda025..13e4709ca0 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,7 +1,7 @@
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { SearchComponent } from '../shared/search/search.component';
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject, PLATFORM_ID } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
 import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
@@ -35,7 +35,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig, platformId);
   }
 }
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 8ffd832009..05d4fc6b85 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
 
 import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -216,6 +216,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
         useValue: searchConfigurationServiceStub
       },
       { provide: APP_CONFIG, useValue: environment },
+      { provide: PLATFORM_ID, useValue: 'browser' },
     ],
     schemas: [NO_ERRORS_SCHEMA]
   }).overrideComponent(compType, {
@@ -374,5 +375,34 @@ describe('SearchComponent', () => {
         expect(result).toBeNull();
       });
     });
+
+    describe('when rendered in SSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'server';
+      });
+
+      it('should not call search method on init', (done) => {
+        comp.ngOnInit();
+        //Check that the first method from which the search depend upon is not being called
+        expect(searchConfigurationServiceStub.getCurrentConfiguration).not.toHaveBeenCalled();
+        comp.initialized$.subscribe((res) => {
+          expect(res).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('when rendered in CSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'browser';
+      });
+
+      it('should call search method on init', fakeAsync(() => {
+        comp.ngOnInit();
+        tick(100);
+        //Check that the last method from which the search depend upon is being called
+        expect(searchServiceStub.search).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 5a848c9786..6040a47d6e 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,4 +1,14 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output, OnDestroy } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+  OnDestroy,
+  PLATFORM_ID
+} from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -38,6 +48,7 @@ import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
+import { isPlatformServer } from "@angular/common";
 
 @Component({
   selector: 'ds-search',
@@ -176,6 +187,11 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   @Input() scope: string;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide = false;
+
   /**
    * The current configuration used during the search
    */
@@ -285,6 +301,7 @@ export class SearchComponent implements OnDestroy, OnInit {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
@@ -297,6 +314,11 @@ export class SearchComponent implements OnDestroy, OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
+    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+      this.initialized$.next(true);
+      return;
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);

From 5868a3198f9d12d817ac845ea1d04c59aa756359 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 16:49:25 +0100
Subject: [PATCH 1101/1286] [DURACOM-303] fix missing imports

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

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index ac572c7b86..d94e7df04f 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -25,6 +25,7 @@ import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { cold } from 'jasmine-marbles';
 import { Store } from "@ngrx/store";
+import { BrowseEntry } from "../../core/shared/browse-entry.model";
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
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 4629982e65..e18841f9ca 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
@@ -22,6 +22,7 @@ import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from "@angular/common";
 
 export const BBM_PAGINATION_ID = 'bbm';
 
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 11dc2a2a6a..0d8a2e32ed 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -1,5 +1,5 @@
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, PLATFORM_ID } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import {
@@ -11,9 +11,11 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { map, take } from 'rxjs/operators';
+import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { isPlatformServer } from "@angular/common";
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -32,11 +34,16 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);

From 39c5de6e18ff7e4baa78861b760990c775433562 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 26 Nov 2024 13:11:26 +0100
Subject: [PATCH 1102/1286] [DURACOM-303] implement skeleton component for
 search results

---
 package.json                                  |  1 +
 .../search-results-skeleton.component.html    | 12 +++++++
 .../search-results-skeleton.component.scss    |  0
 .../search-results-skeleton.component.spec.ts | 27 ++++++++++++++
 .../search-results-skeleton.component.ts      | 36 +++++++++++++++++++
 .../search-results.component.html             |  7 +++-
 .../search-results.component.spec.ts          |  2 ++
 src/themes/custom/lazy-theme.module.ts        |  4 +++
 8 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
 create mode 100644 src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts

diff --git a/package.json b/package.json
index c2aa6d74dd..86a506c57a 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,7 @@
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
+    "ngx-skeleton-loader": "^9.0.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.8.1",
     "pem": "1.14.8",
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
new file mode 100644
index 0000000000..33f05985e1
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -0,0 +1,12 @@
+@for (result of loadingResults; track result) {
+  <div class="row">
+    @if(showThumbnails) {
+      <ngx-skeleton-loader [theme]="{height: '100px', width: '120px', padding: '1em'}" />
+    }
+
+    <div [class.col-9]="showThumbnails" [class.col-md-12]="!showThumbnails">
+      <ngx-skeleton-loader [theme]="{height: '20px', width: '75px'}" />
+      <ngx-skeleton-loader [theme]="{height: '20px'}" count="2"/>
+    </div>
+  </div>
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
new file mode 100644
index 0000000000..0ec74eb946
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -0,0 +1,27 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
+
+describe('SearchResultsSkeletonComponent', () => {
+  let component: SearchResultsSkeletonComponent;
+  let fixture: ComponentFixture<SearchResultsSkeletonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SearchResultsSkeletonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
new file mode 100644
index 0000000000..d35c5d1733
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -0,0 +1,36 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { hasValue } from '../../../empty.util';
+
+@Component({
+  selector: 'ds-search-results-skeleton',
+  standalone: true,
+  imports: [
+    NgxSkeletonLoaderModule,
+  ],
+  templateUrl: './search-results-skeleton.component.html',
+  styleUrl: './search-results-skeleton.component.scss',
+})
+export class SearchResultsSkeletonComponent implements OnInit {
+  @Input()
+  showThumbnails: boolean;
+
+  @Input()
+  numberOfResults = 0;
+
+  public loadingResults: number[];
+
+  ngOnInit() {
+    this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
+
+    if (!hasValue(this.showThumbnails)) {
+      // this is needed as the default value of show thumbnails is true but set in lower levels of the DOM.
+      this.showThumbnails = true;
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 1f1e58ea10..1ad0129d2d 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -19,7 +19,12 @@
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
-<ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
+<ds-search-results-skeleton
+  *ngIf="isLoading()"
+  [showThumbnails]="showThumbnails"
+  [numberOfResults]="searchConfig.pagination.pageSize"
+></ds-search-results-skeleton>
+
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index 4cc4f84f65..cf4bcf61a5 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
+import { SearchResultsSkeletonComponent } from "./search-results-skeleton/search-results-skeleton.component";
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -19,6 +20,7 @@ describe('SearchResultsComponent', () => {
       imports: [TranslateModule.forRoot(), NoopAnimationsModule],
       declarations: [
         SearchResultsComponent,
+        SearchResultsSkeletonComponent,
         QueryParamsDirectiveStub],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 73400e7880..1fe476c1e1 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -159,6 +159,9 @@ import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
 import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
 import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
 import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
+import {
+  SearchResultsSkeletonComponent
+} from "../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component";
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -245,6 +248,7 @@ const DECLARATIONS = [
   UserMenuComponent,
   BrowseByComponent,
   RegisterEmailFormComponent,
+  SearchResultsSkeletonComponent,
 ];
 
 @NgModule({

From 31411e9afa964fd822d29152d4734c38b486d9c8 Mon Sep 17 00:00:00 2001
From: DSpace Bot <68393067+dspace-bot@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:58:29 -0600
Subject: [PATCH 1103/1286] [Port dspace-8_x] Improving the color contrast of
 home news content (#3891)

* Improving the color contrast of home news content

(cherry picked from commit 2290b871f72acc85dd05955a7e2877f8cea16238)

* Improved color contrast

(cherry picked from commit 62b6677e04b6ba6578603d1ceb6ae40e967340de)

* Adjusting font color changes

(cherry picked from commit be335415fd8e62ed108c6652544588c3be46ac88)

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
---
 .../dspace/app/home-page/home-news/home-news.component.scss | 6 ++++++
 src/themes/dspace/styles/_theme_css_variable_overrides.scss | 2 +-
 .../dspace/styles/_theme_sass_variable_overrides.scss       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 3c3aa8b445..d00b0ec959 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -4,6 +4,7 @@
   div.background-image-container {
     color: white;
     position: relative;
+    font-weight: 600;
 
     .background-image > img {
       background-color: var(--bs-info);
@@ -68,6 +69,11 @@
       color: var(--ds-home-news-link-hover-color);
     }
   }
+
+  .lead {
+    font-size: 1.25rem;
+    font-weight: 400;
+  }
 }
 
 
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 863db57833..5763979e94 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -11,7 +11,7 @@
     --ds-header-height: 90px;
   }
 
-  --ds-banner-text-background: rgba(0, 0, 0, 0.45);
+  --ds-banner-text-background: rgba(0, 0, 0, 0.58);
   --ds-banner-background-gradient-width: 300px;
 
   --ds-header-navbar-border-bottom-height: 5px;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index a9231d37e5..9fcb540ab6 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -83,7 +83,7 @@ $navbar-dark-color: #fff;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
-$ds-home-news-link-color: #92c642;
+$ds-home-news-link-color: #D2FC93;
 $ds-header-navbar-border-bottom-color: #92c642;
 
 $ds-breadcrumb-link-color: #154E66 !default;

From 6cd092671f1dfd382410517fccd55650db0edf6a Mon Sep 17 00:00:00 2001
From: DSpace Bot <68393067+dspace-bot@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:58:41 -0600
Subject: [PATCH 1104/1286] [Port dspace-7_x] Improving the color contrast of
 home news content (#3890)

* Improving the color contrast of home news content

(cherry picked from commit 2290b871f72acc85dd05955a7e2877f8cea16238)

* Improved color contrast

(cherry picked from commit 62b6677e04b6ba6578603d1ceb6ae40e967340de)

* Adjusting font color changes

(cherry picked from commit be335415fd8e62ed108c6652544588c3be46ac88)

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
---
 .../dspace/app/home-page/home-news/home-news.component.scss | 6 ++++++
 src/themes/dspace/styles/_theme_css_variable_overrides.scss | 2 +-
 .../dspace/styles/_theme_sass_variable_overrides.scss       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 3c3aa8b445..d00b0ec959 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -4,6 +4,7 @@
   div.background-image-container {
     color: white;
     position: relative;
+    font-weight: 600;
 
     .background-image > img {
       background-color: var(--bs-info);
@@ -68,6 +69,11 @@
       color: var(--ds-home-news-link-hover-color);
     }
   }
+
+  .lead {
+    font-size: 1.25rem;
+    font-weight: 400;
+  }
 }
 
 
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index d016ff4032..8b95cd0033 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -11,7 +11,7 @@
     --ds-header-height: 90px;
   }
 
-  --ds-banner-text-background: rgba(0, 0, 0, 0.45);
+  --ds-banner-text-background: rgba(0, 0, 0, 0.58);
   --ds-banner-background-gradient-width: 300px;
 
   --ds-header-navbar-border-bottom-height: 5px;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 17155b15a1..3750b1f826 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -83,7 +83,7 @@ $navbar-dark-color: #fff;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
-$ds-home-news-link-color: #92c642;
+$ds-home-news-link-color: #D2FC93;
 $ds-header-navbar-border-bottom-color: #92c642;
 
 $ds-breadcrumb-link-color: #154E66 !default;

From 126f3c71f4a2ad5a9f6b52b098ed1317e3c0d935 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 27 Nov 2024 16:01:41 +0100
Subject: [PATCH 1105/1286] [DURACOM-303] add skeleton loader for search
 results and filters

---
 .../search-filters.component.html             |  6 ++++-
 .../search-filters.component.scss             | 10 ++++++-
 .../search-filters.component.ts               |  8 +++++-
 .../search-results-skeleton.component.html    | 18 ++++++++++---
 .../search-results-skeleton.component.scss    | 27 +++++++++++++++++++
 .../search-results-skeleton.component.ts      |  3 +++
 .../search-results.component.html             |  2 +-
 src/app/shared/search/search.component.ts     |  3 +++
 src/config/search-page-config.interface.ts    | 16 +++++++++++
 src/styles/_custom_variables.scss             | 11 ++++++++
 .../styles/_theme_css_variable_overrides.scss |  1 +
 11 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 src/config/search-page-config.interface.ts

diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index c006d80c44..97f8c75234 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,7 +1,11 @@
 <h3>{{"search.filters.head" | translate}}</h3>
-<div *ngIf="(filters | async)?.hasSucceeded">
+<div *ngIf="(filters | async)?.hasSucceeded; else skeleton;">
     <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
         <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
+
+<ng-template #skeleton>
+  <ngx-skeleton-loader [count]="defaultFilterCount"/>
+</ng-template>
 <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index b5b2816e89..a103119daf 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -1,2 +1,10 @@
 @import '../../../../styles/variables';
-@import '../../../../styles/mixins';
\ No newline at end of file
+@import '../../../../styles/mixins';
+
+:host ::ng-deep {
+  ngx-skeleton-loader .skeleton-loader {
+    height: var(--ds-filters-skeleton-height);
+    margin-bottom: var(--ds-filters-skeleton-spacing);
+    padding: var(--ds-filters-skeleton-spacing);
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 766939226d..c960dfda56 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -12,6 +12,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
+import { APP_CONFIG, AppConfig } from "../../../../config/app-config.interface";
 
 @Component({
   selector: 'ds-search-filters',
@@ -61,6 +62,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   subs = [];
+  defaultFilterCount: number;
 
   /**
    * Initialize instance variables
@@ -68,12 +70,16 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * @param {SearchFilterService} filterService
    * @param {Router} router
    * @param {SearchConfigurationService} searchConfigService
+   * @param appConfig
    */
   constructor(
     private searchService: SearchService,
     private filterService: SearchFilterService,
     private router: Router,
-    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
+    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    this.defaultFilterCount = this.appConfig.search.defaultFilterCount ?? 5;
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index 33f05985e1..5972a54dc4 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -1,12 +1,24 @@
+<div class="row">
+  <div class="info-skeleton mb-2">
+    <ngx-skeleton-loader/>
+  </div>
+</div>
+
 @for (result of loadingResults; track result) {
   <div class="row">
     @if(showThumbnails) {
-      <ngx-skeleton-loader [theme]="{height: '100px', width: '120px', padding: '1em'}" />
+      <div class="thumbnail-skeleton">
+        <ngx-skeleton-loader/>
+      </div>
     }
 
     <div [class.col-9]="showThumbnails" [class.col-md-12]="!showThumbnails">
-      <ngx-skeleton-loader [theme]="{height: '20px', width: '75px'}" />
-      <ngx-skeleton-loader [theme]="{height: '20px'}" count="2"/>
+      <div class="badge-skeleton">
+        <ngx-skeleton-loader/>
+      </div>
+      <div class="text-skeleton">
+        <ngx-skeleton-loader [count]="textLineCount"/>
+      </div>
     </div>
   </div>
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
index e69de29bb2..c982d14fb0 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -0,0 +1,27 @@
+:host ::ng-deep {
+  .info-skeleton, .badge-skeleton, .text-skeleton{
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+
+  .badge-skeleton, .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-badge-width);
+    }
+  }
+
+  .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-info-width);
+    }
+  }
+
+  .thumbnail-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-thumbnail-width);
+      height: var(--ds-search-skeleton-thumbnail-height);
+      padding: var(--ds-search-skeleton-thumbnail-padding);
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index d35c5d1733..fef1529460 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -23,6 +23,9 @@ export class SearchResultsSkeletonComponent implements OnInit {
   @Input()
   numberOfResults = 0;
 
+  @Input()
+  textLineCount = 2;
+
   public loadingResults: number[];
 
   ngOnInit() {
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 1ad0129d2d..a190b64752 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -20,7 +20,7 @@
     </ds-viewable-collection>
 </div>
 <ds-search-results-skeleton
-  *ngIf="isLoading()"
+  *ngIf="true"
   [showThumbnails]="showThumbnails"
   [numberOfResults]="searchConfig.pagination.pageSize"
 ></ds-search-results-skeleton>
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 6040a47d6e..362257be0e 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -315,6 +315,9 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   ngOnInit(): void {
     if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+      this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
+        this.searchOptions$.next(options);
+      }));
       this.initialized$.next(true);
       return;
     }
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
new file mode 100644
index 0000000000..7d582866e7
--- /dev/null
+++ b/src/config/search-page-config.interface.ts
@@ -0,0 +1,16 @@
+import { AdvancedSearchConfig } from './advance-search-config.interface';
+import { Config } from './config.interface';
+
+export interface SearchConfig extends Config {
+
+    /**
+     * List of standard filter to select in adding advanced Search
+     * Used by {@link UploadBitstreamComponent}.
+     */
+    advancedFilters: AdvancedSearchConfig;
+  /**
+   * Number used to render n skeletons while the filters are loading
+   */
+  defaultFilterCount?: number;
+
+}
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index aa67acac1c..96db246079 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -138,4 +138,15 @@
   --green1: #1FB300;  // This variable represents the success color for the Klaro cookie banner
   --button-text-color-cookie: #333; // This variable represents the text color for buttons in the Klaro cookie banner
   --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
+
+  --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-thumbnail-height: 100px;
+  --ds-search-skeleton-thumbnail-width: 120px;
+  --ds-search-skeleton-thumbnail-padding: 1em;
+  --ds-search-skeleton-text-line-count: 2;
+  --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-info-width: 200px;
+
+  --ds-filters-skeleton-height: 40px;
+  --ds-filters-skeleton-spacing: 12px;
 }
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index d016ff4032..5978eadb28 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -18,6 +18,7 @@
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
   in order to keep the bottom border of the header when navbar is expanded */
+
   --ds-expandable-navbar-border-top-color: #{$white};
   --ds-expandable-navbar-border-top-height: 0;
   --ds-expandable-navbar-padding-top: 0;

From 61eb14783e3995fe2beede1801b1027a62032f0b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 17:03:47 +0100
Subject: [PATCH 1106/1286] [DURACOM-303] resolve conflicts

---
 src/config/app-config.interface.ts         | 2 ++
 src/config/default-app-config.ts           | 5 +++++
 src/config/search-page-config.interface.ts | 7 -------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index a2bf0cb876..8b8dcf74a7 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from "./search-page-config.interface";
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -50,6 +51,7 @@ interface AppConfig extends Config {
   vocabularies: FilterVocabularyConfig[];
   comcolSelectionSort: DiscoverySortConfig;
   liveRegion: LiveRegionConfig;
+  search: SearchConfig
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index a3a490538c..0915f90069 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -23,6 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
+import { SearchConfig } from "./search-page-config.interface";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -442,4 +443,8 @@ export class DefaultAppConfig implements AppConfig {
     messageTimeOutDurationMs: 30000,
     isVisible: false,
   };
+
+  search: SearchConfig = {
+    defaultFilterCount: 2
+  }
 }
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index 7d582866e7..cc63607f7f 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -1,13 +1,6 @@
-import { AdvancedSearchConfig } from './advance-search-config.interface';
 import { Config } from './config.interface';
 
 export interface SearchConfig extends Config {
-
-    /**
-     * List of standard filter to select in adding advanced Search
-     * Used by {@link UploadBitstreamComponent}.
-     */
-    advancedFilters: AdvancedSearchConfig;
   /**
    * Number used to render n skeletons while the filters are loading
    */

From d6f0f02c1aaf437126289ac6ed0180ea266ac8ab Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 28 Nov 2024 13:54:48 +0100
Subject: [PATCH 1107/1286] [DURACOM-303] minor restyle of skeleton for mobile

---
 .../search-results-skeleton.component.html                  | 6 +++---
 .../search-results-skeleton.component.scss                  | 5 +++++
 .../search/search-results/search-results.component.html     | 2 +-
 src/config/default-app-config.ts                            | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index 5972a54dc4..4bc70d1263 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -1,11 +1,11 @@
-<div class="row">
-  <div class="info-skeleton mb-2">
+<div class="row flex-nowrap">
+  <div class="info-skeleton mb-2 col-12">
     <ngx-skeleton-loader/>
   </div>
 </div>
 
 @for (result of loadingResults; track result) {
-  <div class="row">
+  <div class="row flex-nowrap result-row">
     @if(showThumbnails) {
       <div class="thumbnail-skeleton">
         <ngx-skeleton-loader/>
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
index c982d14fb0..02711a33b6 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -25,3 +25,8 @@
     }
   }
 }
+
+.result-row {
+  margin-right: 0;
+  margin-left: 0;
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index a190b64752..1ad0129d2d 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -20,7 +20,7 @@
     </ds-viewable-collection>
 </div>
 <ds-search-results-skeleton
-  *ngIf="true"
+  *ngIf="isLoading()"
   [showThumbnails]="showThumbnails"
   [numberOfResults]="searchConfig.pagination.pageSize"
 ></ds-search-results-skeleton>
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 0915f90069..7ed4168217 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -445,6 +445,6 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   search: SearchConfig = {
-    defaultFilterCount: 2
+    defaultFilterCount: 5
   }
 }

From 312a2a7f58decb141822c81fc5e4c86b10331f2f Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 28 Nov 2024 15:01:00 +0100
Subject: [PATCH 1108/1286] [DURACOM-303] fix lint and tests

---
 .../search/search-filters/search-filters.component.spec.ts    | 4 +++-
 .../search/search-results/search-results.component.spec.ts    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 522459b603..c8ad89910c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -9,6 +9,8 @@ import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { APP_CONFIG } from "../../../../config/app-config.interface";
+import { environment } from "../../../../environments/environment";
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -37,7 +39,7 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFiltersStub },
-
+        { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFiltersComponent, {
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index cf4bcf61a5..dc961c97cb 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -65,7 +65,7 @@ describe('SearchResultsComponent', () => {
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
-    (comp as any).searchConfig = { query: 'foobar' };
+    (comp as any).searchConfig = { query: 'foobar', pagination: { pageSize: 10 } };
     fixture.detectChanges();
 
     const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));

From b482b58d530b946b4e3376acb406e1ee04c68059 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 20 Dec 2024 15:36:06 +0100
Subject: [PATCH 1109/1286] [DURACOM-303] adapt tests

---
 .../browse-by-date-page.component.spec.ts       | 12 ++++++------
 .../browse-by-title-page.component.spec.ts      | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index d94e7df04f..2fe673f821 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -140,12 +140,12 @@ describe('BrowseByDatePageComponent', () => {
   describe('when rendered in SSR', () => {
     beforeEach(() => {
       comp.platformId = 'server';
-      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
     });
 
-    it('should not call getBrowseEntriesFor on init', (done) => {
+    it('should not call getBrowseItemsFor on init', (done) => {
       comp.ngOnInit();
-      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
       comp.loading$.subscribe((res) => {
         expect(res).toBeFalsy();
         done();
@@ -156,13 +156,13 @@ describe('BrowseByDatePageComponent', () => {
   describe('when rendered in CSR', () => {
     beforeEach(() => {
       comp.platformId = 'browser';
-      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
     });
 
-    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
       comp.ngOnInit();
       tick(100);
-      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
     }));
   });
 });
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index 9c9586032d..653ad596c5 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -64,7 +64,8 @@ describe('BrowseByTitlePageComponent', () => {
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
-    data: observableOf({ metadata: 'title' })
+    queryParams: observableOf({}),
+    data: observableOf({ metadata: 'title' }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -102,12 +103,13 @@ describe('BrowseByTitlePageComponent', () => {
   describe('when rendered in SSR', () => {
     beforeEach(() => {
       comp.platformId = 'server';
-      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+      fixture.detectChanges();
     });
 
-    it('should not call getBrowseEntriesFor on init', (done) => {
+    it('should not call getBrowseItemsFor on init', (done) => {
       comp.ngOnInit();
-      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
       comp.loading$.subscribe((res) => {
         expect(res).toBeFalsy();
         done();
@@ -118,13 +120,14 @@ describe('BrowseByTitlePageComponent', () => {
   describe('when rendered in CSR', () => {
     beforeEach(() => {
       comp.platformId = 'browser';
-      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+      fixture.detectChanges();
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
     });
 
-    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
       comp.ngOnInit();
       tick(100);
-      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
     }));
   });
 });

From 6756a78ba03944a8ee28a582a89480fd2a3fc3e4 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 10 Jan 2025 12:01:50 +0100
Subject: [PATCH 1110/1286] [DURACOM-303] restyle skeleton, add filter badge
 skeleton

---
 .../search-filters/search-filters.component.scss      |  2 ++
 .../search-results-skeleton.component.scss            |  7 +++++++
 .../search-results/search-results.component.html      | 11 +++++++++++
 .../search-results/search-results.component.scss      | 10 ++++++++++
 .../search/search-results/search-results.component.ts |  9 +++++++++
 src/styles/_custom_variables.scss                     |  6 ++++--
 6 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 src/app/shared/search/search-results/search-results.component.scss

diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index a103119daf..6170b9281c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -6,5 +6,7 @@
     height: var(--ds-filters-skeleton-height);
     margin-bottom: var(--ds-filters-skeleton-spacing);
     padding: var(--ds-filters-skeleton-spacing);
+    background-color: var(--bs-light);
+    box-shadow: none;
   }
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
index 02711a33b6..1a111f9dd9 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -22,8 +22,15 @@
       width: var(--ds-search-skeleton-thumbnail-width);
       height: var(--ds-search-skeleton-thumbnail-height);
       padding: var(--ds-search-skeleton-thumbnail-padding);
+      margin-right: var(--ds-search-skeleton-thumbnail-margin);
+      border-radius: 0;
     }
   }
+
+  ngx-skeleton-loader .skeleton-loader {
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
 }
 
 .result-row {
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 1ad0129d2d..d812561ea7 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,3 +1,13 @@
+@if ((filters$ | async).length > 0 && isLoading()) {
+  <div class="row">
+    <div class="col-12">
+      <div class="filter-badge-skeleton">
+        <ngx-skeleton-loader/>
+      </div>
+    </div>
+  </div>
+}
+
 <div class="d-flex justify-content-between">
     <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
@@ -19,6 +29,7 @@
             (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
 </div>
+
 <ds-search-results-skeleton
   *ngIf="isLoading()"
   [showThumbnails]="showThumbnails"
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..4bf3f8325e
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -0,0 +1,10 @@
+:host ::ng-deep {
+  .filter-badge-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      background-color: var(--bs-light);
+      box-shadow: none;
+      width: var(--ds-search-skeleton-filter-badge-width);
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 15d2cc0f00..e4ebf2819b 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -11,6 +11,9 @@ import { CollectionElementLinkType } from '../../object-collection/collection-el
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from "../models/search-filter.model";
+import { Observable } from "rxjs";
+import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -32,6 +35,8 @@ export interface SelectionConfig {
 export class SearchResultsComponent {
   hasNoValue = hasNoValue;
 
+  filters$: Observable<SearchFilter[]>;
+
   /**
    * The link type of the listed search results
    */
@@ -104,6 +109,10 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  constructor(private searchConfigService: SearchConfigurationService) {
+    this.filters$ = this.searchConfigService.getCurrentFilters();
+  }
+
   /**
    * Check if search results are loading
    */
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 96db246079..d64f1c6acd 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -140,11 +140,13 @@
   --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
 
   --ds-search-skeleton-text-height: 20px;
-  --ds-search-skeleton-thumbnail-height: 100px;
-  --ds-search-skeleton-thumbnail-width: 120px;
+  --ds-search-skeleton-thumbnail-height: 125px;
+  --ds-search-skeleton-thumbnail-width: 90px;
   --ds-search-skeleton-thumbnail-padding: 1em;
+  --ds-search-skeleton-thumbnail-margin: 1em;
   --ds-search-skeleton-text-line-count: 2;
   --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-filter-badge-width: 200px;
   --ds-search-skeleton-info-width: 200px;
 
   --ds-filters-skeleton-height: 40px;

From 8ee05f43521462b85f041c1c903f5eb7f52d94bd Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 17:11:13 +0100
Subject: [PATCH 1111/1286] [DURACOM-303] fix missing url link

---
 src/app/shared/search/search-results/search-results.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index e4ebf2819b..296d73f9d8 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -22,6 +22,7 @@ export interface SelectionConfig {
 
 @Component({
   selector: 'ds-search-results',
+  styleUrls: ['./search-results.component.scss'],
   templateUrl: './search-results.component.html',
   animations: [
     fadeIn,

From 99656f1357438695385820f2c95d4ca5a58993b9 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 10 Jan 2025 12:54:40 +0100
Subject: [PATCH 1112/1286] [DURACOM-303] add loop for filters count

---
 .../search/search-results/search-results.component.html   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index d812561ea7..643cf5eb4b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,8 +1,12 @@
 @if ((filters$ | async).length > 0 && isLoading()) {
   <div class="row">
     <div class="col-12">
-      <div class="filter-badge-skeleton">
-        <ngx-skeleton-loader/>
+      <div class="d-flex">
+        @for (filter of (filters$| async); track filter.key) {
+          <div class="filter-badge-skeleton mr-2">
+            <ngx-skeleton-loader/>
+          </div>
+        }
       </div>
     </div>
   </div>

From 9467838066cb48906dcda334919f468fea59efbe Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 10 Jan 2025 18:08:20 +0100
Subject: [PATCH 1113/1286] [DURACOM-303] add grid layout, make SSR enabling
 configurable, minor restyle of skeletons

---
 config/config.example.yml                     | 12 +++++-
 .../browse-by-metadata-page.component.ts      |  4 +-
 .../search-filter/search-filter.component.ts  |  7 +++-
 .../search-filters.component.html             |  9 +++--
 .../search-filters.component.ts               | 11 +++++
 .../search-results-skeleton.component.html    | 40 ++++++++++++-------
 .../search-results-skeleton.component.scss    | 20 ++++++++++
 .../search-results-skeleton.component.ts      | 17 ++++++++
 .../search-results.component.html             | 10 ++---
 .../search-results.component.scss             |  9 ++++-
 .../search-results.component.ts               |  6 ++-
 src/app/shared/search/search.component.ts     |  2 +
 src/environments/environment.production.ts    |  4 +-
 src/environments/environment.test.ts          |  2 +
 src/environments/environment.ts               |  4 +-
 src/styles/_custom_variables.scss             |  2 +
 16 files changed, 127 insertions(+), 32 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index c1d7f967a4..0a039a40ad 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -25,6 +25,14 @@ ssr:
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
   paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false,
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false,
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
@@ -84,7 +92,7 @@ cache:
     anonymousCache:
       # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
       # As all pages are cached in server memory, increasing this value will increase memory needs.
-      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory. 
+      # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory.
       max: 0
       # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
       # copy is automatically refreshed on the next request.
@@ -394,7 +402,7 @@ vocabularies:
     vocabulary: 'srsc'
     enabled: true
 
-# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
+# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query.
 comcolSelectionSort:
   sortField: 'dc.title'
   sortDirection: 'ASC'
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 e18841f9ca..7f14f45b2c 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
@@ -23,6 +23,7 @@ import { Community } from '../../core/shared/community.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { isPlatformServer } from "@angular/common";
+import { environment } from "../../../environments/environment";
 
 export const BBM_PAGINATION_ID = 'bbm';
 
@@ -147,7 +148,8 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
-    }
+    this.renderOnServerSide = environment.ssr.enableBrowseComponent;
+  }
 
 
   ngOnInit(): void {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 67e8906bb5..6f88d3924a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
 
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
@@ -43,6 +43,8 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() scope: string;
 
+  @Output() isVisibilityComputed = new EventEmitter<boolean>();
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -99,6 +101,9 @@ export class SearchFilterComponent implements OnInit {
         this.filterService.expand(this.filter.name);
       }
     });
+    this.active$.pipe(take(1)).subscribe(() => {
+      this.isVisibilityComputed.emit(true);
+    })
   }
 
   /**
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index 97f8c75234..45875ad7ae 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,11 +1,12 @@
 <h3>{{"search.filters.head" | translate}}</h3>
-<div *ngIf="(filters | async)?.hasSucceeded; else skeleton;">
+<div *ngIf="(filters | async)?.hasSucceeded">
     <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+        <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
 
-<ng-template #skeleton>
+
+<ng-container *ngIf="filtersWithComputedVisibility !== (filters | async)?.payload?.length">
   <ngx-skeleton-loader [count]="defaultFilterCount"/>
-</ng-template>
+</ng-container>
 <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index c960dfda56..28f351cb6c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -61,6 +61,11 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    */
   searchLink: string;
 
+  /**
+   * Filters for which visibility has been computed
+   */
+  filtersWithComputedVisibility = 0;
+
   subs = [];
   defaultFilterCount: number;
 
@@ -114,4 +119,10 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
       }
     });
   }
+
+  countFiltersWithComputedVisibility(computed: boolean) {
+    if (computed) {
+      this.filtersWithComputedVisibility += 1;
+    }
+  }
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index 4bc70d1263..84a67f4358 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -1,24 +1,36 @@
 <div class="row flex-nowrap">
-  <div class="info-skeleton mb-2 col-12">
+  <div [class.mb-2]="(viewMode$ | async) === ViewMode.ListElement" class="info-skeleton col-12">
     <ngx-skeleton-loader/>
   </div>
 </div>
 
-@for (result of loadingResults; track result) {
-  <div class="row flex-nowrap result-row">
-    @if(showThumbnails) {
-      <div class="thumbnail-skeleton">
-        <ngx-skeleton-loader/>
+@if((viewMode$ | async) === ViewMode.ListElement) {
+  @for (result of loadingResults; track result) {
+      <div class="row flex-nowrap result-row">
+      @if(showThumbnails) {
+        <div class="thumbnail-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+      }
+      <div [class.col-9]="showThumbnails" [class.col-md-12]="!showThumbnails">
+        <div class="badge-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+        <div class="text-skeleton">
+          <ngx-skeleton-loader [count]="textLineCount"/>
+        </div>
+      </div>
+    </div>
+  }
+} @else if ((viewMode$ | async) === ViewMode.GridElement) {
+  <div class="card-columns row">
+    @for (result of loadingResults; track result) {
+      <div class="card-column col col-sm-6 col-lg-4">
+        <div class="card-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
       </div>
     }
 
-    <div [class.col-9]="showThumbnails" [class.col-md-12]="!showThumbnails">
-      <div class="badge-skeleton">
-        <ngx-skeleton-loader/>
-      </div>
-      <div class="text-skeleton">
-        <ngx-skeleton-loader [count]="textLineCount"/>
-      </div>
-    </div>
   </div>
 }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
index 1a111f9dd9..e05e4be6d8 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -1,4 +1,6 @@
 :host ::ng-deep {
+  --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
+
   .info-skeleton, .badge-skeleton, .text-skeleton{
     ngx-skeleton-loader .skeleton-loader {
       height: var(--ds-search-skeleton-text-height);
@@ -27,13 +29,31 @@
     }
   }
 
+  .card-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-card-height);
+    }
+  }
+
   ngx-skeleton-loader .skeleton-loader {
     background-color: var(--bs-light);
     box-shadow: none;
   }
+
+  .card-columns {
+    margin-left: calc(-1 * var(--ds-wrapper-grid-spacing));
+    margin-right: calc(-1 * var(--ds-wrapper-grid-spacing));
+    column-gap: 0;
+
+    .card-column {
+      padding-left: var(--ds-wrapper-grid-spacing);
+      padding-right: var(--ds-wrapper-grid-spacing);
+    }
+  }
 }
 
 .result-row {
   margin-right: 0;
   margin-left: 0;
 }
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index fef1529460..d2896460e1 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -1,10 +1,17 @@
+import {
+  AsyncPipe,
+  NgForOf,
+} from '@angular/common';
 import {
   Component,
   Input,
   OnInit,
 } from '@angular/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { Observable } from 'rxjs';
 
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { hasValue } from '../../../empty.util';
 
 @Component({
@@ -12,6 +19,8 @@ import { hasValue } from '../../../empty.util';
   standalone: true,
   imports: [
     NgxSkeletonLoaderModule,
+    AsyncPipe,
+    NgForOf,
   ],
   templateUrl: './search-results-skeleton.component.html',
   styleUrl: './search-results-skeleton.component.scss',
@@ -26,8 +35,16 @@ export class SearchResultsSkeletonComponent implements OnInit {
   @Input()
   textLineCount = 2;
 
+  public viewMode$: Observable<ViewMode>;
+
   public loadingResults: number[];
 
+  protected readonly ViewMode = ViewMode;
+
+  constructor(private searchService: SearchService) {
+    this.viewMode$ = searchService.getViewMode();
+  }
+
   ngOnInit() {
     this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
 
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 643cf5eb4b..71839d009b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,12 +1,10 @@
-@if ((filters$ | async).length > 0 && isLoading()) {
+@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
   <div class="row">
     <div class="col-12">
-      <div class="d-flex">
-        @for (filter of (filters$| async); track filter.key) {
-          <div class="filter-badge-skeleton mr-2">
-            <ngx-skeleton-loader/>
+      <div class="filters-badge-skeleton-container">
+          <div class="filter-badge-skeleton">
+            <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
           </div>
-        }
       </div>
     </div>
   </div>
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
index 4bf3f8325e..6e369c729b 100644
--- a/src/app/shared/search/search-results/search-results.component.scss
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -4,7 +4,14 @@
       background-color: var(--bs-light);
       box-shadow: none;
       width: var(--ds-search-skeleton-filter-badge-width);
-      height: var(--ds-search-skeleton-text-height);
+      height: var(--ds-search-skeleton-badge-height);
+      margin-bottom: 0;
+      margin-right: calc(var(--bs-spacer) / 4);
     }
   }
+
+  .filters-badge-skeleton-container {
+    display: flex;
+    max-height: var(--ds-search-skeleton-badge-height);
+  }
 }
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 296d73f9d8..1faf8dd778 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -14,6 +14,7 @@ import { PaginatedSearchOptions } from '../models/paginated-search-options.model
 import { SearchFilter } from "../models/search-filter.model";
 import { Observable } from "rxjs";
 import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
+import { SearchService } from "../../../core/shared/search/search.service";
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -110,7 +111,10 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
-  constructor(private searchConfigService: SearchConfigurationService) {
+  constructor(
+    protected searchConfigService: SearchConfigurationService,
+    protected searchService: SearchService,
+  ) {
     this.filters$ = this.searchConfigService.getCurrentFilters();
   }
 
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 362257be0e..1e8811aa86 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -49,6 +49,7 @@ import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-ro
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { isPlatformServer } from "@angular/common";
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'ds-search',
@@ -304,6 +305,7 @@ export class SearchComponent implements OnDestroy, OnInit {
               @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.renderOnServerSide = environment.universal.enableSearchComponent;
   }
 
   /**
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 46a93519df..c3cb74651b 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -10,5 +10,7 @@ export const environment: Partial<BuildConfig> = {
     time: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
-  }
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
+  },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index e872285f61..ea49f5eb10 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -13,6 +13,8 @@ export const environment: BuildConfig = {
     time: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 
   // Angular Universal server settings.
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 25af371e47..419238f264 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -15,7 +15,9 @@ export const environment: Partial<BuildConfig> = {
     time: false,
     inlineCriticalCss: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
-  }
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
+  },
 };
 
 /*
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index d64f1c6acd..d47f5d2dfa 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -140,6 +140,7 @@
   --very-dark-cyan: #215E50; // This variable represents the background color of the save cookies button
 
   --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-badge-height: 18px;
   --ds-search-skeleton-thumbnail-height: 125px;
   --ds-search-skeleton-thumbnail-width: 90px;
   --ds-search-skeleton-thumbnail-padding: 1em;
@@ -148,6 +149,7 @@
   --ds-search-skeleton-badge-width: 75px;
   --ds-search-skeleton-filter-badge-width: 200px;
   --ds-search-skeleton-info-width: 200px;
+  --ds-search-skeleton-card-height: 435px;
 
   --ds-filters-skeleton-height: 40px;
   --ds-filters-skeleton-spacing: 12px;

From 53335658e0874b84841473307d9cd546bd369962 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 17:29:37 +0100
Subject: [PATCH 1114/1286] [DURACOM-303] adapt interface for ssr

---
 .../browse-by-metadata-page.component.ts                 | 2 +-
 src/config/universal-config.interface.ts                 | 9 +++++++++
 src/environments/environment.test.ts                     | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 7f14f45b2c..06a29aad1a 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
@@ -148,7 +148,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
-    this.renderOnServerSide = environment.ssr.enableBrowseComponent;
+    this.renderOnServerSide = environment.universal.enableBrowseComponent;
   }
 
 
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index e54168823f..e3f7f399a9 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -18,4 +18,13 @@ export interface UniversalConfig extends Config {
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
   paths: Array<string>;
+  /**
+   * Whether to enable rendering of search component on SSR
+   */
+  enableSearchComponent: boolean;
+
+  /**
+   * Whether to enable rendering of browse component on SSR
+   */
+  enableBrowseComponent: boolean;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index ea49f5eb10..4f832e1ac4 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -323,4 +323,8 @@ export const environment: BuildConfig = {
     messageTimeOutDurationMs: 30000,
     isVisible: false,
   },
+
+  search: {
+    defaultFilterCount: 5
+  }
 };

From 2c28f7526366450022d7533e1952463fdc31ce52 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 10 Jan 2025 18:20:58 +0100
Subject: [PATCH 1115/1286] [DURACOM-303] refactor param, add example of
 configuration

---
 config/config.example.yml                                | 9 +++++++++
 .../search/search-filters/search-filters.component.ts    | 2 +-
 src/config/search-page-config.interface.ts               | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 0a039a40ad..6674bc5334 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -420,3 +420,12 @@ liveRegion:
   messageTimeOutDurationMs: 30000
   # The visibility of the live region. Setting this to true is only useful for debugging purposes.
   isVisible: false
+
+
+# Search settings
+search:
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 28f351cb6c..4667694edd 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -84,7 +84,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
-    this.defaultFilterCount = this.appConfig.search.defaultFilterCount ?? 5;
+    this.defaultFilterCount = this.appConfig.search.defaultFiltersCount ?? 5;
   }
 
   ngOnInit(): void {
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index cc63607f7f..0f4a145868 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -2,7 +2,10 @@ import { Config } from './config.interface';
 
 export interface SearchConfig extends Config {
   /**
-   * Number used to render n skeletons while the filters are loading
+   * Number used to render n UI elements called loading skeletons that act as placeholders.
+   * These elements indicate that some content will be loaded in their stead.
+   * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+   * For instance f we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
    */
   defaultFilterCount?: number;
 

From 311f648c3f8707fdaa8124a9ddb355e7ff227876 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 13 Jan 2025 10:51:53 +0100
Subject: [PATCH 1116/1286] [DURACOM-303] rename variable, minor code refactor

---
 .../shared/search/search-filters/search-filters.component.ts | 2 +-
 .../search-results-skeleton.component.spec.ts                | 5 +++++
 .../search-results-skeleton.component.ts                     | 2 +-
 src/app/shared/testing/search-configuration-service.stub.ts  | 4 ++++
 src/config/default-app-config.ts                             | 2 +-
 src/config/search-page-config.interface.ts                   | 4 ++--
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 4667694edd..1f08a5ac5d 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -84,7 +84,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
-    this.defaultFilterCount = this.appConfig.search.defaultFiltersCount ?? 5;
+    this.defaultFilterCount = this.appConfig.search.filterPlaceholdersCount ?? 5;
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
index 0ec74eb946..68c8db5a8e 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -4,6 +4,8 @@ import {
 } from '@angular/core/testing';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
 import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
 
 describe('SearchResultsSkeletonComponent', () => {
@@ -13,6 +15,9 @@ describe('SearchResultsSkeletonComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+      providers: [
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
     })
       .compileComponents();
 
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index d2896460e1..28a603cfa3 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -42,7 +42,7 @@ export class SearchResultsSkeletonComponent implements OnInit {
   protected readonly ViewMode = ViewMode;
 
   constructor(private searchService: SearchService) {
-    this.viewMode$ = searchService.getViewMode();
+    this.viewMode$ = this.searchService.getViewMode();
   }
 
   ngOnInit() {
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index 78b358f0d4..ef72e40041 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -13,6 +13,10 @@ export class SearchConfigurationServiceStub {
     return observableOf([]);
   }
 
+  getCurrentFilters() {
+    return observableOf([]);
+  }
+
   getCurrentScope(a) {
     return observableOf('test-id');
   }
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 7ed4168217..2384942e3b 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -445,6 +445,6 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   search: SearchConfig = {
-    defaultFilterCount: 5
+    filterPlaceholdersCount: 5
   }
 }
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index 0f4a145868..410876cde2 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -5,8 +5,8 @@ export interface SearchConfig extends Config {
    * Number used to render n UI elements called loading skeletons that act as placeholders.
    * These elements indicate that some content will be loaded in their stead.
    * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
-   * For instance f we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+   * For instance if we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
    */
-  defaultFilterCount?: number;
+  filterPlaceholdersCount?: number;
 
 }

From 32364e4f68e8153ecb1143bc9d2827a9789d6f16 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 13 Jan 2025 17:31:12 +0100
Subject: [PATCH 1117/1286] [DURACOM-303] add override possibility with input

---
 .../browse-by-metadata-page.component.ts                       | 3 +--
 src/app/shared/search/search.component.ts                      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
index 06a29aad1a..5575b153db 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
@@ -148,12 +148,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
-    this.renderOnServerSide = environment.universal.enableBrowseComponent;
   }
 
 
   ngOnInit(): void {
-    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
       this.loading$ = observableOf(false);
       return;
     }
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 1e8811aa86..e69a183408 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -305,7 +305,6 @@ export class SearchComponent implements OnDestroy, OnInit {
               @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
-    this.renderOnServerSide = environment.universal.enableSearchComponent;
   }
 
   /**
@@ -316,7 +315,7 @@ export class SearchComponent implements OnDestroy, OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
-    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+    if (!this.renderOnServerSide && !environment.universal.enableSearchComponent && isPlatformServer(this.platformId)) {
       this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
         this.searchOptions$.next(options);
       }));

From 8a4e8f60451ef83c8f5f9ee95f1c874424408a73 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 20 Jan 2025 13:16:36 +0100
Subject: [PATCH 1118/1286] [DURACOM-303] fix SSR check on template and on
 components missing the environment config. Add descriptive comment for
 skeleton component. Fix JS error on SSR.

---
 .../browse-by-date-page/browse-by-date-page.component.ts   | 3 ++-
 .../browse-by-metadata-page.component.spec.ts              | 6 +++---
 .../browse-by-metadata-page.component.ts                   | 7 ++++++-
 .../search-results-skeleton.component.ts                   | 3 +++
 4 files changed, 14 insertions(+), 5 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 62bba4d86c..86a2f3dfa3 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
@@ -20,6 +20,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { isPlatformServer } from "@angular/common";
+import { environment } from "../../../environments/environment";
 
 @Component({
   selector: 'ds-browse-by-date-page',
@@ -52,7 +53,7 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
   }
 
   ngOnInit(): void {
-    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
       this.loading$ = observableOf(false);
       return;
     }
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 8eda34cd62..4ea68eaa0c 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
@@ -228,8 +228,8 @@ describe('BrowseByMetadataPageComponent', () => {
 
   describe('when rendered in SSR', () => {
     beforeEach(() => {
-      comp.platformId = 'server';
-      spyOn((comp as any).browseService, 'getBrowseEntriesFor');
+      comp.ssrRenderingDisabled = true;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(null));
     });
 
     it('should not call getBrowseEntriesFor on init', (done) => {
@@ -244,7 +244,7 @@ describe('BrowseByMetadataPageComponent', () => {
 
   describe('when rendered in CSR', () => {
     beforeEach(() => {
-      comp.platformId = 'browser';
+      comp.ssrRenderingDisabled = false;
       spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
     });
 
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 5575b153db..a7357aaaf3 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
@@ -131,6 +131,10 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    * Observable determining if the loading animation needs to be shown
    */
   loading$ = observableOf(true);
+  /**
+   * Whether this component should be rendered or not in SSR
+   */
+  ssrRenderingDisabled = false;
 
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
@@ -148,11 +152,12 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
         currentPage: 1,
         pageSize: this.appConfig.browseBy.pageSize,
         });
+    this.ssrRenderingDisabled = !this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId);
   }
 
 
   ngOnInit(): void {
-    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
+    if (this.ssrRenderingDisabled) {
       this.loading$ = observableOf(false);
       return;
     }
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index 28a603cfa3..16df026cfd 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -25,6 +25,9 @@ import { hasValue } from '../../../empty.util';
   templateUrl: './search-results-skeleton.component.html',
   styleUrl: './search-results-skeleton.component.scss',
 })
+/**
+ * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
+ */
 export class SearchResultsSkeletonComponent implements OnInit {
   @Input()
   showThumbnails: boolean;

From 171a971572cc9c634677376c6063bd0f54487dfe Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 17:41:38 +0100
Subject: [PATCH 1119/1286] [DURACOM-303] resolve conflicts

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

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 a6abd5a7a4..9628de44b2 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
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" *ngIf="(!ssrRenderingDisabled)">
     <ng-container *ngVar="(parent$ | async) as parent">
     <ng-container *ngIf="parent?.payload as parentContext">
         <div class="d-flex flex-row border-bottom mb-4 pb-4">
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 0d8a2e32ed..74a109574c 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
@@ -16,6 +16,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { isPlatformServer } from "@angular/common";
+import { environment } from "../../../environments/environment";
 
 @Component({
   selector: 'ds-browse-by-title-page',
@@ -40,7 +41,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
   }
 
   ngOnInit(): void {
-    if (!this.renderOnServerSide && isPlatformServer(this.platformId)) {
+    if (!this.renderOnServerSide && !environment.universal.enableBrowseComponent && isPlatformServer(this.platformId)) {
       this.loading$ = observableOf(false);
       return;
     }

From 483b97d9c187f415f5d3ad7579c4e4b773dbd782 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 21 Jan 2025 11:01:54 +0100
Subject: [PATCH 1120/1286] [DURACOM-303] refactor thumbnail's skeleton style

---
 .../search-results-skeleton.component.html    | 12 +++++++-----
 .../search-results-skeleton.component.scss    | 11 ++++-------
 .../search-results-skeleton.component.ts      | 19 +++++++++++++++----
 src/styles/_custom_variables.scss             |  3 ---
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index 84a67f4358..a42bda0674 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -5,14 +5,16 @@
 </div>
 
 @if((viewMode$ | async) === ViewMode.ListElement) {
-  @for (result of loadingResults; track result) {
-      <div class="row flex-nowrap result-row">
+  @for (result of loadingResults; track result; let first = $first) {
+      <div [class.my-4]="!first" class="row">
       @if(showThumbnails) {
-        <div class="thumbnail-skeleton">
-          <ngx-skeleton-loader/>
+        <div class="col-3 col-md-2">
+          <div class="thumbnail-skeleton position-relative">
+            <ngx-skeleton-loader/>
+          </div>
         </div>
       }
-      <div [class.col-9]="showThumbnails" [class.col-md-12]="!showThumbnails">
+      <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
         <div class="badge-skeleton">
           <ngx-skeleton-loader/>
         </div>
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
index e05e4be6d8..9345f1ab43 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -20,12 +20,13 @@
   }
 
   .thumbnail-skeleton {
+    max-width: var(--ds-thumbnail-max-width);
+    height: 100%;
+
     ngx-skeleton-loader .skeleton-loader {
-      width: var(--ds-search-skeleton-thumbnail-width);
-      height: var(--ds-search-skeleton-thumbnail-height);
-      padding: var(--ds-search-skeleton-thumbnail-padding);
       margin-right: var(--ds-search-skeleton-thumbnail-margin);
       border-radius: 0;
+      height: 100%;
     }
   }
 
@@ -52,8 +53,4 @@
   }
 }
 
-.result-row {
-  margin-right: 0;
-  margin-left: 0;
-}
 
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index 16df026cfd..3fba70b119 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -29,17 +29,28 @@ import { hasValue } from '../../../empty.util';
  * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
  */
 export class SearchResultsSkeletonComponent implements OnInit {
+  /**
+   * Whether the search result contains thumbnail
+   */
   @Input()
   showThumbnails: boolean;
-
+  /**
+   * The number of search result loaded in the current page
+   */
   @Input()
   numberOfResults = 0;
-
+  /**
+   * How many placeholder are displayed for the search result text
+   */
   @Input()
   textLineCount = 2;
-
+  /**
+   * The view mode of the search page
+   */
   public viewMode$: Observable<ViewMode>;
-
+  /**
+   * Array built from numberOfResults to count and iterate based on index
+   */
   public loadingResults: number[];
 
   protected readonly ViewMode = ViewMode;
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index d47f5d2dfa..3c3244549e 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -141,9 +141,6 @@
 
   --ds-search-skeleton-text-height: 20px;
   --ds-search-skeleton-badge-height: 18px;
-  --ds-search-skeleton-thumbnail-height: 125px;
-  --ds-search-skeleton-thumbnail-width: 90px;
-  --ds-search-skeleton-thumbnail-padding: 1em;
   --ds-search-skeleton-thumbnail-margin: 1em;
   --ds-search-skeleton-text-line-count: 2;
   --ds-search-skeleton-badge-width: 75px;

From 990f00b129c2b7f23e8ac41904d4778b4e07e702 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Jan 2025 18:26:28 +0100
Subject: [PATCH 1121/1286] [DURACOM-303] adapt solution to older version of
 angular

---
 package.json                                  |  2 +-
 .../browse-by-date-page.component.spec.ts     |  4 +--
 .../browse-by-date-page.component.ts          |  4 +--
 .../browse-by-metadata-page.component.ts      |  4 +--
 .../browse-by-title-page.component.spec.ts    |  2 +-
 .../browse-by-title-page.component.ts         |  4 +--
 .../search-filter/search-filter.component.ts  | 12 ++++----
 .../search-filters.component.html             |  3 +-
 .../search-filters.component.spec.ts          |  4 +--
 .../search-filters.component.ts               | 15 ++++++----
 .../search-results-skeleton.component.html    | 30 +++++++++----------
 .../search-results-skeleton.component.ts      | 13 +-------
 .../search-results.component.html             | 12 --------
 .../search-results.component.spec.ts          |  2 +-
 .../search-results.component.ts               |  8 ++---
 src/app/shared/search/search.component.ts     |  2 +-
 src/app/shared/search/search.module.ts        |  9 +++++-
 src/config/app-config.interface.ts            |  2 +-
 src/config/default-app-config.ts              |  4 +--
 src/environments/environment.test.ts          |  2 +-
 src/themes/custom/lazy-theme.module.ts        |  7 ++---
 yarn.lock                                     | 15 ++++++++++
 22 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/package.json b/package.json
index 86a506c57a..76ae2d5827 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
-    "ngx-skeleton-loader": "^9.0.0",
+    "ngx-skeleton-loader": "^7.0.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.8.1",
     "pem": "1.14.8",
diff --git a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
index 2fe673f821..f64091e41f 100644
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
@@ -24,8 +24,8 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { cold } from 'jasmine-marbles';
-import { Store } from "@ngrx/store";
-import { BrowseEntry } from "../../core/shared/browse-entry.model";
+import { Store } from '@ngrx/store';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
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 86a2f3dfa3..afb58e6ad2 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
@@ -19,8 +19,8 @@ import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { isPlatformServer } from "@angular/common";
-import { environment } from "../../../environments/environment";
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-date-page',
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 a7357aaaf3..52cf3b9d7b 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
@@ -22,8 +22,8 @@ import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
 import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { isPlatformServer } from "@angular/common";
-import { environment } from "../../../environments/environment";
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
index 653ad596c5..1b8eb352a3 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -22,7 +22,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
-import { BrowseEntry } from "../../core/shared/browse-entry.model";
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 
 
 describe('BrowseByTitlePageComponent', () => {
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 74a109574c..518fdf8c15 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -15,8 +15,8 @@ import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { isPlatformServer } from "@angular/common";
-import { environment } from "../../../environments/environment";
+import { isPlatformServer } from '@angular/common';
+import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-browse-by-title-page',
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 6f88d3924a..a440652fe5 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -93,7 +93,9 @@ export class SearchFilterComponent implements OnInit {
    */
   ngOnInit() {
     this.selectedValues$ = this.getSelectedValues();
-    this.active$ = this.isActive();
+    this.active$ = this.isActive().pipe(
+      startWith(true)
+    );
     this.collapsed$ = this.isCollapsed();
     this.initializeFilter();
     this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
@@ -101,9 +103,9 @@ export class SearchFilterComponent implements OnInit {
         this.filterService.expand(this.filter.name);
       }
     });
-    this.active$.pipe(take(1)).subscribe(() => {
+    this.isActive().pipe(take(1)).subscribe(() => {
       this.isVisibilityComputed.emit(true);
-    })
+    });
   }
 
   /**
@@ -192,7 +194,7 @@ export class SearchFilterComponent implements OnInit {
               }
             ));
         }
-      }),
-      startWith(true));
+      })
+    );
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index 45875ad7ae..e1e54c683d 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,6 +1,7 @@
 <h3>{{"search.filters.head" | translate}}</h3>
 <div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
+    <div [class.visually-hidden]="filtersWithComputedVisibility !== (filters | async)?.payload?.length"
+         *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
         <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index c8ad89910c..864d7b583e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -9,8 +9,8 @@ import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
-import { APP_CONFIG } from "../../../../config/app-config.interface";
-import { environment } from "../../../../environments/environment";
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 1f08a5ac5d..b491f21177 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
 import { SearchService } from '../../../core/shared/search/search.service';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -12,7 +12,7 @@ import { SearchFilterService } from '../../../core/shared/search/search-filter.s
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
-import { APP_CONFIG, AppConfig } from "../../../../config/app-config.interface";
+import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search-filters',
@@ -88,10 +88,13 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
-      Object.keys(filters).forEach((f) => filters[f] = null);
-      return filters;
-    }));
+    this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(
+      tap(() => this.filtersWithComputedVisibility = 0),
+      map((filters) => {
+        Object.keys(filters).forEach((f) => filters[f] = null);
+        return filters;
+      })
+    );
     this.searchLink = this.getSearchLink();
   }
 
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index a42bda0674..bd98040257 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -4,16 +4,14 @@
   </div>
 </div>
 
-@if((viewMode$ | async) === ViewMode.ListElement) {
-  @for (result of loadingResults; track result; let first = $first) {
-      <div [class.my-4]="!first" class="row">
-      @if(showThumbnails) {
-        <div class="col-3 col-md-2">
-          <div class="thumbnail-skeleton position-relative">
-            <ngx-skeleton-loader/>
-          </div>
+<ng-container *ngIf="(viewMode$ | async) === ViewMode.ListElement; else grid">
+  <ng-container *ngFor="let result of loadingResults; let first = $first">
+    <div [class.my-4]="!first" class="row">
+      <div *ngIf="showThumbnails" class="col-3 col-md-2">
+        <div class="thumbnail-skeleton position-relative">
+          <ngx-skeleton-loader/>
         </div>
-      }
+      </div>
       <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
         <div class="badge-skeleton">
           <ngx-skeleton-loader/>
@@ -23,16 +21,18 @@
         </div>
       </div>
     </div>
-  }
-} @else if ((viewMode$ | async) === ViewMode.GridElement) {
+  </ng-container>
+</ng-container>
+
+<ng-template #grid>
   <div class="card-columns row">
-    @for (result of loadingResults; track result) {
+    <ng-container *ngFor="let result of loadingResults">
       <div class="card-column col col-sm-6 col-lg-4">
         <div class="card-skeleton">
           <ngx-skeleton-loader/>
         </div>
       </div>
-    }
-
+    </ng-container>
   </div>
-}
+</ng-template>
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index 3fba70b119..179b26f1fd 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -1,13 +1,8 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
 import {
   Component,
   Input,
   OnInit,
 } from '@angular/core';
-import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { Observable } from 'rxjs';
 
 import { SearchService } from '../../../../core/shared/search/search.service';
@@ -16,14 +11,8 @@ import { hasValue } from '../../../empty.util';
 
 @Component({
   selector: 'ds-search-results-skeleton',
-  standalone: true,
-  imports: [
-    NgxSkeletonLoaderModule,
-    AsyncPipe,
-    NgForOf,
-  ],
   templateUrl: './search-results-skeleton.component.html',
-  styleUrl: './search-results-skeleton.component.scss',
+  styleUrls: ['./search-results-skeleton.component.scss'],
 })
 /**
  * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 71839d009b..a2bc91195c 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,15 +1,3 @@
-@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
-  <div class="row">
-    <div class="col-12">
-      <div class="filters-badge-skeleton-container">
-          <div class="filter-badge-skeleton">
-            <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
-          </div>
-      </div>
-    </div>
-  </div>
-}
-
 <div class="d-flex justify-content-between">
     <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
     <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index dc961c97cb..c2b181038a 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
-import { SearchResultsSkeletonComponent } from "./search-results-skeleton/search-results-skeleton.component";
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 1faf8dd778..9050ce9cd0 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -11,10 +11,10 @@ import { CollectionElementLinkType } from '../../object-collection/collection-el
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { Context } from '../../../core/shared/context.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
-import { SearchFilter } from "../models/search-filter.model";
-import { Observable } from "rxjs";
-import { SearchConfigurationService } from "../../../core/shared/search/search-configuration.service";
-import { SearchService } from "../../../core/shared/search/search.service";
+import { SearchFilter } from '../models/search-filter.model';
+import { Observable } from 'rxjs';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 export interface SelectionConfig {
   repeatable: boolean;
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index e69a183408..527d2d2719 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -48,7 +48,7 @@ import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
-import { isPlatformServer } from "@angular/common";
+import { isPlatformServer } from '@angular/common';
 import { environment } from 'src/environments/environment';
 
 @Component({
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 69500999a8..e2075a5f56 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -34,6 +34,10 @@ import { ThemedSearchSettingsComponent } from './search-settings/themed-search-s
 import { NouisliderModule } from 'ng2-nouislider';
 import { ThemedSearchFiltersComponent } from './search-filters/themed-search-filters.component';
 import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import {
+  SearchResultsSkeletonComponent
+} from './search-results/search-results-skeleton/search-results-skeleton.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -62,6 +66,7 @@ const COMPONENTS = [
   ThemedSearchSettingsComponent,
   ThemedSearchFiltersComponent,
   ThemedSearchSidebarComponent,
+  SearchResultsSkeletonComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -74,6 +79,7 @@ const ENTRY_COMPONENTS = [
   SearchFacetSelectedOptionComponent,
   SearchFacetRangeOptionComponent,
   SearchAuthorityFilterComponent,
+  SearchResultsSkeletonComponent
 ];
 
 /**
@@ -93,11 +99,12 @@ export const MODELS = [
   imports: [
     CommonModule,
     TranslateModule.forChild({
-      missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
+      missingTranslationHandler: {provide: MissingTranslationHandler, useClass: MissingTranslationHelper},
       useDefaultLang: true
     }),
     SharedModule.withEntryComponents(),
     NouisliderModule,
+    NgxSkeletonLoaderModule,
   ],
   exports: [
     ...COMPONENTS
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 8b8dcf74a7..af78d4ab88 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -23,7 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
-import { SearchConfig } from "./search-page-config.interface";
+import { SearchConfig } from './search-page-config.interface';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 2384942e3b..de4f3bd56e 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -23,7 +23,7 @@ import { MarkdownConfig } from './markdown-config.interface';
 import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { DiscoverySortConfig } from './discovery-sort.config';
 import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
-import { SearchConfig } from "./search-page-config.interface";
+import { SearchConfig } from './search-page-config.interface';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -446,5 +446,5 @@ export class DefaultAppConfig implements AppConfig {
 
   search: SearchConfig = {
     filterPlaceholdersCount: 5
-  }
+  };
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 4f832e1ac4..e6ffe85df6 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -325,6 +325,6 @@ export const environment: BuildConfig = {
   },
 
   search: {
-    defaultFilterCount: 5
+    filterPlaceholdersCount: 5
   }
 };
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 1fe476c1e1..546d2dccbf 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -159,9 +159,8 @@ import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
 import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
 import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
 import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
-import {
-  SearchResultsSkeletonComponent
-} from "../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component";
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -248,7 +247,6 @@ const DECLARATIONS = [
   UserMenuComponent,
   BrowseByComponent,
   RegisterEmailFormComponent,
-  SearchResultsSkeletonComponent,
 ];
 
 @NgModule({
@@ -309,6 +307,7 @@ const DECLARATIONS = [
     NgxGalleryModule,
     FormModule,
     RequestCopyModule,
+    NgxSkeletonLoaderModule
   ],
   declarations: DECLARATIONS,
   exports: [
diff --git a/yarn.lock b/yarn.lock
index 7760902b72..39661b8d43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8415,6 +8415,14 @@ ngx-pagination@6.0.3:
   dependencies:
     tslib "^2.3.0"
 
+ngx-skeleton-loader@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-skeleton-loader/-/ngx-skeleton-loader-7.0.0.tgz#3b1325025a7208a20f3a0fdba6e578532a09cfcd"
+  integrity sha512-myc6GNcNhyksZrimIFkCxeihi0kQ8JhQVZiGbtiIv4gYrnnRk5nXbs3kYitK8E8OstHG+jlsmRofqGBxuIsYTA==
+  dependencies:
+    perf-marks "^1.13.4"
+    tslib "^2.0.0"
+
 ngx-sortablejs@^11.1.0:
   version "11.1.0"
   resolved "https://registry.npmjs.org/ngx-sortablejs/-/ngx-sortablejs-11.1.0.tgz"
@@ -9060,6 +9068,13 @@ pend@~1.2.0:
   resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+perf-marks@^1.13.4:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/perf-marks/-/perf-marks-1.14.2.tgz#7511c24239b9c2071717993a33ec3057f387b8c7"
+  integrity sha512-N0/bQcuTlETpgox/DsXS1voGjqaoamMoiyhncgeW3rSHy/qw8URVgmPRYfFDQns/+C6yFUHDbeSBGL7ixT6Y4A==
+  dependencies:
+    tslib "^2.1.0"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"

From ecd2faea4aa3c4322e98da295b3f826b6c1b3d10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:43:00 +0000
Subject: [PATCH 1122/1286] Bump cross-spawn from 7.0.3 to 7.0.6

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  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 7760902b72..3a723f2ab9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4331,9 +4331,9 @@ cross-env@^7.0.3:
     cross-spawn "^7.0.1"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

From 22b0f4805a08bad9cabd35073449e0c8ec14f57d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:43:10 +0000
Subject: [PATCH 1123/1286] Bump cross-spawn from 7.0.3 to 7.0.6

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  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 f13676c0e1..3326cf5796 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4487,9 +4487,9 @@ cross-env@^7.0.3:
     cross-spawn "^7.0.1"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

From 147564b114afd7c88246da0dbafe4073707f0f06 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 10 Oct 2024 18:13:34 +0200
Subject: [PATCH 1124/1286] [CST-17153] improve descriptive labels for
 show/hide more buttons on related items lists

(cherry picked from commit 7cd82e542bec81bf768124c20ea18162881cb56d)
---
 .../simple/related-items/related-items.component.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index bee1f345fd..b15c93178c 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -7,12 +7,12 @@
       <ds-themed-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
         </div>
         <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
         </div>
       </div>
     </ng-container>

From 7d59615b7ec23fed308d0281d1aae4884b0f469a Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 10 Oct 2024 18:13:34 +0200
Subject: [PATCH 1125/1286] [CST-17153] improve descriptive labels for
 show/hide more buttons on related items lists

(cherry picked from commit 7cd82e542bec81bf768124c20ea18162881cb56d)
---
 .../simple/related-items/related-items.component.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 02c207b332..0b3cf6c0ac 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -7,12 +7,12 @@
       <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
         </div>
         <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
+          <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
         </div>
       </div>
     </ng-container>

From 2cebbd9b8ffd8afa883a9811eaacd5243da8d30f Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 24 Jan 2025 12:10:18 -0600
Subject: [PATCH 1126/1286] Bump cross-spawn from 7.0.3 to 7.0.6

---
 package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc36f5f080..6a80777612 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10081,10 +10081,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

From 5d6bf0bb334ddda17741837058a27de60f1a9e26 Mon Sep 17 00:00:00 2001
From: autavares-dev <autavares.dev@gmail.com>
Date: Mon, 22 Jul 2024 21:20:05 -0300
Subject: [PATCH 1127/1286] Fix truncatable-part keyboard accessibility

(cherry picked from commit 6cb4faa8d34cbb18eb0516506c2c6da6b5e15df9)
---
 .../truncatable-part.component.html            | 18 +++++++++++-------
 .../truncatable-part.component.spec.ts         | 13 +++++++++++++
 .../truncatable-part.component.ts              |  7 +++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 32a2a21349..55ebe2d957 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -2,12 +2,16 @@
   <div #content class="content dont-break-out preserve-line-breaks">
     <ng-content></ng-content>
   </div>
-  <button class="btn btn-link p-0 expandButton" dsDragClick (actualClick)="toggle()">
-    <i class="fas fa-angle-down"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-more' | translate }}</span>
-  </button>
-  <button class="btn btn-link p-0 collapseButton" dsDragClick (actualClick)="toggle()" *ngIf="expand && expandable">
-    <i class="fas fa-angle-up"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-less' | translate }}</span>
+  <button
+    class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
+    dsDragClick
+    (actualClick)="toggle()"
+    (keyup.Enter)="toggle()"
+    (keyup.Space)="toggle()"
+    role="button"
+    [attr.aria-expanded]="isExpanded"
+  >
+    <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
+    <span class="ml-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 08d3e18117..a40703bbf3 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -73,6 +73,11 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).toBeNull();
     });
+
+    it('expandButton aria-expanded should be false', () => {
+      const btn = fixture.debugElement.query(By.css('.expandButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('false');
+    });
   });
 
   describe('When the item is expanded', () => {
@@ -101,6 +106,14 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).not.toBeNull();
     });
+
+    it('collapseButton aria-expanded should be true', () => {
+      (comp as any).setLines();
+      (comp as any).expandable = true;
+      fixture.detectChanges();
+      const btn = fixture.debugElement.query(By.css('.collapseButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('true');
+    });
   });
 });
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 790bd5985d..c25e44c968 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -136,6 +136,13 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
     }
   }
 
+  /**
+   * Indicates if the content is expanded, button state is 'Collapse'
+   */
+  public get isExpanded() {
+    return this.expand && this.expandable;
+  }
+
   /**
    * Unsubscribe from the subscription
    */

From b584d3fee09d29cb1beb451c9231b3b245aefd7f Mon Sep 17 00:00:00 2001
From: autavares-dev <autavares.dev@gmail.com>
Date: Mon, 22 Jul 2024 21:20:05 -0300
Subject: [PATCH 1128/1286] Fix truncatable-part keyboard accessibility

(cherry picked from commit 6cb4faa8d34cbb18eb0516506c2c6da6b5e15df9)
---
 .../truncatable-part.component.html            | 18 +++++++++++-------
 .../truncatable-part.component.spec.ts         | 13 +++++++++++++
 .../truncatable-part.component.ts              |  7 +++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 32a2a21349..55ebe2d957 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -2,12 +2,16 @@
   <div #content class="content dont-break-out preserve-line-breaks">
     <ng-content></ng-content>
   </div>
-  <button class="btn btn-link p-0 expandButton" dsDragClick (actualClick)="toggle()">
-    <i class="fas fa-angle-down"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-more' | translate }}</span>
-  </button>
-  <button class="btn btn-link p-0 collapseButton" dsDragClick (actualClick)="toggle()" *ngIf="expand && expandable">
-    <i class="fas fa-angle-up"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-less' | translate }}</span>
+  <button
+    class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
+    dsDragClick
+    (actualClick)="toggle()"
+    (keyup.Enter)="toggle()"
+    (keyup.Space)="toggle()"
+    role="button"
+    [attr.aria-expanded]="isExpanded"
+  >
+    <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
+    <span class="ml-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 7e528650d9..7b3ac2242b 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -87,6 +87,11 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).toBeNull();
     });
+
+    it('expandButton aria-expanded should be false', () => {
+      const btn = fixture.debugElement.query(By.css('.expandButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('false');
+    });
   });
 
   describe('When the item is expanded', () => {
@@ -115,6 +120,14 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).not.toBeNull();
     });
+
+    it('collapseButton aria-expanded should be true', () => {
+      (comp as any).setLines();
+      (comp as any).expandable = true;
+      fixture.detectChanges();
+      const btn = fixture.debugElement.query(By.css('.collapseButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('true');
+    });
   });
 });
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 54220d7f10..0c49a56405 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -150,6 +150,13 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
     }
   }
 
+  /**
+   * Indicates if the content is expanded, button state is 'Collapse'
+   */
+  public get isExpanded() {
+    return this.expand && this.expandable;
+  }
+
   /**
    * Unsubscribe from the subscription
    */

From 7142e6691001102ee4e6cfcdc9bcde0496e4fae3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 02:47:50 +0000
Subject: [PATCH 1129/1286] Bump @babel/runtime from 7.26.0 to 7.26.7

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.26.0 to 7.26.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.7/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..50d0325a1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/platform-server": "^17.3.12",
         "@angular/router": "^17.3.12",
         "@angular/ssr": "^17.3.11",
-        "@babel/runtime": "7.26.0",
+        "@babel/runtime": "7.26.7",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^11.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
@@ -3869,9 +3869,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
-      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
+      "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
diff --git a/package.json b/package.json
index 9e72a4cc9d..c2e4508cbe 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@angular/platform-server": "^17.3.12",
     "@angular/router": "^17.3.12",
     "@angular/ssr": "^17.3.11",
-    "@babel/runtime": "7.26.0",
+    "@babel/runtime": "7.26.7",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",

From 8a4f24fc31bd1fad18f63cb71a0f377a51f63d87 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 27 Jan 2025 09:34:42 +0100
Subject: [PATCH 1130/1286] [DURACOM-303] adapt tests dependencies and template
 variable

---
 .../search-results-skeleton.component.html            |  2 +-
 .../search-results-skeleton.component.spec.ts         |  3 ++-
 .../search-results/search-results.component.spec.ts   | 11 ++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
index bd98040257..c318eea2e1 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -5,7 +5,7 @@
 </div>
 
 <ng-container *ngIf="(viewMode$ | async) === ViewMode.ListElement; else grid">
-  <ng-container *ngFor="let result of loadingResults; let first = $first">
+  <ng-container *ngFor="let result of loadingResults; let first = first">
     <div [class.my-4]="!first" class="row">
       <div *ngIf="showThumbnails" class="col-3 col-md-2">
         <div class="thumbnail-skeleton position-relative">
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
index 68c8db5a8e..86277181fe 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -14,7 +14,8 @@ describe('SearchResultsSkeletonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+      imports: [NgxSkeletonLoaderModule],
+      declarations: [SearchResultsSkeletonComponent],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub() },
       ],
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index c2b181038a..1ef596a4ed 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -8,6 +8,10 @@ import { SearchResultsComponent } from './search-results.component';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
 import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -21,7 +25,12 @@ describe('SearchResultsComponent', () => {
       declarations: [
         SearchResultsComponent,
         SearchResultsSkeletonComponent,
-        QueryParamsDirectiveStub],
+        QueryParamsDirectiveStub
+      ],
+      providers: [
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));

From 920edef1552966cb43cfdf8a3292e7f6c2dd6127 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 24 Jan 2025 10:36:10 +0100
Subject: [PATCH 1131/1286] 117544: use directive after latest main merge

---
 .../collection-source-controls.component.spec.ts              | 1 -
 .../item-edit-bitstream-bundle.component.html                 | 4 ++--
 .../item-edit-bitstream-bundle.component.ts                   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 2e3cf5477c..cbe3de1483 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -195,7 +195,6 @@ describe('CollectionSourceControlsComponent', () => {
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
       buttons.forEach(button => {
-        console.log(button.nativeElement);
         expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
         expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
       });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 06201b1cbe..348118a05c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -113,13 +113,13 @@
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
                   </button>
-                  <button [disabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                  <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
                           [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
                           class="btn btn-outline-danger btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
-                  <button [disabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                  <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                           class="btn btn-outline-warning btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index bcdcc8d62d..969a971ce9 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -49,6 +49,7 @@ import {
   getAllSucceededRemoteData,
   paginatedListToArray,
 } from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -83,6 +84,7 @@ import {
     NgbDropdownModule,
     CdkDrag,
     BrowserOnlyPipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })

From e9e3d86aab03971615df400108fb207cf9baa9e9 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 24 Jan 2025 10:43:36 +0100
Subject: [PATCH 1132/1286] 117544: use directive after latest 8.x merge

---
 .../collection-source-controls.component.spec.ts              | 1 -
 .../item-edit-bitstream-bundle.component.html                 | 4 ++--
 .../item-edit-bitstream-bundle.component.ts                   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 2e3cf5477c..cbe3de1483 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -195,7 +195,6 @@ describe('CollectionSourceControlsComponent', () => {
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
       buttons.forEach(button => {
-        console.log(button.nativeElement);
         expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
         expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
       });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 06201b1cbe..348118a05c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -113,13 +113,13 @@
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
                   </button>
-                  <button [disabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                  <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
                           [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
                           class="btn btn-outline-danger btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
-                  <button [disabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                  <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                           class="btn btn-outline-warning btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index cf165383af..c8f393d7f1 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -52,6 +52,7 @@ import {
   getAllSucceededRemoteData,
   paginatedListToArray,
 } from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -87,6 +88,7 @@ import {
     NgbDropdownModule,
     CdkDrag,
     BrowserOnlyPipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })

From cd2f8abd2d14a75433a5c0ce3c6362206c4b7eb2 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 24 Jan 2025 11:23:48 +0100
Subject: [PATCH 1133/1286] 117544: fix issues latest 7.x merge

---
 .../filtered-items.component.html             |  0
 ...llection-source-controls.component.spec.ts |  1 -
 .../dso-edit-metadata-value.component.html    | 47 -------------------
 3 files changed, 48 deletions(-)
 delete mode 100644 src/app/admin/admin-reports/filtered-items/filtered-items.component.html

diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 12de34d3a9..ed53f8ab2f 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -191,7 +191,6 @@ describe('CollectionSourceControlsComponent', () => {
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
       buttons.forEach(button => {
-        console.log(button.nativeElement);
         expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
         expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
       });
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 e07585b39b..f96759a75e 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
@@ -6,53 +6,6 @@
     <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
               [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
-                                    [bindId]="mdField"
-                                    [group]="group"
-                                    [model]="getModel()"
-                                    (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-scrollable-dropdown>
-    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
-                      [group]="group"
-                      [model]="getModel()"
-                      (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-onebox>
-    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
-      <span class="badge badge-light border" >
-        <i dsAuthorityConfidenceState
-           class="fas fa-fw p-0"
-           aria-hidden="true"
-           [authorityValue]="mdValue.newValue"
-           [iconMode]="true"
-        ></i>
-        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
-      </span>
-    </div>
-    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
-      <div class="btn-group w-75">
-        <i dsAuthorityConfidenceState
-          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
-          aria-hidden="true"
-          [authorityValue]="mdValue.newValue.confidence"
-          [iconMode]="true"
-      ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
-              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
-              (change)="onChangeAuthorityKey()" />
-        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(true)">
-          <i class="fas fa-lock fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(false)">
-          <i class="fas fa-lock-open fa-fw"></i>
-        </button>
-      </div>
-    </div>
     <div class="d-flex" *ngIf="mdRepresentation">
       <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
       <ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>

From 262723b0ca43f58da9725b7a8226965fb5e7d5f4 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 28 Jan 2025 11:27:36 +0100
Subject: [PATCH 1134/1286] remove duplicate key

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8820d557e0..b4361357c5 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5656,8 +5656,6 @@
 
   "supervision.search.results.head": "Workflow and Workspace tasks",
 
-  "orgunit.search.results.head": "Organizational Unit Search Results",
-
   "workflow-item.edit.breadcrumbs": "Edit workflowitem",
 
   "workflow-item.edit.title": "Edit workflowitem",

From baf388611535825b201a85a69cf6e1b84193c2cd Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 28 Jan 2025 11:31:33 +0100
Subject: [PATCH 1135/1286] remove duplicate key

---
 src/assets/i18n/de.json5 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 189a599cf0..2a627919d1 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -730,11 +730,6 @@
   // TODO New key - Add a translation
   "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
 
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
-
   //"admin.reports.items.breadcrumbs": "Metadata Query Report",
   // TODO New key - Add a translation
   "admin.reports.items.breadcrumbs": "Metadata Query Report",
@@ -887,7 +882,6 @@
   // TODO New key - Add a translation
   "admin.reports.items.title": "Title",
 
-
   //"admin.reports.commons.filters": "Filters",
   // TODO New key - Add a translation
   "admin.reports.commons.filters": "Filters",

From ac3fc1dc3262d925a9a22589a0370f810b4441da Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 28 Jan 2025 11:27:36 +0100
Subject: [PATCH 1136/1286] remove duplicate key

(cherry picked from commit 262723b0ca43f58da9725b7a8226965fb5e7d5f4)
---
 src/assets/i18n/en.json5 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a6525f16c9..77b6c32984 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5662,8 +5662,6 @@
 
   "supervision.search.results.head": "Workflow and Workspace tasks",
 
-  "orgunit.search.results.head": "Organizational Unit Search Results",
-
   "workflow-item.edit.breadcrumbs": "Edit workflowitem",
 
   "workflow-item.edit.title": "Edit workflowitem",

From 17a868a2c457749cd732f9f9341b92fbf8e13d4b Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 28 Jan 2025 11:31:33 +0100
Subject: [PATCH 1137/1286] remove duplicate key

(cherry picked from commit baf388611535825b201a85a69cf6e1b84193c2cd)
---
 src/assets/i18n/de.json5 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 041bf02374..4ee698deed 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -724,11 +724,6 @@
   // TODO New key - Add a translation
   "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
 
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
-
   //"admin.reports.items.breadcrumbs": "Metadata Query Report",
   // TODO New key - Add a translation
   "admin.reports.items.breadcrumbs": "Metadata Query Report",
@@ -881,7 +876,6 @@
   // TODO New key - Add a translation
   "admin.reports.items.title": "Title",
 
-
   //"admin.reports.commons.filters": "Filters",
   // TODO New key - Add a translation
   "admin.reports.commons.filters": "Filters",

From 8c92364d43e464a00585304550b7dc9e8a2d5e11 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 9 Jan 2025 18:46:10 +0100
Subject: [PATCH 1138/1286] 122357: Ensure the request href$ observable aren't
 triggered multiple times

(cherry picked from commit 3ecdfe422df3b31b20d257f9197d0b2e7d250920)
---
 src/app/core/data/base/base-data.service.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 18131dea63..234e7272a6 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
+import { AsyncSubject, from as observableFrom, Observable, of as observableOf, shareReplay } from 'rxjs';
 import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
@@ -264,6 +264,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
     const startTime: number = new Date().getTime();
@@ -299,6 +300,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
+      shareReplay(1),
     );
 
     const startTime: number = new Date().getTime();

From bb3d2bb4837a29664defa8830ac138edc63118d6 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 9 Jan 2025 15:18:24 +0100
Subject: [PATCH 1139/1286] 122357: Reduced the amount of times the browse
 observables are fired again

(cherry picked from commit 0570542b1eb2874617deac27f38c4ecec7bbc1c3)
---
 .../browse-by-date-page.component.ts          | 23 +++++++++-------
 .../browse-by-metadata-page.component.ts      | 26 ++++++++++---------
 .../browse-by-title-page.component.ts         | 21 ++++++++++-----
 3 files changed, 41 insertions(+), 29 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 afb58e6ad2..cca56647d8 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
@@ -10,7 +10,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
@@ -61,16 +61,19 @@ export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
     this.startsWithType = StartsWithType.date;
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest(
-        [ this.route.params.pipe(take(1)),
-          this.route.queryParams,
-          this.currentPagination$,
-          this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), currentPage, currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
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 52cf3b9d7b..5f921667bf 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,7 @@ 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 { filter, map, mergeMap, take } from 'rxjs/operators';
+import { filter, map, mergeMap, distinctUntilChanged } 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';
@@ -162,20 +162,22 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
       return;
     }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.authority === curr.authority && prev.value === curr.value && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest(
-        [ this.route.params.pipe(take(1)),
-          this.route.queryParams,
-          this.currentPagination$,
-          this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-          this.browseId = params.id || this.defaultBrowseId;
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+        this.browseId = params.id || this.defaultBrowseId;
           this.authority = params.authority;
 
           if (typeof params.value === 'string'){
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 518fdf8c15..10968d265f 100644
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -1,4 +1,4 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Component, Inject, PLATFORM_ID } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
@@ -10,7 +10,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { BrowseService } from '../../core/browse/browse.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs/operators';
 import { of as observableOf } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
@@ -48,12 +48,19 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params.pipe(take(1)), this.route.queryParams, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
-        })
-      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);

From 47159fe15bc2c7db1fbfff27badc7c91d04b570b Mon Sep 17 00:00:00 2001
From: VictorDuranEscire <victor@escire.lat>
Date: Tue, 28 Jan 2025 17:07:00 -0600
Subject: [PATCH 1140/1286] Changing metadata in a user profile without
 specifying a password brings up a success and an error panel (#3818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Set constant variable for valid current password in profile page
---
 src/app/profile-page/profile-page.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index a8ac070e70..f3f7a4e7f1 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -220,7 +220,8 @@ export class ProfilePageComponent implements OnInit {
    */
   updateSecurity() {
     const passEntered = isNotEmpty(this.password);
-    if (this.invalidSecurity) {
+    const validCurrentPassword = isNotEmpty(this.currentPassword);
+    if (validCurrentPassword && !passEntered) {
       this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
     }
     if (!this.invalidSecurity && passEntered) {

From 83d86d7b68a97b2ed2102d13a8300f91b7bd3778 Mon Sep 17 00:00:00 2001
From: Miika Nurminen <minurmin@jyu.fi>
Date: Tue, 28 Jan 2025 23:41:30 +0200
Subject: [PATCH 1141/1286] Ensure that password authentication dialog is shown
 even if only ldap auth method is present

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

diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 84d4c53210..d011d27059 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -129,12 +129,24 @@ export class AuthInterceptor implements HttpInterceptor {
    */
   private sortAuthMethods(authMethodModels: AuthMethod[]): AuthMethod[] {
     const sortedAuthMethodModels: AuthMethod[] = [];
+    let passwordAuthFound = false;
+    let ldapAuthFound = false;
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType === AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
+        passwordAuthFound = true;
+      }
+      if (method.authMethodType === AuthMethodType.Ldap) {
+        ldapAuthFound = true;
       }
     });
 
+    // Using password authentication method to provide UI for LDAP authentication even if password auth is not present in server
+    if (ldapAuthFound && !(passwordAuthFound)) {
+      sortedAuthMethodModels.push(new AuthMethod(AuthMethodType.Password,0));
+    }
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType !== AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);

From 090dda28adb0aa14905db0c492d5e53886f6fec3 Mon Sep 17 00:00:00 2001
From: VictorDuranEscire <victor@escire.lat>
Date: Tue, 28 Jan 2025 17:07:00 -0600
Subject: [PATCH 1142/1286] Changing metadata in a user profile without
 specifying a password brings up a success and an error panel (#3818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Set constant variable for valid current password in profile page
---
 src/app/profile-page/profile-page.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index a8ac070e70..f3f7a4e7f1 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -220,7 +220,8 @@ export class ProfilePageComponent implements OnInit {
    */
   updateSecurity() {
     const passEntered = isNotEmpty(this.password);
-    if (this.invalidSecurity) {
+    const validCurrentPassword = isNotEmpty(this.currentPassword);
+    if (validCurrentPassword && !passEntered) {
       this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
     }
     if (!this.invalidSecurity && passEntered) {

From 5a5c1f18e3a1e20b892899106139ef97d5a55f30 Mon Sep 17 00:00:00 2001
From: VictorDuranEscire <victor@escire.lat>
Date: Tue, 28 Jan 2025 17:07:00 -0600
Subject: [PATCH 1143/1286] Changing metadata in a user profile without
 specifying a password brings up a success and an error panel (#3818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Agregar validador para mostrar mensaje de error solo si se escribe la contraseña actual

* Set constant variable for valid current password in profile page
---
 src/app/profile-page/profile-page.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index f8cb30a447..7fb1a14124 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -173,7 +173,8 @@ export class ProfilePageComponent implements OnInit {
    */
   updateSecurity() {
     const passEntered = isNotEmpty(this.password);
-    if (this.invalidSecurity) {
+    const validCurrentPassword = isNotEmpty(this.currentPassword);
+    if (validCurrentPassword && !passEntered) {
       this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
     }
     if (!this.invalidSecurity && passEntered) {

From f26229938266bb2ac5846f89cd005268281e09d1 Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:52:13 -0300
Subject: [PATCH 1144/1286] Accessibility when selecting a search filter
 (#3385)

* Creation of a new method so that when a filter is selected a page reload message is announced to the user

* Correcting import formatting errors

* New attempt - Correcting import formatting errors

* New import fix

* New import fix

* Returning to the order of imports more like the original

* Correcting import order errors

* Resolving conflicts

* lint fixes

* Code refactoring

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
Co-authored-by: nwoodward <woodward.nicholas@gmail.com>
---
 .../search-facet-option.component.html            |  2 +-
 .../search-facet-option.component.ts              | 15 ++++++++++++++-
 src/assets/i18n/en.json5                          |  2 ++
 src/assets/i18n/es.json5                          |  5 +++--
 src/assets/i18n/pt-BR.json5                       |  3 +++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index f0e6120725..dfd68d026a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -2,7 +2,7 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams$ | async"
-   (click)="filterService.minimizeAll()">
+   (click)="announceFilter(); filterService.minimizeAll()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
     <span class="w-100 pl-1 break-facet">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 297ae12f09..17615e6221 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -12,7 +12,10 @@ import {
   Router,
   RouterLink,
 } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -20,6 +23,7 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service';
 import { currentPath } from '../../../../../utils/route.utils';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 import { FacetValue } from '../../../../models/facet-value.model';
@@ -75,6 +79,8 @@ export class SearchFacetOptionComponent implements OnInit {
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService,
+              protected liveRegionService: LiveRegionService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -119,4 +125,11 @@ export class SearchFacetOptionComponent implements OnInit {
     return getFacetValueForType(this.filterValue, this.filterConfig);
   }
 
+  /**
+   * Announces to the screen reader that the page will be reloaded, which filter has been selected
+   */
+  announceFilter() {
+    const message = this.translateService.instant('search-facet-option.update.announcement', { filter: this.filterValue.value });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b4361357c5..4671fd8397 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6769,4 +6769,6 @@
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 6ce558741c..c67bed6a4d 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -10192,5 +10192,6 @@
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
-
-}
\ No newline at end of file
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "La página será recargada. Filtro {{ filter }} seleccionado.",
+}
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 262dfa6d05..beb63bbebb 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10240,4 +10240,7 @@
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Digite seu e-mail",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "A página será recarregada. O filtro {{ filter }} foi selecionado.",
 }

From b27659d958226f3a2aeed1a637c18054261e2950 Mon Sep 17 00:00:00 2001
From: Andrea-Guevara <101608067+Andrea-Guevara@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:52:13 -0300
Subject: [PATCH 1145/1286] Accessibility when selecting a search filter
 (#3385)

* Creation of a new method so that when a filter is selected a page reload message is announced to the user

* Correcting import formatting errors

* New attempt - Correcting import formatting errors

* New import fix

* New import fix

* Returning to the order of imports more like the original

* Correcting import order errors

* Resolving conflicts

* lint fixes

* Code refactoring

---------

Co-authored-by: root <root@TI-03.OHB.LOCAL>
Co-authored-by: nwoodward <woodward.nicholas@gmail.com>
---
 .../search-facet-option.component.html            |  2 +-
 .../search-facet-option.component.ts              | 15 ++++++++++++++-
 src/assets/i18n/en.json5                          |  2 ++
 src/assets/i18n/es.json5                          |  5 +++--
 src/assets/i18n/pt-BR.json5                       |  3 +++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index f0e6120725..dfd68d026a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -2,7 +2,7 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams$ | async"
-   (click)="filterService.minimizeAll()">
+   (click)="announceFilter(); filterService.minimizeAll()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
     <span class="w-100 pl-1 break-facet">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 297ae12f09..17615e6221 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -12,7 +12,10 @@ import {
   Router,
   RouterLink,
 } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -20,6 +23,7 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service';
 import { currentPath } from '../../../../../utils/route.utils';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 import { FacetValue } from '../../../../models/facet-value.model';
@@ -75,6 +79,8 @@ export class SearchFacetOptionComponent implements OnInit {
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService,
+              protected liveRegionService: LiveRegionService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -119,4 +125,11 @@ export class SearchFacetOptionComponent implements OnInit {
     return getFacetValueForType(this.filterValue, this.filterConfig);
   }
 
+  /**
+   * Announces to the screen reader that the page will be reloaded, which filter has been selected
+   */
+  announceFilter() {
+    const message = this.translateService.instant('search-facet-option.update.announcement', { filter: this.filterValue.value });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 77b6c32984..5d8c0237d7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6775,4 +6775,6 @@
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 75677ee18e..7130d6d468 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -10201,5 +10201,6 @@
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
-
-}
\ No newline at end of file
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "La página será recargada. Filtro {{ filter }} seleccionado.",
+}
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 2a326cf181..300b4e370e 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -10258,4 +10258,7 @@
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Digite seu e-mail",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "A página será recarregada. O filtro {{ filter }} foi selecionado.",
 }

From 82ed3aadff3203a58087530a483d97fdf62adf2a Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Jan 2025 00:11:50 +0100
Subject: [PATCH 1146/1286] 116404: Prevent the opening from the modal using
 mouse interactions from automatically focussing on the first element

---
 ...xpandable-navbar-section.component.spec.ts | 133 +++++++++++++++++-
 .../expandable-navbar-section.component.ts    |  22 ++-
 .../menu-section/menu-section.component.ts    |   8 +-
 3 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 91d5a7f1ed..6f374b3aa5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,6 +1,11 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
+  flush,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
@@ -10,6 +15,8 @@ import { of as observableOf } from 'rxjs';
 
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
+import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
@@ -33,6 +40,7 @@ describe('ExpandableNavbarSectionComponent', () => {
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
           { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+          TestComponent,
         ],
       }).compileComponents();
     }));
@@ -142,6 +150,8 @@ describe('ExpandableNavbarSectionComponent', () => {
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
         spyOn(component, 'toggleSection').and.callThrough();
         spyOn(menuService, 'toggleActiveSection');
@@ -150,15 +160,27 @@ describe('ExpandableNavbarSectionComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
-        // dispatch the (keyup.space) action used in our component HTML
-        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
       it('should call toggleSection on the menuService', () => {
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { code: 'Space', key: ' ' }));
+
         expect(component.toggleSection).toHaveBeenCalled();
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Space', key: ' ' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
@@ -180,6 +202,105 @@ describe('ExpandableNavbarSectionComponent', () => {
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
+
+    describe('when enter is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
+      beforeEach(() => {
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+      });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Enter' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
+    });
+
+    describe('when arrow down is pressed on section header', () => {
+      it('should call activateSection', () => {
+        spyOn(component, 'activateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'ArrowDown' }));
+
+        expect(component.focusOnFirstChildSection).toBe(true);
+        expect(component.activateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('when tab is pressed on section header', () => {
+      it('should call deactivateSection', () => {
+        spyOn(component, 'deactivateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(component.deactivateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('navigateDropdown', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([
+          Object.assign(new MenuSection(), {
+            id: 'subSection1',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+          Object.assign(new MenuSection(), {
+            id: 'subSection2',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+        ]));
+        component.ngOnInit();
+        flush();
+        fixture.detectChanges();
+        component.focusOnFirstChildSection = true;
+        component.active$.next(true);
+        fixture.detectChanges();
+      }));
+
+      it('should close the modal on Tab', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+
+      it('should close the modal on Escape', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('on smaller, mobile screens', () => {
@@ -259,7 +380,9 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``,
+  template: `
+    <a role="menuitem">link</a>
+  `,
   standalone: true,
 })
 class TestComponent {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index b28aa25804..dc3db79aca 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -55,6 +55,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   mouseEntered = false;
 
+  /**
+   * Whether the section was expanded
+   */
+  focusOnFirstChildSection = false;
+
   /**
    * True if screen size was small before a resize event
    */
@@ -107,6 +112,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       if (active === true) {
         this.addArrowEventListeners = true;
       } else {
+        this.focusOnFirstChildSection = undefined;
         this.unsubscribeFromEventListeners();
       }
     }));
@@ -118,7 +124,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (this.dropdownItems.length > 0) {
+      if (this.focusOnFirstChildSection && this.dropdownItems.length > 0) {
         this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
@@ -130,6 +136,18 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.unsubscribeFromEventListeners();
   }
 
+  /**
+   * Activate this section if it's currently inactive, deactivate it when it's currently active.
+   * Also saves whether this toggle was performed by a keyboard event (non-click event) in order to know if thi first
+   * item should be focussed when activating a section.
+   *
+   *  @param {Event} event The user event that triggered this method
+   */
+  override toggleSection(event: Event): void {
+    this.focusOnFirstChildSection = event.type !== 'click';
+    super.toggleSection(event);
+  }
+
   /**
    * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
    * destruction)
@@ -222,9 +240,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
+        this.focusOnFirstChildSection = true;
         this.activateSection(event);
         break;
       case 'Space':
+      case 'Enter':
         event.preventDefault();
         break;
     }
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 21deca9b18..d14cfb143c 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -72,9 +72,11 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
-      this.active$.next(isActive);
-    });
+    this.subs.push(this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      if (this.active$.value !== isActive) {
+        this.active$.next(isActive);
+      }
+    }));
     this.initializeInjectorData();
   }
 

From ec9a1e22f7a38563469e09e49f2d661b3099808e Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Tue, 30 Jul 2024 20:19:18 +0200
Subject: [PATCH 1147/1286] [DURACOM-288] Provide a setting to use a different
 REST url during SSR execution

---
 server.ts                                     |   9 +-
 src/app/app.config.ts                         |   6 +
 .../dspace-rest.interceptor.spec.ts           | 194 ++++++++++++++++++
 .../dspace-rest/dspace-rest.interceptor.ts    |  52 +++++
 .../server-hard-redirect.service.spec.ts      |   3 +-
 .../services/server-hard-redirect.service.ts  |  19 +-
 src/app/thumbnail/thumbnail.component.ts      |  28 ++-
 src/config/server-config.interface.ts         |   2 +
 src/modules/app/browser-init.service.ts       |  23 ++-
 src/modules/app/server-init.service.ts        |  11 +-
 10 files changed, 319 insertions(+), 28 deletions(-)
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.ts

diff --git a/server.ts b/server.ts
index 1276621e9d..127a179e7a 100644
--- a/server.ts
+++ b/server.ts
@@ -81,6 +81,9 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -156,7 +159,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -165,7 +168,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -623,7 +626,7 @@ function start() {
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 61a04c8adb..77b29206cb 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -54,6 +54,7 @@ import {
 } from './app-routes';
 import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
 import { AuthInterceptor } from './core/auth/auth.interceptor';
+import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 import { LocaleInterceptor } from './core/locale/locale.interceptor';
 import { LogInterceptor } from './core/log/log.interceptor';
 import {
@@ -148,6 +149,11 @@ export const commonAppConfig: ApplicationConfig = {
       useClass: LogInterceptor,
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: DspaceRestInterceptor,
+      multi: true,
+    },
     // register the dynamic matcher used by form. MUST be provided by the app module
     ...DYNAMIC_MATCHER_PROVIDERS,
     provideCore(),
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
new file mode 100644
index 0000000000..4a47ffe9fd
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
@@ -0,0 +1,194 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { PLATFORM_ID } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestInterceptor } from './dspace-rest.interceptor';
+import { DspaceRestService } from './dspace-rest.service';
+
+describe('DspaceRestInterceptor', () => {
+  let httpMock: HttpTestingController;
+  let httpClient: HttpClient;
+  const appConfig: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+    },
+  };
+  const appConfigWithSSR: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+      ssrBaseUrl: 'http://ssr.example.com/server',
+    },
+  };
+
+  describe('When SSR base URL is not set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+
+  describe('When SSR base URL is set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items');
+        req.flush({});
+        httpMock.verify();
+      });
+
+      it('should not replace any query param containing the base URL', () => {
+        const url = 'http://api.example.com/server/items?url=http://api.example.com/server/item/1';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+});
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
new file mode 100644
index 0000000000..efd2c12b5d
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
@@ -0,0 +1,52 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { isEmpty } from '../../shared/empty.util';
+
+@Injectable()
+/**
+ * This Interceptor is used to use the configured base URL for the request made during SSR execution
+ */
+export class DspaceRestInterceptor implements HttpInterceptor {
+
+  /**
+   * Contains the configured application base URL
+   * @protected
+   */
+  protected baseUrl: string;
+  protected ssrBaseUrl: string;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+  ) {
+    this.baseUrl = this.appConfig.rest.baseUrl;
+    this.ssrBaseUrl = this.appConfig.rest.ssrBaseUrl;
+  }
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    if (isPlatformBrowser(this.platformId) || isEmpty(this.ssrBaseUrl) || this.baseUrl === this.ssrBaseUrl) {
+      return next.handle(request);
+    }
+
+    // Different SSR Base URL specified so replace it in the current request url
+    const url = request.url.replace(this.baseUrl, this.ssrBaseUrl);
+    const newRequest: HttpRequest<any> = request.clone({ url });
+    return next.handle(newRequest);
+  }
+}
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 27777ed7ba..d3247dd0dd 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
+import { environment } from '../../../environments/environment.test';
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -7,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index e1ded1568c..1592d9bf1c 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -7,10 +7,15 @@ import {
   Response,
 } from 'express';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import {
   REQUEST,
   RESPONSE,
 } from '../../../express.tokens';
+import { isNotEmpty } from '../../shared/empty.util';
 import { HardRedirectService } from './hard-redirect.service';
 
 /**
@@ -20,6 +25,7 @@ import { HardRedirectService } from './hard-redirect.service';
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(REQUEST) protected req: Request,
     @Inject(RESPONSE) protected res: Response,
   ) {
@@ -35,17 +41,22 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
   redirect(url: string, statusCode?: number) {
-
     if (url === this.req.url) {
       return;
     }
 
+    let redirectUrl = url;
+    // If redirect url contains SSR base url then replace with public base url
+    if (isNotEmpty(this.appConfig.rest.ssrBaseUrl) && this.appConfig.rest.baseUrl !== this.appConfig.rest.ssrBaseUrl) {
+      redirectUrl = url.replace(this.appConfig.rest.ssrBaseUrl, this.appConfig.rest.baseUrl);
+    }
+
     if (this.res.finished) {
       const req: any = this.req;
       req._r_count = (req._r_count || 0) + 1;
 
       console.warn('Attempted to redirect on a finished response. From',
-        this.req.url, 'to', url);
+        this.req.url, 'to', redirectUrl);
 
       if (req._r_count > 10) {
         console.error('Detected a redirection loop. killing the nodejs process');
@@ -59,9 +70,9 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      console.info(`Redirecting from ${this.req.url} to ${redirectUrl} with ${status}`);
 
-      this.res.redirect(status, url);
+      this.res.redirect(status, redirectUrl);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
       // So we just let it end its work, though we have already closed
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index cc583c3998..7b22dde4cd 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,8 +1,13 @@
-import { CommonModule } from '@angular/common';
+import {
+  CommonModule,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
+  Inject,
   Input,
   OnChanges,
+  PLATFORM_ID,
   SimpleChanges,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -76,6 +81,7 @@ export class ThumbnailComponent implements OnChanges {
   isLoading = true;
 
   constructor(
+    @Inject(PLATFORM_ID) private platformID: any,
     protected auth: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected fileService: FileService,
@@ -87,16 +93,18 @@ export class ThumbnailComponent implements OnChanges {
    * Use a default image if no actual image is available.
    */
   ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.thumbnail)) {
-      this.setSrc(this.defaultImage);
-      return;
-    }
+    if (isPlatformBrowser(this.platformID)) {
+      if (hasNoValue(this.thumbnail)) {
+        this.setSrc(this.defaultImage);
+        return;
+      }
 
-    const src = this.contentHref;
-    if (hasValue(src)) {
-      this.setSrc(src);
-    } else {
-      this.setSrc(this.defaultImage);
+      const src = this.contentHref;
+      if (hasValue(src)) {
+        this.setSrc(src);
+      } else {
+        this.setSrc(this.defaultImage);
+      }
     }
   }
 
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index 8797ea3d60..cdf23cd146 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -6,4 +6,6 @@ export class ServerConfig implements Config {
   public port: number;
   public nameSpace: string;
   public baseUrl?: string;
+  public ssrBaseUrl?: string;
+  public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 525067da3a..b68b4b426a 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -144,15 +144,20 @@ export class BrowserInitService extends InitService {
    * @private
    */
   private async loadAppState(): Promise<boolean> {
-    const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
-    this.transferState.remove(InitService.NGRX_STATE);
-    this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
-    return lastValueFrom(
-      this.store.select(coreSelector).pipe(
-        find((core: any) => isNotEmpty(core)),
-        map(() => true),
-      ),
-    );
+    // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
+    if (!this.appConfig.rest.hasSsrBaseUrl) {
+      const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
+      this.transferState.remove(InitService.NGRX_STATE);
+      this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
+      return lastValueFrom(
+        this.store.select(coreSelector).pipe(
+          find((core: any) => isNotEmpty(core)),
+          map(() => true),
+        ),
+      );
+    } else {
+      return Promise.resolve(true);
+    }
   }
 
   private trackAuthTokenExpiration(): void {
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index c4aa4ffba3..851c2c24c0 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,6 +21,7 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
+import { isNotEmpty } from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
@@ -100,6 +101,14 @@ export class ServerInitService extends InitService {
   }
 
   private saveAppConfigForCSR(): void {
-    this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) {
+      // Avoid to transfer ssrBaseUrl in order to prevent security issues
+      const config: AppConfig = Object.assign({}, environment as AppConfig, {
+        rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }),
+      });
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, config);
+    } else {
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    }
   }
 }

From 587e1546dc418c3076230911932db057cffd9de8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 27 Sep 2024 18:06:15 +0200
Subject: [PATCH 1148/1286] [DURACOM-288] Additional test for thumbnail
 component

---
 src/app/thumbnail/thumbnail.component.spec.ts | 579 ++++++++++--------
 1 file changed, 322 insertions(+), 257 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 10e461112b..f81089e57c 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -2,6 +2,7 @@ import {
   DebugElement,
   Pipe,
   PipeTransform,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -48,298 +49,261 @@ describe('ThumbnailComponent', () => {
   let authService;
   let authorizationService;
   let fileService;
+  let spy;
 
-  beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('AuthService', {
-      isAuthenticated: observableOf(true),
-    });
-    authorizationService = jasmine.createSpyObj('AuthorizationService', {
-      isAuthorized: observableOf(true),
-    });
-    fileService = jasmine.createSpyObj('FileService', {
-      retrieveFileDownloadLink: null,
-    });
-    fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
-
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        ThumbnailComponent,
-        SafeUrlPipe,
-        MockTranslatePipe,
-        VarDirective,
-      ],
-      providers: [
-        { provide: AuthService, useValue: authService },
-        { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService },
-        { provide: ThemeService, useValue: getMockThemeService() },
-      ],
-    }).overrideComponent(ThumbnailComponent, {
-      add: {
-        imports: [MockTranslatePipe],
-      },
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThumbnailComponent);
-    fixture.detectChanges();
-
-    authService = TestBed.inject(AuthService);
-
-    comp = fixture.componentInstance; // ThumbnailComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
-
-  describe('loading', () => {
-    it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading).toBeTrue();
-    });
-
-    it('should set isLoading$ to false once an image is successfully loaded', () => {
-      comp.setSrc('http://bit.stream');
-      fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should set isLoading$ to false once the src is set to null', () => {
-      comp.setSrc(null);
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should show a loading animation while isLoading$ is true', () => {
-      expect(de.query(By.css('ds-loading'))).toBeTruthy();
-
-      comp.isLoading = false;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
-    });
-
-    describe('with a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = 'https://bit.stream';
-        fixture.detectChanges();
+  describe('when platform is browser', () => {
+    beforeEach(waitForAsync(() => {
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
       });
-
-      it('should render but hide the image while loading and show it once done', () => {
-        let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeTrue();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeFalsy();
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
       });
-
-    });
-
-    describe('without a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = null;
-        fixture.detectChanges();
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
       });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
-      it('should only show the HTML placeholder once done loading', () => {
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
-      });
-    });
-
-  });
-
-  const errorHandler = () => {
-    let setSrcSpy;
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'browser' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
 
     beforeEach(() => {
-      // disconnect error handler to be sure it's only called once
-      const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-      img.nativeNode.onerror = null;
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      fixture.detectChanges();
 
-      comp.ngOnChanges({});
-      setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
     });
 
-    describe('retry with authentication token', () => {
-      it('should remember that it already retried once', () => {
-        expect(comp.retriedWithToken).toBeFalse();
-        comp.errorHandler();
-        expect(comp.retriedWithToken).toBeTrue();
+    describe('loading', () => {
+      it('should start out with isLoading$ true', () => {
+        expect(comp.isLoading).toBeTrue();
       });
 
-      describe('if not logged in', () => {
+      it('should set isLoading$ to false once an image is successfully loaded', () => {
+        comp.setSrc('http://bit.stream');
+        fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should set isLoading$ to false once the src is set to null', () => {
+        comp.setSrc(null);
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should show a loading animation while isLoading$ is true', () => {
+        expect(de.query(By.css('ds-loading'))).toBeTruthy();
+
+        comp.isLoading = false;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
+      });
+
+      describe('with a thumbnail image', () => {
         beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(false));
+          comp.src = 'https://bit.stream';
+          fixture.detectChanges();
         });
 
-        it('should fall back to default', () => {
+        it('should render but hide the image while loading and show it once done', () => {
+          let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeTrue();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeFalsy();
+        });
+
+      });
+
+      describe('without a thumbnail image', () => {
+        beforeEach(() => {
+          comp.src = null;
+          fixture.detectChanges();
+        });
+
+        it('should only show the HTML placeholder once done loading', () => {
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
+        });
+      });
+
+    });
+
+    const errorHandler = () => {
+      let setSrcSpy;
+
+      beforeEach(() => {
+        // disconnect error handler to be sure it's only called once
+        const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+        img.nativeNode.onerror = null;
+
+        comp.ngOnChanges({});
+        setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      });
+
+      describe('retry with authentication token', () => {
+        it('should remember that it already retried once', () => {
+          expect(comp.retriedWithToken).toBeFalse();
           comp.errorHandler();
-          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-        });
-      });
-
-      describe('if logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(true));
+          expect(comp.retriedWithToken).toBeTrue();
         });
 
-        describe('and authorized to download the thumbnail', () => {
+        describe('if not logged in', () => {
           beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(true));
-          });
-
-          it('should add an authentication token to the thumbnail URL', () => {
-            comp.errorHandler();
-
-            if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              // If we failed to retrieve the Bitstream in the first place, fall back to the default
-              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-            } else {
-              expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
-            }
-          });
-        });
-
-        describe('but not authorized to download the thumbnail', () => {
-          beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            authService.isAuthenticated.and.returnValue(observableOf(false));
           });
 
           it('should fall back to default', () => {
             comp.errorHandler();
-
             expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-
-            // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
-            if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              expect(authorizationService.isAuthorized).toHaveBeenCalled();
-            }
           });
         });
+
+        describe('if logged in', () => {
+          beforeEach(() => {
+            authService.isAuthenticated.and.returnValue(observableOf(true));
+          });
+
+          describe('and authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(true));
+            });
+
+            it('should add an authentication token to the thumbnail URL', () => {
+              comp.errorHandler();
+
+              if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                // If we failed to retrieve the Bitstream in the first place, fall back to the default
+                expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+              } else {
+                expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
+              }
+            });
+          });
+
+          describe('but not authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            });
+
+            it('should fall back to default', () => {
+              comp.errorHandler();
+
+              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+
+              // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
+              if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                expect(authorizationService.isAuthorized).toHaveBeenCalled();
+              }
+            });
+          });
+        });
+      });
+
+      describe('after retrying with token', () => {
+        beforeEach(() => {
+          comp.retriedWithToken = true;
+        });
+
+        it('should fall back to default', () => {
+          comp.errorHandler();
+          expect(authService.isAuthenticated).not.toHaveBeenCalled();
+          expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
+          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+        });
+      });
+    };
+
+    describe('fallback', () => {
+      describe('if there is a default image', () => {
+        it('should display the default image', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+          expect(comp.src).toBe(comp.defaultImage);
+        });
+
+        it('should include the alt text', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+
+          fixture.detectChanges();
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
+          expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+        });
+      });
+
+      describe('if there is no default image', () => {
+        it('should display the HTML placeholder', () => {
+          comp.src = 'http://default.img';
+          comp.defaultImage = null;
+          comp.errorHandler();
+          expect(comp.src).toBe(null);
+
+          fixture.detectChanges();
+          const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+          expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
+        });
       });
     });
 
-    describe('after retrying with token', () => {
+    describe('with thumbnail as Bitstream', () => {
+      let thumbnail;
       beforeEach(() => {
-        comp.retriedWithToken = true;
-      });
-
-      it('should fall back to default', () => {
-        comp.errorHandler();
-        expect(authService.isAuthenticated).not.toHaveBeenCalled();
-        expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
-        expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-      });
-    });
-  };
-
-  describe('fallback', () => {
-    describe('if there is a default image', () => {
-      it('should display the default image', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-        expect(comp.src).toBe(comp.defaultImage);
-      });
-
-      it('should include the alt text', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if there is no default image', () => {
-      it('should display the HTML placeholder', () => {
-        comp.src = 'http://default.img';
-        comp.defaultImage = null;
-        comp.errorHandler();
-        expect(comp.src).toBe(null);
-
-        fixture.detectChanges();
-        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
-        expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
-      });
-    });
-  });
-
-  describe('with thumbnail as Bitstream', () => {
-    let thumbnail;
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-      comp.thumbnail = thumbnail;
-    });
-
-    describe('if content can be loaded', () => {
-      it('should display an image', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
-      });
-
-      it('should include the alt text', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if content can\'t be loaded', () => {
-      errorHandler();
-    });
-  });
-
-  describe('with thumbnail as RemoteData<Bitstream>', () => {
-    let thumbnail: Bitstream;
-
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-    });
-
-    describe('if RemoteData succeeded', () => {
-      beforeEach(() => {
-        comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
+        comp.thumbnail = thumbnail;
       });
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
         });
 
-        it('should display the alt text', () => {
+        it('should include the alt text', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
         });
       });
@@ -349,16 +313,117 @@ describe('ThumbnailComponent', () => {
       });
     });
 
-    describe('if RemoteData failed', () => {
+    describe('with thumbnail as RemoteData<Bitstream>', () => {
+      let thumbnail: Bitstream;
+
       beforeEach(() => {
-        comp.thumbnail = createFailedRemoteDataObject();
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
       });
 
-      it('should show the default image', () => {
-        comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges({});
-        expect(comp.src).toBe('default/image.jpg');
+      describe('if RemoteData succeeded', () => {
+        beforeEach(() => {
+          comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        });
+
+        describe('if content can be loaded', () => {
+          it('should display an image', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
+          });
+
+          it('should display the alt text', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+          });
+        });
+
+        describe('if content can\'t be loaded', () => {
+          errorHandler();
+        });
+      });
+
+      describe('if RemoteData failed', () => {
+        beforeEach(() => {
+          comp.thumbnail = createFailedRemoteDataObject();
+        });
+
+        it('should show the default image', () => {
+          comp.defaultImage = 'default/image.jpg';
+          comp.ngOnChanges({});
+          expect(comp.src).toBe('default/image.jpg');
+        });
       });
     });
   });
+
+  describe('when platform is server', () => {
+    beforeEach(waitForAsync(() => {
+
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'server' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      spyOn(fixture.componentInstance, 'setSrc').and.callThrough();
+      fixture.detectChanges();
+
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
+
+    it('should start out with isLoading$ true', () => {
+      expect(comp.isLoading).toBeTrue();
+      expect(de.query(By.css('ds-loading'))).toBeTruthy();
+    });
+
+    it('should not call setSrc', () => {
+      expect(comp.setSrc).not.toHaveBeenCalled();
+    });
+
+  });
 });

From a7276b8a3092a8b10bcf99cbc15af3eba7dca3c0 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 20 Nov 2024 12:58:38 +0100
Subject: [PATCH 1149/1286] Add configuration to toggle replace/transfer

---
 server.ts                                | 7 +++++++
 src/config/default-app-config.ts         | 3 +++
 src/config/ui-server-config.interface.ts | 3 +++
 src/modules/app/browser-init.service.ts  | 6 ++++--
 src/modules/app/server-init.service.ts   | 4 +++-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server.ts b/server.ts
index 127a179e7a..e959600d28 100644
--- a/server.ts
+++ b/server.ts
@@ -269,6 +269,13 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
     })
     .then((html) => {
       if (hasValue(html)) {
+        // Replace REST URL with UI URL
+        if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+          const t0 = Date.now();
+          html = html.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
+          console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
+        }
+
         // save server side rendered page to cache (if any are enabled)
         saveToCache(req, html);
         if (sendToUser) {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3c5e0ef0da..e81f77bff5 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -52,6 +52,9 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
+
+    transferState: true,
+    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 70e2fa3e26..2e58f9d6de 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,4 +13,7 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
+
+  transferState: boolean;
+  replaceRestUrl: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index b68b4b426a..9ba103a655 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -113,7 +113,9 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      await this.loadAppState();
+      if (this.appConfig.ui.transferState) {
+        await this.loadAppState();
+      }
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -145,7 +147,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (!this.appConfig.rest.hasSsrBaseUrl) {
+    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 851c2c24c0..8e96e3e61d 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -68,7 +68,9 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      this.saveAppState();
+      if (this.appConfig.ui.transferState) {
+        this.saveAppState();
+      }
       this.initCorrelationId();
 
       this.checkEnvironment();

From cfba84ce31316d92887462100163632e6562e6c4 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:22 +0100
Subject: [PATCH 1150/1286] [DURACOM-288] Refactoring configuration to transfer
 state

---
 server.ts                                  |  4 +---
 src/config/default-app-config.ts           |  3 ---
 src/config/ssr-config.interface.ts         | 18 ++++++++++++++
 src/config/ui-server-config.interface.ts   |  3 ---
 src/environments/environment.production.ts |  2 ++
 src/environments/environment.test.ts       |  2 ++
 src/environments/environment.ts            |  2 ++
 src/modules/app/browser-init.service.ts    |  9 ++++---
 src/modules/app/server-init.service.ts     | 28 ++++++++++++----------
 9 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/server.ts b/server.ts
index e959600d28..499fe5c4ff 100644
--- a/server.ts
+++ b/server.ts
@@ -270,10 +270,8 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
     .then((html) => {
       if (hasValue(html)) {
         // Replace REST URL with UI URL
-        if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
-          const t0 = Date.now();
+        if (environment.ssr.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
           html = html.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
-          console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
         }
 
         // save server side rendered page to cache (if any are enabled)
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index e81f77bff5..3c5e0ef0da 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -52,9 +52,6 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
-
-    transferState: true,
-    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 4def73962a..c9c5f8882b 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -21,6 +21,24 @@ export interface SSRConfig extends Config {
    */
   inlineCriticalCss: boolean;
 
+  /**
+   * Enable state transfer from the server-side application to the client-side application.
+   * Defaults to true.
+   *
+   * Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+   * Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+   * ensure that users always use the most up-to-date state.
+   */
+  transferState: boolean;
+
+  /**
+   * When a different REST base URL is used for the server-side application, the generated state contains references to
+   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+   * URLs used by the client application.
+   */
+  replaceRestUrl: boolean;
+
   /**
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 2e58f9d6de..70e2fa3e26 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,7 +13,4 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
-
-  transferState: boolean;
-  replaceRestUrl: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 8159fff2ea..72c49aa370 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,6 +8,8 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 17d4e8ed10..1525b1960b 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,8 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4ac586d899..ff0c05e76d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,8 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 9ba103a655..3bbdf12b91 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -54,6 +54,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { extendEnvironmentWithAppConfig } from '../../config/config.util';
 import { DefaultAppConfig } from '../../config/default-app-config';
 import { environment } from '../../environments/environment';
@@ -70,7 +71,7 @@ export class BrowserInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -113,9 +114,7 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      if (this.appConfig.ui.transferState) {
-        await this.loadAppState();
-      }
+      await this.loadAppState();
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -147,7 +146,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
+    if (this.appConfig.ssr.transferState) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 8e96e3e61d..60c6cbe413 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,7 +21,10 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
-import { isNotEmpty } from '../../app/shared/empty.util';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
@@ -30,6 +33,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { environment } from '../../environments/environment';
 
 /**
@@ -41,7 +45,7 @@ export class ServerInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -68,9 +72,7 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      if (this.appConfig.ui.transferState) {
-        this.saveAppState();
-      }
+      this.saveAppState();
       this.initCorrelationId();
 
       this.checkEnvironment();
@@ -92,14 +94,16 @@ export class ServerInitService extends InitService {
    * @private
    */
   private saveAppState() {
-    this.transferState.onSerialize(InitService.NGRX_STATE, () => {
-      let state;
-      this.store.pipe(take(1)).subscribe((saveState: any) => {
-        state = saveState;
-      });
+    if (this.appConfig.ssr.transferState && (isEmpty(this.appConfig.rest.ssrBaseUrl) || this.appConfig.ssr.replaceRestUrl)) {
+      this.transferState.onSerialize(InitService.NGRX_STATE, () => {
+        let state;
+        this.store.pipe(take(1)).subscribe((saveState: any) => {
+          state = saveState;
+        });
 
-      return state;
-    });
+        return state;
+      });
+    }
   }
 
   private saveAppConfigForCSR(): void {

From 45ee56fe8f64e36b8f24f8b4dc71f0fecf23b2c4 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:45 +0100
Subject: [PATCH 1151/1286] [DURACOM-288] Add missing settings to
 config.example.yml

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

diff --git a/config/config.example.yml b/config/config.example.yml
index 099bea2614..dca0d698c6 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,6 +19,14 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
+  # A boolean flag indicating whether the SSR configuration is enabled
+  # Defaults to true.
+  enabled: boolean;
+
+  # Enable request performance profiling data collection and printing the results in the server console.
+  # Defaults to false.
+  enablePerformanceProfiler: boolean;
+
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -34,6 +42,19 @@ ssr:
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false,
 
+  # Enable state transfer from the server-side application to the client-side application.
+  # Defaults to true.
+  # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+  # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+  # ensure that users always use the most up-to-date state.
+  transferState: boolean;
+
+  # When a different REST base URL is used for the server-side application, the generated state contains references to
+  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+  # URLs used by the client application.
+  replaceRestUrl: boolean;
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -43,6 +64,9 @@ rest:
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
+  # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
+  # server namespace (uncomment to use it).
+  #ssrBaseUrl: http://localhost:8080/server
 
 # Caching settings
 cache:

From 6e7c0da68ab79d282f84a6c4b8db81b03002a3d9 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 19:09:23 +0100
Subject: [PATCH 1152/1286] [DURACOM-288] Add unit test to test SSR url replace

---
 .../server-hard-redirect.service.spec.ts      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index d3247dd0dd..a904a8e66c 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -8,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
+  let service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
@@ -69,4 +69,23 @@ describe('ServerHardRedirectService', () => {
     });
   });
 
+  describe('when SSR base url is set', () => {
+    const redirect = 'https://private-url:4000/server/api/bitstreams/uuid';
+    const replacedUrl = 'https://public-url/server/api/bitstreams/uuid';
+    const environmentWithSSRUrl: any = { ...environment, ...{ ...environment.rest, rest: {
+      ssrBaseUrl: 'https://private-url:4000/server',
+      baseUrl: 'https://public-url/server',
+    } } };
+    service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse);
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should perform a 302 redirect', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, replacedUrl);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
 });

From ed27231769e61122cb12ad9f145a251b26d4b261 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 10:34:49 +0200
Subject: [PATCH 1153/1286] 116404: Fixed expandable navbar section loosing
 focus on expand through keyboard

(cherry picked from commit 2547b1218f36f00e1a62522a47d9c9f59dbc91e9)
---
 .../expandable-admin-sidebar-section.component.ts    |  2 +-
 .../expandable-navbar-section.component.html         | 12 +++++-------
 .../expandable-navbar-section.component.ts           | 10 ++++------
 .../menu/menu-section/menu-section.component.ts      |  8 +++++---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 1b09d330c2..43d314ecdd 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -84,7 +84,7 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
     this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
     this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
     this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+    this.isExpanded$ = combineLatestObservable([this.active$, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
       map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
     );
   }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 7f9b4a546f..5119cec689 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,9 +1,8 @@
 <div class="ds-menu-item-wrapper text-md-center"
     [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event, isActive)"
-    (mouseleave)="onMouseLeave($event, isActive)"
-    data-test="navbar-section-wrapper"
-    *ngVar="(active | async) as isActive">
+    (mouseenter)="onMouseEnter($event)"
+    (mouseleave)="onMouseLeave($event)"
+    data-test="navbar-section-wrapper">
     <a href="javascript:void(0);" routerLinkActive="active"
        role="menuitem"
        (keyup.enter)="toggleSection($event)"
@@ -12,18 +11,17 @@
        (keydown.space)="$event.preventDefault()"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
-       [attr.aria-expanded]="isActive"
+       [attr.aria-expanded]="(active$ | async).valueOf()"
        [attr.aria-controls]="expandableNavbarSectionId(section.id)"
        class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
        [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
+    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 92da978af7..7f4405e2b6 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -84,13 +84,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseEnter($event: Event, isActive: boolean) {
+  onMouseEnter($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && !isActive && !this.mouseEntered) {
+      if (!isMobile && !this.active$.value && !this.mouseEntered) {
         this.activateSection($event);
       }
       this.mouseEntered = true;
@@ -100,13 +99,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse leaves the section toggler deactivate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseLeave($event: Event, isActive: boolean) {
+  onMouseLeave($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && isActive && this.mouseEntered) {
+      if (!isMobile && this.active$.value && this.mouseEntered) {
         this.deactivateSection($event);
       }
       this.mouseEntered = false;
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index f59c0b5594..685ebe6b99 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -37,9 +37,9 @@ import { MenuSection } from '../menu-section.model';
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
-   * Observable that emits whether or not this section is currently active
+   * {@link BehaviorSubject} containing the current state to whether this section is currently active
    */
-  active: Observable<boolean>;
+  active$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   /**
    * The ID of the menu this section resides in
@@ -72,7 +72,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.active = this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged());
+    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      this.active$.next(isActive);
+    });
     this.initializeInjectorData();
   }
 

From 17e03330d0109599edffdeb88e5411d56f994caa Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 11:01:38 +0200
Subject: [PATCH 1154/1286] 116404: Don't navigate in the expandable navbar
 section with tab

Had to move the @slide animation to prevent focus being lost when tabbing in the expandable section

(cherry picked from commit c08c2721ac2d14f4ba6adf1baf39e8c46cc9401d)
---
 .../expandable-navbar-section.component.html          | 11 +++++++----
 .../menu/menu-section/menu-section.component.ts       |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 5119cec689..f37fc222d5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -9,6 +9,7 @@
        (keyup.space)="toggleSection($event)"
        (click)="toggleSection($event)"
        (keydown.space)="$event.preventDefault()"
+       (keydown.tab)="deactivateSection($event, false)"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
        [attr.aria-expanded]="(active$ | async).valueOf()"
@@ -21,13 +22,15 @@
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+      <div @slide role="presentation">
         <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-            <ng-container
-                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </div>
+              <ng-container
+                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+      </div>
     </div>
 </div>
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 685ebe6b99..43df73547a 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -102,10 +102,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Deactivate this section
+   *
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  deactivateSection(event: Event) {
-    event.preventDefault();
+  deactivateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     this.menuService.deactivateSection(this.menuID, this.section.id);
   }
 

From b9b1d3fd8dc20684de0e0dbd3e2f7bfd82db900f Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 13:30:01 +0200
Subject: [PATCH 1155/1286] 116404: Added navigation with arrow keys in navbar
 & collapsed the expandable menu when hovering outside of it

(cherry picked from commit 05232cdf2b068223c8147ed61afe364fc92986d1)
---
 .../expandable-navbar-section.component.html  |  59 +++++-----
 .../expandable-navbar-section.component.ts    | 104 ++++++++++++++++--
 .../shared/utils/hover-outside.directive.ts   |  51 +++++++++
 .../expandable-navbar-section.component.ts    |  14 ++-
 4 files changed, 185 insertions(+), 43 deletions(-)
 create mode 100644 src/app/shared/utils/hover-outside.directive.ts

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f37fc222d5..f8facaa82a 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,36 +1,37 @@
-<div class="ds-menu-item-wrapper text-md-center"
-    [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event)"
-    (mouseleave)="onMouseLeave($event)"
-    data-test="navbar-section-wrapper">
-    <a href="javascript:void(0);" routerLinkActive="active"
-       role="menuitem"
-       (keyup.enter)="toggleSection($event)"
-       (keyup.space)="toggleSection($event)"
-       (click)="toggleSection($event)"
-       (keydown.space)="$event.preventDefault()"
-       (keydown.tab)="deactivateSection($event, false)"
-       aria-haspopup="menu"
-       data-test="navbar-section-toggler"
-       [attr.aria-expanded]="(active$ | async).valueOf()"
-       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
-       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
-       [class.disabled]="section.model?.disabled">
+<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+     [id]="'expandable-navbar-section-' + section.id"
+     (mouseenter)="onMouseEnter($event)"
+     (mouseleave)="onMouseLeave($event)"
+     data-test="navbar-section-wrapper">
+  <a href="javascript:void(0);" routerLinkActive="active"
+     role="menuitem"
+     (keyup.enter)="toggleSection($event)"
+     (keyup.space)="toggleSection($event)"
+     (click)="toggleSection($event)"
+     (keydown)="keyDown($event)"
+     aria-haspopup="menu"
+     data-test="navbar-section-toggler"
+     [attr.aria-expanded]="(active$ | async).valueOf()"
+     [attr.aria-controls]="expandableNavbarSectionId()"
+     class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+     [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
       </span>
-      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
-    </a>
-    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
-        [id]="expandableNavbarSectionId(section.id)"
-        role="menu"
-        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-      <div @slide role="presentation">
-        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-              <ng-container
-                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-          </div>
+    <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+  </a>
+  <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+       [id]="expandableNavbarSectionId()"
+       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       (dsHoverOutside)="deactivateSection($event, false)"
+       role="menu"
+       class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+    <div @slide role="presentation">
+      <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
       </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 7f4405e2b6..7fb86ce323 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -5,11 +5,14 @@ import {
   NgIf,
 } from '@angular/common';
 import {
+  AfterViewChecked,
   Component,
+  ElementRef,
   HostListener,
   Inject,
   Injector,
   OnInit,
+  ViewChild,
 } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -19,6 +22,8 @@ import { slide } from '../../shared/animations/slide';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
@@ -31,9 +36,20 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    NgFor,
+    NgIf,
+    RouterLinkActive,
+    VarDirective,
+  ],
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
+
+  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+
   /**
    * This section resides in the Public Navbar
    */
@@ -54,6 +70,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   isMobile$: Observable<boolean>;
 
+  /**
+   * Boolean used to add the event listeners to the items in the expandable menu when expanded. This is done for
+   * performance reasons, there is currently an *ngIf on the menu to prevent the {@link HoverOutsideDirective} to tank
+   * performance when not expanded.
+   */
+  addArrowEventListeners = false;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -68,17 +91,33 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     });
   }
 
-  constructor(@Inject('sectionDataProvider') menuSection,
-              protected menuService: MenuService,
-              protected injector: Injector,
-              private windowService: HostWindowService,
+  constructor(
+    @Inject('sectionDataProvider') public section: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected windowService: HostWindowService,
   ) {
-    super(menuSection, menuService, injector);
+    super(section, menuService, injector);
     this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
     super.ngOnInit();
+    this.subs.push(this.active$.subscribe((active: boolean) => {
+      if (active === true) {
+        this.addArrowEventListeners = true;
+      }
+    }));
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.addArrowEventListeners) {
+      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach(item => {
+        item.addEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.addArrowEventListeners = false;
+    }
   }
 
   /**
@@ -113,9 +152,54 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   /**
    * returns the ID of the DOM element representing the navbar section
-   * @param sectionId
    */
-  expandableNavbarSectionId(sectionId: string) {
-    return `expandable-navbar-section-${sectionId}-dropdown`;
+  expandableNavbarSectionId(): string {
+    return `expandable-navbar-section-${this.section.id}-dropdown`;
+  }
+
+  /**
+   * Handles the navigation between the menu items
+   *
+   * @param event
+   */
+  navigateDropdown(event: KeyboardEvent): void {
+    if (event.key === 'Tab') {
+      this.deactivateSection(event, false);
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+
+    const items: NodeListOf<Element> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+    if (items.length === 0) {
+      return;
+    }
+    const currentIndex: number = Array.from(items).findIndex((item: Element) => item === event.target);
+
+    if (event.key === 'ArrowDown') {
+      (items[(currentIndex + 1) % items.length] as HTMLElement).focus();
+    } else if (event.key === 'ArrowUp') {
+      (items[(currentIndex - 1 + items.length) % items.length] as HTMLElement).focus();
+    }
+  }
+
+  /**
+   * Handles all the keydown events on the dropdown toggle
+   *
+   * @param event
+   */
+  keyDown(event: KeyboardEvent): void {
+    switch (event.code) {
+      // Works for both Tab & Shift Tab
+      case 'Tab':
+        this.deactivateSection(event, false);
+        break;
+      case 'ArrowDown':
+        this.navigateDropdown(event);
+        break;
+      case 'Space':
+        event.preventDefault();
+        break;
+    }
   }
 }
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
new file mode 100644
index 0000000000..a0abb8bb63
--- /dev/null
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -0,0 +1,51 @@
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+} from '@angular/core';
+
+/**
+ * Directive to detect when the user hovers outside of the element the directive was put on
+ *
+ * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
+ * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ */
+@Directive({
+  selector: '[dsHoverOutside]',
+  standalone: true,
+})
+export class HoverOutsideDirective {
+
+  /**
+   * Emits null when the user hovers outside of the element
+   */
+  @Output()
+  public dsHoverOutside = new EventEmitter();
+
+  /**
+   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
+   * element the directive was put on.
+   */
+  @Input()
+  public dsHoverOutsideOfElement: ElementRef;
+
+  constructor(
+    private elementRef: ElementRef,
+  ) {
+    this.dsHoverOutsideOfElement = this.elementRef;
+  }
+
+  @HostListener('document:mouseover', ['$event'])
+  public onMouseOver(event: MouseEvent): void {
+    const targetElement: HTMLElement = event.target as HTMLElement;
+    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+
+    if (!hoveredInside) {
+      this.dsHoverOutside.emit(null);
+    }
+  }
+
+}
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index f0e2ebd502..167b805fd5 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -9,11 +9,9 @@ import { RouterLinkActive } from '@angular/router';
 
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
+import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive';
 import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
-/**
- * Represents an expandable section in the navbar
- */
 @Component({
   selector: 'ds-themed-expandable-navbar-section',
   // templateUrl: './expandable-navbar-section.component.html',
@@ -22,7 +20,15 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    NgFor,
+    NgIf,
+    RouterLinkActive,
+    VarDirective,
+  ],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {
 }

From eb93041c5b417686e8075cfc7be5a9a1549262ad Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 16:02:42 +0200
Subject: [PATCH 1156/1286] 116404: Apply focus on first item

(cherry picked from commit 2152bab717c197f7e67b8a025ea611b6515ef308)
---
 .../expandable-navbar-section.component.ts               | 9 ++++++---
 .../shared/menu/menu-section/menu-section.component.ts   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 7fb86ce323..3b1d2f7faa 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -112,10 +112,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach(item => {
+      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
+      if (dropdownItems.length > 0) {
+        dropdownItems.item(0).focus();
+      }
       this.addArrowEventListeners = false;
     }
   }
@@ -195,7 +198,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
-        this.navigateDropdown(event);
+        this.activateSection(event);
         break;
       case 'Space':
         event.preventDefault();
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 43df73547a..21deca9b18 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -92,9 +92,12 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
   /**
    * Activate this section
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  activateSection(event: Event) {
-    event.preventDefault();
+  activateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     if (!this.section.model?.disabled) {
       this.menuService.activateSection(this.menuID, this.section.id);
     }

From daf2f50b00ea6fc329ac450d4079e3487d72182c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 17:57:18 +0200
Subject: [PATCH 1157/1286] 116404: Close modal on escape

(cherry picked from commit 84df67c00bc46f6346efadb7a6cb7c068d7d36a0)
---
 .../expandable-navbar-section.component.ts                  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 3b1d2f7faa..e546585c07 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -166,9 +166,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param event
    */
   navigateDropdown(event: KeyboardEvent): void {
-    if (event.key === 'Tab') {
+    if (event.code === 'Tab') {
       this.deactivateSection(event, false);
       return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
     }
     event.preventDefault();
     event.stopPropagation();

From a984957af910dfc1d3e7b795da74b8bc108a17ae Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 27 Oct 2024 14:11:05 +0100
Subject: [PATCH 1158/1286] 116404: Replaced ViewChild logic with a CSS
 selector

This change avoids triggering an additional change detection cycle

(cherry picked from commit f7bb83013a7b6c49fee3695668c66129b4078f5c)
---
 .../expandable-navbar-section.component.html  |  4 +-
 ...xpandable-navbar-section.component.spec.ts | 20 +++++----
 .../expandable-navbar-section.component.ts    | 42 ++++++++++++++-----
 .../shared/utils/hover-outside.directive.ts   | 18 ++++----
 .../expandable-navbar-section.component.ts    |  2 -
 5 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f8facaa82a..0af5c706b7 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,4 +1,4 @@
-<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+<div class="ds-menu-item-wrapper text-md-center"
      [id]="'expandable-navbar-section-' + section.id"
      (mouseenter)="onMouseEnter($event)"
      (mouseleave)="onMouseLeave($event)"
@@ -23,7 +23,7 @@
   </a>
   <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
        [id]="expandableNavbarSectionId()"
-       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
        (dsHoverOutside)="deactivateSection($event, false)"
        role="menu"
        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index d03c8d89eb..91d5a7f1ed 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -12,7 +12,7 @@ import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 
 describe('ExpandableNavbarSectionComponent', () => {
@@ -23,7 +23,12 @@ describe('ExpandableNavbarSectionComponent', () => {
   describe('on larger screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
@@ -41,10 +46,6 @@ describe('ExpandableNavbarSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
     describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
         spyOn(component, 'onMouseEnter').and.callThrough();
@@ -184,7 +185,12 @@ describe('ExpandableNavbarSectionComponent', () => {
   describe('on smaller, mobile screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index e546585c07..b28aa25804 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -7,12 +7,11 @@ import {
 import {
   AfterViewChecked,
   Component,
-  ElementRef,
   HostListener,
   Inject,
   Injector,
+  OnDestroy,
   OnInit,
-  ViewChild,
 } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -24,7 +23,6 @@ import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
 import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
-import { VarDirective } from '../../shared/utils/var.directive';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
 /**
@@ -43,12 +41,9 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
     NgFor,
     NgIf,
     RouterLinkActive,
-    VarDirective,
   ],
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
-
-  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
 
   /**
    * This section resides in the Public Navbar
@@ -77,6 +72,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   addArrowEventListeners = false;
 
+  /**
+   * List of current dropdown items who have event listeners
+   */
+  private dropdownItems: NodeListOf<HTMLElement>;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -106,23 +106,43 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.subs.push(this.active$.subscribe((active: boolean) => {
       if (active === true) {
         this.addArrowEventListeners = true;
+      } else {
+        this.unsubscribeFromEventListeners();
       }
     }));
   }
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach((item: HTMLElement) => {
+      this.dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (dropdownItems.length > 0) {
-        dropdownItems.item(0).focus();
+      if (this.dropdownItems.length > 0) {
+        this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
     }
   }
 
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.unsubscribeFromEventListeners();
+  }
+
+  /**
+   * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
+   * destruction)
+   */
+  unsubscribeFromEventListeners(): void {
+    if (this.dropdownItems) {
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.removeEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.dropdownItems = undefined;
+    }
+  }
+
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
index a0abb8bb63..e046d3a087 100644
--- a/src/app/shared/utils/hover-outside.directive.ts
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -8,10 +8,11 @@ import {
 } from '@angular/core';
 
 /**
- * Directive to detect when the user hovers outside of the element the directive was put on
+ * Directive to detect when the user hovers outside the element the directive was put on
  *
- * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
- * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ * **Performance Consideration**: it's probably not good for performance to use this excessively (on
+ * {@link ExpandableNavbarSectionComponent} for example, a workaround for this problem was to add an `*ngIf` to prevent
+ * this Directive from always being active)
  */
 @Directive({
   selector: '[dsHoverOutside]',
@@ -26,22 +27,23 @@ export class HoverOutsideDirective {
   public dsHoverOutside = new EventEmitter();
 
   /**
-   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
-   * element the directive was put on.
+   * CSS selector for the parent element to monitor. If set, the directive will use this
+   * selector to determine if the hover event originated within the selected parent element.
+   * If left unset, the directive will monitor mouseover hover events for the element it is applied to.
    */
   @Input()
-  public dsHoverOutsideOfElement: ElementRef;
+  public dsHoverOutsideOfParentSelector: string;
 
   constructor(
     private elementRef: ElementRef,
   ) {
-    this.dsHoverOutsideOfElement = this.elementRef;
   }
 
   @HostListener('document:mouseover', ['$event'])
   public onMouseOver(event: MouseEvent): void {
     const targetElement: HTMLElement = event.target as HTMLElement;
-    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+    const element: Element = document.querySelector(this.dsHoverOutsideOfParentSelector);
+    const hoveredInside = (element ? new ElementRef(element) : this.elementRef).nativeElement.contains(targetElement);
 
     if (!hoveredInside) {
       this.dsHoverOutside.emit(null);
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 167b805fd5..b0b57a75aa 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -10,7 +10,6 @@ import { RouterLinkActive } from '@angular/router';
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
 import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-themed-expandable-navbar-section',
@@ -27,7 +26,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     NgFor,
     NgIf,
     RouterLinkActive,
-    VarDirective,
   ],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {

From 7de6aa0e24f6c1cb85a3df4091eab9e9263cc940 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Jan 2025 00:11:50 +0100
Subject: [PATCH 1159/1286] 116404: Prevent the opening from the modal using
 mouse interactions from automatically focussing on the first element

(cherry picked from commit 82ed3aadff3203a58087530a483d97fdf62adf2a)
---
 ...xpandable-navbar-section.component.spec.ts | 133 +++++++++++++++++-
 .../expandable-navbar-section.component.ts    |  22 ++-
 .../menu-section/menu-section.component.ts    |   8 +-
 3 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 91d5a7f1ed..6f374b3aa5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,6 +1,11 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
+  flush,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
@@ -10,6 +15,8 @@ import { of as observableOf } from 'rxjs';
 
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
+import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
@@ -33,6 +40,7 @@ describe('ExpandableNavbarSectionComponent', () => {
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
           { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+          TestComponent,
         ],
       }).compileComponents();
     }));
@@ -142,6 +150,8 @@ describe('ExpandableNavbarSectionComponent', () => {
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
         spyOn(component, 'toggleSection').and.callThrough();
         spyOn(menuService, 'toggleActiveSection');
@@ -150,15 +160,27 @@ describe('ExpandableNavbarSectionComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
-        // dispatch the (keyup.space) action used in our component HTML
-        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
       it('should call toggleSection on the menuService', () => {
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { code: 'Space', key: ' ' }));
+
         expect(component.toggleSection).toHaveBeenCalled();
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Space', key: ' ' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
@@ -180,6 +202,105 @@ describe('ExpandableNavbarSectionComponent', () => {
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
+
+    describe('when enter is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
+      beforeEach(() => {
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+      });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Enter' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
+    });
+
+    describe('when arrow down is pressed on section header', () => {
+      it('should call activateSection', () => {
+        spyOn(component, 'activateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'ArrowDown' }));
+
+        expect(component.focusOnFirstChildSection).toBe(true);
+        expect(component.activateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('when tab is pressed on section header', () => {
+      it('should call deactivateSection', () => {
+        spyOn(component, 'deactivateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(component.deactivateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('navigateDropdown', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([
+          Object.assign(new MenuSection(), {
+            id: 'subSection1',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+          Object.assign(new MenuSection(), {
+            id: 'subSection2',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+        ]));
+        component.ngOnInit();
+        flush();
+        fixture.detectChanges();
+        component.focusOnFirstChildSection = true;
+        component.active$.next(true);
+        fixture.detectChanges();
+      }));
+
+      it('should close the modal on Tab', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+
+      it('should close the modal on Escape', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('on smaller, mobile screens', () => {
@@ -259,7 +380,9 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``,
+  template: `
+    <a role="menuitem">link</a>
+  `,
   standalone: true,
 })
 class TestComponent {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index b28aa25804..dc3db79aca 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -55,6 +55,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   mouseEntered = false;
 
+  /**
+   * Whether the section was expanded
+   */
+  focusOnFirstChildSection = false;
+
   /**
    * True if screen size was small before a resize event
    */
@@ -107,6 +112,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       if (active === true) {
         this.addArrowEventListeners = true;
       } else {
+        this.focusOnFirstChildSection = undefined;
         this.unsubscribeFromEventListeners();
       }
     }));
@@ -118,7 +124,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (this.dropdownItems.length > 0) {
+      if (this.focusOnFirstChildSection && this.dropdownItems.length > 0) {
         this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
@@ -130,6 +136,18 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.unsubscribeFromEventListeners();
   }
 
+  /**
+   * Activate this section if it's currently inactive, deactivate it when it's currently active.
+   * Also saves whether this toggle was performed by a keyboard event (non-click event) in order to know if thi first
+   * item should be focussed when activating a section.
+   *
+   *  @param {Event} event The user event that triggered this method
+   */
+  override toggleSection(event: Event): void {
+    this.focusOnFirstChildSection = event.type !== 'click';
+    super.toggleSection(event);
+  }
+
   /**
    * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
    * destruction)
@@ -222,9 +240,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
+        this.focusOnFirstChildSection = true;
         this.activateSection(event);
         break;
       case 'Space':
+      case 'Enter':
         event.preventDefault();
         break;
     }
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 21deca9b18..d14cfb143c 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -72,9 +72,11 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
-      this.active$.next(isActive);
-    });
+    this.subs.push(this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      if (this.active$.value !== isActive) {
+        this.active$.next(isActive);
+      }
+    }));
     this.initializeInjectorData();
   }
 

From cafe88a3b815b9f2fd34a5fb76a484d85c5adfd6 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 29 Jan 2025 15:52:39 -0600
Subject: [PATCH 1160/1286] Fix syntax in config.example.yml

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

diff --git a/config/config.example.yml b/config/config.example.yml
index 099bea2614..c6d71714ef 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -28,11 +28,11 @@ ssr:
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableSearchComponent: false,
+  enableSearchComponent: false
   # Whether to enable rendering of Browse component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableBrowseComponent: false,
+  enableBrowseComponent: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From e296295df59099c3778f735334c98038821774d7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 29 Jan 2025 15:57:55 -0600
Subject: [PATCH 1161/1286] Fix YAML syntax and revert section name to
 "universal" as that's the name in 7.x

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

diff --git a/config/config.example.yml b/config/config.example.yml
index 6674bc5334..c79c87f4d7 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -17,8 +17,8 @@ ui:
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
-# Angular Server Side Rendering (SSR) settings
-ssr:
+# Angular Universal / Server Side Rendering (SSR) settings
+universal:
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -28,11 +28,11 @@ ssr:
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableSearchComponent: false,
+  enableSearchComponent: false
   # Whether to enable rendering of Browse component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableBrowseComponent: false,
+  enableBrowseComponent: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From ea3866971003a214f2255c9ef5f6f8a6bd698283 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 29 Jan 2025 15:52:39 -0600
Subject: [PATCH 1162/1286] Fix syntax in config.example.yml

(cherry picked from commit cafe88a3b815b9f2fd34a5fb76a484d85c5adfd6)
---
 config/config.example.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 40ce9af094..79aaab8d5f 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -28,11 +28,11 @@ ssr:
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableSearchComponent: false,
+  enableSearchComponent: false
   # Whether to enable rendering of Browse component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
-  enableBrowseComponent: false,
+  enableBrowseComponent: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From 470ad807410fbc733dc84c57346e9955757ab8ed Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 10:34:49 +0200
Subject: [PATCH 1163/1286] 116404: Fixed expandable navbar section loosing
 focus on expand through keyboard

(cherry picked from commit 2547b1218f36f00e1a62522a47d9c9f59dbc91e9)
---
 .../expandable-admin-sidebar-section.component.ts    |  4 ++--
 .../expandable-navbar-section.component.html         | 12 +++++-------
 .../expandable-navbar-section.component.ts           | 10 ++++------
 .../menu/menu-section/menu-section.component.ts      |  8 +++++---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index e2995598f8..d25d7c6b40 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -67,8 +67,8 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
     this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
     this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
     this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
-      map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed)))
+    this.isExpanded$ = combineLatestObservable([this.active$, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+      map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
     );
   }
 
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 7f9b4a546f..5119cec689 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,9 +1,8 @@
 <div class="ds-menu-item-wrapper text-md-center"
     [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event, isActive)"
-    (mouseleave)="onMouseLeave($event, isActive)"
-    data-test="navbar-section-wrapper"
-    *ngVar="(active | async) as isActive">
+    (mouseenter)="onMouseEnter($event)"
+    (mouseleave)="onMouseLeave($event)"
+    data-test="navbar-section-wrapper">
     <a href="javascript:void(0);" routerLinkActive="active"
        role="menuitem"
        (keyup.enter)="toggleSection($event)"
@@ -12,18 +11,17 @@
        (keydown.space)="$event.preventDefault()"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
-       [attr.aria-expanded]="isActive"
+       [attr.aria-expanded]="(active$ | async).valueOf()"
        [attr.aria-controls]="expandableNavbarSectionId(section.id)"
        class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
        [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
+    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 030b2b3da4..1921737201 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -67,13 +67,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseEnter($event: Event, isActive: boolean) {
+  onMouseEnter($event: Event): void {
     this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile && !isActive && !this.mouseEntered) {
+      if (!isMobile && !this.active$.value && !this.mouseEntered) {
         this.activateSection($event);
       }
       this.mouseEntered = true;
@@ -83,13 +82,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse leaves the section toggler deactivate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseLeave($event: Event, isActive: boolean) {
+  onMouseLeave($event: Event): void {
     this.isMobile$.pipe(
       first()
     ).subscribe((isMobile) => {
-      if (!isMobile && isActive && this.mouseEntered) {
+      if (!isMobile && this.active$.value && this.mouseEntered) {
         this.deactivateSection($event);
       }
       this.mouseEntered = false;
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 9b5bd499e1..2611935dfa 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -20,9 +20,9 @@ import { MenuItemType } from '../menu-item-type.model';
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
-   * Observable that emits whether or not this section is currently active
+   * {@link BehaviorSubject} containing the current state to whether this section is currently active
    */
-  active: Observable<boolean>;
+  active$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   /**
    * The ID of the menu this section resides in
@@ -55,7 +55,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.active = this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged());
+    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      this.active$.next(isActive);
+    });
     this.initializeInjectorData();
   }
 

From 8f9236f06dd1ba94b60a197ac5163a560a5454ca Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 11:01:38 +0200
Subject: [PATCH 1164/1286] 116404: Don't navigate in the expandable navbar
 section with tab

Had to move the @slide animation to prevent focus being lost when tabbing in the expandable section

(cherry picked from commit c08c2721ac2d14f4ba6adf1baf39e8c46cc9401d)
---
 .../expandable-navbar-section.component.html          | 11 +++++++----
 .../menu/menu-section/menu-section.component.ts       |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 5119cec689..f37fc222d5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -9,6 +9,7 @@
        (keyup.space)="toggleSection($event)"
        (click)="toggleSection($event)"
        (keydown.space)="$event.preventDefault()"
+       (keydown.tab)="deactivateSection($event, false)"
        aria-haspopup="menu"
        data-test="navbar-section-toggler"
        [attr.aria-expanded]="(active$ | async).valueOf()"
@@ -21,13 +22,15 @@
       </span>
       <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </a>
-    <div @slide *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
         [id]="expandableNavbarSectionId(section.id)"
         role="menu"
         class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+      <div @slide role="presentation">
         <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-            <ng-container
-                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </div>
+              <ng-container
+                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+      </div>
     </div>
 </div>
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 2611935dfa..e0464a769f 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -85,10 +85,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Deactivate this section
+   *
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  deactivateSection(event: Event) {
-    event.preventDefault();
+  deactivateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     this.menuService.deactivateSection(this.menuID, this.section.id);
   }
 

From 53186988f58073054c9b269144aab50d98da9755 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 13:30:01 +0200
Subject: [PATCH 1165/1286] 116404: Added navigation with arrow keys in navbar
 & collapsed the expandable menu when hovering outside of it

(cherry picked from commit 05232cdf2b068223c8147ed61afe364fc92986d1)
---
 .../expandable-navbar-section.component.html  | 59 ++++++------
 .../expandable-navbar-section.component.ts    | 92 +++++++++++++++++--
 src/app/navbar/navbar.module.ts               |  7 ++
 .../shared/utils/hover-outside.directive.ts   | 50 ++++++++++
 4 files changed, 169 insertions(+), 39 deletions(-)
 create mode 100644 src/app/shared/utils/hover-outside.directive.ts

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f37fc222d5..f8facaa82a 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,36 +1,37 @@
-<div class="ds-menu-item-wrapper text-md-center"
-    [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event)"
-    (mouseleave)="onMouseLeave($event)"
-    data-test="navbar-section-wrapper">
-    <a href="javascript:void(0);" routerLinkActive="active"
-       role="menuitem"
-       (keyup.enter)="toggleSection($event)"
-       (keyup.space)="toggleSection($event)"
-       (click)="toggleSection($event)"
-       (keydown.space)="$event.preventDefault()"
-       (keydown.tab)="deactivateSection($event, false)"
-       aria-haspopup="menu"
-       data-test="navbar-section-toggler"
-       [attr.aria-expanded]="(active$ | async).valueOf()"
-       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
-       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
-       [class.disabled]="section.model?.disabled">
+<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+     [id]="'expandable-navbar-section-' + section.id"
+     (mouseenter)="onMouseEnter($event)"
+     (mouseleave)="onMouseLeave($event)"
+     data-test="navbar-section-wrapper">
+  <a href="javascript:void(0);" routerLinkActive="active"
+     role="menuitem"
+     (keyup.enter)="toggleSection($event)"
+     (keyup.space)="toggleSection($event)"
+     (click)="toggleSection($event)"
+     (keydown)="keyDown($event)"
+     aria-haspopup="menu"
+     data-test="navbar-section-toggler"
+     [attr.aria-expanded]="(active$ | async).valueOf()"
+     [attr.aria-controls]="expandableNavbarSectionId()"
+     class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+     [class.disabled]="section.model?.disabled">
       <span class="flex-fill">
         <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
       </span>
-      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
-    </a>
-    <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
-        [id]="expandableNavbarSectionId(section.id)"
-        role="menu"
-        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-      <div @slide role="presentation">
-        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-              <ng-container
-                      *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-          </div>
+    <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+  </a>
+  <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
+       [id]="expandableNavbarSectionId()"
+       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       (dsHoverOutside)="deactivateSection($event, false)"
+       role="menu"
+       class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+    <div @slide role="presentation">
+      <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+        <ng-container
+          *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
       </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 1921737201..fb891dbbf3 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Inject, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Inject, Injector, OnInit, ViewChild, AfterViewChecked, ElementRef } from '@angular/core';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { slide } from '../../shared/animations/slide';
@@ -6,6 +6,7 @@ import { first } from 'rxjs/operators';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
 import { Observable } from 'rxjs';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 
 /**
  * Represents an expandable section in the navbar
@@ -16,7 +17,10 @@ import { Observable } from 'rxjs';
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide]
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
+
+  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+
   /**
    * This section resides in the Public Navbar
    */
@@ -37,6 +41,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   isMobile$: Observable<boolean>;
 
+  /**
+   * Boolean used to add the event listeners to the items in the expandable menu when expanded. This is done for
+   * performance reasons, there is currently an *ngIf on the menu to prevent the {@link HoverOutsideDirective} to tank
+   * performance when not expanded.
+   */
+  addArrowEventListeners = false;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -51,17 +62,33 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     });
   }
 
-  constructor(@Inject('sectionDataProvider') menuSection,
-              protected menuService: MenuService,
-              protected injector: Injector,
-              private windowService: HostWindowService
+  constructor(
+    @Inject('sectionDataProvider') public section: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected windowService: HostWindowService,
   ) {
-    super(menuSection, menuService, injector);
+    super(section, menuService, injector);
     this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
     super.ngOnInit();
+    this.subs.push(this.active$.subscribe((active: boolean) => {
+      if (active === true) {
+        this.addArrowEventListeners = true;
+      }
+    }));
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.addArrowEventListeners) {
+      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach(item => {
+        item.addEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.addArrowEventListeners = false;
+    }
   }
 
   /**
@@ -96,9 +123,54 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   /**
    * returns the ID of the DOM element representing the navbar section
-   * @param sectionId
    */
-  expandableNavbarSectionId(sectionId: string) {
-    return `expandable-navbar-section-${sectionId}-dropdown`;
+  expandableNavbarSectionId(): string {
+    return `expandable-navbar-section-${this.section.id}-dropdown`;
+  }
+
+  /**
+   * Handles the navigation between the menu items
+   *
+   * @param event
+   */
+  navigateDropdown(event: KeyboardEvent): void {
+    if (event.key === 'Tab') {
+      this.deactivateSection(event, false);
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+
+    const items: NodeListOf<Element> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+    if (items.length === 0) {
+      return;
+    }
+    const currentIndex: number = Array.from(items).findIndex((item: Element) => item === event.target);
+
+    if (event.key === 'ArrowDown') {
+      (items[(currentIndex + 1) % items.length] as HTMLElement).focus();
+    } else if (event.key === 'ArrowUp') {
+      (items[(currentIndex - 1 + items.length) % items.length] as HTMLElement).focus();
+    }
+  }
+
+  /**
+   * Handles all the keydown events on the dropdown toggle
+   *
+   * @param event
+   */
+  keyDown(event: KeyboardEvent): void {
+    switch (event.code) {
+      // Works for both Tab & Shift Tab
+      case 'Tab':
+        this.deactivateSection(event, false);
+        break;
+      case 'ArrowDown':
+        this.navigateDropdown(event);
+        break;
+      case 'Space':
+        event.preventDefault();
+        break;
+    }
   }
 }
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index de3244099d..d282c42a07 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -13,6 +13,7 @@ import { MenuModule } from '../shared/menu/menu.module';
 import { SharedModule } from '../shared/shared.module';
 import { FormsModule } from '@angular/forms';
 import { ThemedNavbarComponent } from './themed-navbar.component';
+import { HoverOutsideDirective } from '../shared/utils/hover-outside.directive';
 
 const effects = [
   NavbarEffects
@@ -25,6 +26,10 @@ const ENTRY_COMPONENTS = [
   ThemedExpandableNavbarSectionComponent,
 ];
 
+const DIRECTIVES = [
+  HoverOutsideDirective,
+];
+
 @NgModule({
   imports: [
     CommonModule,
@@ -35,12 +40,14 @@ const ENTRY_COMPONENTS = [
     CoreModule.forRoot()
   ],
   declarations: [
+    ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
     NavbarComponent,
     ThemedNavbarComponent,
   ],
   providers: [],
   exports: [
+    ...DIRECTIVES,
     ThemedNavbarComponent,
     NavbarSectionComponent,
     ThemedExpandableNavbarSectionComponent
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
new file mode 100644
index 0000000000..7a4bd58540
--- /dev/null
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -0,0 +1,50 @@
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+} from '@angular/core';
+
+/**
+ * Directive to detect when the user hovers outside of the element the directive was put on
+ *
+ * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
+ * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ */
+@Directive({
+  selector: '[dsHoverOutside]',
+})
+export class HoverOutsideDirective {
+
+  /**
+   * Emits null when the user hovers outside of the element
+   */
+  @Output()
+  public dsHoverOutside = new EventEmitter();
+
+  /**
+   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
+   * element the directive was put on.
+   */
+  @Input()
+  public dsHoverOutsideOfElement: ElementRef;
+
+  constructor(
+    private elementRef: ElementRef,
+  ) {
+    this.dsHoverOutsideOfElement = this.elementRef;
+  }
+
+  @HostListener('document:mouseover', ['$event'])
+  public onMouseOver(event: MouseEvent): void {
+    const targetElement: HTMLElement = event.target as HTMLElement;
+    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+
+    if (!hoveredInside) {
+      this.dsHoverOutside.emit(null);
+    }
+  }
+
+}

From 73285284ce434a7c8d444ca837a2f008aea2aea5 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 16:02:42 +0200
Subject: [PATCH 1166/1286] 116404: Apply focus on first item

(cherry picked from commit 2152bab717c197f7e67b8a025ea611b6515ef308)
---
 .../expandable-navbar-section.component.ts               | 9 ++++++---
 .../shared/menu/menu-section/menu-section.component.ts   | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index fb891dbbf3..de4cc46c6c 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -83,10 +83,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach(item => {
+      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
+      if (dropdownItems.length > 0) {
+        dropdownItems.item(0).focus();
+      }
       this.addArrowEventListeners = false;
     }
   }
@@ -166,7 +169,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
-        this.navigateDropdown(event);
+        this.activateSection(event);
         break;
       case 'Space':
         event.preventDefault();
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index e0464a769f..8ee40ee8c6 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -75,9 +75,12 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
   /**
    * Activate this section
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  activateSection(event: Event) {
-    event.preventDefault();
+  activateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     if (!this.section.model?.disabled) {
       this.menuService.activateSection(this.menuID, this.section.id);
     }

From 0f27ae1125ff457c58a96860f3e35deae7bdf642 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 5 Jul 2024 17:57:18 +0200
Subject: [PATCH 1167/1286] 116404: Close modal on escape

(cherry picked from commit 84df67c00bc46f6346efadb7a6cb7c068d7d36a0)
---
 .../expandable-navbar-section.component.ts                  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index de4cc46c6c..72e33b1f18 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -137,9 +137,13 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param event
    */
   navigateDropdown(event: KeyboardEvent): void {
-    if (event.key === 'Tab') {
+    if (event.code === 'Tab') {
       this.deactivateSection(event, false);
       return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
     }
     event.preventDefault();
     event.stopPropagation();

From 9c6fb1794f1329870092433a78bdcbdd0b5f5729 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 27 Oct 2024 14:11:05 +0100
Subject: [PATCH 1168/1286] 116404: Replaced ViewChild logic with a CSS
 selector

This change avoids triggering an additional change detection cycle

(cherry picked from commit f7bb83013a7b6c49fee3695668c66129b4078f5c)
---
 .../expandable-navbar-section.component.html  |  4 +-
 ...xpandable-navbar-section.component.spec.ts | 18 +++++----
 .../expandable-navbar-section.component.ts    | 39 +++++++++++++++----
 .../shared/utils/hover-outside.directive.ts   | 18 +++++----
 4 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index f8facaa82a..0af5c706b7 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,4 +1,4 @@
-<div #expandableNavbarSectionContainer class="ds-menu-item-wrapper text-md-center"
+<div class="ds-menu-item-wrapper text-md-center"
      [id]="'expandable-navbar-section-' + section.id"
      (mouseenter)="onMouseEnter($event)"
      (mouseleave)="onMouseLeave($event)"
@@ -23,7 +23,7 @@
   </a>
   <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
        [id]="expandableNavbarSectionId()"
-       [dsHoverOutsideOfElement]="expandableNavbarSection"
+       [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
        (dsHoverOutside)="deactivateSection($event, false)"
        role="menu"
        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 986dca86eb..2b7c665258 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -9,7 +9,7 @@ import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 
 describe('ExpandableNavbarSectionComponent', () => {
   let component: ExpandableNavbarSectionComponent;
@@ -20,7 +20,11 @@ describe('ExpandableNavbarSectionComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [NoopAnimationsModule],
-        declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        declarations: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
@@ -43,10 +47,6 @@ describe('ExpandableNavbarSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
     describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
         spyOn(component, 'onMouseEnter').and.callThrough();
@@ -187,7 +187,11 @@ describe('ExpandableNavbarSectionComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [NoopAnimationsModule],
-        declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        declarations: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 72e33b1f18..063b080c62 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Inject, Injector, OnInit, ViewChild, AfterViewChecked, ElementRef } from '@angular/core';
+import { Component, HostListener, Inject, Injector, OnInit, AfterViewChecked, OnDestroy } from '@angular/core';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 import { MenuService } from '../../shared/menu/menu.service';
 import { slide } from '../../shared/animations/slide';
@@ -17,9 +17,7 @@ import { MenuSection } from '../../shared/menu/menu-section.model';
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide]
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit {
-
-  @ViewChild('expandableNavbarSectionContainer') expandableNavbarSection: ElementRef;
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
 
   /**
    * This section resides in the Public Navbar
@@ -48,6 +46,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   addArrowEventListeners = false;
 
+  /**
+   * List of current dropdown items who have event listeners
+   */
+  private dropdownItems: NodeListOf<HTMLElement>;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -77,23 +80,43 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.subs.push(this.active$.subscribe((active: boolean) => {
       if (active === true) {
         this.addArrowEventListeners = true;
+      } else {
+        this.unsubscribeFromEventListeners();
       }
     }));
   }
 
   ngAfterViewChecked(): void {
     if (this.addArrowEventListeners) {
-      const dropdownItems: NodeListOf<HTMLElement> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
-      dropdownItems.forEach((item: HTMLElement) => {
+      this.dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (dropdownItems.length > 0) {
-        dropdownItems.item(0).focus();
+      if (this.dropdownItems.length > 0) {
+        this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
     }
   }
 
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.unsubscribeFromEventListeners();
+  }
+
+  /**
+   * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
+   * destruction)
+   */
+  unsubscribeFromEventListeners(): void {
+    if (this.dropdownItems) {
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.removeEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.dropdownItems = undefined;
+    }
+  }
+
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
index 7a4bd58540..fd6676cbe7 100644
--- a/src/app/shared/utils/hover-outside.directive.ts
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -8,10 +8,11 @@ import {
 } from '@angular/core';
 
 /**
- * Directive to detect when the user hovers outside of the element the directive was put on
+ * Directive to detect when the user hovers outside the element the directive was put on
  *
- * BEWARE: it's probably not good for performance to use this excessively (on {@link ExpandableNavbarSectionComponent}
- * for example, a workaround for this problem was to add an `*ngIf` to prevent this Directive from always being active)
+ * **Performance Consideration**: it's probably not good for performance to use this excessively (on
+ * {@link ExpandableNavbarSectionComponent} for example, a workaround for this problem was to add an `*ngIf` to prevent
+ * this Directive from always being active)
  */
 @Directive({
   selector: '[dsHoverOutside]',
@@ -25,22 +26,23 @@ export class HoverOutsideDirective {
   public dsHoverOutside = new EventEmitter();
 
   /**
-   * The {@link ElementRef} for which this directive should emit when the mouse leaves it. By default this will be the
-   * element the directive was put on.
+   * CSS selector for the parent element to monitor. If set, the directive will use this
+   * selector to determine if the hover event originated within the selected parent element.
+   * If left unset, the directive will monitor mouseover hover events for the element it is applied to.
    */
   @Input()
-  public dsHoverOutsideOfElement: ElementRef;
+  public dsHoverOutsideOfParentSelector: string;
 
   constructor(
     private elementRef: ElementRef,
   ) {
-    this.dsHoverOutsideOfElement = this.elementRef;
   }
 
   @HostListener('document:mouseover', ['$event'])
   public onMouseOver(event: MouseEvent): void {
     const targetElement: HTMLElement = event.target as HTMLElement;
-    const hoveredInside = this.dsHoverOutsideOfElement.nativeElement.contains(targetElement);
+    const element: Element = document.querySelector(this.dsHoverOutsideOfParentSelector);
+    const hoveredInside = (element ? new ElementRef(element) : this.elementRef).nativeElement.contains(targetElement);
 
     if (!hoveredInside) {
       this.dsHoverOutside.emit(null);

From 6f9c55d250420fddf3f1fd26f6dab389ef7b2c10 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 28 Jan 2025 00:11:50 +0100
Subject: [PATCH 1169/1286] 116404: Prevent the opening from the modal using
 mouse interactions from automatically focussing on the first element

(cherry picked from commit 82ed3aadff3203a58087530a483d97fdf62adf2a)
---
 ...xpandable-navbar-section.component.spec.ts | 141 ++++++++++++++++--
 .../expandable-navbar-section.component.ts    |  22 ++-
 .../menu-section/menu-section.component.ts    |   8 +-
 3 files changed, 153 insertions(+), 18 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index 2b7c665258..f8bb35b57c 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,12 +1,14 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync, fakeAsync, flush } from '@angular/core/testing';
 
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 import { By } from '@angular/platform-browser';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { Component } from '@angular/core';
+import { Component, DebugElement } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
+import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
@@ -28,14 +30,10 @@ describe('ExpandableNavbarSectionComponent', () => {
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-        ]
-      }).overrideComponent(ExpandableNavbarSectionComponent, {
-        set: {
-          entryComponents: [TestComponent]
-        }
-      })
-        .compileComponents();
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+          TestComponent,
+        ],
+      }).compileComponents();
     }));
 
     beforeEach(() => {
@@ -143,6 +141,8 @@ describe('ExpandableNavbarSectionComponent', () => {
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
         spyOn(component, 'toggleSection').and.callThrough();
         spyOn(menuService, 'toggleActiveSection');
@@ -151,15 +151,27 @@ describe('ExpandableNavbarSectionComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
-        // dispatch the (keyup.space) action used in our component HTML
-        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
       it('should call toggleSection on the menuService', () => {
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { code: 'Space', key: ' ' }));
+
         expect(component.toggleSection).toHaveBeenCalled();
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Space', key: ' ' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
@@ -181,6 +193,105 @@ describe('ExpandableNavbarSectionComponent', () => {
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
+
+    describe('when enter is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
+      beforeEach(() => {
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+      });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Enter' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
+    });
+
+    describe('when arrow down is pressed on section header', () => {
+      it('should call activateSection', () => {
+        spyOn(component, 'activateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'ArrowDown' }));
+
+        expect(component.focusOnFirstChildSection).toBe(true);
+        expect(component.activateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('when tab is pressed on section header', () => {
+      it('should call deactivateSection', () => {
+        spyOn(component, 'deactivateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(component.deactivateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('navigateDropdown', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([
+          Object.assign(new MenuSection(), {
+            id: 'subSection1',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+          Object.assign(new MenuSection(), {
+            id: 'subSection2',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+        ]));
+        component.ngOnInit();
+        flush();
+        fixture.detectChanges();
+        component.focusOnFirstChildSection = true;
+        component.active$.next(true);
+        fixture.detectChanges();
+      }));
+
+      it('should close the modal on Tab', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+
+      it('should close the modal on Escape', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('on smaller, mobile screens', () => {
@@ -265,7 +376,9 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: `
+    <a role="menuitem">link</a>
+  `,
 })
 class TestComponent {
 }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 063b080c62..c4842bbb44 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -29,6 +29,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   mouseEntered = false;
 
+  /**
+   * Whether the section was expanded
+   */
+  focusOnFirstChildSection = false;
+
   /**
    * True if screen size was small before a resize event
    */
@@ -81,6 +86,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       if (active === true) {
         this.addArrowEventListeners = true;
       } else {
+        this.focusOnFirstChildSection = undefined;
         this.unsubscribeFromEventListeners();
       }
     }));
@@ -92,7 +98,7 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       this.dropdownItems.forEach((item: HTMLElement) => {
         item.addEventListener('keydown', this.navigateDropdown.bind(this));
       });
-      if (this.dropdownItems.length > 0) {
+      if (this.focusOnFirstChildSection && this.dropdownItems.length > 0) {
         this.dropdownItems.item(0).focus();
       }
       this.addArrowEventListeners = false;
@@ -104,6 +110,18 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     this.unsubscribeFromEventListeners();
   }
 
+  /**
+   * Activate this section if it's currently inactive, deactivate it when it's currently active.
+   * Also saves whether this toggle was performed by a keyboard event (non-click event) in order to know if thi first
+   * item should be focussed when activating a section.
+   *
+   *  @param {Event} event The user event that triggered this method
+   */
+  override toggleSection(event: Event): void {
+    this.focusOnFirstChildSection = event.type !== 'click';
+    super.toggleSection(event);
+  }
+
   /**
    * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
    * destruction)
@@ -196,9 +214,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
         this.deactivateSection(event, false);
         break;
       case 'ArrowDown':
+        this.focusOnFirstChildSection = true;
         this.activateSection(event);
         break;
       case 'Space':
+      case 'Enter':
         event.preventDefault();
         break;
     }
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 8ee40ee8c6..8988d53fe1 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -55,9 +55,11 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
-      this.active$.next(isActive);
-    });
+    this.subs.push(this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      if (this.active$.value !== isActive) {
+        this.active$.next(isActive);
+      }
+    }));
     this.initializeInjectorData();
   }
 

From a3b7125ef9b6280b44dcfbc448b19e2e94478f64 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Tue, 19 Nov 2024 11:42:38 +0100
Subject: [PATCH 1170/1286] [DURACOM-304] Refactored item-bitstreams.component
 by removing page size of 9999

---
 .../item-bitstreams.component.html            |  3 ++
 .../item-bitstreams.component.ts              | 54 +++++++++++++++----
 src/assets/i18n/en.json5                      |  2 +
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index dc2555469b..9c9b7b1c74 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -39,6 +39,9 @@
                                    [isFirstTable]="isFirst"
                                    aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
+    <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
+      <div class="btn btn-link py-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</div>
+    </div>
   </div>
   <div *ngIf="bundles?.length === 0"
        class="alert alert-info w-100 d-inline-block mt-4" role="alert">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index fe929c452a..4b1d39071c 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, NgZone, OnDestroy, HostListener } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 import { map, switchMap, take } from 'rxjs/operators';
-import { Observable, Subscription, combineLatest } from 'rxjs';
+import { Observable, Subscription, combineLatest, BehaviorSubject, tap } from 'rxjs';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -23,6 +23,7 @@ import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/res
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { ItemBitstreamsService } from './item-bitstreams.service';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { PaginationComponentOptions } from "../../../shared/pagination/pagination-component-options.model";
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -40,7 +41,16 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   /**
    * The currently listed bundles
    */
-  bundles$: Observable<Bundle[]>;
+  private bundlesSubject = new BehaviorSubject<Bundle[]>([]);
+
+  /**
+   * The page options to use for fetching the bundles
+   */
+  bundlesOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'bundles-pagination-options',
+    currentPage: 1,
+    pageSize: 10,
+  });
 
   /**
    * The bootstrap sizes used for the columns within this table
@@ -64,6 +74,18 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   isProcessingMoveRequest: Observable<boolean>;
 
+  /**
+   * The flag indicating to show the load more link
+   */
+  showLoadMoreLink$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The list of bundles for the current item as an observable
+   */
+  get bundles$(): Observable<Bundle[]> {
+    return this.bundlesSubject.asObservable();
+  }
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
@@ -88,14 +110,8 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    const bundlesOptions = this.itemBitstreamsService.getInitialBundlesPaginationOptions();
     this.isProcessingMoveRequest = this.itemBitstreamsService.getPerformingMoveRequest$();
-
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: bundlesOptions})).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
-    );
+    this.loadBundles(1);
   }
 
   /**
@@ -160,6 +176,26 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.notificationsPrefix = 'item.edit.bitstreams.notifications.';
   }
 
+  /**
+   * Load bundles for the current item
+   * @param currentPage The current page to load
+   */
+  loadBundles(currentPage?: number) {
+    this.bundlesOptions = Object.assign(new PaginationComponentOptions(), this.bundlesOptions, {
+      currentPage: currentPage || this.bundlesOptions.currentPage + 1,
+    });
+    this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({pagination: this.bundlesOptions})).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      tap((bundlesPL: PaginatedList<Bundle>) =>
+        this.showLoadMoreLink$.next(bundlesPL.pageInfo.currentPage < bundlesPL.pageInfo.totalPages)
+      ),
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
+    ).subscribe((bundles: Bundle[]) => {
+      this.bundlesSubject.next([...this.bundlesSubject.getValue(), ...bundles]);
+    });
+  }
+
 
   /**
    * Submit the current changes
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 18b14e6c5f..34ea18ab71 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2058,6 +2058,8 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
+  "item.edit.bitstreams.load-more.link": "Load more",
+
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",

From 4536d9c74ddfa1f63a1be04d4952789b2664a391 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Tue, 19 Nov 2024 15:38:50 +0100
Subject: [PATCH 1171/1286] [DURACOM-304] Refactored
 edit-bitstream-page.component by removing page size of 9999

---
 .../edit-bitstream-page.component.ts          | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b77d2151a9..f8a1718e16 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -2,7 +2,14 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest, EMPTY,
+  expand,
+  Observable,
+  of as observableOf, reduce,
+  Subscription
+} from 'rxjs';
 import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
@@ -113,7 +120,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * Options for fetching all bitstream formats
    */
-  findAllOptions = { elementsPerPage: 9999 };
+  findAllOptions = {
+    elementsPerPage: 20,
+    currentPage: 1
+  };
 
   /**
    * The Dynamic Input Model for the file's name
@@ -396,14 +406,27 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
-    const bitstream$ = this.bitstreamRD$.pipe(
+    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions).pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
+      expand((response: RemoteData<PaginatedList<BitstreamFormat>>) => {
+        const pageInfo = response.payload.pageInfo;
+        if (pageInfo.currentPage < pageInfo.totalPages) {
+          const nextPageOptions = { ...this.findAllOptions, currentPage: pageInfo.currentPage + 1 };
+          return this.bitstreamFormatService.findAll(nextPageOptions).pipe(getFirstSucceededRemoteData());
+        } else {
+          return EMPTY;
+        }
+      }),
     );
 
-    const allFormats$ = this.bitstreamFormatsRD$.pipe(
+    const bitstreamFormats$ = this.bitstreamFormatsRD$.pipe(
+      reduce((acc: BitstreamFormat[], response: RemoteData<PaginatedList<BitstreamFormat>>) => {
+          return acc.concat(response.payload.page);
+        }, [])
+    )
+
+    const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     );
@@ -426,14 +449,14 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$,
+        bitstreamFormats$,
         bundle$,
         primaryBitstream$,
         item$,
       ).pipe()
         .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
           this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats.page;
+          this.formats = allFormats;
           this.bundle = bundle;
           // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
           // be a success response, but empty

From 2b583778300e7e1dddb57f1c40b9f7b945c76eab Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Wed, 20 Nov 2024 15:23:09 +0100
Subject: [PATCH 1172/1286] [DURACOM-304] Refactored scripts-select.component
 by using infinite scroll instead of page size 9999

---
 .../scripts-select.component.html             | 58 +++++++----
 .../scripts-select.component.scss             | 23 +++++
 .../scripts-select.component.ts               | 95 +++++++++++++------
 3 files changed, 133 insertions(+), 43 deletions(-)

diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 9cd86d1a6d..8b040308c4 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -1,20 +1,46 @@
-<div class="form-group" *ngIf="scripts$ | async">
-    <label for="process-script">{{'process.new.select-script' | translate}}</label>
-    <select required id="process-script"
-            class="form-control"
-            name="script"
-            [(ngModel)]="selectedScript"
-            #script="ngModel">
-        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
-        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
-            {{script.name}}
-        </option>
-    </select>
-
+<div class="d-flex w-100 flex-column gap-3">
+  <div>
+    <div ngbDropdown class="d-flex">
+      <input id="process-script"
+             class="form-control"
+             required
+             [ngModel]="selectedScript"
+             placeholder="{{'process.new.select-script.placeholder' | translate}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
+            role="menu"
+            (scroll)="onScroll($event)"
+            infiniteScroll
+            [infiniteScrollDistance]="5"
+            [infiniteScrollThrottle]="300"
+            [infiniteScrollUpDistance]="1.5"
+            [fromRoot]="true"
+            [scrollWindow]="false">
+            <button class="dropdown-item"
+                    *ngFor="let script of scripts"
+                    role="menuitem"
+                    type="button"
+                    title="{{ script.name }}"
+                    (click)="onSelect(script);">
+              <span class="text-truncate">{{ script.name }}</span>
+            </button>
+          <ng-container *ngIf="(isLoading$ | async)">
+            <button class="dropdown-item disabled" role="menuitem">
+              <ds-loading message="{{'loading.default' | translate}}">
+              </ds-loading>
+            </button>
+          </ng-container>
+      </div>
+    </div>
+  </div>
+  <div>
     <div *ngIf="script.invalid && (script.dirty || script.touched)"
          class="alert alert-danger validation-error">
-        <div *ngIf="script.errors.required">
-            {{'process.new.select-script.required' | translate}}
-        </div>
+      <div *ngIf="script.errors.required">
+        {{ 'process.new.select-script.required' | translate }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
index e69de29bb2..4f9ca62310 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.scss
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.scss
@@ -0,0 +1,23 @@
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
+
+li:not(:last-of-type) .dropdown-item {
+  border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
+}
+
+#entityControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 4c7fe3bdf7..c2d74938d7 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,14 +1,19 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { Script } from '../../scripts/script.model';
-import { Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription, tap } from 'rxjs';
 import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  getRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData
+} from '../../../core/shared/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { hasNoValue, hasValue } from '../../../shared/empty.util';
 import { ControlContainer, NgForm } from '@angular/forms';
 import { controlContainerFactory } from '../process-form.component';
+import { FindListOptions } from "../../../core/data/find-list-options.model";
 
 const SCRIPT_QUERY_PARAMETER = 'script';
 
@@ -31,10 +36,20 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
    * All available scripts
    */
-  scripts$: Observable<Script[]>;
+  scripts: Script[] = [];
+
   private _selectedScript: Script;
   private routeSub: Subscription;
 
+  private _isLastPage = false;
+
+  scriptOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
   constructor(
     private scriptService: ScriptDataService,
     private router: Router,
@@ -47,31 +62,46 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Checks if the route contains a script ID and auto selects this scripts
    */
   ngOnInit() {
-    this.scripts$ = this.scriptService.findAll({ elementsPerPage: 9999 })
-      .pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
-      );
+    this.loadScripts();
+  }
 
-    this.routeSub = this.route.queryParams
-      .pipe(
-        filter((params: Params) => hasNoValue(params.id)),
-        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
-        distinctUntilChanged(),
-        switchMap((id: string) =>
-          this.scripts$
-            .pipe(
-              take(1),
-              map((scripts) =>
-                scripts.find((script) => script.id === id)
-              )
-            )
-        )
-      ).subscribe((script: Script) => {
-        this._selectedScript = script;
-        this.select.emit(script);
-      });
+  /**
+   * Load the scripts and check if the route contains a script
+   */
+  loadScripts() {
+    if (this.isLoading$.value) return;
+    this.isLoading$.next(true);
+
+    this.routeSub = this.scriptService.findAll(this.scriptOptions).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((paginatedList: PaginatedList<Script>) => {
+        this._isLastPage = paginatedList?.pageInfo?.currentPage >= paginatedList?.pageInfo?.totalPages;
+      }),
+      map((paginatedList: PaginatedList<Script>) => paginatedList.page),
+    ).subscribe((newScripts: Script[]) => {
+      this.scripts = [...this.scripts, ...newScripts];
+      this.isLoading$.next(false);
+
+      const param = this.route.snapshot.queryParams[SCRIPT_QUERY_PARAMETER];
+      if (hasValue(param)) {
+        this._selectedScript = this.scripts.find((script) => script.id === param);
+        this.select.emit(this._selectedScript);
+      }
+    });
+  }
+
+  /**
+   * Load more scripts when the user scrolls to the bottom of the list
+   * @param event The scroll event
+   */
+  onScroll(event: any) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading$.value && !this._isLastPage) {
+        this.scriptOptions.currentPage++;
+        this.loadScripts();
+      }
+    }
   }
 
   /**
@@ -93,6 +123,17 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     );
   }
 
+  selectScript(script: Script) {
+    this._selectedScript = script;
+  }
+
+  onSelect(newScript: Script) {
+    this.selectScript(newScript);
+    // this._selectedScript = newScript;
+    this.select.emit(newScript);
+    this.selectedScript = newScript.name;
+  }
+
   @Input()
   set script(value: Script) {
      this._selectedScript = value;

From c3b265d2130eb7d7e6c67a67ace5faa139e975cb Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Wed, 20 Nov 2024 15:39:05 +0100
Subject: [PATCH 1173/1286] [DURACOM-304] Refactored dynamic-list.component.ts
 by removing page size of 9999

---
 .../models/list/dynamic-list.component.ts     | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 16c46fc26b..3ed279e518 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -17,6 +17,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { EMPTY, expand, reduce } from "rxjs";
 
 export interface ListItem {
   id: string;
@@ -112,18 +113,33 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
-      const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1
+
+      const initialPageInfo: PageInfo = new PageInfo({
+        elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
-        getFirstSucceededRemoteDataPayload()
-      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
+
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, initialPageInfo).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        expand((entries: PaginatedList<VocabularyEntry>) => {
+          if (entries.pageInfo.currentPage < entries.pageInfo.totalPages) {
+            const nextPageInfo: PageInfo = new PageInfo({
+              elementsPerPage: 20, currentPage: entries.pageInfo.currentPage + 1,
+            } as PageInfo);
+            return this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, nextPageInfo).pipe(
+              getFirstSucceededRemoteDataPayload()
+            );
+          } else {
+            return EMPTY;
+          }
+        }),
+        reduce((acc: VocabularyEntry[], entries: PaginatedList<VocabularyEntry>) => acc.concat(entries.page), [])
+      ).subscribe((allEntries: VocabularyEntry[]) => {
         let groupCounter = 0;
         let itemsPerGroup = 0;
         let tempList: ListItem[] = [];
-        this.optionsList = entries.page;
+        this.optionsList = allEntries;
         // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        entries.page.forEach((option: VocabularyEntry, key: number) => {
+        allEntries.forEach((option: VocabularyEntry, key: number) => {
           const value = option.authority || option.value;
           const checked: boolean = isNotEmpty(findKey(
             this.model.value,

From 39221304345893902d4050d84b8383dae74a9dd1 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Wed, 20 Nov 2024 16:51:04 +0100
Subject: [PATCH 1174/1286] [DURACOM-304] Refactored
 relationship-type-data.service.ts by removing page size of 9999

---
 .../data/relationship-type-data.service.ts    | 73 +++++++++++--------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 81612d0278..b8f32bdc44 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, EMPTY, expand, from, Observable, reduce } from 'rxjs';
 import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
@@ -62,34 +62,49 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
    */
   getRelationshipTypeByLabelAndTypes(relationshipTypeLabel: string, firstItemType: string, secondItemType: string): Observable<RelationshipType> {
     // Retrieve all relationship types from the server in a single page
-    return this.findAllData.findAll({ currentPage: 1, elementsPerPage: 9999 }, true, true, followLink('leftType'), followLink('rightType'))
-               .pipe(
-                 getFirstSucceededRemoteData(),
-                 // Emit each type in the page array separately
-                 switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
-                 // Check each type individually, to see if it matches the provided types
-                 mergeMap((relationshipType: RelationshipType) => {
-                   if (relationshipType.leftwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, firstItemType, secondItemType);
-                   } else if (relationshipType.rightwardType === relationshipTypeLabel) {
-                     return this.checkType(relationshipType, secondItemType, firstItemType);
-                   } else {
-                     return [null];
-                   }
-                 }),
-                 // Wait for all types to be checked and emit once, with the results combined back into an
-                 // array
-                 toArray(),
-                 // Look for a match in the array and emit it if found, or null if one isn't found
-                 map((types: RelationshipType[]) => {
-                   const match = types.find((type: RelationshipType) => hasValue(type));
-                   if (hasValue(match)) {
-                     return match;
-                   } else {
-                     return null;
-                   }
-                 }),
-               );
+    const initialPageInfo = { currentPage: 1, elementsPerPage: 20 };
+    return this.findAllData.findAll(initialPageInfo, true, true, followLink('leftType'), followLink('rightType'))
+      .pipe(
+        getFirstSucceededRemoteData(),
+        // Emit each type in the page array separately
+        expand((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => {
+          const currentPage = typeListRD.payload.pageInfo.currentPage;
+          const totalPages = typeListRD.payload.pageInfo.totalPages;
+          if (currentPage < totalPages) {
+            const nextPageInfo = { currentPage: currentPage + 1, elementsPerPage: 20 };
+            return this.findAllData.findAll(nextPageInfo, true, true, followLink('leftType'), followLink('rightType')).pipe(
+              getFirstSucceededRemoteData()
+            );
+          } else {
+            return EMPTY;
+          }
+        }),
+        // Collect all pages into a single array
+        reduce((acc: RelationshipType[], typeListRD: RemoteData<PaginatedList<RelationshipType>>) => acc.concat(typeListRD.payload.page), []),
+        mergeMap((relationshipTypes: RelationshipType[]) => from(relationshipTypes)),
+        // Check each type individually, to see if it matches the provided types
+        mergeMap((relationshipType: RelationshipType) => {
+          if (relationshipType.leftwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, firstItemType, secondItemType);
+          } else if (relationshipType.rightwardType === relationshipTypeLabel) {
+            return this.checkType(relationshipType, secondItemType, firstItemType);
+          } else {
+            return [null];
+          }
+        }),
+        // Wait for all types to be checked and emit once, with the results combined back into an
+        // array
+        toArray(),
+        // Look for a match in the array and emit it if found, or null if one isn't found
+        map((types: RelationshipType[]) => {
+          const match = types.find((type: RelationshipType) => hasValue(type));
+          if (hasValue(match)) {
+            return match;
+          } else {
+            return null;
+          }
+        }),
+      );
   }
 
   /**

From 8453b667cb4fee488364d7ab934c983be838d68b Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 10:15:00 +0100
Subject: [PATCH 1175/1286] [DURACOM-304] removed unneeded selectAll method
 (dynamic-lookup-relation-search-tab.component)

---
 ...okup-relation-search-tab.component.spec.ts | 12 -------
 ...ic-lookup-relation-search-tab.component.ts | 32 +------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index f689743156..61cf8274e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -155,18 +155,6 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     });
   });
 
-  describe('selectAll', () => {
-    beforeEach(() => {
-      spyOn(component.selectObject, 'emit');
-      component.selectAll();
-    });
-
-    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
-      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
-      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
-    });
-  });
-
   describe('deselectAll', () => {
     beforeEach(() => {
       spyOn(component.deselectObject, 'emit');
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 24b5ae3595..2600f8c16e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -6,12 +6,11 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
 import { hasValue } from '../../../../../empty.util';
-import { map, mapTo, switchMap, take, tap } from 'rxjs/operators';
+import { take} from 'rxjs/operators';
 import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { Context } from '../../../../../../core/shared/context.model';
@@ -204,35 +203,6 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectableListService.deselect(this.listId, page);
   }
 
-  /**
-   * Select all items that were found using the current search query
-   */
-  selectAll() {
-    this.allSelected = true;
-    this.selectAllLoading = true;
-    const fullPagination = Object.assign(new PaginationComponentOptions(), {
-      currentPage: 1,
-      pageSize: 9999
-    });
-    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search<Item>(fullSearchConfig);
-    results$.pipe(
-      getFirstSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page),
-      tap(() => this.selectAllLoading = false),
-      switchMap((results) => this.selection$.pipe(
-        take(1),
-        tap((selection: SearchResult<Item>[]) => {
-          const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
-          this.selectObject.emit(...filteredResults);
-        }),
-        mapTo(results)
-      ))
-    ).subscribe((results) => {
-        this.selectableListService.select(this.listId, results);
-    });
-  }
-
   /**
    * setSelectedIds select all the items from the results that have relationship
    * @param idOfItems the uuid of items that are being checked

From 62924cc5e031fdcc6900eba1c2610f3eec5d67b5 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 12:00:17 +0100
Subject: [PATCH 1176/1286] [DURACOM-304] Refactored
 submission-section-cc-licenses.component.ts by removing page size of 9999

---
 ...ubmission-section-cc-licenses.component.ts | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index c8cd898f96..e1b6a005aa 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { EMPTY, expand, Observable, of as observableOf, reduce, Subscription } from 'rxjs';
 import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import {
   getFirstCompletedRemoteData,
@@ -20,6 +20,8 @@ import { isNotEmpty } from '../../../shared/empty.util';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
+import { RemoteData } from "../../../core/data/remote-data";
+import { PaginatedList } from "../../../core/data/paginated-list.model";
 
 /**
  * This component represents the submission section to select the Creative Commons license.
@@ -263,12 +265,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ elementsPerPage: 9999 }).pipe(
+      this.submissionCcLicensesDataService.findAll({ currentPage: 1, elementsPerPage: 20 }).pipe(
         getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((list) => list.page),
+        expand((typeListRD: RemoteData<PaginatedList<SubmissionCcLicence>>) => {
+          const currentPage = typeListRD.payload.pageInfo.currentPage;
+          const totalPages = typeListRD.payload.pageInfo.totalPages;
+          if (currentPage < totalPages) {
+            const nextPageInfo = { currentPage: currentPage + 1, elementsPerPage: 20 };
+            return this.submissionCcLicensesDataService.findAll(nextPageInfo).pipe(
+              getFirstSucceededRemoteData()
+            );
+          } else {
+            return EMPTY;
+          }
+        }),
+        reduce((acc: SubmissionCcLicence[], typeListRD: RemoteData<PaginatedList<SubmissionCcLicence>>) => acc.concat(typeListRD.payload.page), []),
       ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses
+        (licenses) => {
+          this.submissionCcLicenses = licenses;
+        },
       ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),

From 3f5de295a72a07d15c9649b7fd484ba60d09b142 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 12:29:54 +0100
Subject: [PATCH 1177/1286] [DURACOM-304] test fix

---
 .../form/scripts-select/scripts-select.component.spec.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 72dc4c9348..3250a65367 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -74,7 +74,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
@@ -88,7 +88,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();

From 0108f525ba9d779c5ef12b9a045f738363cba276 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 14:52:40 +0100
Subject: [PATCH 1178/1286] [DURACOM-304] fix accessibility issue on
 scripts-select

---
 .../form/scripts-select/scripts-select.component.html            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 8b040308c4..6b521e8d40 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -8,6 +8,7 @@
              placeholder="{{'process.new.select-script.placeholder' | translate}}"
              [ngModelOptions]="{standalone: true}"
              ngbDropdownToggle
+             role="button"
              #script="ngModel">
       <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
             role="menu"

From eaff0b13972587d324d89b9dfa0ebfd9bdb9553f Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 15:31:41 +0100
Subject: [PATCH 1179/1286] [DURACOM-304] Refactor of bundle-data.service.ts by
 removing page size of 9999

---
 src/app/core/data/bitstream-data.service.ts | 37 ++++++++++++++++-
 src/app/core/data/bundle-data.service.ts    | 46 ++++++++++++++++++++-
 2 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index bb4ec28166..e1ea61beed 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,13 +1,14 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, EMPTY } from 'rxjs';
 import { find, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { FollowLinkConfig, followLink } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BITSTREAM } from '../shared/bitstream.resource-type';
+import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
 import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
@@ -201,6 +202,38 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
   }
 
+
+  /**
+   *
+   * Make a request to get primary bitstream
+   * in all current use cases, and having it simplifies this method
+   *
+   * @param item                        the {@link Item} the {@link Bundle} is a part of
+   * @param bundleName                  the name of the {@link Bundle} we want to find
+   *                                    {@link Bitstream}s for
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param options                     the {@link FindListOptions} for the request
+   * @return {Observable<Bitstream | null>}
+   *    Return an observable that contains primary bitstream information or null
+   */
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, options, followLink('primaryBitstream')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<Bundle>) => {
+        if (!rd.hasSucceeded) {
+          return EMPTY;
+        }
+        return rd.payload.primaryBitstream.pipe(
+          getFirstCompletedRemoteData(),
+          map((rdb: RemoteData<Bitstream>) => rdb.hasSucceeded ? rdb.payload : null),
+        );
+      }),
+    );
+  }
+
   /**
    * Make a new FindListRequest with given search method
    *
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 19f0e73706..67dd649c1f 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -75,10 +75,11 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param options                     the {@link FindListOptions} for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: 9999 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+    return this.findAllByItem(item, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
@@ -111,6 +112,47 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
     );
   }
 
+  // findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+  //   return this.findAllByItem(item, { elementsPerPage: 1, currentPage: 1 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  //     expand((rd: RemoteData<PaginatedList<Bundle>>) => {
+  //       if (rd.hasSucceeded && hasValue(rd.payload) && hasValue(rd.payload.page) && rd.payload.currentPage < rd.payload.totalPages) {
+  //         const nextPageOptions = { elementsPerPage: 1, currentPage: rd.payload.currentPage + 1 };
+  //         return this.findAllByItem(item, nextPageOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  //       } else {
+  //         return EMPTY;
+  //       }
+  //     }),
+  //     map((rd: RemoteData<PaginatedList<Bundle>>) => {
+  //       if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
+  //         const matchingBundle = rd.payload.page.find((bundle: Bundle) => bundle.name === bundleName);
+  //         if (hasValue(matchingBundle)) {
+  //           return new RemoteData(
+  //             rd.timeCompleted,
+  //             rd.msToLive,
+  //             rd.lastUpdated,
+  //             RequestEntryState.Success,
+  //             null,
+  //             matchingBundle,
+  //             200
+  //           );
+  //         } else {
+  //           return new RemoteData(
+  //             rd.timeCompleted,
+  //             rd.msToLive,
+  //             rd.lastUpdated,
+  //             RequestEntryState.Error,
+  //             `The bundle with name ${bundleName} was not found.`,
+  //             null,
+  //             404
+  //           );
+  //         }
+  //       } else {
+  //         return rd as any;
+  //       }
+  //     })
+  //   );
+  // }
+
   /**
    * Get the bitstreams endpoint for a bundle
    * @param bundleId

From b220e200534a7d4424b9cee45588601ce68b1333 Mon Sep 17 00:00:00 2001
From: Alisa Ismailati <alisa.ismailati@4science.com>
Date: Thu, 21 Nov 2024 15:40:05 +0100
Subject: [PATCH 1180/1286] [DURACOM-304] other fix related to accessibility

---
 .../form/scripts-select/scripts-select.component.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 6b521e8d40..5c161f8d8d 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -8,7 +8,7 @@
              placeholder="{{'process.new.select-script.placeholder' | translate}}"
              [ngModelOptions]="{standalone: true}"
              ngbDropdownToggle
-             role="button"
+             role="combobox"
              #script="ngModel">
       <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
             role="menu"

From b892b13529cc48d3118864d81501a79393ec0114 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 30 Jan 2025 11:53:31 +0100
Subject: [PATCH 1181/1286] [DURACOM-304] adapt call to bitstream service

---
 src/app/core/metadata/metadata.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 204c925e6b..547029afaa 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -45,6 +45,7 @@ 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';
+import { FindListOptions } from "../data/find-list-options.model";
 
 /**
  * The base selector function to select the metaTag section in the store
@@ -306,6 +307,7 @@ export class MetadataService {
         'ORIGINAL',
         true,
         true,
+        new FindListOptions(),
         followLink('primaryBitstream'),
         followLink('bitstreams', {
             findListOptions: {

From 362364136d1351db5c9d37049d0891c7236cdfe4 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 14 Jan 2025 17:42:52 +0100
Subject: [PATCH 1182/1286] [DURACOM-304] add support for findAll method in
 dynamic-scrollable-dropdown.component.ts

---
 .../edit-bitstream-page.component.html        |   6 +-
 .../edit-bitstream-page.component.spec.ts     |  19 ++-
 .../edit-bitstream-page.component.ts          | 135 ++++++++----------
 ...dynamic-scrollable-dropdown.component.html |  10 +-
 .../dynamic-scrollable-dropdown.component.ts  |  49 +++++--
 .../dynamic-scrollable-dropdown.model.ts      |  19 ++-
 6 files changed, 136 insertions(+), 102 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index b306eb2721..1ac3300bca 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
-  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
+  <div class="container">
+    <div class="row" *ngIf="bitstreamRD?.hasSucceeded">
       <div class="col-md-2">
         <ds-themed-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-themed-thumbnail>
       </div>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-themed-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+    <ds-themed-loading *ngIf="!bitstreamRD || bitstreamRD?.isLoading"
                 message="{{'loading.bitstream' | translate}}"></ds-themed-loading>
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index b83f2b9664..c81926d83d 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -239,7 +239,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should select the correct format', () => {
-        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.shortDescription);
       });
 
       it('should put the \"New Format\" input on invisible', () => {
@@ -270,7 +270,13 @@ describe('EditBitstreamPageComponent', () => {
 
     describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.updateNewFormatLayout(allFormats[0].id);
+        comp.onChange({
+          model: {
+            id: 'selectedFormat',
+            value: allFormats[0],
+          },
+        });
+        comp.updateNewFormatLayout();
       });
 
       it('should remove the invisible class from the \"New Format\" input', () => {
@@ -372,10 +378,11 @@ describe('EditBitstreamPageComponent', () => {
 
       describe('when selected format has changed', () => {
         beforeEach(() => {
-          comp.formGroup.patchValue({
-            formatContainer: {
-              selectedFormat: allFormats[2].id
-            }
+          comp.onChange({
+            model: {
+              id: 'selectedFormat',
+              value: allFormats[2],
+            },
           });
           fixture.detectChanges();
           comp.onSubmit();
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index f8a1718e16..78893c9281 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -8,7 +8,7 @@ import {
   expand,
   Observable,
   of as observableOf, reduce,
-  Subscription
+  Subscription, take
 } from 'rxjs';
 import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
@@ -33,6 +33,8 @@ import { Item } from '../../core/shared/item.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { DynamicScrollableDropdownModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { FindAllDataImpl } from "../../core/data/base/find-all-data";
 
 @Component({
   selector: 'ds-edit-bitstream-page',
@@ -51,12 +53,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-  /**
-   * The formats their remote data observable
-   * Tracks changes and updates the view
-   */
-  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
-
   /**
    * The UUID of the primary bitstream for this bundle
    */
@@ -72,11 +68,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   originalFormat: BitstreamFormat;
 
-  /**
-   * A list of all available bitstream formats
-   */
-  formats: BitstreamFormat[];
-
   /**
    * @type {string} Key prefix used to generate form messages
    */
@@ -163,9 +154,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the selected format
    */
-  selectedFormatModel = new DynamicSelectModel({
+  selectedFormatModel = new DynamicScrollableDropdownModel({
     id: 'selectedFormat',
-    name: 'selectedFormat'
+    name: 'selectedFormat',
+    displayKey: 'shortDescription',
+    repeatable: false,
+    metadataFields: [],
+    submissionId: '',
+    hasSelectableMetadata: false,
+    findAllFactory: this.findAllFormatsServiceFactory(),
+    formatFunction: (format: BitstreamFormat | string) => {
+      if (format instanceof  BitstreamFormat) {
+        return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription;
+      } else {
+        return format;
+      }
+    },
   });
 
   /**
@@ -380,6 +384,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * @private
    */
   private bundle: Bundle;
+  /**
+   * The currently selected format
+   * @private
+   */
+  private selectedFormat: BitstreamFormat;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -407,25 +416,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
 
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions).pipe(
-      getFirstSucceededRemoteData(),
-      expand((response: RemoteData<PaginatedList<BitstreamFormat>>) => {
-        const pageInfo = response.payload.pageInfo;
-        if (pageInfo.currentPage < pageInfo.totalPages) {
-          const nextPageOptions = { ...this.findAllOptions, currentPage: pageInfo.currentPage + 1 };
-          return this.bitstreamFormatService.findAll(nextPageOptions).pipe(getFirstSucceededRemoteData());
-        } else {
-          return EMPTY;
-        }
-      }),
-    );
-
-    const bitstreamFormats$ = this.bitstreamFormatsRD$.pipe(
-      reduce((acc: BitstreamFormat[], response: RemoteData<PaginatedList<BitstreamFormat>>) => {
-          return acc.concat(response.payload.page);
-        }, [])
-    )
-
     const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
@@ -446,24 +436,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       switchMap((bundle: Bundle) => bundle.item),
       getFirstSucceededRemoteDataPayload(),
     );
+    const format$ = bitstream$.pipe(
+      switchMap(bitstream => bitstream.format),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        bitstreamFormats$,
         bundle$,
         primaryBitstream$,
         item$,
-      ).pipe()
-        .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
-          this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats;
-          this.bundle = bundle;
-          // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
-          // be a success response, but empty
-          this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
-          this.itemId = item.uuid;
-          this.setIiifStatus(this.bitstream);
-        })
+        format$,
+      ).subscribe(([bitstream, bundle, primaryBitstream, item, format]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.bundle = bundle;
+        this.selectedFormat = format;
+        // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
+        // be a success response, but empty
+        this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
+        this.itemId = item.uuid;
+        this.setIiifStatus(this.bitstream);
+      }),
+      format$.pipe(take(1)).subscribe(
+        (format) => this.originalFormat = format,
+      ),
     );
 
     this.subs.push(
@@ -479,7 +476,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   setForm() {
     this.formGroup = this.formService.createFormGroup(this.formModel);
-    this.updateFormatModel();
     this.updateForm(this.bitstream);
     this.updateFieldTranslations();
   }
@@ -498,8 +494,9 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         description: bitstream.firstMetadataValue('dc.description')
       },
       formatContainer: {
-        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
-      }
+        selectedFormat: this.selectedFormat.shortDescription,
+        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
+      },
     });
     if (this.isIIIF) {
       this.formGroup.patchValue({
@@ -517,36 +514,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         }
       });
     }
-    this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload()
-    ).subscribe((format: BitstreamFormat) => {
-      this.originalFormat = format;
-      this.formGroup.patchValue({
-        formatContainer: {
-          selectedFormat: format.id
-        }
-      });
-      this.updateNewFormatLayout(format.id);
-    });
+    this.updateNewFormatLayout();
   }
 
-  /**
-   * Create the list of unknown format IDs an add options to the selectedFormatModel
-   */
-  updateFormatModel() {
-    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
-      Object.assign({
-        value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription
-      }));
-  }
 
   /**
    * Update the layout of the "Other Format" input depending on the selected format
    * @param selectedId
    */
-  updateNewFormatLayout(selectedId: string) {
-    if (this.isUnknownFormat(selectedId)) {
+  updateNewFormatLayout() {
+    if (this.isUnknownFormat()) {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
     } else {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
@@ -557,9 +534,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * Is the provided format (id) part of the list of unknown formats?
    * @param id
    */
-  isUnknownFormat(id: string): boolean {
-    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
-    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  isUnknownFormat(): boolean {
+    return hasValue(this.selectedFormat) &&  this.selectedFormat.supportLevel === BitstreamFormatSupportLevel.Unknown;
   }
 
   /**
@@ -591,7 +567,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onChange(event) {
     const model = event.model;
     if (model.id === this.selectedFormatModel.id) {
-      this.updateNewFormatLayout(model.value);
+      this.selectedFormat = model.value;
+      this.updateNewFormatLayout();
     }
   }
 
@@ -601,8 +578,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
     const updatedBitstream = this.formToBitstream(updatedValues);
-    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
-    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+    const isNewFormat = this.selectedFormat.id !== this.originalFormat.id;
     const isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
     const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
@@ -654,7 +630,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       bundle$ = observableOf(this.bundle);
     }
     if (isNewFormat) {
-      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, this.selectedFormat).pipe(
         getFirstCompletedRemoteData(),
         map((formatResponse: RemoteData<Bitstream>) => {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
@@ -812,4 +788,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
+  findAllFormatsServiceFactory() {
+    return () => this.bitstreamFormatService as any as FindAllDataImpl<BitstreamFormat>;
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index bcb83cea11..f8cdb06dac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -40,20 +40,18 @@
          (scrolled)="onScroll()"
          [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" type="button" *ngIf="optionsList && optionsList.length === 0">
-        {{ 'form.no-results' | translate }}
-      </button>
+      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
       <button class="dropdown-item collection-item text-truncate"
               (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
               title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
-              type="button">
+      >
         <i>{{ 'dropdown.clear' | translate }}</i>
       </button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
               [class.active]="i === selectedIndex"
               (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option" type="button"
-              [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+              title="{{ inputFormatter(listEntry) }}" role="option"
+              [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}
       </button>
       <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index c902807cd4..8ac5d0c2ea 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -18,7 +18,7 @@ import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dyna
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { isEmpty } from '../../../../../empty.util';
+import { hasValue, isEmpty } from '../../../../../empty.util';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
@@ -27,6 +27,8 @@ import {
 } from '../../../../../../core/data/paginated-list.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { FindAllData } from "../../../../../../core/data/base/find-all-data";
+import { CacheableObject } from "../../../../../../core/cache/cacheable-object.model";
 
 /**
  * Component representing a dropdown input field
@@ -55,6 +57,21 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public selectedIndex = 0;
   public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
+  /**
+   * If true the component can rely on the findAll method for data loading.
+   * This is a behaviour activated by dependency injection through the dropdown config.
+   * If a service that implements findAll is not provided in the config the component falls back on the standard vocabulary service.
+   *
+   * @private
+   */
+  private useFindAllService: boolean;
+  /**
+   * A service that implements FindAllData.
+   * If is provided in the config will be used for data loading in stead of the VocabularyService
+   * @private
+   */
+  private findAllService: FindAllData<CacheableObject>;
+
   constructor(protected vocabularyService: VocabularyService,
               protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
@@ -67,6 +84,9 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    * Initialize the component, setting up the init form value
    */
   ngOnInit() {
+    this.findAllService = this.model?.findAllFactory();
+    this.useFindAllService = hasValue(this.findAllService?.findAll) && typeof this.findAllService.findAll === 'function';
+
     this.updatePageInfo(this.model.maxOptions, 1);
     this.loadOptions(true);
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
@@ -75,13 +95,24 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
     });
   }
 
+  /**
+   * Get service and method to use to retrieve dropdown options
+   */
+  getDataFromService(): Observable<RemoteData<PaginatedList<CacheableObject>>> {
+    if (this.useFindAllService) {
+      return this.findAllService.findAll({ elementsPerPage: this.pageInfo.elementsPerPage, currentPage: this.pageInfo.currentPage });
+    } else {
+      return this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo);
+    }
+  }
+
   loadOptions(fromInit: boolean) {
     this.loading = true;
-    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.getDataFromService().pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
-      tap(() => this.loading = false)
-    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+      tap(() => this.loading = false),
+    ).subscribe((list: PaginatedList<CacheableObject>) => {
       this.optionsList = list.page;
         if (fromInit && this.model.value) {
           this.setCurrentValue(this.model.value, true);
@@ -101,7 +132,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
-  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
+  inputFormatter = (x: any): string => (this.model.formatFunction ? this.model.formatFunction(x) : (x.display || x.value));
 
   /**
    * Opens dropdown menu
@@ -204,7 +235,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages
       );
-      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.getDataFromService().pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
@@ -212,7 +243,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
           ))
         ),
         tap(() => this.loading = false))
-        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        .subscribe((list: PaginatedList<any>) => {
           this.optionsList = this.optionsList.concat(list.page);
           this.updatePageInfo(
             list.pageInfo.elementsPerPage,
@@ -243,7 +274,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   setCurrentValue(value: any, init = false): void {
     let result: Observable<string>;
 
-    if (init) {
+    if (init && !this.useFindAllService) {
       result = this.getInitValueFromModel().pipe(
         map((formValue: FormFieldMetadataValueObject) => formValue.display)
       );
@@ -252,6 +283,8 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         result = observableOf('');
       } else if (typeof value === 'string') {
         result = observableOf(value);
+      } else if (this.useFindAllService) {
+        result = observableOf(value[this.model.displayKey]);
       } else {
         result = observableOf(value.display);
       }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index a9974717e4..873744d870 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -1,19 +1,33 @@
 import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { FindAllDataImpl } from "../../../../../../core/data/base/find-all-data";
+import { CacheableObject } from "../../../../../../core/cache/cacheable-object.model";
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  vocabularyOptions: VocabularyOptions;
+  vocabularyOptions?: VocabularyOptions;
   maxOptions?: number;
   value?: any;
+  displayKey?: string;
+  formatFunction?: (value: any) => string;
+  findAllFactory?: () =>  FindAllDataImpl<CacheableObject>;
 }
 
 export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
 
   @serializable() maxOptions: number;
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN;
+  @serializable() displayKey: string;
+  /**
+   * Configurable function for display value formatting in input
+   */
+  formatFunction: (value: any) => string;
+  /**
+   * Factory for a service that implements FindAllData
+   */
+  findAllFactory: () =>  FindAllDataImpl<CacheableObject>;
 
   constructor(config: DynamicScrollableDropdownModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -22,6 +36,9 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     this.autoComplete = AUTOCOMPLETE_OFF;
     this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
+    this.displayKey = config.displayKey || 'display';
+    this.formatFunction = config.formatFunction;
+    this.findAllFactory = config.findAllFactory || (() => null);
   }
 
 }

From a3ebfc0f3662a8ff6eb32ac70fd7dd8993111da1 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 30 Jan 2025 12:02:29 +0100
Subject: [PATCH 1183/1286] [DURACOM-304] fix missing import

---
 .../scrollable-dropdown/dynamic-scrollable-dropdown.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 8ac5d0c2ea..4e5977b1c1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -29,6 +29,7 @@ import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { FindAllData } from "../../../../../../core/data/base/find-all-data";
 import { CacheableObject } from "../../../../../../core/cache/cacheable-object.model";
+import { RemoteData } from "../../../../../../core/data/remote-data";
 
 /**
  * Component representing a dropdown input field

From bc068399269e3ecf113addbc4af00f3d4499e249 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 15 Jan 2025 17:01:07 +0100
Subject: [PATCH 1184/1286] [DURACOM-304] improve loading logic for cc-licenses
 section and dynamic-list

---
 .../models/list/dynamic-list.component.html   |   6 +-
 .../models/list/dynamic-list.component.ts     | 130 ++++++++++--------
 ...mission-section-cc-licenses.component.html |  69 +++++-----
 ...mission-section-cc-licenses.component.scss |  10 ++
 ...sion-section-cc-licenses.component.spec.ts |   4 +-
 ...ubmission-section-cc-licenses.component.ts |  80 +++++++----
 src/assets/i18n/en.json5                      |   2 +
 7 files changed, 181 insertions(+), 120 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 728c59aa46..2407a74022 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -62,6 +62,10 @@
       </div>
       <br>
     </div>
-
   </div>
+
+  <div class="d-flex justify-content-center" *ngIf="(showLoadMore$ | async)">
+    <div *ngIf="(showLoadMore$ | async)" class="btn btn-link py-3" (click)="loadEntries()">{{'dynamic-list.load-more' | translate}}</div>
+  </div>
+
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 3ed279e518..2dcc1cb023 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -44,7 +44,9 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: VocabularyEntry[];
+  public showLoadMore$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  protected optionsList: VocabularyEntry[] = [];
+  private nextPageInfo: PageInfo;
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -60,7 +62,7 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   ngOnInit() {
     if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
-      this.setOptionsFromVocabulary();
+      this.initOptionsFromVocabulary();
     }
   }
 
@@ -107,70 +109,18 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   /**
    * Setting up the field options from vocabulary
    */
-  protected setOptionsFromVocabulary() {
+  protected initOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
 
-      const initialPageInfo: PageInfo = new PageInfo({
+      this.nextPageInfo = new PageInfo({
         elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
 
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, initialPageInfo).pipe(
-        getFirstSucceededRemoteDataPayload(),
-        expand((entries: PaginatedList<VocabularyEntry>) => {
-          if (entries.pageInfo.currentPage < entries.pageInfo.totalPages) {
-            const nextPageInfo: PageInfo = new PageInfo({
-              elementsPerPage: 20, currentPage: entries.pageInfo.currentPage + 1,
-            } as PageInfo);
-            return this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, nextPageInfo).pipe(
-              getFirstSucceededRemoteDataPayload()
-            );
-          } else {
-            return EMPTY;
-          }
-        }),
-        reduce((acc: VocabularyEntry[], entries: PaginatedList<VocabularyEntry>) => acc.concat(entries.page), [])
-      ).subscribe((allEntries: VocabularyEntry[]) => {
-        let groupCounter = 0;
-        let itemsPerGroup = 0;
-        let tempList: ListItem[] = [];
-        this.optionsList = allEntries;
-        // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        allEntries.forEach((option: VocabularyEntry, key: number) => {
-          const value = option.authority || option.value;
-          const checked: boolean = isNotEmpty(findKey(
-            this.model.value,
-            (v) => v.value === option.value));
-
-          const item: ListItem = {
-            id: `${this.model.id}_${value}`,
-            label: option.display,
-            value: checked,
-            index: key
-          };
-          if (this.model.repeatable) {
-            this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
-          } else {
-            (this.model as DynamicListRadioGroupModel).options.push({
-              label: item.label,
-              value: option
-            });
-          }
-          tempList.push(item);
-          itemsPerGroup++;
-          this.items[groupCounter] = tempList;
-          if (itemsPerGroup === this.model.groupLength) {
-            groupCounter++;
-            itemsPerGroup = 0;
-            tempList = [];
-          }
-        });
-        this.cdr.markForCheck();
-      });
-
+      this.loadEntries(listGroup);
     }
   }
 
@@ -183,4 +133,70 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     };
   }
 
+  /**
+   * Update current page state to keep track of which one to load next
+   * @param response
+   */
+  setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
+    if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
+      this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
+      this.showLoadMore$.next(true);
+    } else {
+      this.showLoadMore$.next(false);
+    }
+  }
+
+  /**
+   * Load entries page
+   *
+   * @param listGroup
+   */
+  loadEntries(listGroup?: UntypedFormGroup) {
+    if (!hasValue(listGroup)) {
+      listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
+    }
+
+    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      tap((response) => this.setPaginationInfo(response)),
+      map(entries => entries.page),
+    ).subscribe((allEntries: VocabularyEntry[]) => {
+      this.optionsList = [...this.optionsList, ...allEntries];
+      let groupCounter = (this.items.length > 0) ? (this.items.length - 1) : 0;
+      let itemsPerGroup = 0;
+      let tempList: ListItem[] = [];
+
+      // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
+      allEntries.forEach((option: VocabularyEntry, key: number) => {
+        const value = option.authority || option.value;
+        const checked: boolean = isNotEmpty(findKey(
+          this.model.value,
+          (v) => v?.value === option.value));
+
+        const item: ListItem = {
+          id: `${this.model.id}_${value}`,
+          label: option.display,
+          value: checked,
+          index: key,
+        };
+        if (this.model.repeatable) {
+          this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
+        } else {
+          (this.model as DynamicListRadioGroupModel).options.push({
+            label: item.label,
+            value: option,
+          });
+        }
+        tempList.push(item);
+        itemsPerGroup++;
+        this.items[groupCounter] = tempList;
+        if (itemsPerGroup === this.model.groupLength) {
+          groupCounter++;
+          itemsPerGroup = 0;
+          tempList = [];
+        }
+      });
+      this.cdr.markForCheck();
+    });
+  }
 }
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 61e420b23a..2332615d98 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,38 +1,39 @@
-<div class="mb-4 ccLicense-select">
-  <ds-select
-    [disabled]="!submissionCcLicenses">
+@if (submissionCcLicenses) {
+  <div class="mb-4 ccLicense-select">
+    <div ngbDropdown>
+      <input id="cc-license-dropdown"
+             class="form-control"
+             [(ngModel)]="selectedCcLicense.name"
+             placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+             [ngModelOptions]="{standalone: true}"
+             ngbDropdownToggle
+             role="combobox"
+             #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
+           role="menu"
+           infiniteScroll
+           (scroll)="onScroll($event)"
+           [infiniteScrollDistance]="5"
+           [infiniteScrollThrottle]="300"
+           [infiniteScrollUpDistance]="1.5"
+           [fromRoot]="true"
+           [scrollWindow]="false">
 
-    <ng-container class="selection">
-      <span *ngIf="!submissionCcLicenses">
-        <ds-themed-loading></ds-themed-loading>
-      </span>
-      <span *ngIf="getSelectedCcLicense()">
-        {{ getSelectedCcLicense().name }}
-      </span>
-      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
-        <ng-container *ngIf="storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.change' | translate }}
-        </ng-container>
-        <ng-container *ngIf="!storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.select' | translate }}
-        </ng-container>
-      </span>
-    </ng-container>
-
-    <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length == 0"
-              class="dropdown-item disabled">
-        {{ 'submission.sections.ccLicense.none' | translate }}
-      </button>
-      <button *ngFor="let license of submissionCcLicenses"
-              class="dropdown-item"
-              (click)="selectCcLicense(license)">
-        {{ license.name }}
-      </button>
-    </ng-container>
-
-  </ds-select>
-</div>
+        @if(submissionCcLicenses?.length === 0) {
+          <button class="dropdown-item disabled">
+            {{ 'submission.sections.ccLicense.none' | translate }}
+          </button>
+        } @else {
+          @for(license of submissionCcLicenses; track license.id) {
+            <button class="dropdown-item" (click)="selectCcLicense(license)">
+              {{ license.name }}
+            </button>
+          }
+        }
+      </div>
+  </div>
+  </div>
+}
 
 <ng-container *ngIf="getSelectedCcLicense()">
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
index 62a902b79a..142cd82822 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -1,3 +1,13 @@
 .options-select-menu {
   max-height: 25vh;
 }
+
+.ccLicense-select {
+  width: fit-content;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index bb83e48d21..1169a0fb08 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -215,9 +215,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     });
 
     it('should display the selected cc license', () => {
-      expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText
-      ).toContain('test license name 2');
+      expect(component.selectedCcLicense.name).toContain('test license name 2');
     });
 
     it('should display all field labels of the selected cc license only', () => {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index e1b6a005aa..c39136f710 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,9 +1,9 @@
-import { Component, Inject } from '@angular/core';
-import { EMPTY, expand, Observable, of as observableOf, reduce, Subscription } from 'rxjs';
+import { ChangeDetectorRef, Component, Inject } from '@angular/core';
+import { EMPTY, expand, Observable, of as observableOf, reduce, Subscription, tap } from 'rxjs';
 import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
 } from '../../../core/shared/operators';
 import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
@@ -22,6 +22,7 @@ import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/subm
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
 import { RemoteData } from "../../../core/data/remote-data";
 import { PaginatedList } from "../../../core/data/paginated-list.model";
+import { FindListOptions } from "../../../core/data/find-list-options.model";
 
 /**
  * This component represents the submission section to select the Creative Commons license.
@@ -60,7 +61,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   /**
    * Cache of the available Creative Commons licenses.
    */
-  submissionCcLicenses: SubmissionCcLicence[];
+  submissionCcLicenses: SubmissionCcLicence[] = [];
 
   /**
    * Reference to NgbModal
@@ -72,6 +73,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   defaultJurisdiction: string;
 
+  /**
+   * The currently selected cc licence
+   */
+  selectedCcLicense: SubmissionCcLicence = new SubmissionCcLicence();
+
+  /**
+   * Options for paginated data loading
+   */
+  ccLicenceOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+  /**
+   * Check to stop paginated search
+   *
+   * @private
+   */
+  private _isLastPage: boolean;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -96,6 +116,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
     protected configService: ConfigurationDataService,
+    protected ref: ChangeDetectorRef,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
     @Inject('submissionIdProvider') public injectedSubmissionId: string
@@ -119,9 +140,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param ccLicense the Creative Commons license to select.
    */
   selectCcLicense(ccLicense: SubmissionCcLicence) {
-    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+    if (this.selectedCcLicense.id === ccLicense.id) {
       return;
     }
+    this.selectedCcLicense = ccLicense;
     this.setAccepted(false);
     this.updateSectionData({
       ccLicense: {
@@ -265,26 +287,6 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ currentPage: 1, elementsPerPage: 20 }).pipe(
-        getFirstSucceededRemoteData(),
-        expand((typeListRD: RemoteData<PaginatedList<SubmissionCcLicence>>) => {
-          const currentPage = typeListRD.payload.pageInfo.currentPage;
-          const totalPages = typeListRD.payload.pageInfo.totalPages;
-          if (currentPage < totalPages) {
-            const nextPageInfo = { currentPage: currentPage + 1, elementsPerPage: 20 };
-            return this.submissionCcLicensesDataService.findAll(nextPageInfo).pipe(
-              getFirstSucceededRemoteData()
-            );
-          } else {
-            return EMPTY;
-          }
-        }),
-        reduce((acc: SubmissionCcLicence[], typeListRD: RemoteData<PaginatedList<SubmissionCcLicence>>) => acc.concat(typeListRD.payload.page), []),
-      ).subscribe(
-        (licenses) => {
-          this.submissionCcLicenses = licenses;
-        },
-      ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
         getRemoteDataPayload()
@@ -297,6 +299,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
           }
       })
     );
+    this.loadCcLicences();
   }
 
   /**
@@ -316,4 +319,31 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
     this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
   }
+
+  onScroll(event) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading && !this._isLastPage) {
+        this.ccLicenceOptions.currentPage++;
+        this.loadCcLicences();
+      }
+    }
+  }
+
+  loadCcLicences() {
+    this.isLoading = true;
+
+    this.subscriptions.push(
+      this.submissionCcLicensesDataService.findAll(this.ccLicenceOptions).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this._isLastPage = response.pageInfo.currentPage === response.pageInfo.totalPages),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => {
+          this.submissionCcLicenses = [...this.submissionCcLicenses, ...licenses];
+          this.isLoading = false;
+          this.ref.detectChanges();
+        },
+      ),
+    );
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 34ea18ab71..0ad3822813 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1470,6 +1470,8 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dynamic-list.load-more": "Load more",
+
   "dropdown.clear": "Clear selection",
 
   "dropdown.clear.tooltip": "Clear the selected option",

From f77ce869f8c641479aa4d2959176d07b93e22e4d Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 30 Jan 2025 12:14:07 +0100
Subject: [PATCH 1185/1286] [DURACOM-304] remove control flow

---
 .../models/list/dynamic-list.component.ts     |  2 +-
 ...mission-section-cc-licenses.component.html | 25 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 2dcc1cb023..59e07a1fb2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -17,7 +17,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { EMPTY, expand, reduce } from "rxjs";
+import { BehaviorSubject, EMPTY, expand, map, reduce, tap } from "rxjs";
 
 export interface ListItem {
   id: string;
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 2332615d98..e3e11c258a 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,4 +1,4 @@
-@if (submissionCcLicenses) {
+<ng-container *ngIf="selectedCcLicense">
   <div class="mb-4 ccLicense-select">
     <div ngbDropdown>
       <input id="cc-license-dropdown"
@@ -18,22 +18,23 @@
            [infiniteScrollUpDistance]="1.5"
            [fromRoot]="true"
            [scrollWindow]="false">
-
-        @if(submissionCcLicenses?.length === 0) {
+        <ng-container *ngIf="submissionCcLicenses?.length === 0; else licensesList">
           <button class="dropdown-item disabled">
             {{ 'submission.sections.ccLicense.none' | translate }}
           </button>
-        } @else {
-          @for(license of submissionCcLicenses; track license.id) {
-            <button class="dropdown-item" (click)="selectCcLicense(license)">
-              {{ license.name }}
-            </button>
-          }
-        }
+        </ng-container>
       </div>
+    </div>
   </div>
-  </div>
-}
+</ng-container>
+
+<ng-template #licensesList>
+  <ng-container *ngFor="let license of submissionCcLicenses">
+    <button class="dropdown-item" (click)="selectCcLicense(license)">
+      {{ license.name }}
+    </button>
+  </ng-container>
+</ng-template>
 
 <ng-container *ngIf="getSelectedCcLicense()">
 

From af39526d7708855bc0fd5bc017a17639f3dd61ea Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 17 Jan 2025 17:42:18 +0100
Subject: [PATCH 1186/1286] [DURACOM-304] refactor, fix dynamic-list.component
 loading

---
 src/app/core/data/bundle-data.service.ts      |  46 +-------
 .../item-bitstreams.component.html            |   2 +-
 .../models/list/dynamic-list.component.html   |   4 +-
 .../models/list/dynamic-list.component.ts     | 103 ++++++++++--------
 4 files changed, 65 insertions(+), 90 deletions(-)

diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 67dd649c1f..78ae204fe7 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -79,7 +79,10 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    */
   // TODO should be implemented rest side
   findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+    //Since we filter by bundleName where the pagination options are not indicated we need to load all the possible bundles.
+    // This is a workaround, in substitution of the previously recursive call with expand
+    const paginationOptions = options ?? { elementsPerPage: 9999 };
+    return this.findAllByItem(item, paginationOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
@@ -112,47 +115,6 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
     );
   }
 
-  // findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-  //   return this.findAllByItem(item, { elementsPerPage: 1, currentPage: 1 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
-  //     expand((rd: RemoteData<PaginatedList<Bundle>>) => {
-  //       if (rd.hasSucceeded && hasValue(rd.payload) && hasValue(rd.payload.page) && rd.payload.currentPage < rd.payload.totalPages) {
-  //         const nextPageOptions = { elementsPerPage: 1, currentPage: rd.payload.currentPage + 1 };
-  //         return this.findAllByItem(item, nextPageOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  //       } else {
-  //         return EMPTY;
-  //       }
-  //     }),
-  //     map((rd: RemoteData<PaginatedList<Bundle>>) => {
-  //       if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
-  //         const matchingBundle = rd.payload.page.find((bundle: Bundle) => bundle.name === bundleName);
-  //         if (hasValue(matchingBundle)) {
-  //           return new RemoteData(
-  //             rd.timeCompleted,
-  //             rd.msToLive,
-  //             rd.lastUpdated,
-  //             RequestEntryState.Success,
-  //             null,
-  //             matchingBundle,
-  //             200
-  //           );
-  //         } else {
-  //           return new RemoteData(
-  //             rd.timeCompleted,
-  //             rd.msToLive,
-  //             rd.lastUpdated,
-  //             RequestEntryState.Error,
-  //             `The bundle with name ${bundleName} was not found.`,
-  //             null,
-  //             404
-  //           );
-  //         }
-  //       } else {
-  //         return rd as any;
-  //       }
-  //     })
-  //   );
-  // }
-
   /**
    * Get the bitstreams endpoint for a bundle
    * @param bundleId
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 9c9b7b1c74..9447e2560a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -40,7 +40,7 @@
                                    aria-describedby="reorder-description">
     </ds-item-edit-bitstream-bundle>
     <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
-      <div class="btn btn-link py-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</div>
+      <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
     </div>
   </div>
   <div *ngIf="bundles?.length === 0"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 2407a74022..8e45d3e11e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -64,8 +64,8 @@
     </div>
   </div>
 
-  <div class="d-flex justify-content-center" *ngIf="(showLoadMore$ | async)">
-    <div *ngIf="(showLoadMore$ | async)" class="btn btn-link py-3" (click)="loadEntries()">{{'dynamic-list.load-more' | translate}}</div>
+  <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
+    <ds-loading></ds-loading>
   </div>
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 59e07a1fb2..745bbb73af 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { UntypedFormGroup, ValidatorFn, ValidationErrors, AbstractControl } from '@angular/forms';
 import {
   DynamicCheckboxModel,
@@ -17,7 +17,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { BehaviorSubject, EMPTY, expand, map, reduce, tap } from "rxjs";
+import { BehaviorSubject, EMPTY, expand, map, reduce, Subscription, tap } from "rxjs";
 
 export interface ListItem {
   id: string;
@@ -34,7 +34,7 @@ export interface ListItem {
   styleUrls: ['./dynamic-list.component.scss'],
   templateUrl: './dynamic-list.component.html'
 })
-export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
 
   @Input() group: UntypedFormGroup;
   @Input() model: any;
@@ -44,9 +44,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  public showLoadMore$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
   protected optionsList: VocabularyEntry[] = [];
   private nextPageInfo: PageInfo;
+  private subs: Subscription[] = [];
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -66,6 +67,12 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     }
   }
 
+  ngOnDestroy() {
+    if (this.subs.length > 0) {
+      this.subs.forEach(sub => sub.unsubscribe());
+    }
+  }
+
   /**
    * Emits a blur event containing a given value.
    * @param event The value to emit.
@@ -140,9 +147,9 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
     if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
       this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
-      this.showLoadMore$.next(true);
+      this.isLoading$.next(true);
     } else {
-      this.showLoadMore$.next(false);
+      this.isLoading$.next(false);
     }
   }
 
@@ -156,47 +163,53 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
       listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
     }
 
-    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      tap((response) => this.setPaginationInfo(response)),
-      map(entries => entries.page),
-    ).subscribe((allEntries: VocabularyEntry[]) => {
-      this.optionsList = [...this.optionsList, ...allEntries];
-      let groupCounter = (this.items.length > 0) ? (this.items.length - 1) : 0;
-      let itemsPerGroup = 0;
-      let tempList: ListItem[] = [];
+    this.subs.push(
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this.setPaginationInfo(response)),
+        map(entries => entries.page),
+      ).subscribe((allEntries: VocabularyEntry[]) => {
+        this.optionsList = [...this.optionsList, ...allEntries];
+        let groupCounter = this.items.length;
+        let itemsPerGroup = 0;
+        let tempList: ListItem[] = [];
 
-      // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-      allEntries.forEach((option: VocabularyEntry, key: number) => {
-        const value = option.authority || option.value;
-        const checked: boolean = isNotEmpty(findKey(
-          this.model.value,
-          (v) => v?.value === option.value));
+        // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
+        allEntries.forEach((option: VocabularyEntry) => {
+          const value = option.authority || option.value;
+          const checked: boolean = isNotEmpty(findKey(
+            this.model.value,
+            (v) => v?.value === option.value));
 
-        const item: ListItem = {
-          id: `${this.model.id}_${value}`,
-          label: option.display,
-          value: checked,
-          index: key,
-        };
-        if (this.model.repeatable) {
-          this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
-        } else {
-          (this.model as DynamicListRadioGroupModel).options.push({
-            label: item.label,
-            value: option,
-          });
+          const item: ListItem = {
+            id: `${this.model.id}_${value}`,
+            label: option.display,
+            value: checked,
+            index: this.optionsList.indexOf(option),
+          };
+          if (this.model.repeatable) {
+            this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
+          } else {
+            (this.model as DynamicListRadioGroupModel).options.push({
+              label: item.label,
+              value: option,
+            });
+          }
+          tempList.push(item);
+          itemsPerGroup++;
+          this.items[groupCounter] = tempList;
+          if (itemsPerGroup === this.model.groupLength) {
+            groupCounter++;
+            itemsPerGroup = 0;
+            tempList = [];
+          }
+        });
+        this.cdr.markForCheck();
+        // If the paginated request did not reach the end keep loading the entries in the background
+        if (this.isLoading$.value) {
+          this.loadEntries();
         }
-        tempList.push(item);
-        itemsPerGroup++;
-        this.items[groupCounter] = tempList;
-        if (itemsPerGroup === this.model.groupLength) {
-          groupCounter++;
-          itemsPerGroup = 0;
-          tempList = [];
-        }
-      });
-      this.cdr.markForCheck();
-    });
+      }),
+    );
   }
 }

From 50e440bcf505bdc4295f5187af840d209503afda Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 23 Jan 2025 15:04:41 +0100
Subject: [PATCH 1187/1286] [DURACOM-304] remove br

---
 .../models/list/dynamic-list.component.html                   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 8e45d3e11e..c2f35861fe 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -28,9 +28,7 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
-
   </div>
 
   <div *ngIf="!model.repeatable"
@@ -60,10 +58,8 @@
           <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
         </label>
       </div>
-      <br>
     </div>
   </div>
-
   <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
     <ds-loading></ds-loading>
   </div>

From d155d778ee3ed18451507aedea6c81cd3edfac2e Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 30 Jan 2025 12:32:58 +0100
Subject: [PATCH 1188/1286] [DURACOM-304] fix tests and lint

---
 .../edit-bitstream-page.component.ts                | 12 +++++-------
 src/app/core/data/bitstream-data.service.ts         |  2 +-
 src/app/core/data/relationship-type-data.service.ts |  2 +-
 src/app/core/metadata/metadata.service.ts           |  2 +-
 .../item-bitstreams/item-bitstreams.component.ts    |  2 +-
 .../form/scripts-select/scripts-select.component.ts | 13 ++++++-------
 .../models/list/dynamic-list.component.ts           |  2 +-
 .../dynamic-scrollable-dropdown.component.ts        |  7 +++----
 .../dynamic-scrollable-dropdown.model.ts            |  4 ++--
 ...submission-section-cc-licenses.component.spec.ts |  4 ++--
 .../submission-section-cc-licenses.component.ts     |  9 +++------
 11 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 78893c9281..082ffd55a9 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -4,19 +4,18 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 import {
   combineLatest,
-  combineLatest as observableCombineLatest, EMPTY,
-  expand,
+  combineLatest as observableCombineLatest,
   Observable,
-  of as observableOf, reduce,
+  of as observableOf,
   Subscription, take
 } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import cloneDeep from 'lodash/cloneDeep';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../core/shared/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
@@ -25,7 +24,6 @@ import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/em
 import { Metadata } from '../../core/shared/metadata.utils';
 import { Location } from '@angular/common';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
 import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import { Bundle } from '../../core/shared/bundle.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -34,7 +32,7 @@ import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-u
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { DynamicScrollableDropdownModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { FindAllDataImpl } from "../../core/data/base/find-all-data";
+import { FindAllDataImpl } from '../../core/data/base/find-all-data';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index e1ea61beed..2e507173df 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -8,7 +8,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BITSTREAM } from '../shared/bitstream.resource-type';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index b8f32bdc44..263920a615 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { combineLatest as observableCombineLatest, EMPTY, expand, from, Observable, reduce } from 'rxjs';
-import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import { map, mergeMap, toArray } from 'rxjs/operators';
 import { hasValue } from '../../shared/empty.util';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 547029afaa..5659a75f0e 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -45,7 +45,7 @@ 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';
-import { FindListOptions } from "../data/find-list-options.model";
+import { FindListOptions } from '../data/find-list-options.model';
 
 /**
  * The base selector function to select the metaTag section in the store
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 4b1d39071c..581b8b4bcb 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -23,7 +23,7 @@ import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/res
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { ItemBitstreamsService } from './item-bitstreams.service';
 import { AlertType } from '../../../shared/alert/alert-type';
-import { PaginationComponentOptions } from "../../../shared/pagination/pagination-component-options.model";
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-item-bitstreams',
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index c2d74938d7..8cc31085a4 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,19 +1,18 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { Script } from '../../scripts/script.model';
-import { BehaviorSubject, Observable, Subscription, tap } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
+import { BehaviorSubject, Subscription, tap } from 'rxjs';
+import { map } from 'rxjs/operators';
 import {
   getRemoteDataPayload,
-  getFirstSucceededRemoteData,
   getFirstCompletedRemoteData
 } from '../../../core/shared/operators';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ActivatedRoute, Router } from '@angular/router';
+import { hasValue } from '../../../shared/empty.util';
 import { ControlContainer, NgForm } from '@angular/forms';
 import { controlContainerFactory } from '../process-form.component';
-import { FindListOptions } from "../../../core/data/find-list-options.model";
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 const SCRIPT_QUERY_PARAMETER = 'script';
 
@@ -69,7 +68,7 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Load the scripts and check if the route contains a script
    */
   loadScripts() {
-    if (this.isLoading$.value) return;
+    if (this.isLoading$.value) {return;}
     this.isLoading$.next(true);
 
     this.routeSub = this.scriptService.findAll(this.scriptOptions).pipe(
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 745bbb73af..cbb70c930e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -17,7 +17,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { BehaviorSubject, EMPTY, expand, map, reduce, Subscription, tap } from "rxjs";
+import { BehaviorSubject, map, Subscription, tap } from 'rxjs';
 
 export interface ListItem {
   id: string;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 4e5977b1c1..b284fa4fc5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -15,7 +15,6 @@ import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
 import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { hasValue, isEmpty } from '../../../../../empty.util';
@@ -27,9 +26,9 @@ import {
 } from '../../../../../../core/data/paginated-list.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { FindAllData } from "../../../../../../core/data/base/find-all-data";
-import { CacheableObject } from "../../../../../../core/cache/cacheable-object.model";
-import { RemoteData } from "../../../../../../core/data/remote-data";
+import { FindAllData } from '../../../../../../core/data/base/find-all-data';
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 
 /**
  * Component representing a dropdown input field
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index 873744d870..e3d74329ad 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -1,8 +1,8 @@
 import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { FindAllDataImpl } from "../../../../../../core/data/base/find-all-data";
-import { CacheableObject } from "../../../../../../core/cache/cacheable-object.model";
+import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data';
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index 1169a0fb08..b2d9c5ad60 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -198,10 +198,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index c39136f710..fff5428c2f 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,9 +1,8 @@
 import { ChangeDetectorRef, Component, Inject } from '@angular/core';
-import { EMPTY, expand, Observable, of as observableOf, reduce, Subscription, tap } from 'rxjs';
+import { Observable, of as observableOf, Subscription, tap } from 'rxjs';
 import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload
 } from '../../../core/shared/operators';
 import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
@@ -20,9 +19,7 @@ import { isNotEmpty } from '../../../shared/empty.util';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
 import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
-import { RemoteData } from "../../../core/data/remote-data";
-import { PaginatedList } from "../../../core/data/paginated-list.model";
-import { FindListOptions } from "../../../core/data/find-list-options.model";
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 /**
  * This component represents the submission section to select the Creative Commons license.

From 073b2b0acd53bb5464630b012b72f7cdb83b915e Mon Sep 17 00:00:00 2001
From: root <root@TI-03.OHB.LOCAL>
Date: Thu, 30 Jan 2025 09:27:55 -0300
Subject: [PATCH 1189/1286] Accessibility when selecting a search filter v7

---
 .../search-facet-option.component.html             |  3 ++-
 .../search-facet-option.component.ts               | 14 +++++++++++++-
 src/assets/i18n/en.json5                           |  2 ++
 src/assets/i18n/es.json5                           |  3 +++
 src/assets/i18n/pt-BR.json5                        |  3 +++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 9a4bffadb8..0ebd7ee6be 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,7 +1,8 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
-   [queryParams]="addQueryParams" queryParamsHandling="merge">
+   [queryParams]="addQueryParams" queryParamsHandling="merge"
+   (click)="announceFilter()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
     <span class="w-100 pl-1 break-facet">
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index cdbab61a30..8ea06890fe 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -2,10 +2,12 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
@@ -67,7 +69,9 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
+              protected liveRegionService: LiveRegionService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -129,4 +133,12 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
       this.sub.unsubscribe();
     }
   }
+
+  /**
+   * Announces to the screen reader that the page will be reloaded, which filter has been selected
+   */
+  announceFilter() {
+    const message = this.translateService.instant('search-facet-option.update.announcement', { filter: this.filterValue.value });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 18b14e6c5f..497a7dbaa1 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5397,4 +5397,6 @@
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 51bd9c833c..d3d1467fde 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -7839,4 +7839,7 @@
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "La página será recargada. Filtro {{ filter }} seleccionado.",
 }
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 13a6b652a6..b4735c2d96 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -7866,4 +7866,7 @@
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Digite seu e-mail",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "A página será recarregada. O filtro {{ filter }} foi selecionado.",
 }

From c8aae069f8becde3be06af64f2681b986004bfe4 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Tue, 19 Sep 2023 12:42:11 +0200
Subject: [PATCH 1190/1286] [DURACOM-288] Fixes undefined request in thumbnail

---
 src/app/shared/utils/safe-url-pipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 6cb9d9fb1b..f8bc728829 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -16,6 +16,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class SafeUrlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) { }
   transform(url) {
-    return this.domSanitizer.bypassSecurityTrustResourceUrl(url);
+    return url == null ? null : this.domSanitizer.bypassSecurityTrustResourceUrl(url);
   }
 }

From bdac58d7fc20cc8fdea5b00887edd2ac5d04e106 Mon Sep 17 00:00:00 2001
From: AndreaBarbasso <andrea.barbasso@gmail.com>
Date: Thu, 30 Jan 2025 18:11:42 +0100
Subject: [PATCH 1191/1286] Make reorder buttons keyboard accessible (#3372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [CST-15595] add keyboard drag and drop functionality

* [CST-15595] add aria live messages

* [CST-15595] fix e2e tests

* [CST-15595] fix unit tests

* [CST-15595] improve drag and drop keyboard functionality

* [CST-15595] add keydown.enter for keyboard drag and drop

---------

Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´>
---
 .../dynamic-form-array.component.html         |  14 +-
 .../dynamic-form-array.component.scss         |  16 +-
 .../dynamic-form-array.component.spec.ts      | 159 ++++++++++++++++++
 .../dynamic-form-array.component.ts           | 156 +++++++++++++++++
 src/assets/i18n/en.json5                      |  10 ++
 5 files changed, 342 insertions(+), 13 deletions(-)
 create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index a7a6b103e4..3ad7063256 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -5,9 +5,10 @@
          [ngClass]="getClass('element', 'control')">
 
       <!-- Draggable Container -->
-      <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups"
+        <div #sortableElement
+             *ngFor="let groupModel of model.groups; let idx = index; let length = count"
              role="group"
              [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
@@ -16,7 +17,14 @@
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
+               (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+               (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+               (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index ce4a89226a..f93fcb1eac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -17,7 +17,6 @@
   margin-right: calc(-0.5 * var(--bs-spacer));
   padding-right: calc(0.5 * var(--bs-spacer));
   .drag-icon {
-    visibility: hidden;
     width: calc(2 * var(--bs-spacer));
     color: var(--bs-gray-600);
     margin: var(--bs-btn-padding-y) 0;
@@ -27,9 +26,6 @@
 
   &:hover, &:focus {
     cursor: grab;
-    .drag-icon {
-      visibility: visible;
-    }
   }
 
 }
@@ -40,18 +36,12 @@
   }
 
   &:focus {
-    .drag-icon {
-      visibility: visible;
-    }
   }
 }
 
 .cdk-drop-list-dragging {
   .drag-handle {
     cursor: grabbing;
-    .drag-icon {
-      visibility: hidden;
-    }
   }
 }
 
@@ -63,3 +53,9 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+
+::ng-deep {
+  .sorting-with-keyboard input {
+    background-color: var(--bs-gray-400);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
new file mode 100644
index 0000000000..0d9ed6ae74
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -0,0 +1,159 @@
+import { HttpClient } from '@angular/common/http';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  DYNAMIC_FORM_CONTROL_MAP_FN,
+  DynamicFormLayoutService,
+  DynamicFormService,
+  DynamicFormValidationService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  APP_DATA_SERVICES_MAP,
+} from '../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../environments/environment.test';
+import { SubmissionService } from '../../../../../../submission/submission.service';
+import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
+import { dsDynamicFormControlMapFn } from '../../ds-dynamic-form-control-map-fn';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { DsDynamicFormArrayComponent } from './dynamic-form-array.component';
+
+describe('DsDynamicFormArrayComponent', () => {
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  let component: DsDynamicFormArrayComponent;
+  let fixture: ComponentFixture<DsDynamicFormArrayComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        ReactiveFormsModule,
+        DsDynamicFormArrayComponent,
+        NgxMaskModule.forRoot(),
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        DynamicFormLayoutService,
+        DynamicFormValidationService,
+        provideMockStore(),
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HttpClient, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+      ],
+    }).overrideComponent(DsDynamicFormArrayComponent, {
+      remove: {
+        imports: [DsDynamicFormControlContainerComponent],
+      },
+    })
+      .compileComponents();
+  });
+
+  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+    const formModel = [
+      new DynamicRowArrayModel({
+        id: 'testFormRowArray',
+        initialCount: 5,
+        notRepeatable: false,
+        relationshipConfig: undefined,
+        submissionId: '1234',
+        isDraggable: true,
+        groupFactory: () => {
+          return [
+            new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
+          ];
+        },
+        required: false,
+        metadataKey: 'dc.contributor.author',
+        metadataFields: ['dc.contributor.author'],
+        hasSelectableMetadata: true,
+        showButtons: true,
+        typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
+      }),
+    ];
+
+    fixture = TestBed.createComponent(DsDynamicFormArrayComponent);
+    component = fixture.componentInstance;
+    component.model = formModel[0] as DynamicRowArrayModel;
+
+    component.group = service.createFormGroup(formModel);
+
+    fixture.detectChanges();
+  }));
+
+  it('should move element up and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 1, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should move element down and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving up from the first element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 0, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving down from the last element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 2, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should not move element if keyboard drag is not active', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSorted = null;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[1]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should cancel keyboard drag and drop', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSortedStartingIndex = 2;
+    component.elementBeingSorted = dropList.querySelectorAll('[cdkDragHandle]')[2];
+    component.model.moveGroup(2, 1);
+    fixture.detectChanges();
+    component.cancelKeyboardDragAndDrop(dropList, 1, 3);
+    fixture.detectChanges();
+    expect(component.elementBeingSorted).toBeNull();
+    expect(component.elementBeingSortedStartingIndex).toBeNull();
+  });
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 0ae397ce61..220143291e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -32,9 +32,14 @@ import {
   DynamicFormValidationService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
 import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 
@@ -51,6 +56,7 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
     CdkDragHandle,
     forwardRef(() => DsDynamicFormControlContainerComponent),
     NgTemplateOutlet,
+    TranslateModule,
   ],
   standalone: true,
 })
@@ -64,6 +70,9 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
+  elementBeingSorted: HTMLElement;
+  elementBeingSortedStartingIndex: number;
+
   /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -74,6 +83,8 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected liveRegionService: LiveRegionService,
+              protected translateService: TranslateService,
   ) {
     super(layoutService, validationService);
   }
@@ -127,4 +138,149 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
     }
     return this.control.get([groupModel.startingIndex]);
   }
+
+  /**
+   * Toggles the keyboard drag and drop feature for the given sortable element.
+   * @param event
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  toggleKeyboardDragAndDrop(event: KeyboardEvent, sortableElement: HTMLDivElement, index: number, length: number) {
+    event.preventDefault();
+    if (this.elementBeingSorted) {
+      this.stopKeyboardDragAndDrop(sortableElement, index, length);
+    } else {
+      sortableElement.classList.add('sorting-with-keyboard');
+      this.elementBeingSorted = sortableElement;
+      this.elementBeingSortedStartingIndex = index;
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.status', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Stops the keyboard drag and drop feature.
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  stopKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.elementBeingSorted?.classList.remove('sorting-with-keyboard');
+    this.liveRegionService.clear();
+    if (this.elementBeingSorted) {
+      this.elementBeingSorted = null;
+      this.elementBeingSortedStartingIndex = null;
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.dropped', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Handles the keyboard arrow press event to move the element up or down.
+   * @param event
+   * @param dropList
+   * @param length
+   * @param idx
+   * @param direction
+   */
+  handleArrowPress(event: KeyboardEvent, dropList: HTMLDivElement, length: number, idx: number, direction: 'up' | 'down') {
+    let newIndex = direction === 'up' ? idx - 1 : idx + 1;
+    if (newIndex < 0) {
+      newIndex = length - 1;
+    } else if (newIndex >= length) {
+      newIndex = 0;
+    }
+
+    if (this.elementBeingSorted) {
+      this.model.moveGroup(idx, newIndex - idx);
+      if (hasValue(this.model.groups[newIndex]) && hasValue((this.control as any).controls[newIndex])) {
+        this.onCustomEvent({
+          previousIndex: idx,
+          newIndex,
+          arrayModel: this.model,
+          model: this.model.groups[newIndex].group[0],
+          control: (this.control as any).controls[newIndex],
+        }, 'move');
+        this.liveRegionService.clear();
+        this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.moved', {
+          itemName: this.elementBeingSorted.querySelector('input')?.value,
+          index: newIndex + 1,
+          length,
+        }));
+      }
+      event.preventDefault();
+      // Set focus back to the moved element
+      setTimeout(() => {
+        this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+      });
+    } else {
+      event.preventDefault();
+      this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+    }
+  }
+
+  cancelKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.model.moveGroup(index, this.elementBeingSortedStartingIndex - index);
+    if (hasValue(this.model.groups[this.elementBeingSortedStartingIndex]) && hasValue((this.control as any).controls[this.elementBeingSortedStartingIndex])) {
+      this.onCustomEvent({
+        previousIndex: index,
+        newIndex: this.elementBeingSortedStartingIndex,
+        arrayModel: this.model,
+        model: this.model.groups[this.elementBeingSortedStartingIndex].group[0],
+        control: (this.control as any).controls[this.elementBeingSortedStartingIndex],
+      }, 'move');
+      this.stopKeyboardDragAndDrop(sortableElement, this.elementBeingSortedStartingIndex, length);
+    }
+  }
+
+  /**
+   * Sets focus to the drag handle of the drop list element of the given index.
+   * @param dropList
+   * @param index
+   * @param direction
+   */
+  setFocusToDropListElementOfIndex(dropList: HTMLDivElement, index: number, direction: 'up' | 'down') {
+    const newDragHandle = dropList.querySelectorAll(`[cdkDragHandle]`)[index] as HTMLElement;
+    if (newDragHandle) {
+      newDragHandle.focus();
+      if (!this.isElementInViewport(newDragHandle)) {
+        newDragHandle.scrollIntoView(direction === 'up');
+      }
+    }
+  }
+
+  /**
+   * checks if an element is in the viewport
+   * @param el
+   */
+  isElementInViewport(el: HTMLElement) {
+    const rect = el.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
+  /**
+   * Adds an instruction message to the live region when the user might want to sort an element.
+   * @param sortableElement
+   */
+  addInstructionMessageToLiveRegion(sortableElement: HTMLDivElement) {
+    if (!this.elementBeingSorted) {
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.instructions', {
+        itemName: sortableElement.querySelector('input')?.value,
+      }));
+    }
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4671fd8397..053e5133d9 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6771,4 +6771,14 @@
   "forgot-email.form.aria.label": "Enter your e-mail address",
 
   "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+
+  "live-region.ordering.instructions": "Press spacebar to reorder {{ itemName }}.",
+
+  "live-region.ordering.status": "{{ itemName }}, grabbed. Current position in list: {{ index }} of  {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.moved": "{{ itemName }}, moved to position {{ index }} of {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.dropped": "{{ itemName }}, dropped at position {{ index }} of {{ length }}.",
+
+  "dynamic-form-array.sortable-list.label": "Sortable list",
 }

From 0878eafaf3ccb0d6b0b0626517bb7058c83dca81 Mon Sep 17 00:00:00 2001
From: AndreaBarbasso <andrea.barbasso@gmail.com>
Date: Thu, 30 Jan 2025 18:11:42 +0100
Subject: [PATCH 1192/1286] Make reorder buttons keyboard accessible (#3372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [CST-15595] add keyboard drag and drop functionality

* [CST-15595] add aria live messages

* [CST-15595] fix e2e tests

* [CST-15595] fix unit tests

* [CST-15595] improve drag and drop keyboard functionality

* [CST-15595] add keydown.enter for keyboard drag and drop

---------

Co-authored-by: Andrea Barbasso <´andrea.barbasso@4science.com´>
---
 .../dynamic-form-array.component.html         |  14 +-
 .../dynamic-form-array.component.scss         |  16 +-
 .../dynamic-form-array.component.spec.ts      | 159 ++++++++++++++++++
 .../dynamic-form-array.component.ts           | 156 +++++++++++++++++
 src/assets/i18n/en.json5                      |  10 ++
 5 files changed, 342 insertions(+), 13 deletions(-)
 create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index a7a6b103e4..3ad7063256 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -5,9 +5,10 @@
          [ngClass]="getClass('element', 'control')">
 
       <!-- Draggable Container -->
-      <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups"
+        <div #sortableElement
+             *ngFor="let groupModel of model.groups; let idx = index; let length = count"
              role="group"
              [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
@@ -16,7 +17,14 @@
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
+               (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+               (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+               (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index ce4a89226a..f93fcb1eac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -17,7 +17,6 @@
   margin-right: calc(-0.5 * var(--bs-spacer));
   padding-right: calc(0.5 * var(--bs-spacer));
   .drag-icon {
-    visibility: hidden;
     width: calc(2 * var(--bs-spacer));
     color: var(--bs-gray-600);
     margin: var(--bs-btn-padding-y) 0;
@@ -27,9 +26,6 @@
 
   &:hover, &:focus {
     cursor: grab;
-    .drag-icon {
-      visibility: visible;
-    }
   }
 
 }
@@ -40,18 +36,12 @@
   }
 
   &:focus {
-    .drag-icon {
-      visibility: visible;
-    }
   }
 }
 
 .cdk-drop-list-dragging {
   .drag-handle {
     cursor: grabbing;
-    .drag-icon {
-      visibility: hidden;
-    }
   }
 }
 
@@ -63,3 +53,9 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+
+::ng-deep {
+  .sorting-with-keyboard input {
+    background-color: var(--bs-gray-400);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
new file mode 100644
index 0000000000..0d9ed6ae74
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -0,0 +1,159 @@
+import { HttpClient } from '@angular/common/http';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  DYNAMIC_FORM_CONTROL_MAP_FN,
+  DynamicFormLayoutService,
+  DynamicFormService,
+  DynamicFormValidationService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  APP_DATA_SERVICES_MAP,
+} from '../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../environments/environment.test';
+import { SubmissionService } from '../../../../../../submission/submission.service';
+import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
+import { dsDynamicFormControlMapFn } from '../../ds-dynamic-form-control-map-fn';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { DsDynamicFormArrayComponent } from './dynamic-form-array.component';
+
+describe('DsDynamicFormArrayComponent', () => {
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  let component: DsDynamicFormArrayComponent;
+  let fixture: ComponentFixture<DsDynamicFormArrayComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        ReactiveFormsModule,
+        DsDynamicFormArrayComponent,
+        NgxMaskModule.forRoot(),
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        DynamicFormLayoutService,
+        DynamicFormValidationService,
+        provideMockStore(),
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HttpClient, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+      ],
+    }).overrideComponent(DsDynamicFormArrayComponent, {
+      remove: {
+        imports: [DsDynamicFormControlContainerComponent],
+      },
+    })
+      .compileComponents();
+  });
+
+  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+    const formModel = [
+      new DynamicRowArrayModel({
+        id: 'testFormRowArray',
+        initialCount: 5,
+        notRepeatable: false,
+        relationshipConfig: undefined,
+        submissionId: '1234',
+        isDraggable: true,
+        groupFactory: () => {
+          return [
+            new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
+          ];
+        },
+        required: false,
+        metadataKey: 'dc.contributor.author',
+        metadataFields: ['dc.contributor.author'],
+        hasSelectableMetadata: true,
+        showButtons: true,
+        typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
+      }),
+    ];
+
+    fixture = TestBed.createComponent(DsDynamicFormArrayComponent);
+    component = fixture.componentInstance;
+    component.model = formModel[0] as DynamicRowArrayModel;
+
+    component.group = service.createFormGroup(formModel);
+
+    fixture.detectChanges();
+  }));
+
+  it('should move element up and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 1, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should move element down and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving up from the first element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 0, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving down from the last element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 2, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should not move element if keyboard drag is not active', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSorted = null;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[1]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should cancel keyboard drag and drop', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSortedStartingIndex = 2;
+    component.elementBeingSorted = dropList.querySelectorAll('[cdkDragHandle]')[2];
+    component.model.moveGroup(2, 1);
+    fixture.detectChanges();
+    component.cancelKeyboardDragAndDrop(dropList, 1, 3);
+    fixture.detectChanges();
+    expect(component.elementBeingSorted).toBeNull();
+    expect(component.elementBeingSortedStartingIndex).toBeNull();
+  });
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 0ae397ce61..220143291e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -32,9 +32,14 @@ import {
   DynamicFormValidationService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
 import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 
@@ -51,6 +56,7 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
     CdkDragHandle,
     forwardRef(() => DsDynamicFormControlContainerComponent),
     NgTemplateOutlet,
+    TranslateModule,
   ],
   standalone: true,
 })
@@ -64,6 +70,9 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
+  elementBeingSorted: HTMLElement;
+  elementBeingSortedStartingIndex: number;
+
   /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -74,6 +83,8 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected liveRegionService: LiveRegionService,
+              protected translateService: TranslateService,
   ) {
     super(layoutService, validationService);
   }
@@ -127,4 +138,149 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
     }
     return this.control.get([groupModel.startingIndex]);
   }
+
+  /**
+   * Toggles the keyboard drag and drop feature for the given sortable element.
+   * @param event
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  toggleKeyboardDragAndDrop(event: KeyboardEvent, sortableElement: HTMLDivElement, index: number, length: number) {
+    event.preventDefault();
+    if (this.elementBeingSorted) {
+      this.stopKeyboardDragAndDrop(sortableElement, index, length);
+    } else {
+      sortableElement.classList.add('sorting-with-keyboard');
+      this.elementBeingSorted = sortableElement;
+      this.elementBeingSortedStartingIndex = index;
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.status', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Stops the keyboard drag and drop feature.
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  stopKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.elementBeingSorted?.classList.remove('sorting-with-keyboard');
+    this.liveRegionService.clear();
+    if (this.elementBeingSorted) {
+      this.elementBeingSorted = null;
+      this.elementBeingSortedStartingIndex = null;
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.dropped', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Handles the keyboard arrow press event to move the element up or down.
+   * @param event
+   * @param dropList
+   * @param length
+   * @param idx
+   * @param direction
+   */
+  handleArrowPress(event: KeyboardEvent, dropList: HTMLDivElement, length: number, idx: number, direction: 'up' | 'down') {
+    let newIndex = direction === 'up' ? idx - 1 : idx + 1;
+    if (newIndex < 0) {
+      newIndex = length - 1;
+    } else if (newIndex >= length) {
+      newIndex = 0;
+    }
+
+    if (this.elementBeingSorted) {
+      this.model.moveGroup(idx, newIndex - idx);
+      if (hasValue(this.model.groups[newIndex]) && hasValue((this.control as any).controls[newIndex])) {
+        this.onCustomEvent({
+          previousIndex: idx,
+          newIndex,
+          arrayModel: this.model,
+          model: this.model.groups[newIndex].group[0],
+          control: (this.control as any).controls[newIndex],
+        }, 'move');
+        this.liveRegionService.clear();
+        this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.moved', {
+          itemName: this.elementBeingSorted.querySelector('input')?.value,
+          index: newIndex + 1,
+          length,
+        }));
+      }
+      event.preventDefault();
+      // Set focus back to the moved element
+      setTimeout(() => {
+        this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+      });
+    } else {
+      event.preventDefault();
+      this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+    }
+  }
+
+  cancelKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.model.moveGroup(index, this.elementBeingSortedStartingIndex - index);
+    if (hasValue(this.model.groups[this.elementBeingSortedStartingIndex]) && hasValue((this.control as any).controls[this.elementBeingSortedStartingIndex])) {
+      this.onCustomEvent({
+        previousIndex: index,
+        newIndex: this.elementBeingSortedStartingIndex,
+        arrayModel: this.model,
+        model: this.model.groups[this.elementBeingSortedStartingIndex].group[0],
+        control: (this.control as any).controls[this.elementBeingSortedStartingIndex],
+      }, 'move');
+      this.stopKeyboardDragAndDrop(sortableElement, this.elementBeingSortedStartingIndex, length);
+    }
+  }
+
+  /**
+   * Sets focus to the drag handle of the drop list element of the given index.
+   * @param dropList
+   * @param index
+   * @param direction
+   */
+  setFocusToDropListElementOfIndex(dropList: HTMLDivElement, index: number, direction: 'up' | 'down') {
+    const newDragHandle = dropList.querySelectorAll(`[cdkDragHandle]`)[index] as HTMLElement;
+    if (newDragHandle) {
+      newDragHandle.focus();
+      if (!this.isElementInViewport(newDragHandle)) {
+        newDragHandle.scrollIntoView(direction === 'up');
+      }
+    }
+  }
+
+  /**
+   * checks if an element is in the viewport
+   * @param el
+   */
+  isElementInViewport(el: HTMLElement) {
+    const rect = el.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
+  /**
+   * Adds an instruction message to the live region when the user might want to sort an element.
+   * @param sortableElement
+   */
+  addInstructionMessageToLiveRegion(sortableElement: HTMLDivElement) {
+    if (!this.elementBeingSorted) {
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.instructions', {
+        itemName: sortableElement.querySelector('input')?.value,
+      }));
+    }
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5d8c0237d7..b64a499d2b 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6777,4 +6777,14 @@
   "forgot-email.form.aria.label": "Enter your e-mail address",
 
   "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+
+  "live-region.ordering.instructions": "Press spacebar to reorder {{ itemName }}.",
+
+  "live-region.ordering.status": "{{ itemName }}, grabbed. Current position in list: {{ index }} of  {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.moved": "{{ itemName }}, moved to position {{ index }} of {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.dropped": "{{ itemName }}, dropped at position {{ index }} of {{ length }}.",
+
+  "dynamic-form-array.sortable-list.label": "Sortable list",
 }

From e1fad603f018ce031e684bcf8696e24c327d91f1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:41:32 +0100
Subject: [PATCH 1193/1286] [DURACOM-288] Enable URL replacement by default

---
 src/environments/environment.production.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 72c49aa370..ac309d4923 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,7 +9,7 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     transferState: true,
-    replaceRestUrl: false,
+    replaceRestUrl: true,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,

From 04e5f59cdfc90b54130f7cf3e1f91855c05d7f70 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:42:20 +0100
Subject: [PATCH 1194/1286] [DURACOM-288] Change properties description

---
 config/config.example.yml             | 20 ++++++--------------
 src/config/server-config.interface.ts |  2 ++
 src/config/ssr-config.interface.ts    |  5 ++---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index dca0d698c6..fbca53ca92 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,14 +19,9 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
-  # A boolean flag indicating whether the SSR configuration is enabled
-  # Defaults to true.
-  enabled: boolean;
-
   # Enable request performance profiling data collection and printing the results in the server console.
-  # Defaults to false.
-  enablePerformanceProfiler: boolean;
-
+  # Defaults to false. Enabling in production is NOT recommended
+  enablePerformanceProfiler: false
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -41,19 +36,16 @@ ssr:
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false,
-
   # Enable state transfer from the server-side application to the client-side application.
   # Defaults to true.
   # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
   # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
   # ensure that users always use the most up-to-date state.
-  transferState: boolean;
-
+  transferState: true
   # When a different REST base URL is used for the server-side application, the generated state contains references to
-  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-  # URLs used by the client application.
-  replaceRestUrl: boolean;
+  # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+  # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+  replaceRestUrl: true
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index cdf23cd146..ad9fa0868a 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -7,5 +7,7 @@ export class ServerConfig implements Config {
   public nameSpace: string;
   public baseUrl?: string;
   public ssrBaseUrl?: string;
+  // This boolean will be automatically set on server startup based on whether "baseUrl" and "ssrBaseUrl"
+  // have different values.
   public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index c9c5f8882b..2ce626b47b 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -33,9 +33,8 @@ export interface SSRConfig extends Config {
 
   /**
    * When a different REST base URL is used for the server-side application, the generated state contains references to
-   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-   * URLs used by the client application.
+   * REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+   * Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
    */
   replaceRestUrl: boolean;
 

From d4536ffbf4839c5e1b5af2d2bdd06090cf500e94 Mon Sep 17 00:00:00 2001
From: Miika Nurminen <minurmin@jyu.fi>
Date: Tue, 28 Jan 2025 23:41:30 +0200
Subject: [PATCH 1195/1286] Ensure that password authentication dialog is shown
 even if only ldap auth method is present

(cherry picked from commit 83d86d7b68a97b2ed2102d13a8300f91b7bd3778)
---
 src/app/core/auth/auth.interceptor.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 4ad856fd88..751ac44049 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -116,12 +116,24 @@ export class AuthInterceptor implements HttpInterceptor {
    */
   private sortAuthMethods(authMethodModels: AuthMethod[]): AuthMethod[] {
     const sortedAuthMethodModels: AuthMethod[] = [];
+    let passwordAuthFound = false;
+    let ldapAuthFound = false;
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType === AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
+        passwordAuthFound = true;
+      }
+      if (method.authMethodType === AuthMethodType.Ldap) {
+        ldapAuthFound = true;
       }
     });
 
+    // Using password authentication method to provide UI for LDAP authentication even if password auth is not present in server
+    if (ldapAuthFound && !(passwordAuthFound)) {
+      sortedAuthMethodModels.push(new AuthMethod(AuthMethodType.Password,0));
+    }
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType !== AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);

From 33d2a438382ad90a31c86bc007cd13468c5309e7 Mon Sep 17 00:00:00 2001
From: Miika Nurminen <minurmin@jyu.fi>
Date: Tue, 28 Jan 2025 23:41:30 +0200
Subject: [PATCH 1196/1286] Ensure that password authentication dialog is shown
 even if only ldap auth method is present

(cherry picked from commit 83d86d7b68a97b2ed2102d13a8300f91b7bd3778)
---
 src/app/core/auth/auth.interceptor.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 84d4c53210..d011d27059 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -129,12 +129,24 @@ export class AuthInterceptor implements HttpInterceptor {
    */
   private sortAuthMethods(authMethodModels: AuthMethod[]): AuthMethod[] {
     const sortedAuthMethodModels: AuthMethod[] = [];
+    let passwordAuthFound = false;
+    let ldapAuthFound = false;
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType === AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
+        passwordAuthFound = true;
+      }
+      if (method.authMethodType === AuthMethodType.Ldap) {
+        ldapAuthFound = true;
       }
     });
 
+    // Using password authentication method to provide UI for LDAP authentication even if password auth is not present in server
+    if (ldapAuthFound && !(passwordAuthFound)) {
+      sortedAuthMethodModels.push(new AuthMethod(AuthMethodType.Password,0));
+    }
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType !== AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);

From a5378e0cf5121692fbae6407314a22549612d5ca Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 30 Jan 2025 16:55:28 -0600
Subject: [PATCH 1197/1286] Add missing UUIDService to test to fix "No provider
 for UUIDService" errors

---
 .../search-facet-option/search-facet-option.component.spec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 53acb1d911..5ddae92b85 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
@@ -19,6 +19,7 @@ import { PaginationComponentOptions } from '../../../../../pagination/pagination
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { UUIDService } from '../../../../../../core/shared/uuid.service';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -113,7 +114,8 @@ describe('SearchFacetOptionComponent', () => {
             }
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
           }
-        }
+        },
+        { provide: UUIDService, useClass: UUIDService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFacetOptionComponent, {

From 8313b9a929dc398ef56162be43fd39ee3ca036c1 Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Fri, 31 Jan 2025 15:05:36 +0100
Subject: [PATCH 1198/1286] [CST-15595] add keyboard drag and drop
 functionality

---
 .../dynamic-form-array.component.html         |  15 +-
 .../dynamic-form-array.component.scss         |  16 +-
 .../dynamic-form-array.component.spec.ts      | 169 ++++++++++++++++++
 .../dynamic-form-array.component.ts           | 152 ++++++++++++++++
 src/assets/i18n/en.json5                      |  10 ++
 5 files changed, 349 insertions(+), 13 deletions(-)
 create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index a7a6b103e4..1d395dafd9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -5,9 +5,11 @@
          [ngClass]="getClass('element', 'control')">
 
       <!-- Draggable Container -->
-      <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList
+           cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
         <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups"
+        <div #sortableElement
+             *ngFor="let groupModel of model.groups; let idx = index; let length = count"
              role="group"
              [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
@@ -16,7 +18,14 @@
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
+               (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+               (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+               (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+               (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+               (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index ce4a89226a..f93fcb1eac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -17,7 +17,6 @@
   margin-right: calc(-0.5 * var(--bs-spacer));
   padding-right: calc(0.5 * var(--bs-spacer));
   .drag-icon {
-    visibility: hidden;
     width: calc(2 * var(--bs-spacer));
     color: var(--bs-gray-600);
     margin: var(--bs-btn-padding-y) 0;
@@ -27,9 +26,6 @@
 
   &:hover, &:focus {
     cursor: grab;
-    .drag-icon {
-      visibility: visible;
-    }
   }
 
 }
@@ -40,18 +36,12 @@
   }
 
   &:focus {
-    .drag-icon {
-      visibility: visible;
-    }
   }
 }
 
 .cdk-drop-list-dragging {
   .drag-handle {
     cursor: grabbing;
-    .drag-icon {
-      visibility: hidden;
-    }
   }
 }
 
@@ -63,3 +53,9 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+
+::ng-deep {
+  .sorting-with-keyboard input {
+    background-color: var(--bs-gray-400);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
new file mode 100644
index 0000000000..dc6565a0a4
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -0,0 +1,169 @@
+import { HttpClient } from '@angular/common/http';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  DynamicFormLayoutService,
+  DynamicFormService,
+  DynamicFormValidationService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of } from 'rxjs';
+
+import {
+  APP_CONFIG,
+} from '../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../environments/environment.test';
+import { SubmissionService } from '../../../../../../submission/submission.service';
+import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { DsDynamicFormArrayComponent } from './dynamic-form-array.component';
+import { UUIDService } from '../../../../../../core/shared/uuid.service';
+import { TranslateLoaderMock } from '../../../../../mocks/translate-loader.mock';
+
+describe('DsDynamicFormArrayComponent', () => {
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  const uuidServiceStub = {
+    generate: () => 'fake-id'
+  };
+
+  let component: DsDynamicFormArrayComponent;
+  let fixture: ComponentFixture<DsDynamicFormArrayComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        DsDynamicFormArrayComponent,
+      ],
+      imports: [
+        ReactiveFormsModule,
+        NgxMaskModule.forRoot(),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+      ],
+      providers: [
+        DynamicFormLayoutService,
+        DynamicFormValidationService,
+        provideMockStore(),
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HttpClient, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: UUIDService, useValue: uuidServiceStub },
+      ],
+    }).overrideComponent(DsDynamicFormArrayComponent, {
+      remove: {
+        imports: [DsDynamicFormControlContainerComponent],
+      },
+    })
+      .compileComponents();
+  });
+
+  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+    const formModel = [
+      new DynamicRowArrayModel({
+        id: 'testFormRowArray',
+        initialCount: 5,
+        notRepeatable: false,
+        relationshipConfig: undefined,
+        submissionId: '1234',
+        isDraggable: true,
+        groupFactory: () => {
+          return [
+            new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
+          ];
+        },
+        required: false,
+        metadataKey: 'dc.contributor.author',
+        metadataFields: ['dc.contributor.author'],
+        hasSelectableMetadata: true,
+        showButtons: true,
+        typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
+      }),
+    ];
+
+    fixture = TestBed.createComponent(DsDynamicFormArrayComponent);
+    component = fixture.componentInstance;
+    component.model = formModel[0] as DynamicRowArrayModel;
+
+    component.group = service.createFormGroup(formModel);
+
+    fixture.detectChanges();
+  }));
+
+  it('should move element up and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 1, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should move element down and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving up from the first element', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 0, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving down from the last element', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 2, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should not move element if keyboard drag is not active', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.elementBeingSorted = null;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[1]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should cancel keyboard drag and drop', () => {
+    const dropList = fixture.debugElement.query(By.css('[cdkDropList]')).nativeElement;
+    component.elementBeingSortedStartingIndex = 2;
+    component.elementBeingSorted = dropList.querySelectorAll('[cdkDragHandle]')[2];
+    component.model.moveGroup(2, 1);
+    fixture.detectChanges();
+    component.cancelKeyboardDragAndDrop(dropList, 1, 3);
+    fixture.detectChanges();
+    expect(component.elementBeingSorted).toBeNull();
+    expect(component.elementBeingSortedStartingIndex).toBeNull();
+  });
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 1cbee3eb90..fb7ee7ac2e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -15,6 +15,8 @@ import {
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-dynamic-form-array',
@@ -31,6 +33,9 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
+  elementBeingSorted: HTMLElement;
+  elementBeingSortedStartingIndex: number;
+
   /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -41,6 +46,8 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected liveRegionService: LiveRegionService,
+              protected translateService: TranslateService,
   ) {
     super(layoutService, validationService);
   }
@@ -94,4 +101,149 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
     }
     return this.control.get([groupModel.startingIndex]);
   }
+
+  /**
+   * Toggles the keyboard drag and drop feature for the given sortable element.
+   * @param event
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  toggleKeyboardDragAndDrop(event: KeyboardEvent, sortableElement: HTMLDivElement, index: number, length: number) {
+    event.preventDefault();
+    if (this.elementBeingSorted) {
+      this.stopKeyboardDragAndDrop(sortableElement, index, length);
+    } else {
+      sortableElement.classList.add('sorting-with-keyboard');
+      this.elementBeingSorted = sortableElement;
+      this.elementBeingSortedStartingIndex = index;
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.status', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Stops the keyboard drag and drop feature.
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  stopKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.elementBeingSorted?.classList.remove('sorting-with-keyboard');
+    this.liveRegionService.clear();
+    if (this.elementBeingSorted) {
+      this.elementBeingSorted = null;
+      this.elementBeingSortedStartingIndex = null;
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.dropped', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Handles the keyboard arrow press event to move the element up or down.
+   * @param event
+   * @param dropList
+   * @param length
+   * @param idx
+   * @param direction
+   */
+  handleArrowPress(event: KeyboardEvent, dropList: HTMLDivElement, length: number, idx: number, direction: 'up' | 'down') {
+    let newIndex = direction === 'up' ? idx - 1 : idx + 1;
+    if (newIndex < 0) {
+      newIndex = length - 1;
+    } else if (newIndex >= length) {
+      newIndex = 0;
+    }
+
+    if (this.elementBeingSorted) {
+      this.model.moveGroup(idx, newIndex - idx);
+      if (hasValue(this.model.groups[newIndex]) && hasValue((this.control as any).controls[newIndex])) {
+        this.onCustomEvent({
+          previousIndex: idx,
+          newIndex,
+          arrayModel: this.model,
+          model: this.model.groups[newIndex].group[0],
+          control: (this.control as any).controls[newIndex],
+        }, 'move');
+        this.liveRegionService.clear();
+        this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.moved', {
+          itemName: this.elementBeingSorted.querySelector('input')?.value,
+          index: newIndex + 1,
+          length,
+        }));
+      }
+      event.preventDefault();
+      // Set focus back to the moved element
+      setTimeout(() => {
+        this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+      });
+    } else {
+      event.preventDefault();
+      this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+    }
+  }
+
+  cancelKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.model.moveGroup(index, this.elementBeingSortedStartingIndex - index);
+    if (hasValue(this.model.groups[this.elementBeingSortedStartingIndex]) && hasValue((this.control as any).controls[this.elementBeingSortedStartingIndex])) {
+      this.onCustomEvent({
+        previousIndex: index,
+        newIndex: this.elementBeingSortedStartingIndex,
+        arrayModel: this.model,
+        model: this.model.groups[this.elementBeingSortedStartingIndex].group[0],
+        control: (this.control as any).controls[this.elementBeingSortedStartingIndex],
+      }, 'move');
+      this.stopKeyboardDragAndDrop(sortableElement, this.elementBeingSortedStartingIndex, length);
+    }
+  }
+
+  /**
+   * Sets focus to the drag handle of the drop list element of the given index.
+   * @param dropList
+   * @param index
+   * @param direction
+   */
+  setFocusToDropListElementOfIndex(dropList: HTMLDivElement, index: number, direction: 'up' | 'down') {
+    const newDragHandle = dropList.querySelectorAll(`[cdkDragHandle]`)[index] as HTMLElement;
+    if (newDragHandle) {
+      newDragHandle.focus();
+      if (!this.isElementInViewport(newDragHandle)) {
+        newDragHandle.scrollIntoView(direction === 'up');
+      }
+    }
+  }
+
+  /**
+   * checks if an element is in the viewport
+   * @param el
+   */
+  isElementInViewport(el: HTMLElement) {
+    const rect = el.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
+  /**
+   * Adds an instruction message to the live region when the user might want to sort an element.
+   * @param sortableElement
+   */
+  addInstructionMessageToLiveRegion(sortableElement: HTMLDivElement) {
+    if (!this.elementBeingSorted) {
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.instructions', {
+        itemName: sortableElement.querySelector('input')?.value,
+      }));
+    }
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0ad3822813..bd6289cc41 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -5401,4 +5401,14 @@
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "live-region.ordering.instructions": "Press spacebar to reorder {{ itemName }}.",
+
+  "live-region.ordering.status": "{{ itemName }}, grabbed. Current position in list: {{ index }} of  {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.moved": "{{ itemName }}, moved to position {{ index }} of {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.dropped": "{{ itemName }}, dropped at position {{ index }} of {{ length }}.",
+
+  "dynamic-form-array.sortable-list.label": "Sortable list",
 }

From ac3e87db05d578b7ee80de583781005592cf4734 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 31 Jan 2025 19:59:33 +0100
Subject: [PATCH 1199/1286] [DURACOM-288] Add convention SSR REST environment
 variable

---
 src/config/config.server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 69825b6409..3cbce3a42b 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -236,6 +236,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   appConfig.rest.port = isNotEmpty(ENV('REST_PORT', true)) ? getNumberFromString(ENV('REST_PORT', true)) : appConfig.rest.port;
   appConfig.rest.nameSpace = isNotEmpty(ENV('REST_NAMESPACE', true)) ? ENV('REST_NAMESPACE', true) : appConfig.rest.nameSpace;
   appConfig.rest.ssl = isNotEmpty(ENV('REST_SSL', true)) ? getBooleanFromString(ENV('REST_SSL', true)) : appConfig.rest.ssl;
+  appConfig.rest.ssrBaseUrl = isNotEmpty(ENV('REST_SSRBASEURL', true)) ? ENV('REST_SSRBASEURL', true) : appConfig.rest.ssrBaseUrl;
 
   // apply build defined production
   appConfig.production = env === 'production';

From 83d24f8c216aa07199973a7dc716b55b34d09a54 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 31 Jan 2025 14:28:55 -0600
Subject: [PATCH 1200/1286] Ensure "/reload/" (hard reload) path is included in
 SSR paths.

---
 config/config.example.yml                  | 4 +++-
 src/environments/environment.production.ts | 2 +-
 src/environments/environment.test.ts       | 2 +-
 src/environments/environment.ts            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index c6d71714ef..3efc5f5676 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -24,7 +24,9 @@ ssr:
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
-  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # NOTE: The "/handle/" path ensures Handle redirects work via SSR.  The "/reload/" path ensures
+  # hard refreshes (e.g. after login) trigger SSR while fully reloading the page.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ]
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 8159fff2ea..33434183cd 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,7 +8,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 17d4e8ed10..7e967fb227 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,7 +12,7 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4ac586d899..1f409b232f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,7 +13,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },

From 65834fc86ef6910c77734107dc52dd12ec9d72f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 02:33:57 +0000
Subject: [PATCH 1201/1286] Bump isbot from 5.1.21 to 5.1.22

Bumps [isbot](https://github.com/omrilotan/isbot) from 5.1.21 to 5.1.22.
- [Changelog](https://github.com/omrilotan/isbot/blob/main/CHANGELOG.md)
- [Commits](https://github.com/omrilotan/isbot/compare/v5.1.21...v5.1.22)

---
updated-dependencies:
- dependency-name: isbot
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..916b05b68c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
-        "isbot": "^5.1.21",
+        "isbot": "^5.1.22",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
@@ -14480,9 +14480,10 @@
       }
     },
     "node_modules/isbot": {
-      "version": "5.1.21",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.21.tgz",
-      "integrity": "sha512-0q3naRVpENL0ReKHeNcwn/G7BDynp0DqZUckKyFtM9+hmpnPqgm8+8wbjiVZ0XNhq1wPQV28/Pb8Snh5adeUHA==",
+      "version": "5.1.22",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.22.tgz",
+      "integrity": "sha512-RqCFY3cJy3c2y1I+rMn81cfzAR4XJwfPBC+M8kffUjbPzxApzyyv7Tbm1C/gXXq2dSCuD238pKFEWlQMTWsTFw==",
+      "license": "Unlicense",
       "engines": {
         "node": ">=18"
       }
diff --git a/package.json b/package.json
index 9e72a4cc9d..b07e2fe68e 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.21",
+    "isbot": "^5.1.22",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",

From 21f4dc5fd9c85392c76a6238179e46e4c562b938 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 02:34:13 +0000
Subject: [PATCH 1202/1286] Bump @types/lodash from 4.17.14 to 4.17.15

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.14 to 4.17.15.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..1729de45a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.14",
+        "@types/lodash": "^4.17.15",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -6898,10 +6898,11 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz",
-      "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==",
-      "dev": true
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
diff --git a/package.json b/package.json
index 9e72a4cc9d..32fe70edb3 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.14",
+    "@types/lodash": "^4.17.15",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",

From 72919cd8676a18df472f9a2b5ee13924e9dccf04 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 3 Feb 2025 10:47:40 +0100
Subject: [PATCH 1203/1286] Avoid retrieving user suggestions if Researcher
 profiles are disabled

---
 .../suggestion-targets.effects.ts             | 62 ++++++++++++++-----
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
index de92e98ef8..4a1b413872 100644
--- a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
@@ -13,6 +13,10 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
+import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 
 import {
   AuthActionTypes,
@@ -72,14 +76,23 @@ export class SuggestionTargetsEffects {
   ), { dispatch: false });
 
   /**
-   * Show a notification on error.
+   * Retrieve the current user suggestions after retrieving the authenticated user
    */
   retrieveUserTargets$ = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS),
     switchMap((action: RetrieveAuthenticatedEpersonSuccessAction) => {
-      return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
-        map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-      );
+      return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+          if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+            return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
+              map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+            );
+          } else {
+            return of(new AddUserSuggestionsAction([]));
+          }
+        },
+        ));
     })));
 
   /**
@@ -91,16 +104,35 @@ export class SuggestionTargetsEffects {
       return this.store$.select((state: any) => state.core.auth.userId)
         .pipe(
           switchMap((userId: string) => {
-            return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
-              .pipe(
-                map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-                catchError((error: unknown) => {
-                  if (error instanceof Error) {
-                    console.error(error.message);
-                  }
-                  return of(new RefreshUserSuggestionsErrorAction());
-                }),
-              );
+            if (!userId) {
+              return of(new AddUserSuggestionsAction([]));
+            }
+            return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+              getFirstCompletedRemoteData(),
+              switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+                if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+                  return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
+                    .pipe(
+                      map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+                      catchError((error: unknown) => {
+                        if (error instanceof Error) {
+                          console.error(error.message);
+                        }
+                        return of(new RefreshUserSuggestionsErrorAction());
+                      }),
+                    );
+                } else {
+                  return of(new AddUserSuggestionsAction([]));
+                }
+              },
+              ),
+              catchError((error: unknown) => {
+                if (error instanceof Error) {
+                  console.error(error.message);
+                }
+                return of(new RefreshUserSuggestionsErrorAction());
+              }),
+            );
           }),
           catchError((error: unknown) => {
             if (error instanceof Error) {
@@ -119,6 +151,7 @@ export class SuggestionTargetsEffects {
    * @param {TranslateService} translate
    * @param {NotificationsService} notificationsService
    * @param {SuggestionsService} suggestionsService
+   * @param {ConfigurationDataService} configurationService
    */
   constructor(
     private actions$: Actions,
@@ -126,6 +159,7 @@ export class SuggestionTargetsEffects {
     private translate: TranslateService,
     private notificationsService: NotificationsService,
     private suggestionsService: SuggestionsService,
+    private configurationService: ConfigurationDataService,
   ) {
   }
 }

From d92424e2f449968b6cd02867173c82b437d8a6c2 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 31 Jan 2025 14:28:55 -0600
Subject: [PATCH 1204/1286] Ensure "/reload/" (hard reload) path is included in
 SSR paths.

(cherry picked from commit 83d24f8c216aa07199973a7dc716b55b34d09a54)
---
 config/config.example.yml                  | 4 +++-
 src/environments/environment.production.ts | 2 +-
 src/environments/environment.test.ts       | 2 +-
 src/environments/environment.ts            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index c79c87f4d7..ba8b1b5a09 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -24,7 +24,9 @@ universal:
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
-  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # NOTE: The "/handle/" path ensures Handle redirects work via SSR.  The "/reload/" path ensures
+  # hard refreshes (e.g. after login) trigger SSR while fully reloading the page.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ]
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index c3cb74651b..d69389cfe3 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,7 +9,7 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index e6ffe85df6..e01c67480c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,7 +12,7 @@ export const environment: BuildConfig = {
     async: true,
     time: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 419238f264..e3258cb4e2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,7 +14,7 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },

From 04695b252053303a3e093235a1f2d47742bfbd2d Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 31 Jan 2025 14:28:55 -0600
Subject: [PATCH 1205/1286] Ensure "/reload/" (hard reload) path is included in
 SSR paths.

(cherry picked from commit 83d24f8c216aa07199973a7dc716b55b34d09a54)
---
 config/config.example.yml                  | 4 +++-
 src/environments/environment.production.ts | 2 +-
 src/environments/environment.test.ts       | 2 +-
 src/environments/environment.ts            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 79aaab8d5f..a7edc95e5f 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -24,7 +24,9 @@ ssr:
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
   # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
-  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # NOTE: The "/handle/" path ensures Handle redirects work via SSR.  The "/reload/" path ensures
+  # hard refreshes (e.g. after login) trigger SSR while fully reloading the page.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ]
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 8159fff2ea..33434183cd 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,7 +8,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 17d4e8ed10..7e967fb227 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,7 +12,7 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 4ac586d899..1f409b232f 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,7 +13,7 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },

From 8562ddb14b5998ac3b349fb909cdeba6410d7ebd Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Tue, 30 Jul 2024 20:19:18 +0200
Subject: [PATCH 1206/1286] [DURACOM-288] Provide a setting to use a different
 REST url during SSR execution

---
 server.ts                                     |   9 +-
 src/app/app.config.ts                         |   6 +
 .../dspace-rest.interceptor.spec.ts           | 194 ++++++++++++++++++
 .../dspace-rest/dspace-rest.interceptor.ts    |  52 +++++
 .../server-hard-redirect.service.spec.ts      |   3 +-
 .../services/server-hard-redirect.service.ts  |  19 +-
 src/app/thumbnail/thumbnail.component.ts      |  28 ++-
 src/config/server-config.interface.ts         |   2 +
 src/modules/app/browser-init.service.ts       |  23 ++-
 src/modules/app/server-init.service.ts        |  11 +-
 10 files changed, 319 insertions(+), 28 deletions(-)
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.ts

diff --git a/server.ts b/server.ts
index 8c5978937f..1ba73243dc 100644
--- a/server.ts
+++ b/server.ts
@@ -81,6 +81,9 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -156,7 +159,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -165,7 +168,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -623,7 +626,7 @@ function start() {
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 61a04c8adb..77b29206cb 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -54,6 +54,7 @@ import {
 } from './app-routes';
 import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
 import { AuthInterceptor } from './core/auth/auth.interceptor';
+import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 import { LocaleInterceptor } from './core/locale/locale.interceptor';
 import { LogInterceptor } from './core/log/log.interceptor';
 import {
@@ -148,6 +149,11 @@ export const commonAppConfig: ApplicationConfig = {
       useClass: LogInterceptor,
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: DspaceRestInterceptor,
+      multi: true,
+    },
     // register the dynamic matcher used by form. MUST be provided by the app module
     ...DYNAMIC_MATCHER_PROVIDERS,
     provideCore(),
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
new file mode 100644
index 0000000000..4a47ffe9fd
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
@@ -0,0 +1,194 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { PLATFORM_ID } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestInterceptor } from './dspace-rest.interceptor';
+import { DspaceRestService } from './dspace-rest.service';
+
+describe('DspaceRestInterceptor', () => {
+  let httpMock: HttpTestingController;
+  let httpClient: HttpClient;
+  const appConfig: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+    },
+  };
+  const appConfigWithSSR: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+      ssrBaseUrl: 'http://ssr.example.com/server',
+    },
+  };
+
+  describe('When SSR base URL is not set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+
+  describe('When SSR base URL is set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items');
+        req.flush({});
+        httpMock.verify();
+      });
+
+      it('should not replace any query param containing the base URL', () => {
+        const url = 'http://api.example.com/server/items?url=http://api.example.com/server/item/1';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+});
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
new file mode 100644
index 0000000000..efd2c12b5d
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
@@ -0,0 +1,52 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { isEmpty } from '../../shared/empty.util';
+
+@Injectable()
+/**
+ * This Interceptor is used to use the configured base URL for the request made during SSR execution
+ */
+export class DspaceRestInterceptor implements HttpInterceptor {
+
+  /**
+   * Contains the configured application base URL
+   * @protected
+   */
+  protected baseUrl: string;
+  protected ssrBaseUrl: string;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+  ) {
+    this.baseUrl = this.appConfig.rest.baseUrl;
+    this.ssrBaseUrl = this.appConfig.rest.ssrBaseUrl;
+  }
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    if (isPlatformBrowser(this.platformId) || isEmpty(this.ssrBaseUrl) || this.baseUrl === this.ssrBaseUrl) {
+      return next.handle(request);
+    }
+
+    // Different SSR Base URL specified so replace it in the current request url
+    const url = request.url.replace(this.baseUrl, this.ssrBaseUrl);
+    const newRequest: HttpRequest<any> = request.clone({ url });
+    return next.handle(newRequest);
+  }
+}
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 27777ed7ba..d3247dd0dd 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
+import { environment } from '../../../environments/environment.test';
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -7,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index e1ded1568c..1592d9bf1c 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -7,10 +7,15 @@ import {
   Response,
 } from 'express';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import {
   REQUEST,
   RESPONSE,
 } from '../../../express.tokens';
+import { isNotEmpty } from '../../shared/empty.util';
 import { HardRedirectService } from './hard-redirect.service';
 
 /**
@@ -20,6 +25,7 @@ import { HardRedirectService } from './hard-redirect.service';
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(REQUEST) protected req: Request,
     @Inject(RESPONSE) protected res: Response,
   ) {
@@ -35,17 +41,22 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
   redirect(url: string, statusCode?: number) {
-
     if (url === this.req.url) {
       return;
     }
 
+    let redirectUrl = url;
+    // If redirect url contains SSR base url then replace with public base url
+    if (isNotEmpty(this.appConfig.rest.ssrBaseUrl) && this.appConfig.rest.baseUrl !== this.appConfig.rest.ssrBaseUrl) {
+      redirectUrl = url.replace(this.appConfig.rest.ssrBaseUrl, this.appConfig.rest.baseUrl);
+    }
+
     if (this.res.finished) {
       const req: any = this.req;
       req._r_count = (req._r_count || 0) + 1;
 
       console.warn('Attempted to redirect on a finished response. From',
-        this.req.url, 'to', url);
+        this.req.url, 'to', redirectUrl);
 
       if (req._r_count > 10) {
         console.error('Detected a redirection loop. killing the nodejs process');
@@ -59,9 +70,9 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      console.info(`Redirecting from ${this.req.url} to ${redirectUrl} with ${status}`);
 
-      this.res.redirect(status, url);
+      this.res.redirect(status, redirectUrl);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
       // So we just let it end its work, though we have already closed
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index cc583c3998..7b22dde4cd 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,8 +1,13 @@
-import { CommonModule } from '@angular/common';
+import {
+  CommonModule,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
+  Inject,
   Input,
   OnChanges,
+  PLATFORM_ID,
   SimpleChanges,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -76,6 +81,7 @@ export class ThumbnailComponent implements OnChanges {
   isLoading = true;
 
   constructor(
+    @Inject(PLATFORM_ID) private platformID: any,
     protected auth: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected fileService: FileService,
@@ -87,16 +93,18 @@ export class ThumbnailComponent implements OnChanges {
    * Use a default image if no actual image is available.
    */
   ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.thumbnail)) {
-      this.setSrc(this.defaultImage);
-      return;
-    }
+    if (isPlatformBrowser(this.platformID)) {
+      if (hasNoValue(this.thumbnail)) {
+        this.setSrc(this.defaultImage);
+        return;
+      }
 
-    const src = this.contentHref;
-    if (hasValue(src)) {
-      this.setSrc(src);
-    } else {
-      this.setSrc(this.defaultImage);
+      const src = this.contentHref;
+      if (hasValue(src)) {
+        this.setSrc(src);
+      } else {
+        this.setSrc(this.defaultImage);
+      }
     }
   }
 
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index 8797ea3d60..cdf23cd146 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -6,4 +6,6 @@ export class ServerConfig implements Config {
   public port: number;
   public nameSpace: string;
   public baseUrl?: string;
+  public ssrBaseUrl?: string;
+  public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 8cd869e15f..b4be609dea 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -144,15 +144,20 @@ export class BrowserInitService extends InitService {
    * @private
    */
   private async loadAppState(): Promise<boolean> {
-    const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
-    this.transferState.remove(InitService.NGRX_STATE);
-    this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
-    return lastValueFrom(
-      this.store.select(coreSelector).pipe(
-        find((core: any) => isNotEmpty(core)),
-        map(() => true),
-      ),
-    );
+    // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
+    if (!this.appConfig.rest.hasSsrBaseUrl) {
+      const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
+      this.transferState.remove(InitService.NGRX_STATE);
+      this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
+      return lastValueFrom(
+        this.store.select(coreSelector).pipe(
+          find((core: any) => isNotEmpty(core)),
+          map(() => true),
+        ),
+      );
+    } else {
+      return Promise.resolve(true);
+    }
   }
 
   private trackAuthTokenExpiration(): void {
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index e22feec09a..f8bd1ce306 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,6 +21,7 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
+import { isNotEmpty } from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
@@ -100,6 +101,14 @@ export class ServerInitService extends InitService {
   }
 
   private saveAppConfigForCSR(): void {
-    this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) {
+      // Avoid to transfer ssrBaseUrl in order to prevent security issues
+      const config: AppConfig = Object.assign({}, environment as AppConfig, {
+        rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }),
+      });
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, config);
+    } else {
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    }
   }
 }

From 31ed56936c953c2ffc054b4ebc6e6e58ab3a37bc Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 27 Sep 2024 18:06:15 +0200
Subject: [PATCH 1207/1286] [DURACOM-288] Additional test for thumbnail
 component

---
 src/app/thumbnail/thumbnail.component.spec.ts | 579 ++++++++++--------
 1 file changed, 322 insertions(+), 257 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 10e461112b..f81089e57c 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -2,6 +2,7 @@ import {
   DebugElement,
   Pipe,
   PipeTransform,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -48,298 +49,261 @@ describe('ThumbnailComponent', () => {
   let authService;
   let authorizationService;
   let fileService;
+  let spy;
 
-  beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('AuthService', {
-      isAuthenticated: observableOf(true),
-    });
-    authorizationService = jasmine.createSpyObj('AuthorizationService', {
-      isAuthorized: observableOf(true),
-    });
-    fileService = jasmine.createSpyObj('FileService', {
-      retrieveFileDownloadLink: null,
-    });
-    fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
-
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        ThumbnailComponent,
-        SafeUrlPipe,
-        MockTranslatePipe,
-        VarDirective,
-      ],
-      providers: [
-        { provide: AuthService, useValue: authService },
-        { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService },
-        { provide: ThemeService, useValue: getMockThemeService() },
-      ],
-    }).overrideComponent(ThumbnailComponent, {
-      add: {
-        imports: [MockTranslatePipe],
-      },
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThumbnailComponent);
-    fixture.detectChanges();
-
-    authService = TestBed.inject(AuthService);
-
-    comp = fixture.componentInstance; // ThumbnailComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
-
-  describe('loading', () => {
-    it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading).toBeTrue();
-    });
-
-    it('should set isLoading$ to false once an image is successfully loaded', () => {
-      comp.setSrc('http://bit.stream');
-      fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should set isLoading$ to false once the src is set to null', () => {
-      comp.setSrc(null);
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should show a loading animation while isLoading$ is true', () => {
-      expect(de.query(By.css('ds-loading'))).toBeTruthy();
-
-      comp.isLoading = false;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
-    });
-
-    describe('with a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = 'https://bit.stream';
-        fixture.detectChanges();
+  describe('when platform is browser', () => {
+    beforeEach(waitForAsync(() => {
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
       });
-
-      it('should render but hide the image while loading and show it once done', () => {
-        let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeTrue();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeFalsy();
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
       });
-
-    });
-
-    describe('without a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = null;
-        fixture.detectChanges();
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
       });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
-      it('should only show the HTML placeholder once done loading', () => {
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
-      });
-    });
-
-  });
-
-  const errorHandler = () => {
-    let setSrcSpy;
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'browser' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
 
     beforeEach(() => {
-      // disconnect error handler to be sure it's only called once
-      const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-      img.nativeNode.onerror = null;
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      fixture.detectChanges();
 
-      comp.ngOnChanges({});
-      setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
     });
 
-    describe('retry with authentication token', () => {
-      it('should remember that it already retried once', () => {
-        expect(comp.retriedWithToken).toBeFalse();
-        comp.errorHandler();
-        expect(comp.retriedWithToken).toBeTrue();
+    describe('loading', () => {
+      it('should start out with isLoading$ true', () => {
+        expect(comp.isLoading).toBeTrue();
       });
 
-      describe('if not logged in', () => {
+      it('should set isLoading$ to false once an image is successfully loaded', () => {
+        comp.setSrc('http://bit.stream');
+        fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should set isLoading$ to false once the src is set to null', () => {
+        comp.setSrc(null);
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should show a loading animation while isLoading$ is true', () => {
+        expect(de.query(By.css('ds-loading'))).toBeTruthy();
+
+        comp.isLoading = false;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
+      });
+
+      describe('with a thumbnail image', () => {
         beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(false));
+          comp.src = 'https://bit.stream';
+          fixture.detectChanges();
         });
 
-        it('should fall back to default', () => {
+        it('should render but hide the image while loading and show it once done', () => {
+          let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeTrue();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeFalsy();
+        });
+
+      });
+
+      describe('without a thumbnail image', () => {
+        beforeEach(() => {
+          comp.src = null;
+          fixture.detectChanges();
+        });
+
+        it('should only show the HTML placeholder once done loading', () => {
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
+        });
+      });
+
+    });
+
+    const errorHandler = () => {
+      let setSrcSpy;
+
+      beforeEach(() => {
+        // disconnect error handler to be sure it's only called once
+        const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+        img.nativeNode.onerror = null;
+
+        comp.ngOnChanges({});
+        setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      });
+
+      describe('retry with authentication token', () => {
+        it('should remember that it already retried once', () => {
+          expect(comp.retriedWithToken).toBeFalse();
           comp.errorHandler();
-          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-        });
-      });
-
-      describe('if logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(true));
+          expect(comp.retriedWithToken).toBeTrue();
         });
 
-        describe('and authorized to download the thumbnail', () => {
+        describe('if not logged in', () => {
           beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(true));
-          });
-
-          it('should add an authentication token to the thumbnail URL', () => {
-            comp.errorHandler();
-
-            if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              // If we failed to retrieve the Bitstream in the first place, fall back to the default
-              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-            } else {
-              expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
-            }
-          });
-        });
-
-        describe('but not authorized to download the thumbnail', () => {
-          beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            authService.isAuthenticated.and.returnValue(observableOf(false));
           });
 
           it('should fall back to default', () => {
             comp.errorHandler();
-
             expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-
-            // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
-            if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              expect(authorizationService.isAuthorized).toHaveBeenCalled();
-            }
           });
         });
+
+        describe('if logged in', () => {
+          beforeEach(() => {
+            authService.isAuthenticated.and.returnValue(observableOf(true));
+          });
+
+          describe('and authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(true));
+            });
+
+            it('should add an authentication token to the thumbnail URL', () => {
+              comp.errorHandler();
+
+              if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                // If we failed to retrieve the Bitstream in the first place, fall back to the default
+                expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+              } else {
+                expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
+              }
+            });
+          });
+
+          describe('but not authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            });
+
+            it('should fall back to default', () => {
+              comp.errorHandler();
+
+              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+
+              // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
+              if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                expect(authorizationService.isAuthorized).toHaveBeenCalled();
+              }
+            });
+          });
+        });
+      });
+
+      describe('after retrying with token', () => {
+        beforeEach(() => {
+          comp.retriedWithToken = true;
+        });
+
+        it('should fall back to default', () => {
+          comp.errorHandler();
+          expect(authService.isAuthenticated).not.toHaveBeenCalled();
+          expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
+          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+        });
+      });
+    };
+
+    describe('fallback', () => {
+      describe('if there is a default image', () => {
+        it('should display the default image', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+          expect(comp.src).toBe(comp.defaultImage);
+        });
+
+        it('should include the alt text', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+
+          fixture.detectChanges();
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
+          expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+        });
+      });
+
+      describe('if there is no default image', () => {
+        it('should display the HTML placeholder', () => {
+          comp.src = 'http://default.img';
+          comp.defaultImage = null;
+          comp.errorHandler();
+          expect(comp.src).toBe(null);
+
+          fixture.detectChanges();
+          const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+          expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
+        });
       });
     });
 
-    describe('after retrying with token', () => {
+    describe('with thumbnail as Bitstream', () => {
+      let thumbnail;
       beforeEach(() => {
-        comp.retriedWithToken = true;
-      });
-
-      it('should fall back to default', () => {
-        comp.errorHandler();
-        expect(authService.isAuthenticated).not.toHaveBeenCalled();
-        expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
-        expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-      });
-    });
-  };
-
-  describe('fallback', () => {
-    describe('if there is a default image', () => {
-      it('should display the default image', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-        expect(comp.src).toBe(comp.defaultImage);
-      });
-
-      it('should include the alt text', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if there is no default image', () => {
-      it('should display the HTML placeholder', () => {
-        comp.src = 'http://default.img';
-        comp.defaultImage = null;
-        comp.errorHandler();
-        expect(comp.src).toBe(null);
-
-        fixture.detectChanges();
-        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
-        expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
-      });
-    });
-  });
-
-  describe('with thumbnail as Bitstream', () => {
-    let thumbnail;
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-      comp.thumbnail = thumbnail;
-    });
-
-    describe('if content can be loaded', () => {
-      it('should display an image', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
-      });
-
-      it('should include the alt text', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if content can\'t be loaded', () => {
-      errorHandler();
-    });
-  });
-
-  describe('with thumbnail as RemoteData<Bitstream>', () => {
-    let thumbnail: Bitstream;
-
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-    });
-
-    describe('if RemoteData succeeded', () => {
-      beforeEach(() => {
-        comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
+        comp.thumbnail = thumbnail;
       });
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
         });
 
-        it('should display the alt text', () => {
+        it('should include the alt text', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
         });
       });
@@ -349,16 +313,117 @@ describe('ThumbnailComponent', () => {
       });
     });
 
-    describe('if RemoteData failed', () => {
+    describe('with thumbnail as RemoteData<Bitstream>', () => {
+      let thumbnail: Bitstream;
+
       beforeEach(() => {
-        comp.thumbnail = createFailedRemoteDataObject();
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
       });
 
-      it('should show the default image', () => {
-        comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges({});
-        expect(comp.src).toBe('default/image.jpg');
+      describe('if RemoteData succeeded', () => {
+        beforeEach(() => {
+          comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        });
+
+        describe('if content can be loaded', () => {
+          it('should display an image', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
+          });
+
+          it('should display the alt text', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+          });
+        });
+
+        describe('if content can\'t be loaded', () => {
+          errorHandler();
+        });
+      });
+
+      describe('if RemoteData failed', () => {
+        beforeEach(() => {
+          comp.thumbnail = createFailedRemoteDataObject();
+        });
+
+        it('should show the default image', () => {
+          comp.defaultImage = 'default/image.jpg';
+          comp.ngOnChanges({});
+          expect(comp.src).toBe('default/image.jpg');
+        });
       });
     });
   });
+
+  describe('when platform is server', () => {
+    beforeEach(waitForAsync(() => {
+
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'server' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      spyOn(fixture.componentInstance, 'setSrc').and.callThrough();
+      fixture.detectChanges();
+
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
+
+    it('should start out with isLoading$ true', () => {
+      expect(comp.isLoading).toBeTrue();
+      expect(de.query(By.css('ds-loading'))).toBeTruthy();
+    });
+
+    it('should not call setSrc', () => {
+      expect(comp.setSrc).not.toHaveBeenCalled();
+    });
+
+  });
 });

From a78a910718105772758eee6430b42122029baebd Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 20 Nov 2024 12:58:38 +0100
Subject: [PATCH 1208/1286] Add configuration to toggle replace/transfer

---
 server.ts                                | 7 +++++++
 src/config/default-app-config.ts         | 3 +++
 src/config/ui-server-config.interface.ts | 3 +++
 src/modules/app/browser-init.service.ts  | 6 ++++--
 src/modules/app/server-init.service.ts   | 4 +++-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server.ts b/server.ts
index 1ba73243dc..60ba1f2288 100644
--- a/server.ts
+++ b/server.ts
@@ -269,6 +269,13 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
     })
     .then((html) => {
       if (hasValue(html)) {
+        // Replace REST URL with UI URL
+        if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+          const t0 = Date.now();
+          html = html.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
+          console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
+        }
+
         // save server side rendered page to cache (if any are enabled)
         saveToCache(req, html);
         if (sendToUser) {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3c5e0ef0da..e81f77bff5 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -52,6 +52,9 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
+
+    transferState: true,
+    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 70e2fa3e26..2e58f9d6de 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,4 +13,7 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
+
+  transferState: boolean;
+  replaceRestUrl: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index b4be609dea..cf7ccf17a2 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -113,7 +113,9 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      await this.loadAppState();
+      if (this.appConfig.ui.transferState) {
+        await this.loadAppState();
+      }
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -145,7 +147,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (!this.appConfig.rest.hasSsrBaseUrl) {
+    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index f8bd1ce306..0b5c2f10e3 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -68,7 +68,9 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      this.saveAppState();
+      if (this.appConfig.ui.transferState) {
+        this.saveAppState();
+      }
       this.initCorrelationId();
 
       this.checkEnvironment();

From 1a3fe013bbcbd769adcba29ff356317311bb4843 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:22 +0100
Subject: [PATCH 1209/1286] [DURACOM-288] Refactoring configuration to transfer
 state

---
 server.ts                                  |  4 +---
 src/config/default-app-config.ts           |  3 ---
 src/config/ssr-config.interface.ts         | 18 ++++++++++++++
 src/config/ui-server-config.interface.ts   |  3 ---
 src/environments/environment.production.ts |  2 ++
 src/environments/environment.test.ts       |  2 ++
 src/environments/environment.ts            |  2 ++
 src/modules/app/browser-init.service.ts    |  9 ++++---
 src/modules/app/server-init.service.ts     | 28 ++++++++++++----------
 9 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/server.ts b/server.ts
index 60ba1f2288..4544a7c3ba 100644
--- a/server.ts
+++ b/server.ts
@@ -270,10 +270,8 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
     .then((html) => {
       if (hasValue(html)) {
         // Replace REST URL with UI URL
-        if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
-          const t0 = Date.now();
+        if (environment.ssr.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
           html = html.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
-          console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
         }
 
         // save server side rendered page to cache (if any are enabled)
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index e81f77bff5..3c5e0ef0da 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -52,9 +52,6 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
-
-    transferState: true,
-    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 4def73962a..c9c5f8882b 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -21,6 +21,24 @@ export interface SSRConfig extends Config {
    */
   inlineCriticalCss: boolean;
 
+  /**
+   * Enable state transfer from the server-side application to the client-side application.
+   * Defaults to true.
+   *
+   * Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+   * Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+   * ensure that users always use the most up-to-date state.
+   */
+  transferState: boolean;
+
+  /**
+   * When a different REST base URL is used for the server-side application, the generated state contains references to
+   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+   * URLs used by the client application.
+   */
+  replaceRestUrl: boolean;
+
   /**
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 2e58f9d6de..70e2fa3e26 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,7 +13,4 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
-
-  transferState: boolean;
-  replaceRestUrl: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 33434183cd..da1035300a 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,6 +8,8 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 7e967fb227..d7e9067ea3 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,8 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1f409b232f..39ab31de03 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,8 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index cf7ccf17a2..38b5021714 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -54,6 +54,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { extendEnvironmentWithAppConfig } from '../../config/config.util';
 import { DefaultAppConfig } from '../../config/default-app-config';
 import { environment } from '../../environments/environment';
@@ -70,7 +71,7 @@ export class BrowserInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -113,9 +114,7 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      if (this.appConfig.ui.transferState) {
-        await this.loadAppState();
-      }
+      await this.loadAppState();
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -147,7 +146,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
+    if (this.appConfig.ssr.transferState) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 0b5c2f10e3..717a22f68d 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,7 +21,10 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
-import { isNotEmpty } from '../../app/shared/empty.util';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
@@ -30,6 +33,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { environment } from '../../environments/environment';
 
 /**
@@ -41,7 +45,7 @@ export class ServerInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -68,9 +72,7 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      if (this.appConfig.ui.transferState) {
-        this.saveAppState();
-      }
+      this.saveAppState();
       this.initCorrelationId();
 
       this.checkEnvironment();
@@ -92,14 +94,16 @@ export class ServerInitService extends InitService {
    * @private
    */
   private saveAppState() {
-    this.transferState.onSerialize(InitService.NGRX_STATE, () => {
-      let state;
-      this.store.pipe(take(1)).subscribe((saveState: any) => {
-        state = saveState;
-      });
+    if (this.appConfig.ssr.transferState && (isEmpty(this.appConfig.rest.ssrBaseUrl) || this.appConfig.ssr.replaceRestUrl)) {
+      this.transferState.onSerialize(InitService.NGRX_STATE, () => {
+        let state;
+        this.store.pipe(take(1)).subscribe((saveState: any) => {
+          state = saveState;
+        });
 
-      return state;
-    });
+        return state;
+      });
+    }
   }
 
   private saveAppConfigForCSR(): void {

From 9bf1fbd2192764cea1c76bbff4a1325b0f7b52b1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:45 +0100
Subject: [PATCH 1210/1286] [DURACOM-288] Add missing settings to
 config.example.yml

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

diff --git a/config/config.example.yml b/config/config.example.yml
index a7edc95e5f..632ef09a9b 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,6 +19,14 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
+  # A boolean flag indicating whether the SSR configuration is enabled
+  # Defaults to true.
+  enabled: boolean;
+
+  # Enable request performance profiling data collection and printing the results in the server console.
+  # Defaults to false.
+  enablePerformanceProfiler: boolean;
+
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -36,6 +44,19 @@ ssr:
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false
 
+  # Enable state transfer from the server-side application to the client-side application.
+  # Defaults to true.
+  # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+  # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+  # ensure that users always use the most up-to-date state.
+  transferState: boolean;
+
+  # When a different REST base URL is used for the server-side application, the generated state contains references to
+  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+  # URLs used by the client application.
+  replaceRestUrl: boolean;
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -45,6 +66,9 @@ rest:
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
+  # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
+  # server namespace (uncomment to use it).
+  #ssrBaseUrl: http://localhost:8080/server
 
 # Caching settings
 cache:

From deb752c06ed3eab8b82fd05b03277d6aaa99390f Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 19:09:23 +0100
Subject: [PATCH 1211/1286] [DURACOM-288] Add unit test to test SSR url replace

---
 .../server-hard-redirect.service.spec.ts      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index d3247dd0dd..a904a8e66c 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -8,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
+  let service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
@@ -69,4 +69,23 @@ describe('ServerHardRedirectService', () => {
     });
   });
 
+  describe('when SSR base url is set', () => {
+    const redirect = 'https://private-url:4000/server/api/bitstreams/uuid';
+    const replacedUrl = 'https://public-url/server/api/bitstreams/uuid';
+    const environmentWithSSRUrl: any = { ...environment, ...{ ...environment.rest, rest: {
+      ssrBaseUrl: 'https://private-url:4000/server',
+      baseUrl: 'https://public-url/server',
+    } } };
+    service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse);
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should perform a 302 redirect', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, replacedUrl);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
 });

From d52a09406dbda77c02911b981cf7bc065bdba53f Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:41:32 +0100
Subject: [PATCH 1212/1286] [DURACOM-288] Enable URL replacement by default

---
 src/environments/environment.production.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index da1035300a..9bd663922c 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,7 +9,7 @@ export const environment: Partial<BuildConfig> = {
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
     transferState: true,
-    replaceRestUrl: false,
+    replaceRestUrl: true,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,

From f3534537ea01112b263d3411df2dfdc4484c7021 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:42:20 +0100
Subject: [PATCH 1213/1286] [DURACOM-288] Change properties description

---
 config/config.example.yml             | 20 ++++++--------------
 src/config/server-config.interface.ts |  2 ++
 src/config/ssr-config.interface.ts    |  5 ++---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 632ef09a9b..52f8be20f0 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,14 +19,9 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
-  # A boolean flag indicating whether the SSR configuration is enabled
-  # Defaults to true.
-  enabled: boolean;
-
   # Enable request performance profiling data collection and printing the results in the server console.
-  # Defaults to false.
-  enablePerformanceProfiler: boolean;
-
+  # Defaults to false. Enabling in production is NOT recommended
+  enablePerformanceProfiler: false
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -43,19 +38,16 @@ ssr:
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false
-
   # Enable state transfer from the server-side application to the client-side application.
   # Defaults to true.
   # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
   # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
   # ensure that users always use the most up-to-date state.
-  transferState: boolean;
-
+  transferState: true
   # When a different REST base URL is used for the server-side application, the generated state contains references to
-  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-  # URLs used by the client application.
-  replaceRestUrl: boolean;
+  # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+  # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+  replaceRestUrl: true
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index cdf23cd146..ad9fa0868a 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -7,5 +7,7 @@ export class ServerConfig implements Config {
   public nameSpace: string;
   public baseUrl?: string;
   public ssrBaseUrl?: string;
+  // This boolean will be automatically set on server startup based on whether "baseUrl" and "ssrBaseUrl"
+  // have different values.
   public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index c9c5f8882b..2ce626b47b 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -33,9 +33,8 @@ export interface SSRConfig extends Config {
 
   /**
    * When a different REST base URL is used for the server-side application, the generated state contains references to
-   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-   * URLs used by the client application.
+   * REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+   * Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
    */
   replaceRestUrl: boolean;
 

From e6dbfe4b1bc535f7106520882bfd496eadbf94da Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 31 Jan 2025 19:59:33 +0100
Subject: [PATCH 1214/1286] [DURACOM-288] Add convention SSR REST environment
 variable

---
 src/config/config.server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 69825b6409..3cbce3a42b 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -236,6 +236,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   appConfig.rest.port = isNotEmpty(ENV('REST_PORT', true)) ? getNumberFromString(ENV('REST_PORT', true)) : appConfig.rest.port;
   appConfig.rest.nameSpace = isNotEmpty(ENV('REST_NAMESPACE', true)) ? ENV('REST_NAMESPACE', true) : appConfig.rest.nameSpace;
   appConfig.rest.ssl = isNotEmpty(ENV('REST_SSL', true)) ? getBooleanFromString(ENV('REST_SSL', true)) : appConfig.rest.ssl;
+  appConfig.rest.ssrBaseUrl = isNotEmpty(ENV('REST_SSRBASEURL', true)) ? ENV('REST_SSRBASEURL', true) : appConfig.rest.ssrBaseUrl;
 
   // apply build defined production
   appConfig.production = env === 'production';

From 4b61ba4d864be70e519f45437d5b7fc24ef53f00 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Tue, 19 Sep 2023 12:42:11 +0200
Subject: [PATCH 1215/1286] [DURACOM-288] Fixes undefined request in thumbnail

---
 src/app/shared/utils/safe-url-pipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 6cb9d9fb1b..f8bc728829 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -16,6 +16,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class SafeUrlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) { }
   transform(url) {
-    return this.domSanitizer.bypassSecurityTrustResourceUrl(url);
+    return url == null ? null : this.domSanitizer.bypassSecurityTrustResourceUrl(url);
   }
 }

From 402cb7e031e97b3cb03a00287224777ced12e084 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Mon, 3 Feb 2025 10:47:40 +0100
Subject: [PATCH 1216/1286] Avoid retrieving user suggestions if Researcher
 profiles are disabled

(cherry picked from commit 72919cd8676a18df472f9a2b5ee13924e9dccf04)
---
 .../suggestion-targets.effects.ts             | 62 ++++++++++++++-----
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
index de92e98ef8..4a1b413872 100644
--- a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
@@ -13,6 +13,10 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
+import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 
 import {
   AuthActionTypes,
@@ -72,14 +76,23 @@ export class SuggestionTargetsEffects {
   ), { dispatch: false });
 
   /**
-   * Show a notification on error.
+   * Retrieve the current user suggestions after retrieving the authenticated user
    */
   retrieveUserTargets$ = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS),
     switchMap((action: RetrieveAuthenticatedEpersonSuccessAction) => {
-      return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
-        map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-      );
+      return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+          if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+            return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
+              map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+            );
+          } else {
+            return of(new AddUserSuggestionsAction([]));
+          }
+        },
+        ));
     })));
 
   /**
@@ -91,16 +104,35 @@ export class SuggestionTargetsEffects {
       return this.store$.select((state: any) => state.core.auth.userId)
         .pipe(
           switchMap((userId: string) => {
-            return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
-              .pipe(
-                map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-                catchError((error: unknown) => {
-                  if (error instanceof Error) {
-                    console.error(error.message);
-                  }
-                  return of(new RefreshUserSuggestionsErrorAction());
-                }),
-              );
+            if (!userId) {
+              return of(new AddUserSuggestionsAction([]));
+            }
+            return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+              getFirstCompletedRemoteData(),
+              switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+                if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+                  return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
+                    .pipe(
+                      map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+                      catchError((error: unknown) => {
+                        if (error instanceof Error) {
+                          console.error(error.message);
+                        }
+                        return of(new RefreshUserSuggestionsErrorAction());
+                      }),
+                    );
+                } else {
+                  return of(new AddUserSuggestionsAction([]));
+                }
+              },
+              ),
+              catchError((error: unknown) => {
+                if (error instanceof Error) {
+                  console.error(error.message);
+                }
+                return of(new RefreshUserSuggestionsErrorAction());
+              }),
+            );
           }),
           catchError((error: unknown) => {
             if (error instanceof Error) {
@@ -119,6 +151,7 @@ export class SuggestionTargetsEffects {
    * @param {TranslateService} translate
    * @param {NotificationsService} notificationsService
    * @param {SuggestionsService} suggestionsService
+   * @param {ConfigurationDataService} configurationService
    */
   constructor(
     private actions$: Actions,
@@ -126,6 +159,7 @@ export class SuggestionTargetsEffects {
     private translate: TranslateService,
     private notificationsService: NotificationsService,
     private suggestionsService: SuggestionsService,
+    private configurationService: ConfigurationDataService,
   ) {
   }
 }

From fddc4936e88173dc56c7b0d976c07a5fbcee3c41 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 5 Feb 2025 10:32:40 +0100
Subject: [PATCH 1217/1286] 126015: Sync standalone imports in custom theme

---
 .../create-community-parent-selector.component.ts  |  7 ++++++-
 .../search-results/search-results.component.ts     | 12 +++++++++++-
 .../browse-by-date/browse-by-date.component.ts     | 14 --------------
 .../browse-by-metadata.component.ts                | 14 --------------
 .../browse-by-title/browse-by-title.component.ts   | 14 --------------
 .../app/profile-page/profile-page.component.ts     |  2 ++
 .../create-community-parent-selector.component.ts  | 11 ++++++++++-
 .../search-results/search-results.component.ts     | 12 +++++++++++-
 .../header-navbar-wrapper.component.ts             |  3 +--
 src/themes/dspace/app/navbar/navbar.component.ts   |  8 +-------
 10 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index d4e9b31245..dc49fcaa8a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -47,7 +47,12 @@ import {
   styleUrls: ['./create-community-parent-selector.component.scss'],
   templateUrl: './create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    NgIf,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index f9da77ed75..e8f66d01f9 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -57,7 +57,17 @@ export interface SelectionConfig {
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgIf,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 
 /**
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
index d4582dcf25..ffcb504a7f 100644
--- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-date',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index d2894fce3a..9b29bf93be 100644
--- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-metadata',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
index 578663c43c..6a3b612b57 100644
--- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-title',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index e810ca09da..68292450fc 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -2,6 +2,7 @@ import {
   AsyncPipe,
   NgForOf,
   NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -33,6 +34,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
     PaginationComponent,
     ThemedLoadingComponent,
     ErrorComponent,
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 6c4aa8082c..d1d2a4a1f0 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +15,12 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../.
   // templateUrl: './create-community-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    NgIf,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index e2c4427744..b7c84f0fcc 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -27,7 +27,17 @@ import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/sea
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent,  SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgIf,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index cc9a3d727e..45e39d11ab 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgClass,
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -19,7 +18,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
   standalone: true,
-  imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
+  imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
   animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 5713a161e1..8cce626006 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -6,18 +6,12 @@ import {
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
-import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { ThemedSearchNavbarComponent } from 'src/app/search-navbar/themed-search-navbar.component';
-import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component';
 
-import { ContextHelpToggleComponent } from '../../../../app/header/context-help-toggle/context-help-toggle.component';
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
-import { ThemedAuthNavMenuComponent } from '../../../../app/shared/auth-nav-menu/themed-auth-nav-menu.component';
 import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/user-menu/themed-user-menu.component';
-import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-navbar/impersonate-navbar.component';
 
 /**
  * Component representing the public navbar
@@ -28,7 +22,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, ThemedLangSwitchComponent, ThemedSearchNavbarComponent, NgClass, RouterLink, NgIf, NgFor, NgComponentOutlet, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, AsyncPipe, TranslateModule, ThemedUserMenuComponent],
+  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }

From 4d85639f31f5e94288f9021465d3d9f023346b27 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Wed, 5 Feb 2025 17:38:57 +0100
Subject: [PATCH 1218/1286] fixed deprecated import of TransferState

---
 src/ngx-translate-loaders/translate-server.loader.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts
index d86251e008..8950b91a6b 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -1,4 +1,4 @@
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { TranslateLoader } from '@ngx-translate/core';
 import { readFileSync } from 'fs';
 import {

From b504af6f197313577936e207daa2ea1ae7d06f0e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 5 Feb 2025 10:32:40 +0100
Subject: [PATCH 1219/1286] 126015: Sync standalone imports in custom theme

(cherry picked from commit fddc4936e88173dc56c7b0d976c07a5fbcee3c41)
---
 .../create-community-parent-selector.component.ts  |  7 ++++++-
 .../search-results/search-results.component.ts     | 12 +++++++++++-
 .../browse-by-date/browse-by-date.component.ts     | 14 --------------
 .../browse-by-metadata.component.ts                | 14 --------------
 .../browse-by-title/browse-by-title.component.ts   | 14 --------------
 .../app/profile-page/profile-page.component.ts     |  2 ++
 .../create-community-parent-selector.component.ts  | 11 ++++++++++-
 .../search-results/search-results.component.ts     | 12 +++++++++++-
 .../header-navbar-wrapper.component.ts             |  3 +--
 src/themes/dspace/app/navbar/navbar.component.ts   |  8 +-------
 10 files changed, 42 insertions(+), 55 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index d4e9b31245..dc49fcaa8a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -47,7 +47,12 @@ import {
   styleUrls: ['./create-community-parent-selector.component.scss'],
   templateUrl: './create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    NgIf,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index f9da77ed75..e8f66d01f9 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -57,7 +57,17 @@ export interface SelectionConfig {
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgIf,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 
 /**
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
index d4582dcf25..ffcb504a7f 100644
--- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-date',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index d2894fce3a..9b29bf93be 100644
--- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-metadata',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
index 578663c43c..6a3b612b57 100644
--- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-title',
@@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
     NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index e810ca09da..68292450fc 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -2,6 +2,7 @@ import {
   AsyncPipe,
   NgForOf,
   NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -33,6 +34,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     NgIf,
     NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
     PaginationComponent,
     ThemedLoadingComponent,
     ErrorComponent,
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 6c4aa8082c..d1d2a4a1f0 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,3 +1,7 @@
+import {
+  AsyncPipe,
+  NgIf,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +15,12 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../.
   // templateUrl: './create-community-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    NgIf,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index e2c4427744..b7c84f0fcc 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -27,7 +27,17 @@ import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/sea
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ErrorComponent, RouterLink, TranslateModule, SearchResultsSkeletonComponent,  SearchResultsSkeletonComponent, AsyncPipe, NgxSkeletonLoaderModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgIf,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index cc9a3d727e..45e39d11ab 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgClass,
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -19,7 +18,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
   standalone: true,
-  imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
+  imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
   animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 5713a161e1..8cce626006 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -6,18 +6,12 @@ import {
   NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
-import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { ThemedSearchNavbarComponent } from 'src/app/search-navbar/themed-search-navbar.component';
-import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component';
 
-import { ContextHelpToggleComponent } from '../../../../app/header/context-help-toggle/context-help-toggle.component';
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
-import { ThemedAuthNavMenuComponent } from '../../../../app/shared/auth-nav-menu/themed-auth-nav-menu.component';
 import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/user-menu/themed-user-menu.component';
-import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-navbar/impersonate-navbar.component';
 
 /**
  * Component representing the public navbar
@@ -28,7 +22,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, ThemedLangSwitchComponent, ThemedSearchNavbarComponent, NgClass, RouterLink, NgIf, NgFor, NgComponentOutlet, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, AsyncPipe, TranslateModule, ThemedUserMenuComponent],
+  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }

From f721028d81c20e9ff10054b1f1970ba259b21b9b Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Wed, 5 Feb 2025 16:19:49 -0500
Subject: [PATCH 1220/1286] Update fr.json5

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

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index bee30294a9..8877c637cf 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -6113,6 +6113,24 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Sections incomplètes.",
 
+  //"submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Les identifiants uniques suivants seront attribués à votre document :",
+
+  //"submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Aucun handle n'a été crée pour ce document.",
+
+  //"submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Aucun DOI n'a été créé pour ce document.",
+
+  //"submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle : ",
+
+  //"submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI : ",
+
+  //"submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Autres identifiants : ",
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Autorisations d'accès à l'Item",
 
@@ -6134,6 +6152,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Doublon(s) potentiel(s)",
 
+  //"submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identifiants",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licence du dépôt",
 

From 8ca668159eb3495d25fa5811ffe43877a4452d0d Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Tue, 30 Jul 2024 20:19:18 +0200
Subject: [PATCH 1221/1286] [DURACOM-288] Provide a setting to use a different
 REST url during SSR execution

# Conflicts:
#	src/app/app.config.ts
#	src/app/core/services/server-hard-redirect.service.spec.ts
#	src/app/core/services/server-hard-redirect.service.ts
#	src/app/thumbnail/thumbnail.component.ts
#	src/modules/app/browser-init.service.ts
#	src/modules/app/server-init.service.ts
---
 server.ts                                     |   9 +-
 src/app/app.module.ts                         |   7 +
 .../dspace-rest.interceptor.spec.ts           | 194 ++++++++++++++++++
 .../dspace-rest/dspace-rest.interceptor.ts    |  52 +++++
 .../server-hard-redirect.service.spec.ts      |   4 +-
 .../services/server-hard-redirect.service.ts  |  16 +-
 src/app/thumbnail/thumbnail.component.ts      |  24 ++-
 src/config/server-config.interface.ts         |   2 +
 src/modules/app/browser-init.service.ts       |  23 ++-
 src/modules/app/server-init.service.ts        |  11 +-
 10 files changed, 315 insertions(+), 27 deletions(-)
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
 create mode 100644 src/app/core/dspace-rest/dspace-rest.interceptor.ts

diff --git a/server.ts b/server.ts
index 82417f17dc..99fb5d5775 100644
--- a/server.ts
+++ b/server.ts
@@ -79,6 +79,9 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -176,7 +179,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -185,7 +188,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true
   }));
@@ -621,7 +624,7 @@ function start() {
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 89e361821b..1aa5036bce 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -30,6 +30,7 @@ import { EagerThemesModule } from '../themes/eager-themes.module';
 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
 import { StoreDevModules } from '../config/store/devtools';
 import { RootModule } from './root.module';
+import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 
 export function getConfig() {
   return environment;
@@ -103,6 +104,12 @@ const PROVIDERS = [
     useClass: LogInterceptor,
     multi: true
   },
+  // register DspaceRestInterceptor as HttpInterceptor
+  {
+    provide: HTTP_INTERCEPTORS,
+    useClass: DspaceRestInterceptor,
+    multi: true
+  },
   // register the dynamic matcher used by form. MUST be provided by the app module
   ...DYNAMIC_MATCHER_PROVIDERS,
 ];
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
new file mode 100644
index 0000000000..4a47ffe9fd
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
@@ -0,0 +1,194 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { PLATFORM_ID } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestInterceptor } from './dspace-rest.interceptor';
+import { DspaceRestService } from './dspace-rest.service';
+
+describe('DspaceRestInterceptor', () => {
+  let httpMock: HttpTestingController;
+  let httpClient: HttpClient;
+  const appConfig: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+    },
+  };
+  const appConfigWithSSR: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+      ssrBaseUrl: 'http://ssr.example.com/server',
+    },
+  };
+
+  describe('When SSR base URL is not set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+
+  describe('When SSR base URL is set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items');
+        req.flush({});
+        httpMock.verify();
+      });
+
+      it('should not replace any query param containing the base URL', () => {
+        const url = 'http://api.example.com/server/items?url=http://api.example.com/server/item/1';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+});
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
new file mode 100644
index 0000000000..efd2c12b5d
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
@@ -0,0 +1,52 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { isEmpty } from '../../shared/empty.util';
+
+@Injectable()
+/**
+ * This Interceptor is used to use the configured base URL for the request made during SSR execution
+ */
+export class DspaceRestInterceptor implements HttpInterceptor {
+
+  /**
+   * Contains the configured application base URL
+   * @protected
+   */
+  protected baseUrl: string;
+  protected ssrBaseUrl: string;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+  ) {
+    this.baseUrl = this.appConfig.rest.baseUrl;
+    this.ssrBaseUrl = this.appConfig.rest.ssrBaseUrl;
+  }
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    if (isPlatformBrowser(this.platformId) || isEmpty(this.ssrBaseUrl) || this.baseUrl === this.ssrBaseUrl) {
+      return next.handle(request);
+    }
+
+    // Different SSR Base URL specified so replace it in the current request url
+    const url = request.url.replace(this.baseUrl, this.ssrBaseUrl);
+    const newRequest: HttpRequest<any> = request.clone({ url });
+    return next.handle(newRequest);
+  }
+}
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 6bd5828921..d3247dd0dd 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,4 +1,6 @@
 import { TestBed } from '@angular/core/testing';
+
+import { environment } from '../../../environments/environment.test';
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -6,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index d71318d7b8..280dbd22cb 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -2,6 +2,8 @@ import { Inject, Injectable } from '@angular/core';
 import { Request, Response } from 'express';
 import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 import { HardRedirectService } from './hard-redirect.service';
+import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+import { isNotEmpty } from '../../shared/empty.util';
 
 /**
  * Service for performing hard redirects within the server app module
@@ -10,6 +12,7 @@ import { HardRedirectService } from './hard-redirect.service';
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(REQUEST) protected req: Request,
     @Inject(RESPONSE) protected res: Response,
   ) {
@@ -25,17 +28,22 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
   redirect(url: string, statusCode?: number) {
-
     if (url === this.req.url) {
       return;
     }
 
+    let redirectUrl = url;
+    // If redirect url contains SSR base url then replace with public base url
+    if (isNotEmpty(this.appConfig.rest.ssrBaseUrl) && this.appConfig.rest.baseUrl !== this.appConfig.rest.ssrBaseUrl) {
+      redirectUrl = url.replace(this.appConfig.rest.ssrBaseUrl, this.appConfig.rest.baseUrl);
+    }
+
     if (this.res.finished) {
       const req: any = this.req;
       req._r_count = (req._r_count || 0) + 1;
 
       console.warn('Attempted to redirect on a finished response. From',
-        this.req.url, 'to', url);
+        this.req.url, 'to', redirectUrl);
 
       if (req._r_count > 10) {
         console.error('Detected a redirection loop. killing the nodejs process');
@@ -49,9 +57,9 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      console.info(`Redirecting from ${this.req.url} to ${redirectUrl} with ${status}`);
 
-      this.res.redirect(status, url);
+      this.res.redirect(status, redirectUrl);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
       // So we just let it end its work, though we have already closed
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 0827a33e77..6bfe35bee3 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, Inject, Input, OnChanges, PLATFORM_ID, SimpleChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasNoValue, hasValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
@@ -8,6 +8,7 @@ import { FeatureID } from '../core/data/feature-authorization/feature-id';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { AuthService } from '../core/auth/auth.service';
 import { FileService } from '../core/shared/file.service';
+import { isPlatformBrowser } from '@angular/common';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -60,6 +61,7 @@ export class ThumbnailComponent implements OnChanges {
   isLoading = true;
 
   constructor(
+    @Inject(PLATFORM_ID) private platformID: any,
     protected auth: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected fileService: FileService,
@@ -71,16 +73,18 @@ export class ThumbnailComponent implements OnChanges {
    * Use a default image if no actual image is available.
    */
   ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.thumbnail)) {
-      this.setSrc(this.defaultImage);
-      return;
-    }
+    if (isPlatformBrowser(this.platformID)) {
+      if (hasNoValue(this.thumbnail)) {
+        this.setSrc(this.defaultImage);
+        return;
+      }
 
-    const src = this.contentHref;
-    if (hasValue(src)) {
-      this.setSrc(src);
-    } else {
-      this.setSrc(this.defaultImage);
+      const src = this.contentHref;
+      if (hasValue(src)) {
+        this.setSrc(src);
+      } else {
+        this.setSrc(this.defaultImage);
+      }
     }
   }
 
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index 8797ea3d60..cdf23cd146 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -6,4 +6,6 @@ export class ServerConfig implements Config {
   public port: number;
   public nameSpace: string;
   public baseUrl?: string;
+  public ssrBaseUrl?: string;
+  public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 3704892e6e..c86a3d4323 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -32,7 +32,7 @@ import { logStartupMessage } from '../../../startup-message';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { RequestService } from '../../app/core/data/request.service';
 import { RootDataService } from '../../app/core/data/root-data.service';
-import { firstValueFrom, Subscription } from 'rxjs';
+import { firstValueFrom, lastValueFrom, Subscription } from 'rxjs';
 import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
 import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
 
@@ -121,13 +121,20 @@ export class BrowserInitService extends InitService {
    * @private
    */
   private async loadAppState(): Promise<boolean> {
-    const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
-    this.transferState.remove(InitService.NGRX_STATE);
-    this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
-    return this.store.select(coreSelector).pipe(
-      find((core: any) => isNotEmpty(core)),
-      map(() => true)
-    ).toPromise();
+    // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
+    if (!this.appConfig.rest.hasSsrBaseUrl) {
+      const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
+      this.transferState.remove(InitService.NGRX_STATE);
+      this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
+      return lastValueFrom(
+        this.store.select(coreSelector).pipe(
+          find((core: any) => isNotEmpty(core)),
+          map(() => true),
+        ),
+      );
+    } else {
+      return Promise.resolve(true);
+    }
   }
 
   private trackAuthTokenExpiration(): void {
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index 715f872cd9..b162106553 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,6 +21,7 @@ import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
 import { MenuService } from '../../app/shared/menu/menu.service';
+import { isNotEmpty } from '../../app/shared/empty.util';
 
 /**
  * Performs server-side initialization.
@@ -91,6 +92,14 @@ export class ServerInitService extends InitService {
   }
 
   private saveAppConfigForCSR(): void {
-    this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) {
+      // Avoid to transfer ssrBaseUrl in order to prevent security issues
+      const config: AppConfig = Object.assign({}, environment as AppConfig, {
+        rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }),
+      });
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, config);
+    } else {
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    }
   }
 }

From a3ffda3bf8a55fcc27e9de33d50a629921e2543a Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 27 Sep 2024 18:06:15 +0200
Subject: [PATCH 1222/1286] [DURACOM-288] Additional test for thumbnail
 component

---
 src/app/thumbnail/thumbnail.component.spec.ts | 552 ++++++++++--------
 1 file changed, 307 insertions(+), 245 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 2a25c9a318..b251c60dcf 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -1,4 +1,4 @@
-import { DebugElement, Pipe, PipeTransform } from '@angular/core';
+import { DebugElement, Pipe, PipeTransform, PLATFORM_ID } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Bitstream } from '../core/shared/bitstream.model';
@@ -12,6 +12,9 @@ import { AuthService } from '../core/auth/auth.service';
 import { FileService } from '../core/shared/file.service';
 import { VarDirective } from '../shared/utils/var.directive';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { getMockThemeService } from '../shared/mocks/theme-service.mock';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -31,286 +34,249 @@ describe('ThumbnailComponent', () => {
   let authService;
   let authorizationService;
   let fileService;
+  let spy;
 
-  beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('AuthService', {
-      isAuthenticated: observableOf(true),
-    });
-    authorizationService = jasmine.createSpyObj('AuthorizationService', {
-      isAuthorized: observableOf(true),
-    });
-    fileService = jasmine.createSpyObj('FileService', {
+  describe('when platform is browser', () => {
+    beforeEach(waitForAsync(() => {
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
       retrieveFileDownloadLink: null
-    });
-    fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
-    TestBed.configureTestingModule({
+      TestBed.configureTestingModule({
       declarations: [ThumbnailComponent, SafeUrlPipe, MockTranslatePipe, VarDirective],
-      providers: [
-        { provide: AuthService, useValue: authService },
-        { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService }
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: PLATFORM_ID, useValue: 'browser' },
       ]
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThumbnailComponent);
-    fixture.detectChanges();
-
-    authService = TestBed.inject(AuthService);
-
-    comp = fixture.componentInstance; // ThumbnailComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
-
-  describe('loading', () => {
-    it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading).toBeTrue();
-    });
-
-    it('should set isLoading$ to false once an image is successfully loaded', () => {
-      comp.setSrc('http://bit.stream');
-      fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should set isLoading$ to false once the src is set to null', () => {
-      comp.setSrc(null);
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should show a loading animation while isLoading$ is true', () => {
-      expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
-
-      comp.isLoading = false;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeFalsy();
-    });
-
-    describe('with a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = 'https://bit.stream';
-        fixture.detectChanges();
-      });
-
-      it('should render but hide the image while loading and show it once done', () => {
-        let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeTrue();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeFalsy();
-      });
-
-    });
-
-    describe('without a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = null;
-        fixture.detectChanges();
-      });
-
-      it('should only show the HTML placeholder once done loading', () => {
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
-      });
-    });
-
-  });
-
-  const errorHandler = () => {
-    let setSrcSpy;
+    }));
 
     beforeEach(() => {
-      // disconnect error handler to be sure it's only called once
-      const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-      img.nativeNode.onerror = null;
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      fixture.detectChanges();
 
-      comp.ngOnChanges({});
-      setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
     });
 
-    describe('retry with authentication token', () => {
-      it('should remember that it already retried once', () => {
-        expect(comp.retriedWithToken).toBeFalse();
-        comp.errorHandler();
-        expect(comp.retriedWithToken).toBeTrue();
+    describe('loading', () => {
+      it('should start out with isLoading$ true', () => {
+        expect(comp.isLoading).toBeTrue();
       });
 
-      describe('if not logged in', () => {
+      it('should set isLoading$ to false once an image is successfully loaded', () => {
+        comp.setSrc('http://bit.stream');
+        fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should set isLoading$ to false once the src is set to null', () => {
+        comp.setSrc(null);
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should show a loading animation while isLoading$ is true', () => {
+      expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
+
+        comp.isLoading = false;
+        fixture.detectChanges();
+      expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeFalsy();
+      });
+
+      describe('with a thumbnail image', () => {
         beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(false));
+          comp.src = 'https://bit.stream';
+          fixture.detectChanges();
         });
 
-        it('should fall back to default', () => {
+        it('should render but hide the image while loading and show it once done', () => {
+          let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeTrue();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeFalsy();
+        });
+
+      });
+
+      describe('without a thumbnail image', () => {
+        beforeEach(() => {
+          comp.src = null;
+          fixture.detectChanges();
+        });
+
+        it('should only show the HTML placeholder once done loading', () => {
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
+        });
+      });
+
+    });
+
+    const errorHandler = () => {
+      let setSrcSpy;
+
+      beforeEach(() => {
+        // disconnect error handler to be sure it's only called once
+        const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+        img.nativeNode.onerror = null;
+
+        comp.ngOnChanges({});
+        setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      });
+
+      describe('retry with authentication token', () => {
+        it('should remember that it already retried once', () => {
+          expect(comp.retriedWithToken).toBeFalse();
           comp.errorHandler();
-          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-        });
-      });
-
-      describe('if logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(true));
+          expect(comp.retriedWithToken).toBeTrue();
         });
 
-        describe('and authorized to download the thumbnail', () => {
+        describe('if not logged in', () => {
           beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(true));
-          });
-
-          it('should add an authentication token to the thumbnail URL', () => {
-            comp.errorHandler();
-
-            if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              // If we failed to retrieve the Bitstream in the first place, fall back to the default
-              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-            } else {
-              expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
-            }
-          });
-        });
-
-        describe('but not authorized to download the thumbnail', () => {
-          beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            authService.isAuthenticated.and.returnValue(observableOf(false));
           });
 
           it('should fall back to default', () => {
             comp.errorHandler();
-
             expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-
-            // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
-            if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              expect(authorizationService.isAuthorized).toHaveBeenCalled();
-            }
           });
         });
+
+        describe('if logged in', () => {
+          beforeEach(() => {
+            authService.isAuthenticated.and.returnValue(observableOf(true));
+          });
+
+          describe('and authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(true));
+            });
+
+            it('should add an authentication token to the thumbnail URL', () => {
+              comp.errorHandler();
+
+              if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                // If we failed to retrieve the Bitstream in the first place, fall back to the default
+                expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+              } else {
+                expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
+              }
+            });
+          });
+
+          describe('but not authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            });
+
+            it('should fall back to default', () => {
+              comp.errorHandler();
+
+              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+
+              // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
+              if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                expect(authorizationService.isAuthorized).toHaveBeenCalled();
+              }
+            });
+          });
+        });
+      });
+
+      describe('after retrying with token', () => {
+        beforeEach(() => {
+          comp.retriedWithToken = true;
+        });
+
+        it('should fall back to default', () => {
+          comp.errorHandler();
+          expect(authService.isAuthenticated).not.toHaveBeenCalled();
+          expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
+          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+        });
+      });
+    };
+
+    describe('fallback', () => {
+      describe('if there is a default image', () => {
+        it('should display the default image', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+          expect(comp.src).toBe(comp.defaultImage);
+        });
+
+        it('should include the alt text', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+
+          fixture.detectChanges();
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
+          expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+        });
+      });
+
+      describe('if there is no default image', () => {
+        it('should display the HTML placeholder', () => {
+          comp.src = 'http://default.img';
+          comp.defaultImage = null;
+          comp.errorHandler();
+          expect(comp.src).toBe(null);
+
+          fixture.detectChanges();
+          const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+          expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
+        });
       });
     });
 
-    describe('after retrying with token', () => {
+    describe('with thumbnail as Bitstream', () => {
+      let thumbnail;
       beforeEach(() => {
-        comp.retriedWithToken = true;
-      });
-
-      it('should fall back to default', () => {
-        comp.errorHandler();
-        expect(authService.isAuthenticated).not.toHaveBeenCalled();
-        expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
-        expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-      });
-    });
-  };
-
-  describe('fallback', () => {
-    describe('if there is a default image', () => {
-      it('should display the default image', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-        expect(comp.src).toBe(comp.defaultImage);
-      });
-
-      it('should include the alt text', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if there is no default image', () => {
-      it('should display the HTML placeholder', () => {
-        comp.src = 'http://default.img';
-        comp.defaultImage = null;
-        comp.errorHandler();
-        expect(comp.src).toBe(null);
-
-        fixture.detectChanges();
-        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
-        expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
-      });
-    });
-  });
-
-  describe('with thumbnail as Bitstream', () => {
-    let thumbnail;
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-      comp.thumbnail = thumbnail;
-    });
-
-    describe('if content can be loaded', () => {
-      it('should display an image', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
-      });
-
-      it('should include the alt text', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if content can\'t be loaded', () => {
-      errorHandler();
-    });
-  });
-
-  describe('with thumbnail as RemoteData<Bitstream>', () => {
-    let thumbnail: Bitstream;
-
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined
-      };
-    });
-
-    describe('if RemoteData succeeded', () => {
-      beforeEach(() => {
-        comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
+        comp.thumbnail = thumbnail;
       });
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
         });
 
-        it('should display the alt text', () => {
+        it('should include the alt text', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
         });
       });
@@ -320,16 +286,112 @@ describe('ThumbnailComponent', () => {
       });
     });
 
-    describe('if RemoteData failed', () => {
+    describe('with thumbnail as RemoteData<Bitstream>', () => {
+      let thumbnail: Bitstream;
+
       beforeEach(() => {
-        comp.thumbnail = createFailedRemoteDataObject();
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+        thumbnail: undefined
+        };
       });
 
-      it('should show the default image', () => {
-        comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges({});
-        expect(comp.src).toBe('default/image.jpg');
+      describe('if RemoteData succeeded', () => {
+        beforeEach(() => {
+          comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        });
+
+        describe('if content can be loaded', () => {
+          it('should display an image', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
+          });
+
+          it('should display the alt text', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+          });
+        });
+
+        describe('if content can\'t be loaded', () => {
+          errorHandler();
+        });
+      });
+
+      describe('if RemoteData failed', () => {
+        beforeEach(() => {
+          comp.thumbnail = createFailedRemoteDataObject();
+        });
+
+        it('should show the default image', () => {
+          comp.defaultImage = 'default/image.jpg';
+          comp.ngOnChanges({});
+          expect(comp.src).toBe('default/image.jpg');
+        });
       });
     });
   });
+
+  describe('when platform is server', () => {
+    beforeEach(waitForAsync(() => {
+
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'server' },
+        ],
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      spyOn(fixture.componentInstance, 'setSrc').and.callThrough();
+      fixture.detectChanges();
+
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
+
+    it('should start out with isLoading$ true', () => {
+      expect(comp.isLoading).toBeTrue();
+      expect(de.query(By.css('ds-loading'))).toBeTruthy();
+    });
+
+    it('should not call setSrc', () => {
+      expect(comp.setSrc).not.toHaveBeenCalled();
+    });
+
+  });
 });

From f9d8e4e0b7ce1bb74420e3f5c07202ca0934e6ec Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Wed, 20 Nov 2024 12:58:38 +0100
Subject: [PATCH 1223/1286] Add configuration to toggle replace/transfer

---
 server.ts                                | 7 +++++++
 src/config/default-app-config.ts         | 3 +++
 src/config/ui-server-config.interface.ts | 3 +++
 src/modules/app/browser-init.service.ts  | 6 ++++--
 src/modules/app/server-init.service.ts   | 4 +++-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server.ts b/server.ts
index 99fb5d5775..2fa7b9b947 100644
--- a/server.ts
+++ b/server.ts
@@ -272,6 +272,13 @@ function serverSideRender(req, res, sendToUser: boolean = true) {
     requestUrl: req.originalUrl,
   }, (err, data) => {
     if (hasNoValue(err) && hasValue(data)) {
+      // Replace REST URL with UI URL
+      if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+        const t0 = Date.now();
+        data = data.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
+        console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
+      }
+
       // save server side rendered page to cache (if any are enabled)
       saveToCache(req, data);
       if (sendToUser) {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index de4f3bd56e..1e19815e24 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -48,6 +48,9 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
+
+    transferState: true,
+    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 70e2fa3e26..2e58f9d6de 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,4 +13,7 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
+
+  transferState: boolean;
+  replaceRestUrl: boolean;
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index c86a3d4323..30e03cc19d 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -90,7 +90,9 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      await this.loadAppState();
+      if (this.appConfig.ui.transferState) {
+        await this.loadAppState();
+      }
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -122,7 +124,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (!this.appConfig.rest.hasSsrBaseUrl) {
+    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index b162106553..bb32e917ee 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -59,7 +59,9 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      this.saveAppState();
+      if (this.appConfig.ui.transferState) {
+        this.saveAppState();
+      }
       this.initCorrelationId();
 
       this.checkEnvironment();

From cb5deb644e5cb128258d008dfb04ae4e58f0642a Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:22 +0100
Subject: [PATCH 1224/1286] [DURACOM-288] Refactoring configuration to transfer
 state

---
 server.ts                                  |  6 ++----
 src/config/default-app-config.ts           |  3 ---
 src/config/ui-server-config.interface.ts   |  3 ---
 src/config/universal-config.interface.ts   | 19 ++++++++++++++++
 src/environments/environment.production.ts |  2 ++
 src/environments/environment.test.ts       |  2 ++
 src/environments/environment.ts            |  2 ++
 src/modules/app/browser-init.service.ts    |  9 ++++----
 src/modules/app/server-init.service.ts     | 25 +++++++++++-----------
 9 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/server.ts b/server.ts
index 2fa7b9b947..cfab230ef5 100644
--- a/server.ts
+++ b/server.ts
@@ -273,10 +273,8 @@ function serverSideRender(req, res, sendToUser: boolean = true) {
   }, (err, data) => {
     if (hasNoValue(err) && hasValue(data)) {
       // Replace REST URL with UI URL
-      if (environment.ui.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
-        const t0 = Date.now();
-        data = data.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
-        console.log(`Replaced all SSR URLs in HTML in ${Date.now() - t0}ms`); // todo: remove this
+        if (environment.universal.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+          data = data.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
       }
 
       // save server side rendered page to cache (if any are enabled)
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 1e19815e24..de4f3bd56e 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -48,9 +48,6 @@ export class DefaultAppConfig implements AppConfig {
 
     // Trust X-FORWARDED-* headers from proxies
     useProxies: true,
-
-    transferState: true,
-    replaceRestUrl: false,
   };
 
   // The REST API server settings
diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts
index 2e58f9d6de..70e2fa3e26 100644
--- a/src/config/ui-server-config.interface.ts
+++ b/src/config/ui-server-config.interface.ts
@@ -13,7 +13,4 @@ export class UIServerConfig extends ServerConfig {
 
   // Trust X-FORWARDED-* headers from proxies
   useProxies: boolean;
-
-  transferState: boolean;
-  replaceRestUrl: boolean;
 }
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index e3f7f399a9..c789d3f169 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -14,10 +14,29 @@ export interface UniversalConfig extends Config {
    */
   inlineCriticalCss?: boolean;
 
+  /**
+   * Enable state transfer from the server-side application to the client-side application.
+   * Defaults to true.
+   *
+   * Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+   * Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+   * ensure that users always use the most up-to-date state.
+   */
+  transferState: boolean;
+
+  /**
+   * When a different REST base URL is used for the server-side application, the generated state contains references to
+   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+   * URLs used by the client application.
+   */
+  replaceRestUrl: boolean;
+
   /**
    * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
    */
   paths: Array<string>;
+
   /**
    * Whether to enable rendering of search component on SSR
    */
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index d69389cfe3..48e8125e24 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -9,6 +9,8 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index e01c67480c..30ca741b36 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,8 @@ export const environment: BuildConfig = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index e3258cb4e2..502bae140a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,6 +14,8 @@ export const environment: Partial<BuildConfig> = {
     async: true,
     time: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 30e03cc19d..4b1c6b40d2 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -35,6 +35,7 @@ import { RootDataService } from '../../app/core/data/root-data.service';
 import { firstValueFrom, lastValueFrom, Subscription } from 'rxjs';
 import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
 import { HALEndpointService } from '../../app/core/shared/hal-endpoint.service';
+import { BuildConfig } from '../../config/build-config.interface';
 
 /**
  * Performs client-side initialization.
@@ -48,7 +49,7 @@ export class BrowserInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -90,9 +91,7 @@ export class BrowserInitService extends InitService {
 
   protected init(): () => Promise<boolean> {
     return async () => {
-      if (this.appConfig.ui.transferState) {
-        await this.loadAppState();
-      }
+      await this.loadAppState();
       this.checkAuthenticationToken();
       this.externalAuthCheck();
       this.initCorrelationId();
@@ -124,7 +123,7 @@ export class BrowserInitService extends InitService {
    */
   private async loadAppState(): Promise<boolean> {
     // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
-    if (this.appConfig.ui.transferState && (!this.appConfig.rest.hasSsrBaseUrl || this.appConfig.ui.replaceRestUrl)) {
+    if (this.appConfig.universal.transferState) {
       const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
       this.transferState.remove(InitService.NGRX_STATE);
       this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index bb32e917ee..e0c55211e3 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,7 +21,8 @@ import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
 import { MenuService } from '../../app/shared/menu/menu.service';
-import { isNotEmpty } from '../../app/shared/empty.util';
+import { isEmpty, isNotEmpty } from '../../app/shared/empty.util';
+import { BuildConfig } from '../../config/build-config.interface';
 
 /**
  * Performs server-side initialization.
@@ -32,7 +33,7 @@ export class ServerInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -59,9 +60,7 @@ export class ServerInitService extends InitService {
     return async () => {
       this.checkAuthenticationToken();
       this.saveAppConfigForCSR();
-      if (this.appConfig.ui.transferState) {
-        this.saveAppState();
-      }
+      this.saveAppState();
       this.initCorrelationId();
 
       this.checkEnvironment();
@@ -83,14 +82,16 @@ export class ServerInitService extends InitService {
    * @private
    */
   private saveAppState() {
-    this.transferState.onSerialize(InitService.NGRX_STATE, () => {
-      let state;
-      this.store.pipe(take(1)).subscribe((saveState: any) => {
-        state = saveState;
-      });
+    if (this.appConfig.universal.transferState && (isEmpty(this.appConfig.rest.ssrBaseUrl) || this.appConfig.universal.replaceRestUrl)) {
+      this.transferState.onSerialize(InitService.NGRX_STATE, () => {
+        let state;
+        this.store.pipe(take(1)).subscribe((saveState: any) => {
+          state = saveState;
+        });
 
-      return state;
-    });
+        return state;
+      });
+    }
   }
 
   private saveAppConfigForCSR(): void {

From d11849607592eba4b5a93b9e8a95a6022d17c727 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 18:46:45 +0100
Subject: [PATCH 1225/1286] [DURACOM-288] Add missing settings to
 config.example.yml

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

diff --git a/config/config.example.yml b/config/config.example.yml
index ba8b1b5a09..0f4d5cb3e4 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -36,6 +36,19 @@ universal:
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false
 
+  # Enable state transfer from the server-side application to the client-side application.
+  # Defaults to true.
+  # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+  # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+  # ensure that users always use the most up-to-date state.
+  transferState: boolean;
+
+  # When a different REST base URL is used for the server-side application, the generated state contains references to
+  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
+  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
+  # URLs used by the client application.
+  replaceRestUrl: boolean;
+
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
@@ -45,6 +58,9 @@ rest:
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
+  # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
+  # server namespace (uncomment to use it).
+  #ssrBaseUrl: http://localhost:8080/server
 
 # Caching settings
 cache:

From 21dac408ee064fc153e1be65eee359dc237cb829 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 9 Jan 2025 19:09:23 +0100
Subject: [PATCH 1226/1286] [DURACOM-288] Add unit test to test SSR url replace

---
 .../server-hard-redirect.service.spec.ts      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index d3247dd0dd..a904a8e66c 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -8,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
+  let service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
@@ -69,4 +69,23 @@ describe('ServerHardRedirectService', () => {
     });
   });
 
+  describe('when SSR base url is set', () => {
+    const redirect = 'https://private-url:4000/server/api/bitstreams/uuid';
+    const replacedUrl = 'https://public-url/server/api/bitstreams/uuid';
+    const environmentWithSSRUrl: any = { ...environment, ...{ ...environment.rest, rest: {
+      ssrBaseUrl: 'https://private-url:4000/server',
+      baseUrl: 'https://public-url/server',
+    } } };
+    service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse);
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should perform a 302 redirect', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, replacedUrl);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
 });

From 290c24b448985c961559f04c01ac43eb4b5bc8f6 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:41:32 +0100
Subject: [PATCH 1227/1286] [DURACOM-288] Enable URL replacement by default

---
 src/environments/environment.production.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 48e8125e24..bdb953d181 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -10,7 +10,7 @@ export const environment: Partial<BuildConfig> = {
     time: false,
     inlineCriticalCss: false,
     transferState: true,
-    replaceRestUrl: false,
+    replaceRestUrl: true,
     paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,

From d73885137af426a007733941586a7b5c1441b224 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 30 Jan 2025 20:42:20 +0100
Subject: [PATCH 1228/1286] [DURACOM-288] Change properties description

---
 config/config.example.yml                | 11 ++++-------
 src/config/server-config.interface.ts    |  2 ++
 src/config/universal-config.interface.ts |  5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 0f4d5cb3e4..0764edd080 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -35,19 +35,16 @@ universal:
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.
   enableBrowseComponent: false
-
   # Enable state transfer from the server-side application to the client-side application.
   # Defaults to true.
   # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
   # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
   # ensure that users always use the most up-to-date state.
-  transferState: boolean;
-
+  transferState: true
   # When a different REST base URL is used for the server-side application, the generated state contains references to
-  # REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-  # Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-  # URLs used by the client application.
-  replaceRestUrl: boolean;
+  # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+  # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+  replaceRestUrl: true
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index cdf23cd146..ad9fa0868a 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -7,5 +7,7 @@ export class ServerConfig implements Config {
   public nameSpace: string;
   public baseUrl?: string;
   public ssrBaseUrl?: string;
+  // This boolean will be automatically set on server startup based on whether "baseUrl" and "ssrBaseUrl"
+  // have different values.
   public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/config/universal-config.interface.ts b/src/config/universal-config.interface.ts
index c789d3f169..84678b6dcf 100644
--- a/src/config/universal-config.interface.ts
+++ b/src/config/universal-config.interface.ts
@@ -26,9 +26,8 @@ export interface UniversalConfig extends Config {
 
   /**
    * When a different REST base URL is used for the server-side application, the generated state contains references to
-   * REST resources with the internal URL configured, so it is not transferred to the client application, by default.
-   * Enabling this setting transfers the state to the client application and replaces internal URLs with the public
-   * URLs used by the client application.
+   * REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+   * Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
    */
   replaceRestUrl: boolean;
 

From 6f4c3860a31605f7e7dc3642ac6854b9623625de Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 31 Jan 2025 19:59:33 +0100
Subject: [PATCH 1229/1286] [DURACOM-288] Add convention SSR REST environment
 variable

---
 src/config/config.server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 65daede0a8..488c1c7a4c 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -227,6 +227,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   appConfig.rest.port = isNotEmpty(ENV('REST_PORT', true)) ? getNumberFromString(ENV('REST_PORT', true)) : appConfig.rest.port;
   appConfig.rest.nameSpace = isNotEmpty(ENV('REST_NAMESPACE', true)) ? ENV('REST_NAMESPACE', true) : appConfig.rest.nameSpace;
   appConfig.rest.ssl = isNotEmpty(ENV('REST_SSL', true)) ? getBooleanFromString(ENV('REST_SSL', true)) : appConfig.rest.ssl;
+  appConfig.rest.ssrBaseUrl = isNotEmpty(ENV('REST_SSRBASEURL', true)) ? ENV('REST_SSRBASEURL', true) : appConfig.rest.ssrBaseUrl;
 
   // apply build defined production
   appConfig.production = env === 'production';

From 7660dd8d95fa2c8df5a213c6e2d8c9fd4d75ede6 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Tue, 19 Sep 2023 12:42:11 +0200
Subject: [PATCH 1230/1286] [DURACOM-288] Fixes undefined request in thumbnail

---
 src/app/shared/utils/safe-url-pipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 3f35ed9262..c3b8db62ce 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -10,6 +10,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class SafeUrlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) { }
   transform(url) {
-    return this.domSanitizer.bypassSecurityTrustResourceUrl(url);
+    return url == null ? null : this.domSanitizer.bypassSecurityTrustResourceUrl(url);
   }
 }

From be6de64fcd357403a2ef83d1cc2b36273abd77b8 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 6 Feb 2025 22:05:36 +0100
Subject: [PATCH 1231/1286] use translation service to determine placeholder
 values of date picker (#2827)

* use translation service to determine placeholder values

* added translation of date-picker placeholder values

* added German translations of date-picker placeholder values

* fix lint warning: added missing comma

* fix lint warning: removed trailing spaces

* fixed broken tests

* fixed lint warning

* try to mock TranslateService correctly

* remove TranslateService mock

* removed imports

* fixed lint warnings

* fixed lint warnings

* fixed lint warning

* fixed lint warning

* fixed lint error

* fixed lint errors

* removed TestComponent

* added imports

* removed declarations

* fixed lint error

* fix lint error (invalid sorting)

* finally fixing lint error

* use translation pipe directly in template

* move translation of placeholders into HTML template

* remove TranslateService dependency
---
 .../models/date-picker/date-picker.component.html      |  6 +++---
 .../models/date-picker/date-picker.component.spec.ts   |  6 +++++-
 .../models/date-picker/date-picker.component.ts        |  6 ++----
 src/assets/i18n/de.json5                               | 10 ++++++++++
 src/assets/i18n/en.json5                               |  6 ++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 3bf02c4abd..3dab2d214a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -14,7 +14,7 @@
       [(ngModel)]="initialYear"
       [value]="year"
       [invalid]="showErrorMessages"
-      [placeholder]='yearPlaceholder'
+      [placeholder]="'form.date-picker.placeholder.year' | translate"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -29,7 +29,7 @@
       [size]="6"
       [(ngModel)]="initialMonth"
       [value]="month"
-      [placeholder]="monthPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.month' | translate"
       [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
@@ -45,7 +45,7 @@
       [size]="2"
       [(ngModel)]="initialDay"
       [value]="day"
-      [placeholder]="dayPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.day' | translate"
       [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index a6cf7a29f2..54bec75f0f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -24,7 +24,10 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import {
@@ -80,6 +83,7 @@ describe('DsDatePickerComponent test suite', () => {
         NgbModule,
         DsDatePickerComponent,
         TestComponent,
+        TranslateModule.forRoot(),
       ],
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index f398ea6965..360b37e31c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -22,6 +22,7 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import isEqual from 'lodash/isEqual';
 
 import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
@@ -42,6 +43,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
+    TranslateModule,
     BtnDisabledDirective,
   ],
   standalone: true,
@@ -74,10 +76,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   minDay = 1;
   maxDay = 31;
 
-  yearPlaceholder = 'year';
-  monthPlaceholder = 'month';
-  dayPlaceholder = 'day';
-
   disabledMonth = true;
   disabledDay = true;
 
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 2a627919d1..1d0480015a 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5998,4 +5998,14 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
+
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Jahr",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Monat",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Tag",
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 053e5133d9..7da72f0fb3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6758,6 +6758,12 @@
 
   "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 
+  "form.date-picker.placeholder.year": "Year",
+
+  "form.date-picker.placeholder.month": "Month",
+
+  "form.date-picker.placeholder.day": "Day",
+
   "item.page.cc.license.title": "Creative Commons license",
 
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",

From c6deb2271dc425375b43ca64d113d6fe28400301 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 6 Feb 2025 22:05:36 +0100
Subject: [PATCH 1232/1286] use translation service to determine placeholder
 values of date picker (#2827)

* use translation service to determine placeholder values

* added translation of date-picker placeholder values

* added German translations of date-picker placeholder values

* fix lint warning: added missing comma

* fix lint warning: removed trailing spaces

* fixed broken tests

* fixed lint warning

* try to mock TranslateService correctly

* remove TranslateService mock

* removed imports

* fixed lint warnings

* fixed lint warnings

* fixed lint warning

* fixed lint warning

* fixed lint error

* fixed lint errors

* removed TestComponent

* added imports

* removed declarations

* fixed lint error

* fix lint error (invalid sorting)

* finally fixing lint error

* use translation pipe directly in template

* move translation of placeholders into HTML template

* remove TranslateService dependency
---
 .../models/date-picker/date-picker.component.html      |  6 +++---
 .../models/date-picker/date-picker.component.spec.ts   |  6 +++++-
 .../models/date-picker/date-picker.component.ts        |  6 ++----
 src/assets/i18n/de.json5                               | 10 ++++++++++
 src/assets/i18n/en.json5                               |  6 ++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 3bf02c4abd..3dab2d214a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -14,7 +14,7 @@
       [(ngModel)]="initialYear"
       [value]="year"
       [invalid]="showErrorMessages"
-      [placeholder]='yearPlaceholder'
+      [placeholder]="'form.date-picker.placeholder.year' | translate"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -29,7 +29,7 @@
       [size]="6"
       [(ngModel)]="initialMonth"
       [value]="month"
-      [placeholder]="monthPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.month' | translate"
       [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
@@ -45,7 +45,7 @@
       [size]="2"
       [(ngModel)]="initialDay"
       [value]="day"
-      [placeholder]="dayPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.day' | translate"
       [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index a6cf7a29f2..54bec75f0f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -24,7 +24,10 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import {
@@ -80,6 +83,7 @@ describe('DsDatePickerComponent test suite', () => {
         NgbModule,
         DsDatePickerComponent,
         TestComponent,
+        TranslateModule.forRoot(),
       ],
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index f398ea6965..360b37e31c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -22,6 +22,7 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import isEqual from 'lodash/isEqual';
 
 import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
@@ -42,6 +43,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
+    TranslateModule,
     BtnDisabledDirective,
   ],
   standalone: true,
@@ -74,10 +76,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   minDay = 1;
   maxDay = 31;
 
-  yearPlaceholder = 'year';
-  monthPlaceholder = 'month';
-  dayPlaceholder = 'day';
-
   disabledMonth = true;
   disabledDay = true;
 
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 4ee698deed..9fd318e5e5 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5992,4 +5992,14 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
+
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Jahr",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Monat",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Tag",
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b64a499d2b..368791a35f 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -6764,6 +6764,12 @@
 
   "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 
+  "form.date-picker.placeholder.year": "Year",
+
+  "form.date-picker.placeholder.month": "Month",
+
+  "form.date-picker.placeholder.day": "Day",
+
   "item.page.cc.license.title": "Creative Commons license",
 
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",

From 7584b9e1c394c9e43806241b3461f48d563b4f6f Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 6 Feb 2025 22:05:36 +0100
Subject: [PATCH 1233/1286] use translation service to determine placeholder
 values of date picker (#2827)

* use translation service to determine placeholder values

* added translation of date-picker placeholder values

* added German translations of date-picker placeholder values

* fix lint warning: added missing comma

* fix lint warning: removed trailing spaces

* fixed broken tests

* fixed lint warning

* try to mock TranslateService correctly

* remove TranslateService mock

* removed imports

* fixed lint warnings

* fixed lint warnings

* fixed lint warning

* fixed lint warning

* fixed lint error

* fixed lint errors

* removed TestComponent

* added imports

* removed declarations

* fixed lint error

* fix lint error (invalid sorting)

* finally fixing lint error

* use translation pipe directly in template

* move translation of placeholders into HTML template

* remove TranslateService dependency
---
 .../models/date-picker/date-picker.component.html      |  6 +++---
 .../models/date-picker/date-picker.component.spec.ts   |  4 +++-
 .../models/date-picker/date-picker.component.ts        |  6 ++----
 src/assets/i18n/de.json5                               | 10 ++++++++++
 src/assets/i18n/en.json5                               |  6 ++++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 3bf02c4abd..3dab2d214a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -14,7 +14,7 @@
       [(ngModel)]="initialYear"
       [value]="year"
       [invalid]="showErrorMessages"
-      [placeholder]='yearPlaceholder'
+      [placeholder]="'form.date-picker.placeholder.year' | translate"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
       (focus)="onFocus($event)"
@@ -29,7 +29,7 @@
       [size]="6"
       [(ngModel)]="initialMonth"
       [value]="month"
-      [placeholder]="monthPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.month' | translate"
       [disabled]="!year || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
@@ -45,7 +45,7 @@
       [size]="2"
       [(ngModel)]="initialDay"
       [value]="day"
-      [placeholder]="dayPlaceholder"
+      [placeholder]="'form.date-picker.placeholder.day' | translate"
       [disabled]="!month || model.disabled"
       (blur)="onBlur($event)"
       (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index 2b30c439b8..50325e0058 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -14,6 +14,7 @@ import {
   mockDynamicFormValidationService
 } from '../../../../../testing/dynamic-form-mock-services';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
 
 
 export const DATE_TEST_GROUP = new UntypedFormGroup({
@@ -51,7 +52,8 @@ describe('DsDatePickerComponent test suite', () => {
 
     TestBed.configureTestingModule({
       imports: [
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDatePickerComponent,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 404e851493..a3e93a6bb4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -9,6 +9,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { DOCUMENT } from '@angular/common';
 import isEqual from 'lodash/isEqual';
+import { TranslateService } from '@ngx-translate/core';
 
 
 export type DatePickerFieldType = '_year' | '_month' | '_day';
@@ -48,10 +49,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   minDay = 1;
   maxDay = 31;
 
-  yearPlaceholder = 'year';
-  monthPlaceholder = 'month';
-  dayPlaceholder = 'day';
-
   disabledMonth = true;
   disabledDay = true;
 
@@ -59,6 +56,7 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected translateService: TranslateService,
               private renderer: Renderer2,
               @Inject(DOCUMENT) private _document: Document
   ) {
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 82420d691b..5e48b3d7e8 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5553,4 +5553,14 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
+
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Jahr",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Monat",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Tag",
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 99ce196254..c1660c1f0c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1808,6 +1808,12 @@
 
   "form.number-picker.increment": "Increment {{field}}",
 
+  "form.date-picker.placeholder.year": "Year",
+
+  "form.date-picker.placeholder.month": "Month",
+
+  "form.date-picker.placeholder.day": "Day",
+
   "grant-deny-request-copy.deny": "Don't send copy",
 
   "grant-deny-request-copy.email.back": "Back",

From a37bb6ade129acf0c18aef93a535cad555041f5e Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 6 Feb 2025 15:21:08 -0600
Subject: [PATCH 1234/1286] Move performanceprofiler option to last in list

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

diff --git a/config/config.example.yml b/config/config.example.yml
index 89f9bd283b..5fa2e74cbb 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,9 +19,6 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
-  # Enable request performance profiling data collection and printing the results in the server console.
-  # Defaults to false. Enabling in production is NOT recommended
-  enablePerformanceProfiler: false
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -48,6 +45,9 @@ ssr:
   # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
   # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
   replaceRestUrl: true
+  # Enable request performance profiling data collection and printing the results in the server console.
+  # Defaults to false. Enabling in production is NOT recommended
+  #enablePerformanceProfiler: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From 2e28a51b025e7bb2008d62d0239449f59fb9b57e Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Fri, 7 Feb 2025 09:00:10 +0100
Subject: [PATCH 1235/1286] [DURACOM-288] fix tests

---
 src/app/thumbnail/thumbnail.component.spec.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index b251c60dcf..1fe1215bfe 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -357,11 +357,8 @@ describe('ThumbnailComponent', () => {
       TestBed.configureTestingModule({
         imports: [
           TranslateModule.forRoot(),
-          ThumbnailComponent,
-          SafeUrlPipe,
-          MockTranslatePipe,
-          VarDirective,
         ],
+        declarations: [ThumbnailComponent, SafeUrlPipe, MockTranslatePipe, VarDirective],
         providers: [
           { provide: AuthService, useValue: authService },
           { provide: AuthorizationDataService, useValue: authorizationService },
@@ -386,7 +383,7 @@ describe('ThumbnailComponent', () => {
 
     it('should start out with isLoading$ true', () => {
       expect(comp.isLoading).toBeTrue();
-      expect(de.query(By.css('ds-loading'))).toBeTruthy();
+      expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
     });
 
     it('should not call setSrc', () => {

From 2108219711170bb1e69753fe06224aa2d8ff3140 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 6 Feb 2025 15:21:08 -0600
Subject: [PATCH 1236/1286] Move performanceprofiler option to last in list

(cherry picked from commit a37bb6ade129acf0c18aef93a535cad555041f5e)
---
 config/config.example.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 52f8be20f0..8893cf5a9f 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -19,9 +19,6 @@ ui:
 
 # Angular Server Side Rendering (SSR) settings
 ssr:
-  # Enable request performance profiling data collection and printing the results in the server console.
-  # Defaults to false. Enabling in production is NOT recommended
-  enablePerformanceProfiler: false
   # Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
@@ -48,6 +45,9 @@ ssr:
   # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
   # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
   replaceRestUrl: true
+  # Enable request performance profiling data collection and printing the results in the server console.
+  # Defaults to false. Enabling in production is NOT recommended
+  #enablePerformanceProfiler: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually

From 6eb5eec0501da9f054451b12d3c2b3a1e4f0e265 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 7 Feb 2025 11:17:42 -0600
Subject: [PATCH 1237/1286] Update version tag for release

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0a8849d085..5be9ca9a44 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.6.3-next",
+  "version": "7.6.3",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -110,8 +110,8 @@
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
-    "ngx-sortablejs": "^11.1.0",
     "ngx-skeleton-loader": "^7.0.0",
+    "ngx-sortablejs": "^11.1.0",
     "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.8.1",
     "pem": "1.14.8",

From b9ff51d51ccd0afb96dbe33560d240012b9b6d1c Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 7 Feb 2025 12:18:51 -0600
Subject: [PATCH 1238/1286] Update version tag for release

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

diff --git a/package.json b/package.json
index 130f062ef6..ee98e1943c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "8.1.0-next",
+  "version": "8.1.0",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

From 5bf38231fa8bc282a719d4a085acc1f6901db11a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 02:48:25 +0000
Subject: [PATCH 1239/1286] Bump eslint-plugin-jsonc from 2.18.2 to 2.19.1 in
 the eslint group

Bumps the eslint group with 1 update: [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc).


Updates `eslint-plugin-jsonc` from 2.18.2 to 2.19.1
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.18.2...v2.19.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..8a930f79ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -120,7 +120,7 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
-        "eslint-plugin-jsonc": "^2.18.2",
+        "eslint-plugin-jsonc": "^2.19.1",
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
@@ -11986,10 +11986,11 @@
       }
     },
     "node_modules/eslint-plugin-jsonc": {
-      "version": "2.18.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz",
-      "integrity": "sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.19.1.tgz",
+      "integrity": "sha512-MmlAOaZK1+Lg7YoCZPGRjb88ZjT+ct/KTsvcsbZdBm+w8WMzGx+XEmexk0m40P1WV9G2rFV7X3klyRGRpFXEjA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "eslint-compat-utils": "^0.6.0",
diff --git a/package.json b/package.json
index 9e72a4cc9d..027191838d 100644
--- a/package.json
+++ b/package.json
@@ -207,7 +207,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.18.2",
+    "eslint-plugin-jsonc": "^2.19.1",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",

From 98d32bc7adb30ce3fd8bf8563cc2d0479e194225 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 02:48:29 +0000
Subject: [PATCH 1240/1286] Bump cypress-axe from 1.5.0 to 1.6.0 in the testing
 group

Bumps the testing group with 1 update: [cypress-axe](https://github.com/component-driven/cypress-axe).


Updates `cypress-axe` from 1.5.0 to 1.6.0
- [Release notes](https://github.com/component-driven/cypress-axe/releases)
- [Commits](https://github.com/component-driven/cypress-axe/compare/v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: cypress-axe
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: testing
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..6516028a59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,7 +111,7 @@
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
         "cypress": "^13.17.0",
-        "cypress-axe": "^1.5.0",
+        "cypress-axe": "^1.6.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
         "eslint-plugin-deprecation": "^1.4.1",
@@ -10330,16 +10330,17 @@
       }
     },
     "node_modules/cypress-axe": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.5.0.tgz",
-      "integrity": "sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.6.0.tgz",
+      "integrity": "sha512-C/ij50G8eebBrl/WsGT7E+T/SFyIsRZ3Epx9cRTLrPL9Y1GcxlQGFoAVdtSFWRrHSCWXq9HC6iJQMaI89O9yvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
         "axe-core": "^3 || ^4",
-        "cypress": "^10 || ^11 || ^12 || ^13"
+        "cypress": "^10 || ^11 || ^12 || ^13 || ^14"
       }
     },
     "node_modules/cypress/node_modules/ansi-styles": {
diff --git a/package.json b/package.json
index 9e72a4cc9d..c9a8e05666 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
     "cypress": "^13.17.0",
-    "cypress-axe": "^1.5.0",
+    "cypress-axe": "^1.6.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",

From 7a4af88c0d4bc5fe9b9779fc4e96fa120c0514fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 02:49:15 +0000
Subject: [PATCH 1241/1286] Bump sass from 1.83.4 to 1.84.0 in the sass group

Bumps the sass group with 1 update: [sass](https://github.com/sass/dart-sass).


Updates `sass` from 1.83.4 to 1.84.0
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.83.4...1.84.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: sass
...

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

diff --git a/package-lock.json b/package-lock.json
index b75ddc9ccf..53c19b0791 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,7 +143,7 @@
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.83.4",
+        "sass": "~1.84.0",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
@@ -20496,9 +20496,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.83.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
-      "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
+      "version": "1.84.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
+      "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9e72a4cc9d..9300c9054b 100644
--- a/package.json
+++ b/package.json
@@ -230,7 +230,7 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.83.4",
+    "sass": "~1.84.0",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",

From a33afbef2b4e35e56f0ec6d2cfa0d23e1e484723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Morin?=
 <jean-francois.morin@bibl.ulaval.ca>
Date: Tue, 11 Feb 2025 14:03:00 -0500
Subject: [PATCH 1242/1286] Added missing line for Content Reports section

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

diff --git a/src/app/menu-resolver.service.ts b/src/app/menu-resolver.service.ts
index 683111b32a..31210883ae 100644
--- a/src/app/menu-resolver.service.ts
+++ b/src/app/menu-resolver.service.ts
@@ -169,6 +169,7 @@ export class MenuResolverService  {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
+    this.createReportMenuSections();
     return this.waitForMenu$(MenuID.ADMIN);
   }
 

From 5e0ae8a26e8aec1cbd9b7fc4a4f3f82c7764e415 Mon Sep 17 00:00:00 2001
From: Carolyn Sullivan <csulli28@uwo.ca>
Date: Mon, 18 Nov 2024 15:21:25 -0500
Subject: [PATCH 1243/1286] Update fr.json5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajouté des traductions/noté quelques étiquettes sans traductions

(cherry picked from commit 477ca5e71244bb7b7ef6e5c4eb9d6bb27f987b95)
---
 src/assets/i18n/fr.json5 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 8877c637cf..9126f11f49 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -4521,6 +4521,27 @@
   // "process.detail.back": "Back",
   "process.detail.back": "Retour",
 
+  //"process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Êtes-vous sûr de vouloir supprimer ce processus?",
+
+  //"process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Supprimer le processus",
+
+  //"process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "",
+
+  //"process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Supprimer le processus",
+
+  //"process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "",
+
+  //"process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "",
+
+  //"process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Le processus était supprimé",
+
   // "process.detail.output": "Process Output",
   "process.detail.output": "Sortie du processus",
 
@@ -4539,6 +4560,9 @@
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Ce processus ne contient pas de fichiers de sortie",
 
+  //"process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "",
+
   // "process.detail.script": "Script",
   "process.detail.script": "Script",
 

From ead548f499547a784c26489074c76d21f42a0b36 Mon Sep 17 00:00:00 2001
From: Carolyn Sullivan <csulli28@uwo.ca>
Date: Fri, 14 Feb 2025 09:53:21 -0500
Subject: [PATCH 1244/1286] Update fr.json5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ajouté les corrections faites par Pierre Lasou :)

(cherry picked from commit e32d9feaf5197d11ee966fa079350c37d6e15229)
---
 src/assets/i18n/fr.json5 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 9126f11f49..ea45f5b2fe 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -4528,19 +4528,19 @@
   "process.detail.delete.button": "Supprimer le processus",
 
   //"process.detail.delete.cancel": "Cancel",
-  "process.detail.delete.cancel": "",
+  "process.detail.delete.cancel": "Annuler",
 
   //"process.detail.delete.confirm": "Delete process",
   "process.detail.delete.confirm": "Supprimer le processus",
 
   //"process.detail.delete.error": "Something went wrong when deleting the process",
-  "process.detail.delete.error": "",
+  "process.detail.delete.error": "Une erreur s'est produite lors de la suppression du processus",
 
   //"process.detail.delete.header": "Delete process",
-  "process.detail.delete.header": "",
+  "process.detail.delete.header": "Supprimer un processus",
 
   //"process.detail.delete.success": "The process was successfully deleted.",
-  "process.detail.delete.success": "Le processus était supprimé",
+  "process.detail.delete.success": "Le processus a bien été supprimé.",
 
   // "process.detail.output": "Process Output",
   "process.detail.output": "Sortie du processus",
@@ -4561,7 +4561,7 @@
   "process.detail.output-files.empty": "Ce processus ne contient pas de fichiers de sortie",
 
   //"process.detail.refreshing": "Auto-refreshing…",
-  "process.detail.refreshing": "",
+  "process.detail.refreshing": "Actualisation automatique...",
 
   // "process.detail.script": "Script",
   "process.detail.script": "Script",

From 0437ec4c3f5d13dbe83bbfecfd2482e9be787322 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Fri, 21 Feb 2025 15:43:59 -0500
Subject: [PATCH 1245/1286] Addtion to the fr.json5 following version 8.1

Adding and changing parameters after upgrading to 8.1.
---
 src/assets/i18n/fr.json5 | 116 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 112 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index ea45f5b2fe..b6cd2fc905 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1471,11 +1471,11 @@
   // "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
   "browse.startsWith.type_text": "Ou saisir les premières lettres puis cliquer sur le bouton « Parcourir »",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Parcourir par {{ field }}{{ startsWith }} {{ value }}",
 
-  //"browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
+  //"browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Parcourir par {{ field }} {{ value }}",
 
   //"search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Retour aux résultats",
@@ -2682,6 +2682,66 @@
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Demande de copie de document acceptée avec succès",
 
+  //"health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Santé du système",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Santé",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Info",
+
+  //"health-page.status-tab": "Status",
+  "health-page.status-tab": "Statut",
+
+  //"health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Le service de vérification de la santé du système n'est pas disponible",
+
+  //"health-page.property.status": "Status code",
+  "health-page.property.status": "Code de statut",
+
+  //"health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Base de données",
+
+  // "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": "Application Backend",
+
+  //"health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  //"health-page.status": "Status",
+  "health-page.status": "Statut",
+
+  //"health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Opérationnel",
+
+  //"health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Problèmes détectés",
+
+  //"health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Problèmes éventuels détectés",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Santé du système",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Aucun problème détecté",
+
   // "home.description": "",
   "home.description": "",
 
@@ -3972,6 +4032,9 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorisations",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestion des accès en lot",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Groupes",
 
@@ -4590,9 +4653,39 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
+  //"process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Heure de fin (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processus en cours",
+
+  //"process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Heure de création (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processus planifiés",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Heure de début (TUC)",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Heure de fin (UTC)",
+
+  //"process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processus terminés",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "Aucun processus trouvé.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Heure de fin (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processus en échec",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Heure de fin (UTC)",
+
   // "process.overview.table.status": "Status",
   "process.overview.table.status": "Statut",
 
@@ -5648,6 +5741,9 @@
   // "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.crossref": "Crossref (DOI)",
 
+  //"submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   //"submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite (DOI)",
 
@@ -6532,6 +6628,9 @@
   //"submitter.empty": "N/A",
   "submitter.empty": "S/O",
 
+  //"subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Abonnements",
+
   //"subscriptions.modal.title": "Subscriptions",
   "subscriptions.modal.title": "Abonnements",
 
@@ -8440,6 +8539,15 @@
   //"search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
   "search.filters.filter.notifyEndorsement.label": "Chercher l'approbation Notify",
 
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Année",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Mois",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Jour",
+
   //"item.page.cc.license.title": "Creative Commons license",
   "item.page.cc.license.title": "Licence Creative Commons",
 

From 0dbae112dbcb20c6e8e3ead5281e3de15d7a01e7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 26 Feb 2025 12:25:46 -0600
Subject: [PATCH 1246/1286] Use toISOString instead of toUTCString, as ISO puts
 it in ISO-8601 format

---
 .../system-wide-alert-form.component.spec.ts           | 10 +++++-----
 .../alert-form/system-wide-alert-form.component.ts     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 8e0462d084..5abf93d0aa 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -184,7 +184,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -207,7 +207,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save(false);
 
@@ -254,7 +254,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -276,7 +276,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -301,7 +301,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index ea1c0a55f0..85365fa204 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -253,7 +253,7 @@ export class SystemWideAlertFormComponent implements OnInit {
     alert.active = this.formActive.value;
     if (this.counterEnabled$.getValue()) {
       const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
-      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
     } else {
       alert.countdownTo = null;
     }

From 0251aaa3f8e7cf707830d06696762168eff8025b Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 26 Feb 2025 08:47:35 +0300
Subject: [PATCH 1247/1286] src/app/core: add citation_doi tag to head meta

This is used by harvesters like Altmetric and was present in DSpace
version 6 and previous.
---
 src/app/core/metadata/head-tag.service.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/app/core/metadata/head-tag.service.ts b/src/app/core/metadata/head-tag.service.ts
index 8041bb3a4a..6c8d9fd432 100644
--- a/src/app/core/metadata/head-tag.service.ts
+++ b/src/app/core/metadata/head-tag.service.ts
@@ -186,6 +186,7 @@ export class HeadTagService {
     this.setCitationKeywordsTag();
 
     this.setCitationAbstractUrlTag();
+    this.setCitationDoiTag();
     this.setCitationPdfUrlTag();
     this.setCitationPublisherTag();
 
@@ -319,6 +320,18 @@ export class HeadTagService {
     }
   }
 
+  /**
+   * Add <meta name="citation_doi" ... >  to the <head>
+   */
+  protected setCitationDoiTag(): void {
+    if (this.currentObject.value instanceof Item) {
+      const doi = this.getMetaTagValue('dc.identifier.doi');
+      if (hasValue(doi)) {
+        this.addMetaTag('citation_doi', doi);
+      }
+    }
+  }
+
   /**
    * Add <meta name="citation_pdf_url" ... >  to the <head>
    */

From f28dc8bf72ea5388dee45ab3fe7c58869326911e Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 26 Feb 2025 08:47:48 +0300
Subject: [PATCH 1248/1286] src/app/core: remove unnecessary comment

Remove commented out this.setCitationDOITag() since it is not used
and we use camel case with this.setCitationDoiTag() now anyway.
---
 src/app/core/metadata/head-tag.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/core/metadata/head-tag.service.ts b/src/app/core/metadata/head-tag.service.ts
index 6c8d9fd432..d52efb8fa1 100644
--- a/src/app/core/metadata/head-tag.service.ts
+++ b/src/app/core/metadata/head-tag.service.ts
@@ -199,7 +199,6 @@ export class HeadTagService {
     // this.setCitationIssueTag();
     // this.setCitationFirstPageTag();
     // this.setCitationLastPageTag();
-    // this.setCitationDOITag();
     // this.setCitationPMIDTag();
 
     // this.setCitationFullTextTag();

From e0240259ec9a777c18b53bf951bc1341f8f2e5c5 Mon Sep 17 00:00:00 2001
From: Wout-atmire <wout.atmire@gmail.com>
Date: Wed, 5 Mar 2025 19:15:51 +0100
Subject: [PATCH 1249/1286] Upgrade to Bootstrap 5 & realign themes (#3506)

* 117631: upgraded bootstrap, ng-bootstrap and installed popper.js

* 117631: SASS to CSS variables

* 117631: Bootstrap 4 to 5 html/css fixes

* 117631: Theming fixes after bootstrap upgrade

* 117631: More theming fixes: accordions, spacing, search components etc

* 117631: Fixed tests

* 117631: Fixed offset issues

* 117631: Fixed contrast ratio issue

* 117631: Fixed variables, removed unnecessary mapping, fixed tables, upgraded to Bootstrap 5.3.3

* 118113: vertical footer deviders

* 118113: remove button shadow

* 118113: old checkboxes

* 118113: Custom icons font-family

* 118113: accordion color

* 118113: table striped customizable background-color

* 118113: revert vertical deviders in footer bs-secondary change

* 118113: modal close button

* 118113: add w-100 to btn-block elements

* 118113: border radius

* 118113: The date selector on the submission page gets squished to the side of its label fix

* 118113: adding margins to dynamic-form-control-containers

* 118113: adding gaps between sections of item submission form

* 118113: icon font-family removed !important

* 118113: removed !important from #legend_dc_date_issued

* 118113: move --bs-border-radius to $bs-border-radius

* 118113: remove new SCSS variable

* 118113: reduce size for Item type labels

* 118113: date picker border - transparent

* 118113: drag-item-container elements on same line

* 118113: specific border color for ds-number-picker buttons

* Simplify variables & styles

* 118627: html files

* Fix new SCSS compile issues, remove yarn.lock

* 118627: remove footer button shadow

* 118627: custom login button radius

* 118627: success button - white text

* 118627: table alternate colors

* Fix ghostly Bootstrap version, again

* Override (ng-)bootstrap versions for @ng-dynamic-forms

* 118627: Feedback - fix login button radius

* 118627: Feedback - fix footer button shadows

* 118627: Feedback - login border radius use $bs-border-radius-lg + change to rem

* 118627: Tooltip issue

* 118627: Metadata white authority badge

* 118627: Align Back button

* 118627: Bitstreams under Item's Metadata issue fix

* 118627: select on edit collection page "arrow icon"

* 118627: fix alignment issues

* 118627: fix admin sidebar "Managment" label

* 118627: Feedback - login button

* 118627: Line above table heads

* 118627: Remove HMTL accordion expandable arrow

* 118627: bitstream table

* 118627: notification "close button"

* 118627: faint border/shadow around the expand buttons on hierarchical browse pages

* 118627: tooltip margin

* 118627: Bootstrap 5 changed the default gutter size to 24px

* 118627: custom-aligning -> custom-alignment

* 118627: lint-fix

* 118627: lint fix

* 118627: e2e Fix with new "btn-close"

* 118627: e2e Fix heading order for access-control-form-container

* 118627: access-control-form-container mr-4 to me-4

* 118627: update mr to me & ml to ms & pr to ps & pl to ps

* 118627: Access Control "Mode" radiobuttons under Text

* 118627: Item submission Publisher select icon positioning

* 118627: resolved merge conflict with main (and npm install)

* 118627: cherrypicking 3553 commits

* Remove unused angular-idle-preload

(cherry picked from commit fef5dd72b30ca6174587f1a7dea8994f1e96bbc9)

* 118627: npm install - to fix package-lock.json

* 120594: hamberger menu not showing fix

* 120594: big logo header issue

* 120594: remove faint shadow

* 120594: btn-transparent class

* 120594: badge-* to bg-*

* 120594: add padding-right & -left for rounded-pill

* 120594: update test variables to fit the new bootstrap variables

* 120594: add missing rss conditions

* 120594: fix white badges

* 118627: remove shadow on number-picker

* 120594: revert white badge fix

* 120594: re-add dropdown-button in dynamic-lookup-relation-search-tab

* 120594: remove default radio button styling

* 120594: full width radio buttons

* 120594: edit collection page alignment

* 120594: bg -> bg-primary

* 120594: revert to old info color

* 120594: revert media breakpoints

* 120594: recover PR 3227 rss

* 120594: remove login & logout from PR

* 120594: ds-filter input & label gap

* 120594: ds-filter aligning rows

* 120594: remove navbar.module.ts

* 120594: remove item-edit-bitstream.component.html

* 120594: remove item-edit-bitstream-drag-handle.component.html

* 120594: Fix vocabulary-treeview styling

* 120594: Remove unused browse-by-metadata-page.component.html

* 120594: red invalid input label

* 120594: use old link color for number-picker: #1f7293

* 120594: move $theme-colors to sass override

* 120594: spacing for upload icon

* 120594: decrease media-breakpoint-down

* 120594: PR 3227 rss

* 120594: merge in main bootstrap variable mappings

* 120594: restore all mapped variable that have a value

* 120594: fix unset variable item-edit-bitstream-bundle.component.scss

* 120594: old tooltip color

* 120594: edit bitstream render text inline with the icon

* Revert "120594: merge in main bootstrap variable mappings"

This reverts commit 4e61b5fb

* 120594: add non-default mapped variables with references

* 120594: add docs in _bootstrap_variables_mapping.scss

* 120594: use bootstrap variables instead of hardcoded values

---------

Co-authored-by: lotte <lotte_hofstede@hotmail.com>
Co-authored-by: Yura Bondarenko <yura.bondarenko@atmire.com>
Co-authored-by: Yury Bondarenko <ybnd@tuta.io>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
---
 cypress/e2e/submission.cy.ts                  |   2 +-
 package-lock.json                             |  49 +-
 package.json                                  |   8 +-
 .../browse/bulk-access-browse.component.html  |  14 +-
 .../browse/bulk-access-browse.component.scss  |   4 +
 .../bulk-access/bulk-access.component.html    |   2 +-
 .../bulk-access-settings.component.html       |   8 +-
 .../epeople-registry.component.html           |  12 +-
 .../eperson-form/eperson-form.component.html  |   2 +-
 .../members-list/members-list.component.html  |   4 +-
 .../subgroups-list.component.html             |   6 +-
 .../groups-registry.component.html            |   8 +-
 .../batch-import-page.component.html          |   6 +-
 .../metadata-import-page.component.html       |   2 +-
 .../ldn-service-form.component.html           |   8 +-
 .../ldn-services-directory.component.html     |   4 +-
 .../admin-notify-logs-result.component.html   |   2 +-
 .../bitstream-formats.component.html          |   4 +-
 .../format-form/format-form.component.ts      |   2 +-
 .../metadata-registry.component.html          |   4 +-
 .../metadata-schema.component.html            |   2 +-
 .../filters-section.component.html            |   2 +-
 .../filters-section.component.scss            |   8 +
 ...vision-order-group-selector.component.html |   9 +-
 .../supervision-order-status.component.html   |   2 +-
 ...admin-workflow-grid-element.component.html |   4 +-
 ...admin-workflow-grid-element.component.html |   4 +-
 ...admin-workflow-list-element.component.html |   2 +-
 ...admin-workflow-list-element.component.html |   2 +-
 .../bitstream-authorizations.component.html   |   4 +-
 .../edit-bitstream-page.component.ts          |  10 +-
 .../breadcrumbs/breadcrumbs.component.scss    |   2 +
 .../collection-page.component.html            |   2 +-
 .../delete-collection-page.component.html     |   4 +-
 .../collection-roles.component.html           |  14 +-
 .../collection-source-controls.component.html |   8 +-
 .../collection-source.component.html          |   4 +-
 .../edit-collection-page.component.scss       |   9 +
 .../edit-collection-page.component.ts         |   1 +
 .../community-list.component.html             |   6 +-
 .../community-page.component.html             |   2 +-
 .../delete-community-page.component.html      |   4 +-
 .../community-roles.component.html            |  14 +-
 .../curation-form.component.html              |   8 +-
 .../dso-edit-metadata-cells.scss              |  12 +-
 .../dso-edit-metadata-value.component.html    |   6 +-
 .../dso-edit-metadata-value.component.scss    |   3 +
 .../dso-edit-metadata.component.html          |  12 +-
 ...-search-result-grid-element.component.html |   2 +-
 ...-search-result-grid-element.component.html |   2 +-
 ...-search-result-grid-element.component.html |   2 +-
 .../journal-issue.component.html              |   2 +-
 .../journal-volume.component.html             |   2 +-
 .../item-pages/journal/journal.component.html |   4 +-
 ...-search-result-grid-element.component.html |   2 +-
 ...-search-result-grid-element.component.html |   2 +-
 ...-search-result-grid-element.component.html |   2 +-
 .../org-unit/org-unit.component.html          |   4 +-
 .../item-pages/person/person.component.html   |   4 +-
 .../item-pages/project/project.component.html |   2 +-
 ...ult-list-submission-element.component.html |   2 +-
 .../name-variant-modal.component.html         |   3 +-
 .../name-variant-modal.component.spec.ts      |   2 +-
 src/app/footer/footer.component.html          |   2 +-
 src/app/footer/footer.component.scss          |   4 +
 .../forgot-password-form.component.html       |   2 +-
 src/app/header/header.component.html          |   2 +-
 .../health-info-component.component.html      |   2 +-
 .../health-info/health-info.component.html    |  12 +-
 .../health-component.component.html           |   2 +-
 .../health-panel/health-panel.component.html  |  12 +-
 .../health-status.component.html              |   6 +-
 .../home-news/home-news.component.html        |   4 +-
 .../home-news/home-news.component.scss        |   2 +-
 .../recent-item-list.component.html           |   2 +-
 .../end-user-agreement.component.html         |   4 +-
 .../feedback-form.component.html              |   8 +-
 ...tstream-request-a-copy-page.component.html |  16 +-
 .../upload/upload-bitstream.component.html    |   6 +-
 .../edit-item-page.component.html             |   2 +-
 .../item-bitstreams.component.html            |   4 +-
 .../item-edit-bitstream-bundle.component.html |   2 +-
 .../item-edit-bitstream-bundle.component.scss |  15 +-
 .../item-delete/item-delete.component.html    |   7 +-
 .../item-move/item-move.component.html        |   4 +-
 .../item-operation.component.html             |   4 +-
 .../item-register-doi-component.html          |   2 +-
 .../edit-relationship-list.component.html     |   2 +-
 .../edit-relationship.component.html          |   2 +-
 .../item-relationships.component.html         |   2 +-
 .../item-status/item-status.component.html    |  12 +-
 .../virtual-metadata.component.html           |   5 +-
 .../virtual-metadata.component.spec.ts        |   2 +-
 .../full/full-item-page.component.html        |   6 +-
 .../orcid-auth/orcid-auth.component.html      |   6 +-
 .../orcid-page/orcid-page.component.html      |   2 +-
 .../orcid-sync-settings.component.html        |  20 +-
 .../file-section/file-section.component.html  |   2 +-
 .../item-page/simple/item-page.component.scss |   2 +-
 .../publication/publication.component.html    |   2 +-
 .../untyped-item/untyped-item.component.html  |   2 +-
 ...etadata-representation-list.component.html |   4 +-
 .../qa-event-notification.component.html      |   2 +-
 .../related-items.component.html              |   4 +-
 .../item-versions-delete-modal.component.html |   3 +-
 ...ersions-row-element-version.component.html |   4 +-
 ...item-versions-summary-modal.component.html |  11 +-
 .../versions/item-versions.component.html     |   4 +-
 src/app/login-page/login-page.component.html  |   2 +-
 .../logout-page/logout-page.component.html    |   2 +-
 .../collection-selector.component.html        |   3 +-
 ...space-new-external-dropdown.component.html |   4 +-
 ...ace-new-submission-dropdown.component.html |   4 +-
 ...ace-qa-events-notifications.component.html |   2 +-
 .../expandable-navbar-section.component.scss  |   4 +-
 src/app/navbar/navbar.component.html          |   2 +-
 .../quality-assurance-events.component.html   |  20 +-
 .../quality-assurance-source.component.html   |   2 +-
 .../quality-assurance-topics.component.html   |   2 +-
 .../suggestion-actions.component.html         |   4 +-
 .../suggestions-popup.component.html          |   2 +-
 .../detail/process-detail.component.html      |  12 +-
 .../form/process-form.component.html          |   4 +-
 .../parameter-select.component.html           |   4 +-
 .../file-value-input.component.html           |   4 +-
 .../process-parameters.component.html         |   4 +-
 .../scripts-select.component.html             |   2 +-
 .../overview/process-overview.component.html  |  14 +-
 .../process-overview-table.component.html     |   4 +-
 .../profile-claim-item-modal.component.html   |   7 +-
 ...rofile-page-researcher-form.component.html |   6 +-
 .../profile-page/profile-page.component.html  |   2 +-
 .../register-email-form.component.html        |   4 +-
 .../create-profile.component.html             |  14 +-
 .../email-request-copy.component.html         |  10 +-
 .../search-navbar.component.html              |   2 +-
 .../search-navbar.component.scss              |   3 +-
 .../access-control-array-form.component.html  |   8 +-
 ...cess-control-form-container.component.html |  12 +-
 ...cess-control-form-container.component.scss |   5 +
 ...rol-select-bitstreams-modal.component.html |   3 +-
 src/app/shared/alert/alert.component.html     |   3 +-
 src/app/shared/alert/alert.component.scss     |   2 +-
 src/app/shared/alert/alert.component.spec.ts  |   2 +-
 src/app/shared/animations/slide.ts            |   1 -
 .../auth-nav-menu.component.html              |   4 +-
 .../collection-dropdown.component.html        |   4 +-
 .../comcol-form/comcol-form.component.html    |   6 +-
 .../comcol-role/comcol-role.component.html    |   2 +-
 .../edit-comcol-page.component.html           |   2 +-
 .../comcol-page-browse-by.component.html      |   2 +-
 .../confirmation-modal.component.html         |   3 +-
 .../confirmation-modal.component.spec.ts      |   2 +-
 ...m-withdrawn-reinstate-modal.component.html |   4 +-
 .../shared/ds-select/ds-select.component.html |   8 +-
 ...dit-menu-expandable-section.component.html |   2 +-
 .../dso-edit-menu.component.html              |   2 +-
 .../dso-selector/dso-selector.component.html  |   2 +-
 ...e-community-parent-selector.component.html |   8 +-
 ...create-item-parent-selector.component.html |   3 +-
 .../dso-selector-modal-wrapper.component.html |   3 +-
 ...o-selector-modal-wrapper.component.spec.ts |   2 +-
 .../edit-item-selector.component.html         |   3 +-
 .../entity-dropdown.component.html            |   4 +-
 .../eperson-search-box.component.html         |  14 +-
 .../group-search-box.component.html           |   6 +-
 .../file-download-link.component.html         |   2 +-
 ...amic-form-control-container.component.html |   7 +-
 ...amic-form-control-container.component.scss |  19 +
 ...sting-metadata-list-element.component.html |   2 +-
 ...sting-relation-list-element.component.html |   2 +-
 .../dynamic-form-array.component.html         |   1 +
 .../dynamic-form-array.component.scss         |  91 +-
 .../custom-switch.component.html              |   2 +-
 .../dynamic-date-picker-inline.component.html |  20 +-
 .../date-picker/date-picker.component.scss    |   3 +
 .../disabled/dynamic-disabled.component.html  |   2 +-
 .../models/list/dynamic-list.component.html   |   8 +-
 .../lookup/dynamic-lookup.component.html      |   8 +-
 .../lookup/dynamic-lookup.component.scss      |   9 +
 .../onebox/dynamic-onebox.component.html      |   4 +-
 .../dynamic-relation-group.component.html     |  10 +-
 .../models/tag/dynamic-tag.component.html     |   4 +-
 ...namic-lookup-relation-modal.component.html |   7 +-
 ...ic-lookup-relation-modal.component.spec.ts |   4 +-
 ...l-source-entry-import-modal.component.html |  11 +-
 ...-lookup-relation-search-tab.component.html |   2 +-
 .../builder/parsers/concat-field-parser.ts    |   2 +-
 .../form/builder/parsers/field-parser.ts      |   2 +-
 .../builder/parsers/onebox-field-parser.ts    |   6 +-
 .../shared/form/builder/parsers/row-parser.ts |   2 +-
 .../shared/form/chips/chips.component.html    |  12 +-
 src/app/shared/form/form.component.html       |   6 +-
 src/app/shared/form/form.component.scss       |   9 +
 .../number-picker.component.html              |   2 +-
 .../number-picker.component.scss              |   6 +-
 .../vocabulary-treeview-modal.component.html  |   3 +-
 .../vocabulary-treeview.component.html        |  20 +-
 .../vocabulary-treeview.component.scss        |  14 +
 src/app/shared/host-window.service.ts         |   8 +-
 .../idle-modal/idle-modal.component.html      |   3 +-
 .../idle-modal/idle-modal.component.spec.ts   |   2 +-
 .../filter-input-suggestions.component.html   |   6 +-
 src/app/shared/loading/loading.component.html |   2 +-
 .../log-in-external-provider.component.html   |   2 +-
 .../password/log-in-password.component.html   |   2 +-
 src/app/shared/log-out/log-out.component.html |   2 +-
 ...claimed-task-actions-reject.component.html |   5 +-
 .../pool-task-actions.component.html          |   2 +-
 .../workspaceitem-actions.component.html      |   3 +-
 .../notification/notification.component.html  |  23 +-
 .../notification/notification.component.scss  |   2 +-
 .../access-status-badge.component.html        |   2 +-
 .../shared/badges/badges.component.html       |   2 +-
 .../status-badge/status-badge.component.html  |   4 +-
 .../type-badge/type-badge.component.html      |   2 +-
 ...mportable-list-item-control.component.html |   4 +-
 .../item-collection.component.html            |   2 +-
 .../item-submitter.component.html             |   2 +-
 ...electable-list-item-control.component.html |   4 +-
 ...-search-result-grid-element.component.html |   2 +-
 .../browse-entry-list-element.component.html  |   4 +-
 .../collection-list-element.component.html    |   4 +-
 .../community-list-element.component.html     |   4 +-
 ...-search-result-list-element.component.html |   2 +-
 ...ult-list-element-submission.component.html |   2 +-
 ...-search-result-list-element.component.html |   2 +-
 ...-search-result-list-element.component.html |   2 +-
 ...-search-result-list-element.component.html |   2 +-
 ...-search-result-list-element.component.html |   3 +-
 ...-search-result-list-element.component.html |   3 +-
 ...sidebar-search-list-element.component.html |   2 +-
 .../collection-select.component.html          |   2 +-
 .../item-select/item-select.component.html    |   4 +-
 .../pagination/pagination.component.html      |   6 +-
 .../form/resource-policy-form.component.html  |  11 +-
 .../form/resource-policy-form.model.ts        |   2 +-
 src/app/shared/rss-feed/rss.component.html    |   4 +-
 .../scope-selector-modal.component.html       |   7 +-
 .../search-form/search-form.component.html    |   8 +-
 .../search-authority-filter.component.html    |   4 +-
 .../search-boolean-filter.component.html      |   4 +-
 .../search-facet-option.component.html        |   4 +-
 .../search-facet-range-option.component.html  |   4 +-
 ...earch-facet-selected-option.component.html |   2 +-
 .../search-hierarchy-filter.component.html    |   4 +-
 .../search-range-filter.component.html        |  10 +-
 .../search-text-filter.component.html         |   4 +-
 .../search-label-range.component.html         |   8 +-
 .../search-label/search-label.component.html  |   4 +-
 .../search-sidebar.component.html             |   2 +-
 ...search-switch-configuration.component.html |   2 +-
 ...rch-switch-configuration.component.spec.ts |   2 +-
 src/app/shared/search/search.component.html   |   2 +-
 src/app/shared/search/search.component.scss   |   6 +-
 .../sidebar/page-with-sidebar.component.html  |   2 +-
 .../sidebar/page-with-sidebar.component.scss  |   9 +-
 .../sidebar/sidebar-dropdown.component.html   |   4 +-
 .../date/starts-with-date.component.html      |  61 +-
 .../text/starts-with-text.component.html      |   4 +-
 .../subscription-modal.component.html         |   7 +-
 .../testing/css-variable-service.stub.ts      |   8 +-
 .../truncatable-part.component.html           |   2 +-
 .../file-dropzone-no-uploader.component.html  |   2 +-
 .../upload/uploader/uploader.component.html   |  10 +-
 .../submission-form-collection.component.html |  16 +-
 .../submission-form-footer.component.html     |   7 +-
 .../form/submission-form.component.html       |   2 +-
 .../form/submission-form.component.scss       |   2 +-
 ...-import-external-collection.component.html |   3 +-
 ...-import-external-collection.component.scss |   2 +-
 ...ion-import-external-preview.component.html |   5 +-
 ...ion-import-external-preview.component.scss |   2 +-
 ...n-import-external-searchbar.component.html |  14 +-
 .../accesses/section-accesses.model.ts        |  10 +-
 ...mission-section-cc-licenses.component.html |  13 +-
 .../section-container.component.html          |  24 +-
 .../sections/license/section-license.model.ts |   2 +-
 .../section-coar-notify.component.html        |  10 +-
 .../content-accordion.component.html          |   8 +-
 .../metadata-information.component.html       |   4 +-
 .../publication-information.component.html    |   4 +-
 .../publisher-policy.component.html           |   4 +-
 .../section-sherpa-policies.component.html    |   2 +-
 ...on-upload-access-conditions.component.html |   6 +-
 .../section-upload-file-edit.component.html   |   3 +-
 .../edit/section-upload-file-edit.model.ts    |  10 +-
 .../file/section-upload-file.component.html   |  11 +-
 .../suggestions-page.component.html           |   2 +-
 .../system-wide-alert-banner.component.html   |   4 +-
 .../system-wide-alert-form.component.html     |  12 +-
 ...nced-workflow-action-rating.component.html |   4 +-
 .../workspaceitems-delete-page.component.html |   3 +-
 src/styles/_bootstrap_variables.scss          |  27 +-
 src/styles/_bootstrap_variables_mapping.scss  | 869 ++----------------
 src/styles/_custom_variables.scss             |   6 +-
 src/styles/_global-styles.scss                |  70 +-
 src/styles/_variables.scss                    |   6 +-
 ...-collection-parent-selector.component.html |   3 +-
 ...e-community-parent-selector.component.html |   7 +-
 ...create-item-parent-selector.component.html |   3 +-
 .../edit-collection-selector.component.html   |   3 +-
 .../edit-community-selector.component.html    |   3 +-
 .../edit-item-selector.component.html         |   3 +-
 .../_theme_sass_variable_overrides.scss       |  26 +-
 .../dspace/app/header/header.component.html   |   7 +-
 .../home-news/home-news.component.html        |   4 +-
 .../home-news/home-news.component.scss        |   2 +-
 src/themes/dspace/styles/_global-styles.scss  |   2 +-
 .../_theme_sass_variable_overrides.scss       |  12 +-
 src/themes/dspace/styles/theme.scss           |   3 +
 webpack/webpack.common.ts                     |   4 -
 312 files changed, 1064 insertions(+), 1662 deletions(-)
 create mode 100644 src/app/collection-page/edit-collection-page/edit-collection-page.component.scss

diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index ebdabbde2e..d46bb9fc0d 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -217,7 +217,7 @@ describe('New Submission page', () => {
     });
 
     // Close popup window
-    cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+    cy.get('ds-dynamic-lookup-relation-modal button.btn-close').click();
 
     // Back on the form, click the discard button to remove new submission
     // Clicking it will display a confirmation, which we will confirm with another click
diff --git a/package-lock.json b/package-lock.json
index b5ad2f6bdf..f1f35dd217 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@angular/ssr": "^17.3.11",
         "@babel/runtime": "7.26.7",
         "@kolkov/ngx-gallery": "^2.0.1",
-        "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^12.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
         "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
         "@ngrx/effects": "^17.1.1",
@@ -33,7 +33,7 @@
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
         "axios": "^1.7.9",
-        "bootstrap": "^4.6.1",
+        "bootstrap": "^5.3",
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
@@ -5496,9 +5496,9 @@
       }
     },
     "node_modules/@ng-bootstrap/ng-bootstrap": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz",
-      "integrity": "sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==",
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-12.1.2.tgz",
+      "integrity": "sha512-p27c+mYVdHiJMYrj5hwClVJxLdiZxafAqlbw1sdJh2xJ1rGOe+H/kCf5YDRbhlHqRN+34Gr0RQqIUeD1I2V8hg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -5507,6 +5507,7 @@
         "@angular/core": "^13.0.0",
         "@angular/forms": "^13.0.0",
         "@angular/localize": "^13.0.0",
+        "@popperjs/core": "^2.10.2",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -6250,6 +6251,16 @@
         "node": ">=14"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@react-dnd/asap": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
@@ -8679,9 +8690,9 @@
       "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="
     },
     "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "funding": [
         {
           "type": "github",
@@ -8693,8 +8704,7 @@
         }
       ],
       "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.1"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/brace-expansion": {
@@ -14878,13 +14888,6 @@
         "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/js-cookie": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
@@ -18383,18 +18386,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/portscanner": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz",
diff --git a/package.json b/package.json
index fb6cf658de..3171f40369 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,9 @@
       "@angular/forms": "^17.3.11"
     },
     "@ng-dynamic-forms/ui-ng-bootstrap": {
-      "ngx-mask": "14.2.4"
+      "ngx-mask": "14.2.4",
+      "@ng-bootstrap/ng-bootstrap": "^12.0.0",
+      "bootstrap": "^5.3"
     },
     "@ngtools/webpack": {
       "@angular/compiler-cli": "^17.3.11",
@@ -110,7 +112,7 @@
     "@angular/ssr": "^17.3.11",
     "@babel/runtime": "7.26.7",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
     "@ngrx/effects": "^17.1.1",
@@ -120,7 +122,7 @@
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.9",
-    "bootstrap": "^4.6.1",
+    "bootstrap": "^5.3",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index f96ddf4a23..6c748ca2e7 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -1,19 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
-    <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
+    <ng-template ngbPanelTitle>
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle('browse')"
            data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
                 [attr.aria-expanded]="acc.isExpanded('browse')"
                 aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
@@ -22,7 +16,7 @@
           <li [ngbNavItem]="'search'" role="presentation">
             <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
             <ng-template ngbNavContent>
-              <div class="mx-n3">
+              <div class="bulk-access-search">
                 <ds-search [configuration]="'administrativeBulkAccess'"
                                   [selectable]="true"
                                   [selectionConfig]="{ repeatable: true, listId: listId }"
@@ -42,7 +36,7 @@
                 [showPaginator]="false"
                 (prev)="pagePrev()"
                 (next)="pageNext()">
-                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
+              <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ms-4">
                   <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
                               currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
                       class="mt-4 mb-4 d-flex"
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
index e69de29bb2..0fb077b979 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
@@ -0,0 +1,4 @@
+.bulk-access-search {
+    margin-right: calc(var(--bs-gutter-x, 1.5rem) / -2);
+    margin-left: calc(var(--bs-gutter-x, 1.5rem) / -2);
+}
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index cda6b805bc..d22a8bda43 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -7,7 +7,7 @@
   <hr>
 
   <div class="d-flex justify-content-end">
-    <button class="btn btn-outline-primary mr-3" (click)="reset()">
+    <button class="btn btn-outline-primary me-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
     <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
index c41053874e..0b5c872aff 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -1,17 +1,11 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
-    <ng-template ngbPanelHeader>
+    <ng-template ngbPanelTitle>
       <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
                 aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index b5a26533cf..8c462daf6b 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -5,10 +5,10 @@
         <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
         <div>
-          <button class="mr-auto btn btn-success addEPerson-button"
+          <button class="me-auto btn btn-success addEPerson-button"
                   [routerLink]="'create'">
             <i class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
+            <span class="d-none d-sm-inline ms-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
@@ -18,17 +18,17 @@
       </h2>
       <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">
+            <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
             <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
             <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
           </select>
         </div>
-        <div class="flex-grow-1 mr-3 ml-3">
-          <div class="form-group input-group">
+          <div class="flex-grow-1 me-3 ms-3">
+            <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
                    class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
                    [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
-            <span class="input-group-append">
+              <span class="input-group-append">
                 <button type="submit" class="search-button btn btn-primary">
                   <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
                 </button>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 3aa4d66b05..c6f3a915a9 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -29,7 +29,7 @@
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
-        <div *ngIf="canImpersonate$ | async" between class="btn-group">
+        <div *ngIf="canImpersonate$ | async" between class="btn-group ms-1">
           <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
             <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
           </button>
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 d289d036bb..82e07a898d 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
@@ -75,8 +75,8 @@
   </h3>
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="form-group input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
                class="form-control" aria-label="Search input">
         <span class="input-group-append">
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 66404bde0d..32525fb2b5 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
@@ -62,8 +62,8 @@
 
   </h4>
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
                class="form-control" aria-label="Search input">
         <span class="input-group-append">
@@ -75,7 +75,7 @@
       </div>
     </div>
     <div>
-      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-right">
+      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-end">
         {{messagePrefix + '.button.see-all' | translate}}
       </button>
     </div>
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 4150e2560c..8dd88e23fb 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -4,18 +4,18 @@
       <div class="d-flex justify-content-between border-bottom mb-3">
         <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
-          <button class="mr-auto btn btn-success"
+          <button class="me-auto btn btn-success"
                   [routerLink]="'create'">
             <i class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>
+            <span class="d-none d-sm-inline ms-1">{{messagePrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
       <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-        <div class="flex-grow-1 mr-3">
-          <div class="form-group input-group">
+        <div class="flex-grow-1 me-3">
+          <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
                    class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
                    [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index c51ee7597c..c321fb235d 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -8,7 +8,7 @@
   <p>
     <button class="btn btn-primary" (click)="this.selectCollection();">{{'admin.metadata-import.page.button.select-collection' | translate}}</button>
   </p>
-  <div class="form-group">
+  <div class="mb-3">
     <div class="form-check">
       <input class="form-check-input" type="checkbox" id="validateOnly" [(ngModel)]="validateOnly">
       <label class="form-check-label" for="validateOnly">
@@ -25,7 +25,7 @@
              [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
              [checked]="isUpload"
              (change)="toggleUpload()" ></ui-switch>
-  <small class="form-text text-muted">
+  <small class="form-text text-muted d-block">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
 
@@ -38,7 +38,7 @@
     [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
   </ds-file-dropzone-no-uploader>
 
-  <div class="form-group mt-2" *ngIf="!isUpload">
+  <div class="mb-3 mt-2" *ngIf="!isUpload">
     <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
            data-test="file-url-input" [(ngModel)]="fileURL">
   </div>
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 73e69737ca..154e69d2c9 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
-  <div class="form-group">
+  <div class="mb-3">
     <div class="form-check">
       <input class="form-check-input" type="checkbox" id="validateOnly" [(ngModel)]="validateOnly">
       <label class="form-check-label" for="validateOnly">
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index a980182882..3a42eb7825 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -37,7 +37,7 @@
     <div class="mb-5 mt-5">
       <!-- In the url section -->
       <div class="d-flex align-items-center">
-        <div class="d-flex flex-column w-50 mr-2">
+        <div class="d-flex flex-column w-50 me-2">
           <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
                  [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
@@ -73,7 +73,7 @@
       <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
       <div class="d-flex">
         <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
-               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
+               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
                formControlName="lowerIp"
                id="lowerIp"
                name="lowerIp"
@@ -298,7 +298,7 @@
     </div>
       <div class="modal-footer">
         <div *ngIf="!isNewService">
-          <button (click)="closeModal()" class="btn btn-outline-secondary mr-2"
+          <button (click)="closeModal()" class="btn btn-outline-secondary me-2"
                   id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
           </button>
           <button *ngIf="!isNewService" (click)="patchService()"
@@ -306,7 +306,7 @@
           </button>
         </div>
         <div *ngIf="isNewService">
-          <button (click)="closeModal()" class="btn btn-outline-secondary mr-2 "
+          <button (click)="closeModal()" class="btn btn-outline-secondary me-2 "
                   id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
           </button>
           <button (click)="createService()"
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
index 1c3dbe91f2..1e43cfad5d 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -4,7 +4,7 @@
   </div>
   <div class="d-flex justify-content-end">
     <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
-      class="fas fa-plus pr-2"></i>{{ 'process.overview.new' | translate }}</button>
+      class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
   </div>
   <ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
                  [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
@@ -85,7 +85,7 @@
       <div class="mt-4 text-right">
         <button (click)="closeModal()"
                 [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-                class="btn btn-outline-secondary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
+                class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
         <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
                 class="btn btn-danger"
                 [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
index 57ce83934c..48e2a42fe2 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -3,7 +3,7 @@
     <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
     <div class="col-md-9">
       <div class="h4">
-        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary mr-1 mb-1">
+        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge bg-primary me-1 mb-1">
           {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
           <span> ×</span>
         </button>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index ccdfd3dfec..cc544476cc 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -28,7 +28,7 @@
             <tbody>
             <tr *ngFor="let bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page">
               <td>
-                <label class="mb-0">
+                <label class="form-label mb-0">
                   <input type="checkbox"
                          [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
                          [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
@@ -52,7 +52,7 @@
 
       <div>
         <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
-        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 37ae0d1dc0..08c3343aa8 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -64,7 +64,7 @@ export class FormatFormComponent implements OnInit {
    */
   arrayElementLayout: DynamicFormControlLayout = {
     grid: {
-      group: 'form-row',
+      group: 'row',
     },
   };
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 8b3c6fe972..ff70c04d11 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -29,7 +29,7 @@
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
                             [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
                             <td>
-                                <label class="mb-0">
+                                <label class="form-label mb-0">
                                     <input type="checkbox"
                                            [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
                                            (change)="selectMetadataSchema(schema, $event)"
@@ -52,7 +52,7 @@
             </div>
 
             <div>
-              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
+              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
             </div>
 
         </div>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 288266fb75..19c5370a9c 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -53,7 +53,7 @@
 
         <div>
           <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
         </div>
       </ng-container>
 
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
index 1e7856f09c..2fa1a2f547 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.html
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -13,7 +13,7 @@
     <legend>{{group.key | translate}}</legend>
     <ng-container [formGroup]="filtersForm">
         <div *ngFor="let filter of group.filters" class="col-6">
-            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1 align-baseline" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
+            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
         </div>
     </ng-container>
 </fieldset>
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.scss b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
index e69de29bb2..58d3a12f1b 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.scss
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
@@ -0,0 +1,8 @@
+.col-6 > label.col-11.align-middle {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+fieldset.row-cols-2 > legend {
+  float: none !important;
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
index 3ad1dce0b8..200286e08f 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -1,14 +1,13 @@
 <div>
     <div class="modal-header">{{'supervision-group-selector.header' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
         <div class="row">
             <div class="control-group col-sm-12">
-                <label for="supervisionOrder">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
-                <select name="supervisionOrder" id="supervisionOrder" class="form-control"
+                <label for="supervisionOrder" class="form-label">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
+                <select name="supervisionOrder" id="supervisionOrder" class="form-select"
                         [(ngModel)]="selectedOrderType"
                         attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
                     <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
@@ -20,7 +19,7 @@
         </div>
         <div class="row">
             <div class="control-group col-sm-12">
-                <label for="supervisionGroup">{{'supervision-group-selector.select.group.label' | translate}}</label>
+                <label for="supervisionGroup" class="form-label">{{'supervision-group-selector.select.group.label' | translate}}</label>
                 <ng-container class="mb-3">
                     <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
                     <ds-error *ngIf="isSubmitted && !selectedGroup" message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
index 84d8c052cd..75e10a10df 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
@@ -4,7 +4,7 @@
       <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
     </div>
     <div>
-      <a class="badge badge-primary mr-1 mb-1 text-capitalize mw-100 text-truncate" *ngFor="let supervisionOrder of supervisionOrders" data-test="soBadge"
+      <a class="badge bg-primary me-1 mb-1 text-capitalize mw-100 text-truncate" *ngFor="let supervisionOrder of supervisionOrders" data-test="soBadge"
          [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
          (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
         {{ dsoNameService.getName(supervisionOrder.group) }}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
index c5c2a5331a..70fbc6f667 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
@@ -1,8 +1,8 @@
 <ng-template dsDynamicComponentLoader>
 </ng-template>
-<div #badges class="position-absolute ml-1">
+<div #badges class="position-absolute ms-1">
     <div class="workflow-badge">
-        <span class="badge badge-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+        <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
     </div>
 </div>
 <ul #buttons class="list-group list-group-flush">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
index f78a0a3ca4..3af6264322 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
@@ -1,8 +1,8 @@
 <ng-template dsDynamicComponentLoader>
 </ng-template>
-<div #badges class="position-absolute ml-1">
+<div #badges class="position-absolute ms-1">
     <div class="workflow-badge">
-        <span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+        <span class="badge bg-info">{{ "admin.workflow.item.workspace" | translate }}</span>
     </div>
 </div>
 <ul #buttons class="list-group list-group-flush">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
index 192cc751f2..f34d17da51 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="workflow-badge">
-    <span class="badge badge-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+    <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
 </div>
 <ds-listable-object-component-loader *ngIf="item$ | async"
                                      [object]="item$ | async"
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
index ed877706c6..15e0699f28 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
@@ -1,4 +1,4 @@
-<span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+<span class="badge bg-info">{{ "admin.workflow.item.workspace" | translate }}</span>
 <ds-listable-object-component-loader *ngIf="item$ | async"
                                      [object]="item$ | async"
                                      [viewMode]="viewModes.ListElement"
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
index 804bb4f891..b749b3b213 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
@@ -1,8 +1,8 @@
 <div class="container">
   <ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="(dsoRD$ | async)?.payload?.id"></ds-resource-policies>
   <div class="button-row bottom">
-    <div class="text-right">
-      <a [routerLink]="['/bitstreams', (dsoRD$ | async)?.payload?.id, 'edit']" role="button" class="btn btn-outline-secondary mr-1">
+    <div class="text-end">
+      <a [routerLink]="['/bitstreams', (dsoRD$ | async)?.payload?.id, 'edit']" role="button" class="btn btn-outline-secondary me-1">
         <i class="fas fa-arrow-left"></i> {{'bitstream.edit.return' | translate}}
       </a>
     </div>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 9f1a84c19d..b54a7bbaed 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -255,7 +255,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifLabelModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -273,7 +273,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifTocModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -291,7 +291,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifWidthModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -309,7 +309,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifHeightModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -332,7 +332,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       ],
     }, {
       grid: {
-        host: 'form-row',
+        host: 'row',
       },
     }),
     new DynamicFormGroupModel({
diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index ac9cb42ce5..d938dad1a6 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -7,6 +7,8 @@
   padding-bottom: calc(var(--ds-content-spacing) / 2);
   padding-top: calc(var(--ds-content-spacing) / 2);
   background-color: var(--ds-breadcrumb-bg);
+  padding-left: calc(var(--bs-spacer) *.75);
+  padding-right: calc(var(--bs-spacer) *.75);
 }
 
 li.breadcrumb-item {
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 4a3e28c6aa..e5b8bd6945 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -5,7 +5,7 @@
       <div *ngIf="collectionRD?.payload as collection">
         <ds-view-tracker [object]="collection"></ds-view-tracker>
         <div class="d-flex flex-row border-bottom mb-4 pb-4">
-          <header class="comcol-header mr-auto">
+                <header class="comcol-header me-auto">
             <!-- Collection Name -->
             <ds-comcol-page-header
                 [name]="dsoNameService.getName(collection)">
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index 0cdba00f03..3bc2d23c34 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -4,8 +4,8 @@
             <div class="col-12 pb-4">
                 <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="form-group row">
-                  <div class="col text-right space-children-mr">
+                <div class="mb-3 row">
+                  <div class="col text-end space-children-mr">
                     <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
index 9c5020fc7f..7cd3d6a342 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
@@ -1,6 +1,8 @@
-<ds-comcol-role
-  *ngFor="let comcolRole of comcolRoles$ | async"
-  [dso]="collection$ | async"
-  [comcolRole]="comcolRole"
->
-</ds-comcol-role>
+<div class="custom-alignment">
+  <ds-comcol-role
+    *ngFor="let comcolRole of comcolRoles$ | async"
+    [dso]="collection$ | async"
+    [comcolRole]="comcolRole"
+  >
+  </ds-comcol-role>
+</div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 1e09758bd1..9a46fac09a 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -2,19 +2,19 @@
     <div class="container-fluid space-children-mr" *ngIf="shouldShow">
         <h3>{{ 'collection.source.controls.head' | translate }}</h3>
         <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
+            <span class="fw-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
             <span>{{contentSource?.harvestStatus}}</span>
         </div>
         <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
+            <span class="fw-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
             <span>{{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
         <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
+            <span class="fw-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
             <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
         <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
+            <span class="fw-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
             <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 7aa1f1a8b7..715ef9e726 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <div class="d-inline-block float-right space-children-mr">
+    <div class="d-inline-block float-end space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
                 [dsBtnDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
@@ -43,7 +43,7 @@
 <div class="container mt-2" *ngIf="(contentSource?.harvestType !== harvestTypeNone)">
     <div class="row">
         <div class="col-12">
-            <div class="d-inline-block float-right ml-1 space-children-mr">
+            <div class="d-inline-block float-end ms-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
                         [dsBtnDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss b/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss
new file mode 100644
index 0000000000..240d2bb868
--- /dev/null
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss
@@ -0,0 +1,9 @@
+:host ::ng-deep #oaiSetContainer {
+  > :first-child {
+    padding-left: 0;
+  }
+
+  > :last-child {
+    padding-right: 0;
+  }
+}
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index 4508ba7342..e629f80570 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -23,6 +23,7 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
 @Component({
   selector: 'ds-edit-collection',
   templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
+  styleUrls: ['./edit-collection-page.component.scss'],
   imports: [
     RouterLink,
     TranslateModule,
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 82238ddd0d..6f3fc66705 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -24,7 +24,7 @@
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
                  class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default" cdkTreeNodeToggle
+      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
               [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
               (click)="toggleExpanded(node)"
               data-test="expand-button">
@@ -39,8 +39,8 @@
       <div class="d-flex flex-row">
         <span class="d-flex align-middle my-auto">
           <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
-          <span class="pr-2">&nbsp;</span>
-          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead my-auto">{{node.payload.archivedItemsCount}}</span>
+          <span class="pe-2">&nbsp;</span>
+          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-top archived-items-lead my-auto ps-2 pe-2">{{node.payload.archivedItemsCount}}</span>
         </span>
       </div>
     </div>
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index a695e2019a..c04575841e 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -3,7 +3,7 @@
     <div *ngIf="communityRD?.payload; let communityPayload">
       <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
       <div class="d-flex flex-row border-bottom mb-4 pb-4">
-        <header class="comcol-header mr-auto">
+        <header class="comcol-header me-auto">
           <!-- Community name -->
           <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
           <!-- Community logo -->
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index b5d215e3b6..07b0bdfa9d 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -4,8 +4,8 @@
             <div class="col-12 pb-4">
                 <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="form-group row">
-                    <div class="col text-right space-children-mr">
+                <div class="mb-3 row">
+                    <div class="col text-end space-children-mr">
                         <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
index 37a70ff403..7a048cf923 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
@@ -1,6 +1,8 @@
-<ds-comcol-role
-  *ngFor="let comcolRole of comcolRoles$ | async"
-  [dso]="community$ | async"
-  [comcolRole]="comcolRole"
->
-</ds-comcol-role>
+<div class="custom-alignment">
+  <ds-comcol-role
+    *ngFor="let comcolRole of comcolRoles$ | async"
+    [dso]="community$ | async"
+    [comcolRole]="comcolRole"
+  >
+  </ds-comcol-role>
+</div>
diff --git a/src/app/curation-form/curation-form.component.html b/src/app/curation-form/curation-form.component.html
index c940494016..93c89499f3 100644
--- a/src/app/curation-form/curation-form.component.html
+++ b/src/app/curation-form/curation-form.component.html
@@ -1,16 +1,16 @@
 <form [formGroup]="form" (ngSubmit)="submit()">
-    <div class="form-group">
+    <div class="mb-3">
         <div class="row mb-2">
             <div class="col-12 col-sm-6">
-                <label class="font-weight-bold" for="task">{{'curation.form.task-select.label' |translate }}</label>
-                <select id="task" formControlName="task" class="form-control">
+                <label class="fw-bold form-label" for="task">{{'curation.form.task-select.label' |translate }}</label>
+                <select id="task" formControlName="task" class="form-select">
                     <option *ngFor="let task of tasks" [value]="task">
                         {{ 'curation-task.task.' + task + '.label' | translate }}
                     </option>
                 </select>
             </div>
             <div *ngIf="!hasHandleValue()" class="col-12 col-sm-6">
-                <label class="font-weight-bold" for="handle">{{'curation.form.handle.label' |translate }}</label>
+                <label class="fw-bold form-label" for="handle">{{'curation.form.handle.label' |translate }}</label>
                 <input id="handle" class="form-control" formControlName="handle">
                 <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
             </div>
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
index 29b93f3150..d83bacecb2 100644
--- 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
@@ -24,26 +24,26 @@
   }
 
   &.ds-warning {
-    background-color: var(--ds-warning-bg);
+    background-color: var(--ds-warning-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-warning);
+      border: 1px solid var(--bs-warning-border-subtle);
     }
   }
 
   &.ds-danger {
-    background-color: var(--ds-danger-bg);
+    background-color: var(--ds-danger-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-danger);
+      border: 1px solid var(--bs-danger-border-subtle);
     }
   }
 
   &.ds-success {
-    background-color: var(--ds-success-bg);
+    background-color: var(--ds-success-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-success);
+      border: 1px solid var(--bs-success-border-subtle);
     }
   }
 }
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 2262782687..3bddba534d 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
@@ -24,7 +24,7 @@
     {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
     </button>
     <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
-      <span class="badge badge-light border" >
+      <span class="badge bg-light border" >
         <i dsAuthorityConfidenceState
            class="fas fa-fw p-0"
            aria-hidden="true"
@@ -37,7 +37,7 @@
     <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
       <div class="btn-group w-75">
         <i dsAuthorityConfidenceState
-          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
+          class="fas fa-fw p-0 me-1 mt-auto mb-auto"
           aria-hidden="true"
           [authorityValue]="mdValue.newValue.confidence"
           [iconMode]="true"
@@ -60,7 +60,7 @@
       </div>
     </div>
     <div class="d-flex" *ngIf="mdRepresentation">
-      <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
+      <a class="me-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
       <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
     </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
index e555191300..b57e6005b7 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
@@ -14,3 +14,6 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+.badge.bg-light {
+  color: var(--bs-gray-900);
+}
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 54392a00b0..53ebd02491 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,24 +1,24 @@
 <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" [dsBtnDisabled]="form.newValue || (saving$ | async)"
+  <div class="button-row top d-flex my-2 space-children-mr ms-gap">
+    <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></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" [dsBtnDisabled]="(saving$ | async)"
+    <button class="btn btn-warning ms-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></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" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></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"
+    <button class="btn btn-danger ms-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [dsBtnDisabled]="!hasChanges || (saving$ | async)"
@@ -76,7 +76,7 @@
     <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
   </div>
   <div class="button-row bottom d-inline-block w-100">
-    <div class="mt-2 float-right space-children-mr ml-gap">
+    <div class="mt-2 float-end space-children-mr ms-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index bca1a1b3b3..e62da86922 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 3b14a1d8b0..7e0ab3f9e3 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 20084f21ba..a157089b02 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
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 e3dec92c52..9469dcc7b5 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </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 de1ee4a27d..ff8811b4a6 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </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 7041158923..b5a09a842f 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -38,7 +38,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isJournalOfPublication',
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 56c518a09c..95c3ae70f2 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 7b444d261c..7d8ea40f38 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 2181a4eb07..cc9c7f6f35 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -1,6 +1,6 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None"
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 21acce9f09..80cf2c11be 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -59,7 +59,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isOrgUnitOfPerson',
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 fb93da4265..da0d5e6c47 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field class="mr-auto" [item]="object">
+  <ds-item-page-title-field class="me-auto" [item]="object">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -55,7 +55,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isAuthorOfPublication',
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 340650506b..73dc9b4e09 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 @@
 <ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index 1f020d127f..6b9a775391 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex">
-<!--    <div class="person-thumbnail pr-2">-->
+<!--    <div class="person-thumbnail pe-2">-->
 <!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
 <!--    </div>-->
     <div class="flex-grow-1">
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
index 13ae884ccb..2129aec11a 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
@@ -1,7 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title">New name variant</h4>
-    <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Cross click')">
-        <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="modal.dismiss('Cross click')">
     </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
index ef20ec3a5c..e63e920784 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
@@ -43,7 +43,7 @@ describe('NameVariantModalComponent', () => {
   });
 
   it('when close button is clicked, dismiss should be called on the modal', () => {
-    debugElement.query(By.css('button.close')).triggerEventHandler('click', {});
+    debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {});
     expect(modal.dismiss).toHaveBeenCalled();
   });
 
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 4841674852..5bac874479 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,4 +1,4 @@
-<footer class="text-lg-start">
+<footer>
   <div *ngIf="showTopFooter" class="top-footer">
     <!-- Grid container -->
     <div class=" container p-4">
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 5f86137b44..7b6c6ae239 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -68,6 +68,10 @@
         }
       }
     }
+
+    .btn {
+      box-shadow: none;
+    }
   }
 }
 
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 6cff2903b9..f8cad64fd5 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -5,7 +5,7 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <span class="font-weight-bold">{{'forgot-password.form.identification.email' | translate}} </span>
+                    <span class="fw-bold form-label">{{'forgot-password.form.identification.email' | translate}} </span>
                     <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
                 </div>
             </div>
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index e59086134a..80873e7ede 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -11,7 +11,7 @@
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-auth-nav-menu></ds-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div *ngIf="isMobile$ | async" class="pl-2">
+        <div *ngIf="isMobile$ | async" class="ps-2">
           <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
                   aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index 84cba4d92f..073f194f7b 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -22,6 +22,6 @@
     </div>
   </div>
   <ng-container *ngIf="entry && isPlainProperty(entry.value)">
-    <p data-test="property"> <span class="font-weight-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
+    <p data-test="property"> <span class="fw-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
   </ng-container>
 </div>
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index b590695b0b..e8d1bfb56c 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -1,18 +1,14 @@
 <ng-container *ngIf="healthInfoResponse">
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
     <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
-      <ng-template ngbPanelHeader>
-        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
+      <ng-template ngbPanelTitle>
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="info-component">
           <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
                   [attr.aria-controls]="'health-info-' + entry.key + '-content'">
             {{ getPanelLabel(entry.key) | titlecase }}
           </button>
-          <div class="text-right d-flex gap-2">
-            <ds-health-status [status]="entry.value?.status"></ds-health-status>
-            <div class="d-flex my-auto">
-              <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
-              <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
-            </div>
+          <div class="text-end d-flex gap-2">
+            <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
           </div>
         </div>
       </ng-template>
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index f962e66052..55e11ed6ad 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -22,7 +22,7 @@
 </ng-container>
 <ng-container *ngIf="healthComponent?.details">
   <div *ngFor="let item of healthComponent?.details | dsObjNgFor" data-test="details">
-    <p data-test="property"><span class="font-weight-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
+    <p data-test="property"><span class="fw-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
   </div>
 </ng-container>
 <ng-container *ngIf="!healthComponent?.details && !healthComponent?.components">
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index ec2a27ce40..169cb05575 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -4,18 +4,14 @@
 </p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
   <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
-    <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
+    <ng-template ngbPanelTitle>
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="component">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
                 [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
           {{ getPanelLabel(entry.key) | titlecase }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <ds-health-status [status]="entry.value?.status"></ds-health-status>
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
-          </div>
+        <div class="text-end d-flex gap-2">
+          <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
         </div>
       </div>
     </ng-template>
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index e8710a0760..ee1dabc2de 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,12 @@
 <ng-container [ngSwitch]="status">
   <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success my-auto"
+     class="fa fa-check-circle text-success ms-2 mt-1"
      ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
   <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning my-auto"
+     class="fa fa-exclamation-triangle text-warning ms-2 mt-1"
      ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
   <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger my-auto"
+     class="fa fa-times-circle text-danger ms-2 mt-1"
      ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
 </ng-container>
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 9bb2e9857a..972c8cc293 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,8 +1,8 @@
-<div class="jumbotron jumbotron-fluid mt-ncs">
+<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
-        <h1 class="display-3">DSpace 9</h1>
+        <h1 class="display-2">DSpace 9</h1>
         <p class="lead">DSpace is the world leading open source repository platform that enables organisations to:</p>
       </div>
     </div>
diff --git a/src/app/home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
index 911a2fafc5..0306555522 100644
--- a/src/app/home-page/home-news/home-news.component.scss
+++ b/src/app/home-page/home-news/home-news.component.scss
@@ -13,7 +13,7 @@
 a {
   color: var(--ds-home-news-link-color);
 
-  @include hover {
+  &:hover {
     color: var(--ds-home-news-link-hover-color);
   }
 }
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index 82262be1b3..7bf89b232f 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -6,7 +6,7 @@
                         <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
                         </ds-listable-object-component-loader>
                 </div>
-                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
         </div>
         <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
         <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index ceb2ad23a4..23b728e09d 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -2,11 +2,11 @@
   <ds-end-user-agreement-content></ds-end-user-agreement-content>
 
   <form class="form-user-agreement-accept mt-4" (ngSubmit)="submit()" novalidate>
-    <input class="ml-1 mr-2" type="checkbox" id="user-agreement-accept" [(ngModel)]="accepted" [ngModelOptions]="{standalone: true}">
+    <input class="ms-1 me-2" type="checkbox" id="user-agreement-accept" [(ngModel)]="accepted" [ngModelOptions]="{standalone: true}">
     <label class="col-form-label-lg" for="user-agreement-accept">{{ 'info.end-user-agreement.accept' | translate }}</label>
 
     <div class="d-flex mt-4">
-      <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
+      <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary me-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
       <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index c5c4b460a2..7909c02272 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -5,7 +5,7 @@
     <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+            <label class="control-label form-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
           <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
           <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
         </div>
@@ -20,7 +20,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+            <label class="control-label form-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
           <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
         </div>
       </div>
@@ -33,14 +33,14 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+            <label class="control-label form-labe" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
           <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
           <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
       </div>
 
       <div class="row mt-3">
-        <div class="control-group col-sm-12 text-right">
+        <div class="control-group col-sm-12 text-end">
           <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 5f42ccee74..dde13db9a6 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -11,10 +11,10 @@
     </div>
     <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
 
-        <div class="form-group">
+        <div class="mb-3">
             <div class="row mb-4">
                 <div class="col-12">
-                    <label for="name">{{'bitstream-request-a-copy.name.label' | translate}}</label>
+                    <label for="name" class="form-label">{{'bitstream-request-a-copy.name.label' | translate}}</label>
                     <input [className]="(name.invalid) && (name.dirty || name.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="name" formControlName="name"/>
                     <div *ngIf="name.invalid && (name.dirty || name.touched)"
@@ -28,7 +28,7 @@
             <div class="row mb-4">
                 <div class="col-12">
                     <label
-                            for="email">{{'bitstream-request-a-copy.email.label' | translate}}</label>
+                            for="email" class="form-label">{{'bitstream-request-a-copy.email.label' | translate}}</label>
                     <input
                             [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                             id="email" formControlName="email">
@@ -44,13 +44,13 @@
             <div class="row mb-4">
                 <div class="col-12">
                     <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
-                    <div class="ml-4">
+                    <div class="ms-4 form-check">
                         <input [className]="'form-check-input'" type="radio"
                                id="allfiles-true" formControlName="allfiles" value="true">
                         <label class="form-check-label"
                                for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
                     </div>
-                    <div class="ml-4">
+                    <div class="ms-4">
                         <input [className]="'form-check-input'" type="radio"
                                id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
                         <label class="form-check-label"
@@ -61,7 +61,7 @@
             <div class="row mb-4">
                 <div class="col-12">
                     <label
-                            for="message">{{'bitstream-request-a-copy.message.label' | translate}}</label>
+                            for="message" class="form-label">{{'bitstream-request-a-copy.message.label' | translate}}</label>
                     <textarea rows="5"
                               [className]="'form-control'"
                               id="message" formControlName="message"></textarea>
@@ -72,9 +72,9 @@
 
     <hr>
     <div class="row">
-        <div class="col-12 text-right">
+        <div class="col-12 text-end">
 
-            <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary mr-1">
+            <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary me-1">
                 <i class="fas fa-arrow-left"></i> {{'bitstream-request-a-copy.return' | translate}}
             </a>
 
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index 530471135c..c055fdde68 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -5,13 +5,13 @@
         <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
           <div *ngIf="item">
-            <span class="font-weight-bold">{{'item.bitstreams.upload.item' | translate}}</span>
+            <span class="fw-bold">{{'item.bitstreams.upload.item' | translate}}</span>
             <span>{{ dsoNameService.getName(item) }}</span>
           </div>
         </ng-container>
       </div>
       <div class="col-12">
-        <label class="font-weight-bold">{{'item.bitstreams.upload.bundle' | translate}}</label>
+        <label class="fw-bold form-label">{{'item.bitstreams.upload.bundle' | translate}}</label>
         <ds-dso-input-suggestions #f id="search-form"
                                   [suggestions]="bundles"
                                   [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
@@ -24,7 +24,7 @@
                                   (click)="f.open()"
                                   ngDefaultControl>
         </ds-dso-input-suggestions>
-        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success mr-2" (click)="createBundle()">
+        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success me-2" (click)="createBundle()">
           <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
         </button>
         <ds-uploader  class="w-100" *ngIf="selectedBundleId"
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index cac114ef28..ecba905297 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -27,7 +27,7 @@
                         <router-outlet></router-outlet>
                     </div>
                     <div class="button-row bottom">
-                      <div class="text-right">
+                      <div class="text-end">
                         <a [routerLink]="getItemPage((itemRD$ | async)?.payload)" role="button" class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{'item.edit.return' | translate}}</a>
                       </div>
                     </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 24a6a7509a..b5d74d81f3 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -4,7 +4,7 @@
   </div>
 
   <div class="button-row top d-flex mt-2 space-children-mr">
-    <button class="mr-auto btn btn-success"
+    <button class="me-auto btn btn-success"
             [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
             [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
             class="fas fa-upload"></i>
@@ -50,7 +50,7 @@
   <ds-loading *ngIf="!bundles" message="{{'loading.bitstreams' | translate}}"></ds-loading>
 
   <div class="button-row bottom">
-    <div class="mt-4 float-right space-children-mr ml-gap">
+    <div class="mt-4 float-end space-children-mr ms-gap">
       <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
               [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
               (click)="reinstate()"><i
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 348118a05c..4450e62ec7 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -82,7 +82,7 @@
 
             <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                 scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
-              <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0" cdkDragHandle
+              <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
                    (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
                 <i class="fas fa-grip-vertical fa-fw"
                    [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
index bbd4e1e75c..1947119f24 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -1,13 +1,16 @@
 .header-row {
-  color: var(--bs-table-dark-color);
-  background-color: var(--bs-table-dark-bg);
-  border-color: var(--bs-table-dark-bg);
+  & > th {
+    padding: .75rem;
+  }
+  --bs-table-bg: var(--bs-dark);
+  --bs-table-bg-state: var(--bs-dark);
+  --bs-table-color-state: var(--bs-light);
 }
 
 .bundle-row {
-  color: var(--bs-table-head-color);
-  background-color: var(--bs-table-head-bg);
-  border-color: var(--bs-table-border-color);
+  --bs-table-color-state: var(--bs-dark);
+  --bs-table-bg: var(--bs-light-bg-subtle);
+  --bs-table-bg-state: var(--bs-light-bg-subtle);
 }
 
 .row-element {
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 25780d989c..5ed36347cb 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -35,7 +35,7 @@
                                                 [object]="relatedItem"
                                                 [viewMode]="viewMode">
                                         </ds-listable-object-component-loader>
-                                        <div class="ml-auto">
+                                        <div class="ms-auto">
                                             <div class="btn-group">
                                                 <button class="btn btn-outline-info btn-sm"
                                                         (click)="openVirtualMetadataModal(virtualMetadataModal)">
@@ -48,9 +48,8 @@
                                             <div class="thumb-font-1">
                                                 <div class="modal-header">
                                                     {{'virtual-metadata.delete-item.modal-head' | translate}}
-                                                    <button type="button" class="close"
+                                                    <button type="button" class="btn-close"
                                                             (click)="closeVirtualMetadataModal()" aria-label="Close">
-                                                        <span aria-hidden="true">×</span>
                                                     </button>
                                                 </div>
                                                 <div class="modal-body">
@@ -61,7 +60,7 @@
                                                     </ds-listable-object-component-loader>
                                                     <div *ngFor="let metadata of (relationshipDto.virtualMetadata$ | async)">
                                                         <div>
-                                                            <div class="font-weight-bold">
+                                                            <div class="fw-bold">
                                                                 {{metadata.metadataField}}
                                                             </div>
                                                             <div>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 63378f5afe..fa4bacab0e 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -20,7 +20,7 @@
             <div class="row">
                 <div class="col-12">
                     <p>
-                      <label for="inheritPoliciesCheckbox">
+                      <label class="form-label" for="inheritPoliciesCheckbox">
                         <ng-template #tooltipContent>
                           {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
                         </ng-template>
@@ -36,7 +36,7 @@
             </div>
 
           <div class="button-row bottom">
-            <div class="float-right space-children-mr">
+            <div class="float-end space-children-mr">
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
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 06f5e2901f..83c720bcb6 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
@@ -1,9 +1,9 @@
-<div class="col-12 col-md-3 h-auto float-left d-flex action-label">
+<div class="col-12 col-md-3 h-auto float-start d-flex action-label">
       <span class="justify-content-center align-self-center font-weight-bold">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
       </span>
 </div>
-<div class="col-12 col-md-9 float-left action-button">
+<div class="col-12 col-md-9 float-start action-button">
   <span *ngIf="operation.authorized">
     <button class="btn btn-outline-primary" [dsBtnDisabled]="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}}
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 97aa40c7b0..4cb5db3f1e 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -5,7 +5,7 @@
       <p>{{descriptionMessage | translate}}</p>
       <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
         <div *ngIf="(identifier.identifierType === 'doi')">
-          <p class="float-left">{{doiToUpdateMessage | translate}}: {{identifier.value}}
+          <p class="float-start">{{doiToUpdateMessage | translate}}: {{identifier.value}}
             ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
           </p>
         </div>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 06e3a4ace7..aede31e737 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
     {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 8cd86d597b..d33323759b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -7,7 +7,7 @@
     >
     </ds-listable-object-component-loader>
   </div>
-  <div class="col-2">
+  <div class="col-2 position-relative">
     <div class="btn-group relationship-action-buttons">
       <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
               class="btn btn-outline-danger btn-sm"
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 0ee2e6acfd..6376585ba5 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="button-row bottom">
-      <div class="float-right ml-gap">
+      <div class="float-end ms-gap">
         <ng-container *ngTemplateOutlet="buttons"></ng-container>
       </div>
     </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 7d6e2e9559..a640bc72cc 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,28 +1,28 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
   <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
-    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
+    <div class="col-12 col-md-3 float-start status-label font-weight-bold">
       {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
     </div>
-    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
+    <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
       {{statusData[statusKey]}}
     </div>
   </div>
 
   <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
     <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
+      <div class="col-12 col-md-3 float-start status-label font-weight-bold">
         {{identifier.identifierType.toLocaleUpperCase()}}
       </div>
-      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
+      <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
         ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
   </div>
 
-  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
+  <div class="col-12 col-md-3 float-start status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-start status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index 927f7dbb48..f86ab8c288 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -1,7 +1,6 @@
 <div [ngClass]="showThumbnails ? 'hide-modal-thumbnail-column' : ''">
     <div class="modal-header">{{'virtual-metadata.delete-relationship.modal-head' | translate}}
-        <button type="button" class="close" (click)="close.emit()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="close.emit()" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
@@ -18,7 +17,7 @@
                     <ds-listable-object-component-loader [object]="itemDTO.item">
                     </ds-listable-object-component-loader>
                     <div *ngFor="let metadata of virtualMetadata.get(itemDTO.item.uuid)">
-                        <div class="font-weight-bold">
+                        <div class="fw-bold">
                             {{metadata.metadataField}}
                         </div>
                         <div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
index e02df167f5..3d0f520d3d 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
@@ -99,7 +99,7 @@ describe('VirtualMetadataComponent', () => {
 
       spyOn(comp.close, 'emit');
       fixture.debugElement
-        .query(By.css('button.close'))
+        .query(By.css('button.btn-close'))
         .triggerEventHandler('click', null);
       expect(comp.close.emit).toHaveBeenCalled();
     });
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index b6e1d1e6ed..e9b6436d2f 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -6,7 +6,7 @@
       <ds-view-tracker [object]="item"></ds-view-tracker>
       <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
         <div class="d-flex flex-row">
-          <ds-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
+          <ds-item-page-title-field class="me-auto" [item]="item"></ds-item-page-title-field>
           <ds-dso-edit-menu></ds-dso-edit-menu>
         </div>
         <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
@@ -31,8 +31,8 @@
         <ds-item-page-collections [item]="item"></ds-item-page-collections>
         <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
         <div class="button-row bottom" *ngIf="fromSubmissionObject">
-          <div class="text-right">
-            <button class="btn btn-outline-secondary mr-1" (click)="back()"><i
+          <div class="text-end">
+            <button class="btn btn-outline-secondary me-1" (click)="back()"><i
                     class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
           </div>
         </div>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index 905372ba8c..eda90ed213 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -47,7 +47,7 @@
     </ds-alert>
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
-        <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
+        <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
                 [dsBtnDisabled]="(unlinkProcessing | async)">
           <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
@@ -55,7 +55,7 @@
             class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
         </button>
         <button *ngIf="(hasMissingOrcidAuthorizations() | async)" type="submit"
-                class="btn btn-primary float-right" (click)="linkOrcid()">
+                class="btn btn-primary float-end" (click)="linkOrcid()">
           <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
         </button>
       </div>
@@ -73,7 +73,7 @@
     </div>
     <div class="row">
       <div class="col">
-        <button class="btn btn-primary float-right" (click)="linkOrcid()">
+        <button class="btn btn-primary float-end" (click)="linkOrcid()">
           <i class="fas fa-link"></i>
           {{'person.page.orcid.link' | translate}}
         </button>
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 7c5ab4a276..472dc517fa 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -10,7 +10,7 @@
 
 <div *ngIf="(processingConnection | async) !== true && (item | async)" class="container">
   <div class="button-row bottom mb-3">
-    <div class="text-right">
+    <div class="text-end">
       <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
         <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
       </a>
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
index 19044e5a70..bfba8eb75d 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
@@ -12,9 +12,9 @@
                   {{ 'person.page.orcid.synchronization-mode-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group row">
-                <label for="syncMode">{{ 'person.page.orcid.synchronization-mode.label'| translate }}</label>
-                <select class="form-control" [(ngModel)]="currentSyncMode" name="syncMode" id="syncMode"
+              <div class="mb-3 row">
+                <label class="form-label" for="syncMode">{{ 'person.page.orcid.synchronization-mode.label'| translate }}</label>
+                <select class="form-select" [(ngModel)]="currentSyncMode" name="syncMode" id="syncMode"
                         required>
                   <option *ngFor="let syncMode of syncModes"
                           [value]="syncMode.value">{{ syncMode.label | translate }}</option>
@@ -36,13 +36,13 @@
                   {{ 'person.page.orcid.synchronization-mode-publication-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
+              <div class="mb-3">
                 <div *ngFor="let option of syncPublicationOptions" class="row form-check">
                   <input type="radio" [(ngModel)]="currentSyncPublications"
                          name="syncPublications" id="publicationOption_{{option.value}}" [value]="option.value"
                          required>
                   <label for="publicationOption_{{option.value}}"
-                         class="ml-2">{{option.label | translate}}</label>
+                         class="ms-2 form-label">{{option.label | translate}}</label>
                 </div>
               </div>
             </div>
@@ -59,12 +59,12 @@
                   {{ 'person.page.orcid.synchronization-mode-funding-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
+              <div class="mb-3">
                 <div *ngFor="let option of syncFundingOptions" class="row form-check">
                   <input type="radio" [(ngModel)]="currentSyncFunding"
                          name="syncFundings" id="fundingOption_{{option.value}}" [value]="option.value"
                          required>
-                  <label for="fundingOption_{{option.value}}" class="ml-2">{{option.label | translate}}</label>
+                  <label for="fundingOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
                 </div>
               </div>
             </div>
@@ -81,12 +81,12 @@
                   {{ 'person.page.orcid.synchronization-mode-profile-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
+              <div class="mb-3">
                 <div *ngFor="let option of syncProfileOptions" class="row form-check">
                   <input type="checkbox" [(ngModel)]="option.checked"
                          name="syncProfile_{{option.value}}" id="profileOption_{{option.value}}"
                          [value]="option.value">
-                  <label for="profileOption_{{option.value}}" class="ml-2">{{option.label | translate}}</label>
+                  <label for="profileOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
                 </div>
               </div>
             </div>
@@ -96,7 +96,7 @@
     </div>
     <div class="row">
       <div class="col">
-        <button type="submit" class="btn btn-primary float-right">
+        <button type="submit" class="btn btn-primary float-end">
           <i class="fas fa-edit"></i>
           {{ 'person.page.orcid.save.preference.changes' | translate }}
         </button>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 44c83b8626..3348f55162 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -3,7 +3,7 @@
     <div class="file-section">
       <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
         <span>
-          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">{{ 'item.page.bitstreams.primary' | translate }}</span> 
+          <span *ngIf="primaryBitsreamId === file.id" class="badge bg-primary">{{ 'item.page.bitstreams.primary' | translate }}</span>
           {{ dsoNameService.getName(file) }}
         </span>
         <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
diff --git a/src/app/item-page/simple/item-page.component.scss b/src/app/item-page/simple/item-page.component.scss
index a99cbd688f..2501fc92ca 100644
--- a/src/app/item-page/simple/item-page.component.scss
+++ b/src/app/item-page/simple/item-page.component.scss
@@ -1,4 +1,4 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
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 86f203deca..cfd4c818fc 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
@@ -9,7 +9,7 @@
   </div>
 </div>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </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 962cc2fcad..5d1b2c6715 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
@@ -10,7 +10,7 @@
 </div>
 
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index 424c2324fa..c845deb450 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -6,11 +6,11 @@
       </ds-metadata-representation-loader>
       <ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
-        <div *ngIf="(objects.length * incrementBy) < total" class="float-left">
+        <div *ngIf="(objects.length * incrementBy) < total" class="float-start">
           <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
             translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
         </div>
-        <div *ngIf="objects.length > 1" class="float-right">
+        <div *ngIf="objects.length > 1" class="float-end">
           <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
             translate:{ amount: representations?.length } }}</button>
         </div>
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index 77370f462d..16a1532fc0 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -8,7 +8,7 @@
              onerror="this.src='assets/images/dspace-logo.svg'">
       </div>
       <div class="w-100 d-flex justify-content-between">
-        <div class="pl-4 align-self-center">
+        <div class="ps-4 align-self-center">
           {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
         </div>
         <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 0b3cf6c0ac..b49c91aed9 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -6,11 +6,11 @@
       </ds-listable-object-component-loader>
       <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
-        <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
+        <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-start" id="view-more">
           <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
             translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
         </div>
-        <div *ngIf="objects.length > 1" class="float-right" id="view-less">
+        <div *ngIf="objects.length > 1" class="float-end" id="view-less">
           <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
             translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
         </div>
diff --git a/src/app/item-page/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
index 6c54a15162..b65883775b 100644
--- a/src/app/item-page/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
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'item.version.delete.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index a22ba008d8..95f6ed8d6b 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -8,11 +8,11 @@
       </ng-template>
       <span *ngIf="version?.id === itemVersion?.id">*</span>
 
-      <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
+      <span *ngIf="workspaceId$ | async" class="text-light badge bg-primary ms-3">
                       {{ "item.version.history.table.workspaceItem" | translate }}
                     </span>
 
-      <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
+      <span *ngIf="workflowId$ | async" class="text-light badge bg-info ms-3">
                       {{ "item.version.history.table.workflowItem" | translate }}
                     </span>
 
diff --git a/src/app/item-page/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
index c0e5e83b33..7b622744e2 100644
--- a/src/app/item-page/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
@@ -1,7 +1,6 @@
 <div *ngIf="(this.submitted$ | async) !== true; else waiting">
   <div class="modal-header">{{'item.version.create.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
@@ -11,8 +10,8 @@
         {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
       </span>
     </p>
-    <div class="form-group">
-      <label for="summary">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
+    <div class="mb-3">
+      <label for="summary" class="form-label">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
       <input type="text" id="summary" class="form-control" [(ngModel)]="newVersionSummary"
              (keyup.enter)="onModalSubmit()"
              placeholder="{{'item.version.create.modal.form.summary.placeholder' | translate }}"/>
@@ -20,13 +19,13 @@
     </div>
   </div>
   <div class="modal-footer space-children-mr">
-      <button class="btn btn-outline-secondary btn-sm ml-0"
+      <button class="btn btn-outline-secondary btn-sm ms-0"
               type="button"
               (click)="onModalClose()"
               title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
         <i class="fas fa-times fa-fw"></i> {{'item.version.create.modal.button.cancel' | translate}}
       </button>
-      <button class="btn btn-success btn-sm ml-0"
+      <button class="btn btn-success btn-sm ms-0"
               type="submit"
               (click)="onModalSubmit()"
               title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index ad2f216838..c90b2e545e 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -39,7 +39,7 @@
               {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
             </td>
             <td class="version-row-element-summary">
-              <div class="float-left">
+              <div class="float-start">
                 <ng-container *ngIf="isThisBeingEdited(versionDTO.version); then editSummary else showSummary"></ng-container>
                 <ng-template #showSummary>{{versionDTO.version.summary}}</ng-template>
                 <ng-template #editSummary>
@@ -49,7 +49,7 @@
                 </ng-template>
               </div>
 
-              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
+              <div class="float-end btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
                 <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
                   <!--DISCARD EDIT-->
                   <button class="btn btn-sm btn-outline-warning"
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index e32840ead8..cde54f8fd7 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -2,7 +2,7 @@
   <div class="text-center mt-5 row justify-content-center">
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
-      <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
+      <h1 class="h3 mb-0 fw-normal">{{"login.form.header" | translate}}</h1>
       <ds-log-in
       [isStandalonePage]="true"></ds-log-in>
     </div>
diff --git a/src/app/logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html
index edb86583fd..78074b30e8 100644
--- a/src/app/logout-page/logout-page.component.html
+++ b/src/app/logout-page/logout-page.component.html
@@ -2,7 +2,7 @@
   <div class="text-center mt-5 row justify-content-md-center">
     <div class="mx-auto">
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
-      <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
+      <h1 class="h3 mb-0 fw-normal">{{"logout.form.header" | translate}}</h1>
       <ds-log-out></ds-log-out>
     </div>
   </div>
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.html b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
index a87118fc4e..2e6d3b03bf 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.html
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.create.submission.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 70905d95ee..ddb74f58f9 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,5 +1,5 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
+    <button class="btn btn-lg btn-outline-primary mt-1 ms-2"
             [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
@@ -9,7 +9,7 @@
   <div class="add w-100" display="dynamic" placement="bottom-right"
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
+    <button class="btn btn-lg btn-outline-primary mt-1 ms-2" id="dropdownImport" ngbDropdownToggle
             type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index c68968e91f..1f20330c17 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,5 +1,5 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+    <button class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
             [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
@@ -7,7 +7,7 @@
   <div class="add w-100" display="dynamic" placement="bottom-right"
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
+    <button class="btn btn-lg btn-primary mt-1 ms-2" id="dropdownSubmission" ngbDropdownToggle
             type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index e44d2c6e48..c29412e004 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -13,7 +13,7 @@
       />
     </div>
       <div class="w-100 d-flex justify-content-between">
-        <div class="pl-4 align-self-center">
+        <div class="ps-4 align-self-center">
           {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
         </div>
         <button
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 8849fbd809..ab0934e902 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -5,7 +5,9 @@
 
   .dropdown-menu {
     overflow: hidden;
-    @include media-breakpoint-down(sm) {
+    min-width: 100%;
+    top: 100%;
+    @include media-breakpoint-down(xs) {
       border: 0;
       background-color: var(--ds-expandable-navbar-bg);
     }
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index f2f87a8bb6..7ea2b700ec 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -9,7 +9,7 @@
         <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
           <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
         </ng-container>
-        <div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
+        <div class="navbar-nav align-items-md-center me-auto shadow-none gapx-3">
           <ng-container *ngFor="let section of (sections | async)">
             <ng-container
               *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 6620d80f84..dbcafbde0e 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -63,30 +63,30 @@
                          [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
                     <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
                     <div *ngIf="eventElement?.event?.message?.serviceId">
-                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
+                      <span class="small pe-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
                       <span [title]="eventElement.event.message.serviceId">
                         <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
                       </span>
                     </div>
                     <div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
-                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
+                      <span class="small pe-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
                       <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
                         <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
                       </span>
                     </div>
                   </td>
                   <td *ngIf="showTopic.indexOf('/PID') !== -1">
-                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.type}}</span></p>
+                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.type}}</span></p>
                     <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
                       <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
                         {{eventElement.event.message.value}}
                       </a>
-                      <ng-template #noPID><span class="badge badge-info">{{eventElement.event.message.value}}</span></ng-template>
+                      <ng-template #noPID><span class="badge bg-info">{{eventElement.event.message.value}}</span></ng-template>
                     </p>
                   </td>
                   <td *ngIf="showTopic.indexOf('/SUBJECT') !== -1">
                     <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
-                       </span><br><span class="badge badge-info">{{eventElement.event.message.value}}</span></p>
+                       </span><br><span class="badge bg-info">{{eventElement.event.message.value}}</span></p>
                   </td>
                   <td *ngIf="showTopic.indexOf('/ABSTRACT') !== -1">
                     <p class="abstract-container" [class.show]="showMore">
@@ -125,11 +125,11 @@
                       <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
                     </p>
                     <p>
-                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.acronym}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.code}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.funder}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.jurisdiction}}</span></span>
+                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.acronym}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.code}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.funder}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.jurisdiction}}</span></span>
                     </p>
                     <hr>
                     <div>
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index 7d24452c9b..3a1ccbe7dc 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -41,7 +41,7 @@
                                 class="btn btn-outline-primary btn-sm"
                                 title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
                                 [routerLink]="[sourceElement.id]">
-                          <span class="badge badge-info">{{sourceElement.totalEvents}}</span>
+                          <span class="badge bg-info">{{sourceElement.totalEvents}}</span>
                           <i class="fas fa-info fa-fw"></i>
                         </button>
                       </div>
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index c2882f94ef..4afc5e2185 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -45,7 +45,7 @@
                               class="btn btn-outline-primary btn-sm"
                               title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
                               [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
-                        <span class="badge badge-info">{{topicElement.totalEvents}}</span>
+                        <span class="badge bg-info">{{topicElement.totalEvents}}</span>
                         <i class="fas fa-info fa-fw"></i>
                       </button>
                     </div>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index 342919d4ae..d262e746b1 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -19,9 +19,9 @@
     </ng-template>
 
   </div>
-  <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
+  <button (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
     {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
     <i class="fa fa-eye"></i>
     <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
     <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
index 474dfa329e..f21b469ccf 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.html
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -1,7 +1,7 @@
 <div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
   <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
     <button (click)="removePopup()"
-            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
+            type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
       <span aria-hidden="true">&times;</span>
     </button>
 
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 7558939ef3..a60ba59ec4 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -53,7 +53,7 @@
         </button>
         <ds-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
                            message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
-        <pre class="font-weight-bold text-secondary bg-light p-3" tabindex="0"
+        <pre class="fw-bold text-secondary bg-light p-3" tabindex="0"
              *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
         <p id="no-output-logs-message" *ngIf="((retrievingOutputLogs$ | async) !== true && showOutputLogs)
       && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output">
@@ -62,11 +62,11 @@
     </ds-process-detail-field>
 
     <ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
-        <button class="btn btn-success mr-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
-                class="fas fa-plus pr-2"></i>{{'process.detail.create' | translate}}</button>
+        <button class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
+                class="fas fa-plus pe-2"></i>{{'process.detail.create' | translate}}</button>
         <button *ngIf="isProcessFinished(process)" id="delete" class="btn btn-danger"
                 (click)="openDeleteModal(deleteModal)">
-            <i class="fas fa-trash pr-2"></i>{{ 'process.detail.delete.button' | translate }}
+            <i class="fas fa-trash pe-2"></i>{{ 'process.detail.delete.button' | translate }}
         </button>
     </ds-process-detail-field>
 
@@ -83,7 +83,7 @@
             <div>
                 <h4>{{'process.detail.delete.header' | translate }}</h4>
             </div>
-            <button type="button" class="close"
+            <button type="button" class="btn-close"
                     (click)="closeModal()" aria-label="Close">
                 <span aria-hidden="true">×</span>
             </button>
@@ -92,7 +92,7 @@
         <div class="modal-body">
             <div>{{'process.detail.delete.body' | translate }}</div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+                <button class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
                         (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
                 </button>
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index 211129489e..c1d1c3a61c 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -7,8 +7,8 @@
             <form #form="ngForm" (ngSubmit)="submitForm(form)">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
                 <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
-                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
+                <a [routerLink]="['/processes']" class="btn btn-danger float-start">{{ 'process.new.cancel' | translate }}</a>
+                <button type="submit" class="btn btn-primary float-end">{{ 'process.new.submit' | translate }}</button>
             </form>
         </div>
         <div class="col-12 col-md-6">
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 1f1559b50b..ee4714806c 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,6 +1,6 @@
-<div class="form-row gap-2 mb-2 mx-0">
+<div class="row gap-2 mb-2 mx-0">
     <select id="process-parameters"
-            class="form-control col"
+            class="form-select col"
             name="parameter-{{index}}"
             [attr.aria-label]="'process.new.select-parameter' | translate"
             [(ngModel)]="selectedParameter"
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index a741eacc86..85372acce0 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,8 +1,8 @@
-<label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
+<label for="file-upload-{{index}}" class="form-label d-flex align-items-center m-0">
     <span class="btn btn-primary">
         {{'process.new.parameter.file.upload-button' | translate}}
     </span>
-    <span class="file-name ml-1">{{fileObject?.name}}</span>
+    <span class="file-name ms-1">{{fileObject?.name}}</span>
 </label>
 <input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
 <div *ngIf="file.invalid && (file.dirty || file.touched)"
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
index a937524e88..5676da2a12 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.html
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -1,5 +1,5 @@
-<div class="form-group" *ngIf="script?.parameters?.length" data-testID="parameters-select-container">
-  <label>{{'process.new.select-parameters' | translate}}</label>
+<div class="mb-3" *ngIf="script?.parameters?.length" data-testID="parameters-select-container">
+  <label class="form-label">{{'process.new.select-parameters' | translate}}</label>
   <ds-parameter-select
     *ngFor="let value of parameterValues; let i = index; let last = last"
     [parameters]="script.parameters"
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 5c161f8d8d..ffe0c7dc88 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -2,7 +2,7 @@
   <div>
     <div ngbDropdown class="d-flex">
       <input id="process-script"
-             class="form-control"
+             class="form-select"
              required
              [ngModel]="selectedScript"
              placeholder="{{'process.new.select-script.placeholder' | translate}}"
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index cd7b97609a..65100e79eb 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -30,16 +30,16 @@
 
 <ng-template #buttons>
     <div class="d-flex justify-content-end mb-2">
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
+        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary me-2"
                 (click)="processBulkDeleteService.clearAllProcesses()"><i
-            class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
+                class="fas fa-undo pe-2"></i>{{'process.overview.delete.clear' | translate }}
         </button>
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
+        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger me-2"
                 (click)="openDeleteModal(deleteModal)"><i
-            class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+                class="fas fa-trash pe-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
         </button>
         <button class="btn btn-success" routerLink="/processes/new"><i
-            class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
+            class="fas fa-plus pe-2"></i>{{'process.overview.new' | translate}}</button>
     </div>
 </ng-template>
 
@@ -51,7 +51,7 @@
             <div>
                 <h4>{{'process.overview.delete.header' | translate }}</h4>
             </div>
-            <button type="button" class="close"
+            <button type="button" class="btn-close"
                     (click)="closeModal()" aria-label="Close">
                 <span aria-hidden="true">×</span>
             </button>
@@ -64,7 +64,7 @@
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
             </div>
             <div class="mt-4">
-                <button class="btn btn-primary mr-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
+                <button class="btn btn-primary me-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
                         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
                 <button id="delete-confirm" class="btn btn-danger"
                         [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index 0d699d9f38..69b3deea6f 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -2,11 +2,11 @@
   <div class="d-flex" (click)="collapse.toggle()" [attr.aria-expanded]="!collapse.collapsed" role="button">
     <h2 class="flex-grow-1">
       {{'process.overview.table.' + processStatus.toLowerCase() + '.title' | translate}}
-      <span class="badge badge-pill badge-primary badge-nb-processes"
+      <span class="badge rounded-pill bg-primary badge-nb-processes ps-2 pe-2"
             *ngIf="(processesRD$ | async) as processesRD">
         {{processesRD?.payload?.totalElements}}
       </span>
-      <span class="ml-2 toggle-icon">
+      <span class="ms-2 toggle-icon">
         <i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
       </span>
     </h2>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index 3233aa5555..841d65d61c 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header"><h4>{{'dso-selector.claim.item.head' | translate}}</h4>
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
@@ -25,11 +24,11 @@
     </div>
   </div>
   <div class="modal-footer">
-    <div class="mr-5">
+    <div class="me-5">
       <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
       {{ 'dso-selector.claim.item.not-mine-label' | translate }}
     </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
+    <button type="submit" class="btn btn-primary ms-5 me-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
       <i class="fas fa-plus"></i>
       {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
     </button>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index d0279d9c5f..abff578acf 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="researcherProfile">
     <p>{{'researcher.profile.associated' | translate}}</p>
     <p class="align-items-center researcher-profile-switch" >
-      <span class="mr-3">{{'researcher.profile.status' | translate}}</span>
+      <span class="me-3">{{'researcher.profile.status' | translate}}</span>
       <ui-switch [checkedLabel]="'researcher.profile.public.visibility' | translate"
                  [uncheckedLabel]="'researcher.profile.private.visibility' | translate"
                  [checked]="researcherProfile.visible"
@@ -12,7 +12,7 @@
   <div *ngIf="!researcherProfile">
     <p>{{'researcher.profile.not.associated' | translate}}</p>
   </div>
-  <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
+  <button *ngIf="!researcherProfile" class="btn btn-primary me-2"
           [dsBtnDisabled]="(isProcessingCreate() | async)"
           (click)="createProfile()">
     <span *ngIf="(isProcessingCreate() | async)">
@@ -23,7 +23,7 @@
     </span>
   </button>
   <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button class="btn btn-primary me-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
     <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index d56c4b10f3..59c6129ac6 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -29,7 +29,7 @@
         ></ds-profile-page-security-form>
       </div>
     </div>
-    <div class="col-12 text-right pr-0">
+    <div class="col-12 text-end pe-0">
       <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
     </div>
 
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 87a96df33d..43db6ac1f1 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -8,10 +8,10 @@
 
     <form [class]="'ng-invalid'" [formGroup]="form">
 
-        <div class="form-group">
+        <div class="mb-3">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold"
+                    <label class="fw-bold form-label"
                            for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
                     <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
                            type="text" id="email" formControlName="email"
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index 14c06fd8db..800ffa2a70 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -5,16 +5,16 @@
         <div class="card-body">
             <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold mr-4"
+                    <label class="fw-bold form-label me-4"
                            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
                     <span id="email">{{(registration$ |async).email}}</span></div>
             </div>
             <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
 
-                <div class="form-group">
+                <div class="mb-3">
                     <div class="row">
                         <div class="col-12">
-                            <label for="firstName">{{'register-page.create-profile.identification.first-name' | translate}}</label>
+                            <label for="firstName" class="form-label">{{'register-page.create-profile.identification.first-name' | translate}}</label>
                             <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
                                    type="text" id="firstName" formControlName="firstName"/>
                             <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)"
@@ -29,7 +29,7 @@
                     <div class="row">
                         <div class="col-12">
                             <label
-                                    for="lastName">{{'register-page.create-profile.identification.last-name' | translate}}</label>
+                                    for="lastName" class="form-label">{{'register-page.create-profile.identification.last-name' | translate}}</label>
                             <input
                                     [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
                                     id="lastName" formControlName="lastName">
@@ -43,17 +43,17 @@
                     </div>
                     <div class="row">
                         <div class="col-12">
-                            <label
+                            <label class="form-label"
                                     for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
                             <input class="form-control" id="contactPhone" formControlName="contactPhone">
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-12">
-                            <label
+                            <label class="form-label"
                                     for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
 
-                            <select id="language" formControlName="language" class="form-control">
+                            <select id="language" formControlName="language" class="form-select">
                                 <option [value]="''"></option>
                                 <option *ngFor="let lang of activeLangs" [value]="lang.code">{{lang.label}}</option>
                             </select>
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index b2227bfbae..a6d0187be9 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -1,13 +1,13 @@
 <form>
-  <div class="form-group">
-    <label for="subject">{{ 'grant-deny-request-copy.email.subject' | translate }}</label>
+  <div class="mb-3">
+    <label for="subject" class="form-label">{{ 'grant-deny-request-copy.email.subject' | translate }}</label>
     <input type="text" class="form-control" id="subject" [ngClass]="{'is-invalid': !subject || subject.length === 0}" [(ngModel)]="subject" name="subject">
     <div *ngIf="!subject || subject.length === 0" class="invalid-feedback">
       {{ 'grant-deny-request-copy.email.subject.empty' | translate }}
     </div>
   </div>
-  <div class="form-group">
-    <label for="message">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
+  <div class="mb-3">
+    <label for="message" class="form-label">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
     <textarea class="form-control" id="message" rows="8" [(ngModel)]="message" name="message"></textarea>
   </div>
   <ng-content></ng-content>
@@ -19,7 +19,7 @@
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
     </button>
     <button (click)="return()"
-            class="btn btn-outline-secondary mr-1"
+            class="btn btn-outline-secondary me-1"
             title="{{'grant-deny-request-copy.email.back' | translate }}">
       <i class="fas fa-arrow-left"></i> {{'grant-deny-request-copy.email.back' | translate }}
     </button>
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index e9b5f285fb..a13abcdf53 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -3,7 +3,7 @@
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="bg-transparent position-absolute form-control dropdown-menu-right pl-1 pr-4"
+             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p1"
              [class.display]="searchExpanded ? 'inline-block' : 'none'"
              [tabIndex]="searchExpanded ? 0 : -1"
              [attr.data-test]="'header-search-box' | dsBrowserOnly">
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index a276482b53..965cebfb3c 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -1,7 +1,8 @@
 input[type="text"] {
-  margin-top: calc(-0.5 * var(--bs-font-size-base));
+  margin-top: calc(-0.3 * var(--bs-font-size-base));
   background-color: #fff !important;
   border-color: var(--ds-header-icon-color);
+  right: 0;
 
   &.collapsed {
     opacity: 0;
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 69c49d6117..1a0710f924 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -8,7 +8,7 @@
 
       <div class="d-flex flex-column">
         <div>
-          <label for="accesscontroloption-{{control.id}}">
+          <label class="form-label" for="accesscontroloption-{{control.id}}">
             {{'access-control-option-label' | translate}}
           </label>
           <select
@@ -17,7 +17,7 @@
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
-            class="form-control">
+            class="form-select">
             <option value=""></option>
             <option *ngFor="let option of dropdownOptions" [value]="option.name">
               {{ option.name }}
@@ -29,7 +29,7 @@
         </div>
 
         <div *ngIf="control.hasStartDate" class="mt-3">
-          <label for="accesscontrolstartdate-{{control.id}}">
+          <label class="form-label" for="accesscontrolstartdate-{{control.id}}">
             {{'access-control-option-start-date' | translate}}
           </label>
           <div class="input-group">
@@ -58,7 +58,7 @@
         </div>
 
         <div *ngIf="control.hasEndDate" class="mt-3">
-          <label for="accesscontrolenddate-{{control.id}}">
+          <label class="form-label" for="accesscontrolenddate-{{control.id}}">
             {{'access-control-option-end-date' | translate}}
           </label>
           <div class="input-group">
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 0c93aabcf5..119de6fe80 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -8,12 +8,12 @@
         class="d-block pb-3">
       </ds-alert>
 
-      <div class="row">
-        <div class="col-12 col-md-6 border-right d-flex flex-column justify-content-between">
+      <div class="row mt-5">
+        <div class="col-12 col-md-6 border-end d-flex flex-column justify-content-between">
 
           <div>
             <div class="d-flex align-items-center">
-              <h2 class="h3 mb-0 mr-4">
+              <h2 class="h3 mb-0 me-4">
                 {{ 'access-control-item-header-toggle' | translate }}
               </h2>
               <ui-switch
@@ -60,14 +60,12 @@
               [dropdownOptions]="(dropdownData$ | async)?.itemAccessConditionOptions || []">
             </ds-access-control-array-form>
           </div>
-
         </div>
 
         <div class="col-12 col-md-6 d-flex flex-column justify-content-between">
-
           <div>
             <div class="d-flex align-items-center">
-              <h2 class="h3 mb-0 mr-4">
+              <h2 class="h3 mb-0 me-4">
                 {{'access-control-bitstream-header-toggle' | translate}}
               </h2>
               <ui-switch
@@ -157,7 +155,7 @@
       <hr *ngIf="showSubmit">
 
       <div *ngIf="showSubmit" class="d-flex justify-content-end">
-        <button class="btn btn-outline-primary mr-3" (click)="reset()" type="button">
+        <button class="btn btn-outline-primary me-3" (click)="reset()" type="button">
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.scss b/src/app/shared/access-control-form-container/access-control-form-container.component.scss
index e69de29bb2..ee06dd3e3f 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.scss
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.scss
@@ -0,0 +1,5 @@
+
+
+fieldset > legend.col-12.col-md-3 {
+  width: 100%;
+}
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
index 8cf0ecea38..4aed6fe128 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
@@ -2,9 +2,8 @@
   <h4 class="modal-title">
     {{'access-control-select-bitstreams-modal.title' | translate}}
   </h4>
-  <button type="button" class="close" aria-label="Close"
+  <button type="button" class="btn-close" aria-label="Close"
           (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
   </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/shared/alert/alert.component.html b/src/app/shared/alert/alert.component.html
index 3bc4782a77..560dfa0794 100644
--- a/src/app/shared/alert/alert.component.html
+++ b/src/app/shared/alert/alert.component.html
@@ -3,7 +3,6 @@
 
   <ng-content></ng-content>
 
-  <button *ngIf="dismissible" type="button" class="close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
-    <span aria-hidden="true">&times;</span>
+  <button *ngIf="dismissible" type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
   </button>
 </div>
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 907edae24b..aa843c8e0c 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,4 +1,4 @@
-.close {
+.btn-close {
   opacity: 0.75;
   &:focus {
     outline: none !important;
diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts
index 264f110137..244fe3ad99 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -91,7 +91,7 @@ describe('AlertComponent test suite', () => {
 
     it('should dismiss alert when click on close icon', () => {
       spyOn(comp, 'dismiss');
-      const btn = fixture.debugElement.query(By.css('.close'));
+      const btn = fixture.debugElement.query(By.css('.btn-close'));
 
       btn.nativeElement.click();
 
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 92e5084d81..59fc682145 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -22,7 +22,6 @@ export const slideMobileNav = trigger('slideMobileNav', [
   state('expanded', style({ height: '*', minHeight: '*' })),
 
   state('collapsed', style({ height: 0, minHeight: 0 })),
-
   transition('expanded <=> collapsed', animate('300ms')),
 ]);
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 70d7a382f6..1b279bf16b 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,4 +1,4 @@
-<div class="navbar-nav mr-auto" *ngIf="(isMobile$ | async) !== true; else mobileButtons" data-test="auth-nav">
+<div class="navbar-nav me-auto" *ngIf="(isMobile$ | async) !== true; else mobileButtons" data-test="auth-nav">
   <div *ngIf="(isAuthenticated | async) !== true && (showAuth | async)"
       class="nav-item"
       (click)="$event.stopPropagation();">
@@ -10,7 +10,7 @@
          aria-controls="loginDropdownMenu"
          [attr.aria-expanded]="loginDrop.isOpen()"
          ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
-      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+      <div id="loginDropdownMenu" [ngClass]="{'ps-3 pe-3': (loading | async)}" ngbDropdownMenu
            role="menu"
            [attr.aria-label]="'nav.login' | translate">
         <ds-log-in
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 64aa6f2f6b..751f91fb7b 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2 my-2">
+<div *ngIf="searchField" class="mb-3 w-100 pe-2 ps-2 my-2">
   <input type="search"
          class="form-control w-100"
          (click)="$event.stopPropagation();"
@@ -31,7 +31,7 @@
         <div class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
           {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
         </div>
-        <div class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</div>
+        <div class="list-item text-truncate text-primary fw-bold">{{ listItem.collection.name}}</div>
       </div>
     </li>
   </ng-container>
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index 1d752869e5..d99e740b07 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-12 d-inline-block mb-1">
-      <span>{{type.value + '.edit.logo.label' | translate}}</span>
+    <div class="col-12 d-inline-block">
+      <label class="form-label">{{type.value + '.edit.logo.label' | translate}}</label>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
       <div class="col-12 d-inline-block alert" id="logo-section" *ngIf="logo">
@@ -10,7 +10,7 @@
             <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
           </div>
           <div class="col-4 d-inline-block">
-            <div *ngIf="logo" class="float-right">
+            <div *ngIf="logo" class="float-end">
               <button
                 (click)="confirmLogoDeleteWithModal()"
                 class="btn btn-danger"
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 2639a4c099..32985c5d3d 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -1,4 +1,4 @@
-<div class="card p-2 m-3 {{(comcolRole$ | async)?.name}}">
+<div class="card p-2 mb-3 mt-3 custom-alignment {{(comcolRole$ | async)?.name}}">
 
   <div class="card-body d-flex flex-column"
        *ngVar="group$ | async as group">
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index 7797ba13c9..ac58bf79c7 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -26,7 +26,7 @@
           <div class="mb-4">
             <router-outlet></router-outlet>
           </div>
-          <div class="col-12 text-right">
+          <div class="col-12 text-end custom-alignment">
             <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
               <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
             </a>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index b0d72f4a72..0ad9448099 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -17,7 +17,7 @@
 
   <div class="d-block d-sm-none">
     <select name="browse-type"
-            class="form-control"
+            class="form-select"
             aria-label="Browse Community or Collection"
             (change)="onSelectChange($event)">
       <option *ngFor="let option of allOptions"
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
index ff82f5bc83..d0ce017965 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index af589716de..e08bf8d54e 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -82,7 +82,7 @@ describe('ConfirmationModalComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(fakeAsync(() => {
       spyOn(component, 'close');
-      debugElement.query(By.css('button.close')).triggerEventHandler('click', {
+      debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
         },
       });
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
index b1056cdf18..8f770b915a 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -20,13 +20,13 @@
     </div>
   </div>
   <div class="modal-footer space-children-mr">
-    <button class="btn btn-outline-secondary btn-sm ml-0"
+    <button class="btn btn-outline-secondary btn-sm ms-0"
             type="button"
             (click)="onModalClose()"
             title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
       <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
     </button>
-    <button class="btn btn-success btn-sm ml-0"
+    <button class="btn btn-success btn-sm ms-0"
             type="submit"
             (click)="onModalSubmit()"
             title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index e87b7c5cc6..3e8b8397af 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -2,11 +2,9 @@
 
   <div ngbDropdown class="btn-group" (openChange)="toggled.emit($event)">
 
-    <div class="input-group-prepend" *ngIf="label">
-      <span id="dsSelectMenuLabel" class="input-group-text">
-        {{ label | translate }}
-      </span>
-    </div>
+  <span  *ngIf="label" id="dsSelectMenuLabel" class="input-group-text">
+    {{ label | translate }}
+  </span>
 
     <button aria-describedby="dsSelectMenuLabel"
             id="dsSelectMenuButton"
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 0503281329..4e5f4d99d0 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -6,7 +6,7 @@
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
             <li class="nav-item nav-link d-flex flex-row" *ngFor="let subSection of (subSections$ | async)">
-                <div *ngIf="renderIcons$ | async" class="mr-2">
+                <div *ngIf="renderIcons$ | async" class="me-2">
                     <i *ngIf="subSection.icon; else spacer" class="fas fa-{{subSection.icon}} fa-fw"></i>
                     <ng-template #spacer><i class="fas fa-fw"></i></ng-template>
                 </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
index 000da1678e..b5c51d4855 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -1,5 +1,5 @@
 <div class="dso-edit-menu d-flex">
-    <div *ngFor="let section of (sections | async)" class="ml-1">
+    <div *ngFor="let section of (sections | async)" class="ms-1">
         <ng-container
                 *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
     </div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 24f579cbba..f13d7f70ca 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -1,4 +1,4 @@
-<div class="form-group w-100 pr-2 pl-2">
+<div class="mb-3 w-100 pe-2 ps-2">
     <input type="search"
            class="form-control"
            (click)="$event.stopPropagation();"
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a8ec02239d..2f04098e8b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -1,13 +1,12 @@
 <div>
     <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
       <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <div class="h3 position-relative py-1 my-3 font-weight-normal">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <div class="h3 position-relative py-1 my-3 fw-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
@@ -18,3 +17,4 @@
         <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
+
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 5288f08e02..70f4d0302c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 6d3d45cb3d..dab24d8aa3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index 80ec88f02f..4bbdd11a04 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -137,7 +137,7 @@ describe('DSOSelectorModalWrapperComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(() => {
       spyOn(component, 'close');
-      debugElement.query(By.css('button.close')).triggerEventHandler('click', {});
+      debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {});
       fixture.detectChanges();
     });
     it('should call the close method on the component', () => {
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 999a96e730..1fbdd9ca9a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index 049f5c81be..dd73e82584 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -18,7 +18,9 @@
             role="menuitem"
             title="{{ listItem.label }}"
             (click)="onSelect(listItem)">
-      <span class="text-truncate font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</span>
+      <ul class="list-unstyled mb-0">
+        <li class="list-item text-truncate text-primary fw-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
+      </ul>
     </button>
   </li>
   <li *ngIf="(isLoadingList | async)">
diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
index fb330a536a..214f90cf27 100644
--- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
@@ -2,20 +2,18 @@
       [formGroup]="searchForm"
       (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
   <div>
-    <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+    <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
       <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
       <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
     </select>
   </div>
-  <div class="flex-grow-1 mr-3 ml-3">
-    <div class="form-group input-group">
+  <div class="flex-grow-1 me-3 ms-3">
+    <div class="mb-3 input-group">
       <input type="text" name="query" id="query" formControlName="query"
              class="form-control" aria-label="Search input">
-      <span class="input-group-append">
-        <button type="submit" class="search-button btn btn-primary">
-          <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
-        </button>
-      </span>
+    <button type="submit" class="search-button btn btn-primary">
+      <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
+    </button>
     </div>
   </div>
   <div>
diff --git a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
index e5a3e1a876..efb0162591 100644
--- a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
@@ -1,15 +1,13 @@
 <form class="d-flex justify-content-between"
       [formGroup]="searchForm"
       (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
-  <div class="flex-grow-1 mr-3">
-    <div class="form-group input-group">
+  <div class="flex-grow-1 me-3">
+    <div class="mb-3 input-group">
       <input type="text" name="query" id="query" formControlName="query"
              class="form-control" aria-label="Search input">
-      <span class="input-group-append">
         <button type="submit" class="search-button btn btn-primary">
           <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
         </button>
-      </span>
     </div>
   </div>
   <div>
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index aea5c4562c..5b47f6eb4a 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -3,7 +3,7 @@
    [target]="isBlank ? '_blank': '_self'"
    [ngClass]="cssClasses"
    [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
-  <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
+  <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pe-1"><i class="fas fa-lock"></i></span>
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 7224f1843d..195c1b561e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,15 +1,16 @@
-<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
+<div [class.mb-3]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-3')"
      [class.d-none]="model.hidden"
      [formGroup]="group"
      [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
   <label *ngIf="!isCheckbox && hasLabel"
          [id]="'label_' + model.id"
          [for]="id"
+         class="form-label"
          [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
          [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
   <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: { $implicit: model };"></ng-container>
   <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
-  <div [ngClass]="{'form-row': model.hasLanguages || isRelationship,
+  <div [ngClass]="{'row': model.hasLanguages || isRelationship,
                       'd-none': this.metadataService.isVirtual(value) && (model.hasSelectableMetadata || context?.index > 0)}">
     <div [ngClass]="getClass('grid', 'control')">
       <div>
@@ -33,7 +34,7 @@
         #language="ngModel"
         [disabled]="model.readOnly"
         [(ngModel)]="model.language"
-        class="form-control"
+        class="form-select"
         (blur)="onBlur($event)"
         (change)="onChangeLanguage($event)"
         [ngModelOptions]="{standalone: true}"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
index 4e58759f4e..92aee1c159 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
@@ -14,3 +14,22 @@
   -moz-appearance: none;
   appearance: none;
 }
+
+
+:host ::ng-deep .btn-group-toggle > .btn input[type="radio"] {
+  position: absolute;
+  clip: rect(0,0,0,0);
+  pointer-events: none;
+}
+
+:host ::ng-deep dynamic-ng-bootstrap-radio-group {
+  display: block;
+  width: 100%;
+  > .btn-group.btn-group-toggle {
+    width: 100%;
+  }
+}
+
+:host ::ng-deep .custom-control-input.is-invalid ~ .custom-control-label {
+  color: var(--bs-form-invalid-color);
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 944e4650ab..4daf1762a7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex">
-    <span class="mr-auto text-contents">
+    <span class="me-auto text-contents">
         <ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
             <ds-loading [showMessage]="false"></ds-loading>
         </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index 08efff4219..e24144fbad 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex">
-    <div class="flex-grow-1 mr-auto">
+    <div class="flex-grow-1 me-auto">
         <ng-container *ngIf="(relatedItem$ | async) === undefined">
             <ds-loading [showMessage]="false"></ds-loading>
         </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 3ad7063256..150da83afd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -9,6 +9,7 @@
         <!-- Draggable Items -->
         <div #sortableElement
              *ngFor="let groupModel of model.groups; let idx = index; let length = count"
+             class="drag-item-container"
              role="group"
              [formGroupName]="groupModel.index"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index f93fcb1eac..0005f20dfc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -1,57 +1,78 @@
 @import './../../../../../../../styles/variables';
 
 :host {
-  display: block;
+    display: block;
 }
-.drag-disable {
-  visibility: hidden !important;
-  &:hover, &:focus {
-    cursor: default;
-    .drag-icon {
-      visibility: hidden !important;
-    }
-  }
-}
-.cdk-drag {
-  margin-left: calc(-2.3 * var(--bs-spacer));
-  margin-right: calc(-0.5 * var(--bs-spacer));
-  padding-right: calc(0.5 * var(--bs-spacer));
-  .drag-icon {
-    width: calc(2 * var(--bs-spacer));
-    color: var(--bs-gray-600);
-    margin: var(--bs-btn-padding-y) 0;
-    line-height: var(--bs-btn-line-height);
-    text-indent: calc(0.5 * var(--bs-spacer))
-  }
 
-  &:hover, &:focus {
-    cursor: grab;
-  }
+.drag-disable {
+    visibility: hidden !important;
+
+    &:hover, &:focus {
+        cursor: default;
+
+        .drag-icon {
+            visibility: hidden !important;
+        }
+    }
+}
+
+.cdk-drag {
+    margin-left: calc(-2.3 * var(--bs-spacer));
+    margin-right: calc(-0.5 * var(--bs-spacer));
+    padding-right: calc(0.5 * var(--bs-spacer));
+    > .col {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    .cdk-drag-handle {
+        width: calc(2 * var(--bs-spacer));
+    }
+
+    .drag-icon {
+        visibility: hidden;
+        width: calc(2 * var(--bs-spacer));
+        color: var(--bs-gray-600);
+        margin: var(--bs-btn-padding-y) 0;
+        line-height: var(--bs-btn-line-height);
+        text-indent: calc(0.5 * var(--bs-spacer))
+    }
+
+    &:hover, &:focus {
+        cursor: grab;
+
+        .drag-icon {
+            visibility: visible;
+        }
+    }
 
 }
 
 .drag-handle {
-  &:hover {
-    cursor: move;
-  }
+    &:hover {
+        cursor: move;
+    }
 
-  &:focus {
-  }
+    &:focus {
+    }
 }
 
 .cdk-drop-list-dragging {
-  .drag-handle {
-    cursor: grabbing;
-  }
+    .drag-handle {
+        cursor: grabbing;
+
+        .drag-icon {
+            visibility: hidden;
+        }
+    }
 }
 
 .cdk-drag-preview {
-  margin: 0;
-  padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 .cdk-drag-placeholder {
-  opacity: 0;
+    opacity: 0;
 }
 
 ::ng-deep {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index 5beb8d52da..90e8ff3060 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
+<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control form-switch" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index c0ff290d73..f38cc079db 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -23,20 +23,18 @@
            (change)="onChange($event)"
            (focus)="onFocus($event)">
 
-    <div class="input-group-append">
 
-        <button class="btn btn-outline-secondary"
-                type="button"
-                [attr.aria-labelledby]="'label_' + model.id"
-                [class.disabled]="model.disabled"
-                [dsBtnDisabled]="model.disabled"
-                (click)="datepicker.toggle()">
+    <button class="btn btn-outline-secondary"
+            type="button"
+            [attr.aria-labelledby]="'label_' + model.id"
+            [class.disabled]="model.disabled"
+            [dsBtnDisabled]="model.disabled"
+            (click)="datepicker.toggle()">
 
-            <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
-            <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span>
+        <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
+        <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span>
 
-        </button>
+    </button>
 
-    </div>
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
index 97698b2102..e8a63ce135 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
@@ -4,4 +4,7 @@
 
 legend {
   font-size: initial;
+
+  /* Changed from Bootstrap 5's legend to ensure that the date issues label is on a different line as it's input */
+  float: none;
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index 5b58352214..5ba40f64ec 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div class="form-row align-items-center">
+    <div class="row align-items-center">
         <div class="col">
           <input class="form-control"
                  [class.is-invalid]="showErrorMessages"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index c2f35861fe..86f997de29 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -1,12 +1,12 @@
 <div [formGroup]="group">
   <div *ngIf="model.repeatable"
-       class="form-row"
+       class="row"
        [attr.tabindex]="model.tabIndex"
        [id]="id"
        [formGroupName]="model.id"
        [ngClass]="model.layout.element?.control">
 
-    <div *ngFor="let columnItems of items" class="col-sm ml-3">
+    <div *ngFor="let columnItems of items" class="col-sm ms-3">
 
       <div  *ngFor="let item of columnItems" class="custom-control custom-checkbox">
 
@@ -32,14 +32,14 @@
   </div>
 
   <div *ngIf="!model.repeatable"
-       class="form-row"
+       class="row"
        ngbRadioGroup
        [attr.tabindex]="model.tabIndex"
        [id]="id"
        [ngClass]="model.layout.element?.control"
        (change)="onChange($event)">
 
-    <div *ngFor="let columnItems of items" class="col-sm ml-3">
+    <div *ngFor="let columnItems of items" class="col-sm ms-3">
 
       <div  *ngFor="let item of columnItems" class="custom-control custom-radio">
         <input type="radio" class="custom-control-input"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 4f7fb01837..8861174bd7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -2,11 +2,11 @@
      (click)="$event.stopPropagation();"
      (openChange)="openChange($event);">
 
-  <div class="form-row align-items-center">
+  <div class="row align-items-center">
     <!--Simple lookup, first field -->
     <div class="col right-addon">
       <i dsAuthorityConfidenceState
-         class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pr-2"
+         class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pe-2"
          aria-hidden="true"
          [authorityValue]="model.value"
          (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
@@ -115,7 +115,7 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
     <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
       {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
     </li>
@@ -124,6 +124,6 @@
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
   </ul>
 </ng-template>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
index dee03647de..10907e4cca 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
@@ -25,3 +25,12 @@ div {
 .lookup-item {
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
+
+div.col {
+  position: relative;
+}
+
+.row > div {
+  padding-right: 5px;
+  padding-left: 5px;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 5463b06827..81b28ea5dd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -7,7 +7,7 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
     <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
       {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
     </li>
@@ -16,7 +16,7 @@
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
   </ul>
 </ng-template>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 1cb8ee1e1a..581ae72318 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -16,9 +16,9 @@
 </a>
 
 <div class="pt-2" [ngClass]="{'border-top': !showErrorMessages, 'border border-danger': showErrorMessages}">
-  <div *ngIf="(formCollapsed | async) !== true" class="pl-2 row"  @shrinkInOut>
+  <div *ngIf="(formCollapsed | async) !== true" class="ps-2 row"  @shrinkInOut>
     <ds-form #formRef="formComponent"
-             class="col-sm-12 col-md-8 col-lg-9 col-xl-10 pl-0"
+             class="col-sm-12 col-md-8 col-lg-9 col-xl-10 ps-0"
              [formId]="formId"
              [formModel]="formModel"
              [displaySubmit]="false"
@@ -34,14 +34,14 @@
                 class="btn btn-link"
                 [dsBtnDisabled]="isMandatoryFieldEmpty()"
                 (click)="save()">
-          <i class="fas fa-save text-primary fa-2x"
+          <i class="fas fa-save link-primary fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
                 class="btn btn-link"
                 [dsBtnDisabled]="!editMode"
                 (click)="delete()">
-          <i class="fas fa-trash text-danger fa-2x"
+          <i class="fas fa-trash link-danger fa-2x"
              aria-hidden="true"></i>
         </button>
         <button type="button"
@@ -60,7 +60,7 @@
     <ds-loading *ngIf="!chips" [showMessage]="false"></ds-loading>
     <div *ngIf="chips && !chips.hasItems()">
       <input type="text"
-             class="border-0 form-control-plaintext tag-input mt-1 mb-1 pl-2 text-muted"
+             class="border-0 form-control-plaintext tag-input mt-1 mb-1 ps-2 text-muted"
              readonly
              tabindex="-1"
              value="{{'form.no-value' | translate}}">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 0cbd518595..7a45c19007 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -12,7 +12,7 @@
          class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
          type="text"
          role="textbox"
-         [class.pl-3]="chips.hasItems()"
+         [class.ps-3]="chips.hasItems()"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
          [(ngModel)]="currentValue"
@@ -29,7 +29,7 @@
            [(ngModel)]="currentValue"
            [attr.autoComplete]="model.autoComplete"
            [class.is-invalid]="showErrorMessages"
-           [class.pl-3]="chips.hasItems()"
+           [class.ps-3]="chips.hasItems()"
            [id]="id"
            [inputFormatter]="formatter"
            [name]="model.name"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index d12c27eb64..e4838757d9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [dsBtnDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsBtnDisabled]="isPending" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
-        <span aria-hidden="true">&times;</span>
     </button>
 </div>
 <div class="modal-body">
@@ -71,7 +70,7 @@
 </div>
 <div class="modal-footer">
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
-  <div class="d-flex float-right space-children-mr">
+  <div class="d-flex float-end space-children-mr">
     <div class="close-button">
         <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
@@ -86,7 +85,7 @@
       <button class="btn btn-primary submit"
             [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
-              <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
+              <span *ngIf="isPending" class="spinner-border spinner-border-sm me-1" role="status"
                               aria-hidden="true"></span>
               <i *ngIf="!isPending" class="fas fa-save"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index d6db87b993..2660675211 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -271,8 +271,8 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       expect(debugElement.query(By.css('.submit')).nativeElement?.classList.contains('disabled')).toBeTrue();
       expect(debugElement.query(By.css('.discard')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
       expect(debugElement.query(By.css('.discard')).nativeElement?.classList.contains('disabled')).toBeTrue();
-      expect(debugElement.query(By.css('.close')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
-      expect(debugElement.query(By.css('.close')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.btn-close')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.btn-close')).nativeElement?.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/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.html b/src/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.html
index 7d233fe0b7..be8f049632 100644
--- a/src/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.html
+++ b/src/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.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
-  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+  <button type="button" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
           (click)="modal.dismiss()">
-    <span aria-hidden="true">&times;</span>
   </button>
 </div>
 <div class="modal-body">
@@ -15,7 +14,7 @@
   <h4>{{ (labelPrefix + 'select' | translate) }}</h4>
 
   <div id="external-source-entry-entities" class="mb-3">
-    <h5 class="font-weight-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
+    <h5 class="fw-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
 
     <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0"
                        [searchResults]="(localEntitiesRD$ | async)"
@@ -30,15 +29,15 @@
                        (deselectObject)="deselectEntity()"
                        (selectObject)="selectEntity($event)">
     </ds-search-results>
-    <div class="ml-4">
+    <div class="ms-4 form-check">
       <input class="form-check-input" type="radio" name="new-entity" id="new-entity" value="new-entity" (click)="selectNewEntity()" [checked]="selectedImportType === importType.NewEntity" />
       <label class="form-check-label" for="new-entity">{{ (labelPrefix + 'entities.new' | translate) }}</label>
     </div>
   </div>
   <div id="external-source-entry-authority" *ngIf="authorityEnabled">
-    <h5 class="font-weight-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
+    <h5 class="fw-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
 
-    <div class="ml-4">
+    <div class="ms-4 form-check">
       <input class="form-check-input" type="radio" name="new-authority" id="new-authority" value="new-authority" (click)="selectNewAuthority()" [checked]="selectedImportType === importType.NewAuthority" />
       <label class="form-check-label" for="new-authority">{{ (labelPrefix + 'authority.new' | translate) }}</label>
     </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 02dec72baa..f5928a68cb 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -18,7 +18,7 @@
     <div class="input-group mb-3">
       <div ngbDropdown class="input-group dropdown-button">
         <button *ngIf="selectAllLoading" type="button"
-                class="btn btn-outline-secondary rounded-right">
+                class="btn btn-outline-secondary rounded-end">
                             <span class="spinner-border spinner-border-sm" role="status"
                                   aria-hidden="true"></span>
           <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index 40711c188d..751128446b 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -113,7 +113,7 @@ export class ConcatFieldParser extends FieldParser {
 
     const clsGroup = {
       element: {
-        control: 'form-row',
+        control: 'row',
       },
     };
     const concatModel = new DynamicConcatModel(concatGroup, clsGroup);
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 590d5f564e..c634c7d876 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -127,7 +127,7 @@ export abstract class FieldParser {
 
       const layout: DynamicFormControlLayout = {
         grid: {
-          group: 'form-row',
+          group: 'row',
         },
       };
 
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
index 9c5ef7423e..50fc585abf 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -29,7 +29,7 @@ export class OneboxFieldParser extends FieldParser {
       // Case Qualdrop Model
       const clsGroup = {
         element: {
-          control: 'form-row',
+          control: 'row',
           hint: 'ds-form-qualdrop-hint',
         },
       };
@@ -39,7 +39,7 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-addon custom-select',
         },
         grid: {
-          host: 'col-sm-4 pr-0',
+          host: 'col-sm-4 pe-0',
         },
       };
 
@@ -48,7 +48,7 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-value',
         },
         grid: {
-          host: 'col-sm-8 pl-0',
+          host: 'col-sm-8 ps-0',
         },
       };
 
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index b4febfc47f..5de43bb918 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -122,7 +122,7 @@ export class RowParser {
     if (config && !isEmpty(config.group)) {
       const clsGroup = {
         element: {
-          control: 'form-row',
+          control: 'row',
         },
       };
       const groupModel = new DynamicRowGroupModel(config, clsGroup);
diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index 927ca426ef..f3c0e0d4b5 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -1,11 +1,11 @@
-<div [className]="'float-left w-100 ' + wrapperClass">
+<div [className]="'float-start w-100 ' + wrapperClass">
   <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="onDrop($event)">
     <ng-template #tipContent>
-      <p class="text-left p-0 m-0" *ngFor="let tip of tipText">
+        <p class="text-start p-0 m-0" *ngFor="let tip of tipText">
         {{tip}}
       </p>
     </ng-template>
-    <div role="listitem" class="nav-item mr-2 mb-1"
+    <div role="listitem" class="nav-item me-2 mb-1"
            *ngFor="let c of chips.getChips(); let i = index"
            #t="ngbTooltip"
            triggers="manual"
@@ -26,8 +26,8 @@
                  triggers="manual"
                  #t="ngbTooltip"
                  class="{{icon.style}}"
-                 [class.mr-1]="!l"
-                 [class.mr-2]="l"
+                 [class.me-1]="!l"
+                 [class.me-2]="l"
                  dsAuthorityConfidenceState
                  [authorityValue]="c.item[icon.metadata] || c.item"
                  [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty"
@@ -35,7 +35,7 @@
                  (mouseover)="showTooltip(t, i, icon.metadata)"
                  (mouseout)="t.close()"></i>
             </ng-container>
-            <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ml-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
+            <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ms-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
           </span>
         </a>
       </div>
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 85e32e66ea..b1737a9339 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -22,7 +22,7 @@
               <span><i class="fas fa-trash" aria-hidden="true"></i></span>
             </button>
         </div>
-        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix pl-4 w-100">
+        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix ps-4 w-100">
           <div class="btn-group" role="group">
             <button type="button" role="button" class="ds-form-add-more btn btn-link"
                     title="{{'form.add' | translate}}"
@@ -54,8 +54,8 @@
 
     <div *ngIf="displaySubmit || displayCancel">
       <hr>
-      <div class="form-group row">
-        <div class="col text-right space-children-mr">
+      <div class="mb-3 row">
+        <div class="col text-end space-children-mr">
           <ng-content select="[before]"></ng-content>
             <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
               <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
diff --git a/src/app/shared/form/form.component.scss b/src/app/shared/form/form.component.scss
index f537e8d193..6483553b5a 100644
--- a/src/app/shared/form/form.component.scss
+++ b/src/app/shared/form/form.component.scss
@@ -47,3 +47,12 @@ button.ds-form-add-more:focus {
 .right-addon input {
   padding-right: calc(var(--bs-spacer) * 2.25);
 }
+
+select.form-control {
+  appearance: auto;
+}
+
+.col-sm-6, .col-sm-12 {
+  padding-left: 15px;
+  padding-right: 15px;
+}
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 9b9d038e86..6d8aeb7b9d 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -1,4 +1,4 @@
-<div class="d-flex flex-column align-items-center justify-content-around mr-3">
+<div class="d-flex flex-column align-items-center justify-content-around me-3">
     <button
       class="btn btn-link-focus"
       type="button"
diff --git a/src/app/shared/form/number-picker/number-picker.component.scss b/src/app/shared/form/number-picker/number-picker.component.scss
index 94f7f38ef0..0b4e7ac569 100644
--- a/src/app/shared/form/number-picker/number-picker.component.scss
+++ b/src/app/shared/form/number-picker/number-picker.component.scss
@@ -27,15 +27,17 @@ input {
 .btn-link-focus {
   // behave as btn-link but does not override box-shadow of btn-link:focus
   font-weight: $font-weight-normal;
-  color: $link-color;
+  color: #1f7293;
   text-decoration: $link-decoration;
-  @include hover {
+  box-shadow: none;
+  &:hover {
     color: $link-hover-color;
     text-decoration: $link-hover-decoration;
   }
   &:disabled,
   &.disabled {
     color: $btn-link-disabled-color;
+    border: transparent;
     pointer-events: none;
   }
 
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
index 851ccaf880..62ea1e445e 100644
--- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
@@ -1,7 +1,6 @@
 <div class="modal-header">
   <h4 class="modal-title">{{'vocabulary-treeview.header' | translate}}</h4>
-  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 1778291a63..6aceab7171 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -36,16 +36,16 @@
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-      <span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
-        <i class="fas fa-fw fa-angle-right invisible"></i>
-      </span>
-          <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
+            <span aria-hidden="true" type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
+                <i class="fas fa-fw fa-angle-right invisible"></i>
+            </span>
+            <label *ngIf="multiSelect" class="form-label d-flex align-items-center m-0 p-0 form-check"
                  [class.text-success]="node.isSelected"
                  [ngbTooltip]="node.item?.otherInformation?.note"
                  [openDelay]="500"
                  container="body"
           >
-            <input class="mr-2" type="checkbox"
+                <input class="me-2" type="checkbox"
                    [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
@@ -53,7 +53,7 @@
             >
             <span>{{node.item.display}}</span>
           </label>
-          <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
+            <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-start"
                   [class.text-success]="node.isSelected"
                   [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
@@ -66,18 +66,18 @@
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
+        <button type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle
                 [attr.aria-label]="'toggle ' + node.name"
                 (click)="loadChildren(node)">
           <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
         </button>
 
-          <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
+            <label *ngIf="multiSelect" class="form-label d-flex align-items-center m-0 p-0 form-check"
                 [class.text-success]="node.isSelected"
                 [ngbTooltip]="node.item?.otherInformation?.note"
                 [openDelay]="500"
                 container="body">
-            <input class="mr-2" type="checkbox"
+                <input class="me-2" type="checkbox"
                    [disabled]="!node.item?.selectable"
                    [(ngModel)]="node.isSelected"
                    [checked]="node.isSelected"
@@ -85,7 +85,7 @@
             >
             <span>{{node.item.display}}</span>
           </label>
-          <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
+            <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-start"
                   [class.text-success]="node.isSelected"
                   [dsBtnDisabled]="!node.item?.selectable"
                   [ngbTooltip]="node.item?.otherInformation?.note"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
index 3d32acac5b..43b4db2ddf 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -5,3 +5,17 @@
 label {
   cursor: pointer;
 }
+
+.input-group > .input-group-append > .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.input-group-append .btn + .btn {
+  margin-left: -1px;
+}
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 7b3723c1a0..3801a4ef06 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -43,10 +43,10 @@ export class HostWindowService {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
-        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
-        this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
-        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
+        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl'], 10);
+        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg'], 10);
+        this.breakPoints.MD_MIN = parseInt(variables['--bs-md'], 10);
+        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm'], 10);
       });
   }
 
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
index a69c4d7e76..91ca7cd67b 100644
--- a/src/app/shared/idle-modal/idle-modal.component.html
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header" id="idle-modal.header">{{ "idle-modal.header" | translate }}
-    <button type="button" class="close" (click)="closePressed()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="closePressed()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 29c13cba5f..4180117576 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -130,7 +130,7 @@ describe('IdleModalComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(fakeAsync(() => {
       spyOn(component, 'closePressed');
-      debugElement.query(By.css('.close')).triggerEventHandler('click', {
+      debugElement.query(By.css('.btn-close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
         },
       });
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 633c7b3e45..719e76b30f 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -3,9 +3,9 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="close();">
-  <div class="form-group mb-0">
-    <label *ngIf="label; else searchInput" class="mb-0 w-100">
-      <span class="font-weight-bold">
+  <div class="mb-3 mb-0">
+    <label class="form-label" *ngIf="label; else searchInput" class="mb-0 w-100">
+      <span class="fw-bold">
         {{label}}
       </span>
       <ng-container *ngTemplateOutlet="searchInput"></ng-container>
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index e391cedbea..e12a0d9444 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="!spinner">
-  <label *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
+  <label class="form-label" *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
   <div class="loader" aria-hidden="true">
     <span class="l-1"></span>
     <span class="l-2"></span>
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
index 378bb6ed67..a8d511a3f5 100644
--- 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
@@ -1,3 +1,3 @@
-<button class="btn btn-lg btn-primary btn-block text-white" (click)="redirectToExternalProvider()">
+<button class="btn btn-lg btn-primary w-100 text-white" (click)="redirectToExternalProvider()">
   <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
 </button>
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 00ef253167..089f4c8de8 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -23,7 +23,7 @@
   <div *ngIf="(message | async) && hasMessage" class="alert alert-info" role="alert"
        @fadeOut>{{ (message | async) | translate }}</div>
 
-  <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
+  <button class="btn btn-lg btn-primary w-100" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
           [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
 </form>
 
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 26f03b95a4..de029622c0 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -2,5 +2,5 @@
 
   <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
 
-  <button role="menuitem" class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button role="menuitem" class="btn btn-lg btn-primary w-100" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 21e7f4d21b..fa65a12dd5 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -11,10 +11,9 @@
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.workflow.tasks.claimed.reject.reason.title' | translate}}</h4>
     <button type="button"
-            class="close"
+            class="btn-close"
             aria-label="Close"
             (click)="d('Cross click')">
-      <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <div class="modal-body">
@@ -27,7 +26,7 @@
                 rows="4"
                 placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
-              class="btn btn-danger btn-lg btn-block mt-3"
+              class="btn btn-danger btn-lg btn-block w-100 mt-3"
               [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
               type="submit">
         <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index b164767c23..13d432259a 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -6,7 +6,7 @@
   <span *ngIf="(processing$ | async) !== true"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
     translate}}</span>
 </button>
-<button class="btn btn-primary workflow-view ml-1 mt-1 mb-3" data-test="view-btn"
+<button class="btn btn-primary workflow-view ms-1 mt-1 mb-3" data-test="view-btn"
   ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
   [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
   <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index daefc75fd3..9f8999f333 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -31,8 +31,7 @@
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
-    <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" id="delete_close" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index dae0207493..ce6297904a 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -2,13 +2,12 @@
      [@enterLeave]="animate">
 
   <div class="notification-progress-loader position-absolute w-100" *ngIf="showProgressBar">
-    <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-left"></span>
+    <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-start"></span>
   </div>
 
     <button *ngIf="notification.options.clickToClose"
             (click)="remove()"
-            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
+            type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-dismiss="alert" aria-label="Close">
     </button>
 
 
@@ -23,32 +22,32 @@
       }"></i></div>
     </div>
     <div class="d-flex flex-column justify-content-center align-content-stretch">
-      <div class="p-2 mr-3"  *ngIf="title">
+      <div class="p-2 me-3"  *ngIf="title">
         <strong>
-          <div class="notification-title pl-1" *ngIf="titleIsTemplate; else regularTitle">
+          <div class="notification-title ps-1" *ngIf="titleIsTemplate; else regularTitle">
             <ng-container *ngTemplateOutlet="title"></ng-container>
           </div>
           <ng-template #regularTitle>
-            <div class="notification-title pl-1">{{(title | async)}}</div>
+            <div class="notification-title ps-1">{{(title | async)}}</div>
           </ng-template>
         </strong>
       </div>
 
-      <div class="p-2 mr-3"  *ngIf="content && !html">
-        <div class="notification-content pl-1" *ngIf="contentIsTemplate; else regularContent">
+      <div class="p-2 me-3"  *ngIf="content && !html">
+        <div class="notification-content ps-1" *ngIf="contentIsTemplate; else regularContent">
           <ng-container *ngTemplateOutlet="content"></ng-container>
         </div>
         <ng-template #regularContent>
-          <div class="notification-content pl-1">{{(content | async)}}</div>
+          <div class="notification-content ps-1">{{(content | async)}}</div>
         </ng-template>
       </div>
 
-      <div class="p-2 mr-3" *ngIf="content && html">
-        <div class="notification-html pl-1" *ngIf="contentIsTemplate; else regularHtml">
+      <div class="p-2 me-3" *ngIf="content && html">
+        <div class="notification-html ps-1" *ngIf="contentIsTemplate; else regularHtml">
           <ng-container *ngTemplateOutlet="content"></ng-container>
         </div>
         <ng-template #regularHtml>
-          <div class="notification-html pl-1" [innerHTML]="content"></div>
+          <div class="notification-html ps-1" [innerHTML]="content"></div>
         </ng-template>
       </div>
     </div>
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index ecfc25fee0..e6beffb94e 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -4,7 +4,7 @@
   text-align: left;
 }
 
-.close {
+.btn-close {
   outline: none !important;
   opacity: 0.8;
 }
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
index 5b20860684..32adab29c7 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="showAccessStatus">
   <span *ngIf="accessStatus$ | async as accessStatus">
-    <span [class]="'badge badge-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
+    <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
   </span>
 </ng-container>
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.html b/src/app/shared/object-collection/shared/badges/badges.component.html
index aade4503a4..46e2555a9a 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.html
+++ b/src/app/shared/object-collection/shared/badges/badges.component.html
@@ -3,7 +3,7 @@
     <ds-my-dspace-status-badge [context]="context"></ds-my-dspace-status-badge>
 </ng-container>
 <div>
-    <ds-type-badge class="pr-1" [object]="object"></ds-type-badge>
+    <ds-type-badge class="pe-1" [object]="object"></ds-type-badge>
     <ng-container *ngIf="showAccessStatus">
         <ds-access-status-badge [object]="object"></ds-access-status-badge>
     </ng-container>
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
index c864f22afa..5175848f8d 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="privateBadge" class="private-badge">
-    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
+    <span class="badge bg-danger">{{ "item.badge.private" | translate }}</span>
 </div>
 <div *ngIf="withdrawnBadge" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
+    <span class="badge bg-warning">{{ "item.badge.withdrawn" | translate }}</span>
 </div>
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
index 119702c375..c0a173dfe8 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
@@ -1,3 +1,3 @@
 <span *ngIf="typeMessage">
-  <span class="badge badge-info">{{ typeMessage | translate }}</span>
+  <span class="badge bg-info">{{ typeMessage | translate }}</span>
 </span>
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
index 921999b540..3d2ade646e 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
@@ -1,6 +1,6 @@
-<div class="mr-2">
+<div class="me-2">
   <button (click)="importObject.emit(object)"
-          class="btn btn-outline-primary btn-sm float-left"
+          class="btn btn-outline-primary btn-sm float-start"
           title="{{importConfig?.buttonLabel | translate}}">
     <i class="fas fa-cloud-download-alt fa-fw"></i>
   </button>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
index 513c132432..5256b87cc1 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
@@ -1,5 +1,5 @@
 <div class="mt-2 mb-2" *ngIf="(collection$ | async)">
-  <span class="text-muted">{{'collection.listelement.badge' | translate}}:
+  <span class="link-muted">{{'collection.listelement.badge' | translate}}:
     <a [routerLink]="['/collections', (collection$ | async)?.id]">
       {{ dsoNameService.getName(collection$ | async) }}
     </a>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index 0f9cdf846e..c1154be723 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -1,7 +1,7 @@
 <div class="mt-2 mb-2">
   <span class="text-muted">
     {{'submission.workflow.tasks.generic.submitter' | translate}}:
-    <span class="badge badge-info">
+    <span class="badge bg-info">
       <ng-container *ngIf="submitter$ | async as submitter; else noSubmitter">
         {{ dsoNameService.getName(submitter) }}
       </ng-container>
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index a90f375c6a..58de45d81c 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,5 +1,6 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+    <span class="form-check">
+        <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
            [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
            [name]="'checkbox' + index"
            [id]="'object' + index"
@@ -11,4 +12,5 @@
            [id]="'object' + index"
            [checked]="selected$ | async"
            (click)="selectRadio(!checked)">
+    </span>
 </ng-container>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 8d42c8536a..374c7f2acb 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -1,5 +1,5 @@
   <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
         <ng-content></ng-content>
     </div>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index 757135d809..b6349fd83c 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -5,6 +5,6 @@
     <span *ngIf="linkType === linkTypes.None" class="lead">
         {{object.value}}
     </span>
-    <span class="pr-2">&nbsp;</span>
-    <span class="badge badge-pill badge-secondary align-self-center">{{object.count}}</span>
+    <span class="pe-2">&nbsp;</span>
+    <span class="badge rounded-pill bg-secondary align-self-center ps-2 pe-2">{{object.count}}</span>
 </div>
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
index 1c4f68fbcc..5d965ca47d 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -5,8 +5,8 @@
   <span *ngIf="linkType === linkTypes.None" class="lead">
     {{ dsoNameService.getName(object) }}
   </span>
-  <span class="pr-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+  <span class="pe-2">&nbsp;</span>
+  <span *ngIf="object.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
 </div>
 <div *ngIf="object.shortDescription" class="text-muted abstract-text">
     {{object.shortDescription}}
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
index d63abd9672..234dc4f859 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.html
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -5,8 +5,8 @@
   <span *ngIf="linkType === linkTypes.None" class="lead">
     {{ dsoNameService.getName(object) }}
   </span>
-  <span class="pr-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+  <span class="pe-2">&nbsp;</span>
+  <span *ngIf="object.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
 </div>
 <div *ngIf="object.shortDescription" class="text-muted abstract-text">
     {{object.shortDescription}}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index 8f85b5491c..5fc4bb6f40 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -16,7 +16,7 @@
     </div>
   </ng-container>
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-claimed-task-actions [item]="item$.value"
                                [object]="dso"
                                [workflowitem]="workflowitem$.value"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
index 5600ccd920..9d6070c287 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -3,7 +3,7 @@
                       [badgeContext]="badgeContext"></ds-item-list-preview>
 
 <div class="row">
-  <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+  <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
     <ds-item-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-item-actions>
   </div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index d17bebe2d9..77dd7d56bc 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -18,7 +18,7 @@
   </ng-container>
 
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-pool-task-actions id="actions"
                             [item]="item$.value"
                             [object]="dso"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index c2b030c734..cdd650ce65 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -4,7 +4,7 @@
             [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
             [context]="badgeContext"></ds-listable-object-component-loader>
     <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
+        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  col-9 col-md-10 ps-3' : ''">
             <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
         </div>
     </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 240706c91b..91e8d92f29 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -4,7 +4,7 @@
             [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
             [context]="badgeContext"></ds-listable-object-component-loader>
     <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
+        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
             <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
         </div>
     </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 17b5d50d90..2447366d00 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,6 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-3 offset-md-2 "></div>
-  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index f5d6803159..8547f2b848 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,6 +1,5 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-3 offset-md-2"></div>
-  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
+  <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
index 040f528768..64a063ae4f 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
@@ -3,7 +3,7 @@
        [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
 </ds-truncatable-part>
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
-  <div class="font-weight-bold"
+  <div class="fw-bold"
        [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
        [innerHTML]="dsoTitle"></div>
 </ds-truncatable-part>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 03491e7491..f341060c81 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -28,7 +28,7 @@
   </div>
   <ds-error *ngIf="collectionsRD?.hasFailed" message="{{'error.collections' | translate}}"></ds-error>
   <ds-loading *ngIf="!collectionsRD || collectionsRD?.isLoading" message="{{'loading.collections' | translate}}"></ds-loading>
-  <div class="space-children-mr float-right" *ngVar="(selectedIds$ | async) as selectedIds">
+  <div class="space-children-mr float-end" *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn btn-outline-secondary collection-cancel" (click)="onCancel()">
       <i class="fas fa-times"></i> {{cancelButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 6f3d31703d..8a369446cf 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -39,8 +39,8 @@
   <ds-error *ngIf="itemsRD?.hasFailed" message="{{'error.items' | translate}}"></ds-error>
   <ds-loading *ngIf="!itemsRD || itemsRD?.isLoading" message="{{'loading.items' | translate}}"></ds-loading>
   <div *ngVar="(selectedIds$ | async) as selectedIds">
-    <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
-    <button class="btn item-confirm float-right"
+    <button class="btn btn-outline-secondary item-cancel float-start" (click)="onCancel()">{{cancelButton | translate}}</button>
+    <button class="btn item-confirm float-end"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
             [dsBtnDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 605ac4ef45..d5e9ee41bd 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -6,7 +6,7 @@
           <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
       </div>
       <div class="col">
-        <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
+        <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-end">
           <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
           <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
             <li role="menuitem">
@@ -54,12 +54,12 @@
     </div>
 
     <div *ngIf="!showPaginator" class="d-flex justify-content-between">
-        <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
+        <button id="nav-prev" type="button" class="btn btn-outline-primary float-start"
                 (click)="goPrev()"
                 [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
         </button>
-      <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
+      <button id="nav-next" type="button" class="btn btn-outline-primary float-end"
               (click)="goNext()"
               [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 14171cb30b..65c67f4159 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -26,9 +26,9 @@
     <div [ngbNavOutlet]="nav"></div>
     <div>
       <hr>
-      <div class="form-group row">
+      <div class="mb-3 row">
 
-        <div class="col text-right">
+        <div class="col text-end">
           <button type="reset"
                   class="btn btn-default"
                   [dsBtnDisabled]="(isProcessing | async)"
@@ -54,18 +54,17 @@
 <ng-template #content let-modal>
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{ 'resource-policies.form.eperson-group-list.modal.header' | translate }}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="modal.close()">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="modal.close()">
     </button>
   </div>
   <div class="modal-body">
     <div class="d-flex flex-row">
-      <div class="mr-3">
+      <div class="me-3">
         <i class="fas fa-info-circle fa-2x text-info"></i>
       </div>
       <div>
       <p [innerHTML]="(navActiveId === 'eperson' ? 'resource-policies.form.eperson-group-list.modal.text1.toGroup' :
-       'resource-policies.form.eperson-group-list.modal.text1.toEPerson') | translate" class="font-weight-bold"></p>
+       'resource-policies.form.eperson-group-list.modal.text1.toEPerson') | translate" class="fw-bold"></p>
       <p [innerHTML]="'resource-policies.form.eperson-group-list.modal.text2' | translate"></p>
       </div>
     </div>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
index 98ecd67827..2902f22a2d 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -118,7 +118,7 @@ export const RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG: DynamicFormGroupModelConfig
 };
 export const RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    control: 'form-row',
+    control: 'row',
   },
 };
 
diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html
index 133880c593..079441132e 100644
--- a/src/app/shared/rss-feed/rss.component.html
+++ b/src/app/shared/rss-feed/rss.component.html
@@ -1,9 +1,9 @@
 <ng-container
   *ngIf="(isEnabled$ | async) && (isActivated$ | async)">
-  <div *ngIf="route$ | async as route" class="d-inline-block float-right margin-right">
+  <div *ngIf="route$ | async as route" class="d-inline-block float-end margin-right">
     <a target="_blank" rel="noopener noreferrer" [href]="route" class="btn btn-secondary"
       [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate">
       <i class="fas fa-rss-square"></i>
     </a>
   </div>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 4346e06332..60b6bd3324 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -1,12 +1,11 @@
 <div>
     <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="selectObject(undefined)" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="selectObject(undefined)" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <div class="position-relative py-1 my-3 font-weight-normal h3">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
+        <div class="position-relative py-1 my-3 fw-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index 96e45240a1..f1c882dbe2 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -1,19 +1,15 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(form.value)" action="/search">
     <div>
-        <div class="form-group input-group">
-            <div *ngIf="showScopeSelector" class="input-group-prepend">
-                <button class="scope-button btn btn-outline-secondary text-truncate"
+        <div class="mb-3 input-group">
+                <button *ngIf="showScopeSelector" class="scope-button btn btn-outline-secondary text-truncate"
                         [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
                         (click)="openScopeModal()">
                   {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
                 </button>
-            </div>
             <input type="text" [(ngModel)]="query" name="query" class="form-control"
                    [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
                    [placeholder]="searchPlaceholder">
-            <span class="input-group-append">
             <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
-        </span>
         </div>
     </div>
 </form>
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index 1a95d68b2c..716de88eef 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -7,11 +7,11 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
+            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
+            <a class="float-end" *ngIf="(currentPage | async) > 1"
                (click)="showFirstPageOnly()" href="javascript:void(0);">
               {{"search.filters.filter.show-less" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 6c26198e65..92e6e0631f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -7,11 +7,11 @@
         </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
+            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
+            <a class="float-end" *ngIf="(currentPage | async) > 1"
                (click)="showFirstPageOnly()" href="javascript:void(0);">
               {{"search.filters.filter.show-less" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index dfd68d026a..5dd12829eb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -5,8 +5,8 @@
    (click)="announceFilter(); filterService.minimizeAll()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="w-100 pl-1 break-facet">
-      <span class="float-right badge badge-secondary badge-pill mt-1 ml-1">{{filterValue.count | dsShortNumber}}</span>
+    <span class="w-100 ps-1 break-facet">
+      <span class="float-end badge bg-secondary rounded-pill mt-1 ms-1">{{filterValue.count | dsShortNumber}}</span>
       {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
     </span>
   </label>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 068c9bc775..30ab17b7db 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -3,7 +3,7 @@
    [routerLink]="[searchLink]"
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
   <span class="filter-value px-1">{{filterValue.label}}</span>
-  <span class="float-right filter-value-count ml-auto">
-    <span class="badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
+  <span class="float-end filter-value-count ms-auto">
+    <span class="badge bg-secondary rounded-pill">{{filterValue.count | dsShortNumber}}</span>
   </span>
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index 0887e4d6a5..b1045a854a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -5,7 +5,7 @@
    (click)="searchFilterService.minimizeAll()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="filter-value pl-1 break-facet">
+    <span class="filter-value ps-1 break-facet">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
   </label>
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 51200571bd..a4fe34b50e 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
@@ -7,11 +7,11 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
+            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
+            <a class="float-end" *ngIf="(currentPage | async) > 1"
                (click)="showFirstPageOnly()" href="javascript:void(0);">
               {{"search.filters.filter.show-less" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 6f1f95738c..67c2be4e4f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -2,9 +2,9 @@
     <div class="filters py-2">
         <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
               [action]="currentUrl">
-            <div class="col-6 form-group mb-0">
-                <label>
-                  <span class="font-weight-bold">
+            <div class="col-6 mb-3 mb-0">
+                <label class="form-label">
+                  <span class="fw-bold">
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
@@ -15,8 +15,8 @@
                 </label>
             </div>
             <div class="col-6">
-                <label>
-                    <span class="font-weight-bold">
+                <label class="form-label">
+                    <span class="fw-bold">
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index 037964c63f..776680c2cd 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -7,11 +7,11 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
+            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
+            <a class="float-end" *ngIf="(currentPage | async) > 1"
                (click)="showFirstPageOnly()" href="javascript:void(0);">
               {{"search.filters.filter.show-less" | translate}}
             </a>
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
index 609d9ad785..ea8fbc392b 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
@@ -3,10 +3,10 @@
    [routerLink]="searchLink"
    [queryParams]="(removeParametersMin$ | async)"
    (click)="searchFilterService.minimizeAll()"
-   class="badge badge-primary">
+   class="badge bg-primary">
   <span class="d-flex">
     <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
+    <span class="ps-1" aria-hidden="true">×</span>
   </span>
 </a>
 <a *ngIf="max !== '*'"
@@ -14,9 +14,9 @@
    [routerLink]="searchLink"
    [queryParams]="(removeParametersMax$ | async)"
    (click)="searchFilterService.minimizeAll()"
-   class="badge badge-primary">
+   class="badge bg-primary">
   <span class="d-flex">
     <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
+    <span class="ps-1" aria-hidden="true">×</span>
   </span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 58308d4928..4550d41c21 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,10 +1,10 @@
-<a class="badge badge-primary"
+<a class="badge bg-primary me-1 mb-1 text-capitalize"
    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter) | translate, value: appliedFilter.label }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters$ | async)"
    (click)="searchFilterService.minimizeAll()">
   <span class="d-flex">
     <span class="flex-grow-1 text-left">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}{{'search.filters.applied.operator.' + appliedFilter.operator | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
+    <span class="ps-1" aria-hidden="true">×</span>
   </span>
 </a>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index 43fdc99391..c52d8b1d4a 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -4,7 +4,7 @@
         <button (click)="toggleSidebar.emit()"
                 [attr.aria-label]="'search.sidebar.close' | translate"
                 aria-controls="search-content"
-                class="btn btn-outline-primary float-right close-sidebar"><i
+                class="btn btn-outline-primary float-end close-sidebar"><i
                 class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
         </button>
     </div>
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index 64c0cd5008..87546b6c76 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
   <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
 
-  <select class="form-control"
+  <select class="form-select"
           aria-labelledby="configuration-switch"
           [compareWith]="compare"
           [(ngModel)]="selectedOption"
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index d1562b3734..913b9cba0b 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -87,7 +87,7 @@ describe('SearchSwitchConfigurationComponent', () => {
   });
 
   it('should display select field properly', () => {
-    const selectField = fixture.debugElement.query(By.css('.form-control'));
+    const selectField = fixture.debugElement.query(By.css('.form-select'));
     expect(selectField).not.toBeNull();
 
     const childElements = selectField.children;
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index e090280692..07b9ea5cf2 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -28,7 +28,7 @@
                 <ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
                     [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
                 <button (click)="openSidebar()" aria-controls="#search-body"
-                        class="btn btn-outline-primary float-right open-sidebar"><i
+                        class="btn btn-outline-primary float-end open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"
                        | translate}}
                 </button>
diff --git a/src/app/shared/search/search.component.scss b/src/app/shared/search/search.component.scss
index 82de1f4772..bea773455d 100644
--- a/src/app/shared/search/search.component.scss
+++ b/src/app/shared/search/search.component.scss
@@ -1,10 +1,14 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
   }
 }
 
+:host {
+    --bs-gutter-x: .75rem;
+}
+
 ::ng-deep .search-controls {
     margin-bottom: var(--bs-spacer);
 }
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 42f1b53819..c558d97f1f 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -1,6 +1,6 @@
 <div class="container">
   <div class="row">
-    <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
+    <div class="row-with-sidebar row-offcanvas row-offcanvas-left px-0"
          [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
       <div *ngIf="sideBarWidth > 0" id="{{id}}-sidebar-content"
            [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.scss b/src/app/shared/sidebar/page-with-sidebar.component.scss
index 4949694313..df87cdf054 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.scss
+++ b/src/app/shared/sidebar/page-with-sidebar.component.scss
@@ -1,4 +1,4 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
@@ -6,16 +6,19 @@
 }
 
 .row-with-sidebar {
-
   &.row-offcanvas {
     width: 100%;
+    > * {
+      padding-right: calc(var(--bs-gutter-x) / 2);
+      padding-left: calc(var(--bs-gutter-x) / 2);
+    }
   }
 
   @include media-breakpoint-up(md) {
     display: flex;
   }
 
-  @include media-breakpoint-down(sm) {
+  @include media-breakpoint-down(md) {
     position: relative;
 
     &.row-offcanvas {
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 644e1e0d27..101276de82 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.html
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.html
@@ -1,6 +1,6 @@
 <div class="setting-option mb-3 p-3">
-  <h4><label for="{{id}}">{{label | translate}}</label></h4>
-  <select id="{{id}}" class="form-control" (change)="changed.emit($event)">
+  <h4><label class="form-label" for="{{id}}">{{label | translate}}</label></h4>
+  <select id="{{id}}" class="form-select" (change)="changed.emit($event)">
     <ng-content></ng-content>
   </select>
 </div>
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index b350d9896c..fcc0986003 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -1,34 +1,35 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
-  <div class="row">
-    <span class="col-12 font-weight-bold mb-1">
-      {{'browse.startsWith.jump' | translate}}
+    <div class="row">
+    <span class="col-12 fw-bold mb-1">
+      {{ 'browse.startsWith.jump' | translate }}
     </span>
-    <div class="col-6 col-md-2">
-      <select id="year-select" class="form-control" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
-        <option [value]="-1" [selected]="!startsWithYear">
-          {{'browse.startsWith.choose_year' | translate}}
-        </option>
-        <option *ngFor="let option of startsWithOptions"
-                [value]="option"
-                [selected]="option === startsWithYear ? 'selected': null">
-          {{option}}
-        </option>
-      </select>
+        <div class="col-6 col-md-2">
+            <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
+                <option [value]="-1" [selected]="!startsWithYear">
+                    {{ 'browse.startsWith.choose_year' | translate }}
+                </option>
+                <option *ngFor="let option of startsWithOptions"
+                        [value]="option"
+                        [selected]="option === startsWithYear ? 'selected': null">
+                    {{ option }}
+                </option>
+            </select>
+        </div>
+        <div class="col-6 col-md-2">
+            <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
+                <option *ngFor="let option of monthOptions"
+                        [value]="option"
+                        [selected]="option === startsWithMonth ? 'selected': null">
+                    {{ 'browse.startsWith.months.' + option | translate }}
+                </option>
+            </select>
+        </div>
+        <div class="col-12 col-md-6">
+            <div class="mb-3 input-group pt-1 pt-md-0">
+                <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith"
+                       formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''"/>
+                <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{ 'browse.startsWith.submit' | translate }}</button>
+            </div>
+        </div>
     </div>
-    <div class="col-6 col-md-2">
-      <select id="month-select" class="form-control" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
-        <option *ngFor="let option of monthOptions"
-                [value]="option"
-                [selected]="option === startsWithMonth ? 'selected': null">
-          {{'browse.startsWith.months.' + option | translate}}
-        </option>
-      </select>
-    </div>
-    <div class="form-group input-group col-12 col-md-6 pt-1 pt-md-0">
-      <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''" />
-      <span class="input-group-append">
-        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
-      </span>
-    </div>
-  </div>
 </form>
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.html b/src/app/shared/starts-with/text/starts-with-text.component.html
index edbd1f1960..5208427f34 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/app/shared/starts-with/text/starts-with-text.component.html
@@ -1,11 +1,9 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
 <div class="mb-3">
   <div class="row">
-    <div class="form-group input-group col-sm-12 col-md-6 col-auto">
+    <div class="mb-3 input-group col-sm-12 col-md-6 col-auto">
       <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.search-form.placeholder' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
-      <span class="input-group-append">
         <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
-      </span>
     </div>
   </div>
   <small class="text-muted">{{'browse.startsWith.type_text' | translate}}</small>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 37a7a3f431..926ae08c2f 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -1,16 +1,15 @@
 <form *ngIf="subscriptionForm" [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
   <div class="modal-header">
     <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="activeModal.close()">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.close()">
     </button>
   </div>
   <div class="modal-body">
     <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
-      <span *ngIf="!!dso" class="float-right"><ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge></span>
+      <span *ngIf="!!dso" class="float-end"><ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge></span>
     </p>
     <div>
-      <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="form-group form-row">
+      <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="mb-3 row">
         <legend class="col-md-4 col-form-label float-md-left pt-0">
           {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
         </legend>
diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts
index b1f1ba6ee2..554bfaf179 100644
--- a/src/app/shared/testing/css-variable-service.stub.ts
+++ b/src/app/shared/testing/css-variable-service.stub.ts
@@ -6,10 +6,10 @@ import {
 import { KeyValuePair } from '../key-value-pair.model';
 
 const variables = {
-  '--bs-sm-min': '576px,',
-  '--bs-md-min': '768px,',
-  '--bs-lg-min': '992px',
-  '--bs-xl-min': '1200px',
+  '--bs-sm': '576px,',
+  '--bs-md': '768px,',
+  '--bs-lg': '992px',
+  '--bs-xl': '1200px',
 } as any;
 
 export class CSSVariableServiceStub {
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 55ebe2d957..fef02ea6d7 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -12,6 +12,6 @@
     [attr.aria-expanded]="isExpanded"
   >
     <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
+    <span class="ms-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 38c2af97fc..95b00acdbd 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -18,7 +18,7 @@
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
       <span><i class="fas fa-cloud-upload"
                aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
-    <label class="btn btn-link m-0 p-0 ml-1">
+    <label class="btn btn-link m-0 p-0 ms-1">
       <input class="form-control-file d-none" type="file" name="file-upload"
              id="file-upload"
              (change)="handleFileInput($event)">
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index ae7c07bbab..5b2f3f9672 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -20,9 +20,9 @@
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
         <span class="d-flex align-items-center">
-          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
+          <i class="fas fa-upload pe-1" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
-          <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
+          <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ms-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
             <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
           </label>
           <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
@@ -34,13 +34,13 @@
             <span class="filename">
               <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
             </span>
-            <div class="btn-group btn-group-sm float-right" role="group">
+            <div class="btn-group btn-group-sm float-end" role="group">
               <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
-            <span *ngIf="uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)" class="float-right mr-3">{{ uploader.progress }}%</span>
-            <span *ngIf="uploader.progress === 100" class="float-right mr-3">{{'uploader.processing' | translate}}</span>
+            <span *ngIf="uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)" class="float-end me-3">{{ uploader.progress }}%</span>
+            <span *ngIf="uploader.progress === 100" class="float-end me-3">{{'uploader.processing' | translate}}</span>
           </div>
           <div class="ds-base-drop-zone-progress clearfix mt-2">
             <div role="progressbar"
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index db33afc76a..2795686501 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -2,12 +2,8 @@
   <div
     *ngIf="(available$ | async) !== true"
     class="input-group mb-3">
-    <div class="input-group-prepend">
-      <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
-    </div>
-    <div class="input-group-append">
-      <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
-    </div>
+  <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
+  <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
   </div>
   <div
     ngbDropdown
@@ -15,11 +11,9 @@
     *ngIf="(available$ | async)"
     class="btn-group input-group"
     (openChange)="toggled($event)">
-    <div class="input-group-prepend">
-      <span id="collectionControlsMenuLabel" class="input-group-text">
-        {{ 'submission.sections.general.collection' | translate }}
-      </span>
-    </div>
+  <span id="collectionControlsMenuLabel" class="input-group-text">
+    {{ 'submission.sections.general.collection' | translate }}
+  </span>
     <button aria-describedby="collectionControlsMenuLabel"
             id="collectionControlsMenuButton"
             class="btn btn-outline-primary"
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index c860fb557b..dbbef546df 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -10,7 +10,7 @@
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
   </div>
-  <div class="col text-right d-flex justify-content-end align-items-center">
+  <div class="col text-end d-flex justify-content-end align-items-center">
     <span *ngIf="(hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
       <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
     </span>
@@ -23,7 +23,7 @@
         <div *ngIf="(processingDepositStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
       </div>
     </div>
-    <div class="ml-2 space-children-mr">
+    <div class="ms-2 space-children-mr">
       <button type="button"
               class="btn btn-secondary"
               id="save"
@@ -58,8 +58,7 @@
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 17e863d435..27b1c0c545 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -19,7 +19,7 @@
             </ds-submission-form-collection>
           </ng-container>
         </div>
-        <div class="submission-form-header-item text-right">
+        <div class="submission-form-header-item text-end">
             <ds-submission-form-section-add [collectionId]="collectionId"
                                             [submissionId]="submissionId">
             </ds-submission-form-section-add>
diff --git a/src/app/submission/form/submission-form.component.scss b/src/app/submission/form/submission-form.component.scss
index c5e142b89c..772849791c 100644
--- a/src/app/submission/form/submission-form.component.scss
+++ b/src/app/submission/form/submission-form.component.scss
@@ -22,7 +22,7 @@
   font-weight: $font-weight-normal;
   color: $link-color;
   text-decoration: $link-decoration;
-  @include hover {
+  &:hover {
     color: $link-hover-color;
     text-decoration: $link-hover-decoration;
   }
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
index e2b769295a..234fbe9233 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.select.collection.head' | translate}}
-    <button type="button" class="close" (click)="closeCollectionModal()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="closeCollectionModal()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
index 1a70081367..5a3c2bd9c6 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
@@ -1,3 +1,3 @@
-.close:focus {
+.btn-close:focus {
   outline: none !important;
 }
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index beecd68d70..b386f3c8cb 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
   <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h2>
-  <button type="button" class="close"
+  <button type="button" class="btn-close"
           (click)="closeMetadataModal()" aria-label="Close">
-      <span aria-hidden="true">×</span>
   </button>
 </div>
 <div class="modal-body">
@@ -31,7 +30,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-md-12 text-right">
+      <div class="col-md-12 text-end">
         <button class="btn btn-success" (click)="import()" role="button">
           <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
         </button>
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
index 1a70081367..5a3c2bd9c6 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
@@ -1,3 +1,3 @@
-.close:focus {
+.btn-close:focus {
   outline: none !important;
 }
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index f5bde4e81a..c90adbea07 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,5 +1,6 @@
 <div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
-  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+    <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}"
+           [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
 </div>
 <div class="input-group mb-5">
   <input *ngIf="(isXsOrSm$ | async) !== true" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
@@ -19,10 +20,13 @@
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-        <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
+            <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
+                    *ngFor="let source of sourceList">{{ 'submission.import-external.source.' + source?.name | translate }}
+            </button>
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
-      </li>
+        </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsBtnDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
-  </div>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''"
+            [dsBtnDisabled]="searchString === ''" (click)="search()">{{ 'submission.import-external.search.button' | translate }}
+    </button>
 </div>
diff --git a/src/app/submission/sections/accesses/section-accesses.model.ts b/src/app/submission/sections/accesses/section-accesses.model.ts
index 6b4732b881..2967971b83 100644
--- a/src/app/submission/sections/accesses/section-accesses.model.ts
+++ b/src/app/submission/sections/accesses/section-accesses.model.ts
@@ -18,7 +18,7 @@ export const ACCESS_FORM_CHECKBOX_CONFIG: DynamicCheckboxModelConfig = {
 export const ACCESS_FORM_CHECKBOX_LAYOUT = {
 
   element: {
-    container: 'custom-control custom-checkbox pl-1',
+    container: 'custom-control custom-checkbox ps-1',
     control: 'custom-control-input',
     label: 'custom-control-label pt-1',
   },
@@ -31,9 +31,9 @@ export const ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
 
 export const ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'form-group access-condition-group col',
-    container: 'pl-1 pr-1',
-    control: 'form-row ',
+    host: 'mb-3 access-condition-group col',
+    container: 'ps-1 pe-1',
+    control: 'row ',
   },
 };
 
@@ -43,7 +43,7 @@ export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig =
 };
 export const ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
-    group: 'form-row pt-4',
+    group: 'row pt-4',
   },
 };
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index a8d6ef3262..cf2e68e87b 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -41,11 +41,11 @@
        class="mb-4">
 
     <div class="d-flex flex-row">
-      <div class="font-weight-bold {{ field.id }}">
+      <div class="fw-bold {{ field.id }}">
         {{ field.label }}
       </div>
       <button
-        class="btn btn-outline-info btn-sm ml-2"
+        class="btn btn-outline-info btn-sm ms-2"
         (click)="openInfoModal(infoModal)">
         <i class="fas fa-question"></i>
       </button>
@@ -62,9 +62,8 @@
             </h4>
             <div [innerHTML]="field.description"></div>
           </div>
-          <button type="button" class="close"
+          <button type="button" class="btn-close"
                   (click)="closeInfoModal()" aria-label="Close">
-            <span aria-hidden="true">×</span>
           </button>
         </div>
 
@@ -74,7 +73,7 @@
             <h5>
               {{ value.label }}
             </h5>
-            <div [innerHTML]="value.description" class="font-weight-light"></div>
+            <div [innerHTML]="value.description" class="fw-light"></div>
           </div>
         </div>
 
@@ -108,7 +107,7 @@
         <div (click)="selectOption(getSelectedCcLicense(), field, option)">
           <input type="radio"
                  title="{{ option.label }}"
-                 class="mr-1"
+                 class="me-1"
                  [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
           <span>{{ option.label }}</span>
         </div>
@@ -135,7 +134,7 @@
       <div class="m-2">
         <div (click)="setAccepted(!accepted)">
           <input type="checkbox"
-                 class="mr-2"
+                 class="me-2"
                  title="accepted"
                  [checked]="accepted">
           <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 3f0050ea51..4f76af8c4c 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -1,37 +1,31 @@
 <div dsSection #sectionRef="sectionRef" [attr.id]="'section_' + sectionData.id"
+  class="mb-2"
   [ngClass]="{ 'section-focus' : sectionRef.isSectionActive() }" [mandatory]="sectionData.mandatory"
   [submissionId]="submissionId" [sectionType]="sectionData.sectionType" [sectionId]="sectionData.id">
   <ngb-accordion #acc="ngbAccordion" *ngIf="(sectionRef.isEnabled() | async)"
     (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
     <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
-      <ng-template ngbPanelTitle>
-        <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="float-left section-title" tabindex="0">{{
+      <ng-template ngbPanelTitle class="d-flex">
+        <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
           'submission.sections.'+sectionData.header | translate
           }}</span>
-        <div class="d-inline-block float-right">
+        <div class="d-inline-block">
           <i *ngIf="(sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-warning mr-3"
+            class="fas fa-exclamation-circle text-warning me-3"
             title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
           <i *ngIf="(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-danger mr-3"
+            class="fas fa-exclamation-circle text-danger me-3"
             title="{{'submission.sections.status.errors.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.errors.aria' | translate"></i>
           <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-check-circle text-success mr-3"
+            class="fas fa-check-circle text-success me-3"
             title="{{'submission.sections.status.valid.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
-          <i *ngIf="sectionRef.isInfo()" class="fas fa-info-circle mr-3 text-white"
+          <i *ngIf="sectionRef.isInfo()" class="fas fa-info-circle me-3 text-white"
             title="{{'submission.sections.status.info.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
-          <a class="close" tabindex="0" role="button"
-            [attr.aria-label]="(sectionRef.isOpen() ? 'submission.sections.toggle.aria.close' : 'submission.sections.toggle.aria.open') | translate: {sectionHeader: ('submission.sections.'+sectionData.header | translate)}"
-            [title]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate">
-            <span *ngIf="sectionRef.isOpen()" [ngClass]="{ 'text-white' : sectionRef.isInfo()}"
-              class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"></span>
-          </a>
-          <a href="javascript:void(0);" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
+          <a href="javascript:void(0);" class="me-3" *ngIf="!sectionRef.isMandatory()"
             (click)="removeSection($event)">
             <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
           </a>
diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
index 33f7721ac3..43ed56d1fd 100644
--- a/src/app/submission/sections/license/section-license.model.ts
+++ b/src/app/submission/sections/license/section-license.model.ts
@@ -3,7 +3,7 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
 
   granted: {
     element: {
-      container: 'custom-control custom-checkbox pl-1',
+      container: 'custom-control custom-checkbox ps-1',
       control: 'custom-control-input',
       label: 'custom-control-label pt-1',
     },
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
index 49742892ca..9f3110d965 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -73,7 +73,7 @@
               </div>
               <button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
                       type="button" [class.mt-2]="serviceIndex > 0"
-                      class="btn btn-secondary ml-2"
+                      class="btn btn-secondary ms-2"
                       role="button"
                       title="{{'form.remove' | translate}}"
                       [attr.aria-label]="'form.remove' | translate"
@@ -102,8 +102,8 @@
               <div
                 class="alert alert-info w-100 d-flex align-items-center flex-row"
               >
-                <i class="fa-solid fa-circle-info fa-xl ml-2"></i>
-                <div class="ml-4">
+                <i class="fa-solid fa-circle-info fa-xl ms-2"></i>
+                <div class="ms-4">
                   <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
                   <div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
                     {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
@@ -120,7 +120,7 @@
               <div
                 class="alert alert-danger w-100 d-flex align-items-center flex-row"
               >
-                <div class="ml-4">
+                <div class="ms-4">
               <span>
                 {{ 'submission.section.section-coar-notify.notification.error' | translate }}
               </span>
@@ -130,7 +130,7 @@
             <div class="row">
               <div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
                    (click)="addNewService(ldnPattern)"
-                   class="btn btn-link mt-2 pl-0"
+                   class="btn btn-link mt-2 ps-0"
               >
                 <i class="fas fa-plus"></i>
                 {{ 'submission.sections.general.add-more' | translate }}
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
index 3d4fba5cea..74d69dfaf8 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
@@ -1,7 +1,7 @@
 <div class="mb-3 border-bottom" data-test="collapse">
     <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
         <div class="d-flex">
-            <button type="button" class="btn btn-link p-0 mr-4" (click)="$event.preventDefault()"
+            <button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
                 [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
                 {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
                 translate
@@ -16,7 +16,7 @@
                         'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
                 </ng-template>
 
-                <span class="m-1 ml-4">
+                <span class="m-1 ms-4">
                     <i class="far fa-folder-open"></i>
                     <span *ngIf="!!version?.locations && version.locations.length > 0; else noLocations">
                         {{version.locations[0]}} <span
@@ -35,7 +35,7 @@
         </div>
     </div>
     <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-        <div *ngIf="!!version" class="ml-4">
+        <div *ngIf="!!version" class="ms-4">
             <div class="row" *ngIf="!!version?.embargo && !!version?.embargo.amount">
                 <div class="col-4">
                     <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
@@ -87,4 +87,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
index 15dd4d7286..36b9581182 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
@@ -1,4 +1,4 @@
-<div class="ml-4">
+<div class="ms-4">
     <div class="row" *ngIf="!!metadata?.id">
         <div class="col-4">
             <p class="m-1">{{ 'submission.sections.sherpa.record.information.id' | translate }}</p>
@@ -36,4 +36,4 @@
             </p>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
index 534b95397e..26da914ead 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
@@ -1,4 +1,4 @@
-<div class="ml-4">
+<div class="ms-4">
     <div class="row" *ngIf="!!journal?.titles && journal.titles.length > 0">
         <div class="col-4">
             <p class="m-1">{{'submission.sections.sherpa.publication.information.title' | translate}}</p>
@@ -61,4 +61,4 @@
             </p>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
index 96e42202b3..4e89a98aab 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
@@ -1,4 +1,4 @@
-<div class="ml-4">
+<div class="ms-4">
     <ds-content-accordion *ngFor="let permittedVersions of policy.permittedVersions" [version]="permittedVersions">
     </ds-content-accordion>
     <div class="row" *ngIf="!!policy?.urls">
@@ -13,4 +13,4 @@
             </ul>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
index 4b636ee46e..7b3da2d020 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
@@ -6,7 +6,7 @@
     {{'submission.sections.sherpa.publisher.policy.description' | translate}}
   </ds-alert>
   <div>
-    <button type="button" class="btn btn-secondary float-right" (click)="refresh()" data-test="refresh-btn">
+    <button type="button" class="btn btn-secondary float-end" (click)="refresh()" data-test="refresh-btn">
       <span><i class="fas fa-sync"></i> {{'submission.sections.sherpa.publisher.policy.refresh' | translate}} </span>
     </button>
   </div>
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
index f217abf88e..ddfe3e27ce 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
@@ -1,8 +1,8 @@
 <ng-container *ngFor="let accessCondition of accessConditionsList">
-  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
+  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge bg-primary mt-3 me-2">
     {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
   </span>
-  <span *ngIf="accessCondition.name === 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
-  <span *ngIf="accessCondition.name === 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+  <span *ngIf="accessCondition.name === 'lease'" class="badge bg-primary mt-3 me-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
+  <span *ngIf="accessCondition.name === 'embargo'" class="badge bg-dark mt-3 me-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
   <br>
 </ng-container>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index b03504c6be..761ac9537e 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,8 +1,7 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 4a39dfcfc8..65d233081c 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -15,7 +15,7 @@ export const BITSTREAM_METADATA_FORM_GROUP_CONFIG: DynamicFormGroupModelConfig =
 };
 export const BITSTREAM_METADATA_FORM_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    container: 'form-group',
+    container: 'mb-3',
     label: 'col-form-label',
   },
   grid: {
@@ -29,9 +29,9 @@ export const BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfi
 
 export const BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'form-group access-condition-group col',
-    container: 'pl-1 pr-1',
-    control: 'form-row ',
+    host: 'mb-3 access-condition-group col',
+    container: 'ps-1 pe-1',
+    control: 'row ',
   },
 };
 
@@ -41,7 +41,7 @@ export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayMode
 };
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
-    group: 'form-row pt-4',
+    group: 'row pt-4',
   },
 };
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index cd04542676..da1200b8e4 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -17,10 +17,10 @@
       </div>
     </div>
     <div class="col-md-10">
-      <div class="float-left w-75">
+      <div class="float-start w-75">
         <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
       </div>
-      <div class="float-right w-15">
+      <div class="float-end w-15">
         <ng-container>
           <ds-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
                                         [bitstream]="getBitstream()" [enableRequestACopy]="false">
@@ -37,8 +37,8 @@
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [dsBtnDisabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
-            <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
-            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
+            <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x link-danger"></i>
+            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x link-danger"></i>
           </button>
         </ng-container>
       </div>
@@ -50,8 +50,7 @@
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title text-danger">{{ 'submission.sections.upload.delete.confirm.title' | translate }}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
index 45bdff32bf..1fe3ffb4ce 100644
--- a/src/app/suggestions-page/suggestions-page.component.html
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -12,7 +12,7 @@
             </h1>
 
             <div class="mb-3 mt-3">
-              <button class="btn mr-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
+              <button class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
               <em>({{ getSelectedSuggestionsCount() }})</em>
               <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
                                       class="m-2"
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index c2c1942cdd..102987a9dd 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="(systemWideAlert$ |async)?.active">
     <div class="rounded-0 alert alert-warning w100 m-0 px-1">
         <div class="container">
-            <span class="font-weight-bold">
+            <span class="fw-bold">
                 <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
                     {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
                 </span>
@@ -18,4 +18,4 @@
             <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index dc2699b6d1..92dd91227b 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,7 +1,7 @@
 <div class="container">
     <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
     <div [formGroup]="alertForm" [class]="'ng-invalid'">
-        <div class="form-group">
+        <div class="mb-3">
             <div class="row mb-2">
                 <div class="col">
                     <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
@@ -11,7 +11,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
+                    <label class="form-label" for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
                     <textarea id="formMessage" rows="5"
                         [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
                         formControlName="formMessage">
@@ -30,7 +30,7 @@
         <div class="col mb-2 d-flex align-items-end">
             <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
                 [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
-            <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+            <span class="ms-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
         </div>
     </div>
     <div *ngIf="counterEnabled$ |async">
@@ -62,11 +62,11 @@
     <div *ngIf="formMessage.value">
         <div class="row">
             <div class="col">
-                <label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
+                <label class="form-label">{{ 'system-wide-alert.form.label.preview' | translate }}</label>
             </div>
         </div>
         <div class="rounded-0 alert alert-warning">
-            <span class="font-weight-bold">
+            <span class="fw-bold">
                 <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
                     {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
                 </span>
@@ -83,7 +83,7 @@
             <span [innerHTML]="formMessage.value"></span>
         </div>
     </div>
-    <div class="btn-row float-right space-children-mr mt-2">
+    <div class="btn-row float-end space-children-mr mt-2">
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
index aca9b4da73..bd2ec5115b 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
@@ -7,7 +7,7 @@
   </p>
 
   <form (ngSubmit)="performAction()" *ngIf="ratingForm" [formGroup]="ratingForm">
-    <div class="form-group">
+    <div class="mb-3">
       <label class="control-label">
         <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
         <span *ngIf="advancedInfo?.descriptionRequired">*</span>
@@ -20,7 +20,7 @@
       </small>
     </div>
 
-    <div class="form-group">
+    <div class="mb-3">
       <label class="control-label mb-1">
         {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
       </label>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index 75c265b420..059d3b7e3b 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -8,8 +8,7 @@
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
     <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
-    <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" id="delete_close" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 386b4b47fe..fc470e4490 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -26,8 +26,6 @@ $h6-font-size: $font-size-base !default;
 
 /*** BOOTSTRAP OPTIONS ***/
 
-// enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
-$enable-responsive-font-sizes: true !default;
 $enable-shadows: true !default;
 
 
@@ -43,20 +41,38 @@ $danger:    #cf4444 !default;               // Red
 $light:     #f8f9fa !default;               // As Bootstrap $gray-100
 $dark:      darken(#2b4e72, 17%) !default;  // Blue gray (darker)
 
+// Add new semantic colors here (you don't need to add existing semantic colors)
+$global-custom-semantic-colors: (
+);
 
 /*** OTHER BOOTSTRAP VARIABLES ***/
 
-$link-color: #1F7293 !default;
+$link-color: $info !default;
 $link-hover-color: darken($link-color, 15%) !default;
 
-// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold: 165 !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
 $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-dark-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-light-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 
+$min-contrast-ratio: 2 !default;
+
+$link-decoration: none;
+$link-hover-decoration: underline;
+
+$pagination-disabled-bg: white;
+
+$icon-font-family: "Font Awesome 6 Free"; /* Define the font-family for icons */
+
+$border-radius: 0.25em;
+
+$bs-border-radius-lg: 0.3rem;
+
+$badge-padding-x: 0.4em;
+$badge-padding-y: 0.25em;
+
+$primary-bg-subtle: $light !default;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
@@ -101,3 +117,4 @@ $ds-danger-bg: #{lighten($danger, 30%)} !default;
 // Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
 // See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
 $fa-font-path: "^assets/fonts" !default;
+
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 944166399e..0cfa811b00 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -6,820 +6,105 @@
   // Variables should follow the `$component-state-property-size` formula for
   // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
 
-  // Color system
-  --bs-white: #{$white};
-  --bs-gray-100: #{$gray-100};
-  --bs-gray-200: #{$gray-200};
-  --bs-gray-300: #{$gray-300};
-  --bs-gray-400: #{$gray-400};
-  --bs-gray-500: #{$gray-500};
-  --bs-gray-600: #{$gray-600};
-  --bs-gray-700: #{$gray-700};
-  --bs-gray-800: #{$gray-800};
-  --bs-gray-900: #{$gray-900};
-  --bs-black: #{$black};
-  --bs-blue: #{$blue};
-  --bs-indigo: #{$indigo};
-  --bs-purple: #{$purple};
-  --bs-pink: #{$pink};
-  --bs-red: #{$red};
-  --bs-orange: #{$orange};
-  --bs-yellow: #{$yellow};
-  --bs-green: #{$green};
-  --bs-teal: #{$teal};
-  --bs-cyan: #{$cyan};
-  --bs-primary: #{$primary};
-  --bs-secondary: #{$secondary};
-  --bs-success: #{$success};
-  --bs-info: #{$info};
-  --bs-warning: #{$warning};
-  --bs-danger: #{$danger};
-  --bs-light: #{$light};
-  --bs-dark: #{$dark};
-
-
-  // Set a specific jump point for requesting color jumps
-  --bs-theme-color-interval: #{$theme-color-interval};
-
-  // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-  --bs-yiq-contrasted-threshold: #{$yiq-contrasted-threshold};
-
-  // Customize the light and dark text colors for use in our YIQ color contrast function.
-  --bs-yiq-text-dark: #{$yiq-text-dark};
-  --bs-yiq-text-light: #{$yiq-text-light};
-
-
-  // Options
-  //
-  // Quickly modify global styling by enabling or disabling optional features.
-  --bs-enable-caret: #{$enable-caret};
-  --bs-enable-rounded: #{$enable-rounded};
-  --bs-enable-shadows: #{$enable-shadows};
-  --bs-enable-gradients: #{$enable-gradients};
-  --bs-enable-transitions: #{$enable-transitions};
-  --bs-enable-prefers-reduced-motion-media-query: #{$enable-prefers-reduced-motion-media-query};
-  --bs-enable-grid-classes: #{$enable-grid-classes};
-  --bs-enable-pointer-cursor-for-buttons: #{$enable-pointer-cursor-for-buttons};
-  --bs-enable-print-styles: #{$enable-print-styles};
-  --bs-enable-responsive-font-sizes: #{$enable-responsive-font-sizes};
-  --bs-enable-validation-icons: #{$enable-validation-icons};
-  --bs-enable-deprecation-messages: #{$enable-deprecation-messages};
-  --bs-spacer: #{$spacer};
-  --bs-spacer-0: #{map-get($spacers, 0)};
-  --bs-spacer-1: #{map-get($spacers, 1)};
-  --bs-spacer-2: #{map-get($spacers, 2)};
-  --bs-spacer-3: #{map-get($spacers, 3)};
-  --bs-spacer-4: #{map-get($spacers, 4)};
-  --bs-spacer-5: #{map-get($spacers, 5)};
-  --bs-sizes-25: #{map-get($sizes, 25)};
-  --bs-sizes-50: #{map-get($sizes, 50)};
-  --bs-sizes-75: #{map-get($sizes, 75)};
-  --bs-sizes-100: #{map-get($sizes, 100)};
-  --bs-sizes-auto: #{map-get($sizes, auto)};
-
-  // Body
-  //
-  // Settings for the `<body>` element.
-  --bsbody-bg: #{$body-bg};
-  --bs-body-color: #{$body-color};
-
-
-  // Links
-  //
-  // Style anchor elements.
-  --bs-link-color: #{$link-color};
-  --bs-link-decoration: #{$link-decoration};
-  --bs-link-hover-color: #{$link-hover-color};
-  --bs-link-hover-decoration: #{$link-hover-decoration};
-  // Darken percentage for links with `.text-*` class (e.g. `.text-success`)
-  --bs-emphasized-link-hover-darken-percentage: #{$emphasized-link-hover-darken-percentage};
-
-  // Paragraphs
-  //
-  // Style p element.
-  --bs-paragraph-margin-bottom: #{$paragraph-margin-bottom};
-
-
-  // Grid breakpoints
-  //
-  // Define the minimum dimensions at which your layout will change,
-  // adapting to different screen sizes, for use in media queries.
-
-  --bs-xs-min: #{map-get($grid-breakpoints, xs)};
-  --bs-sm-min: #{map-get($grid-breakpoints, sm)};
-  --bs-md-min: #{map-get($grid-breakpoints, md)};
-  --bs-lg-min: #{map-get($grid-breakpoints, lg)};
-  --bs-xl-min: #{map-get($grid-breakpoints, xl)};
-
-  --bs-xs-max: #{map-get($container-max-widths, xs)};
-  --bs-sm-max: #{map-get($container-max-widths, sm)};
-  --bs-md-max: #{map-get($container-max-widths, md)};
-  --bs-lg-max: #{map-get($container-max-widths, lg)};
-  --bs-xl-max: #{map-get($container-max-widths, xl)};
-
-  // Grid columns
-  //
-  // Set the number of columns and specify the width of the gutters.
-  --bs-grid-columns: #{$grid-columns};
-  --bs-grid-gutter-width: #{$grid-gutter-width};
-
-
-  // Components
-  //
-  // Define common padding and border radius sizes and more.
-  --bs-line-height-lg: #{$line-height-lg};
-  --bs-line-height-sm: #{$line-height-sm};
-  --bs-border-width: #{$border-width};
-  --bs-border-color: #{$border-color};
-  --bs-border-radius: #{$border-radius};
-  --bs-border-radius-lg: #{$border-radius-lg};
-  --bs-border-radius-sm: #{$border-radius-sm};
-  --bs-rounded-pill: #{$rounded-pill};
-  --bs-box-shadow-sm: #{$box-shadow-sm};
-  --bs-box-shadow: #{$box-shadow};
-  --bs-box-shadow-lg: #{$box-shadow-lg};
-  --bs-component-active-color: #{$component-active-color};
-  --bs-component-active-bg: #{$component-active-bg};
-  --bs-caret-width: #{$caret-width};
-  --bs-caret-vertical-align: #{$caret-vertical-align};
-  --bs-caret-spacing: #{$caret-spacing};
-  --bs-transition-base: #{$transition-base};
-  --bs-transition-fade: #{$transition-fade};
-  --bs-transition-collapse: #{$transition-collapse};
-
-  --bs-font-family-sans-serif: #{$font-family-sans-serif};
-  --bs-font-family-monospace: #{$font-family-monospace};
-  --bs-font-family-base: #{$font-family-base};
-  // stylelint-enable value-keyword-case
-  --bs-font-size-base: #{$font-size-base};
-  --bs-font-size-lg: #{$font-size-lg};
-  --bs-font-size-sm: #{$font-size-sm};
-  --bs-font-weight-lighter: #{$font-weight-lighter};
-  --bs-font-weight-light: #{$font-weight-light};
-  --bs-font-weight-normal: #{$font-weight-normal};
-  --bs-font-weight-bold: #{$font-weight-bold};
-  --bs-font-weight-bolder: #{$font-weight-bolder};
-  --bs-font-weight-base: #{$font-weight-base};
-  --bs-line-height-base: #{$line-height-base};
-  --bs-h1-font-size: #{$h1-font-size};
-  --bs-h2-font-size: #{$h2-font-size};
-  --bs-h3-font-size: #{$h3-font-size};
-  --bs-h4-font-size: #{$h4-font-size};
-  --bs-h5-font-size: #{$h5-font-size};
-  --bs-h6-font-size: #{$h6-font-size};
-  --bs-headings-margin-bottom: #{$headings-margin-bottom};
-  --bs-headings-font-family: #{$headings-font-family};
-  --bs-headings-font-weight: #{$headings-font-weight};
-  --bs-headings-line-height: #{$headings-line-height};
-  --bs-headings-color: #{$headings-color};
-  --bs-display1-size: #{$display1-size};
-  --bs-display2-size: #{$display2-size};
-  --bs-display3-size: #{$display3-size};
-  --bs-display4-size: #{$display4-size};
-  --bs-display1-weight: #{$display1-weight};
-  --bs-display2-weight: #{$display2-weight};
-  --bs-display3-weight: #{$display3-weight};
-  --bs-display4-weight: #{$display4-weight};
-  --bs-display-line-height: #{$display-line-height};
-  --bs-lead-font-size: #{$lead-font-size};
-  --bs-lead-font-weight: #{$lead-font-weight};
-  --bs-small-font-size: #{$small-font-size};
-  --bs-text-muted: #{$text-muted};
-  --bs-blockquote-small-color: #{$blockquote-small-color};
-  --bs-blockquote-small-font-size: #{$blockquote-small-font-size};
-  --bs-blockquote-font-size: #{$blockquote-font-size};
-  --bs-hr-border-color: #{$hr-border-color};
-  --bs-hr-border-width: #{$hr-border-width};
-  --bs-mark-padding: #{$mark-padding};
-  --bs-dt-font-weight: #{$dt-font-weight};
-  --bs-kbd-box-shadow: #{$kbd-box-shadow};
-  --bs-nested-kbd-font-weight: #{$nested-kbd-font-weight};
-  --bs-list-inline-padding: #{$list-inline-padding};
-  --bs-mark-bg: #{$mark-bg};
-  --bs-hr-margin-y: #{$hr-margin-y};
-
-
-  // Tables
-  //
-  // Customizes the `.table` component with basic values, each used across all table variations.
-  --bs-table-cell-padding: #{$table-cell-padding};
-  --bs-table-cell-padding-sm: #{$table-cell-padding-sm};
-  --bs-table-color: #{$table-color};
-  --bs-table-bg: #{$table-bg};
-  --bs-table-accent-bg: #{$table-accent-bg};
-  --bs-table-hover-color: #{$table-hover-color};
-  --bs-table-hover-bg: #{$table-hover-bg};
-  --bs-table-active-bg: #{$table-active-bg};
-  --bs-table-border-width: #{$table-border-width};
-  --bs-table-border-color: #{$table-border-color};
-  --bs-table-head-bg: #{$table-head-bg};
-  --bs-table-head-color: #{$table-head-color};
-  --bs-table-dark-color: #{$table-dark-color};
-  --bs-table-dark-bg: #{$table-dark-bg};
-  --bs-table-dark-accent-bg: #{$table-dark-accent-bg};
-  --bs-table-dark-hover-color: #{$table-dark-hover-color};
-  --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
-  --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-striped-order: #{$table-striped-order};
-  --bs-table-caption-color: #{$table-caption-color};
-  --bs-table-bg-level: #{$table-bg-level};
-  --bs-table-border-level: #{$table-border-level};
-
-
-  // Buttons + Forms
-  //
-  // Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
-  --bs-input-btn-padding-y: #{$input-btn-padding-y};
-  --bs-input-btn-padding-x: #{$input-btn-padding-x};
-  --bs-input-btn-font-family: #{$input-btn-font-family};
-  --bs-input-btn-font-size: #{$input-btn-font-size};
-  --bs-input-btn-line-height: #{$input-btn-line-height};
-  --bs-input-btn-focus-width: #{$input-btn-focus-width};
-  --bs-input-btn-focus-color: #{$input-btn-focus-color};
-  --bs-input-btn-focus-box-shadow: #{$input-btn-focus-box-shadow};
-  --bs-input-btn-padding-y-sm: #{$input-btn-padding-y-sm};
-  --bs-input-btn-padding-x-sm: #{$input-btn-padding-x-sm};
-  --bs-input-btn-font-size-sm: #{$input-btn-font-size-sm};
-  --bs-input-btn-line-height-sm: #{$input-btn-line-height-sm};
-  --bs-input-btn-padding-y-lg: #{$input-btn-padding-y-lg};
-  --bs-input-btn-padding-x-lg: #{$input-btn-padding-x-lg};
-  --bs-input-btn-font-size-lg: #{$input-btn-font-size-lg};
-  --bs-input-btn-line-height-lg: #{$input-btn-line-height-lg};
-  --bs-input-btn-border-width: #{$input-btn-border-width};
-
-
-  // Buttons
-  //
-  // For each of Bootstrap's buttons, define text, background, and border color.
-  --bs-btn-padding-y: #{$btn-padding-y};
-  --bs-btn-padding-x: #{$btn-padding-x};
-  --bs-btn-font-family: #{$btn-font-family};
-  --bs-btn-font-size: #{$btn-font-size};
-  --bs-btn-line-height: #{$btn-line-height};
-  --bs-btn-padding-y-sm: #{$btn-padding-y-sm};
-  --bs-btn-padding-x-sm: #{$btn-padding-x-sm};
-  --bs-btn-font-size-sm: #{$btn-font-size-sm};
-  --bs-btn-line-height-sm: #{$btn-line-height-sm};
-  --bs-btn-padding-y-lg: #{$btn-padding-y-lg};
-  --bs-btn-padding-x-lg: #{$btn-padding-x-lg};
-  --bs-btn-font-size-lg: #{$btn-font-size-lg};
-  --bs-btn-line-height-lg: #{$btn-line-height-lg};
-  --bs-btn-border-width: #{$btn-border-width};
-  --bs-btn-font-weight: #{$btn-font-weight};
-  --bs-btn-box-shadow: #{$btn-box-shadow};
-  --bs-btn-focus-width: #{$btn-focus-width};
-  --bs-btn-focus-box-shadow: #{$btn-focus-box-shadow};
-  --bs-btn-disabled-opacity: #{$btn-disabled-opacity};
-  --bs-btn-active-box-shadow: #{$btn-active-box-shadow};
-  --bs-btn-link-disabled-color: #{$btn-link-disabled-color};
-  --bs-btn-block-spacing-y: #{$btn-block-spacing-y};
-
-  // Allows for customizing button radius independently from global border radius
-  --bs-btn-border-radius: #{$btn-border-radius};
-  --bs-btn-border-radius-lg: #{$btn-border-radius-lg};
-  --bs-btn-border-radius-sm: #{$btn-border-radius-sm};
-  --bs-btn-transition: #{$btn-transition};
-
-
-  // Forms
-  --bs-label-margin-bottom: #{$label-margin-bottom};
-  --bs-input-padding-y: #{$input-padding-y};
-  --bs-input-padding-x: #{$input-padding-x};
-  --bs-input-font-family: #{$input-font-family};
-  --bs-input-font-size: #{$input-font-size};
-  --bs-input-font-weight: #{$input-font-weight};
-  --bs-input-line-height: #{$input-line-height};
-  --bs-input-padding-y-sm: #{$input-padding-y-sm};
-  --bs-input-padding-x-sm: #{$input-padding-x-sm};
-  --bs-input-font-size-sm: #{$input-font-size-sm};
-  --bs-input-line-height-sm: #{$input-line-height-sm};
-  --bs-input-padding-y-lg: #{$input-padding-y-lg};
-  --bs-input-padding-x-lg: #{$input-padding-x-lg};
-  --bs-input-font-size-lg: #{$input-font-size-lg};
-  --bs-input-line-height-lg: #{$input-line-height-lg};
-  --bs-input-bg: #{$input-bg};
-  --bs-input-disabled-bg: #{$input-disabled-bg};
-  --bs-input-color: #{$input-color};
-  --bs-input-border-color: #{$input-border-color};
-  --bs-input-border-width: #{$input-border-width};
-  --bs-input-box-shadow: #{$input-box-shadow};
-  --bs-input-border-radius: #{$input-border-radius};
-  --bs-input-border-radius-lg: #{$input-border-radius-lg};
-  --bs-input-border-radius-sm: #{$input-border-radius-sm};
-  --bs-input-focus-bg: #{$input-focus-bg};
-  --bs-input-focus-border-color: #{$input-focus-border-color};
-  --bs-input-focus-color: #{$input-focus-color};
-  --bs-input-focus-width: #{$input-focus-width};
-  --bs-input-focus-box-shadow: #{$input-focus-box-shadow};
-  --bs-input-placeholder-color: #{$input-placeholder-color};
-  --bs-input-plaintext-color: #{$input-plaintext-color};
-  --bs-input-height-border: #{$input-height-border};
-  --bs-input-height-inner: #{$input-height-inner};
-  --bs-input-height-inner-half: #{$input-height-inner-half};
-  --bs-input-height-inner-quarter: #{$input-height-inner-quarter};
-  --bs-input-height: #{$input-height};
-  --bs-input-height-sm: #{$input-height-sm};
-  --bs-input-height-lg: #{$input-height-lg};
-  --bs-input-transition: #{$input-transition};
-  --bs-form-text-margin-top: #{$form-text-margin-top};
-  --bs-form-check-input-gutter: #{$form-check-input-gutter};
-  --bs-form-check-input-margin-y: #{$form-check-input-margin-y};
-  --bs-form-check-input-margin-x: #{$form-check-input-margin-x};
-  --bs-form-check-inline-margin-x: #{$form-check-inline-margin-x};
-  --bs-form-check-inline-input-margin-x: #{$form-check-inline-input-margin-x};
-  --bs-form-grid-gutter-width: #{$form-grid-gutter-width};
-  --bs-form-group-margin-bottom: #{$form-group-margin-bottom};
-  --bs-input-group-addon-color: #{$input-group-addon-color};
-  --bs-input-group-addon-bg: #{$input-group-addon-bg};
-  --bs-input-group-addon-border-color: #{$input-group-addon-border-color};
-  --bs-custom-forms-transition: #{$custom-forms-transition};
-  --bs-custom-control-gutter: #{$custom-control-gutter};
-  --bs-custom-control-spacer-x: #{$custom-control-spacer-x};
-  --bs-custom-control-indicator-size: #{$custom-control-indicator-size};
-  --bs-custom-control-indicator-bg: #{$custom-control-indicator-bg};
-  --bs-custom-control-indicator-bg-size: #{$custom-control-indicator-bg-size};
-  --bs-custom-control-indicator-box-shadow: #{$custom-control-indicator-box-shadow};
-  --bs-custom-control-indicator-border-color: #{$custom-control-indicator-border-color};
-  --bs-custom-control-indicator-border-width: #{$custom-control-indicator-border-width};
-  --bs-custom-control-indicator-disabled-bg: #{$custom-control-indicator-disabled-bg};
-  --bs-custom-control-label-disabled-color: #{$custom-control-label-disabled-color};
-  --bs-custom-control-indicator-checked-color: #{$custom-control-indicator-checked-color};
-  --bs-custom-control-indicator-checked-bg: #{$custom-control-indicator-checked-bg};
-  --bs-custom-control-indicator-checked-disabled-bg: #{$custom-control-indicator-checked-disabled-bg};
-  --bs-custom-control-indicator-checked-box-shadow: #{$custom-control-indicator-checked-box-shadow};
-  --bs-custom-control-indicator-checked-border-color: #{$custom-control-indicator-checked-border-color};
-  --bs-custom-control-indicator-focus-box-shadow: #{$custom-control-indicator-focus-box-shadow};
-  --bs-custom-control-indicator-focus-border-color: #{$custom-control-indicator-focus-border-color};
-  --bs-custom-control-indicator-active-color: #{$custom-control-indicator-active-color};
-  --bs-custom-control-indicator-active-bg: #{$custom-control-indicator-active-bg};
-  --bs-custom-control-indicator-active-box-shadow: #{$custom-control-indicator-active-box-shadow};
-  --bs-custom-control-indicator-active-border-color: #{$custom-control-indicator-active-border-color};
-  --bs-custom-checkbox-indicator-border-radius: #{$custom-checkbox-indicator-border-radius};
-  --bs-custom-checkbox-indicator-icon-checked: #{$custom-checkbox-indicator-icon-checked};
-  --bs-custom-checkbox-indicator-indeterminate-bg: #{$custom-checkbox-indicator-indeterminate-bg};
-  --bs-custom-checkbox-indicator-indeterminate-color: #{$custom-checkbox-indicator-indeterminate-color};
-  --bs-custom-checkbox-indicator-icon-indeterminate: #{$custom-checkbox-indicator-icon-indeterminate};
-  --bs-custom-checkbox-indicator-indeterminate-box-shadow: #{$custom-checkbox-indicator-indeterminate-box-shadow};
-  --bs-custom-checkbox-indicator-indeterminate-border-color: #{$custom-checkbox-indicator-indeterminate-border-color};
-  --bs-custom-radio-indicator-border-radius: #{$custom-radio-indicator-border-radius};
-  --bs-custom-radio-indicator-icon-checked: #{$custom-radio-indicator-icon-checked};
-  --bs-custom-switch-width: #{$custom-switch-width};
-  --bs-custom-switch-indicator-border-radius: #{$custom-switch-indicator-border-radius};
-  --bs-custom-switch-indicator-size: #{$custom-switch-indicator-size};
-  --bs-custom-select-padding-y: #{$custom-select-padding-y};
-  --bs-custom-select-padding-x: #{$custom-select-padding-x};
-  --bs-custom-select-font-family: #{$custom-select-font-family};
-  --bs-custom-select-font-size: #{$custom-select-font-size};
-  --bs-custom-select-height: #{$custom-select-height};
-  --bs-custom-select-indicator-padding: #{$custom-select-indicator-padding};
-  --bs-custom-select-font-weight: #{$custom-select-font-weight};
-  --bs-custom-select-line-height: #{$custom-select-line-height};
-  --bs-custom-select-color: #{$custom-select-color};
-  --bs-custom-select-disabled-color: #{$custom-select-disabled-color};
-  --bs-custom-select-bg: #{$custom-select-bg};
-  --bs-custom-select-disabled-bg: #{$custom-select-disabled-bg};
-  --bs-custom-select-bg-size: #{$custom-select-bg-size};
-  --bs-custom-select-indicator-color: #{$custom-select-indicator-color};
-  --bs-custom-select-indicator: #{$custom-select-indicator};
-  --bs-custom-select-background: #{$custom-select-background};
-  --bs-custom-select-feedback-icon-padding-right: #{$custom-select-feedback-icon-padding-right};
-  --bs-custom-select-feedback-icon-position: #{$custom-select-feedback-icon-position};
-  --bs-custom-select-feedback-icon-size: #{$custom-select-feedback-icon-size};
-  --bs-custom-select-border-width: #{$custom-select-border-width};
-  --bs-custom-select-border-color: #{$custom-select-border-color};
-  --bs-custom-select-border-radius: #{$custom-select-border-radius};
-  --bs-custom-select-box-shadow: #{$custom-select-box-shadow};
-  --bs-custom-select-focus-border-color: #{$custom-select-focus-border-color};
-  --bs-custom-select-focus-width: #{$custom-select-focus-width};
-  --bs-custom-select-focus-box-shadow: #{$custom-select-focus-box-shadow};
-  --bs-custom-select-padding-y-sm: #{$custom-select-padding-y-sm};
-  --bs-custom-select-padding-x-sm: #{$custom-select-padding-x-sm};
-  --bs-custom-select-font-size-sm: #{$custom-select-font-size-sm};
-  --bs-custom-select-height-sm: #{$custom-select-height-sm};
-  --bs-custom-select-padding-y-lg: #{$custom-select-padding-y-lg};
-  --bs-custom-select-padding-x-lg: #{$custom-select-padding-x-lg};
-  --bs-custom-select-font-size-lg: #{$custom-select-font-size-lg};
-  --bs-custom-select-height-lg: #{$custom-select-height-lg};
-  --bs-custom-range-track-width: #{$custom-range-track-width};
-  --bs-custom-range-track-height: #{$custom-range-track-height};
-  --bs-custom-range-track-cursor: #{$custom-range-track-cursor};
-  --bs-custom-range-track-bg: #{$custom-range-track-bg};
-  --bs-custom-range-track-border-radius: #{$custom-range-track-border-radius};
-  --bs-custom-range-track-box-shadow: #{$custom-range-track-box-shadow};
-  --bs-custom-range-thumb-width: #{$custom-range-thumb-width};
-  --bs-custom-range-thumb-height: #{$custom-range-thumb-height};
-  --bs-custom-range-thumb-bg: #{$custom-range-thumb-bg};
-  --bs-custom-range-thumb-border: #{$custom-range-thumb-border};
-  --bs-custom-range-thumb-border-radius: #{$custom-range-thumb-border-radius};
-  --bs-custom-range-thumb-box-shadow: #{$custom-range-thumb-box-shadow};
-  --bs-custom-range-thumb-focus-box-shadow: #{$custom-range-thumb-focus-box-shadow};
-  --bs-custom-range-thumb-focus-box-shadow-width: #{$custom-range-thumb-focus-box-shadow-width};
-  --bs-custom-range-thumb-active-bg: #{$custom-range-thumb-active-bg};
-  --bs-custom-range-thumb-disabled-bg: #{$custom-range-thumb-disabled-bg};
-  --bs-custom-file-height: #{$custom-file-height};
-  --bs-custom-file-height-inner: #{$custom-file-height-inner};
-  --bs-custom-file-focus-border-color: #{$custom-file-focus-border-color};
-  --bs-custom-file-focus-box-shadow: #{$custom-file-focus-box-shadow};
-  --bs-custom-file-disabled-bg: #{$custom-file-disabled-bg};
-  --bs-custom-file-padding-y: #{$custom-file-padding-y};
-  --bs-custom-file-padding-x: #{$custom-file-padding-x};
-  --bs-custom-file-line-height: #{$custom-file-line-height};
-  --bs-custom-file-font-family: #{$custom-file-font-family};
-  --bs-custom-file-font-weight: #{$custom-file-font-weight};
-  --bs-custom-file-color: #{$custom-file-color};
-  --bs-custom-file-bg: #{$custom-file-bg};
-  --bs-custom-file-border-width: #{$custom-file-border-width};
-  --bs-custom-file-border-color: #{$custom-file-border-color};
-  --bs-custom-file-border-radius: #{$custom-file-border-radius};
-  --bs-custom-file-box-shadow: #{$custom-file-box-shadow};
-  --bs-custom-file-button-color: #{$custom-file-button-color};
-  --bs-custom-file-button-bg: #{$custom-file-button-bg};
-  //--bs-custom-file-text: #{$custom-file-text}; //mapping doesn't work
-
-
-  // Form validation
-  --bs-form-feedback-margin-top: #{$form-feedback-margin-top};
-  --bs-form-feedback-font-size: #{$form-feedback-font-size};
-  --bs-form-feedback-valid-color: #{$form-feedback-valid-color};
-  --bs-form-feedback-invalid-color: #{$form-feedback-invalid-color};
-  --bs-form-feedback-icon-valid-color: #{$form-feedback-icon-valid-color};
-  --bs-form-feedback-icon-valid: #{$form-feedback-icon-valid};
-  --bs-form-feedback-icon-invalid-color: #{$form-feedback-icon-invalid-color};
-  --bs-form-feedback-icon-invalid: #{$form-feedback-icon-invalid};
-  // Z-index master list
-  //
-  // Warning: Avoid customizing these values. They're used for a bird's eye view
-  // of components dependent on the z-axis and are designed to all work together.
-  --bs-zindex-dropdown: #{$zindex-dropdown};
-  --bs-zindex-sticky: #{$zindex-sticky};
-  --bs-zindex-fixed: #{$zindex-fixed};
-  --bs-zindex-modal-backdrop: #{$zindex-modal-backdrop};
-  --bs-zindex-modal: #{$zindex-modal};
-  --bs-zindex-popover: #{$zindex-popover};
-  --bs-zindex-tooltip: #{$zindex-tooltip};
-
-
-  // Navs
-  --bs-nav-link-padding-y: #{$nav-link-padding-y};
-  --bs-nav-link-padding-x: #{$nav-link-padding-x};
-  --bs-nav-link-disabled-color: #{$nav-link-disabled-color};
-  --bs-nav-tabs-border-color: #{$nav-tabs-border-color};
-  --bs-nav-tabs-border-width: #{$nav-tabs-border-width};
-  --bs-nav-tabs-border-radius: #{$nav-tabs-border-radius};
-  --bs-nav-tabs-link-hover-border-color: #{$nav-tabs-link-hover-border-color};
-  --bs-nav-tabs-link-active-color: #{$nav-tabs-link-active-color};
-  --bs-nav-tabs-link-active-bg: #{$nav-tabs-link-active-bg};
-  --bs-nav-tabs-link-active-border-color: #{$nav-tabs-link-active-border-color};
-  --bs-nav-pills-border-radius: #{$nav-pills-border-radius};
-  --bs-nav-pills-link-active-color: #{$nav-pills-link-active-color};
-  --bs-nav-pills-link-active-bg: #{$nav-pills-link-active-bg};
-  --bs-nav-divider-color: #{$nav-divider-color};
-  --bs-nav-divider-margin-y: #{$nav-divider-margin-y};
-
-
-  // Navbar
-  --bs-navbar-padding-y: #{$navbar-padding-y};
-  --bs-navbar-padding-x: #{$navbar-padding-x};
-  --bs-navbar-nav-link-padding-x: #{$navbar-nav-link-padding-x};
-  --bs-navbar-brand-font-size: #{$navbar-brand-font-size};
-  // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
-  --bs-nav-link-height: #{$nav-link-height};
-  --bs-navbar-brand-height: #{$navbar-brand-height};
-  --bs-navbar-brand-padding-y: #{$navbar-brand-padding-y};
-  --bs-navbar-toggler-padding-y: #{$navbar-toggler-padding-y};
-  --bs-navbar-toggler-padding-x: #{$navbar-toggler-padding-x};
-  --bs-navbar-toggler-font-size: #{$navbar-toggler-font-size};
-  --bs-navbar-toggler-border-radius: #{$navbar-toggler-border-radius};
-  --bs-navbar-dark-color: #{$navbar-dark-color};
-  --bs-navbar-dark-hover-color: #{$navbar-dark-hover-color};
-  --bs-navbar-dark-active-color: #{$navbar-dark-active-color};
-  --bs-navbar-dark-disabled-color: #{$navbar-dark-disabled-color};
-  --bs-navbar-dark-toggler-icon-bg: #{$navbar-dark-toggler-icon-bg};
-  --bs-navbar-dark-toggler-border-color: #{$navbar-dark-toggler-border-color};
-  --bs-navbar-light-color: #{$navbar-light-color};
-  --bs-navbar-light-hover-color: #{$navbar-light-hover-color};
-  --bs-navbar-light-active-color: #{$navbar-light-active-color};
-  --bs-navbar-light-disabled-color: #{$navbar-light-disabled-color};
-  --bs-navbar-light-toggler-icon-bg: #{$navbar-light-toggler-icon-bg};
-  --bs-navbar-light-toggler-border-color: #{$navbar-light-toggler-border-color};
-  --bs-navbar-light-brand-color: #{$navbar-light-brand-color};
-  --bs-navbar-light-brand-hover-color: #{$navbar-light-brand-hover-color};
-  --bs-navbar-dark-brand-color: #{$navbar-dark-brand-color};
-  --bs-navbar-dark-brand-hover-color: #{$navbar-dark-brand-hover-color};
-
-
-  // Dropdowns
-  //
-  // Dropdown menu container and contents.
-  --bs-dropdown-min-width: #{$dropdown-min-width};
-  --bs-dropdown-padding-y: #{$dropdown-padding-y};
-  --bs-dropdown-spacer: #{$dropdown-spacer};
-  --bs-dropdown-font-size: #{$dropdown-font-size};
-  --bs-dropdown-color: #{$dropdown-color};
-  --bs-dropdown-bg: #{$dropdown-bg};
-  --bs-dropdown-border-color: #{$dropdown-border-color};
-  --bs-dropdown-border-radius: #{$dropdown-border-radius};
-  --bs-dropdown-border-width: #{$dropdown-border-width};
-  --bs-dropdown-inner-border-radius: #{$dropdown-inner-border-radius};
-  --bs-dropdown-divider-bg: #{$dropdown-divider-bg};
-  --bs-dropdown-divider-margin-y: #{$dropdown-divider-margin-y};
-  --bs-dropdown-box-shadow: #{$dropdown-box-shadow};
-  --bs-dropdown-link-color: #{$dropdown-link-color};
-  --bs-dropdown-link-hover-color: #{$dropdown-link-hover-color};
-  --bs-dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
-  --bs-dropdown-link-active-color: #{$dropdown-link-active-color};
-  --bs-dropdown-link-active-bg: #{$dropdown-link-active-bg};
-  --bs-dropdown-link-disabled-color: #{$dropdown-link-disabled-color};
-  --bs-dropdown-item-padding-y: #{$dropdown-item-padding-y};
-  --bs-dropdown-item-padding-x: #{$dropdown-item-padding-x};
-  --bs-dropdown-header-color: #{$dropdown-header-color};
-
-
-  // Pagination
-  --bs-pagination-padding-y: #{$pagination-padding-y};
-  --bs-pagination-padding-x: #{$pagination-padding-x};
-  --bs-pagination-padding-y-sm: #{$pagination-padding-y-sm};
-  --bs-pagination-padding-x-sm: #{$pagination-padding-x-sm};
-  --bs-pagination-padding-y-lg: #{$pagination-padding-y-lg};
-  --bs-pagination-padding-x-lg: #{$pagination-padding-x-lg};
-  --bs-pagination-line-height: #{$pagination-line-height};
-  --bs-pagination-color: #{$pagination-color};
-  --bs-pagination-bg: #{$pagination-bg};
-  --bs-pagination-border-width: #{$pagination-border-width};
-  --bs-pagination-border-color: #{$pagination-border-color};
-  --bs-pagination-focus-box-shadow: #{$pagination-focus-box-shadow};
-  --bs-pagination-focus-outline: #{$pagination-focus-outline};
-  --bs-pagination-hover-color: #{$pagination-hover-color};
-  --bs-pagination-hover-bg: #{$pagination-hover-bg};
-  --bs-pagination-hover-border-color: #{$pagination-hover-border-color};
-  --bs-pagination-active-color: #{$pagination-active-color};
-  --bs-pagination-active-bg: #{$pagination-active-bg};
-  --bs-pagination-active-border-color: #{$pagination-active-border-color};
-  --bs-pagination-disabled-color: #{$pagination-disabled-color};
-  --bs-pagination-disabled-bg: #{$pagination-disabled-bg};
-  --bs-pagination-disabled-border-color: #{$pagination-disabled-border-color};
-
-
-  // Jumbotron
-  --bs-jumbotron-padding: #{$jumbotron-padding};
-  --bs-jumbotron-color: #{$jumbotron-color};
-  --bs-jumbotron-bg: #{$jumbotron-bg};
-
-
-  // Cards
-  --bs-card-spacer-y: #{$card-spacer-y};
-  --bs-card-spacer-x: #{$card-spacer-x};
-  --bs-card-border-width: #{$card-border-width};
-  --bs-card-border-radius: #{$card-border-radius};
-  --bs-card-border-color: #{$card-border-color};
-  --bs-card-inner-border-radius: #{$card-inner-border-radius};
-  --bs-card-cap-bg: #{$card-cap-bg};
-  --bs-card-cap-color: #{$card-cap-color};
-  --bs-card-color: #{$card-color};
-  --bs-card-bg: #{$card-bg};
-  --bs-card-img-overlay-padding: #{$card-img-overlay-padding};
-  --bs-card-group-margin: #{$card-group-margin};
-  --bs-card-deck-margin: #{$card-deck-margin};
-  --bs-card-columns-count: #{$card-columns-count};
-  --bs-card-columns-gap: #{$card-columns-gap};
-  --bs-card-columns-margin: #{$card-columns-margin};
-
-
-  // Tooltips
-  --bs-tooltip-font-size: #{$tooltip-font-size};
-  --bs-tooltip-max-width: #{$tooltip-max-width};
-  --bs-tooltip-color: #{$tooltip-color};
-  --bs-tooltip-bg: #{$tooltip-bg};
-  --bs-tooltip-border-radius: #{$tooltip-border-radius};
-  --bs-tooltip-opacity: #{$tooltip-opacity};
-  --bs-tooltip-padding-y: #{$tooltip-padding-y};
-  --bs-tooltip-padding-x: #{$tooltip-padding-x};
-  --bs-tooltip-margin: #{$tooltip-margin};
-  --bs-tooltip-arrow-width: #{$tooltip-arrow-width};
-  --bs-tooltip-arrow-height: #{$tooltip-arrow-height};
-  --bs-tooltip-arrow-color: #{$tooltip-arrow-color};
-
-  // Form tooltips must come after regular tooltips
-  --bs-form-feedback-tooltip-padding-y: #{$form-feedback-tooltip-padding-y};
-  --bs-form-feedback-tooltip-padding-x: #{$form-feedback-tooltip-padding-x};
-  --bs-form-feedback-tooltip-font-size: #{$form-feedback-tooltip-font-size};
-  --bs-form-feedback-tooltip-line-height: #{$form-feedback-tooltip-line-height};
-  --bs-form-feedback-tooltip-opacity: #{$form-feedback-tooltip-opacity};
-  --bs-form-feedback-tooltip-border-radius: #{$form-feedback-tooltip-border-radius};
-
-
-  // Popovers
-  --bs-popover-font-size: #{$popover-font-size};
-  --bs-popover-bg: #{$popover-bg};
-  --bs-popover-max-width: #{$popover-max-width};
-  --bs-popover-border-width: #{$popover-border-width};
-  --bs-popover-border-color: #{$popover-border-color};
-  --bs-popover-border-radius: #{$popover-border-radius};
-  --bs-popover-box-shadow: #{$popover-box-shadow};
-  --bs-popover-header-bg: #{$popover-header-bg};
-  --bs-popover-header-color: #{$popover-header-color};
-  --bs-popover-header-padding-y: #{$popover-header-padding-y};
-  --bs-popover-header-padding-x: #{$popover-header-padding-x};
-  --bs-popover-body-color: #{$popover-body-color};
-  --bs-popover-body-padding-y: #{$popover-body-padding-y};
-  --bs-popover-body-padding-x: #{$popover-body-padding-x};
-  --bs-popover-arrow-width: #{$popover-arrow-width};
-  --bs-popover-arrow-height: #{$popover-arrow-height};
-  --bs-popover-arrow-color: #{$popover-arrow-color};
-  --bs-popover-arrow-outer-color: #{$popover-arrow-outer-color};
-
-
-  // Toasts
-  --bs-toast-max-width: #{$toast-max-width};
-  --bs-toast-padding-x: #{$toast-padding-x};
-  --bs-toast-padding-y: #{$toast-padding-y};
-  --bs-toast-font-size: #{$toast-font-size};
-  --bs-toast-color: #{$toast-color};
-  --bs-toast-background-color: #{$toast-background-color};
-  --bs-toast-border-width: #{$toast-border-width};
-  --bs-toast-border-color: #{$toast-border-color};
-  --bs-toast-border-radius: #{$toast-border-radius};
-  --bs-toast-box-shadow: #{$toast-box-shadow};
-  --bs-toast-header-color: #{$toast-header-color};
-  --bs-toast-header-background-color: #{$toast-header-background-color};
-  --bs-toast-header-border-color: #{$toast-header-border-color};
-
-
-  // Badges
-  --bs-badge-font-size: #{$badge-font-size};
-  --bs-badge-font-weight: #{$badge-font-weight};
-  --bs-badge-padding-y: #{$badge-padding-y};
-  --bs-badge-padding-x: #{$badge-padding-x};
-  --bs-badge-border-radius: #{$badge-border-radius};
-  --bs-badge-transition: #{$badge-transition};
-  --bs-badge-focus-width: #{$badge-focus-width};
-  --bs-badge-pill-padding-x: #{$badge-pill-padding-x};
-  // Use a higher than normal value to ensure completely rounded edges when
-  // customizing padding or font-size on labels.
-  --bs-badge-pill-border-radius: #{$badge-pill-border-radius};
-
-
-  // Modals
-
-  // Padding applied to the modal body
-  --bs-modal-inner-padding: #{$modal-inner-padding};
-  --bs-modal-dialog-margin: #{$modal-dialog-margin};
-  --bs-modal-dialog-margin-y-sm-up: #{$modal-dialog-margin-y-sm-up};
-  --bs-modal-title-line-height: #{$modal-title-line-height};
-  --bs-modal-content-color: #{$modal-content-color};
-  --bs-modal-content-bg: #{$modal-content-bg};
-  --bs-modal-content-border-color: #{$modal-content-border-color};
-  --bs-modal-content-border-width: #{$modal-content-border-width};
-  --bs-modal-content-border-radius: #{$modal-content-border-radius};
-  --bs-modal-content-box-shadow-xs: #{$modal-content-box-shadow-xs};
-  --bs-modal-content-box-shadow-sm-up: #{$modal-content-box-shadow-sm-up};
-  --bs-modal-backdrop-bg: #{$modal-backdrop-bg};
-  --bs-modal-backdrop-opacity: #{$modal-backdrop-opacity};
-  --bs-modal-header-border-color: #{$modal-header-border-color};
-  --bs-modal-footer-border-color: #{$modal-footer-border-color};
-  --bs-modal-header-border-width: #{$modal-header-border-width};
-  --bs-modal-footer-border-width: #{$modal-footer-border-width};
-  --bs-modal-header-padding-y: #{$modal-header-padding-y};
-  --bs-modal-header-padding-x: #{$modal-header-padding-x};
-  --bs-modal-header-padding: #{$modal-header-padding};
-  --bs-modal-xl: #{$modal-xl};
-  --bs-modal-lg: #{$modal-lg};
-  --bs-modal-md: #{$modal-md};
-  --bs-modal-sm: #{$modal-sm};
-  --bs-modal-fade-transform: #{$modal-fade-transform};
-  --bs-modal-show-transform: #{$modal-show-transform};
-  --bs-modal-transition: #{$modal-transition};
-
+  // Bootstrap 5.x maps many SCSS variables to CSS variables (for example the color system)
+  // Default mappings: https://getbootstrap.com/docs/5.3/customize/css-variables/#default
+  // Any Bootstrap SCSS variables that are used  within DSpace should be exposed as CSS variable in this file.
+  // These are no longer "all" variables, but only the ones that are actually used in DSpace.
 
   // Alerts
   //
   // Define alert colors, border radius, and padding.
   --bs-alert-padding-y: #{$alert-padding-y};
   --bs-alert-padding-x: #{$alert-padding-x};
-  --bs-alert-margin-bottom: #{$alert-margin-bottom};
-  --bs-alert-border-radius: #{$alert-border-radius};
-  --bs-alert-link-font-weight: #{$alert-link-font-weight};
-  --bs-alert-border-width: #{$alert-border-width};
-  --bs-alert-bg-level: #{$alert-bg-level};
-  --bs-alert-border-level: #{$alert-border-level};
-  --bs-alert-color-level: #{$alert-color-level};
 
 
-  // Progress bars
-  --bs-progress-height: #{$progress-height};
-  --bs-progress-font-size: #{$progress-font-size};
-  --bs-progress-bg: #{$progress-bg};
-  --bs-progress-border-radius: #{$progress-border-radius};
-  --bs-progress-box-shadow: #{$progress-box-shadow};
-  --bs-progress-bar-color: #{$progress-bar-color};
-  --bs-progress-bar-bg: #{$progress-bar-bg};
-  --bs-progress-bar-animation-timing: #{$progress-bar-animation-timing};
-  --bs-progress-bar-transition: #{$progress-bar-transition};
+  // Cards
+  --bs-card-border-color: #{$card-border-color};
+  --bs-card-border-radius: #{$card-border-radius};
+  --bs-card-border-width: #{$card-border-width};
 
 
-  // List group
-  --bs-list-group-color: #{$list-group-color};
-  --bs-list-group-bg: #{$list-group-bg};
-  --bs-list-group-border-color: #{$list-group-border-color};
-  --bs-list-group-border-width: #{$list-group-border-width};
-  --bs-list-group-border-radius: #{$list-group-border-radius};
-  --bs-list-group-item-padding-y: #{$list-group-item-padding-y};
-  --bs-list-group-item-padding-x: #{$list-group-item-padding-x};
-  --bs-list-group-hover-bg: #{$list-group-hover-bg};
-  --bs-list-group-active-color: #{$list-group-active-color};
-  --bs-list-group-active-bg: #{$list-group-active-bg};
-  --bs-list-group-active-border-color: #{$list-group-active-border-color};
-  --bs-list-group-disabled-color: #{$list-group-disabled-color};
-  --bs-list-group-disabled-bg: #{$list-group-disabled-bg};
-  --bs-list-group-action-color: #{$list-group-action-color};
-  --bs-list-group-action-hover-color: #{$list-group-action-hover-color};
-  --bs-list-group-action-active-color: #{$list-group-action-active-color};
-  --bs-list-group-action-active-bg: #{$list-group-action-active-bg};
+
+  // Buttons
+  //
+  // For each of Bootstrap's buttons, define text, background, and border color.
+  --bs-btn-padding-y: #{$btn-padding-y};
+  --bs-btn-focus-box-shadow: #{$btn-focus-box-shadow};
+  --bs-btn-line-height: #{$btn-line-height};
+  --bs-btn-link-disabled-color: #{$btn-link-disabled-color};
 
 
-  // Image thumbnails
-  --bs-thumbnail-padding: #{$thumbnail-padding};
-  --bs-thumbnail-bg: #{$thumbnail-bg};
-  --bs-thumbnail-border-width: #{$thumbnail-border-width};
-  --bs-thumbnail-border-color: #{$thumbnail-border-color};
-  --bs-thumbnail-border-radius: #{$thumbnail-border-radius};
-  --bs-thumbnail-box-shadow: #{$thumbnail-box-shadow};
+  // Dropdowns
+  //
+  // Dropdown menu container and contents.
+  --bs-dropdown-border-color: #{$dropdown-border-color};
+  --bs-dropdown-border-width: #{$dropdown-border-width};
+  --bs-dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
+  --bs-dropdown-link-hover-color: #{$dropdown-link-hover-color};
 
 
-  // Figures
-  --bs-figure-caption-font-size: #{$figure-caption-font-size};
-  --bs-figure-caption-color: #{$figure-caption-color};
+  // Components
+  //
+  // Define common padding and border radius sizes and more.
+  --bs-small-font-size: #{$small-font-size};
+
+  // Tables
+  //
+  // Customizes the `.table` component with basic values, each used across all table variations.
+  --bs-table-accent-bg: #{$table-accent-bg};
+  --bs-table-bg: #{$table-bg};
+  --bs-table-border-color: #{$table-border-color};
+  --bs-table-color: #{$table-color};
 
 
-  // Breadcrumbs
-  --bs-breadcrumb-padding-y: #{$breadcrumb-padding-y};
-  --bs-breadcrumb-padding-x: #{$breadcrumb-padding-x};
-  --bs-breadcrumb-item-padding: #{$breadcrumb-item-padding};
-  --bs-breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom};
-  --bs-breadcrumb-bg: #{$breadcrumb-bg};
-  --bs-breadcrumb-divider-color: #{$breadcrumb-divider-color};
-  --bs-breadcrumb-active-color: #{$breadcrumb-active-color};
-  --bs-breadcrumb-divider: #{$breadcrumb-divider};
-  --bs-breadcrumb-border-radius: #{$breadcrumb-border-radius};
+  --bs-xl: #{map-get($grid-breakpoints, xl)};
+  --bs-md: #{map-get($grid-breakpoints, md)};
+  --bs-lg: #{map-get($grid-breakpoints, lg)};
+  --bs-sm: #{map-get($grid-breakpoints, sm)};
+
+  --bs-spacer: #{$spacer};
+
+  --bs-navbar-dark-active-color: #{$navbar-dark-active-color};
+  --bs-navbar-dark-color: #{$navbar-dark-color};
+
+  --bs-line-height-base: #{$line-height-base};
+
+  --bs-font-size-base: #{$font-size-base};
+  --bs-font-size-lg: #{$font-size-lg};
 
 
-  // Carousel
-  --bs-carousel-control-color: #{$carousel-control-color};
-  --bs-carousel-control-width: #{$carousel-control-width};
-  --bs-carousel-control-opacity: #{$carousel-control-opacity};
-  --bs-carousel-control-hover-opacity: #{$carousel-control-hover-opacity};
-  --bs-carousel-control-transition: #{$carousel-control-transition};
-  --bs-carousel-indicator-width: #{$carousel-indicator-width};
-  --bs-carousel-indicator-height: #{$carousel-indicator-height};
-  --bs-carousel-indicator-hit-area-height: #{$carousel-indicator-hit-area-height};
-  --bs-carousel-indicator-spacer: #{$carousel-indicator-spacer};
-  --bs-carousel-indicator-active-bg: #{$carousel-indicator-active-bg};
-  --bs-carousel-indicator-transition: #{$carousel-indicator-transition};
-  --bs-carousel-caption-width: #{$carousel-caption-width};
-  --bs-carousel-caption-color: #{$carousel-caption-color};
-  --bs-carousel-control-icon-width: #{$carousel-control-icon-width};
-  --bs-carousel-control-prev-icon-bg: #{$carousel-control-prev-icon-bg};
-  --bs-carousel-control-next-icon-bg: #{$carousel-control-next-icon-bg};
-  --bs-carousel-transition-duration: #{$carousel-transition-duration};
-  --bs-carousel-transition: #{$carousel-transition};
 
+  --bs-input-btn-border-width: #{$input-btn-border-width};
+  --bs-input-border-color: #{$input-border-color};
+  --bs-input-padding-y: #{$input-padding-y};
+  --bs-input-padding-x: #{$input-padding-x};
+  --bs-input-btn-focus-box-shadow: #{$input-btn-focus-box-shadow};
+  --bs-input-bg: #{$input-bg};
+  --bs-input-color: #{$input-color};
 
-  // Spinners
-  --bs-spinner-width: #{$spinner-width};
-  --bs-spinner-height: #{$spinner-height};
-  --bs-spinner-border-width: #{$spinner-border-width};
-  --bs-spinner-width-sm: #{$spinner-width-sm};
-  --bs-spinner-height-sm: #{$spinner-height-sm};
-  --bs-spinner-border-width-sm: #{$spinner-border-width-sm};
+  --bs-table-border-width: #{$table-border-width};
 
+  --bs-modal-sm: #{$modal-sm};
 
-  // Close
-  --bs-close-font-size: #{$close-font-size};
-  --bs-close-font-weight: #{$close-font-weight};
-  --bs-close-color: #{$close-color};
-  --bs-close-text-shadow: #{$close-text-shadow};
+  --bs-zindex-popover: #{$zindex-popover};
+  --bs-zindex-sticky: #{$zindex-sticky};
 
-
-  // Code
-  --bs-code-font-size: #{$code-font-size};
-  --bs-code-color: #{$code-color};
-  --bs-kbd-padding-y: #{$kbd-padding-y};
-  --bs-kbd-padding-x: #{$kbd-padding-x};
-  --bs-kbd-font-size: #{$kbd-font-size};
-  --bs-kbd-color: #{$kbd-color};
-  --bs-kbd-bg: #{$kbd-bg};
-  --bs-pre-color: #{$pre-color};
-  --bs-pre-scrollable-max-height: #{$pre-scrollable-max-height};
-
-
-  // Utilities
-  --bs-displays: #{$displays};
-  --bs-overflows: #{$overflows};
-  --bs-positions: #{$positions};
-
-
-  // Printing
-  --bs-print-page-size: #{$print-page-size};
-  --bs-print-body-min-width: #{$print-body-min-width};
+  --bs-border-radius-lg: #{$bs-border-radius-lg};
 
 }
+
+// Some Bootstrap CSS variables are tied to classes
+
+.accordion {
+  --bs-accordion-btn-bg: #{$light};
+}
+
+.table {
+  --bs-table-striped-bg: #{$light};
+}
+
+.btn-transparent  {
+  --bs-btn-box-shadow: none;
+  --bs-btn-focus-box-shadow: none;
+  --bs-btn-active-border-color: transparent;
+}
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 6bd2bef378..5bc8a54ae9 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -1,7 +1,7 @@
 :root {
   --ds-content-spacing: #{$spacer}; // equivalent to Bootstrap spaces of size 3
 
-  --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2)};
+    --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem(calc($input-btn-border-width*2))};
 
   --ds-card-height-percentage:98%;
   --ds-card-thumbnail-height:240px;
@@ -21,6 +21,8 @@
   --ds-sidebar-z-index: 20;
 
   --ds-header-bg: #{$ds-header-bg};
+  --ds-header-logo-height: 50px;
+  --ds-header-logo-height-xs: 50px;
   --ds-header-icon-color: #{$ds-header-icon-color};
   --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
 
@@ -92,7 +94,7 @@
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
 
   --ds-top-footer-bg: #{$gray-200};
-  --ds-footer-bg: #{theme-color('primary')};
+    --ds-footer-bg: #{$primary};
   --ds-footer-border: 1px solid var(--bs-gray-400);
   --ds-footer-padding: 0;
   --ds-footer-padding-bottom: 0;
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index b1a6c62bee..5fc005c797 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -125,11 +125,11 @@ ngb-modal-backdrop {
 }
 
 /* Complement .space-children-mr when spaced elements are not on the same level */
-.mr-gap {
+.me-gap {
     margin-right: var(--ds-gap);
 }
 
-.ml-gap {
+.ms-gap {
     margin-left: var(--ds-gap);
 }
 
@@ -238,27 +238,27 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-validation {
-    background-color: #{map-get($theme-colors, warning)};
+  background-color: #{$warning};
 }
 
 .badge-waiting-controller {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .badge-workspace {
-    background-color: #{map-get($theme-colors, primary)};
+  background-color: #{$primary};
 }
 
 .badge-archived {
-    background-color: darken($green, 25);
+  background-color: #{$success};
 }
 
 .badge-workflow {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .badge-item-type {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .visually-hidden {
@@ -482,6 +482,60 @@ ngb-accordion {
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
 .my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
 
+/* form-check-input Changed from Bootstrap 5's form-check-input to ensure that we keep the default checkboxes */
+.form-check-input {
+  border-color: unset;
+  appearance: auto; /* Reset to browser's default appearance */
+}
+
+/* Custom fas font-family; Makes it so that BootStrap classes don't override it (Typically used for icons) */
+.btn.fas {
+  font-family: $icon-font-family;
+}
+
+/* btn-close Changed from Bootstrap 5's .btn-close to ensure the button close button has the original size */
+.btn-close {
+  transform: scale(0.6);
+}
+
+/* Make sure every element of a single drag-item is on the same line */
+.drag-item-container > * {
+  width: auto;
+}
+
+
+.btn.btn-success {
+  color: #fff;
+}
+
+.btn.btn-success:hover {
+  color: #fff;
+}
+
+.table {
+  --bs-table-accent-bg: #fff;
+}
+
+ngb-tooltip-window {
+  margin-bottom: 0.25rem !important;
+  &> .tooltip-inner > .text-muted {
+    color: #{$gray-600} !important;
+  }
+}
+
+.table thead th {
+  border-bottom: 2px solid #{$gray-300};
+  border-top: 1px solid #{$gray-300};
+}
+
+.custom-alignment {
+  --bs-gutter-x: 1.5rem;
+  --bs-gutter-y: 0;
+  width: 100%;
+  padding-right: calc(var(--bs-gutter-x) * 0.5);
+  padding-left: calc(var(--bs-gutter-x) * 0.5);
+}
+
 
 .link-contrast {
   // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
index badc159747..7a321c9364 100644
--- a/src/styles/_variables.scss
+++ b/src/styles/_variables.scss
@@ -1,5 +1,7 @@
-@import '_functions.scss';
+@import './functions.scss';
 @import '../../node_modules/bootstrap/scss/functions.scss';
 
-@import '_bootstrap_variables.scss';
+@import './bootstrap_variables.scss';
 @import '../../node_modules/bootstrap/scss/variables.scss';
+
+$theme-colors: map-merge($theme-colors, $global-custom-semantic-colors);
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
index 54044f5d79..b2831d5c33 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a13be63880..e75cf05c5a 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -1,12 +1,11 @@
 <div>
     <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <h3 class="position-relative py-1 my-3 fw-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 664aef95c0..6fc90cbf2d 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
index 54044f5d79..b2831d5c33 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
index 54044f5d79..b2831d5c33 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..6dafc18209 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index f1387aa619..1ded6bbb60 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -15,15 +15,19 @@
 // $red:    #CF4444 !default;
 // $dark:   darken($blue, 17%) !default;
 //
-// $theme-colors: (
-//   primary: $blue,
-//   secondary: $gray-700,
-//   success: $green,
-//   info: $cyan,
-//   warning: $yellow,
-//   danger: $red,
-//   light: $gray-100,
-//   dark: $dark
-// ) !default;
+// $primary: $blue !default;
+// $secondary: $gray-700 !default;
+// $success: $green !default;
+// $info: $cyan !default;
+// $warning: $yellow !default;
+// $danger: $red !default;
+// $light: $gray-100 !default;
+// $dark: $dark !default;
 //
-// $link-color: map-get($theme-colors, info) !default;
+// $link-color: $info !default;
+
+// Add new semantic colors here (you don't need to add existing semantic colors)
+@import '../../../styles/_variables.scss';
+$theme-custom-semantic-colors: (
+);
+$theme-colors: map-merge($theme-colors, $theme-custom-semantic-colors);
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index e78d19053d..27a506eb19 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -13,7 +13,7 @@
       </nav>
     </div>
     <!-- Search bar and other menus -->
-    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ms-auto">
       <ds-search-navbar></ds-search-navbar>
       <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
         <ds-lang-switch></ds-lang-switch>
@@ -22,13 +22,12 @@
         <ds-auth-nav-menu></ds-auth-nav-menu>
       </div>
 
-      <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
-        <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
+      <div id="mobile-navbar-toggler" class="d-block d-lg-none ms-3" *ngIf="(isMobile$ | async)">
+        <button id="navbar-toggler" class="btn btn-transparent" type="button" (click)="toggleNavbar()"
                 [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
           <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
         </button>
       </div>
-
     </div>
   </div>
 </header>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index ca053fc662..a29239dff1 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -1,9 +1,9 @@
 <div class="background-image-container mt-ncs">
   <div class="container">
-    <div class="jumbotron jumbotron-fluid">
+    <div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
       <div class="d-flex flex-wrap">
         <div>
-          <h1 class="display-3">DSpace 9</h1>
+          <h1 class="display-2">DSpace 9</h1>
           <p class="lead">DSpace is the world leading open source repository platform that enables
             organisations to:</p>
         </div>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index d00b0ec959..ba9d31a85b 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -65,7 +65,7 @@
   a {
     color: var(--ds-home-news-link-color);
 
-    @include hover {
+    &:hover {
       color: var(--ds-home-news-link-hover-color);
     }
   }
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index d225819326..ffca3cda13 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -13,7 +13,7 @@
     padding-bottom: 0.5rem !important;
   }
 
-  .badge-secondary {
+  .bg-secondary {
     background-color: var(--bs-primary);
   }
 
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 9fcb540ab6..8bce1c4a61 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -44,9 +44,6 @@ $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI"
 //$teal:    #20c997 !default;
 //$cyan:    #17a2b8 !default;
 
-// Define or override other colors here
-// ...
-
 // Override semantic colors here
 $primary:   #43515f;  // Gray
 $secondary: #495057;  // As Bootstrap $gray-700
@@ -55,18 +52,15 @@ $info:      #1e6f90;  // Light blue
 $warning:   #ec9433;  // Orange
 $danger:    #cf4444;  // Red
 $light:     #f8f9fa;  // As Bootstrap $gray-100
-$dark:      #43515f;  // Gray
+$dark:      #43515f;  // Dark blue
 
 // Add new semantic colors here (you don't need to add existing semantic colors)
-$theme-colors: (
-  // ...
+$theme-custom-semantic-colors: (
 );
 
-
 /*** OTHER BOOTSTRAP VARIABLES ***/
 
-// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold: 170;
+$min-contrast-ratio: 2.06 !default;
 
 $body-color: #343a40;       // As Bootstrap $gray-800
 
diff --git a/src/themes/dspace/styles/theme.scss b/src/themes/dspace/styles/theme.scss
index 05c96f3372..dfa8274cf6 100644
--- a/src/themes/dspace/styles/theme.scss
+++ b/src/themes/dspace/styles/theme.scss
@@ -2,6 +2,9 @@
 
 @import './_theme_sass_variable_overrides.scss';
 @import '../../../styles/_variables.scss';
+
+$theme-colors: map-merge($theme-colors, $theme-custom-semantic-colors);
+
 @import '../../../styles/_mixins.scss';
 @import '../../../styles/helpers/font_awesome_imports.scss';
 @import '../../../styles/_vendor.scss';
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 8d433edf39..b1c42df8ad 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -66,10 +66,6 @@ const SCSS_LOADERS = [
     loader: 'sass-loader',
     options: {
       sourceMap: true,
-      // sass >1.33 complains about deprecation warnings in Bootstrap 4
-      // After upgrading to Angular 12 we need to explicitly use an older version here
-      // todo: remove after upgrading to Bootstrap 5
-      implementation: sass,
       sassOptions: {
         includePaths: [projectRoot('./')]
       }

From 16eb620f4f7e101d3bf8628c7070436858b8f88f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 08:59:24 +0100
Subject: [PATCH 1250/1286] 120243: ng update @angular-eslint/schematics

---
 package-lock.json | 915 +++++++++++++++++++++-------------------------
 package.json      |  16 +-
 2 files changed, 415 insertions(+), 516 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1f35dd217..de3f0f2600 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,13 +80,13 @@
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
         "@angular-devkit/build-angular": "^17.3.11",
-        "@angular-eslint/builder": "^17.5.3",
-        "@angular-eslint/bundled-angular-compiler": "^17.5.3",
-        "@angular-eslint/eslint-plugin": "^17.5.3",
-        "@angular-eslint/eslint-plugin-template": "^17.5.3",
-        "@angular-eslint/schematics": "^17.5.3",
-        "@angular-eslint/template-parser": "^17.5.3",
-        "@angular-eslint/utils": "^17.5.3",
+        "@angular-eslint/builder": "^18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "^18.4.1",
+        "@angular-eslint/eslint-plugin": "^18.4.1",
+        "@angular-eslint/eslint-plugin-template": "^18.4.1",
+        "@angular-eslint/schematics": "^18.4.1",
+        "@angular-eslint/template-parser": "^18.4.1",
+        "@angular-eslint/utils": "^18.4.1",
         "@angular/cli": "^17.3.11",
         "@angular/compiler-cli": "^17.3.11",
         "@angular/language-service": "^17.3.12",
@@ -189,6 +189,33 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       }
     },
+    "node_modules/@angular-builders/common/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@angular-builders/common/node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -252,6 +279,33 @@
         "@angular/compiler-cli": "^17.0.0"
       }
     },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@angular-devkit/architect": {
       "version": "0.1703.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
@@ -267,6 +321,33 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "17.3.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz",
@@ -396,6 +477,55 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
       "version": "7.24.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
@@ -1388,20 +1518,21 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
+      "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
         "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
@@ -1414,408 +1545,212 @@
         }
       }
     },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
-      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.8",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@angular-devkit/core/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz",
+      "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@angular-devkit/core": "18.2.12",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.11",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "peer": true
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/magic-string": {
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0"
+      }
+    },
     "node_modules/@angular-eslint/builder": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.5.3.tgz",
-      "integrity": "sha512-DoPCwt8qp5oMkfxY8V3wygf6/E7zzgXkPCwTRhIelklfpB3nYwLnbRSD8G5hueAU4eyASKiIuhR79E996AuUSw==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.1.tgz",
+      "integrity": "sha512-Ofkwd9Rg52K+AgvnV1RXYXVBGJvl5jD7+4dqwoprqXG7YKNTdHy5vqNZ5XDSMb26qjoZF7JC+IKruKFaON/ZaA==",
       "dev": true,
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.5.3.tgz",
-      "integrity": "sha512-x9jZ6mME9wxumErPGonWERXX/9TJ7mzEkQhOKt3BxBFm0sy9XQqLMAenp1PBSg3RF3rH7EEVdB2+jb75RtHp0g==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.1.tgz",
+      "integrity": "sha512-gCQC0mgBO1bwHDXL9CUgHW+Rf1XGZCLAopoXnggwxGkBCx+oww507t+jrSOxdh+4OTKU4ZfmbtWd7Y8AeXns8w==",
       "dev": true
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.5.3.tgz",
-      "integrity": "sha512-2gMRZ+SkiygrPDtCJwMfjmwIFOcvxxC4NRX/MqRo6udsa0gtqPrc8acRbwrmAXlullmhzmaeUfkHpGDSzW8pFw==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.1.tgz",
+      "integrity": "sha512-FoHwj+AFo8ONKb8wEK5qpo6uefuyklZlDqErJxeC3fpNIJzDe8PWBcJsuZt7Wwm/HeggWgt0Au6h+3IEa0V3BQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@angular-eslint/utils": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.1",
+        "@angular-eslint/utils": "18.4.1"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.5.3.tgz",
-      "integrity": "sha512-RkRFagxqBPV2xdNyeQQROUm6I1Izto1Z3Wy73lCk2zq1RhVgbznniH/epmOIE8PMkHmMKmZ765FV++J/90p4Ig==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.1.tgz",
+      "integrity": "sha512-sofnKpi6wOZ6avVfYYqB7sCgGgWF2HgCZfW+IAp1MtVD2FBa1zTSbbfIZ1I8Akpd22UXa4LKJd0TLwm5XHHkiQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@angular-eslint/utils": "17.5.3",
-        "@typescript-eslint/type-utils": "7.11.0",
-        "@typescript-eslint/utils": "7.11.0",
-        "aria-query": "5.3.0",
-        "axobject-query": "4.0.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.1",
+        "@angular-eslint/utils": "18.4.1",
+        "aria-query": "5.3.2",
+        "axobject-query": "4.1.0"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/types": "^7.11.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@angular-eslint/schematics": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.5.3.tgz",
-      "integrity": "sha512-a0MlOjNLIM18l/66S+CzhANQR3QH3jDUa1MC50E4KBf1mwjQyfqd6RdfbOTMDjgFlPrfB+5JvoWOHHGj7FFM1A==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.1.tgz",
+      "integrity": "sha512-1+gGodwh+UevtEx9mzZbzP1uY/9NAGEbsn8jisG1TEPDby2wKScQj6U6JwGxoW/Dd/4SIeSdilruZPALkqha7g==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "17.5.3",
-        "@angular-eslint/eslint-plugin-template": "17.5.3",
-        "ignore": "5.3.1",
-        "strip-json-comments": "3.1.1",
-        "tmp": "0.2.3"
+        "@angular-eslint/eslint-plugin": "18.4.1",
+        "@angular-eslint/eslint-plugin-template": "18.4.1",
+        "ignore": "6.0.2",
+        "semver": "7.6.3",
+        "strip-json-comments": "3.1.1"
       },
       "peerDependencies": {
-        "@angular/cli": ">= 17.0.0 < 18.0.0"
+        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
+        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0"
+      }
+    },
+    "node_modules/@angular-eslint/schematics/node_modules/ignore": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@angular-eslint/schematics/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.5.3.tgz",
-      "integrity": "sha512-NYybOsMkJUtFOW2JWALicipq0kK5+jGwA1MYyRoXjdbDlXltHUb9qkXj7p0fE6uRutBGXDl4288s8g/fZCnAIA==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.1.tgz",
+      "integrity": "sha512-LsStXVyso/89gQU5eiJebB/b1j+wrRtTLjk+ODVUTa7NGCCT7B7xI6ToTchkBEpSTHLT9pEQXHsHer3FymsQRQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "eslint-scope": "^8.0.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.1",
+        "eslint-scope": "^8.0.2"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/utils": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
-      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
+      "version": "18.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.1.tgz",
+      "integrity": "sha512-F5UGE1J/CRmTbl8vjexQRwRglNqnJwdXCUejaG+qlGssSHoWcRB+ubbR/na3PdnzeJdBE6DkLYElXnOQZ6YKfg==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.1"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@angular/animations": {
       "version": "17.3.12",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
@@ -1880,6 +1815,51 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
+      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.11",
+        "jsonc-parser": "3.2.1",
+        "magic-string": "0.30.8",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
     "node_modules/@angular/common": {
       "version": "17.3.12",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
@@ -5260,9 +5240,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
@@ -6568,6 +6548,51 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
+      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.11",
+        "jsonc-parser": "3.2.1",
+        "magic-string": "0.30.8",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
     "node_modules/@sigstore/bundle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
@@ -7390,130 +7415,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz",
-      "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.11.0",
-        "@typescript-eslint/utils": "7.11.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
@@ -8113,12 +8014,12 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria-query": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "dev": true,
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/array-buffer-byte-length": {
@@ -8393,12 +8294,12 @@
       }
     },
     "node_modules/axobject-query": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
-      "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/babel-loader": {
@@ -10768,15 +10669,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -12101,9 +11993,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz",
-      "integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -12736,6 +12628,13 @@
         "node": ">=10.0"
       }
     },
+    "node_modules/fast-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
diff --git a/package.json b/package.json
index 3171f40369..d1c5a97e0e 100644
--- a/package.json
+++ b/package.json
@@ -169,13 +169,13 @@
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
     "@angular-devkit/build-angular": "^17.3.11",
-    "@angular-eslint/builder": "^17.5.3",
-    "@angular-eslint/bundled-angular-compiler": "^17.5.3",
-    "@angular-eslint/eslint-plugin": "^17.5.3",
-    "@angular-eslint/eslint-plugin-template": "^17.5.3",
-    "@angular-eslint/schematics": "^17.5.3",
-    "@angular-eslint/template-parser": "^17.5.3",
-    "@angular-eslint/utils": "^17.5.3",
+    "@angular-eslint/builder": "^18.4.1",
+    "@angular-eslint/bundled-angular-compiler": "^18.4.1",
+    "@angular-eslint/eslint-plugin": "^18.4.1",
+    "@angular-eslint/eslint-plugin-template": "^18.4.1",
+    "@angular-eslint/schematics": "^18.4.1",
+    "@angular-eslint/template-parser": "^18.4.1",
+    "@angular-eslint/utils": "^18.4.1",
     "@angular/cli": "^17.3.11",
     "@angular/compiler-cli": "^17.3.11",
     "@angular/language-service": "^17.3.12",
@@ -241,4 +241,4 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
-}
+}
\ No newline at end of file

From 5e7b066af132a6f131855d958c79a781d87166e4 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 09:25:25 +0100
Subject: [PATCH 1251/1286] 120243: ng update @angular/core @angular/cli
 --force

---
 package-lock.json                             | 8862 +++++++++++++----
 package.json                                  |   36 +-
 .../filtered-collections.component.spec.ts    |   28 +-
 src/app/core/auth/auth.interceptor.spec.ts    |   23 +-
 src/app/core/auth/auth.interceptor.ts         |   11 +-
 .../auth/server-auth-request.service.spec.ts  |    6 +-
 .../core/auth/server-auth-request.service.ts  |    6 +-
 .../core/data/eperson-registration.service.ts |    5 +-
 src/app/core/data/identifier-data.service.ts  |    6 +-
 .../dspace-rest/dspace-rest.service.spec.ts   |   16 +-
 .../core/dspace-rest/dspace-rest.service.ts   |    8 +-
 .../forward-client-ip.interceptor.spec.ts     |   23 +-
 .../forward-client-ip.interceptor.ts          |    7 +-
 .../core/locale/locale.interceptor.spec.ts    |   23 +-
 src/app/core/locale/locale.interceptor.ts     |    7 +-
 src/app/core/log/log.interceptor.spec.ts      |   26 +-
 src/app/core/log/log.interceptor.ts           |    7 +-
 .../quality-assurance-event-data.service.ts   |    5 +-
 .../researcher-profile-data.service.spec.ts   |    5 +-
 .../workspaceitem-data.service.spec.ts        |    5 +-
 .../submission/workspaceitem-data.service.ts  |    5 +-
 .../core/xsrf/browser-xsrf.service.spec.ts    |   13 +-
 src/app/core/xsrf/xsrf.interceptor.spec.ts    |   27 +-
 src/app/core/xsrf/xsrf.interceptor.ts         |   10 +-
 .../lang-switch/lang-switch.component.spec.ts |   42 +-
 .../endpoint-mocking-rest.service.spec.ts     |    5 +-
 .../endpoint-mocking-rest.service.ts          |    5 +-
 src/modules/app/browser-app.config.ts         |    6 +-
 src/themes/custom/lazy-theme.module.ts        |   33 +-
 src/themes/dspace/lazy-theme.module.ts        |   30 +-
 tsconfig.json                                 |    3 +-
 31 files changed, 6948 insertions(+), 2346 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de3f0f2600..a3bf97cfcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,19 +9,19 @@
       "version": "9.0.0-next",
       "hasInstallScript": true,
       "dependencies": {
-        "@angular/animations": "^17.3.12",
+        "@angular/animations": "^18.2.12",
         "@angular/cdk": "^17.3.10",
-        "@angular/common": "^17.3.12",
-        "@angular/compiler": "^17.3.12",
-        "@angular/core": "^17.3.12",
-        "@angular/forms": "^17.3.12",
-        "@angular/localize": "^17.3.12",
-        "@angular/platform-browser": "^17.3.12",
-        "@angular/platform-browser-dynamic": "^17.3.12",
-        "@angular/platform-server": "^17.3.12",
-        "@angular/router": "^17.3.12",
-        "@angular/ssr": "^17.3.11",
-        "@babel/runtime": "7.26.7",
+        "@angular/common": "^18.2.12",
+        "@angular/compiler": "^18.2.12",
+        "@angular/core": "^18.2.12",
+        "@angular/forms": "^18.2.12",
+        "@angular/localize": "^18.2.12",
+        "@angular/platform-browser": "^18.2.12",
+        "@angular/platform-browser-dynamic": "^18.2.12",
+        "@angular/platform-server": "^18.2.12",
+        "@angular/router": "^18.2.12",
+        "@angular/ssr": "^18.2.12",
+        "@babel/runtime": "7.26.0",
         "@kolkov/ngx-gallery": "^2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^12.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
@@ -32,34 +32,35 @@
         "@ngx-translate/core": "^14.0.0",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
-        "axios": "^1.7.9",
+        "axios": "^1.7.4",
         "bootstrap": "^5.3",
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
-        "compression": "^1.7.5",
+        "compression": "^1.7.4",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.40.0",
+        "core-js": "^3.38.1",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.21.2",
+        "express": "^4.21.1",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
-        "isbot": "^5.1.22",
+        "isbot": "^5.1.17",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
-        "jsonschema": "1.5.0",
+        "jsonschema": "1.4.1",
         "jwt-decode": "^3.1.2",
+        "klaro": "^0.7.18",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
-        "mirador": "^3.4.3",
+        "mirador": "^3.3.0",
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
@@ -67,10 +68,8 @@
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^16.0.0",
         "ngx-pagination": "6.0.3",
-        "ngx-skeleton-loader": "^9.0.0",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
-        "orejime": "^2.3.1",
         "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
@@ -79,7 +78,7 @@
       },
       "devDependencies": {
         "@angular-builders/custom-webpack": "~17.0.2",
-        "@angular-devkit/build-angular": "^17.3.11",
+        "@angular-devkit/build-angular": "^18.2.12",
         "@angular-eslint/builder": "^18.4.1",
         "@angular-eslint/bundled-angular-compiler": "^18.4.1",
         "@angular-eslint/eslint-plugin": "^18.4.1",
@@ -87,11 +86,11 @@
         "@angular-eslint/schematics": "^18.4.1",
         "@angular-eslint/template-parser": "^18.4.1",
         "@angular-eslint/utils": "^18.4.1",
-        "@angular/cli": "^17.3.11",
-        "@angular/compiler-cli": "^17.3.11",
-        "@angular/language-service": "^17.3.12",
+        "@angular/cli": "^18.2.12",
+        "@angular/compiler-cli": "^18.2.12",
+        "@angular/language-service": "^18.2.12",
         "@cypress/schematic": "^1.5.0",
-        "@fortawesome/fontawesome-free": "^6.7.2",
+        "@fortawesome/fontawesome-free": "^6.6.0",
         "@ngrx/store-devtools": "^17.1.1",
         "@ngtools/webpack": "^16.2.16",
         "@types/deep-freeze": "0.1.5",
@@ -100,7 +99,7 @@
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.15",
+        "@types/lodash": "^4.17.12",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -110,8 +109,8 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.17.0",
-        "cypress-axe": "^1.6.0",
+        "cypress": "^13.15.1",
+        "cypress-axe": "^1.5.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
         "eslint-plugin-deprecation": "^1.4.1",
@@ -120,12 +119,12 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
-        "eslint-plugin-jsonc": "^2.19.1",
+        "eslint-plugin-jsonc": "^2.6.0",
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.2.0",
-        "express-static-gzip": "^2.2.0",
+        "express-static-gzip": "^2.1.8",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
@@ -135,20 +134,20 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
-        "ng-mocks": "^14.13.2",
+        "ng-mocks": "^14.13.1",
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
-        "postcss": "^8.5",
+        "postcss": "^8.4",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.84.0",
+        "sass": "~1.80.4",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.97.1",
+        "webpack": "5.95.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -279,76 +278,7 @@
         "@angular/compiler-cli": "^17.0.0"
       }
     },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
-      "integrity": "sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/build-angular": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/build-angular": {
       "version": "17.3.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz",
       "integrity": "sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==",
@@ -477,7 +407,23 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.11.tgz",
+      "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^17.0.0",
+        "typescript": ">=5.2 <5.5",
+        "webpack": "^5.54.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/core": {
       "version": "17.3.11",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
       "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
@@ -504,29 +450,502 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/animations": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
+      "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "tslib": "^2.3.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/common": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
+      "integrity": "sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.12",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/compiler": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.12.tgz",
+      "integrity": "sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "17.3.12"
+      },
+      "peerDependenciesMeta": {
+        "@angular/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/core": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.12.tgz",
+      "integrity": "sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.14.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.12.tgz",
+      "integrity": "sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "7.23.9",
+        "@types/babel__core": "7.20.5",
+        "fast-glob": "3.3.2",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "localize-extract": "tools/bundles/src/extract/cli.js",
+        "localize-migrate": "tools/bundles/src/migrate/cli.js",
+        "localize-translate": "tools/bundles/src/translate/cli.js"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "17.3.12",
+        "@angular/compiler-cli": "17.3.12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize/node_modules/@babel/core": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
+      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.23.5",
+        "@babel/generator": "^7.23.6",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@babel/template": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/platform-browser": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz",
+      "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "17.3.12",
+        "@angular/common": "17.3.12",
+        "@angular/core": "17.3.12"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/platform-server": {
+      "version": "17.3.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz",
+      "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0",
+        "xhr2": "^0.2.0"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "17.3.12",
+        "@angular/common": "17.3.12",
+        "@angular/compiler": "17.3.12",
+        "@angular/core": "17.3.12",
+        "@angular/platform-browser": "17.3.12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.23.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
+      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
+      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.20"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
+      "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.8",
+        "babel-plugin-polyfill-corejs3": "^0.9.0",
+        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
+      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "core-js-compat": "^3.34.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
+      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env": {
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
+      "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.23.5",
+        "@babel/helper-compilation-targets": "^7.23.6",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.23.3",
+        "@babel/plugin-syntax-import-attributes": "^7.23.3",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.23.3",
+        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
+        "@babel/plugin-transform-async-to-generator": "^7.23.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
+        "@babel/plugin-transform-block-scoping": "^7.23.4",
+        "@babel/plugin-transform-class-properties": "^7.23.3",
+        "@babel/plugin-transform-class-static-block": "^7.23.4",
+        "@babel/plugin-transform-classes": "^7.23.8",
+        "@babel/plugin-transform-computed-properties": "^7.23.3",
+        "@babel/plugin-transform-destructuring": "^7.23.3",
+        "@babel/plugin-transform-dotall-regex": "^7.23.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
+        "@babel/plugin-transform-dynamic-import": "^7.23.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+        "@babel/plugin-transform-for-of": "^7.23.6",
+        "@babel/plugin-transform-function-name": "^7.23.3",
+        "@babel/plugin-transform-json-strings": "^7.23.4",
+        "@babel/plugin-transform-literals": "^7.23.3",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
+        "@babel/plugin-transform-modules-amd": "^7.23.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
+        "@babel/plugin-transform-modules-umd": "^7.23.3",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.23.3",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+        "@babel/plugin-transform-numeric-separator": "^7.23.4",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.0",
+        "@babel/plugin-transform-object-super": "^7.23.3",
+        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
+        "@babel/plugin-transform-optional-chaining": "^7.23.4",
+        "@babel/plugin-transform-parameters": "^7.23.3",
+        "@babel/plugin-transform-private-methods": "^7.23.3",
+        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
+        "@babel/plugin-transform-property-literals": "^7.23.3",
+        "@babel/plugin-transform-regenerator": "^7.23.3",
+        "@babel/plugin-transform-reserved-words": "^7.23.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
+        "@babel/plugin-transform-spread": "^7.23.3",
+        "@babel/plugin-transform-sticky-regex": "^7.23.3",
+        "@babel/plugin-transform-template-literals": "^7.23.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
+        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
+        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-regex": "^7.23.3",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.8",
+        "babel-plugin-polyfill-corejs3": "^0.9.0",
+        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "core-js-compat": "^3.31.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
+      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "core-js-compat": "^3.34.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
+      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.5.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
+      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/runtime": {
       "version": "7.24.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
       "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
@@ -538,10 +957,10 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
+      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
       "cpu": [
         "ppc64"
       ],
@@ -554,10 +973,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
+      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
       "cpu": [
         "arm"
       ],
@@ -570,10 +989,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
+      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
       "cpu": [
         "arm64"
       ],
@@ -586,10 +1005,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
+      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
       "cpu": [
         "x64"
       ],
@@ -602,10 +1021,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
+      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
       "cpu": [
         "arm64"
       ],
@@ -618,10 +1037,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
+      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
       "cpu": [
         "x64"
       ],
@@ -634,10 +1053,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
+      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
       "cpu": [
         "arm64"
       ],
@@ -650,10 +1069,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
+      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
       "cpu": [
         "x64"
       ],
@@ -666,10 +1085,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
+      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
       "cpu": [
         "arm"
       ],
@@ -682,10 +1101,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
+      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
       "cpu": [
         "arm64"
       ],
@@ -698,10 +1117,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
+      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
       "cpu": [
         "ia32"
       ],
@@ -714,10 +1133,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
+      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
       "cpu": [
         "loong64"
       ],
@@ -730,10 +1149,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
+      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
       "cpu": [
         "mips64el"
       ],
@@ -746,10 +1165,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
+      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
       "cpu": [
         "ppc64"
       ],
@@ -762,10 +1181,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
+      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
       "cpu": [
         "riscv64"
       ],
@@ -778,10 +1197,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
+      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
       "cpu": [
         "s390x"
       ],
@@ -794,10 +1213,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
       "cpu": [
         "x64"
       ],
@@ -810,10 +1229,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
       "cpu": [
         "x64"
       ],
@@ -826,10 +1245,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
       "cpu": [
         "x64"
       ],
@@ -842,10 +1261,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
+      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
       "cpu": [
         "x64"
       ],
@@ -858,10 +1277,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
+      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
       "cpu": [
         "arm64"
       ],
@@ -874,10 +1293,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
+      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
       "cpu": [
         "ia32"
       ],
@@ -890,10 +1309,10 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
+      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
       "cpu": [
         "x64"
       ],
@@ -906,34 +1325,18 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.11.tgz",
-      "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==",
-      "dev": true,
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0",
-        "typescript": ">=5.2 <5.5",
-        "webpack": "^5.54.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
-      "version": "22.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
-      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/@types/node": {
+      "version": "22.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
       "dev": true,
       "optional": true,
       "peer": true,
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.19.8"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@vitejs/plugin-basic-ssl": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
       "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
@@ -945,32 +1348,56 @@
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
@@ -979,7 +1406,15 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/copy-webpack-plugin": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/copy-webpack-plugin": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
       "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
@@ -1003,33 +1438,108 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+    "node_modules/@angular-builders/custom-webpack/node_modules/critters": {
+      "version": "0.0.22",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
+      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
       "dev": true,
       "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
+        "chalk": "^4.1.0",
+        "css-select": "^5.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.2",
+        "htmlparser2": "^8.0.2",
+        "postcss": "^8.4.23",
+        "postcss-media-query-parser": "^0.2.3"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/css-loader": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
+      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.4",
+        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">= 12.13.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "typescript": ">=4.9.5"
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
           "optional": true
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/esbuild": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
+      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.20.1",
+        "@esbuild/android-arm": "0.20.1",
+        "@esbuild/android-arm64": "0.20.1",
+        "@esbuild/android-x64": "0.20.1",
+        "@esbuild/darwin-arm64": "0.20.1",
+        "@esbuild/darwin-x64": "0.20.1",
+        "@esbuild/freebsd-arm64": "0.20.1",
+        "@esbuild/freebsd-x64": "0.20.1",
+        "@esbuild/linux-arm": "0.20.1",
+        "@esbuild/linux-arm64": "0.20.1",
+        "@esbuild/linux-ia32": "0.20.1",
+        "@esbuild/linux-loong64": "0.20.1",
+        "@esbuild/linux-mips64el": "0.20.1",
+        "@esbuild/linux-ppc64": "0.20.1",
+        "@esbuild/linux-riscv64": "0.20.1",
+        "@esbuild/linux-s390x": "0.20.1",
+        "@esbuild/linux-x64": "0.20.1",
+        "@esbuild/netbsd-x64": "0.20.1",
+        "@esbuild/openbsd-x64": "0.20.1",
+        "@esbuild/sunos-x64": "0.20.1",
+        "@esbuild/win32-arm64": "0.20.1",
+        "@esbuild/win32-ia32": "0.20.1",
+        "@esbuild/win32-x64": "0.20.1"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/esbuild-wasm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz",
+      "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==",
+      "dev": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
@@ -1042,7 +1552,7 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
@@ -1051,7 +1561,7 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
@@ -1063,7 +1573,7 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/globby": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/globby": {
       "version": "13.2.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
       "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
@@ -1082,13 +1592,35 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/immutable": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
       "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/ipaddr.js": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
@@ -1097,19 +1629,89 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/less-loader": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
+      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "less": "^3.5.0 || ^4.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/loader-utils": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/magic-string": {
+      "version": "0.30.8",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/mini-css-extract-plugin": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
+      "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/piscina": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz",
+      "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==",
+      "dev": true,
+      "optionalDependencies": {
+        "nice-napi": "^1.0.2"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/postcss": {
       "version": "8.4.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
       "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
@@ -1137,7 +1739,7 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/postcss-loader": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
       "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
@@ -1168,7 +1770,33 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/sass": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/postcss-loader/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/sass": {
       "version": "1.71.1",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
       "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
@@ -1185,7 +1813,7 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/sass-loader": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/sass-loader": {
       "version": "14.1.1",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz",
       "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
@@ -1225,7 +1853,7 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/slash": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/slash": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
       "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
@@ -1237,7 +1865,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/vite": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.8.tgz",
       "integrity": "sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==",
@@ -1292,7 +1932,375 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/esbuild": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/esbuild": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
       "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
@@ -1330,7 +2338,20 @@
         "@esbuild/win32-x64": "0.19.12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack": {
       "version": "5.94.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
       "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
@@ -1376,7 +2397,35 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-middleware": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz",
+      "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.12",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-server": {
       "version": "4.15.1",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
       "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
@@ -1435,7 +2484,7 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
       "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
@@ -1458,6 +2507,1571 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect": {
+      "version": "0.1703.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
+      "integrity": "sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "17.3.11",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
+      "version": "17.3.11",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
+      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular": {
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz",
+      "integrity": "sha512-quVUi7eqTq9OHumQFNl9Y8t2opm8miu4rlYnuF6rbujmmBDvdUvR6trFChueRczl2p5HWqTOr6NPoDGQm8AyNw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "2.3.0",
+        "@angular-devkit/architect": "0.1802.12",
+        "@angular-devkit/build-webpack": "0.1802.12",
+        "@angular-devkit/core": "18.2.12",
+        "@angular/build": "18.2.12",
+        "@babel/core": "7.25.2",
+        "@babel/generator": "7.25.0",
+        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@babel/helper-split-export-declaration": "7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "7.25.0",
+        "@babel/plugin-transform-async-to-generator": "7.24.7",
+        "@babel/plugin-transform-runtime": "7.24.7",
+        "@babel/preset-env": "7.25.3",
+        "@babel/runtime": "7.25.0",
+        "@discoveryjs/json-ext": "0.6.1",
+        "@ngtools/webpack": "18.2.12",
+        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "ansi-colors": "4.1.3",
+        "autoprefixer": "10.4.20",
+        "babel-loader": "9.1.3",
+        "browserslist": "^4.21.5",
+        "copy-webpack-plugin": "12.0.2",
+        "critters": "0.0.24",
+        "css-loader": "7.1.2",
+        "esbuild-wasm": "0.23.0",
+        "fast-glob": "3.3.2",
+        "http-proxy-middleware": "3.0.3",
+        "https-proxy-agent": "7.0.5",
+        "istanbul-lib-instrument": "6.0.3",
+        "jsonc-parser": "3.3.1",
+        "karma-source-map-support": "1.4.0",
+        "less": "4.2.0",
+        "less-loader": "12.2.0",
+        "license-webpack-plugin": "4.0.2",
+        "loader-utils": "3.3.1",
+        "magic-string": "0.30.11",
+        "mini-css-extract-plugin": "2.9.0",
+        "mrmime": "2.0.0",
+        "open": "10.1.0",
+        "ora": "5.4.1",
+        "parse5-html-rewriting-stream": "7.0.0",
+        "picomatch": "4.0.2",
+        "piscina": "4.6.1",
+        "postcss": "8.4.41",
+        "postcss-loader": "8.1.1",
+        "resolve-url-loader": "5.0.0",
+        "rxjs": "7.8.1",
+        "sass": "1.77.6",
+        "sass-loader": "16.0.0",
+        "semver": "7.6.3",
+        "source-map-loader": "5.0.0",
+        "source-map-support": "0.5.21",
+        "terser": "5.31.6",
+        "tree-kill": "1.2.2",
+        "tslib": "2.6.3",
+        "vite": "5.4.6",
+        "watchpack": "2.4.1",
+        "webpack": "5.94.0",
+        "webpack-dev-middleware": "7.4.2",
+        "webpack-dev-server": "5.0.4",
+        "webpack-merge": "6.0.1",
+        "webpack-subresource-integrity": "5.1.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "optionalDependencies": {
+        "esbuild": "0.23.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^18.0.0",
+        "@angular/localize": "^18.0.0",
+        "@angular/platform-server": "^18.0.0",
+        "@angular/service-worker": "^18.0.0",
+        "@web/test-runner": "^0.18.0",
+        "browser-sync": "^3.0.2",
+        "jest": "^29.5.0",
+        "jest-environment-jsdom": "^29.5.0",
+        "karma": "^6.3.0",
+        "ng-packagr": "^18.0.0",
+        "protractor": "^7.0.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=5.4 <5.6"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/platform-server": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "@web/test-runner": {
+          "optional": true
+        },
+        "browser-sync": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        },
+        "jest-environment-jsdom": {
+          "optional": true
+        },
+        "karma": {
+          "optional": true
+        },
+        "ng-packagr": {
+          "optional": true
+        },
+        "protractor": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
+      "version": "0.1802.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
+      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "18.2.12",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1802.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz",
+      "integrity": "sha512-0Z3fdbZVRnjYWE2/VYyfy+uieY+6YZyEp4ylzklVkc+fmLNsnz4Zw6cK1LzzcBqAwKIyh1IdW20Cg7o8b0sONA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1802.12",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^5.0.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@babel/generator": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@discoveryjs/json-ext": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
+      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.17.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz",
+      "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^18.0.0",
+        "typescript": ">=5.4 <5.6",
+        "webpack": "^5.54.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
+      "version": "22.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
+      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
+      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "peerDependencies": {
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/autoprefixer": {
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/copy-webpack-plugin": {
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
+      "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.3.2",
+        "glob-parent": "^6.0.1",
+        "globby": "^14.0.0",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
+      "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.15",
+        "debug": "^4.3.6",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.3",
+        "is-plain-object": "^5.0.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/is-wsl": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "dev": true,
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/open": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
+      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
+      "dev": true,
+      "dependencies": {
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/p-retry": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
+      "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/path-type": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
+      "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
+      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^9.0.0",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/sass": {
+      "version": "1.77.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
+      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/sass-loader": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz",
+      "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==",
+      "dev": true,
+      "dependencies": {
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/terser": {
+      "version": "5.31.6",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/vite": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
+      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
+      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.13",
+        "@types/connect-history-api-fallback": "^1.5.4",
+        "@types/express": "^4.17.21",
+        "@types/serve-index": "^1.9.4",
+        "@types/serve-static": "^1.15.5",
+        "@types/sockjs": "^0.3.36",
+        "@types/ws": "^8.5.10",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.2.1",
+        "chokidar": "^3.6.0",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.4.0",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.1.0",
+        "launch-editor": "^2.6.1",
+        "open": "^10.0.3",
+        "p-retry": "^6.2.0",
+        "rimraf": "^5.0.5",
+        "schema-utils": "^4.2.0",
+        "selfsigned": "^2.4.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^7.1.0",
+        "ws": "^8.16.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-merge": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
@@ -1522,7 +4136,6 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
       "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ajv": "8.17.1",
         "ajv-formats": "3.0.1",
@@ -1550,7 +4163,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -1567,7 +4179,6 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
       "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -1584,15 +4195,13 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@angular-devkit/core/node_modules/picomatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1605,7 +4214,6 @@
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz",
       "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@angular-devkit/core": "18.2.12",
         "jsonc-parser": "3.3.1",
@@ -1623,18 +4231,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
-      }
+      "dev": true
     },
     "node_modules/@angular-eslint/builder": {
       "version": "18.4.1",
@@ -1752,17 +4349,1226 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
-      "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.12.tgz",
+      "integrity": "sha512-XcWH/VFQ1Rddhdqi/iU8lW3Qg96yVx1NPfrO5lhcSSvVUzYWTZ5r+jh3GqYqUgPWyEp1Kpw3FLsOgVcGcBWQkQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12"
+        "@angular/core": "18.2.12"
+      }
+    },
+    "node_modules/@angular/build": {
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.12.tgz",
+      "integrity": "sha512-4Ohz+OSILoL+cCAQ4UTiCT5v6pctu3fXNoNpTEUK46OmxELk9jDITO5rNyNS7TxBn9wY69kjX5VcDf7MenquFQ==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "2.3.0",
+        "@angular-devkit/architect": "0.1802.12",
+        "@babel/core": "7.25.2",
+        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@babel/helper-split-export-declaration": "7.24.7",
+        "@babel/plugin-syntax-import-attributes": "7.24.7",
+        "@inquirer/confirm": "3.1.22",
+        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "browserslist": "^4.23.0",
+        "critters": "0.0.24",
+        "esbuild": "0.23.0",
+        "fast-glob": "3.3.2",
+        "https-proxy-agent": "7.0.5",
+        "listr2": "8.2.4",
+        "lmdb": "3.0.13",
+        "magic-string": "0.30.11",
+        "mrmime": "2.0.0",
+        "parse5-html-rewriting-stream": "7.0.0",
+        "picomatch": "4.0.2",
+        "piscina": "4.6.1",
+        "rollup": "4.22.4",
+        "sass": "1.77.6",
+        "semver": "7.6.3",
+        "vite": "5.4.6",
+        "watchpack": "2.4.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^18.0.0",
+        "@angular/localize": "^18.0.0",
+        "@angular/platform-server": "^18.0.0",
+        "@angular/service-worker": "^18.0.0",
+        "less": "^4.2.0",
+        "postcss": "^8.4.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=5.4 <5.6"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/platform-server": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/build/node_modules/@angular-devkit/architect": {
+      "version": "0.1802.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
+      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "18.2.12",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@babel/core": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@babel/generator": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@angular/build/node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/@types/node": {
+      "version": "22.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.19.8"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
+      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "peerDependencies": {
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
+      "dev": true,
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/cli-truncate": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "dev": true,
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/build/node_modules/listr2": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^4.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/log-update": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
+      "dev": true,
+      "dependencies": {
+        "get-east-asian-width": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@angular/build/node_modules/restore-cursor": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/rollup": {
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "1.0.5"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/@angular/build/node_modules/sass": {
+      "version": "1.77.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
+      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/build/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular/build/node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/build/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/build/node_modules/vite": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
+      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/build/node_modules/vite/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/@angular/build/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/@angular/cdk": {
@@ -1782,27 +5588,26 @@
       }
     },
     "node_modules/@angular/cli": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.11.tgz",
-      "integrity": "sha512-8R9LwAGL8hGAWJ4mNG9ZPUrBUzIdmst0Ldua6RJJ+PrqgjX+8IbO+lNnfrOY/XY+Z3LXbCEJflL26f9czCvTPQ==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.12.tgz",
+      "integrity": "sha512-xhuZ/b7IhqNw1MgXf+arWf4x+GfUSt/IwbdWU4+CO8A7h0Y46zQywouP/KUK3cMQZfVdHdciTBvlpF3vFacA6Q==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.11",
-        "@angular-devkit/core": "17.3.11",
-        "@angular-devkit/schematics": "17.3.11",
-        "@schematics/angular": "17.3.11",
+        "@angular-devkit/architect": "0.1802.12",
+        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/schematics": "18.2.12",
+        "@inquirer/prompts": "5.3.8",
+        "@listr2/prompt-adapter-inquirer": "2.0.15",
+        "@schematics/angular": "18.2.12",
         "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "ini": "4.1.2",
-        "inquirer": "9.2.15",
-        "jsonc-parser": "3.2.1",
-        "npm-package-arg": "11.0.1",
-        "npm-pick-manifest": "9.0.0",
-        "open": "8.4.2",
-        "ora": "5.4.1",
-        "pacote": "17.0.6",
+        "ini": "4.1.3",
+        "jsonc-parser": "3.3.1",
+        "listr2": "8.2.4",
+        "npm-package-arg": "11.0.3",
+        "npm-pick-manifest": "9.1.0",
+        "pacote": "18.0.6",
         "resolve": "1.22.8",
-        "semver": "7.6.0",
+        "semver": "7.6.3",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
@@ -1810,83 +5615,340 @@
         "ng": "bin/ng.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1802.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
+      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
       "dev": true,
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
-      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.8",
-        "ora": "5.4.1",
+        "@angular-devkit/core": "18.2.12",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
+      "dev": true,
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/cli-truncate": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
+      "dev": true,
+      "dependencies": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
+    },
+    "node_modules/@angular/cli/node_modules/listr2": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
+      "dev": true,
+      "dependencies": {
+        "cli-truncate": "^4.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/log-update": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
+      "dev": true,
+      "dependencies": {
+        "get-east-asian-width": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/restore-cursor": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/@angular/common": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
-      "integrity": "sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.12.tgz",
+      "integrity": "sha512-gI5o8Bccsi8ow8Wk2vG4Tw/Rw9LoHEA9j8+qHKNR/55SCBsz68Syg310dSyxy+sApJO2WiqIadr5VP36dlSUFw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12",
+        "@angular/core": "18.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.12.tgz",
-      "integrity": "sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.12.tgz",
+      "integrity": "sha512-D5d5dLrjQal5DbAXJJNSsCC3UxzjOI2wbc+Iv+LOpRM1gpNwuYfZMX5W7cj62Ce4G2++78CJSppdKBp8D4HErQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12"
+        "@angular/core": "18.2.12"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -1895,13 +5957,13 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.12.tgz",
-      "integrity": "sha512-1F8M7nWfChzurb7obbvuE7mJXlHtY1UG58pcwcomVtpPb+kPavgAO8OEvJHYBMV+bzSxkXt5UIwL9lt9jHUxZA==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.12.tgz",
+      "integrity": "sha512-IWimTNq5Q+i2Wxev6HLqnN4iYbPvLz04W1BBycT1LfGUsHcjFYLuUqbeUzHbk2snmBAzXkixgVpo8SF6P4Y5Pg==",
       "dependencies": {
-        "@babel/core": "7.23.9",
+        "@babel/core": "7.25.2",
         "@jridgewell/sourcemap-codec": "^1.4.14",
-        "chokidar": "^3.0.0",
+        "chokidar": "^4.0.0",
         "convert-source-map": "^1.5.1",
         "reflect-metadata": "^0.2.0",
         "semver": "^7.0.0",
@@ -1914,28 +5976,28 @@
         "ngcc": "bundles/ngcc/index.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.12",
-        "typescript": ">=5.2 <5.5"
+        "@angular/compiler": "18.2.12",
+        "typescript": ">=5.4 <5.6"
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -1963,53 +6025,105 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "dependencies": {
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/compiler-cli/node_modules/readdirp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@angular/core": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.12.tgz",
-      "integrity": "sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.12.tgz",
+      "integrity": "sha512-wCf/OObwS6bpM60rk6bpMpCRGp0DlMLB1WNAMtfcaPNyqimVV5Bm98mWRhkOuRyvU3fU7iHhM/10ePVaoyu9+A==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.0"
+        "zone.js": "~0.14.10"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.12.tgz",
-      "integrity": "sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.12.tgz",
+      "integrity": "sha512-FsukBJEU6jfAmht7TrODTkct/o4iwCZvGozuThOp0tYUPD/E1rZZzuKjEyTnT5Azpfkf0Wqx1nmpz80cczELOQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12",
+        "@angular/common": "18.2.12",
+        "@angular/core": "18.2.12",
+        "@angular/platform-browser": "18.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.12.tgz",
-      "integrity": "sha512-MVmEXonXwdhFtIpU4q8qbXHsrAsdTjZcPPuWCU0zXVQ+VaB/y6oF7BVpmBtfyBcBCums1guEncPP+AZVvulXmQ==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.12.tgz",
+      "integrity": "sha512-oaiVAnGzmPZvrXdGh8XnosaqfEPbZxO2225MxbbrD49XTqUgpaS2zrz1Uf5j42e8qytA2kj8tckLq7PAMm0D1w==",
       "dev": true,
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       }
     },
     "node_modules/@angular/localize": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.12.tgz",
-      "integrity": "sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.12.tgz",
+      "integrity": "sha512-qC3cYFh3miR9revmHGlfbGvugcsK6nQud4QKBNyTUp1XZRrEE0yzPvvsnmbv2lHUOazrvTxQpfVZZKpiifgoLw==",
       "dependencies": {
-        "@babel/core": "7.23.9",
+        "@babel/core": "7.25.2",
         "@types/babel__core": "7.20.5",
         "fast-glob": "3.3.2",
         "yargs": "^17.2.1"
@@ -2020,28 +6134,28 @@
         "localize-translate": "tools/bundles/src/translate/cli.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.12",
-        "@angular/compiler-cli": "17.3.12"
+        "@angular/compiler": "18.2.12",
+        "@angular/compiler-cli": "18.2.12"
       }
     },
     "node_modules/@angular/localize/node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -2056,11 +6170,37 @@
         "url": "https://opencollective.com/babel"
       }
     },
+    "node_modules/@angular/localize/node_modules/@babel/generator": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "dependencies": {
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@angular/localize/node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
+    "node_modules/@angular/localize/node_modules/jsesc": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@angular/localize/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -2070,19 +6210,19 @@
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz",
-      "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.12.tgz",
+      "integrity": "sha512-DRSMznuxuecrs+v5BRyd60/R4vjkQtuYUEPfzdo+rqxM83Dmr3PGtnqPRgd5oAFUbATxf02hQXijRD27K7rZRg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12"
+        "@angular/animations": "18.2.12",
+        "@angular/common": "18.2.12",
+        "@angular/core": "18.2.12"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -2091,77 +6231,78 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz",
-      "integrity": "sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.12.tgz",
+      "integrity": "sha512-dv1QEjYpcFno6+oUeGEDRWpB5g2Ufb0XkUbLJQIgrOk1Qbyzb8tmpDpTjok8jcKdquigMRWolr6Y1EOicfRlLw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/compiler": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12"
+        "@angular/common": "18.2.12",
+        "@angular/compiler": "18.2.12",
+        "@angular/core": "18.2.12",
+        "@angular/platform-browser": "18.2.12"
       }
     },
     "node_modules/@angular/platform-server": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz",
-      "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.12.tgz",
+      "integrity": "sha512-CF5iM2R96RD2kl3J6tL6VXU8UCIxQfRU4+Wbor+CcNNKQHU76TiEzaJCU+vRWMzP5AYW8pEM0qmf3c2rbdUyRw==",
       "dependencies": {
         "tslib": "^2.3.0",
         "xhr2": "^0.2.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/compiler": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12"
+        "@angular/animations": "18.2.12",
+        "@angular/common": "18.2.12",
+        "@angular/compiler": "18.2.12",
+        "@angular/core": "18.2.12",
+        "@angular/platform-browser": "18.2.12"
       }
     },
     "node_modules/@angular/router": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz",
-      "integrity": "sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.12.tgz",
+      "integrity": "sha512-cz/1YWOZadAT35PPPYmpK3HSzKOE56nlUHue5bFkw73VSZr2iBn03ALLpd9YKzWgRmx3y7DqnlQtCkDu9JPGKQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12",
+        "@angular/common": "18.2.12",
+        "@angular/core": "18.2.12",
+        "@angular/platform-browser": "18.2.12",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/ssr": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz",
-      "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-18.2.12.tgz",
+      "integrity": "sha512-KoVBTk0+wV+VKWew611S2bTcaQx2MpxCiCacS/bChNJlrcy1wg0ae7ymj3oUu/NiKZP8cq+dzBcx0JZepozE/A==",
       "dependencies": {
-        "critters": "0.0.22",
+        "critters": "0.0.24",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0",
-        "@angular/core": "^17.0.0"
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -2169,9 +6310,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -2218,6 +6359,39 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
+      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@babel/eslint-parser/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/@babel/generator": {
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
@@ -2233,37 +6407,37 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
-      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/compat-data": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -2294,17 +6468,17 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2315,12 +6489,12 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2336,12 +6510,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
         "regexpu-core": "^6.1.1",
         "semver": "^6.3.1"
       },
@@ -2353,12 +6527,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2374,9 +6548,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -2402,39 +6576,38 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
-      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2444,35 +6617,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
-      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
-      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-wrap-function": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2482,26 +6655,26 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
-      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2511,112 +6684,99 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
+      "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
-      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
-      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
       "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
-      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
       "dependencies": {
-        "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+      "dependencies": {
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.26.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2625,13 +6785,44 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
-      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2641,14 +6832,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
-      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-transform-optional-chaining": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2658,13 +6849,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
-      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2749,12 +6940,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
-      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2764,12 +6955,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
-      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2921,12 +7112,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
-      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2936,15 +7127,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
-      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
+      "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-remap-async-to-generator": "^7.25.0",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2954,14 +7145,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2971,12 +7162,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
-      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2986,12 +7177,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
-      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3001,13 +7192,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
-      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3017,13 +7208,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
-      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3033,16 +7224,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
-      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -3053,25 +7244,25 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
-      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/template": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3081,12 +7272,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
-      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3096,13 +7287,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
-      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3112,12 +7303,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
-      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3126,13 +7317,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
-      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3142,13 +7349,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
-      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3158,12 +7365,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
-      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3173,13 +7380,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
-      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3189,14 +7396,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
-      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3206,12 +7413,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
-      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3221,12 +7428,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
-      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3236,12 +7443,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
-      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3251,12 +7458,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
-      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3266,13 +7473,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
-      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3282,14 +7489,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
-      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3299,15 +7506,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
-      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3317,13 +7524,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
-      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3333,13 +7540,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3349,12 +7556,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
-      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3364,12 +7571,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
-      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3379,12 +7586,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
-      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3394,14 +7601,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
-      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-transform-parameters": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3411,13 +7618,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
-      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3427,12 +7634,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
-      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3442,13 +7649,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
-      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3458,12 +7665,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
-      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3473,13 +7680,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
-      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3489,14 +7696,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
-      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3506,24 +7713,24 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
-      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3533,12 +7740,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
-      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -3549,12 +7756,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
-      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3564,16 +7771,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
-      "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz",
+      "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.1",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -3593,12 +7800,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
-      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3608,13 +7815,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
-      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3624,12 +7831,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
-      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3639,12 +7846,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
-      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3654,12 +7861,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
-      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3669,12 +7876,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
-      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3684,13 +7891,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
-      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3700,13 +7907,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
-      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3716,13 +7923,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
-      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3732,26 +7939,28 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
-      "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
+      "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -3763,59 +7972,60 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.8",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.0",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.0",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.25.0",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.25.0",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.8",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.25.1",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.25.2",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.8",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
-        "core-js-compat": "^3.31.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.37.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -3849,10 +8059,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
-      "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
-      "license": "MIT",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -3861,28 +8070,28 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -3891,11 +8100,12 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/parser": "^7.26.2",
+        "@babel/types": "^7.26.0",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -3916,13 +8126,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4240,9 +8449,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.6.tgz",
-      "integrity": "sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.4.tgz",
+      "integrity": "sha512-eqNHMsxEXuit0sRvvWoGG3/4+Q5qwqjKARWXKM/KoSsKvTNBwWt8pwspg5+TniP3POAZcPPx0O8CiEIQ4e6NWg==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -4251,7 +8460,7 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~4.0.0",
+        "form-data": "~2.5.0",
         "http-signature": "~1.4.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -4260,7 +8469,7 @@
         "performance-now": "^2.1.0",
         "qs": "6.13.0",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^5.0.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -4268,6 +8477,20 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@cypress/request/node_modules/form-data": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
     "node_modules/@cypress/schematic": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.7.0.tgz",
@@ -4480,9 +8703,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
       "cpu": [
         "ppc64"
       ],
@@ -4492,13 +8715,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
       "cpu": [
         "arm"
       ],
@@ -4508,13 +8731,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
       "cpu": [
         "arm64"
       ],
@@ -4524,13 +8747,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
       "cpu": [
         "x64"
       ],
@@ -4540,13 +8763,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
       "cpu": [
         "arm64"
       ],
@@ -4556,13 +8779,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
       "cpu": [
         "x64"
       ],
@@ -4572,13 +8795,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
       "cpu": [
         "arm64"
       ],
@@ -4588,13 +8811,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
       "cpu": [
         "x64"
       ],
@@ -4604,13 +8827,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
       "cpu": [
         "arm"
       ],
@@ -4620,13 +8843,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
-      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
       "cpu": [
         "arm64"
       ],
@@ -4636,13 +8859,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
       "cpu": [
         "ia32"
       ],
@@ -4652,13 +8875,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
       "cpu": [
         "loong64"
       ],
@@ -4668,13 +8891,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
       "cpu": [
         "mips64el"
       ],
@@ -4684,13 +8907,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
       "cpu": [
         "ppc64"
       ],
@@ -4700,13 +8923,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
       "cpu": [
         "riscv64"
       ],
@@ -4716,13 +8939,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
       "cpu": [
         "s390x"
       ],
@@ -4732,13 +8955,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
       "cpu": [
         "x64"
       ],
@@ -4748,13 +8971,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
       "cpu": [
         "x64"
       ],
@@ -4764,13 +8987,29 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
       "cpu": [
         "x64"
       ],
@@ -4780,13 +9019,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
       "cpu": [
         "x64"
       ],
@@ -4796,13 +9035,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
       "cpu": [
         "arm64"
       ],
@@ -4812,13 +9051,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
       "cpu": [
         "ia32"
       ],
@@ -4828,13 +9067,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
       "cpu": [
         "x64"
       ],
@@ -4844,14 +9083,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -4866,7 +9104,6 @@
       "version": "4.11.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
       "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -4875,7 +9112,6 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
       "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -4898,7 +9134,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4914,7 +9149,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4924,7 +9158,6 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -4938,14 +9171,12 @@
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4957,7 +9188,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4969,15 +9199,14 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
       "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
-      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
+      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -4994,7 +9223,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^2.0.2",
         "debug": "^4.3.1",
@@ -5008,7 +9236,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5018,7 +9245,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -5030,7 +9256,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -5043,14 +9268,253 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
+      "deprecated": "Use @eslint/object-schema instead"
     },
     "node_modules/@iiif/vocabulary": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz",
       "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg=="
     },
+    "node_modules/@inquirer/checkbox": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz",
+      "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
+      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
+      "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/figures": "^1.0.6",
+        "@inquirer/type": "^2.0.0",
+        "@types/mute-stream": "^0.0.4",
+        "@types/node": "^22.5.5",
+        "@types/wrap-ansi": "^3.0.0",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^1.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/@inquirer/type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
+      "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/@types/node": {
+      "version": "22.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.19.8"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz",
+      "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "external-editor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz",
+      "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz",
+      "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz",
+      "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz",
+      "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz",
+      "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
+      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/checkbox": "^2.4.7",
+        "@inquirer/confirm": "^3.1.22",
+        "@inquirer/editor": "^2.1.22",
+        "@inquirer/expand": "^2.1.22",
+        "@inquirer/input": "^2.2.9",
+        "@inquirer/number": "^1.0.10",
+        "@inquirer/password": "^2.1.22",
+        "@inquirer/rawlist": "^2.2.4",
+        "@inquirer/search": "^1.0.7",
+        "@inquirer/select": "^2.4.7"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz",
+      "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz",
+      "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz",
+      "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
+      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5069,9 +9533,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -5253,6 +9717,60 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonjoy.com/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/json-pack": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz",
+      "integrity": "sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==",
+      "dev": true,
+      "dependencies": {
+        "@jsonjoy.com/base64": "^1.1.1",
+        "@jsonjoy.com/util": "^1.1.2",
+        "hyperdyperid": "^1.2.0",
+        "thingies": "^1.20.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/util": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
+      "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/@kolkov/ngx-gallery": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz",
@@ -5272,6 +9790,21 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "dev": true
     },
+    "node_modules/@listr2/prompt-adapter-inquirer": {
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz",
+      "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/type": "^1.5.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@inquirer/prompts": ">= 3 < 6"
+      }
+    },
     "node_modules/@ljharb/through": {
       "version": "2.3.13",
       "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
@@ -5284,6 +9817,84 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@lmdb/lmdb-darwin-arm64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
+      "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-darwin-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz",
+      "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-arm": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz",
+      "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-arm64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz",
+      "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz",
+      "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-win32-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz",
+      "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@material-ui/core": {
       "version": "4.12.4",
       "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz",
@@ -5475,6 +10086,84 @@
         "react-dom": "^16.8.0 || ^17.0.0"
       }
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@ng-bootstrap/ng-bootstrap": {
       "version": "12.1.2",
       "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-12.1.2.tgz",
@@ -5629,6 +10318,34 @@
         "@angular/core": "^14.0.0"
       }
     },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -5678,13 +10395,10 @@
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/@npmcli/fs": {
       "version": "1.1.1",
@@ -5697,12 +10411,13 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz",
-      "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
+      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/promise-spawn": "^7.0.0",
+        "ini": "^4.1.3",
         "lru-cache": "^10.0.1",
         "npm-pick-manifest": "^9.0.0",
         "proc-log": "^4.0.0",
@@ -5725,22 +10440,10 @@
       }
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/@npmcli/git/node_modules/which": {
       "version": "4.0.0",
@@ -5797,9 +10500,9 @@
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz",
+      "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
@@ -5815,9 +10518,9 @@
       }
     },
     "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -5830,9 +10533,6 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -5846,15 +10546,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@npmcli/promise-spawn": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
@@ -5892,24 +10583,25 @@
       }
     },
     "node_modules/@npmcli/redact": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz",
-      "integrity": "sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
+      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
       "dev": true,
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz",
-      "integrity": "sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
+      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
       "dev": true,
       "dependencies": {
         "@npmcli/node-gyp": "^3.0.0",
         "@npmcli/package-json": "^5.0.0",
         "@npmcli/promise-spawn": "^7.0.0",
         "node-gyp": "^10.0.0",
+        "proc-log": "^4.0.0",
         "which": "^4.0.0"
       },
       "engines": {
@@ -5944,8 +10636,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
       "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -5981,7 +10671,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -6001,7 +10690,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -6021,7 +10709,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -6041,7 +10728,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -6061,7 +10747,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6081,7 +10766,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6101,7 +10785,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6121,7 +10804,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6141,7 +10823,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -6161,7 +10842,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6181,7 +10861,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6201,7 +10880,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -6217,9 +10895,7 @@
     "node_modules/@parcel/watcher/node_modules/node-addon-api": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="
     },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
@@ -6533,65 +11209,26 @@
       "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.11.tgz",
-      "integrity": "sha512-tvJpTgYC+hCnTyLszYRUZVyNTpPd+C44gh5CPTcG3qkqStzXQwynQAf6X/DjtwXbUiPQF0XfF0+0R489GpdZPA==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz",
+      "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "@angular-devkit/schematics": "17.3.11",
-        "jsonc-parser": "3.2.1"
+        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/schematics": "18.2.12",
+        "jsonc-parser": "3.3.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
-      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.8",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
+    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
     },
     "node_modules/@sigstore/bundle": {
       "version": "2.3.2",
@@ -6640,15 +11277,6 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@sigstore/sign/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@sigstore/tuf": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
@@ -6676,6 +11304,18 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
@@ -6830,26 +11470,6 @@
       "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
       "dev": true
     },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -6903,9 +11523,9 @@
       "devOptional": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+      "version": "1.17.15",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+      "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6935,11 +11555,10 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
+      "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
+      "dev": true
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
@@ -6947,6 +11566,15 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
       "devOptional": true
     },
+    "node_modules/@types/mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "14.18.63",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
@@ -7088,6 +11716,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/wrap-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
+      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
+      "dev": true
+    },
     "node_modules/@types/ws": {
       "version": "8.5.10",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
@@ -7498,152 +12132,151 @@
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -7731,10 +12364,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-      "dev": true,
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7756,7 +12388,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -7943,6 +12574,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -7954,6 +12586,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -7966,6 +12599,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -8284,9 +12918,10 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -8335,14 +12970,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -8359,57 +13019,25 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
-      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
-        "core-js-compat": "^3.34.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+      "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -8504,6 +13132,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -8557,6 +13186,14 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8869,9 +13506,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "funding": [
         {
           "type": "opencollective",
@@ -8887,10 +13524,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
         "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -8946,10 +13583,25 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "dev": true,
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -9032,7 +13684,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -9047,9 +13698,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001668",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+      "version": "1.0.30001680",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+      "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
       "funding": [
         {
           "type": "opencollective",
@@ -9095,6 +13746,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -9131,6 +13783,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -9169,9 +13822,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
-      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "dev": true,
       "funding": [
         {
@@ -9344,7 +13997,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -9358,7 +14010,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -9378,6 +14029,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -9385,7 +14037,8 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "2.0.20",
@@ -9463,16 +14116,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
-      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "compressible": "~2.0.18",
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.2.1",
+        "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -9512,33 +14165,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -9834,9 +14460,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
-      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
+      "version": "3.38.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -9844,12 +14470,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
-      "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+      "version": "3.39.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.23.3"
+        "browserslist": "^4.24.2"
       },
       "funding": {
         "type": "opencollective",
@@ -9898,9 +14524,10 @@
       "dev": true
     },
     "node_modules/critters": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
-      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz",
+      "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==",
+      "deprecated": "Ownership of Critters has moved to the Nuxt team, who will be maintaining the project going forward. If you'd like to keep using Critters, please switch to the actively-maintained fork at https://github.com/danielroe/beasties",
       "dependencies": {
         "chalk": "^4.1.0",
         "css-select": "^5.1.0",
@@ -9994,11 +14621,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "dev": true,
-      "license": "MIT",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -10061,22 +14686,22 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
-      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+      "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.4",
-        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
         "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10084,7 +14709,7 @@
       },
       "peerDependencies": {
         "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.0.0"
+        "webpack": "^5.27.0"
       },
       "peerDependenciesMeta": {
         "@rspack/core": {
@@ -10185,13 +14810,13 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
-      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
+      "version": "13.15.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.1.tgz",
+      "integrity": "sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.6",
+        "@cypress/request": "^3.0.4",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -10202,7 +14827,6 @@
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
-        "ci-info": "^4.0.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
         "commander": "^6.2.1",
@@ -10217,6 +14841,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
+        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -10243,17 +14868,16 @@
       }
     },
     "node_modules/cypress-axe": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.6.0.tgz",
-      "integrity": "sha512-C/ij50G8eebBrl/WsGT7E+T/SFyIsRZ3Epx9cRTLrPL9Y1GcxlQGFoAVdtSFWRrHSCWXq9HC6iJQMaI89O9yvQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.5.0.tgz",
+      "integrity": "sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
         "axe-core": "^3 || ^4",
-        "cypress": "^10 || ^11 || ^12 || ^13 || ^14"
+        "cypress": "^10 || ^11 || ^12 || ^13"
       }
     },
     "node_modules/cypress/node_modules/ansi-styles": {
@@ -10485,11 +15109,11 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -10521,8 +15145,7 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -10532,6 +15155,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "dev": true,
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/default-gateway": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
@@ -10682,8 +15333,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
-      "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -10769,7 +15418,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -11011,9 +15659,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.38",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
-      "integrity": "sha512-VbeVexmZ1IFh+5EfrYz1I0HTzHVIlJa112UEWhciPyeOcKJGeTv6N8WnG4wsQB81DGCaVEGhpSb6o6a8WYFXXg=="
+      "version": "1.5.63",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz",
+      "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA=="
     },
     "node_modules/element-resize-detector": {
       "version": "1.2.4",
@@ -11190,6 +15838,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/err-code": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
@@ -11364,60 +16024,60 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
-      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
       "dev": true,
       "hasInstallScript": true,
-      "optional": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.1",
-        "@esbuild/android-arm": "0.20.1",
-        "@esbuild/android-arm64": "0.20.1",
-        "@esbuild/android-x64": "0.20.1",
-        "@esbuild/darwin-arm64": "0.20.1",
-        "@esbuild/darwin-x64": "0.20.1",
-        "@esbuild/freebsd-arm64": "0.20.1",
-        "@esbuild/freebsd-x64": "0.20.1",
-        "@esbuild/linux-arm": "0.20.1",
-        "@esbuild/linux-arm64": "0.20.1",
-        "@esbuild/linux-ia32": "0.20.1",
-        "@esbuild/linux-loong64": "0.20.1",
-        "@esbuild/linux-mips64el": "0.20.1",
-        "@esbuild/linux-ppc64": "0.20.1",
-        "@esbuild/linux-riscv64": "0.20.1",
-        "@esbuild/linux-s390x": "0.20.1",
-        "@esbuild/linux-x64": "0.20.1",
-        "@esbuild/netbsd-x64": "0.20.1",
-        "@esbuild/openbsd-x64": "0.20.1",
-        "@esbuild/sunos-x64": "0.20.1",
-        "@esbuild/win32-arm64": "0.20.1",
-        "@esbuild/win32-ia32": "0.20.1",
-        "@esbuild/win32-x64": "0.20.1"
+        "@esbuild/aix-ppc64": "0.23.0",
+        "@esbuild/android-arm": "0.23.0",
+        "@esbuild/android-arm64": "0.23.0",
+        "@esbuild/android-x64": "0.23.0",
+        "@esbuild/darwin-arm64": "0.23.0",
+        "@esbuild/darwin-x64": "0.23.0",
+        "@esbuild/freebsd-arm64": "0.23.0",
+        "@esbuild/freebsd-x64": "0.23.0",
+        "@esbuild/linux-arm": "0.23.0",
+        "@esbuild/linux-arm64": "0.23.0",
+        "@esbuild/linux-ia32": "0.23.0",
+        "@esbuild/linux-loong64": "0.23.0",
+        "@esbuild/linux-mips64el": "0.23.0",
+        "@esbuild/linux-ppc64": "0.23.0",
+        "@esbuild/linux-riscv64": "0.23.0",
+        "@esbuild/linux-s390x": "0.23.0",
+        "@esbuild/linux-x64": "0.23.0",
+        "@esbuild/netbsd-x64": "0.23.0",
+        "@esbuild/openbsd-arm64": "0.23.0",
+        "@esbuild/openbsd-x64": "0.23.0",
+        "@esbuild/sunos-x64": "0.23.0",
+        "@esbuild/win32-arm64": "0.23.0",
+        "@esbuild/win32-ia32": "0.23.0",
+        "@esbuild/win32-x64": "0.23.0"
       }
     },
     "node_modules/esbuild-wasm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz",
-      "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz",
+      "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==",
       "dev": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "engines": {
         "node": ">=6"
       }
@@ -11431,6 +16091,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -11439,7 +16100,6 @@
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
       "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -11491,9 +16151,9 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
-      "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
+      "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
       "dev": true,
       "dependencies": {
         "semver": "^7.5.4"
@@ -11540,27 +16200,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-json-compat-utils": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz",
-      "integrity": "sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==",
-      "dev": true,
-      "dependencies": {
-        "esquery": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "jsonc-eslint-parser": "^2.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@eslint/json": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-module-utils": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
@@ -11891,15 +16530,13 @@
       }
     },
     "node_modules/eslint-plugin-jsonc": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.19.1.tgz",
-      "integrity": "sha512-MmlAOaZK1+Lg7YoCZPGRjb88ZjT+ct/KTsvcsbZdBm+w8WMzGx+XEmexk0m40P1WV9G2rFV7X3klyRGRpFXEjA==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz",
+      "integrity": "sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "eslint-compat-utils": "^0.6.0",
-        "eslint-json-compat-utils": "^0.2.1",
+        "eslint-compat-utils": "^0.5.0",
         "espree": "^9.6.1",
         "graphemer": "^1.4.0",
         "jsonc-eslint-parser": "^2.0.4",
@@ -12012,7 +16649,6 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -12024,7 +16660,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -12040,7 +16675,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12055,7 +16689,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12065,7 +16698,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12081,7 +16713,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12092,14 +16723,12 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12111,7 +16740,6 @@
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -12127,7 +16755,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -12143,7 +16770,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -12155,7 +16781,6 @@
       "version": "13.24.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
       "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -12170,7 +16795,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12178,14 +16802,12 @@
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -12200,7 +16822,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -12212,7 +16833,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -12227,7 +16847,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12239,7 +16858,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12251,7 +16869,6 @@
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -12278,10 +16895,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-      "dev": true,
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -12293,7 +16909,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -12305,7 +16920,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -12314,7 +16928,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12382,11 +16995,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/exenv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
-    },
     "node_modules/exponential-backoff": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -12394,9 +17002,9 @@
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -12417,7 +17025,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -12432,10 +17040,6 @@
       },
       "engines": {
         "node": ">= 0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express-rate-limit": {
@@ -12444,12 +17048,11 @@
       "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
     },
     "node_modules/express-static-gzip": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz",
-      "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
+      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
       "dev": true,
       "dependencies": {
-        "parseurl": "^1.3.3",
         "serve-static": "^1.16.2"
       }
     },
@@ -12582,8 +17185,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -12608,14 +17210,12 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-printf": {
       "version": "1.6.9",
@@ -12632,8 +17232,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
       "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
@@ -12692,7 +17291,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -12835,7 +17433,6 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
       "bin": {
         "flat": "cli.js"
       }
@@ -12844,7 +17441,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -12857,8 +17453,7 @@
     "node_modules/flatted": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
     },
     "node_modules/follow-redirects": {
       "version": "1.15.6",
@@ -12889,9 +17484,9 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
       "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.0",
@@ -13001,8 +17596,7 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/fscreen": {
       "version": "1.2.0",
@@ -13013,6 +17607,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -13073,6 +17668,18 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -13155,7 +17762,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -13192,7 +17798,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -13202,7 +17807,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13298,8 +17902,7 @@
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
@@ -13320,6 +17923,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -13409,13 +18013,10 @@
       }
     },
     "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/hpack.js": {
       "version": "2.1.6",
@@ -13627,9 +18228,9 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
         "agent-base": "^7.0.2",
@@ -13648,6 +18249,15 @@
         "node": ">=8.12.0"
       }
     },
+    "node_modules/hyperdyperid": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
+      "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.18"
+      }
+    },
     "node_modules/hyphenate-style-name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
@@ -13719,7 +18329,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
       "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
-      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -13775,7 +18384,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -13791,7 +18399,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -13831,7 +18438,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -13856,7 +18462,6 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -13868,9 +18473,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
-      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -14009,6 +18614,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -14049,6 +18655,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
     "node_modules/is-core-module": {
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
@@ -14141,6 +18759,39 @@
       "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
       "integrity": "sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g=="
     },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
@@ -14184,6 +18835,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-network-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
+      "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -14222,7 +18885,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14238,6 +18900,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -14393,10 +19064,9 @@
       }
     },
     "node_modules/isbot": {
-      "version": "5.1.22",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.22.tgz",
-      "integrity": "sha512-RqCFY3cJy3c2y1I+rMn81cfzAR4XJwfPBC+M8kffUjbPzxApzyyv7Tbm1C/gXXq2dSCuD238pKFEWlQMTWsTFw==",
-      "license": "Unlicense",
+      "version": "5.1.17",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz",
+      "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==",
       "engines": {
         "node": ">=18"
       }
@@ -14410,7 +19080,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14440,28 +19109,19 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report": {
@@ -14591,16 +19251,13 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.1.tgz",
-      "integrity": "sha512-U23pQPDnmYybVkYjObcuYMk43VRlMLLqLI+RdZy8s8WV8WsxO9SnqSroKaluuvcNOdCAlauKszDwd+umbot5Mg==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -14837,8 +19494,7 @@
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "3.0.2",
@@ -14864,8 +19520,7 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -14929,9 +19584,9 @@
       ]
     },
     "node_modules/jsonschema": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz",
-      "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
+      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
       "engines": {
         "node": "*"
       }
@@ -15460,7 +20115,6 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -15469,11 +20123,20 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaro": {
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/klaro/-/klaro-0.7.21.tgz",
+      "integrity": "sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==",
+      "dependencies": {
+        "@babel/eslint-parser": "^7.23.10",
+        "sass": "^1.25.0",
+        "webpack-merge": "^5.10.0"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -15538,23 +20201,29 @@
       }
     },
     "node_modules/less-loader": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
-      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz",
+      "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==",
       "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4"
-      },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
         "less": "^3.5.0 || ^4.0.0",
         "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/less/node_modules/make-dir": {
@@ -15618,7 +20287,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -15746,6 +20414,31 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/lmdb": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz",
+      "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "msgpackr": "^1.10.2",
+        "node-addon-api": "^6.1.0",
+        "node-gyp-build-optional-packages": "5.2.2",
+        "ordered-binary": "^1.4.1",
+        "weak-lru-cache": "^1.2.2"
+      },
+      "bin": {
+        "download-lmdb-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@lmdb/lmdb-darwin-arm64": "3.0.13",
+        "@lmdb/lmdb-darwin-x64": "3.0.13",
+        "@lmdb/lmdb-linux-arm": "3.0.13",
+        "@lmdb/lmdb-linux-arm64": "3.0.13",
+        "@lmdb/lmdb-linux-x64": "3.0.13",
+        "@lmdb/lmdb-win32-x64": "3.0.13"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -15756,9 +20449,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+      "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
       "dev": true,
       "engines": {
         "node": ">= 12.13.0"
@@ -15798,8 +20491,7 @@
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -15997,15 +20689,12 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-dir": {
@@ -16065,9 +20754,9 @@
       }
     },
     "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "18.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
+      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
@@ -16100,9 +20789,9 @@
       }
     },
     "node_modules/make-fetch-happen/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -16115,21 +20804,15 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/make-fetch-happen/node_modules/minipass": {
       "version": "7.1.2",
@@ -16152,15 +20835,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/make-fetch-happen/node_modules/ssri": {
       "version": "10.0.6",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
@@ -16371,10 +21045,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
-      "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
+      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^4.0.0",
@@ -16483,16 +21169,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.3.1",
-        "minipass": "^3.0.0"
-      }
-    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
@@ -16531,11 +21207,11 @@
       }
     },
     "node_modules/mirador": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.3.tgz",
-      "integrity": "sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz",
+      "integrity": "sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==",
       "dependencies": {
-        "@material-ui/core": "^4.12.3",
+        "@material-ui/core": "^4.11.0",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
         "@researchgate/react-intersection-observer": "^1.0.0",
@@ -16552,7 +21228,7 @@
         "lodash": "^4.17.11",
         "manifesto.js": "^4.2.0",
         "normalize-url": "^4.5.0",
-        "openseadragon": "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0",
+        "openseadragon": "^2.4.2",
         "prop-types": "^15.6.2",
         "re-reselect": "^4.0.0",
         "react-aria-live": "^2.0.5",
@@ -16684,9 +21360,40 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/msgpackr": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz",
+      "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==",
+      "dev": true,
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
@@ -16711,9 +21418,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "funding": [
         {
           "type": "github",
@@ -16730,8 +21437,7 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/needle": {
       "version": "3.3.1",
@@ -16778,18 +21484,18 @@
       "dev": true
     },
     "node_modules/ng-mocks": {
-      "version": "14.13.2",
-      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.2.tgz",
-      "integrity": "sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==",
+      "version": "14.13.1",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
+      "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
       "peerDependencies": {
-        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
-        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
-        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
-        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19"
+        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
+        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18"
       }
     },
     "node_modules/ng2-file-upload": {
@@ -16854,19 +21560,6 @@
         "@angular/core": ">=13.0.0"
       }
     },
-    "node_modules/ngx-skeleton-loader": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-9.0.0.tgz",
-      "integrity": "sha512-aO4/V6oGdZGNcTjasTg/fwzJJYl/ZmNKgCukOEQdUK3GSFOZtB/3GGULMJuZ939hk3Hzqh1OBiLfIM1SqTfhqg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": ">=16.0.0",
-        "@angular/core": ">=16.0.0"
-      }
-    },
     "node_modules/ngx-ui-switch": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz",
@@ -16897,13 +21590,19 @@
         "node-gyp-build": "^4.2.2"
       }
     },
-    "node_modules/node-addon-api": {
+    "node_modules/nice-napi/node_modules/node-addon-api": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
       "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "dev": true,
       "optional": true
     },
+    "node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -16933,9 +21632,9 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
-      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz",
+      "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==",
       "dev": true,
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -16944,9 +21643,9 @@
         "graceful-fs": "^4.2.6",
         "make-fetch-happen": "^13.0.0",
         "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.1.0",
         "semver": "^7.3.5",
-        "tar": "^6.1.2",
+        "tar": "^6.2.1",
         "which": "^4.0.0"
       },
       "bin": {
@@ -16957,9 +21656,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
-      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz",
+      "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -16968,10 +21667,33 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "dev": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
+    "node_modules/node-gyp-build-optional-packages/node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -16984,9 +21706,6 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -17130,6 +21849,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17225,13 +21945,13 @@
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz",
-      "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
+      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
       "dev": true,
       "dependencies": {
         "hosted-git-info": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.0.0",
         "semver": "^7.3.5",
         "validate-npm-package-name": "^5.0.0"
       },
@@ -17252,9 +21972,9 @@
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz",
-      "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
+      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
       "dev": true,
       "dependencies": {
         "npm-install-checks": "^6.0.0",
@@ -17267,16 +21987,16 @@
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "16.2.1",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz",
-      "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
+      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
       "dev": true,
       "dependencies": {
-        "@npmcli/redact": "^1.1.0",
+        "@npmcli/redact": "^2.0.0",
+        "jsonparse": "^1.3.1",
         "make-fetch-happen": "^13.0.0",
         "minipass": "^7.0.2",
         "minipass-fetch": "^3.0.0",
-        "minipass-json-stream": "^1.0.1",
         "minizlib": "^2.1.2",
         "npm-package-arg": "^11.0.0",
         "proc-log": "^4.0.0"
@@ -17294,15 +22014,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -17450,7 +22161,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -17521,7 +22231,6 @@
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -17627,18 +22336,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/orejime": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.1.tgz",
-      "integrity": "sha512-LpJCuOG7mvR5fwD3wr+FoHPG+DX2t7+dJ4gBZnWICnNHtOTNuBzne0T+JcK0nW30JjiYULq1vfOaSLU2qmHCPg==",
-      "dependencies": {
-        "@babel/runtime": "^7.1.2",
-        "react-modal": "^3.13.1"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16"
-      }
+    "node_modules/ordered-binary": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
+      "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
+      "dev": true
     },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
@@ -17666,7 +22368,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -17776,38 +22477,37 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "dev": true
     },
     "node_modules/pacote": {
-      "version": "17.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
-      "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==",
+      "version": "18.0.6",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
+      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
       "dev": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
         "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/package-json": "^5.1.0",
         "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^7.0.0",
+        "@npmcli/run-script": "^8.0.0",
         "cacache": "^18.0.0",
         "fs-minipass": "^3.0.0",
         "minipass": "^7.0.2",
         "npm-package-arg": "^11.0.0",
         "npm-packlist": "^8.0.0",
         "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^16.0.0",
-        "proc-log": "^3.0.0",
+        "npm-registry-fetch": "^17.0.0",
+        "proc-log": "^4.0.0",
         "promise-retry": "^2.0.1",
-        "read-package-json": "^7.0.0",
-        "read-package-json-fast": "^3.0.0",
         "sigstore": "^2.2.0",
         "ssri": "^10.0.0",
         "tar": "^6.1.11"
       },
       "bin": {
-        "pacote": "lib/bin.js"
+        "pacote": "bin/index.js"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -17826,9 +22526,9 @@
       }
     },
     "node_modules/pacote/node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "18.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
+      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
@@ -17861,9 +22561,9 @@
       }
     },
     "node_modules/pacote/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -17876,21 +22576,15 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/pacote/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/pacote/node_modules/minipass": {
       "version": "7.1.2",
@@ -17953,7 +22647,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -18050,7 +22743,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18059,7 +22751,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18068,7 +22759,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18096,13 +22786,10 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/path-scurry/node_modules/minipass": {
       "version": "7.1.2",
@@ -18114,9 +22801,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -18180,9 +22867,9 @@
       }
     },
     "node_modules/piscina": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz",
-      "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz",
+      "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==",
       "dev": true,
       "optionalDependencies": {
         "nice-napi": "^1.0.2"
@@ -18322,9 +23009,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -18340,8 +23027,8 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.8",
-        "picocolors": "^1.1.1",
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.0",
         "source-map-js": "^1.2.1"
       },
       "engines": {
@@ -18799,13 +23486,13 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
+      "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -18815,13 +23502,26 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -18830,6 +23530,19 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -19071,7 +23784,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -19089,9 +23801,9 @@
       }
     },
     "node_modules/proc-log": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -19183,6 +23895,12 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -19228,6 +23946,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -19283,6 +24007,14 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/re-reselect": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz",
@@ -19500,29 +24232,6 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
-    "node_modules/react-modal": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
-      "dependencies": {
-        "exenv": "^1.2.0",
-        "prop-types": "^15.7.2",
-        "react-lifecycles-compat": "^3.0.0",
-        "warning": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
-      }
-    },
     "node_modules/react-mosaic-component": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz",
@@ -19661,67 +24370,6 @@
         "pify": "^2.3.0"
       }
     },
-    "node_modules/read-package-json": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz",
-      "integrity": "sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==",
-      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
-      "dev": true,
-      "dependencies": {
-        "glob": "^10.2.2",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-package-json-fast": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
-      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
-      "dev": true,
-      "dependencies": {
-        "json-parse-even-better-errors": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-package-json/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/read-package-json/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -19740,6 +24388,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -19751,6 +24400,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -19888,9 +24538,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
-      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
+      "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
       "dev": true,
       "dependencies": {
         "jsesc": "~3.0.2"
@@ -20135,7 +24785,6 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -20202,6 +24851,18 @@
         "@babel/runtime": "^7.1.2"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
+      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/run-async": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
@@ -20391,14 +25052,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.84.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
-      "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
-      "dev": true,
-      "license": "MIT",
+      "version": "1.80.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.4.tgz",
+      "integrity": "sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==",
       "dependencies": {
+        "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
-        "immutable": "^5.0.2",
+        "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -20406,9 +25066,6 @@
       },
       "engines": {
         "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
@@ -20549,7 +25206,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
       "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
-      "dev": true,
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -20561,16 +25217,14 @@
       }
     },
     "node_modules/sass/node_modules/immutable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
-      "dev": true
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="
     },
     "node_modules/sass/node_modules/readdirp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
       "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
-      "dev": true,
       "engines": {
         "node": ">= 14.16.0"
       },
@@ -20711,11 +25365,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -20873,7 +25522,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -20890,7 +25538,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -20902,7 +25549,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -21561,7 +26207,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -21573,6 +26218,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -21794,8 +26440,19 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "node_modules/thingies": {
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
+      "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.18"
+      },
+      "peerDependencies": {
+        "tslib": "^2"
+      }
     },
     "node_modules/throttle-debounce": {
       "version": "2.3.0",
@@ -21836,24 +26493,6 @@
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
-    "node_modules/tldts": {
-      "version": "6.1.65",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.65.tgz",
-      "integrity": "sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==",
-      "dev": true,
-      "dependencies": {
-        "tldts-core": "^6.1.65"
-      },
-      "bin": {
-        "tldts": "bin/cli.js"
-      }
-    },
-    "node_modules/tldts-core": {
-      "version": "6.1.65",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.65.tgz",
-      "integrity": "sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==",
-      "dev": true
-    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
@@ -21863,14 +26502,6 @@
         "node": ">=14.14"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -21905,15 +26536,36 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
-      "integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
       "dependencies": {
-        "tldts": "^6.1.32"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/tr46": {
@@ -21921,6 +26573,22 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
     },
+    "node_modules/tree-dump": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
+      "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -22061,7 +26729,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -22268,9 +26935,7 @@
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/unfetch": {
       "version": "4.2.0",
@@ -22317,6 +26982,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
@@ -22362,9 +27039,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "funding": [
         {
           "type": "opencollective",
@@ -22380,8 +27057,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -22394,7 +27071,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -22403,11 +27079,20 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/use-memo-one": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
@@ -22494,18 +27179,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -22533,24 +27210,30 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/weak-lru-cache": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
+      "dev": true
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.97.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
-      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
-        "browserslist": "^4.24.0",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -22639,19 +27322,20 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz",
-      "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
+      "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
       "dev": true,
       "dependencies": {
         "colorette": "^2.0.10",
-        "memfs": "^3.4.12",
+        "memfs": "^4.6.0",
         "mime-types": "^2.1.31",
+        "on-finished": "^2.4.1",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22666,6 +27350,25 @@
         }
       }
     },
+    "node_modules/webpack-dev-middleware/node_modules/memfs": {
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
+      "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
+      "dev": true,
+      "dependencies": {
+        "@jsonjoy.com/json-pack": "^1.0.3",
+        "@jsonjoy.com/util": "^1.3.0",
+        "tree-dump": "^1.0.1",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      }
+    },
     "node_modules/webpack-dev-server": {
       "version": "4.15.2",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
@@ -22770,7 +27473,6 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
       "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
-      "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
@@ -23004,14 +27706,12 @@
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-      "dev": true
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
     },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -23117,8 +27817,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/ws": {
       "version": "8.17.1",
@@ -23230,7 +27929,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -23238,6 +27936,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/zone.js": {
       "version": "0.14.10",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
diff --git a/package.json b/package.json
index d1c5a97e0e..a8d70da9d7 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,10 @@
     "start:mirador:prod": "npm run build:mirador && npm run start:prod",
     "preserve": "npm run base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
-    "serve:ssr": "node dist/server/main",
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
     "build:prod": "cross-env NODE_ENV=production npm run build:ssr",
-    "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "build:lint": "rimraf 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
@@ -98,19 +96,19 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "^17.3.12",
+    "@angular/animations": "^18.2.12",
     "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.12",
-    "@angular/compiler": "^17.3.12",
-    "@angular/core": "^17.3.12",
-    "@angular/forms": "^17.3.12",
-    "@angular/localize": "^17.3.12",
-    "@angular/platform-browser": "^17.3.12",
-    "@angular/platform-browser-dynamic": "^17.3.12",
-    "@angular/platform-server": "^17.3.12",
-    "@angular/router": "^17.3.12",
-    "@angular/ssr": "^17.3.11",
-    "@babel/runtime": "7.26.7",
+    "@angular/common": "^18.2.12",
+    "@angular/compiler": "^18.2.12",
+    "@angular/core": "^18.2.12",
+    "@angular/forms": "^18.2.12",
+    "@angular/localize": "^18.2.12",
+    "@angular/platform-browser": "^18.2.12",
+    "@angular/platform-browser-dynamic": "^18.2.12",
+    "@angular/platform-server": "^18.2.12",
+    "@angular/router": "^18.2.12",
+    "@angular/ssr": "^18.2.12",
+    "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
@@ -168,7 +166,7 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.11",
+    "@angular-devkit/build-angular": "^18.2.12",
     "@angular-eslint/builder": "^18.4.1",
     "@angular-eslint/bundled-angular-compiler": "^18.4.1",
     "@angular-eslint/eslint-plugin": "^18.4.1",
@@ -176,9 +174,9 @@
     "@angular-eslint/schematics": "^18.4.1",
     "@angular-eslint/template-parser": "^18.4.1",
     "@angular-eslint/utils": "^18.4.1",
-    "@angular/cli": "^17.3.11",
-    "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.12",
+    "@angular/cli": "^18.2.12",
+    "@angular/compiler-cli": "^18.2.12",
+    "@angular/language-service": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@ngrx/store-devtools": "^17.1.1",
@@ -241,4 +239,4 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
index dff6445225..7c6428c4dc 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -20,6 +20,7 @@ import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.mode
 import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
 
 import { FilteredCollectionsComponent } from './filtered-collections.component';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('FiltersComponent', () => {
   let component: FilteredCollectionsComponent;
@@ -39,23 +40,22 @@ describe('FiltersComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [
-        NgbAccordionModule,
+    schemas: [NO_ERRORS_SCHEMA],
+    imports: [NgbAccordionModule,
         TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock,
-          },
+            loader: {
+                provide: TranslateLoader,
+                useClass: TranslateLoaderMock,
+            },
         }),
-        HttpClientTestingModule,
-        FilteredCollectionsComponent,
-      ],
-      providers: [
+        FilteredCollectionsComponent],
+    providers: [
         FormBuilder,
         DspaceRestService,
-      ],
-      schemas: [NO_ERRORS_SCHEMA],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
   }));
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index d824df472a..ceb8e3bc59 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -1,8 +1,5 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -28,19 +25,21 @@ describe(`AuthInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
+    imports: [],
+    providers: [
         DspaceRestService,
         { provide: AuthService, useValue: authServiceStub },
         { provide: Router, useClass: RouterStub },
         {
-          provide: HTTP_INTERCEPTORS,
-          useClass: AuthInterceptor,
-          multi: true,
+            provide: HTTP_INTERCEPTORS,
+            useClass: AuthInterceptor,
+            multi: true,
         },
         { provide: Store, useValue: store },
-      ],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index d011d27059..becc03f046 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -1,13 +1,4 @@
-import {
-  HttpErrorResponse,
-  HttpEvent,
-  HttpHandler,
-  HttpHeaders,
-  HttpInterceptor,
-  HttpRequest,
-  HttpResponse,
-  HttpResponseBase,
-} from '@angular/common/http';
+import { HttpErrorResponse, HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest, HttpResponse, HttpResponseBase } from '@angular/common/http';
 import {
   Injectable,
   Injector,
diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts
index b119f6b3b7..ff7b661078 100644
--- a/src/app/core/auth/server-auth-request.service.spec.ts
+++ b/src/app/core/auth/server-auth-request.service.spec.ts
@@ -1,8 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-  HttpResponse,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
 import {
   Observable,
   of as observableOf,
diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts
index 5f1828c71c..28b5566c15 100644
--- a/src/app/core/auth/server-auth-request.service.ts
+++ b/src/app/core/auth/server-auth-request.service.ts
@@ -1,8 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-  HttpResponse,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index 90a3fab83a..1b5c348c6d 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -1,7 +1,4 @@
-import {
-  HttpHeaders,
-  HttpParams,
-} from '@angular/common/http';
+import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts
index 502b1fe710..a193f5aa96 100644
--- a/src/app/core/data/identifier-data.service.ts
+++ b/src/app/core/data/identifier-data.service.ts
@@ -1,8 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-  HttpParams,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/dspace-rest/dspace-rest.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
index 4dd856b48e..11f0ae94d1 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,11 +1,5 @@
-import {
-  HttpErrorResponse,
-  HttpHeaders,
-} from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HttpErrorResponse, HttpHeaders, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import {
   inject,
   TestBed,
@@ -33,9 +27,9 @@ describe('DspaceRestService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [DspaceRestService],
-    });
+    imports: [],
+    providers: [DspaceRestService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
+});
 
     dspaceRestService = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index a75cef53bf..e32566043a 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -1,10 +1,4 @@
-import {
-  HttpClient,
-  HttpErrorResponse,
-  HttpHeaders,
-  HttpParams,
-  HttpResponse,
-} from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
   Observable,
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
index 82fb36ce66..159f129b3f 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -1,8 +1,5 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { REQUEST } from '../../../express.tokens';
@@ -21,17 +18,19 @@ describe('ForwardClientIpInterceptor', () => {
     clientIp = '1.2.3.4';
 
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
+    imports: [],
+    providers: [
         DspaceRestService,
         {
-          provide: HTTP_INTERCEPTORS,
-          useClass: ForwardClientIpInterceptor,
-          multi: true,
+            provide: HTTP_INTERCEPTORS,
+            useClass: ForwardClientIpInterceptor,
+            multi: true,
         },
         { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
-      ],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index 7fe4263d46..b36c56752c 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -1,9 +1,4 @@
-import {
-  HttpEvent,
-  HttpHandler,
-  HttpInterceptor,
-  HttpRequest,
-} from '@angular/common/http';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import {
   Inject,
   Injectable,
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
index 4725820a6b..52868efc0a 100644
--- a/src/app/core/locale/locale.interceptor.spec.ts
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -1,8 +1,5 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
@@ -25,17 +22,19 @@ describe(`LocaleInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
+    imports: [],
+    providers: [
         DspaceRestService,
         {
-          provide: HTTP_INTERCEPTORS,
-          useClass: LocaleInterceptor,
-          multi: true,
+            provide: HTTP_INTERCEPTORS,
+            useClass: LocaleInterceptor,
+            multi: true,
         },
         { provide: LocaleService, useValue: mockLocaleService },
-      ],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/locale/locale.interceptor.ts b/src/app/core/locale/locale.interceptor.ts
index 6dfa19485d..fea345604d 100644
--- a/src/app/core/locale/locale.interceptor.ts
+++ b/src/app/core/locale/locale.interceptor.ts
@@ -1,9 +1,4 @@
-import {
-  HttpEvent,
-  HttpHandler,
-  HttpInterceptor,
-  HttpRequest,
-} from '@angular/common/http';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
index 7a3c11fccc..dda3052a03 100644
--- a/src/app/core/log/log.interceptor.spec.ts
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -1,8 +1,5 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
@@ -39,24 +36,23 @@ describe('LogInterceptor', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        HttpClientTestingModule,
-        StoreModule.forRoot(appReducers, storeModuleConfig),
-      ],
-      providers: [
+    imports: [StoreModule.forRoot(appReducers, storeModuleConfig)],
+    providers: [
         DspaceRestService,
         // LogInterceptor,
         {
-          provide: HTTP_INTERCEPTORS,
-          useClass: LogInterceptor,
-          multi: true,
+            provide: HTTP_INTERCEPTORS,
+            useClass: LogInterceptor,
+            multi: true,
         },
         { provide: CookieService, useValue: new CookieServiceMock() },
         { provide: Router, useValue: router },
         { provide: CorrelationIdService, useClass: CorrelationIdService },
         { provide: UUIDService, useClass: UUIDService },
-      ],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index bda408278f..d9c67f9628 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -1,9 +1,4 @@
-import {
-  HttpEvent,
-  HttpHandler,
-  HttpInterceptor,
-  HttpRequest,
-} from '@angular/common/http';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
index 7e6e888417..b4db9d6361 100644
--- a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
@@ -1,7 +1,4 @@
-import {
-  HttpHeaders,
-  HttpParams,
-} from '@angular/common/http';
+import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ReplaceOperation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/profile/researcher-profile-data.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
index ccaa7063dd..bc6106fc8e 100644
--- a/src/app/core/profile/researcher-profile-data.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -1,7 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { ReplaceOperation } from 'fast-json-patch';
 import {
   cold,
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index 8837792a78..fa24bcc2d9 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -1,7 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { waitForAsync } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import {
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index 17aafaf651..ef09ce5768 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,7 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
index aba3edd330..5a1875a759 100644
--- a/src/app/core/xsrf/browser-xsrf.service.spec.ts
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -1,8 +1,5 @@
-import { HttpClient } from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
@@ -17,9 +14,9 @@ describe(`BrowserXSRFService`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [ HttpClientTestingModule ],
-      providers: [ BrowserXSRFService ],
-    });
+    imports: [],
+    providers: [BrowserXSRFService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
+});
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
     service = TestBed.inject(BrowserXSRFService);
diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index 1668407e04..634593142a 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -1,12 +1,5 @@
-import {
-  HTTP_INTERCEPTORS,
-  HttpHeaders,
-  HttpXsrfTokenExtractor,
-} from '@angular/common/http';
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HTTP_INTERCEPTORS, HttpHeaders, HttpXsrfTokenExtractor, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
@@ -35,18 +28,20 @@ describe(`XsrfInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
+    imports: [],
+    providers: [
         DspaceRestService,
         {
-          provide: HTTP_INTERCEPTORS,
-          useClass: XsrfInterceptor,
-          multi: true,
+            provide: HTTP_INTERCEPTORS,
+            useClass: XsrfInterceptor,
+            multi: true,
         },
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
         { provide: CookieService, useValue: new CookieServiceMock() },
-      ],
-    });
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+});
 
     service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts
index 91e780590b..3155d73fe5 100644
--- a/src/app/core/xsrf/xsrf.interceptor.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.ts
@@ -1,12 +1,4 @@
-import {
-  HttpErrorResponse,
-  HttpEvent,
-  HttpHandler,
-  HttpInterceptor,
-  HttpRequest,
-  HttpResponse,
-  HttpXsrfTokenExtractor,
-} from '@angular/common/http';
+import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse, HttpXsrfTokenExtractor } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
   Observable,
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 2dce8302ce..1f96be936e 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,7 +1,4 @@
-import {
-  HttpClientTestingModule,
-  HttpTestingController,
-} from '@angular/common/http/testing';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import {
   DebugElement,
   NO_ERRORS_SCHEMA,
@@ -25,6 +22,7 @@ import {
 import { LangConfig } from '../../../config/lang-config.interface';
 import { LocaleService } from '../../core/locale/locale.service';
 import { LangSwitchComponent } from './lang-switch.component';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -83,15 +81,17 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
-          loader: { provide: TranslateLoader, useClass: CustomLoader },
+    schemas: [NO_ERRORS_SCHEMA],
+    imports: [TranslateModule.forRoot({
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
-        providers: [
-          TranslateService,
-          { provide: LocaleService, useValue: getMockLocaleService() },
-        ],
-      }).compileComponents()
+    providers: [
+        TranslateService,
+        { provide: LocaleService, useValue: getMockLocaleService() },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+}).compileComponents()
         .then(() => {
           translate = TestBed.inject(TranslateService);
           translate.addLangs(mockConfig.languages.filter((langConfig: LangConfig) => langConfig.active === true).map((a) => a.code));
@@ -166,15 +166,17 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
-          loader: { provide: TranslateLoader, useClass: CustomLoader },
+    schemas: [NO_ERRORS_SCHEMA],
+    imports: [TranslateModule.forRoot({
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
-        providers: [
-          TranslateService,
-          { provide: LocaleService, useValue: getMockLocaleService() },
-        ],
-      }).compileComponents();
+    providers: [
+        TranslateService,
+        { provide: LocaleService, useValue: getMockLocaleService() },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+    ]
+}).compileComponents();
       translate = TestBed.inject(TranslateService);
       translate.addLangs(mockConfig.languages.filter((MyLangConfig) => MyLangConfig.active === true).map((a) => a.code));
       translate.setDefaultLang('en');
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
index 84664b7b20..26e3733a36 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
@@ -1,7 +1,4 @@
-import {
-  HttpHeaders,
-  HttpResponse,
-} from '@angular/common/http';
+import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { of as observableOf } from 'rxjs';
 
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index bfdbe4d6d7..acad4b764b 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -1,7 +1,4 @@
-import {
-  HttpClient,
-  HttpHeaders,
-} from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import {
   Inject,
   Injectable,
diff --git a/src/modules/app/browser-app.config.ts b/src/modules/app/browser-app.config.ts
index 213b9de2f7..f668b6a3c0 100644
--- a/src/modules/app/browser-app.config.ts
+++ b/src/modules/app/browser-app.config.ts
@@ -1,8 +1,4 @@
-import {
-  HttpClient,
-  provideHttpClient,
-  withInterceptorsFromDi,
-} from '@angular/common/http';
+import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {
   APP_ID,
   APP_INITIALIZER,
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 14e42d09e4..98d7561b8d 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -1,6 +1,6 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -203,24 +203,19 @@ const DECLARATIONS = [
   SearchResultsSkeletonComponent,
 ];
 
-@NgModule({
-  imports: [
-    RootModule,
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    HttpClientModule,
-    NgbModule,
-    RouterModule,
-    ScrollToModule,
-    StoreModule,
-    StoreRouterConnectingModule,
-    TranslateModule,
-    FormsModule,
-    NgxGalleryModule,
-    ...DECLARATIONS,
-  ],
-})
+@NgModule({ imports: [RootModule,
+        CommonModule,
+        DragDropModule,
+        FormsModule,
+        NgbModule,
+        RouterModule,
+        ScrollToModule,
+        StoreModule,
+        StoreRouterConnectingModule,
+        TranslateModule,
+        FormsModule,
+        NgxGalleryModule,
+        ...DECLARATIONS], providers: [provideHttpClient(withInterceptorsFromDi())] })
 
 /**
    * This module serves as an index for all the components in this theme.
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 9d26b19536..51baf83081 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -1,6 +1,6 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -15,23 +15,17 @@ import { RootModule } from '../../app/root.module';
 const DECLARATIONS = [
 ];
 
-@NgModule({
-  imports: [
-    RootModule,
-    CommonModule,
-    DragDropModule,
-    FormsModule,
-    HttpClientModule,
-    NgbModule,
-    RouterModule,
-    ScrollToModule,
-    StoreModule,
-    StoreRouterConnectingModule,
-    TranslateModule,
-    FormsModule,
-  ],
-  declarations: DECLARATIONS,
-})
+@NgModule({ declarations: DECLARATIONS, imports: [RootModule,
+        CommonModule,
+        DragDropModule,
+        FormsModule,
+        NgbModule,
+        RouterModule,
+        ScrollToModule,
+        StoreModule,
+        StoreRouterConnectingModule,
+        TranslateModule,
+        FormsModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
 
 /**
  * This module serves as an index for all the components in this theme.
diff --git a/tsconfig.json b/tsconfig.json
index afd00f8568..2603ba05ef 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,8 +8,8 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "declaration": false,
-    "downlevelIteration": true,
     "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
     "experimentalDecorators": true,
     "sourceMap": true,
     "module": "es2020",
@@ -20,7 +20,6 @@
     "strictNullChecks": false,
     "skipDefaultLibCheck": true,
     "pretty": true,
-    "allowSyntheticDefaultImports": true,
     "target": "ES2022",
     "typeRoots": [
       "node_modules/@types",

From bb55534f2c9e6f750fac34e327db1781433dca94 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 13:24:05 +0100
Subject: [PATCH 1252/1286] 120243: Restore serve:ssr and build:ssr after
 upgrade

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

diff --git a/package.json b/package.json
index a8d70da9d7..2db5cd691d 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,12 @@
     "start:mirador:prod": "npm run build:mirador && npm run start:prod",
     "preserve": "npm run base-href",
     "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
+    "serve:ssr": "node dist/server/main",
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
     "build:prod": "cross-env NODE_ENV=production npm run build:ssr",
+    "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "build:lint": "rimraf 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",

From 3a049da62035807123ea993247fc4b5dc0cd42c4 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 09:51:31 +0100
Subject: [PATCH 1253/1286] 120243: ng update @ngrx/effects

---
 package-lock.json | 61 +++++++++++++++++++----------------------------
 package.json      | 11 +++++----
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a3bf97cfcd..ee7a469d8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,9 +26,9 @@
         "@ng-bootstrap/ng-bootstrap": "^12.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
         "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
-        "@ngrx/effects": "^17.1.1",
-        "@ngrx/router-store": "^17.1.1",
-        "@ngrx/store": "^17.1.1",
+        "@ngrx/effects": "^18.1.1",
+        "@ngrx/router-store": "^18.1.1",
+        "@ngrx/store": "^18.1.1",
         "@ngx-translate/core": "^14.0.0",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
@@ -91,7 +91,7 @@
         "@angular/language-service": "^18.2.12",
         "@cypress/schematic": "^1.5.0",
         "@fortawesome/fontawesome-free": "^6.6.0",
-        "@ngrx/store-devtools": "^17.1.1",
+        "@ngrx/store-devtools": "^18.1.1",
         "@ngtools/webpack": "^16.2.16",
         "@types/deep-freeze": "0.1.5",
         "@types/ejs": "^3.1.2",
@@ -10210,67 +10210,56 @@
       }
     },
     "node_modules/@ngrx/effects": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.2.0.tgz",
-      "integrity": "sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.1.1.tgz",
+      "integrity": "sha512-XXob8kYEvYMaZwgHtrrTW0XZargbu5PloEpNHLnzB8jPk0yWEw6keryxaF09Ylws1779MWvMmF/YP2rPl04nHQ==",
       "dependencies": {
-        "@ngrx/operators": "17.0.0-beta.0",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^17.0.0",
-        "@ngrx/store": "17.2.0",
+        "@angular/core": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
-    "node_modules/@ngrx/operators": {
-      "version": "17.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-17.0.0-beta.0.tgz",
-      "integrity": "sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A==",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
     "node_modules/@ngrx/router-store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-17.2.0.tgz",
-      "integrity": "sha512-Vynfg2xsB57Oedf0Bb6mjC4MIeaF2OtAewsSnppGIM2b8pwL5W89r2+q2SGc2D6Mp3/pZF3HRI6NxhnHWJdYmg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.1.1.tgz",
+      "integrity": "sha512-S1/09T8EJHso1keOZ2Q3hb1oAsdJ/FSEWkn24yWJXftbXOKJq1jnrYhNaVm5gPnxGzdQ1mqRtLuMKaDClyxP5A==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0",
-        "@angular/core": "^17.0.0",
-        "@angular/router": "^17.0.0",
-        "@ngrx/store": "17.2.0",
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0",
+        "@angular/router": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngrx/store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.2.0.tgz",
-      "integrity": "sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.1.1.tgz",
+      "integrity": "sha512-K0v1akJ2sEnIeb1AUA064+ksgRgbMgVG9HbSsLBxENbFjK2ZvKRxo1bpOw6WHW9+hyDTlhZGl7+gUtjmo3497g==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^17.0.0",
+        "@angular/core": "^18.0.0",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngrx/store-devtools": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-17.2.0.tgz",
-      "integrity": "sha512-ig0qr6hMexZGnrlxfHvZmu5CanRjH7hhx60XUbB5BdBvWJIIRaWKPLcsniiDUhljAD87gvzrrilbCTiML38+CA==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-18.1.1.tgz",
+      "integrity": "sha512-tfn9Ms1q2bl7VDWwHyj7dUbwmGiiVzIpOKZs39rsms8tG8hbvsxoczyQAp2w5erVtoJb8ltIh1/birKkS7HmuQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@ngrx/store": "17.2.0",
+        "@angular/core": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
diff --git a/package.json b/package.json
index 2db5cd691d..d921c04544 100644
--- a/package.json
+++ b/package.json
@@ -115,9 +115,9 @@
     "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
-    "@ngrx/effects": "^17.1.1",
-    "@ngrx/router-store": "^17.1.1",
-    "@ngrx/store": "^17.1.1",
+    "@ngrx/effects": "^18.1.1",
+    "@ngrx/router-store": "^18.1.1",
+    "@ngrx/store": "^18.1.1",
     "@ngx-translate/core": "^14.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
@@ -164,7 +164,8 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "zone.js": "~0.14.10"
+    "zone.js": "~0.14.10",
+    "@ngrx/operators": "^18.0.0"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~17.0.2",
@@ -181,7 +182,7 @@
     "@angular/language-service": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
-    "@ngrx/store-devtools": "^17.1.1",
+    "@ngrx/store-devtools": "^18.1.1",
     "@ngtools/webpack": "^16.2.16",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",

From 54e6471fa5b01cd5ac7693651fd73593dc5b97ed Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 09:53:04 +0100
Subject: [PATCH 1254/1286] 120243: ng update @ngrx-translate/core

---
 package-lock.json | 24 ++++++++++++++++++------
 package.json      |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee7a469d8d..205e571e38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,9 +27,10 @@
         "@ng-dynamic-forms/core": "^16.0.0",
         "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
         "@ngrx/effects": "^18.1.1",
+        "@ngrx/operators": "^18.0.0",
         "@ngrx/router-store": "^18.1.1",
         "@ngrx/store": "^18.1.1",
-        "@ngx-translate/core": "^14.0.0",
+        "@ngx-translate/core": "^16.0.3",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
         "axios": "^1.7.4",
@@ -10222,6 +10223,17 @@
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
+    "node_modules/@ngrx/operators": {
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.1.1.tgz",
+      "integrity": "sha512-RB156PouKI/E79jxvJLaDFYMHz9JVFR8f4ogfAeT7sh2dDGoK4A+B0n1Cl0iYW9fpcJCdfB/mu7TkH6auFv1aQ==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
     "node_modules/@ngrx/router-store": {
       "version": "18.1.1",
       "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.1.1.tgz",
@@ -10280,15 +10292,15 @@
       }
     },
     "node_modules/@ngx-translate/core": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz",
-      "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.3.tgz",
+      "integrity": "sha512-UPse66z9tRUmIpeorYodXBQY6O4foUmj9jy9cCuuja7lqdOwRBWPzCWqc+qYIXv5L2QoqZdxgHtqoUz+Q9weSA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=13.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
+        "@angular/common": ">=16",
+        "@angular/core": ">=16"
       }
     },
     "node_modules/@nicky-lenaers/ngx-scroll-to": {
diff --git a/package.json b/package.json
index d921c04544..2f897ce6e9 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "@ngrx/effects": "^18.1.1",
     "@ngrx/router-store": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@ngx-translate/core": "^14.0.0",
+    "@ngx-translate/core": "^16.0.3",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
     "axios": "^1.7.9",

From 8072d8f0f29344a7a4e1be46c32e798b945aa494 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:00:25 +0100
Subject: [PATCH 1255/1286] 120243: ng update ng2-file-upload

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 205e571e38..e8b2138ad6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
-        "ng2-file-upload": "5.0.0",
+        "ng2-file-upload": "7.0.1",
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^16.0.0",
         "ngx-pagination": "6.0.3",
@@ -21500,15 +21500,15 @@
       }
     },
     "node_modules/ng2-file-upload": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-5.0.0.tgz",
-      "integrity": "sha512-M2JaX0unB/30GmQUScfXko2vseaPlU1R5jnhL5cfvOLNw8BBSVJAdOSmcavJzicgTZWCYz7y7Fvpr939bd4eCA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-7.0.1.tgz",
+      "integrity": "sha512-qqJRzdRehYn6IQyr49qzW4Z3FYYr2ehq/vcn2K933Xf4kxJwhkzWObzJMEDYzhORoTndt+BYfVBNKmN4wjZkyw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^16.0.0",
-        "@angular/core": "^16.0.0"
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0"
       }
     },
     "node_modules/ng2-nouislider": {
diff --git a/package.json b/package.json
index 2f897ce6e9..1bf96f3a31 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng2-file-upload": "5.0.0",
+    "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^16.0.0",
     "ngx-pagination": "6.0.3",

From e259cf4c137e1c9728e6196dd78fa32ca708cbe9 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:17:16 +0100
Subject: [PATCH 1256/1286] 120243: Remove ng2-file-upload from overrides

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 1bf96f3a31..f1784b58c7 100644
--- a/package.json
+++ b/package.json
@@ -88,10 +88,6 @@
     "eslint-plugin-unused-imports": {
       "@typescript-eslint/eslint-plugin": "^7.2.0"
     },
-    "ng2-file-upload": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
-    },
     "ngx-infinite-scroll": {
       "@angular/common": "^17.3.11",
       "@angular/core": "^17.3.11"

From 99b3db365a4f551c608b93b1c0222047a7d750a7 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:07:08 +0100
Subject: [PATCH 1257/1286] 120243: ng update ngx-infinite-scroll

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8b2138ad6..6d1549a628 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "morgan": "^1.10.0",
         "ng2-file-upload": "7.0.1",
         "ng2-nouislider": "^2.0.0",
-        "ngx-infinite-scroll": "^16.0.0",
+        "ngx-infinite-scroll": "^18.0.0",
         "ngx-pagination": "6.0.3",
         "ngx-ui-switch": "^14.1.0",
         "nouislider": "^15.7.1",
@@ -21525,15 +21525,15 @@
       }
     },
     "node_modules/ngx-infinite-scroll": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz",
-      "integrity": "sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==",
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-18.0.0.tgz",
+      "integrity": "sha512-D183TDwpsd9Zl56UmItsl3RzHdN25srAISfg6lc3A8mEKkEgOq0s7ZzRAYcx8DHsAkMgtZqjIPEvMifD3DOB/g==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=16.0.0 <17.0.0",
-        "@angular/core": ">=16.0.0 <17.0.0"
+        "@angular/common": ">=18.0.0 <19.0.0",
+        "@angular/core": ">=18.0.0 <19.0.0"
       }
     },
     "node_modules/ngx-mask": {
diff --git a/package.json b/package.json
index f1784b58c7..6480f4d0aa 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "morgan": "^1.10.0",
     "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
-    "ngx-infinite-scroll": "^16.0.0",
+    "ngx-infinite-scroll": "^18.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-skeleton-loader": "^9.0.0",
     "ngx-ui-switch": "^14.1.0",

From 8150517f137581286ffd4c10a06e3c5eedb670b3 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:10:53 +0100
Subject: [PATCH 1258/1286] 120243: ng update ngx-ui-switch

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d1549a628..f0eac10656 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,7 +69,7 @@
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^18.0.0",
         "ngx-pagination": "6.0.3",
-        "ngx-ui-switch": "^14.1.0",
+        "ngx-ui-switch": "^15.0.0",
         "nouislider": "^15.7.1",
         "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
@@ -21562,9 +21562,9 @@
       }
     },
     "node_modules/ngx-ui-switch": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz",
-      "integrity": "sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-15.0.0.tgz",
+      "integrity": "sha512-yMfAyIij01zUOeODREX8PyVl1nbfj5gVQW3mRJqihhkFESz+k4vddu6uuxEiyreLCUSDb/e6ZLXvO7ei9WSGcA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
diff --git a/package.json b/package.json
index 6480f4d0aa..7f32c98123 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "ngx-infinite-scroll": "^18.0.0",
     "ngx-pagination": "6.0.3",
     "ngx-skeleton-loader": "^9.0.0",
-    "ngx-ui-switch": "^14.1.0",
+    "ngx-ui-switch": "^15.0.0",
     "nouislider": "^15.7.1",
     "orejime": "^2.3.1",
     "pem": "1.14.8",

From 1ab022ad6c16802cdc688b372b14b9cc303ad356 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:20:46 +0100
Subject: [PATCH 1259/1286] 120243: ng update @ngtools/webpack

---
 package-lock.json | 30 +++++++-----------------------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0eac10656..fcc3fe7b9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,7 +93,7 @@
         "@cypress/schematic": "^1.5.0",
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@ngrx/store-devtools": "^18.1.1",
-        "@ngtools/webpack": "^16.2.16",
+        "@ngtools/webpack": "^18.2.12",
         "@types/deep-freeze": "0.1.5",
         "@types/ejs": "^3.1.2",
         "@types/express": "^4.17.17",
@@ -3220,22 +3220,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz",
-      "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^18.0.0",
-        "typescript": ">=5.4 <5.6",
-        "webpack": "^5.54.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
       "version": "22.7.7",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
@@ -10276,18 +10260,18 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.2.16",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.16.tgz",
-      "integrity": "sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==",
+      "version": "18.2.12",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz",
+      "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==",
       "dev": true,
       "engines": {
-        "node": "^16.14.0 || >=18.10.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^16.0.0",
-        "typescript": ">=4.9.3 <5.2",
+        "@angular/compiler-cli": "^18.0.0",
+        "typescript": ">=5.4 <5.6",
         "webpack": "^5.54.0"
       }
     },
diff --git a/package.json b/package.json
index 7f32c98123..122ef98893 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "@cypress/schematic": "^1.5.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@ngrx/store-devtools": "^18.1.1",
-    "@ngtools/webpack": "^16.2.16",
+    "@ngtools/webpack": "^18.2.12",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",

From a0f6f4b0cc5eb9dd4a67fdc7caed0cca4bb46611 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:21:26 +0100
Subject: [PATCH 1260/1286] 120243: Remove @ngtools/webpack from overrides

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 122ef98893..542a10b3ba 100644
--- a/package.json
+++ b/package.json
@@ -77,10 +77,6 @@
       "@ng-bootstrap/ng-bootstrap": "^12.0.0",
       "bootstrap": "^5.3"
     },
-    "@ngtools/webpack": {
-      "@angular/compiler-cli": "^17.3.11",
-      "typescript": "~5.4.5"
-    },
     "@nicky-lenaers/ngx-scroll-to": {
       "@angular/common": "^17.3.11",
       "@angular/core": "^17.3.11"

From c52c4542ce924150e95ca47d0ab67e688a09cd7f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 10:41:31 +0100
Subject: [PATCH 1261/1286] 120243: ng update @angular-builders/custom-webpack

---
 package-lock.json | 2704 +--------------------------------------------
 package.json      |    2 +-
 2 files changed, 22 insertions(+), 2684 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fcc3fe7b9e..608d511251 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,7 @@
         "zone.js": "~0.14.10"
       },
       "devDependencies": {
-        "@angular-builders/custom-webpack": "~17.0.2",
+        "@angular-builders/custom-webpack": "~18.0.0",
         "@angular-devkit/build-angular": "^18.2.12",
         "@angular-eslint/builder": "^18.4.1",
         "@angular-eslint/bundled-angular-compiler": "^18.4.1",
@@ -176,12 +176,12 @@
       }
     },
     "node_modules/@angular-builders/common": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-1.0.2.tgz",
-      "integrity": "sha512-lUusRq6jN1It5LcUTLS6Q+AYAYGTo/EEN8hV0M6Ek9qXzweAouJaSEnwv7p04/pD7yJTl0YOCbN79u+wGm3x4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-2.0.0.tgz",
+      "integrity": "sha512-O5YJc++DtJVJhqA/OomRKN2jGYzvU/YXtfrPAqcA9Is3Ob5jvV0L0JHSAjSw/KaLvk/FjBIqoRVcYdLp5LKddA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "^17.1.0",
+        "@angular-devkit/core": "^18.0.0",
         "ts-node": "^10.0.0",
         "tsconfig-paths": "^4.1.0"
       },
@@ -189,33 +189,6 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       }
     },
-    "node_modules/@angular-builders/common/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-builders/common/node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -260,15 +233,15 @@
       }
     },
     "node_modules/@angular-builders/custom-webpack": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-17.0.2.tgz",
-      "integrity": "sha512-K0jqdW5UdVIeKiZXO4nLiiiVt0g6PKJELdxgjsBGMtyRk+RLEY+pIp1061oy/Yf09nGYseZ7Mdx3XASYHQjNwA==",
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-18.0.0.tgz",
+      "integrity": "sha512-XSynPSXHq5+nrh7J2snfrcbvm6YGwUGQRzr7OuO3wURJ6CHOD9C+xEAmvEUWW8c1YjEslVNG7aLtCGz7LA4ymw==",
       "dev": true,
       "dependencies": {
-        "@angular-builders/common": "1.0.2",
-        "@angular-devkit/architect": ">=0.1700.0 < 0.1800.0",
-        "@angular-devkit/build-angular": "^17.0.0",
-        "@angular-devkit/core": "^17.0.0",
+        "@angular-builders/common": "2.0.0",
+        "@angular-devkit/architect": ">=0.1800.0 < 0.1900.0",
+        "@angular-devkit/build-angular": "^18.0.0",
+        "@angular-devkit/core": "^18.0.0",
         "lodash": "^4.17.15",
         "webpack-merge": "^5.7.3"
       },
@@ -276,2345 +249,24 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/build-angular": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz",
-      "integrity": "sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1703.11",
-        "@angular-devkit/build-webpack": "0.1703.11",
-        "@angular-devkit/core": "17.3.11",
-        "@babel/core": "7.24.0",
-        "@babel/generator": "7.23.6",
-        "@babel/helper-annotate-as-pure": "7.22.5",
-        "@babel/helper-split-export-declaration": "7.22.6",
-        "@babel/plugin-transform-async-generator-functions": "7.23.9",
-        "@babel/plugin-transform-async-to-generator": "7.23.3",
-        "@babel/plugin-transform-runtime": "7.24.0",
-        "@babel/preset-env": "7.24.0",
-        "@babel/runtime": "7.24.0",
-        "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "17.3.11",
-        "@vitejs/plugin-basic-ssl": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "autoprefixer": "10.4.18",
-        "babel-loader": "9.1.3",
-        "babel-plugin-istanbul": "6.1.1",
-        "browserslist": "^4.21.5",
-        "copy-webpack-plugin": "11.0.0",
-        "critters": "0.0.22",
-        "css-loader": "6.10.0",
-        "esbuild-wasm": "0.20.1",
-        "fast-glob": "3.3.2",
-        "http-proxy-middleware": "2.0.7",
-        "https-proxy-agent": "7.0.4",
-        "inquirer": "9.2.15",
-        "jsonc-parser": "3.2.1",
-        "karma-source-map-support": "1.4.0",
-        "less": "4.2.0",
-        "less-loader": "11.1.0",
-        "license-webpack-plugin": "4.0.2",
-        "loader-utils": "3.2.1",
-        "magic-string": "0.30.8",
-        "mini-css-extract-plugin": "2.8.1",
-        "mrmime": "2.0.0",
-        "open": "8.4.2",
-        "ora": "5.4.1",
-        "parse5-html-rewriting-stream": "7.0.0",
-        "picomatch": "4.0.1",
-        "piscina": "4.4.0",
-        "postcss": "8.4.35",
-        "postcss-loader": "8.1.1",
-        "resolve-url-loader": "5.0.0",
-        "rxjs": "7.8.1",
-        "sass": "1.71.1",
-        "sass-loader": "14.1.1",
-        "semver": "7.6.0",
-        "source-map-loader": "5.0.0",
-        "source-map-support": "0.5.21",
-        "terser": "5.29.1",
-        "tree-kill": "1.2.2",
-        "tslib": "2.6.2",
-        "undici": "6.11.1",
-        "vite": "5.1.8",
-        "watchpack": "2.4.0",
-        "webpack": "5.94.0",
-        "webpack-dev-middleware": "6.1.2",
-        "webpack-dev-server": "4.15.1",
-        "webpack-merge": "5.10.0",
-        "webpack-subresource-integrity": "5.1.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "optionalDependencies": {
-        "esbuild": "0.20.1"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0",
-        "@angular/localize": "^17.0.0",
-        "@angular/platform-server": "^17.0.0",
-        "@angular/service-worker": "^17.0.0",
-        "@web/test-runner": "^0.18.0",
-        "browser-sync": "^3.0.2",
-        "jest": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
-        "karma": "^6.3.0",
-        "ng-packagr": "^17.0.0",
-        "protractor": "^7.0.0",
-        "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.2 <5.5"
-      },
-      "peerDependenciesMeta": {
-        "@angular/localize": {
-          "optional": true
-        },
-        "@angular/platform-server": {
-          "optional": true
-        },
-        "@angular/service-worker": {
-          "optional": true
-        },
-        "@web/test-runner": {
-          "optional": true
-        },
-        "browser-sync": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        },
-        "jest-environment-jsdom": {
-          "optional": true
-        },
-        "karma": {
-          "optional": true
-        },
-        "ng-packagr": {
-          "optional": true
-        },
-        "protractor": {
-          "optional": true
-        },
-        "tailwindcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.11.tgz",
-      "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==",
-      "dev": true,
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0",
-        "typescript": ">=5.2 <5.5",
-        "webpack": "^5.54.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/animations": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
-      "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "17.3.12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/common": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
-      "integrity": "sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "17.3.12",
-        "rxjs": "^6.5.3 || ^7.4.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/compiler": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.12.tgz",
-      "integrity": "sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/core": "17.3.12"
-      },
-      "peerDependenciesMeta": {
-        "@angular/core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/core": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.12.tgz",
-      "integrity": "sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.12.tgz",
-      "integrity": "sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/core": "7.23.9",
-        "@types/babel__core": "7.20.5",
-        "fast-glob": "3.3.2",
-        "yargs": "^17.2.1"
-      },
-      "bin": {
-        "localize-extract": "tools/bundles/src/extract/cli.js",
-        "localize-migrate": "tools/bundles/src/migrate/cli.js",
-        "localize-translate": "tools/bundles/src/translate/cli.js"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler": "17.3.12",
-        "@angular/compiler-cli": "17.3.12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize/node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/localize/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/platform-browser": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz",
-      "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12"
-      },
-      "peerDependenciesMeta": {
-        "@angular/animations": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@angular/platform-server": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz",
-      "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.3.0",
-        "xhr2": "^0.2.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0"
-      },
-      "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/compiler": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
-      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
-      "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
-      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
-        "core-js-compat": "^3.34.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
-      "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
-        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.8",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.0",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
-        "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
-        "core-js-compat": "^3.31.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
-      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
-        "core-js-compat": "^3.34.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@babel/runtime": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
-      "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
-      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/linux-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@types/node": {
-      "version": "22.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "undici-types": "~6.19.8"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
-      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.6.0"
-      },
-      "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/critters": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
-      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "css-select": "^5.1.0",
-        "dom-serializer": "^2.0.0",
-        "domhandler": "^5.0.2",
-        "htmlparser2": "^8.0.2",
-        "postcss": "^8.4.23",
-        "postcss-media-query-parser": "^0.2.3"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/css-loader": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
-      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.4",
-        "postcss-modules-scope": "^3.1.1",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/esbuild": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
-      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.1",
-        "@esbuild/android-arm": "0.20.1",
-        "@esbuild/android-arm64": "0.20.1",
-        "@esbuild/android-x64": "0.20.1",
-        "@esbuild/darwin-arm64": "0.20.1",
-        "@esbuild/darwin-x64": "0.20.1",
-        "@esbuild/freebsd-arm64": "0.20.1",
-        "@esbuild/freebsd-x64": "0.20.1",
-        "@esbuild/linux-arm": "0.20.1",
-        "@esbuild/linux-arm64": "0.20.1",
-        "@esbuild/linux-ia32": "0.20.1",
-        "@esbuild/linux-loong64": "0.20.1",
-        "@esbuild/linux-mips64el": "0.20.1",
-        "@esbuild/linux-ppc64": "0.20.1",
-        "@esbuild/linux-riscv64": "0.20.1",
-        "@esbuild/linux-s390x": "0.20.1",
-        "@esbuild/linux-x64": "0.20.1",
-        "@esbuild/netbsd-x64": "0.20.1",
-        "@esbuild/openbsd-x64": "0.20.1",
-        "@esbuild/sunos-x64": "0.20.1",
-        "@esbuild/win32-arm64": "0.20.1",
-        "@esbuild/win32-ia32": "0.20.1",
-        "@esbuild/win32-x64": "0.20.1"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/esbuild-wasm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz",
-      "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==",
-      "dev": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/ipaddr.js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/less-loader": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
-      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "less": "^3.5.0 || ^4.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/mini-css-extract-plugin": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
-      "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/piscina": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz",
-      "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==",
-      "dev": true,
-      "optionalDependencies": {
-        "nice-napi": "^1.0.2"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/postcss": {
-      "version": "8.4.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
-      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/postcss-loader": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
-      "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^9.0.0",
-        "jiti": "^1.20.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/postcss-loader/node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/sass": {
-      "version": "1.71.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
-      "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
-      "dev": true,
-      "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/sass-loader": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz",
-      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
-      "dev": true,
-      "dependencies": {
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 18.12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.8.tgz",
-      "integrity": "sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.35",
-        "rollup": "^4.2.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/vite/node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-middleware": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz",
-      "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.12",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-server": {
-      "version": "4.15.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
-      "dev": true,
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.5",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "launch-editor": "^2.6.0",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.13.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        },
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/@angular-builders/custom-webpack/node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "@angular/compiler-cli": "^18.0.0"
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
-      "integrity": "sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==",
+      "version": "0.1802.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
+      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
+        "@angular-devkit/core": "18.2.12",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "18.2.12",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz",
@@ -2743,21 +395,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
-      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.2.12",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/build-webpack": {
       "version": "0.1802.12",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz",
@@ -4097,25 +1734,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1703.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.11.tgz",
-      "integrity": "sha512-qbCiiHuoVkD7CtLyWoRi/Vzz6nrEztpF5XIyWUcQu67An1VlxbMTE4yoSQiURjCQMnB/JvS1GPVed7wOq3SJ/w==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1703.11",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.30.0",
-        "webpack-dev-server": "^4.0.0"
-      }
-    },
     "node_modules/@angular-devkit/core": {
       "version": "18.2.12",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
@@ -4415,21 +2033,6 @@
         }
       }
     },
-    "node_modules/@angular/build/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
-      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.2.12",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular/build/node_modules/@babel/core": {
       "version": "7.25.2",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
@@ -5605,21 +3208,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
-      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "18.2.12",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular/cli/node_modules/ansi-escapes": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
@@ -6548,18 +4136,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
@@ -9596,50 +7172,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -9790,18 +7322,6 @@
         "@inquirer/prompts": ">= 3 < 6"
       }
     },
-    "node_modules/@ljharb/through": {
-      "version": "2.3.13",
-      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
-      "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/@lmdb/lmdb-darwin-arm64": {
       "version": "3.0.13",
       "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
@@ -12378,9 +9898,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.11.0"
@@ -12939,47 +10459,6 @@
         "webpack": ">=5"
       }
     },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-istanbul/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.4.12",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
@@ -13673,15 +11152,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001680",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
@@ -16866,19 +14336,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
@@ -17683,15 +15140,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -18466,44 +15914,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/inquirer": {
-      "version": "9.2.15",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz",
-      "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==",
-      "dev": true,
-      "dependencies": {
-        "@ljharb/through": "^2.3.12",
-        "ansi-escapes": "^4.3.2",
-        "chalk": "^5.3.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "figures": "^3.2.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
@@ -19542,12 +16952,6 @@
         "url": "https://github.com/sponsors/ota-meshi"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true
-    },
     "node_modules/jsonfile": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
@@ -22830,18 +20234,6 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
-    "node_modules/picomatch": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
-      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -24848,15 +22240,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -26386,42 +23769,6 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -26907,15 +24254,6 @@
       "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
       "dev": true
     },
-    "node_modules/undici": {
-      "version": "6.11.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz",
-      "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==",
-      "dev": true,
-      "engines": {
-        "node": ">=18.0"
-      }
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
diff --git a/package.json b/package.json
index 542a10b3ba..447f510556 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
     "@ngrx/operators": "^18.0.0"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~17.0.2",
+    "@angular-builders/custom-webpack": "~18.0.0",
     "@angular-devkit/build-angular": "^18.2.12",
     "@angular-eslint/builder": "^18.4.1",
     "@angular-eslint/bundled-angular-compiler": "^18.4.1",

From ae32581d2077dc34dfef0231ac8ddfdb553f3729 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 11:38:26 +0100
Subject: [PATCH 1262/1286] 120243: Update overrides after upgrade

---
 package.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 447f510556..15e3367ee0 100644
--- a/package.json
+++ b/package.json
@@ -57,20 +57,20 @@
   "private": true,
   "overrides": {
     "@kolkov/ngx-gallery": {
-      "@angular/animations": "^17.3.11",
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
+      "@angular/animations": "^18.2.12",
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
     },
     "@ng-bootstrap/ng-bootstrap": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11",
-      "@angular/forms": "^17.3.11",
-      "@angular/localize": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12",
+      "@angular/localize": "^18.2.12"
     },
     "@ng-dynamic-forms/core": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11",
-      "@angular/forms": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12"
     },
     "@ng-dynamic-forms/ui-ng-bootstrap": {
       "ngx-mask": "14.2.4",
@@ -78,15 +78,15 @@
       "bootstrap": "^5.3"
     },
     "@nicky-lenaers/ngx-scroll-to": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
     },
     "eslint-plugin-unused-imports": {
       "@typescript-eslint/eslint-plugin": "^7.2.0"
     },
     "ngx-infinite-scroll": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
     }
   },
   "dependencies": {

From d87b375a3580ff4676496703308dfc2a499eafd8 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 11:24:30 +0100
Subject: [PATCH 1263/1286] 120243: Fix lint issues after upgrade

---
 .../filtered-collections.component.spec.ts    | 23 +++++----
 src/app/core/auth/auth.interceptor.spec.ts    | 25 ++++++----
 src/app/core/auth/auth.interceptor.ts         | 11 +++-
 .../auth/server-auth-request.service.spec.ts  |  6 ++-
 .../core/auth/server-auth-request.service.ts  |  6 ++-
 .../core/data/eperson-registration.service.ts |  5 +-
 src/app/core/data/identifier-data.service.ts  |  6 ++-
 .../dspace-rest/dspace-rest.service.spec.ts   | 22 ++++++--
 .../core/dspace-rest/dspace-rest.service.ts   |  8 ++-
 .../forward-client-ip.interceptor.spec.ts     | 25 ++++++----
 .../forward-client-ip.interceptor.ts          |  7 ++-
 .../core/locale/locale.interceptor.spec.ts    | 25 ++++++----
 src/app/core/locale/locale.interceptor.ts     |  7 ++-
 src/app/core/log/log.interceptor.spec.ts      | 25 ++++++----
 src/app/core/log/log.interceptor.ts           |  7 ++-
 .../quality-assurance-event-data.service.ts   |  5 +-
 .../researcher-profile-data.service.spec.ts   |  5 +-
 .../workspaceitem-data.service.spec.ts        |  5 +-
 .../submission/workspaceitem-data.service.ts  |  5 +-
 .../core/xsrf/browser-xsrf.service.spec.ts    | 21 ++++++--
 src/app/core/xsrf/xsrf.interceptor.spec.ts    | 27 ++++++----
 src/app/core/xsrf/xsrf.interceptor.ts         | 10 +++-
 .../lang-switch/lang-switch.component.spec.ts | 50 +++++++++++--------
 .../endpoint-mocking-rest.service.spec.ts     |  5 +-
 .../endpoint-mocking-rest.service.ts          |  5 +-
 src/modules/app/browser-app.config.ts         |  6 ++-
 src/themes/custom/lazy-theme.module.ts        | 36 +++++++------
 src/themes/dspace/lazy-theme.module.ts        | 35 ++++++++-----
 28 files changed, 293 insertions(+), 130 deletions(-)

diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
index 7c6428c4dc..ae4df271ae 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -1,3 +1,7 @@
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
@@ -20,7 +24,6 @@ import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.mode
 import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
 
 import { FilteredCollectionsComponent } from './filtered-collections.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 describe('FiltersComponent', () => {
   let component: FilteredCollectionsComponent;
@@ -40,22 +43,22 @@ describe('FiltersComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [NgbAccordionModule,
+      schemas: [NO_ERRORS_SCHEMA],
+      imports: [NgbAccordionModule,
         TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock,
-            },
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
         }),
         FilteredCollectionsComponent],
-    providers: [
+      providers: [
         FormBuilder,
         DspaceRestService,
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
   }));
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index ceb8e3bc59..b137b2713c 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -1,5 +1,12 @@
-import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -25,21 +32,21 @@ describe(`AuthInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [
+      imports: [],
+      providers: [
         DspaceRestService,
         { provide: AuthService, useValue: authServiceStub },
         { provide: Router, useClass: RouterStub },
         {
-            provide: HTTP_INTERCEPTORS,
-            useClass: AuthInterceptor,
-            multi: true,
+          provide: HTTP_INTERCEPTORS,
+          useClass: AuthInterceptor,
+          multi: true,
         },
         { provide: Store, useValue: store },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index becc03f046..d011d27059 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -1,4 +1,13 @@
-import { HttpErrorResponse, HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest, HttpResponse, HttpResponseBase } from '@angular/common/http';
+import {
+  HttpErrorResponse,
+  HttpEvent,
+  HttpHandler,
+  HttpHeaders,
+  HttpInterceptor,
+  HttpRequest,
+  HttpResponse,
+  HttpResponseBase,
+} from '@angular/common/http';
 import {
   Injectable,
   Injector,
diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts
index ff7b661078..b119f6b3b7 100644
--- a/src/app/core/auth/server-auth-request.service.spec.ts
+++ b/src/app/core/auth/server-auth-request.service.spec.ts
@@ -1,4 +1,8 @@
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import {
   Observable,
   of as observableOf,
diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts
index 28b5566c15..5f1828c71c 100644
--- a/src/app/core/auth/server-auth-request.service.ts
+++ b/src/app/core/auth/server-auth-request.service.ts
@@ -1,4 +1,8 @@
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index 1b5c348c6d..90a3fab83a 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -1,4 +1,7 @@
-import { HttpHeaders, HttpParams } from '@angular/common/http';
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts
index a193f5aa96..502b1fe710 100644
--- a/src/app/core/data/identifier-data.service.ts
+++ b/src/app/core/data/identifier-data.service.ts
@@ -1,4 +1,8 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/dspace-rest/dspace-rest.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
index 11f0ae94d1..04f44fc942 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,5 +1,13 @@
-import { HttpErrorResponse, HttpHeaders, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HttpErrorResponse,
+  HttpHeaders,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import {
   inject,
   TestBed,
@@ -27,9 +35,13 @@ describe('DspaceRestService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [DspaceRestService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [
+        DspaceRestService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
+    });
 
     dspaceRestService = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index e32566043a..a75cef53bf 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -1,4 +1,10 @@
-import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpErrorResponse,
+  HttpHeaders,
+  HttpParams,
+  HttpResponse,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
   Observable,
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
index 159f129b3f..aa45ee5ee3 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -1,5 +1,12 @@
-import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { REQUEST } from '../../../express.tokens';
@@ -18,19 +25,19 @@ describe('ForwardClientIpInterceptor', () => {
     clientIp = '1.2.3.4';
 
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [
+      imports: [],
+      providers: [
         DspaceRestService,
         {
-            provide: HTTP_INTERCEPTORS,
-            useClass: ForwardClientIpInterceptor,
-            multi: true,
+          provide: HTTP_INTERCEPTORS,
+          useClass: ForwardClientIpInterceptor,
+          multi: true,
         },
         { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
index b36c56752c..7fe4263d46 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.ts
@@ -1,4 +1,9 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import {
   Inject,
   Injectable,
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
index 52868efc0a..4731e109e5 100644
--- a/src/app/core/locale/locale.interceptor.spec.ts
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -1,5 +1,12 @@
-import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
@@ -22,19 +29,19 @@ describe(`LocaleInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [
+      imports: [],
+      providers: [
         DspaceRestService,
         {
-            provide: HTTP_INTERCEPTORS,
-            useClass: LocaleInterceptor,
-            multi: true,
+          provide: HTTP_INTERCEPTORS,
+          useClass: LocaleInterceptor,
+          multi: true,
         },
         { provide: LocaleService, useValue: mockLocaleService },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/locale/locale.interceptor.ts b/src/app/core/locale/locale.interceptor.ts
index fea345604d..6dfa19485d 100644
--- a/src/app/core/locale/locale.interceptor.ts
+++ b/src/app/core/locale/locale.interceptor.ts
@@ -1,4 +1,9 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
index dda3052a03..021526f2e1 100644
--- a/src/app/core/log/log.interceptor.spec.ts
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -1,5 +1,12 @@
-import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
@@ -36,14 +43,14 @@ describe('LogInterceptor', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [StoreModule.forRoot(appReducers, storeModuleConfig)],
-    providers: [
+      imports: [StoreModule.forRoot(appReducers, storeModuleConfig)],
+      providers: [
         DspaceRestService,
         // LogInterceptor,
         {
-            provide: HTTP_INTERCEPTORS,
-            useClass: LogInterceptor,
-            multi: true,
+          provide: HTTP_INTERCEPTORS,
+          useClass: LogInterceptor,
+          multi: true,
         },
         { provide: CookieService, useValue: new CookieServiceMock() },
         { provide: Router, useValue: router },
@@ -51,8 +58,8 @@ describe('LogInterceptor', () => {
         { provide: UUIDService, useClass: UUIDService },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
 
     service = TestBed.inject(DspaceRestService);
     httpMock = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index d9c67f9628..bda408278f 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -1,4 +1,9 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
index b4db9d6361..7e6e888417 100644
--- a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
@@ -1,4 +1,7 @@
-import { HttpHeaders, HttpParams } from '@angular/common/http';
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ReplaceOperation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/profile/researcher-profile-data.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
index bc6106fc8e..ccaa7063dd 100644
--- a/src/app/core/profile/researcher-profile-data.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -1,4 +1,7 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import { ReplaceOperation } from 'fast-json-patch';
 import {
   cold,
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index fa24bcc2d9..8837792a78 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -1,4 +1,7 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import { waitForAsync } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import {
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index ef09ce5768..17aafaf651 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,4 +1,7 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
index 5a1875a759..9c67819741 100644
--- a/src/app/core/xsrf/browser-xsrf.service.spec.ts
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -1,5 +1,12 @@
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HttpClient,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
@@ -14,9 +21,13 @@ describe(`BrowserXSRFService`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [BrowserXSRFService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
-});
+      imports: [],
+      providers: [
+        BrowserXSRFService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
+    });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
     service = TestBed.inject(BrowserXSRFService);
diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index 634593142a..b04958690b 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -1,5 +1,14 @@
-import { HTTP_INTERCEPTORS, HttpHeaders, HttpXsrfTokenExtractor, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  HTTP_INTERCEPTORS,
+  HttpHeaders,
+  HttpXsrfTokenExtractor,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
@@ -28,20 +37,20 @@ describe(`XsrfInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [
+      imports: [],
+      providers: [
         DspaceRestService,
         {
-            provide: HTTP_INTERCEPTORS,
-            useClass: XsrfInterceptor,
-            multi: true,
+          provide: HTTP_INTERCEPTORS,
+          useClass: XsrfInterceptor,
+          multi: true,
         },
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
         { provide: CookieService, useValue: new CookieServiceMock() },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
-    ]
-});
+      ],
+    });
 
     service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts
index 3155d73fe5..91e780590b 100644
--- a/src/app/core/xsrf/xsrf.interceptor.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.ts
@@ -1,4 +1,12 @@
-import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse, HttpXsrfTokenExtractor } from '@angular/common/http';
+import {
+  HttpErrorResponse,
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+  HttpResponse,
+  HttpXsrfTokenExtractor,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import {
   Observable,
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 1f96be936e..80d9c83d91 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,4 +1,11 @@
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
 import {
   DebugElement,
   NO_ERRORS_SCHEMA,
@@ -22,7 +29,6 @@ import {
 import { LangConfig } from '../../../config/lang-config.interface';
 import { LocaleService } from '../../core/locale/locale.service';
 import { LangSwitchComponent } from './lang-switch.component';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -81,17 +87,17 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [TranslateModule.forRoot({
-            loader: { provide: TranslateLoader, useClass: CustomLoader },
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
+          loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-    providers: [
-        TranslateService,
-        { provide: LocaleService, useValue: getMockLocaleService() },
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-    ]
-}).compileComponents()
+        providers: [
+          TranslateService,
+          { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
+        ],
+      }).compileComponents()
         .then(() => {
           translate = TestBed.inject(TranslateService);
           translate.addLangs(mockConfig.languages.filter((langConfig: LangConfig) => langConfig.active === true).map((a) => a.code));
@@ -166,17 +172,17 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-    schemas: [NO_ERRORS_SCHEMA],
-    imports: [TranslateModule.forRoot({
-            loader: { provide: TranslateLoader, useClass: CustomLoader },
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
+          loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-    providers: [
-        TranslateService,
-        { provide: LocaleService, useValue: getMockLocaleService() },
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-    ]
-}).compileComponents();
+        providers: [
+          TranslateService,
+          { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
+        ],
+      }).compileComponents();
       translate = TestBed.inject(TranslateService);
       translate.addLangs(mockConfig.languages.filter((MyLangConfig) => MyLangConfig.active === true).map((a) => a.code));
       translate.setDefaultLang('en');
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
index 26e3733a36..84664b7b20 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
@@ -1,4 +1,7 @@
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import {
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import { of as observableOf } from 'rxjs';
 
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index acad4b764b..bfdbe4d6d7 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -1,4 +1,7 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import {
   Inject,
   Injectable,
diff --git a/src/modules/app/browser-app.config.ts b/src/modules/app/browser-app.config.ts
index f668b6a3c0..213b9de2f7 100644
--- a/src/modules/app/browser-app.config.ts
+++ b/src/modules/app/browser-app.config.ts
@@ -1,4 +1,8 @@
-import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import {
+  HttpClient,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import {
   APP_ID,
   APP_INITIALIZER,
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 98d7561b8d..cd677847ce 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -203,19 +206,24 @@ const DECLARATIONS = [
   SearchResultsSkeletonComponent,
 ];
 
-@NgModule({ imports: [RootModule,
-        CommonModule,
-        DragDropModule,
-        FormsModule,
-        NgbModule,
-        RouterModule,
-        ScrollToModule,
-        StoreModule,
-        StoreRouterConnectingModule,
-        TranslateModule,
-        FormsModule,
-        NgxGalleryModule,
-        ...DECLARATIONS], providers: [provideHttpClient(withInterceptorsFromDi())] })
+@NgModule({
+  imports: [RootModule,
+    CommonModule,
+    DragDropModule,
+    FormsModule,
+    NgbModule,
+    RouterModule,
+    ScrollToModule,
+    StoreModule,
+    StoreRouterConnectingModule,
+    TranslateModule,
+    FormsModule,
+    NgxGalleryModule,
+    ...DECLARATIONS],
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
+})
 
 /**
    * This module serves as an index for all the components in this theme.
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 51baf83081..8de71d14c8 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -15,17 +18,25 @@ import { RootModule } from '../../app/root.module';
 const DECLARATIONS = [
 ];
 
-@NgModule({ declarations: DECLARATIONS, imports: [RootModule,
-        CommonModule,
-        DragDropModule,
-        FormsModule,
-        NgbModule,
-        RouterModule,
-        ScrollToModule,
-        StoreModule,
-        StoreRouterConnectingModule,
-        TranslateModule,
-        FormsModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
+@NgModule({
+  declarations: DECLARATIONS,
+  imports: [
+    RootModule,
+    CommonModule,
+    DragDropModule,
+    FormsModule,
+    NgbModule,
+    RouterModule,
+    ScrollToModule,
+    StoreModule,
+    StoreRouterConnectingModule,
+    TranslateModule,
+    FormsModule,
+  ],
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
+})
 
 /**
  * This module serves as an index for all the components in this theme.

From 76e1a39208e441b87b07e0d093a015ec2b1d87a1 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 12:56:46 +0100
Subject: [PATCH 1264/1286] 120243: Fix dev compilation issues after upgrade

---
 src/app/shared/utils/file-size-pipe.ts                          | 2 +-
 .../alert-form/system-wide-alert-form.component.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index 310fc08d17..1c6d2b646b 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -3,7 +3,7 @@ import {
   PipeTransform,
 } from '@angular/core';
 // eslint-disable-next-line import/no-namespace
-import * as fileSize from 'filesize';
+import fileSize from 'filesize';
 
 /*
  * Convert bytes into largest possible unit.
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index ea1c0a55f0..73517e5b0d 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -278,7 +278,7 @@ export class SystemWideAlertFormComponent implements OnInit {
           this.back();
         }
       } else {
-        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage));
+        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`));
       }
     });
   }

From 2173f3956eaee3be7fbcab34d14d086f0cc48e0a Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 13:34:24 +0100
Subject: [PATCH 1265/1286] 120243: Fix prod compilation issues after upgrade

---
 server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.ts b/server.ts
index 499fe5c4ff..52b2823d49 100644
--- a/server.ts
+++ b/server.ts
@@ -20,10 +20,10 @@ import 'reflect-metadata';
 
 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
-import * as express from 'express';
+import express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
-import * as expressStaticGzip from 'express-static-gzip';
+import expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';

From 8d02988da7392fc9058e664d706b8c50d152d2f1 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 14:23:24 +0100
Subject: [PATCH 1266/1286] 120243: Fix test compilation issues after upgrade

---
 src/app/core/cache/object-cache.reducer.spec.ts               | 2 +-
 src/app/core/cache/server-sync-buffer.reducer.spec.ts         | 2 +-
 .../core/data/object-updates/object-updates.reducer.spec.ts   | 2 +-
 src/app/core/data/request.reducer.spec.ts                     | 2 +-
 src/app/core/index/index.reducer.spec.ts                      | 2 +-
 src/app/core/json-patch/json-patch-operations.reducer.spec.ts | 2 +-
 .../project-entry-import-modal.component.spec.ts              | 4 ++--
 .../suggestion-list-element.component.spec.ts                 | 4 ++--
 .../suggestions-popup/suggestions-popup.component.spec.ts     | 4 ++--
 .../quality-assurance-events-page.component.spec.ts           | 4 ++--
 .../quality-assurance-topics-page.component.spec.ts           | 4 ++--
 src/app/shared/host-window.reducer.spec.ts                    | 2 +-
 src/app/shared/menu/menu.reducer.spec.ts                      | 2 +-
 .../search-filter/search-filter.reducer.spec.ts               | 2 +-
 src/app/shared/sidebar/sidebar.reducer.spec.ts                | 2 +-
 src/app/shared/truncatable/truncatable.reducer.spec.ts        | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index 7dda02a0f5..105ee93733 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 import { Operation } from 'fast-json-patch';
 
 import { Item } from '../shared/item.model';
diff --git a/src/app/core/cache/server-sync-buffer.reducer.spec.ts b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
index d986581ce2..e954b5d7c0 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { RestRequestMethod } from '../data/rest-request-method';
 import { RemoveFromObjectCacheAction } from './object-cache.actions';
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index 1f2a15769b..9572767854 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { Relationship } from '../../shared/item-relationships/relationship.model';
 import { FieldChangeType } from './field-change-type.model';
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 40e17a49dd..d39f8fe644 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   RequestConfigureAction,
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index a5d46a05f6..5f876f6167 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   AddToIndexAction,
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 6d513120dc..ca25240ac6 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   CommitPatchOperationsAction,
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
index dada55a423..fb331fafa4 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -4,10 +4,10 @@ import {
   NO_ERRORS_SCHEMA,
 } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   inject,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@@ -86,7 +86,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   const searchServiceStub: any = getMockSearchService();
 
 
-  beforeEach(async (() => {
+  beforeEach(waitForAsync (() => {
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
index 3f803c468d..509128384b 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +22,7 @@ describe('SuggestionListElementComponent', () => {
   let scheduler: TestScheduler;
 
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
index 3959e675bc..4ef3aa00a6 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -31,7 +31,7 @@ describe('SuggestionsPopupComponent', () => {
       jasmine.createSpy('getNotificationSuggestionInterpolation').and.returnValue(mockNotificationInterpolation),
   });
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SuggestionsPopupComponent],
       providers: [
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
index 02bb9d4ca9..29a84b80ea 100644
--- a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 
 import { QualityAssuranceEventsComponent } from '../../notifications/qa/events/quality-assurance-events.component';
@@ -12,7 +12,7 @@ describe('QualityAssuranceEventsPageComponent', () => {
   let component: QualityAssuranceEventsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceEventsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceEventsPageComponent],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
index 7445863fd5..981bd5fa33 100644
--- a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
@@ -14,7 +14,7 @@ describe('QualityAssuranceTopicsPageComponent', () => {
   let component: QualityAssuranceTopicsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceTopicsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceTopicsPageComponent],
       providers: [
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index 7e1fe3761b..50725663bb 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { HostWindowResizeAction } from './host-window.actions';
 import { hostWindowReducer } from './search/host-window.reducer';
diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts
index da837f2062..a8f269b81f 100644
--- a/src/app/shared/menu/menu.reducer.spec.ts
+++ b/src/app/shared/menu/menu.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { initialMenusState } from './initial-menus-state';
 import {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
index f2841ea42d..eff66dd3a4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SearchFilterCollapseAction,
diff --git a/src/app/shared/sidebar/sidebar.reducer.spec.ts b/src/app/shared/sidebar/sidebar.reducer.spec.ts
index a654b0af18..ec44dc0994 100644
--- a/src/app/shared/sidebar/sidebar.reducer.spec.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SidebarCollapseAction,
diff --git a/src/app/shared/truncatable/truncatable.reducer.spec.ts b/src/app/shared/truncatable/truncatable.reducer.spec.ts
index dca19d0225..a95a55ad7c 100644
--- a/src/app/shared/truncatable/truncatable.reducer.spec.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   TruncatableCollapseAction,

From 540cb86b2d98f2b0e931cf1cad084493ebf2d1b7 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 20 Nov 2024 09:50:55 +0100
Subject: [PATCH 1267/1286] 120243: Fix REST baseUrl in test environment

---
 src/environments/environment.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index d7e9067ea3..40c5e8bc64 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -42,7 +42,7 @@ export const environment: BuildConfig = {
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/api',
-    baseUrl: 'https://rest.com/api',
+    baseUrl: 'https://rest.com/server',
   },
 
   actuators: {

From 1df73d673012cc6e2dd7874e487065319f4b0b2b Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 19 Nov 2024 15:43:14 +0100
Subject: [PATCH 1268/1286] 120243: Fix test without spec

---
 .../context-help-toggle.component.spec.ts                 | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 d538ce520b..33dfccc5ad 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
@@ -56,11 +56,9 @@ describe('ContextHelpToggleComponent', () => {
     });
 
     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();
-      });
+      fixture.debugElement.query(By.css('a')).nativeElement.click();
+      tick();
+      expect(contextHelpService.toggleIcons).toHaveBeenCalled();
     }));
   });
 

From 47d55ecd36552ea529b388b675199341c225d9e0 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Thu, 21 Nov 2024 09:36:24 +0100
Subject: [PATCH 1269/1286] 120243: Fix xsrf.interceptor tests

---
 src/app/core/xsrf/xsrf.interceptor.spec.ts | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index b04958690b..54afdc9b9c 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -22,7 +22,7 @@ import { XsrfInterceptor } from './xsrf.interceptor';
 describe(`XsrfInterceptor`, () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
-  let cookieService: CookieService;
+  let cookieService: CookieServiceMock;
 
   // mock XSRF token
   const testToken = 'test-token';
@@ -35,18 +35,24 @@ describe(`XsrfInterceptor`, () => {
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
 
+  const testUrl = 'https://rest.com/server/api/core/items';
+
   beforeEach(() => {
+    const tokenExtractor = new HttpXsrfTokenExtractorMock(testToken);
+    cookieService = new CookieServiceMock();
+    const interceptor = new XsrfInterceptor(tokenExtractor,cookieService as any);
+
     TestBed.configureTestingModule({
       imports: [],
       providers: [
         DspaceRestService,
         {
           provide: HTTP_INTERCEPTORS,
-          useClass: XsrfInterceptor,
+          useValue: interceptor,
           multi: true,
         },
-        { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
-        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: HttpXsrfTokenExtractor, useValue: tokenExtractor },
+        { provide: CookieService, useValue: cookieService },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
@@ -54,28 +60,27 @@ describe(`XsrfInterceptor`, () => {
 
     service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
-    cookieService = TestBed.get(CookieService);
   });
 
   it('should change withCredentials to true at all times', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test', { withCredentials: false }).subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test', { withCredentials: false }).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
     expect(httpRequest.request.withCredentials).toBeTrue();
 
     httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
   });
 
   it('should add an X-XSRF-TOKEN header when we are sending an HTTP POST request', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test').subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test').subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeTrue();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -87,12 +92,12 @@ describe(`XsrfInterceptor`, () => {
   });
 
   it('should NOT add an X-XSRF-TOKEN header when we are sending an HTTP GET request', (done) => {
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeFalse();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -119,7 +124,7 @@ describe(`XsrfInterceptor`, () => {
     // Create a mock XSRF token to be returned in response within DSPACE-XSRF-TOKEN header
     const mockNewXSRFToken = '123456789abcdefg';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
 
       // ensure mock data (added in below flush() call) is returned.
@@ -139,7 +144,7 @@ describe(`XsrfInterceptor`, () => {
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock response (including sending back a new XSRF token in header)
     httpRequest.flush(mockPayload, {
@@ -157,7 +162,7 @@ describe(`XsrfInterceptor`, () => {
     const mockErrorText = 'Forbidden';
     const mockErrorMessage = 'CSRF token mismatch';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe({
+    service.request(RestRequestMethod.GET, testUrl).subscribe({
       error: (error: unknown) => {
         expect(error).toBeTruthy();
         expect(error instanceof RequestError).toBeTrue();
@@ -174,7 +179,7 @@ describe(`XsrfInterceptor`, () => {
       },
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock error response (including sending back a new XSRF token in header)
     httpRequest.flush(mockErrorMessage, {

From 0f3a7ff9024e8c88fcc1801e3aa3243a135c66b7 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 26 Nov 2024 08:24:20 +0100
Subject: [PATCH 1270/1286] 120243: npm audit fix

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 608d511251..b61edbfda4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12076,9 +12076,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

From 10dc73498a5316fb4b41f7509e767951e1fbead6 Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Tue, 26 Nov 2024 08:25:01 +0100
Subject: [PATCH 1271/1286] 120243: npm audit fix --force

---
 package-lock.json | 53 ++++++++++++-----------------------------------
 package.json      |  4 ++--
 2 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b61edbfda4..34d105afa0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -137,7 +137,7 @@
         "karma-mocha-reporter": "2.2.5",
         "ng-mocks": "^14.13.1",
         "ngx-mask": "14.2.4",
-        "nodemon": "^2.0.22",
+        "nodemon": "^3.1.7",
         "postcss": "^8.4",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
@@ -19138,18 +19138,18 @@
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
     },
     "node_modules/nodemon": {
-      "version": "2.0.22",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
-      "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz",
+      "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",
       "dev": true,
       "dependencies": {
         "chokidar": "^3.5.2",
-        "debug": "^3.2.7",
+        "debug": "^4",
         "ignore-by-default": "^1.0.1",
         "minimatch": "^3.1.2",
         "pstree.remy": "^1.1.8",
-        "semver": "^5.7.1",
-        "simple-update-notifier": "^1.0.7",
+        "semver": "^7.5.3",
+        "simple-update-notifier": "^2.0.0",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
         "undefsafe": "^2.0.5"
@@ -19158,7 +19158,7 @@
         "nodemon": "bin/nodemon.js"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=10"
       },
       "funding": {
         "type": "opencollective",
@@ -19175,15 +19175,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/nodemon/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
     "node_modules/nodemon/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -19196,15 +19187,6 @@
         "node": "*"
       }
     },
-    "node_modules/nodemon/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/nopt": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
@@ -22971,24 +22953,15 @@
       }
     },
     "node_modules/simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
       "dependencies": {
-        "semver": "~7.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/simple-update-notifier/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/sisteransi": {
diff --git a/package.json b/package.json
index 15e3367ee0..0958530e95 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
     "@ngrx/effects": "^18.1.1",
+    "@ngrx/operators": "^18.0.0",
     "@ngrx/router-store": "^18.1.1",
     "@ngrx/store": "^18.1.1",
     "@ngx-translate/core": "^16.0.3",
@@ -156,8 +157,7 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
     "uuid": "^8.3.2",
-    "zone.js": "~0.14.10",
-    "@ngrx/operators": "^18.0.0"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~18.0.0",

From a0c9b3da91d90e2eefa8c4a2c34efa6ce7cb017f Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Wed, 5 Mar 2025 15:41:57 +0100
Subject: [PATCH 1272/1286] 120243: update @angular/cdk

(cherry picked from commit cd7bf4283a236ad0c899bcda5277e605ffa8ddcb)
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0958530e95..68b9db5c8e 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
   },
   "dependencies": {
     "@angular/animations": "^18.2.12",
-    "@angular/cdk": "^17.3.10",
+    "@angular/cdk": "^18.2.12",
     "@angular/common": "^18.2.12",
     "@angular/compiler": "^18.2.12",
     "@angular/core": "^18.2.12",

From a3a2f259b29ae0bf0e4bf0994fc49e9bd0b568ce Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 6 Mar 2025 14:57:44 +0100
Subject: [PATCH 1273/1286] Pin notistack v3.0.1 to avoid peer conflict with
 React

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

diff --git a/package.json b/package.json
index 68b9db5c8e..c289171423 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,8 @@
     "ngx-infinite-scroll": {
       "@angular/common": "^18.2.12",
       "@angular/core": "^18.2.12"
-    }
+    },
+    "notistack": "3.0.1"
   },
   "dependencies": {
     "@angular/animations": "^18.2.12",

From 2ea32752bc080c4a00ac0a135e8719e77f2011d1 Mon Sep 17 00:00:00 2001
From: Yury Bondarenko <ybnd@tuta.io>
Date: Thu, 6 Mar 2025 14:57:52 +0100
Subject: [PATCH 1274/1286] Recreate lockfile

---
 package-lock.json | 9169 +++++++++++++++++++--------------------------
 1 file changed, 3916 insertions(+), 5253 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 34d105afa0..27a9b18050 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@angular/animations": "^18.2.12",
-        "@angular/cdk": "^17.3.10",
+        "@angular/cdk": "^18.2.12",
         "@angular/common": "^18.2.12",
         "@angular/compiler": "^18.2.12",
         "@angular/core": "^18.2.12",
@@ -33,35 +33,34 @@
         "@ngx-translate/core": "^16.0.3",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
-        "axios": "^1.7.4",
+        "axios": "^1.7.9",
         "bootstrap": "^5.3",
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
-        "compression": "^1.7.4",
+        "compression": "^1.7.5",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.38.1",
+        "core-js": "^3.40.0",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.21.1",
+        "express": "^4.21.2",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
-        "isbot": "^5.1.17",
+        "isbot": "^5.1.22",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
-        "jsonschema": "1.4.1",
+        "jsonschema": "1.5.0",
         "jwt-decode": "^3.1.2",
-        "klaro": "^0.7.18",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
-        "mirador": "^3.3.0",
+        "mirador": "^3.4.3",
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
@@ -69,8 +68,10 @@
         "ng2-nouislider": "^2.0.0",
         "ngx-infinite-scroll": "^18.0.0",
         "ngx-pagination": "6.0.3",
+        "ngx-skeleton-loader": "^9.0.0",
         "ngx-ui-switch": "^15.0.0",
         "nouislider": "^15.7.1",
+        "orejime": "^2.3.1",
         "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
@@ -91,7 +92,7 @@
         "@angular/compiler-cli": "^18.2.12",
         "@angular/language-service": "^18.2.12",
         "@cypress/schematic": "^1.5.0",
-        "@fortawesome/fontawesome-free": "^6.6.0",
+        "@fortawesome/fontawesome-free": "^6.7.2",
         "@ngrx/store-devtools": "^18.1.1",
         "@ngtools/webpack": "^18.2.12",
         "@types/deep-freeze": "0.1.5",
@@ -100,7 +101,7 @@
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.12",
+        "@types/lodash": "^4.17.15",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -110,8 +111,8 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.15.1",
-        "cypress-axe": "^1.5.0",
+        "cypress": "^13.17.0",
+        "cypress-axe": "^1.6.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
         "eslint-plugin-deprecation": "^1.4.1",
@@ -120,12 +121,12 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
-        "eslint-plugin-jsonc": "^2.6.0",
+        "eslint-plugin-jsonc": "^2.19.1",
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.2.0",
-        "express-static-gzip": "^2.1.8",
+        "express-static-gzip": "^2.2.0",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
@@ -135,20 +136,20 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
-        "ng-mocks": "^14.13.1",
+        "ng-mocks": "^14.13.2",
         "ngx-mask": "14.2.4",
-        "nodemon": "^3.1.7",
-        "postcss": "^8.4",
+        "nodemon": "^2.0.22",
+        "postcss": "^8.5",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.80.4",
+        "sass": "~1.84.0",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.95.0",
+        "webpack": "5.97.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -253,12 +254,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz",
-      "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==",
+      "version": "0.1802.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.14.tgz",
+      "integrity": "sha512-eplaGCXSlPwf1f4XwyzsYTd8/lJ0/Adm6XsODsBxvkZlIpLcps80/h2lH5MVJpoDREzIFu1BweDpYCoNK5yYZg==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/core": "18.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -267,17 +268,26 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz",
-      "integrity": "sha512-quVUi7eqTq9OHumQFNl9Y8t2opm8miu4rlYnuF6rbujmmBDvdUvR6trFChueRczl2p5HWqTOr6NPoDGQm8AyNw==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.14.tgz",
+      "integrity": "sha512-ycie4OhvNv8eNVqvq46pCIf6kB50xbMOdnAVqmlj+BaQjWbGjUQPjAmp4VGqeDZZ/lW82xkfTmJZxc6pYp7YdQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.12",
-        "@angular-devkit/build-webpack": "0.1802.12",
-        "@angular-devkit/core": "18.2.12",
-        "@angular/build": "18.2.12",
+        "@angular-devkit/architect": "0.1802.14",
+        "@angular-devkit/build-webpack": "0.1802.14",
+        "@angular-devkit/core": "18.2.14",
+        "@angular/build": "18.2.14",
         "@babel/core": "7.25.2",
         "@babel/generator": "7.25.0",
         "@babel/helper-annotate-as-pure": "7.24.7",
@@ -288,7 +298,7 @@
         "@babel/preset-env": "7.25.3",
         "@babel/runtime": "7.25.0",
         "@discoveryjs/json-ext": "0.6.1",
-        "@ngtools/webpack": "18.2.12",
+        "@ngtools/webpack": "18.2.14",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.20",
@@ -328,7 +338,6 @@
         "terser": "5.31.6",
         "tree-kill": "1.2.2",
         "tslib": "2.6.3",
-        "vite": "5.4.6",
         "watchpack": "2.4.1",
         "webpack": "5.94.0",
         "webpack-dev-middleware": "7.4.2",
@@ -396,12 +405,12 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1802.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz",
-      "integrity": "sha512-0Z3fdbZVRnjYWE2/VYyfy+uieY+6YZyEp4ylzklVkc+fmLNsnz4Zw6cK1LzzcBqAwKIyh1IdW20Cg7o8b0sONA==",
+      "version": "0.1802.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.14.tgz",
+      "integrity": "sha512-cccne0SG4BaQHsKRRZCi/wMLJ7yFXrwvE8w+Kug3HdpJJoyH3FeG386EQuca/azslQlK+c5g4ywSZdXeNkGazA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.12",
+        "@angular-devkit/architect": "0.1802.14",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -414,60 +423,6 @@
         "webpack-dev-server": "^5.0.2"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/@babel/generator": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.25.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
@@ -480,15 +435,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@discoveryjs/json-ext": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
-      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.17.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -501,6 +447,7 @@
       "os": [
         "aix"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -517,6 +464,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -533,6 +481,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -549,6 +498,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -565,6 +515,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -581,6 +532,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -597,6 +549,7 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -613,6 +566,7 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -629,6 +583,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -645,6 +600,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -661,6 +617,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -677,6 +634,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -693,6 +651,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -709,6 +668,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -725,6 +685,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -741,6 +702,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -757,6 +719,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -773,6 +736,7 @@
       "os": [
         "netbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -789,6 +753,7 @@
       "os": [
         "openbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -805,6 +770,7 @@
       "os": [
         "sunos"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -821,6 +787,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -837,6 +804,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -853,19 +821,20 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
-      "version": "22.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
-      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
       "dev": true,
       "optional": true,
       "peer": true,
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/retry": {
@@ -911,64 +880,15 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/autoprefixer": {
-      "version": "10.4.20",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
-      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+    "node_modules/@angular-devkit/build-angular/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
       "dependencies": {
-        "browserslist": "^4.23.3",
-        "caniuse-lite": "^1.0.30001646",
-        "fraction.js": "^4.3.7",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/copy-webpack-plugin": {
       "version": "12.0.2",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
@@ -1019,18 +939,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -1086,17 +994,17 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/globby": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
-      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
+      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
       "dev": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.2",
-        "ignore": "^5.2.4",
-        "path-type": "^5.0.0",
+        "fast-glob": "^3.3.3",
+        "ignore": "^7.0.3",
+        "path-type": "^6.0.0",
         "slash": "^5.1.0",
-        "unicorn-magic": "^0.1.0"
+        "unicorn-magic": "^0.3.0"
       },
       "engines": {
         "node": ">=18"
@@ -1105,6 +1013,34 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby/node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
@@ -1122,6 +1058,15 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/ignore": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz",
+      "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
@@ -1137,19 +1082,13 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+    "node_modules/@angular-devkit/build-angular/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
       "dev": true,
-      "dependencies": {
-        "is-inside-container": "^1.0.0"
-      },
       "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
@@ -1164,11 +1103,20 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
+    "node_modules/@angular-devkit/build-angular/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/minipass": {
       "version": "7.1.2",
@@ -1179,24 +1127,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/open": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
-      "dev": true,
-      "dependencies": {
-        "default-browser": "^5.2.1",
-        "define-lazy-prop": "^3.0.0",
-        "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/p-retry": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
@@ -1215,29 +1145,17 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/path-type": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
-      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
+      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
       "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
       "version": "8.4.41",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
@@ -1321,6 +1239,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/sass": {
       "version": "1.77.6",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
@@ -1378,18 +1305,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
@@ -1402,35 +1317,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/terser": {
-      "version": "5.31.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
-      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/vite": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
-      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
@@ -1491,6 +1383,7 @@
       "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -1524,9 +1417,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "dev": true,
       "funding": [
         {
@@ -1542,8 +1435,9 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -1721,23 +1615,10 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/@angular-devkit/core": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz",
-      "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.14.tgz",
+      "integrity": "sha512-UGIGOjXuOyCW+5S4tINu7e6LOu738CmTw3h7Ui1I8OzdTIYJcYJrei8sgrwDwOYADRal+p0MeMlnykH3TM5XBA==",
       "dev": true,
       "dependencies": {
         "ajv": "8.17.1",
@@ -1761,64 +1642,22 @@
         }
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
-    },
-    "node_modules/@angular-devkit/core/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz",
-      "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.14.tgz",
+      "integrity": "sha512-mukjZIHHB7gWratq8fZwUq5WZ+1bF4feG/idXr1wgQ+/FqWjs2PP7HDesHVcPymmRulpTyCpB7TNB1O1fgnCpA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
+        "@angular-devkit/core": "18.2.14",
         "jsonc-parser": "3.3.1",
         "magic-string": "0.30.11",
         "ora": "5.4.1",
@@ -1830,36 +1669,43 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
     },
     "node_modules/@angular-eslint/builder": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.1.tgz",
-      "integrity": "sha512-Ofkwd9Rg52K+AgvnV1RXYXVBGJvl5jD7+4dqwoprqXG7YKNTdHy5vqNZ5XDSMb26qjoZF7JC+IKruKFaON/ZaA==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.3.tgz",
+      "integrity": "sha512-NzmrXlr7GFE+cjwipY/CxBscZXNqnuK0us1mO6Z2T6MeH6m+rRcdlY/rZyKoRniyNNvuzl6vpEsfMIMmnfebrA==",
       "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": ">= 0.1800.0 < 0.1900.0",
+        "@angular-devkit/core": ">= 18.0.0 < 19.0.0"
+      },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.1.tgz",
-      "integrity": "sha512-gCQC0mgBO1bwHDXL9CUgHW+Rf1XGZCLAopoXnggwxGkBCx+oww507t+jrSOxdh+4OTKU4ZfmbtWd7Y8AeXns8w==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.3.tgz",
+      "integrity": "sha512-zdrA8mR98X+U4YgHzUKmivRU+PxzwOL/j8G7eTOvBuq8GPzsP+hvak+tyxlgeGm9HsvpFj9ERHLtJ0xDUPs8fg==",
       "dev": true
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.1.tgz",
-      "integrity": "sha512-FoHwj+AFo8ONKb8wEK5qpo6uefuyklZlDqErJxeC3fpNIJzDe8PWBcJsuZt7Wwm/HeggWgt0Au6h+3IEa0V3BQ==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.3.tgz",
+      "integrity": "sha512-AyJbupiwTBR81P6T59v+aULEnPpZBCBxL2S5QFWfAhNCwWhcof4GihvdK2Z87yhvzDGeAzUFSWl/beJfeFa+PA==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
-        "@angular-eslint/utils": "18.4.1"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "@angular-eslint/utils": "18.4.3"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -1868,13 +1714,13 @@
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.1.tgz",
-      "integrity": "sha512-sofnKpi6wOZ6avVfYYqB7sCgGgWF2HgCZfW+IAp1MtVD2FBa1zTSbbfIZ1I8Akpd22UXa4LKJd0TLwm5XHHkiQ==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.3.tgz",
+      "integrity": "sha512-ijGlX2N01ayMXTpeQivOA31AszO8OEbu9ZQUCxnu9AyMMhxyi2q50bujRChAvN9YXQfdQtbxuajxV6+aiWb5BQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
-        "@angular-eslint/utils": "18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "@angular-eslint/utils": "18.4.3",
         "aria-query": "5.3.2",
         "axobject-query": "4.1.0"
       },
@@ -1886,50 +1732,27 @@
       }
     },
     "node_modules/@angular-eslint/schematics": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.1.tgz",
-      "integrity": "sha512-1+gGodwh+UevtEx9mzZbzP1uY/9NAGEbsn8jisG1TEPDby2wKScQj6U6JwGxoW/Dd/4SIeSdilruZPALkqha7g==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.3.tgz",
+      "integrity": "sha512-D5maKn5e6n58+8n7jLFLD4g+RGPOPeDSsvPc1sqial5tEKLxAJQJS9WZ28oef3bhkob6C60D+1H0mMmEEVvyVA==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "18.4.1",
-        "@angular-eslint/eslint-plugin-template": "18.4.1",
+        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
+        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0",
+        "@angular-eslint/eslint-plugin": "18.4.3",
+        "@angular-eslint/eslint-plugin-template": "18.4.3",
         "ignore": "6.0.2",
         "semver": "7.6.3",
         "strip-json-comments": "3.1.1"
-      },
-      "peerDependencies": {
-        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
-        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/ignore": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
-      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@angular-eslint/schematics/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.1.tgz",
-      "integrity": "sha512-LsStXVyso/89gQU5eiJebB/b1j+wrRtTLjk+ODVUTa7NGCCT7B7xI6ToTchkBEpSTHLT9pEQXHsHer3FymsQRQ==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz",
+      "integrity": "sha512-JZMPtEB8yNip3kg4WDEWQyObSo2Hwf+opq2ElYuwe85GQkGhfJSJ2CQYo4FSwd+c5MUQAqESNRg9QqGYauDsiw==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
         "eslint-scope": "^8.0.2"
       },
       "peerDependencies": {
@@ -1938,12 +1761,12 @@
       }
     },
     "node_modules/@angular-eslint/utils": {
-      "version": "18.4.1",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.1.tgz",
-      "integrity": "sha512-F5UGE1J/CRmTbl8vjexQRwRglNqnJwdXCUejaG+qlGssSHoWcRB+ubbR/na3PdnzeJdBE6DkLYElXnOQZ6YKfg==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.3.tgz",
+      "integrity": "sha512-w0bJ9+ELAEiPBSTPPm9bvDngfu1d8JbzUhvs2vU+z7sIz/HMwUZT5S4naypj2kNN0gZYGYrW0lt+HIbW87zTAQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "18.4.1"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3"
       },
       "peerDependencies": {
         "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -1952,9 +1775,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.12.tgz",
-      "integrity": "sha512-XcWH/VFQ1Rddhdqi/iU8lW3Qg96yVx1NPfrO5lhcSSvVUzYWTZ5r+jh3GqYqUgPWyEp1Kpw3FLsOgVcGcBWQkQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.13.tgz",
+      "integrity": "sha512-rG5J5Ek5Hg+Tz2NjkNOaG6PupiNK/lPfophXpsR1t/nWujqnMWX2krahD/i6kgD+jNWNKCJCYSOVvCx/BHOtKA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1962,17 +1785,17 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12"
+        "@angular/core": "18.2.13"
       }
     },
     "node_modules/@angular/build": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.12.tgz",
-      "integrity": "sha512-4Ohz+OSILoL+cCAQ4UTiCT5v6pctu3fXNoNpTEUK46OmxELk9jDITO5rNyNS7TxBn9wY69kjX5VcDf7MenquFQ==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.14.tgz",
+      "integrity": "sha512-9g24Oe/ZLULacW3hEpRCjSZIJPJTzN5BeFbA27epSV5NsrQOoeUGsEpRs90Zmt6eReO0fW1BGshWRoZtpSedcw==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1802.12",
+        "@angular-devkit/architect": "0.1802.14",
         "@babel/core": "7.25.2",
         "@babel/helper-annotate-as-pure": "7.24.7",
         "@babel/helper-split-export-declaration": "7.24.7",
@@ -1994,7 +1817,7 @@
         "rollup": "4.22.4",
         "sass": "1.77.6",
         "semver": "7.6.3",
-        "vite": "5.4.6",
+        "vite": "5.4.14",
         "watchpack": "2.4.1"
       },
       "engines": {
@@ -2033,61 +1856,6 @@
         }
       }
     },
-    "node_modules/@angular/build/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular/build/node_modules/@babel/generator": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
-      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.26.2",
-        "@babel/types": "^7.26.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -2456,229 +2224,15 @@
         "node": ">=12"
       }
     },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@angular/build/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
-    },
     "node_modules/@angular/build/node_modules/@types/node": {
-      "version": "22.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
       "dev": true,
       "optional": true,
       "peer": true,
       "dependencies": {
-        "undici-types": "~6.19.8"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@angular/build/node_modules/@vitejs/plugin-basic-ssl": {
@@ -2693,269 +2247,12 @@
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/@angular/build/node_modules/ansi-escapes": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
-      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
-      "dev": true,
-      "dependencies": {
-        "environment": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@angular/build/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@angular/build/node_modules/cli-cursor": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/cli-truncate": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
-      "dev": true,
-      "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/@angular/build/node_modules/emoji-regex": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true
-    },
-    "node_modules/@angular/build/node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true
-    },
     "node_modules/@angular/build/node_modules/immutable": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
       "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
       "dev": true
     },
-    "node_modules/@angular/build/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@angular/build/node_modules/listr2": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^4.0.0",
-        "colorette": "^2.0.20",
-        "eventemitter3": "^5.0.1",
-        "log-update": "^6.1.0",
-        "rfdc": "^1.4.1",
-        "wrap-ansi": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@angular/build/node_modules/log-update": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
-      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^7.0.0",
-        "cli-cursor": "^5.0.0",
-        "slice-ansi": "^7.1.0",
-        "strip-ansi": "^7.1.0",
-        "wrap-ansi": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/log-update/node_modules/is-fullwidth-code-point": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
-      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
-      "dev": true,
-      "dependencies": {
-        "get-east-asian-width": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/log-update/node_modules/slice-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
-      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "is-fullwidth-code-point": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@angular/build/node_modules/onetime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-function": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/@angular/build/node_modules/restore-cursor": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^7.0.0",
-        "signal-exit": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/rollup": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "1.0.5"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.4",
-        "@rollup/rollup-android-arm64": "4.22.4",
-        "@rollup/rollup-darwin-arm64": "4.22.4",
-        "@rollup/rollup-darwin-x64": "4.22.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
-        "@rollup/rollup-linux-arm64-musl": "4.22.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-musl": "4.22.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
-        "@rollup/rollup-win32-x64-msvc": "4.22.4",
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/@angular/build/node_modules/sass": {
       "version": "1.77.6",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
@@ -2973,82 +2270,10 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@angular/build/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@angular/build/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@angular/build/node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@angular/build/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/build/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/@angular/build/node_modules/vite": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
-      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",
@@ -3142,27 +2367,10 @@
         "@esbuild/win32-x64": "0.21.5"
       }
     },
-    "node_modules/@angular/build/node_modules/wrap-ansi": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
-      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/@angular/cdk": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.10.tgz",
-      "integrity": "sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.14.tgz",
+      "integrity": "sha512-vDyOh1lwjfVk9OqoroZAP8pf3xxKUvyl+TVR8nJxL4c5fOfUFkD7l94HaanqKSRwJcI2xiztuu92IVoHn8T33Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3170,23 +2378,23 @@
         "parse5": "^7.1.2"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0 || ^18.0.0",
-        "@angular/core": "^17.0.0 || ^18.0.0",
+        "@angular/common": "^18.0.0 || ^19.0.0",
+        "@angular/core": "^18.0.0 || ^19.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.12.tgz",
-      "integrity": "sha512-xhuZ/b7IhqNw1MgXf+arWf4x+GfUSt/IwbdWU4+CO8A7h0Y46zQywouP/KUK3cMQZfVdHdciTBvlpF3vFacA6Q==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.14.tgz",
+      "integrity": "sha512-kWgRRQtJPkr8iwN7DMbTi3sXOnv7H5QhbU/GgD3nNX3D8YCSPmnby4PAE/P3wn7FsIK9JsSchsCt7MZ37Urh9A==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1802.12",
-        "@angular-devkit/core": "18.2.12",
-        "@angular-devkit/schematics": "18.2.12",
+        "@angular-devkit/architect": "0.1802.14",
+        "@angular-devkit/core": "18.2.14",
+        "@angular-devkit/schematics": "18.2.14",
         "@inquirer/prompts": "5.3.8",
         "@listr2/prompt-adapter-inquirer": "2.0.15",
-        "@schematics/angular": "18.2.12",
+        "@schematics/angular": "18.2.14",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "4.1.3",
         "jsonc-parser": "3.3.1",
@@ -3208,297 +2416,10 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/ansi-escapes": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
-      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
-      "dev": true,
-      "dependencies": {
-        "environment": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/cli-cursor": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/cli-truncate": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
-      "dev": true,
-      "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/emoji-regex": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
-    },
-    "node_modules/@angular/cli/node_modules/listr2": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^4.0.0",
-        "colorette": "^2.0.20",
-        "eventemitter3": "^5.0.1",
-        "log-update": "^6.1.0",
-        "rfdc": "^1.4.1",
-        "wrap-ansi": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/log-update": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
-      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^7.0.0",
-        "cli-cursor": "^5.0.0",
-        "slice-ansi": "^7.1.0",
-        "strip-ansi": "^7.1.0",
-        "wrap-ansi": "^9.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/log-update/node_modules/is-fullwidth-code-point": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
-      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
-      "dev": true,
-      "dependencies": {
-        "get-east-asian-width": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/log-update/node_modules/slice-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
-      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "is-fullwidth-code-point": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/onetime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-function": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/restore-cursor": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^7.0.0",
-        "signal-exit": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/wrap-ansi": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
-      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/@angular/common": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.12.tgz",
-      "integrity": "sha512-gI5o8Bccsi8ow8Wk2vG4Tw/Rw9LoHEA9j8+qHKNR/55SCBsz68Syg310dSyxy+sApJO2WiqIadr5VP36dlSUFw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.13.tgz",
+      "integrity": "sha512-4ZqrNp1PoZo7VNvW+sbSc2CB2axP1sCH2wXl8B0wdjsj8JY1hF1OhuugwhpAHtGxqewed2kCXayE+ZJqSTV4jw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3506,14 +2427,14 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12",
+        "@angular/core": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.12.tgz",
-      "integrity": "sha512-D5d5dLrjQal5DbAXJJNSsCC3UxzjOI2wbc+Iv+LOpRM1gpNwuYfZMX5W7cj62Ce4G2++78CJSppdKBp8D4HErQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.13.tgz",
+      "integrity": "sha512-TzWcrkopyjFF+WeDr2cRe8CcHjU72KfYV3Sm2TkBkcXrkYX5sDjGWrBGrG3hRB4e4okqchrOCvm1MiTdy2vKMA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3521,7 +2442,7 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "18.2.12"
+        "@angular/core": "18.2.13"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -3530,9 +2451,9 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.12.tgz",
-      "integrity": "sha512-IWimTNq5Q+i2Wxev6HLqnN4iYbPvLz04W1BBycT1LfGUsHcjFYLuUqbeUzHbk2snmBAzXkixgVpo8SF6P4Y5Pg==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.13.tgz",
+      "integrity": "sha512-DBSh4AQwkiJDSiVvJATRmjxf6wyUs9pwQLgaFdSlfuTRO+sdb0J2z1r3BYm8t0IqdoyXzdZq2YCH43EmyvD71g==",
       "dependencies": {
         "@babel/core": "7.25.2",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -3552,71 +2473,14 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "18.2.12",
+        "@angular/compiler": "18.2.13",
         "typescript": ">=5.4 <5.6"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
-      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
-      "dependencies": {
-        "@babel/parser": "^7.26.2",
-        "@babel/types": "^7.26.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@angular/compiler-cli/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -3627,23 +2491,12 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@angular/compiler-cli/node_modules/readdirp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 14.18.0"
       },
       "funding": {
         "type": "individual",
@@ -3651,9 +2504,9 @@
       }
     },
     "node_modules/@angular/core": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.12.tgz",
-      "integrity": "sha512-wCf/OObwS6bpM60rk6bpMpCRGp0DlMLB1WNAMtfcaPNyqimVV5Bm98mWRhkOuRyvU3fU7iHhM/10ePVaoyu9+A==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.13.tgz",
+      "integrity": "sha512-8mbWHMgO95OuFV1Ejy4oKmbe9NOJ3WazQf/f7wks8Bck7pcihd0IKhlPBNjFllbF5o+04EYSwFhEtvEgjMDClA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3666,9 +2519,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.12.tgz",
-      "integrity": "sha512-FsukBJEU6jfAmht7TrODTkct/o4iwCZvGozuThOp0tYUPD/E1rZZzuKjEyTnT5Azpfkf0Wqx1nmpz80cczELOQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz",
+      "integrity": "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3676,25 +2529,25 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.12.tgz",
-      "integrity": "sha512-oaiVAnGzmPZvrXdGh8XnosaqfEPbZxO2225MxbbrD49XTqUgpaS2zrz1Uf5j42e8qytA2kj8tckLq7PAMm0D1w==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.13.tgz",
+      "integrity": "sha512-4E4VJDrbOAxS69F9C1twQPbR9AjY47Qlz8+lwg5lJOyUJ4GoEThLbXKfadt/vIeYBwMJ7fIsYWXD0Dlmxh4k+w==",
       "dev": true,
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       }
     },
     "node_modules/@angular/localize": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.12.tgz",
-      "integrity": "sha512-qC3cYFh3miR9revmHGlfbGvugcsK6nQud4QKBNyTUp1XZRrEE0yzPvvsnmbv2lHUOazrvTxQpfVZZKpiifgoLw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.13.tgz",
+      "integrity": "sha512-qQaIYdDS/l1w6tr/wpOoimjpmoJU0WmB8AGbNeKLoM36K+ix6hkvn67+UgkpZtaDHZylm8GsGW1NjzpM2tr3pA==",
       "dependencies": {
         "@babel/core": "7.25.2",
         "@types/babel__core": "7.20.5",
@@ -3710,82 +2563,14 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "18.2.12",
-        "@angular/compiler-cli": "18.2.12"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/@babel/generator": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
-      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
-      "dependencies": {
-        "@babel/parser": "^7.26.2",
-        "@babel/types": "^7.26.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
-    "node_modules/@angular/localize/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
+        "@angular/compiler": "18.2.13",
+        "@angular/compiler-cli": "18.2.13"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.12.tgz",
-      "integrity": "sha512-DRSMznuxuecrs+v5BRyd60/R4vjkQtuYUEPfzdo+rqxM83Dmr3PGtnqPRgd5oAFUbATxf02hQXijRD27K7rZRg==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.13.tgz",
+      "integrity": "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3793,9 +2578,9 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "18.2.12",
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12"
+        "@angular/animations": "18.2.13",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -3804,9 +2589,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.12.tgz",
-      "integrity": "sha512-dv1QEjYpcFno6+oUeGEDRWpB5g2Ufb0XkUbLJQIgrOk1Qbyzb8tmpDpTjok8jcKdquigMRWolr6Y1EOicfRlLw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.13.tgz",
+      "integrity": "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3814,16 +2599,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/compiler": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12"
+        "@angular/common": "18.2.13",
+        "@angular/compiler": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13"
       }
     },
     "node_modules/@angular/platform-server": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.12.tgz",
-      "integrity": "sha512-CF5iM2R96RD2kl3J6tL6VXU8UCIxQfRU4+Wbor+CcNNKQHU76TiEzaJCU+vRWMzP5AYW8pEM0qmf3c2rbdUyRw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.13.tgz",
+      "integrity": "sha512-eYYhFQkjg3rIBY0kG0XLZ3v6ObvDq9SMsGVtsddhlmdhkdO0Sdu9d8hjP7LmioO+60vUG2jNW02ROVMhSNBR5A==",
       "dependencies": {
         "tslib": "^2.3.0",
         "xhr2": "^0.2.0"
@@ -3832,17 +2617,17 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "18.2.12",
-        "@angular/common": "18.2.12",
-        "@angular/compiler": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12"
+        "@angular/animations": "18.2.13",
+        "@angular/common": "18.2.13",
+        "@angular/compiler": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13"
       }
     },
     "node_modules/@angular/router": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.12.tgz",
-      "integrity": "sha512-cz/1YWOZadAT35PPPYmpK3HSzKOE56nlUHue5bFkw73VSZr2iBn03ALLpd9YKzWgRmx3y7DqnlQtCkDu9JPGKQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.13.tgz",
+      "integrity": "sha512-VKmfgi/r/CkyBq9nChQ/ptmfu0JT/8ONnLVJ5H+SkFLRYJcIRyHLKjRihMCyVm6xM5yktOdCaW73NTQrFz7+bg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -3850,16 +2635,16 @@
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.12",
-        "@angular/core": "18.2.12",
-        "@angular/platform-browser": "18.2.12",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/ssr": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-18.2.12.tgz",
-      "integrity": "sha512-KoVBTk0+wV+VKWew611S2bTcaQx2MpxCiCacS/bChNJlrcy1wg0ae7ymj3oUu/NiKZP8cq+dzBcx0JZepozE/A==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-18.2.14.tgz",
+      "integrity": "sha512-UrOT76jeNBc396/lcNg+IrVSlp58WL57150uDQh50EIkzS6a7Id0hUN6bzkbedFf5pWn07bMWqCF5RNLse5Vng==",
       "dependencies": {
         "critters": "0.0.24",
         "tslib": "^2.3.0"
@@ -3883,28 +2668,28 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
-      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
-      "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.0",
-        "@babel/parser": "^7.24.0",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.0",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -3932,47 +2717,14 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz",
-      "integrity": "sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA==",
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -3991,25 +2743,12 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
-      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
-      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dependencies": {
-        "@babel/compat-data": "^7.25.9",
+        "@babel/compat-data": "^7.26.5",
         "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -4041,17 +2780,17 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
-      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz",
+      "integrity": "sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
         "@babel/helper-member-expression-to-functions": "^7.25.9",
         "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.26.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
+        "@babel/traverse": "^7.26.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -4083,13 +2822,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
-      "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
-        "regexpu-core": "^6.1.1",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -4190,9 +2929,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
-      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -4228,14 +2967,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
-      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-member-expression-to-functions": "^7.25.9",
         "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4244,19 +2983,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
-      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
@@ -4321,23 +3047,23 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
-      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
       "dependencies": {
-        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.0"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
-      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
       "dependencies": {
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.9"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -4723,12 +3449,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
-      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -4910,12 +3636,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
-      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
         "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
@@ -4941,12 +3666,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
-      "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
+      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.26.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
@@ -5050,14 +3775,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
-      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-simple-access": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -5132,12 +3856,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
-      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+      "version": "7.26.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -5407,12 +4131,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
-      "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -5422,12 +4146,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
-      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -5631,28 +4355,28 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
-      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.9",
-        "@babel/parser": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
-      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.9",
-        "@babel/generator": "^7.25.9",
-        "@babel/parser": "^7.25.9",
-        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.25.9",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -5661,12 +4385,12 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
-      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dependencies": {
-        "@babel/parser": "^7.26.2",
-        "@babel/types": "^7.26.0",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -5676,9 +4400,9 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -5687,9 +4411,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
         "@babel/helper-validator-identifier": "^7.25.9"
@@ -5749,6 +4473,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-color-function": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
@@ -5847,6 +4600,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-nested-calc": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
@@ -5993,26 +4775,10 @@
         "postcss": "^8.2"
       }
     },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
-      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
     "node_modules/@cypress/request": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.4.tgz",
-      "integrity": "sha512-eqNHMsxEXuit0sRvvWoGG3/4+Q5qwqjKARWXKM/KoSsKvTNBwWt8pwspg5+TniP3POAZcPPx0O8CiEIQ4e6NWg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
+      "integrity": "sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -6021,16 +4787,16 @@
         "combined-stream": "~1.0.6",
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.5.0",
+        "form-data": "~4.0.0",
         "http-signature": "~1.4.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.13.0",
+        "qs": "6.14.0",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -6038,20 +4804,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@cypress/request/node_modules/form-data": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/@cypress/schematic": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.7.0.tgz",
@@ -6231,12 +4983,12 @@
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
+      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
       "dev": true,
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/@edsilv/http-status-codes": {
@@ -6648,36 +5400,43 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -6685,7 +5444,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -6695,6 +5454,8 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -6706,68 +5467,49 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "peer": true
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
-      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -6780,12 +5522,13 @@
       "dev": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -6793,30 +5536,11 @@
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -6829,7 +5553,8 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead"
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
     },
     "node_modules/@iiif/vocabulary": {
       "version": "1.0.26",
@@ -6901,24 +5626,12 @@
       }
     },
     "node_modules/@inquirer/core/node_modules/@types/node": {
-      "version": "22.9.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
       "dev": true,
       "dependencies": {
-        "undici-types": "~6.19.8"
-      }
-    },
-    "node_modules/@inquirer/core/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@inquirer/editor": {
@@ -6950,9 +5663,9 @@
       }
     },
     "node_modules/@inquirer/figures": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz",
-      "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.10.tgz",
+      "integrity": "sha512-Ey6176gZmeqZuY/W/nZiUyvmb1/qInjcpiZjXWi6nON+nxJpD1bxtSoBxNliGISae32n6OwbY+TSXPZ1CfS4bw==",
       "dev": true,
       "engines": {
         "node": ">=18"
@@ -7182,9 +5895,9 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -7251,9 +5964,9 @@
       }
     },
     "node_modules/@jsonjoy.com/json-pack": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz",
-      "integrity": "sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.1.tgz",
+      "integrity": "sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==",
       "dev": true,
       "dependencies": {
         "@jsonjoy.com/base64": "^1.1.1",
@@ -7437,12 +6150,6 @@
         }
       }
     },
-    "node_modules/@material-ui/core/node_modules/popper.js": {
-      "version": "1.16.1-lts",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
-      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==",
-      "license": "MIT"
-    },
     "node_modules/@material-ui/icons": {
       "version": "4.11.3",
       "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz",
@@ -7780,9 +6487,9 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz",
-      "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.14.tgz",
+      "integrity": "sha512-rT+Y4WR8QTVsijtb+YRqHcPTpd1ZiwRbklQXRTxU0YGFHpxpi+bhjmY8FjpPoAtdPO1Lg3l3KIZPZa0thG0FNg==",
       "dev": true,
       "engines": {
         "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
@@ -7796,9 +6503,9 @@
       }
     },
     "node_modules/@ngx-translate/core": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.3.tgz",
-      "integrity": "sha512-UPse66z9tRUmIpeorYodXBQY6O4foUmj9jy9cCuuja7lqdOwRBWPzCWqc+qYIXv5L2QoqZdxgHtqoUz+Q9weSA==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.4.tgz",
+      "integrity": "sha512-s8llTL2SJvROhqttxvEs7Cg+6qSf4kvZPFYO+cTOY1d8DWTjlutRkWAleZcPPoeX927Dm7ALfL07G7oYDJ7z6w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -7823,34 +6530,6 @@
         "@angular/core": "^14.0.0"
       }
     },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8022,6 +6701,15 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@npmcli/package-json/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@npmcli/package-json/node_modules/glob": {
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -8042,6 +6730,21 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@npmcli/package-json/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@npmcli/package-json/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -8138,9 +6841,12 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
-      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -8155,27 +6861,29 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.4.1",
-        "@parcel/watcher-darwin-arm64": "2.4.1",
-        "@parcel/watcher-darwin-x64": "2.4.1",
-        "@parcel/watcher-freebsd-x64": "2.4.1",
-        "@parcel/watcher-linux-arm-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-musl": "2.4.1",
-        "@parcel/watcher-linux-x64-glibc": "2.4.1",
-        "@parcel/watcher-linux-x64-musl": "2.4.1",
-        "@parcel/watcher-win32-arm64": "2.4.1",
-        "@parcel/watcher-win32-ia32": "2.4.1",
-        "@parcel/watcher-win32-x64": "2.4.1"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
-      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -8189,12 +6897,13 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
-      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -8208,12 +6917,13 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
-      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -8227,12 +6937,13 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
-      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -8246,12 +6957,33 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
-      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8265,12 +6997,13 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
-      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8284,12 +7017,13 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
-      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8303,12 +7037,13 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
-      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8322,12 +7057,13 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
-      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8341,12 +7077,13 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
-      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -8360,12 +7097,13 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
-      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -8379,12 +7117,13 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
-      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -8397,10 +7136,25 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@parcel/watcher/node_modules/node-addon-api": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "optional": true
     },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
@@ -8500,9 +7254,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
-      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
       "cpu": [
         "arm"
       ],
@@ -8513,9 +7267,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
-      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
       "cpu": [
         "arm64"
       ],
@@ -8526,9 +7280,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
-      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
       "cpu": [
         "arm64"
       ],
@@ -8539,9 +7293,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
-      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
       "cpu": [
         "x64"
       ],
@@ -8552,9 +7306,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
-      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
       "cpu": [
         "arm"
       ],
@@ -8565,9 +7319,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
-      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
       "cpu": [
         "arm"
       ],
@@ -8578,9 +7332,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
-      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
       "cpu": [
         "arm64"
       ],
@@ -8591,9 +7345,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
-      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
       "cpu": [
         "arm64"
       ],
@@ -8604,9 +7358,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
-      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
       "cpu": [
         "ppc64"
       ],
@@ -8617,9 +7371,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
-      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
       "cpu": [
         "riscv64"
       ],
@@ -8630,9 +7384,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
-      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
       "cpu": [
         "s390x"
       ],
@@ -8643,9 +7397,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
-      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
       "cpu": [
         "x64"
       ],
@@ -8656,9 +7410,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
-      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
       "cpu": [
         "x64"
       ],
@@ -8669,9 +7423,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
-      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
       "cpu": [
         "arm64"
       ],
@@ -8682,9 +7436,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
-      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
       "cpu": [
         "ia32"
       ],
@@ -8695,9 +7449,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
-      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
       "cpu": [
         "x64"
       ],
@@ -8714,13 +7468,13 @@
       "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "18.2.12",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz",
-      "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.14.tgz",
+      "integrity": "sha512-CHh6ew2Az71UlvVcnYeuMEwjwkZqR7y/9ebLzFRvczC71ZL8qPVBpBTVGbCpGBd54VEbCZVWRxBQoZZ5LP/aBw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "18.2.12",
-        "@angular-devkit/schematics": "18.2.12",
+        "@angular-devkit/core": "18.2.14",
+        "@angular-devkit/schematics": "18.2.14",
         "jsonc-parser": "3.3.1"
       },
       "engines": {
@@ -8729,12 +7483,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
-    },
     "node_modules/@sigstore/bundle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
@@ -8757,12 +7505,12 @@
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
-      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz",
+      "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==",
       "dev": true,
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign": {
@@ -8873,6 +7621,30 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@tufjs/models/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -8948,12 +7720,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
@@ -8975,10 +7741,30 @@
       "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
       "dev": true
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "node_modules/@types/express": {
@@ -8994,9 +7780,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.5",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "devOptional": true,
       "dependencies": {
         "@types/node": "*",
@@ -9009,13 +7795,12 @@
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.9.tgz",
       "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+      "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -9028,9 +7813,9 @@
       "devOptional": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.15",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
-      "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -9060,9 +7845,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
-      "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
+      "version": "4.17.16",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",
       "dev": true
     },
     "node_modules/@types/mime": {
@@ -9101,14 +7886,14 @@
       "dev": true
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.12",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
+      "version": "15.7.14",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="
     },
     "node_modules/@types/qs": {
-      "version": "6.9.15",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
       "devOptional": true
     },
     "node_modules/@types/range-parser": {
@@ -9118,10 +7903,9 @@
       "devOptional": true
     },
     "node_modules/@types/react": {
-      "version": "17.0.80",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.80.tgz",
-      "integrity": "sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==",
-      "license": "MIT",
+      "version": "17.0.83",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+      "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "^0.16",
@@ -9129,9 +7913,9 @@
       }
     },
     "node_modules/@types/react-redux": {
-      "version": "7.1.33",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
-      "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==",
+      "version": "7.1.34",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.34.tgz",
+      "integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -9140,10 +7924,10 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.10",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
-      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
-      "dependencies": {
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
+      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
+      "peerDependencies": {
         "@types/react": "*"
       }
     },
@@ -9161,8 +7945,7 @@
     "node_modules/@types/scheduler": {
       "version": "0.16.8",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
-      "license": "MIT"
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
     },
     "node_modules/@types/semver": {
       "version": "7.5.8",
@@ -9207,9 +7990,9 @@
       "dev": true
     },
     "node_modules/@types/sizzle": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
-      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
       "dev": true
     },
     "node_modules/@types/sockjs": {
@@ -9228,18 +8011,18 @@
       "dev": true
     },
     "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -9294,31 +8077,13 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
@@ -9490,6 +8255,19 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/rule-tester": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.18.0.tgz",
@@ -9554,7 +8332,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/types": {
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
       "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
@@ -9567,6 +8345,47 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz",
+      "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
@@ -9595,6 +8414,43 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
@@ -9617,6 +8473,19 @@
         "eslint": "^8.56.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
@@ -9634,154 +8503,168 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -9868,10 +8751,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -9884,7 +8776,6 @@
       "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
       "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -9893,6 +8784,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -9937,13 +8829,10 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
@@ -9962,15 +8851,15 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -9978,9 +8867,9 @@
       }
     },
     "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.0"
@@ -10043,18 +8932,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -10076,15 +8953,17 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -10162,13 +9041,13 @@
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10232,15 +9111,15 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10250,15 +9129,15 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10268,19 +9147,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10317,19 +9195,17 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
     },
-    "node_modules/async-each-series": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz",
-      "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==",
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/asynckit": {
@@ -10347,9 +9223,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.18",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
-      "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
       "dev": true,
       "funding": [
         {
@@ -10366,11 +9242,11 @@
         }
       ],
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001591",
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
         "postcss-value-parser": "^4.2.0"
       },
       "bin": {
@@ -10414,19 +9290,18 @@
       "dev": true
     },
     "node_modules/axe-core": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
-      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz",
+      "integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
-      "license": "MIT",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz",
+      "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -10552,6 +9427,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/basic-auth/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -10650,14 +9530,6 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -10671,10 +9543,24 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -10686,11 +9572,6 @@
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="
-    },
     "node_modules/bootstrap": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
@@ -10710,11 +9591,12 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
@@ -10728,251 +9610,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/browser-sync": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.3.tgz",
-      "integrity": "sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "browser-sync-client": "^3.0.3",
-        "browser-sync-ui": "^3.0.3",
-        "bs-recipes": "1.3.4",
-        "chalk": "4.1.2",
-        "chokidar": "^3.5.1",
-        "connect": "3.6.6",
-        "connect-history-api-fallback": "^1",
-        "dev-ip": "^1.0.1",
-        "easy-extender": "^2.3.4",
-        "eazy-logger": "^4.0.1",
-        "etag": "^1.8.1",
-        "fresh": "^0.5.2",
-        "fs-extra": "3.0.1",
-        "http-proxy": "^1.18.1",
-        "immutable": "^3",
-        "micromatch": "^4.0.8",
-        "opn": "5.3.0",
-        "portscanner": "2.2.0",
-        "raw-body": "^2.3.2",
-        "resp-modifier": "6.0.2",
-        "rx": "4.1.0",
-        "send": "^0.19.0",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.16.2",
-        "server-destroy": "1.0.1",
-        "socket.io": "^4.4.1",
-        "ua-parser-js": "^1.0.33",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "browser-sync": "dist/bin.js"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/browser-sync-client": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.3.tgz",
-      "integrity": "sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "mitt": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/browser-sync-ui": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz",
-      "integrity": "sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "async-each-series": "0.1.1",
-        "chalk": "4.1.2",
-        "connect-history-api-fallback": "^1",
-        "immutable": "^3",
-        "server-destroy": "1.0.1",
-        "socket.io-client": "^4.4.1",
-        "stream-throttle": "^0.1.3"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/browser-sync-ui/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/browser-sync/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/browser-sync/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/browserslist": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "funding": [
         {
           "type": "opencollective",
@@ -10988,9 +9629,9 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001669",
-        "electron-to-chromium": "^1.5.41",
-        "node-releases": "^2.0.18",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.1"
       },
       "bin": {
@@ -11000,14 +9641,6 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/bs-recipes": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz",
-      "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -11063,9 +9696,9 @@
       }
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11127,15 +9760,42 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11148,14 +9808,15 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001680",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
-      "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
+      "version": "1.0.30001702",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz",
+      "integrity": "sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==",
       "funding": [
         {
           "type": "opencollective",
@@ -11198,17 +9859,18 @@
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chardet": {
@@ -11277,9 +9939,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz",
+      "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==",
       "dev": true,
       "funding": [
         {
@@ -11329,9 +9991,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -11356,21 +10018,71 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/cli-width": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@@ -11393,36 +10105,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cliui/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/cliui/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -11452,6 +10134,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -11461,17 +10144,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clsx": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
@@ -11481,19 +10153,20 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
       "version": "2.0.20",
@@ -11571,16 +10244,16 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
+        "negotiator": "~0.6.4",
         "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -11626,16 +10299,14 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/connect": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-      "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
-        "finalhandler": "1.1.0",
-        "parseurl": "~1.3.2",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
       },
       "engines": {
@@ -11643,12 +10314,10 @@
       }
     },
     "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -11658,19 +10327,63 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
+    "node_modules/connect/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "optional": true,
-      "peer": true
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -11683,25 +10396,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -11831,6 +10525,19 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -11851,6 +10558,18 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -11866,6 +10585,33 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -11915,9 +10661,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz",
+      "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -11925,12 +10671,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.39.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
-      "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.24.2"
+        "browserslist": "^4.24.4"
       },
       "funding": {
         "type": "opencollective",
@@ -11993,70 +10739,6 @@
         "postcss-media-query-parser": "^0.2.3"
       }
     },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-env": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -12079,6 +10761,7 @@
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -12114,6 +10797,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-blank-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-box-model": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
@@ -12140,6 +10836,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-loader": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
@@ -12265,13 +10974,13 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.15.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.15.1.tgz",
-      "integrity": "sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
+      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^3.0.4",
+        "@cypress/request": "^3.0.6",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -12282,6 +10991,7 @@
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
+        "ci-info": "^4.0.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
         "commander": "^6.2.1",
@@ -12296,7 +11006,6 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -12323,113 +11032,120 @@
       }
     },
     "node_modules/cypress-axe": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.5.0.tgz",
-      "integrity": "sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.6.0.tgz",
+      "integrity": "sha512-C/ij50G8eebBrl/WsGT7E+T/SFyIsRZ3Epx9cRTLrPL9Y1GcxlQGFoAVdtSFWRrHSCWXq9HC6iJQMaI89O9yvQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
         "axe-core": "^3 || ^4",
-        "cypress": "^10 || ^11 || ^12 || ^13"
+        "cypress": "^10 || ^11 || ^12 || ^13 || ^14"
       }
     },
-    "node_modules/cypress/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/cypress/node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/cypress/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cypress/node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cypress/node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cypress/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/cypress/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cypress/node_modules/has-flag": {
+    "node_modules/cypress/node_modules/log-update": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
       "dependencies": {
-        "universalify": "^2.0.0"
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cypress/node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/cypress/node_modules/proxy-from-env": {
@@ -12438,6 +11154,20 @@
       "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
       "dev": true
     },
+    "node_modules/cypress/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -12453,15 +11183,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -12475,14 +11196,14 @@
       }
     },
     "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12492,29 +11213,29 @@
       }
     },
     "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -12558,15 +11279,15 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
-      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -12600,7 +11321,8 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
@@ -12694,6 +11416,12 @@
         "node": ">=10.17.0"
       }
     },
+    "node_modules/default-gateway/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -12710,6 +11438,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -12723,12 +11452,15 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-properties": {
@@ -12785,14 +11517,12 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
     "node_modules/detect-node": {
@@ -12801,20 +11531,6 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
-    "node_modules/dev-ip": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
-      "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "dev-ip": "lib/dev-ip.js"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -12873,6 +11589,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -12945,14 +11662,14 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.6.tgz",
-      "integrity": "sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ=="
+      "version": "2.5.8",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.8.tgz",
+      "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw=="
     },
     "node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
@@ -12962,122 +11679,25 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "node_modules/easy-extender": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz",
-      "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash": "^4.17.10"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/eazy-logger": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz",
-      "integrity": "sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "4.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/eazy-logger/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -13114,9 +11734,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.63",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz",
-      "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA=="
+      "version": "1.5.112",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz",
+      "integrity": "sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA=="
     },
     "node_modules/element-resize-detector": {
       "version": "1.2.4",
@@ -13141,9 +11761,9 @@
       }
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -13179,12 +11799,11 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
-      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
       "dev": true,
       "dependencies": {
-        "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
@@ -13199,36 +11818,37 @@
         "node": ">=10.2.0"
       }
     },
-    "node_modules/engine.io-client": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
-      "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.17.1",
-        "xmlhttprequest-ssl": "~2.1.1"
-      }
-    },
     "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -13238,24 +11858,28 @@
       }
     },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
       }
     },
     "node_modules/ent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz",
-      "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.2.tgz",
+      "integrity": "sha512-kKvD1tO6BM+oK9HzCPpUdRb4vKFQY/FPTFmurMvh6LlN68VMrdj77w8yp51/kDbpkFOS9J8w5W6zIzgM2H8/hw==",
       "dev": true,
       "dependencies": {
-        "punycode": "^1.4.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "punycode": "^1.4.1",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13282,9 +11906,9 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
-      "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+      "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
       "dev": true,
       "bin": {
         "envinfo": "dist/cli.js"
@@ -13334,57 +11958,62 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13394,12 +12023,9 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "engines": {
         "node": ">= 0.4"
       }
@@ -13413,16 +12039,15 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
       "dev": true
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -13431,37 +12056,40 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13543,24 +12171,29 @@
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -13606,9 +12239,9 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
-      "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
+      "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
       "dev": true,
       "dependencies": {
         "semver": "^7.5.4"
@@ -13655,6 +12288,27 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-json-compat-utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz",
+      "integrity": "sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==",
+      "dev": true,
+      "dependencies": {
+        "esquery": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "jsonc-eslint-parser": "^2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@eslint/json": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-module-utils": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
@@ -13874,16 +12528,6 @@
         "eslint": ">=6.0.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -13917,18 +12561,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -13972,26 +12604,15 @@
         "eslint": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint-plugin-jsonc": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz",
-      "integrity": "sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.19.1.tgz",
+      "integrity": "sha512-MmlAOaZK1+Lg7YoCZPGRjb88ZjT+ct/KTsvcsbZdBm+w8WMzGx+XEmexk0m40P1WV9G2rFV7X3klyRGRpFXEjA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "eslint-compat-utils": "^0.5.0",
+        "eslint-compat-utils": "^0.6.0",
+        "eslint-json-compat-utils": "^0.2.1",
         "espree": "^9.6.1",
         "graphemer": "^1.4.0",
         "jsonc-eslint-parser": "^2.0.4",
@@ -14008,6 +12629,23 @@
         "eslint": ">=6.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsonc/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-lodash": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz",
@@ -14058,7 +12696,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz",
       "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint-rule-composer": "^0.3.0"
       },
@@ -14104,6 +12741,30 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -14115,6 +12776,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -14126,75 +12788,11 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
       "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -14206,124 +12804,11 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
+    "node_modules/eslint/node_modules/espree": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -14336,10 +12821,96 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -14351,6 +12922,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -14362,6 +12934,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -14370,6 +12943,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14425,6 +12999,12 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/executable": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
@@ -14437,16 +13017,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
+    },
     "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -14467,7 +13052,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -14482,6 +13067,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express-rate-limit": {
@@ -14490,11 +13079,12 @@
       "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
     },
     "node_modules/express-static-gzip": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
-      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz",
+      "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==",
       "dev": true,
       "dependencies": {
+        "parseurl": "^1.3.3",
         "serve-static": "^1.16.2"
       }
     },
@@ -14514,54 +13104,24 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+    "node_modules/express/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/extend": {
       "version": "3.0.2",
@@ -14627,7 +13187,8 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
@@ -14652,29 +13213,38 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
     "node_modules/fast-printf": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz",
-      "integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==",
-      "dependencies": {
-        "boolean": "^3.1.4"
-      },
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.10.tgz",
+      "integrity": "sha512-GwTgG9O4FVIdShhbVF3JxOgSBY2+ePGsu2V/UONgoCPzF9VY6ZdBMKsHKCYQHZwNk3qNouUolRDsgVxcVA5G1w==",
       "engines": {
         "node": ">=10.0"
       }
     },
     "node_modules/fast-uri": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
-      "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
-      "dev": true
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
@@ -14686,9 +13256,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -14729,10 +13299,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/figures/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -14748,6 +13328,14 @@
         "minimatch": "^5.0.1"
       }
     },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/filelist/node_modules/minimatch": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -14779,19 +13367,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -14802,9 +13387,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -14812,35 +13394,7 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/finalhandler/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-cache-dir": {
       "version": "4.0.0",
@@ -14859,22 +13413,26 @@
       }
     },
     "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
+        "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/flat": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
       "bin": {
         "flat": "cli.js"
       }
@@ -14883,6 +13441,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
       "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.3",
@@ -14893,14 +13452,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
@@ -14917,21 +13477,27 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -14941,18 +13507,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/foreground-child/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -14963,12 +13517,13 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -15005,16 +13560,18 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/fs-minipass": {
@@ -15038,7 +13595,8 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/fscreen": {
       "version": "1.2.0",
@@ -15068,15 +13626,17 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15123,15 +13683,20 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15140,6 +13705,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -15156,14 +13733,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15195,6 +13772,7 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -15227,26 +13805,6 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/global-dirs": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
@@ -15315,12 +13873,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -15335,7 +13902,8 @@
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
@@ -15344,27 +13912,30 @@
       "dev": true
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -15373,9 +13944,13 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -15384,9 +13959,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -15398,7 +13973,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -15484,6 +14058,12 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -15577,9 +14157,9 @@
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
+      "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==",
       "dev": true
     },
     "node_modules/http-proxy": {
@@ -15612,7 +14192,6 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
       "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -15660,6 +14239,17 @@
         "node": ">=14"
       }
     },
+    "node_modules/http-terminator/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/https-proxy-agent": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
@@ -15759,9 +14349,10 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -15784,6 +14375,30 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ignore-walk/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -15803,20 +14418,16 @@
       "integrity": "sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="
     },
     "node_modules/immutable": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
-      "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -15828,18 +14439,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
@@ -15855,6 +14458,58 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/import-local/node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -15871,6 +14526,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -15895,6 +14551,7 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -15915,14 +14572,14 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15972,13 +14629,14 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15993,13 +14651,35 @@
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
       "dev": true,
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -16018,13 +14698,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16050,22 +14730,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-ci": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^3.2.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
@@ -16078,11 +14746,13 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -16093,12 +14763,13 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16108,15 +14779,15 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -16130,12 +14801,49 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-glob": {
@@ -16172,21 +14880,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
@@ -16218,10 +14911,10 @@
       "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
-    "node_modules/is-negative-zero": {
+    "node_modules/is-map": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -16250,24 +14943,14 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-number-like": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
-      "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash.isfinite": "^3.3.2"
-      }
-    },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16280,6 +14963,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -16296,22 +14980,27 @@
       }
     },
     "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16320,13 +15009,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16348,12 +15049,13 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16363,12 +15065,14 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16378,12 +15082,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -16410,13 +15114,44 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -16429,15 +15164,18 @@
       "dev": true
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/isarray": {
@@ -16459,9 +15197,9 @@
       }
     },
     "node_modules/isbot": {
-      "version": "5.1.17",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz",
-      "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==",
+      "version": "5.1.23",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.23.tgz",
+      "integrity": "sha512-ie3ehy2iXdkuzaZx32SoKb9b8l9Cm8cqQ1lJjQXnq8GRTrk/Jx7IUDcB4mhlw6H3gWaMqGYoWeV0lPv1P/20Ig==",
       "engines": {
         "node": ">=18"
       }
@@ -16475,6 +15213,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16533,27 +15272,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
@@ -16661,9 +15379,9 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
-      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
@@ -16677,90 +15395,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jasmine": {
       "version": "3.99.0",
       "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.99.0.tgz",
@@ -16806,15 +15440,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -16831,9 +15456,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -16889,7 +15514,8 @@
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "3.0.2",
@@ -16915,7 +15541,8 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -16952,13 +15579,37 @@
         "url": "https://github.com/sponsors/ota-meshi"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==",
+    "node_modules/jsonc-eslint-parser/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -16973,9 +15624,9 @@
       ]
     },
     "node_modules/jsonschema": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
-      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz",
+      "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==",
       "engines": {
         "node": "*"
       }
@@ -17173,28 +15824,6 @@
         "url": "https://github.com/sponsors/mattlewis92"
       }
     },
-    "node_modules/karma-coverage-istanbul-reporter/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/karma-coverage-istanbul-reporter/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma-jasmine": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz",
@@ -17244,6 +15873,65 @@
         "node": ">=4"
       }
     },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/karma-mocha-reporter/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/karma-mocha-reporter/node_modules/log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -17268,6 +15956,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/karma-mocha-reporter/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
@@ -17277,31 +15977,6 @@
         "source-map-support": "^0.5.5"
       }
     },
-    "node_modules/karma/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/karma/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -17313,78 +15988,6 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/karma/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/karma/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma/node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -17397,24 +16000,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/karma/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/karma/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -17424,38 +16009,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/karma/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/karma/node_modules/ua-parser-js": {
-      "version": "0.7.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
-      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -17504,6 +16057,7 @@
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -17512,20 +16066,11 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/klaro": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/klaro/-/klaro-0.7.21.tgz",
-      "integrity": "sha512-PbF23xYGPObhg2GL0yqskPqRTziv3RTwVi9QZiBEB/BVulS/e1fFprgRiW6f4utPjb61q/16fWgPwHuuXJZYRA==",
-      "dependencies": {
-        "@babel/eslint-parser": "^7.23.10",
-        "sass": "^1.25.0",
-        "webpack-merge": "^5.10.0"
-      }
-    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -17545,9 +16090,9 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz",
-      "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
+      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
       "dev": true,
       "dependencies": {
         "picocolors": "^1.0.0",
@@ -17676,6 +16221,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -17710,13 +16256,11 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/limiter": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
-      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/linkify-it": {
       "version": "4.0.1",
@@ -17727,77 +16271,102 @@
       }
     },
     "node_modules/listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
       "dev": true,
       "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "cli-truncate": "^4.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/listr2/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/listr2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/listr2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/listr2/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
       "dev": true
     },
-    "node_modules/listr2/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+    "node_modules/listr2/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -17847,15 +16416,18 @@
       }
     },
     "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lodash": {
@@ -17869,18 +16441,11 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true
     },
-    "node_modules/lodash.isfinite": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz",
-      "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
@@ -17904,144 +16469,196 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/log-update/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "environment": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/log-update/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "restore-cursor": "^5.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/log-update/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
       "dev": true
     },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "get-east-asian-width": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/restore-cursor": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
+    "node_modules/log-update/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/log4js": {
       "version": "6.9.1",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
@@ -18142,6 +16759,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/cacache": {
       "version": "18.0.4",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
@@ -18203,6 +16829,21 @@
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true
     },
+    "node_modules/make-fetch-happen/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -18261,9 +16902,9 @@
       }
     },
     "node_modules/manifesto.js": {
-      "version": "4.2.17",
-      "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz",
-      "integrity": "sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==",
+      "version": "4.2.21",
+      "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz",
+      "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==",
       "dependencies": {
         "@edsilv/http-status-codes": "^1.0.3",
         "@iiif/vocabulary": "^1.0.26",
@@ -18301,6 +16942,14 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/md5": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
@@ -18325,15 +16974,22 @@
       }
     },
     "node_modules/memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.0.tgz",
+      "integrity": "sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==",
       "dev": true,
       "dependencies": {
-        "fs-monkey": "^1.0.4"
+        "@jsonjoy.com/json-pack": "^1.0.3",
+        "@jsonjoy.com/util": "^1.3.0",
+        "tree-dump": "^1.0.1",
+        "tslib": "^2.0.0"
       },
       "engines": {
         "node": ">= 4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
       }
     },
     "node_modules/memoize-one": {
@@ -18407,9 +17063,9 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.53.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -18425,6 +17081,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/mime-types/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -18473,18 +17137,14 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "*"
       }
     },
     "node_modules/minimist": {
@@ -18596,11 +17256,11 @@
       }
     },
     "node_modules/mirador": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz",
-      "integrity": "sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.3.tgz",
+      "integrity": "sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==",
       "dependencies": {
-        "@material-ui/core": "^4.11.0",
+        "@material-ui/core": "^4.12.3",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
         "@researchgate/react-intersection-observer": "^1.0.0",
@@ -18617,7 +17277,7 @@
         "lodash": "^4.17.11",
         "manifesto.js": "^4.2.0",
         "normalize-url": "^4.5.0",
-        "openseadragon": "^2.4.2",
+        "openseadragon": "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0",
         "prop-types": "^15.6.2",
         "re-reselect": "^4.0.0",
         "react-aria-live": "^2.0.5",
@@ -18680,14 +17340,6 @@
         "react-dom": "16.x"
       }
     },
-    "node_modules/mitt": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
-      "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -18807,9 +17459,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -18826,7 +17478,8 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "node_modules/needle": {
       "version": "3.3.1",
@@ -18859,9 +17512,9 @@
       }
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -18873,18 +17526,18 @@
       "dev": true
     },
     "node_modules/ng-mocks": {
-      "version": "14.13.1",
-      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
-      "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
+      "version": "14.13.2",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.2.tgz",
+      "integrity": "sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
       "peerDependencies": {
-        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18"
+        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19"
       }
     },
     "node_modules/ng2-file-upload": {
@@ -18949,6 +17602,18 @@
         "@angular/core": ">=13.0.0"
       }
     },
+    "node_modules/ngx-skeleton-loader": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-9.0.0.tgz",
+      "integrity": "sha512-aO4/V6oGdZGNcTjasTg/fwzJJYl/ZmNKgCukOEQdUK3GSFOZtB/3GGULMJuZ939hk3Hzqh1OBiLfIM1SqTfhqg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=16.0.0",
+        "@angular/core": ">=16.0.0"
+      }
+    },
     "node_modules/ngx-ui-switch": {
       "version": "15.0.0",
       "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-15.0.0.tgz",
@@ -19021,9 +17686,9 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz",
-      "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
+      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
       "dev": true,
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -19045,9 +17710,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz",
-      "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -19070,13 +17735,13 @@
         "node-gyp-build-optional-packages-test": "build-test.js"
       }
     },
-    "node_modules/node-gyp-build-optional-packages/node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+    "node_modules/node-gyp/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/node-gyp/node_modules/glob": {
@@ -19108,6 +17773,21 @@
         "node": ">=16"
       }
     },
+    "node_modules/node-gyp/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/node-gyp/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -19133,23 +17813,23 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "node_modules/nodemon": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.7.tgz",
-      "integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",
+      "version": "2.0.22",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+      "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
       "dev": true,
       "dependencies": {
         "chokidar": "^3.5.2",
-        "debug": "^4",
+        "debug": "^3.2.7",
         "ignore-by-default": "^1.0.1",
         "minimatch": "^3.1.2",
         "pstree.remy": "^1.1.8",
-        "semver": "^7.5.3",
-        "simple-update-notifier": "^2.0.0",
+        "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
         "undefsafe": "^2.0.5"
@@ -19158,33 +17838,50 @@
         "nodemon": "bin/nodemon.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.10.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/nodemon"
       }
     },
-    "node_modules/nodemon/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/nodemon/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/nodemon/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/nodemon/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/nodemon/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/nodemon/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=4"
       }
     },
     "node_modules/nopt": {
@@ -19417,9 +18114,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -19437,14 +18134,16 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -19487,12 +18186,13 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
@@ -19532,6 +18232,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -19552,56 +18253,36 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
+      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
       "dev": true,
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/openseadragon": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz",
-      "integrity": "sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw=="
-    },
-    "node_modules/opn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/opn/node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-5.0.1.tgz",
+      "integrity": "sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==",
+      "funding": {
+        "url": "https://opencollective.com/openseadragon"
       }
     },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -19637,82 +18318,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ordered-binary": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
       "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
       "dev": true
     },
+    "node_modules/orejime": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.1.tgz",
+      "integrity": "sha512-LpJCuOG7mvR5fwD3wr+FoHPG+DX2t7+dJ4gBZnWICnNHtOTNuBzne0T+JcK0nW30JjiYULq1vfOaSLU2qmHCPg==",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2",
+        "react-modal": "^3.13.1"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16"
+      }
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -19727,6 +18351,23 @@
       "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
       "dev": true
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -19739,6 +18380,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -19750,27 +18392,15 @@
       }
     },
     "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -19896,6 +18526,15 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/pacote/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/pacote/node_modules/cacache": {
       "version": "18.0.4",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
@@ -19957,6 +18596,21 @@
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true
     },
+    "node_modules/pacote/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/pacote/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -20018,6 +18672,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -20049,12 +18704,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/parse-json/node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
@@ -20065,12 +18714,12 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "devOptional": true,
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -20114,6 +18763,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -20122,6 +18772,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20130,6 +18781,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -20172,9 +18824,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -20216,6 +18868,18 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
+    "node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -20320,9 +18984,9 @@
       }
     },
     "node_modules/pkg-dir/node_modules/yocto-queue": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
-      "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.0.tgz",
+      "integrity": "sha512-KHBC7z61OJeaMGnF3wqNZj+GGNXOyypZviiKpQeiHirG5Ib1ImwcLBH70rbMSkKfSmUNBsdf2PwaEJtKvgmkNw==",
       "dev": true,
       "engines": {
         "node": ">=12.20"
@@ -20331,46 +18995,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/portscanner": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz",
-      "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "async": "^2.6.0",
-        "is-number-like": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.0.0"
-      }
-    },
-    "node_modules/portscanner/node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
+    "node_modules/popper.js": {
+      "version": "1.16.1-lts",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
+      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -20386,8 +19028,8 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {
@@ -20413,6 +19055,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-clamp": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
@@ -20542,6 +19197,19 @@
         "postcss": "^8.3"
       }
     },
+    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-dir-pseudo-class": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
@@ -20561,6 +19229,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-double-position-gradients": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
@@ -20611,6 +19292,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-visible/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-focus-within": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
@@ -20626,6 +19320,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-within/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-font-variant": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
@@ -20845,9 +19552,9 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
-      "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
@@ -20861,19 +19568,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss-modules-scope": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
@@ -20889,19 +19583,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-      "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -20937,6 +19618,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-opacity-percentage": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
@@ -21092,6 +19802,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-replace-overflow-wrap": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
@@ -21120,10 +19843,23 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-selector-not/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -21143,6 +19879,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -21254,12 +19991,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -21267,9 +19998,9 @@
       "dev": true
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -21292,11 +20023,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -21305,12 +20037,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -21366,14 +20092,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/re-reselect": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz",
@@ -21383,12 +20101,12 @@
       }
     },
     "node_modules/re-resizable": {
-      "version": "6.9.17",
-      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz",
-      "integrity": "sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g==",
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.11.2.tgz",
+      "integrity": "sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==",
       "peerDependencies": {
-        "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
+        "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react": {
@@ -21429,6 +20147,7 @@
       "version": "13.1.1",
       "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz",
       "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==",
+      "deprecated": "react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672",
       "dependencies": {
         "@babel/runtime": "^7.9.2",
         "css-box-model": "^1.2.0",
@@ -21591,6 +20310,26 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "node_modules/react-modal": {
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz",
+      "integrity": "sha512-yCYRJB5YkeQDQlTt17WGAgFJ7jr2QYcWa1SHqZ3PluDmnKJ/7+tVU+E6uKyZ0nODaeEj+xCpK4LcSnKXLMC0Nw==",
+      "dependencies": {
+        "exenv": "^1.2.0",
+        "prop-types": "^15.7.2",
+        "react-lifecycles-compat": "^3.0.0",
+        "warning": "^4.0.3"
+      },
+      "peerDependencies": {
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19"
+      }
+    },
     "node_modules/react-mosaic-component": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz",
@@ -21652,11 +20391,11 @@
       }
     },
     "node_modules/react-rnd": {
-      "version": "10.4.11",
-      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz",
-      "integrity": "sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q==",
+      "version": "10.5.2",
+      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.5.2.tgz",
+      "integrity": "sha512-0Tm4x7k7pfHf2snewJA8x7Nwgt3LV+58MVEWOVsFjk51eYruFEa6Wy7BNdxt4/lH0wIRsu7Gm3KjSXY2w7YaNw==",
       "dependencies": {
-        "re-resizable": "6.9.17",
+        "re-resizable": "6.11.2",
         "react-draggable": "4.4.6",
         "tslib": "2.6.2"
       },
@@ -21665,6 +20404,11 @@
         "react-dom": ">=16.3.0"
       }
     },
+    "node_modules/react-rnd/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
     "node_modules/react-sizeme": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
@@ -21696,18 +20440,18 @@
       }
     },
     "node_modules/react-virtualized-auto-sizer": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz",
-      "integrity": "sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.25.tgz",
+      "integrity": "sha512-YHsksEGDfsHbHuaBVDYwJmcktblcHGafz4ZVuYPQYuSHMUGjpwmUCrAOcvMSGMwwk1eFWj1M/1GwYpNPuyhaBg==",
       "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0"
+        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-window": {
-      "version": "1.8.10",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz",
-      "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==",
+      "version": "1.8.11",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
+      "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": ">=3.1.1 <6"
@@ -21716,8 +20460,8 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/read-cache": {
@@ -21817,6 +20561,28 @@
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -21850,21 +20616,23 @@
       }
     },
     "node_modules/regex-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+      "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
       "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21874,15 +20642,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
-      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.2.0",
         "regjsgen": "^0.8.0",
-        "regjsparser": "^0.11.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -21897,9 +20665,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
-      "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
       "dependencies": {
         "jsesc": "~3.0.2"
@@ -21994,7 +20762,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-from": {
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
@@ -22003,6 +20771,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/resolve-url-loader": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
@@ -22042,66 +20819,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/resp-modifier": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz",
-      "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "debug": "^2.2.0",
-        "minimatch": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -22115,6 +20832,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -22125,9 +20848,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -22144,6 +20867,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -22168,12 +20892,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
-      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.5"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -22183,22 +20907,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.0",
-        "@rollup/rollup-android-arm64": "4.24.0",
-        "@rollup/rollup-darwin-arm64": "4.24.0",
-        "@rollup/rollup-darwin-x64": "4.24.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
-        "@rollup/rollup-linux-arm64-musl": "4.24.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-musl": "4.24.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
-        "@rollup/rollup-win32-x64-msvc": "4.24.0",
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -22244,18 +20968,10 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/rx": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -22278,85 +20994,16 @@
         "rxjs-report-usage": "bin/rxjs-report-usage"
       }
     },
-    "node_modules/rxjs-report-usage/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/rxjs-report-usage/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -22367,19 +21014,49 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22389,9 +21066,9 @@
       }
     },
     "node_modules/safe-stable-stringify": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
-      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
+      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
       "engines": {
         "node": ">=10"
       }
@@ -22402,13 +21079,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.80.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.4.tgz",
-      "integrity": "sha512-rhMQ2tSF5CsuuspvC94nPM9rToiAFw2h3JTrLlgmNw1MH79v8Cr3DH6KF6o6r+8oofY3iYVPUf66KzC8yuVN1w==",
+      "version": "1.84.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
+      "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
+      "dev": true,
       "dependencies": {
-        "@parcel/watcher": "^2.4.1",
         "chokidar": "^4.0.0",
-        "immutable": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -22416,6 +21093,9 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/sass-loader": {
@@ -22468,64 +21148,6 @@
         "loader-utils": "^2.0.0"
       }
     },
-    "node_modules/sass-resources-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/sass-resources-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass-resources-loader/node_modules/loader-utils": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
@@ -22540,22 +21162,11 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/sass-resources-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -22566,17 +21177,13 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/sass/node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="
-    },
     "node_modules/sass/node_modules/readdirp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 14.18.0"
       },
       "funding": {
         "type": "individual",
@@ -22601,9 +21208,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -22612,13 +21219,30 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -22639,12 +21263,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -22657,17 +21278,6 @@
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/send": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -22704,6 +21314,14 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -22816,26 +21434,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/serve-static/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/server-destroy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
-      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -22863,6 +21466,20 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -22872,6 +21489,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -22888,6 +21506,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -22899,28 +21518,83 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22930,10 +21604,16 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/sigstore": {
       "version": "2.3.1",
@@ -22953,15 +21633,24 @@
       }
     },
     "node_modules/simple-update-notifier": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
-      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
       "dev": true,
       "dependencies": {
-        "semver": "^7.5.3"
+        "semver": "~7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/sisteransi": {
@@ -22980,52 +21669,33 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -23037,9 +21707,9 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
-      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
@@ -23064,21 +21734,21 @@
         "ws": "~8.17.1"
       }
     },
-    "node_modules/socket.io-client": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.0.tgz",
-      "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==",
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.2",
-        "engine.io-client": "~6.6.1",
-        "socket.io-parser": "~4.2.4"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/socket.io-parser": {
@@ -23094,6 +21764,40 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -23106,9 +21810,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
+      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
       "dev": true,
       "dependencies": {
         "ip-address": "^9.0.5",
@@ -23120,12 +21824,12 @@
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
       "dev": true,
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -23241,9 +21945,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "version": "3.0.21",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
       "dev": true
     },
     "node_modules/spdy": {
@@ -23333,32 +22037,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stream-throttle": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
-      "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "commander": "^2.2.0",
-        "limiter": "^1.0.5"
-      },
-      "bin": {
-        "throttleproxy": "bin/throttleproxy.js"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/stream-throttle/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/streamroller": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
@@ -23396,6 +22074,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/streamroller/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -23405,26 +22092,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -23453,16 +22120,36 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23472,15 +22159,19 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -23548,6 +22239,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -23556,15 +22248,14 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -23636,9 +22327,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.29.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
-      "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
+      "version": "5.31.6",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -23654,16 +22345,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -23687,55 +22378,6 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -23745,7 +22387,8 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
     },
     "node_modules/thingies": {
       "version": "1.21.0",
@@ -23798,6 +22441,24 @@
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
+    "node_modules/tldts": {
+      "version": "6.1.83",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.83.tgz",
+      "integrity": "sha512-FHxxNJJ0WNsEBPHyC1oesQb3rRoxpuho/z2g3zIIAhw1WHJeQsUzK1jYK8TI1/iClaa4fS3Z2TCA9mtxXsENSg==",
+      "dev": true,
+      "dependencies": {
+        "tldts-core": "^6.1.83"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.83",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.83.tgz",
+      "integrity": "sha512-I2wb9OJc6rXyh9d4aInhSNWChNI+ra6qDnFEGEwe9OoA68lE4Temw29bOkf1Uvwt8VZS079t1BFZdXVBmmB4dw==",
+      "dev": true
+    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
@@ -23841,36 +22502,15 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "tldts": "^6.1.32"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/tr46": {
@@ -23904,9 +22544,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
       "dev": true,
       "engines": {
         "node": ">=16"
@@ -23955,9 +22595,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -24034,6 +22674,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -24042,11 +22683,12 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
       "engines": {
-        "node": ">=12.20"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -24065,30 +22707,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24098,17 +22740,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24118,17 +22761,17 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -24177,9 +22820,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "1.0.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.38.tgz",
-      "integrity": "sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==",
+      "version": "0.7.40",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.40.tgz",
+      "integrity": "sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ==",
       "dev": true,
       "funding": [
         {
@@ -24195,8 +22838,9 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
-      "optional": true,
-      "peer": true,
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
       "engines": {
         "node": "*"
       }
@@ -24207,15 +22851,18 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -24228,9 +22875,9 @@
       "dev": true
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
       "dev": true
     },
     "node_modules/unfetch": {
@@ -24279,9 +22926,9 @@
       }
     },
     "node_modules/unicorn-magic": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
-      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
       "dev": true,
       "engines": {
         "node": ">=18"
@@ -24309,12 +22956,12 @@
       }
     },
     "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 10.0.0"
       }
     },
     "node_modules/unpipe": {
@@ -24335,9 +22982,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -24354,7 +23001,7 @@
       ],
       "dependencies": {
         "escalade": "^3.2.0",
-        "picocolors": "^1.1.0"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -24367,6 +23014,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -24375,20 +23023,11 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "node_modules/use-memo-one": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
@@ -24475,6 +23114,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
@@ -24518,18 +23165,18 @@
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -24608,6 +23255,15 @@
         }
       }
     },
+    "node_modules/webpack-cli/node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
@@ -24646,25 +23302,6 @@
         }
       }
     },
-    "node_modules/webpack-dev-middleware/node_modules/memfs": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
-      "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
-      "dev": true,
-      "dependencies": {
-        "@jsonjoy.com/json-pack": "^1.0.3",
-        "@jsonjoy.com/util": "^1.3.0",
-        "tree-dump": "^1.0.1",
-        "tslib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      }
-    },
     "node_modules/webpack-dev-server": {
       "version": "4.15.2",
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
@@ -24724,13 +23361,13 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/connect-history-api-fallback": {
+    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
       "engines": {
-        "node": ">=0.8"
+        "node": ">=8"
       }
     },
     "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
@@ -24742,6 +23379,62 @@
         "node": ">= 10"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
@@ -24769,6 +23462,7 @@
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
       "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
@@ -24818,6 +23512,12 @@
         }
       }
     },
+    "node_modules/webpack/node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
     "node_modules/webpack/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -24895,20 +23595,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/webpack/node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
@@ -24965,31 +23651,80 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -25002,12 +23737,14 @@
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true
     },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -25044,76 +23781,11 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "node_modules/ws": {
       "version": "8.17.1",
@@ -25144,17 +23816,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/xmlhttprequest-ssl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
-      "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -25166,7 +23827,8 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/yaml": {
       "version": "1.10.2",
@@ -25225,6 +23887,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },

From e976ddb07c6ca80e04e2ea2a2bc84b12fb7f9fdc Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 6 Mar 2025 17:28:12 +0100
Subject: [PATCH 1275/1286] remove custom theme dependency in base component
 SuggestionListElementComponent (#4041)

* remove custom theme dependency

* remove custom theme component

* remove obsolete constructor

* fix lint error

* fix lint error
---
 .../suggestion-list-element.component.spec.ts          |  2 +-
 .../suggestion-list-element.component.ts               | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
index 3f803c468d..2933933ba3 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
@@ -9,9 +9,9 @@ import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
-import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { Item } from '../../core/shared/item.model';
 import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 import { SuggestionListElementComponent } from './suggestion-list-element.component';
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
index 11bc64935b..99a22f89ea 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -6,14 +6,13 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Suggestion } from 'src/app/core/notifications/suggestions/models/suggestion.model';
 
-import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { Item } from '../../core/shared/item.model';
 import { fadeIn } from '../../shared/animations/fade';
 import { isNotEmpty } from '../../shared/empty.util';
+import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
 import { SuggestionApproveAndImport } from './suggestion-approve-and-import';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
@@ -62,13 +61,6 @@ export class SuggestionListElementComponent implements OnInit {
    */
   @Output() selected = new EventEmitter<boolean>();
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {NgbModal} modalService
-   */
-  constructor(private modalService: NgbModal) { }
-
   ngOnInit() {
     this.listableObject = {
       indexableObject: Object.assign(new Item(), { id: this.object.id, metadata: this.object.metadata }),

From 7d0408464242f96f94f5854f98277fffd7b0379d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 10 Mar 2025 00:27:03 +0100
Subject: [PATCH 1276/1286] Restored breadcrumbs on collection pages

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

diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts
index 51101f5a2d..37de4e46c7 100644
--- a/src/app/app-routes.ts
+++ b/src/app/app-routes.ts
@@ -108,7 +108,7 @@ export const APP_ROUTES: Route[] = [
         path: COLLECTION_MODULE_PATH,
         loadChildren: () => import('./collection-page/collection-page-routes')
           .then((m) => m.ROUTES),
-        data: { showBreadcrumbs: false,  enableRSS: true },
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {

From c90b05650aa597adfb7592c10845c48ccd55c51a Mon Sep 17 00:00:00 2001
From: Andreas Awouters <andreas.awouters@atmire.com>
Date: Mon, 10 Mar 2025 16:47:47 +0100
Subject: [PATCH 1277/1286] 120243: Disable 'aria-valid-attr-value' for
 community-list e2e test

---
 cypress/e2e/community-list.cy.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/community-list.cy.ts b/cypress/e2e/community-list.cy.ts
index 9b9c87b112..a5c255de04 100644
--- a/cypress/e2e/community-list.cy.ts
+++ b/cypress/e2e/community-list.cy.ts
@@ -12,6 +12,13 @@ describe('Community List Page', () => {
     cy.get('[data-test="expand-button"]').click({ multiple: true });
 
     // Analyze <ds-community-list-page> for accessibility issues
-    testA11y('ds-community-list-page');
+    testA11y('ds-community-list-page', {
+      rules: {
+        // When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
+        // 0 is not a valid value for 'aria-posinset' so the test fails.
+        // see https://github.com/DSpace/dspace-angular/issues/4068
+        'aria-valid-attr-value': { enabled: false },
+      },
+    });
   });
 });

From 069fd025172bb123b5dca11c3a7621bb0a35d2be Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 5 Feb 2025 18:33:54 +0100
Subject: [PATCH 1278/1286] [DURACOM-307] start migration and type fixing

---
 .../browse/bulk-access-browse.component.ts    |  12 +-
 .../bulk-access-settings.component.ts         |   7 +-
 .../epeople-registry.component.ts             |  13 +-
 .../eperson-form/eperson-form.component.ts    |  13 +-
 .../group-form/group-form.component.html      |  88 +++--
 .../group-form/group-form.component.ts        |  10 +-
 .../members-list/members-list.component.html  | 243 ++++++------
 .../members-list/members-list.component.ts    |  13 +-
 .../subgroups-list.component.html             | 188 ++++-----
 .../subgroup-list/subgroups-list.component.ts |  12 +-
 .../groups-registry.component.ts              |  16 +-
 .../batch-import-page.component.ts            |  10 +-
 .../ldn-service-form.component.ts             |  12 +-
 .../ldn-services-directory.component.ts       |  13 +-
 .../admin-notify-dashboard.component.html     |  10 +-
 .../admin-notify-dashboard.component.ts       |  10 +-
 .../admin-notify-detail-modal.component.html  |   8 +-
 .../admin-notify-detail-modal.component.ts    |  11 +-
 .../admin-notify-logs-result.component.ts     |  10 +-
 .../admin-notify-metrics.component.html       |  16 +-
 .../admin-notify-metrics.component.ts         |   7 +-
 .../admin-notify-search-result.component.html |  86 +++--
 .../admin-notify-search-result.component.ts   |  13 +-
 .../bitstream-formats.component.ts            |  12 +-
 .../format-form/format-form.component.html    |   8 +-
 .../format-form/format-form.component.ts      |   7 +-
 .../metadata-registry.component.ts            |  13 +-
 .../metadata-schema-form.component.html       |  22 +-
 .../metadata-schema-form.component.ts         |  10 +-
 .../metadata-field-form.component.html        |  22 +-
 .../metadata-field-form.component.ts          |  10 +-
 .../metadata-schema.component.ts              |  13 +-
 .../filtered-collections.component.html       | 124 +++---
 .../filtered-collections.component.ts         |  10 +-
 .../filtered-items/filtered-items-model.ts    |   9 +-
 .../filtered-items.component.html             | 364 ++++++++++--------
 .../filtered-items.component.ts               |  17 +-
 .../filtered-items/option-vo.model.ts         |   1 +
 .../filtered-items/preset-query.model.ts      |   1 +
 .../filters-section.component.ts              |   7 +-
 ...admin-search-result-actions.component.html |  62 ++-
 ...m-admin-search-result-actions.component.ts |   7 +-
 .../admin-sidebar.component.html              | 104 +++--
 .../admin-sidebar/admin-sidebar.component.ts  |  10 +-
 ...dable-admin-sidebar-section.component.html |  46 ++-
 ...andable-admin-sidebar-section.component.ts |  10 +-
 ...item-admin-workflow-actions.component.html |  14 +-
 ...w-item-admin-workflow-actions.component.ts |   7 +-
 ...ervision-order-group-selector.component.ts |   4 +-
 .../supervision-order-status.component.ts     |   8 +-
 ...item-admin-workflow-actions.component.html |  24 +-
 ...e-item-admin-workflow-actions.component.ts |   7 +-
 ...t-admin-workflow-grid-element.component.ts |   4 +-
 ...t-admin-workflow-list-element.component.ts |   7 +-
 ...t-admin-workflow-list-element.component.ts |   7 +-
 .../edit-bitstream-page.component.html        |  58 +--
 .../edit-bitstream-page.component.ts          |  10 +-
 .../breadcrumbs/breadcrumbs.component.html    |  30 +-
 src/app/breadcrumbs/breadcrumbs.component.ts  |   9 +-
 .../browse-by-metadata.component.html         |  38 +-
 .../browse-by-metadata.component.ts           |  11 +-
 .../browse-by-taxonomy.component.html         |  34 +-
 .../browse-by-taxonomy.component.ts           |  10 +-
 .../collection-item-mapper.component.html     |  44 ++-
 .../collection-item-mapper.component.ts       |  10 +-
 .../collection-page.component.ts              |  10 +-
 .../create-collection-page.component.html     |  24 +-
 .../create-collection-page.component.ts       |  10 +-
 .../delete-collection-page.component.ts       |  10 +-
 .../collection-access-control.component.html  |  13 +-
 .../collection-access-control.component.ts    |  10 +-
 .../collection-metadata.component.html        |  40 +-
 .../collection-metadata.component.ts          |  10 +-
 .../collection-roles.component.ts             |  10 +-
 .../collection-source-controls.component.ts   |  10 +-
 .../collection-source.component.ts            |  11 +-
 .../edit-item-template-page.component.html    |  12 +-
 .../edit-item-template-page.component.ts      |  10 +-
 .../community-list.component.ts               |   8 +-
 .../community-page.component.ts               |  10 +-
 .../create-community-page.component.html      |  31 +-
 .../create-community-page.component.ts        |  10 +-
 .../delete-community-page.component.ts        |  10 +-
 .../community-access-control.component.html   |  13 +-
 .../community-access-control.component.ts     |  10 +-
 .../community-roles.component.ts              |  10 +-
 .../edit-community-page.component.ts          |  13 +-
 ...ty-page-sub-collection-list.component.html |  28 +-
 ...nity-page-sub-collection-list.component.ts |  10 +-
 .../sub-com-col-section.component.html        |   8 +-
 .../sub-com-col-section.component.ts          |  10 +-
 ...ity-page-sub-community-list.component.html |  28 +-
 ...unity-page-sub-community-list.component.ts |  10 +-
 .../models/quality-assurance-event.model.ts   |   9 +
 .../core/registry/registry.service.spec.ts    |   2 +-
 .../core/shared/search/search.service.spec.ts |   2 +-
 .../curation-form/curation-form.component.ts  |   7 +-
 ...-edit-metadata-field-values.component.html |  28 +-
 ...so-edit-metadata-field-values.component.ts |   7 +-
 .../dso-edit-metadata-value.component.ts      |   8 +-
 .../dso-edit-metadata.component.ts            |   8 +-
 .../metadata-field-selector.component.html    |  48 ++-
 .../metadata-field-selector.component.ts      |   9 +-
 ...-search-result-grid-element.component.html |  76 ++--
 ...ue-search-result-grid-element.component.ts |   7 +-
 ...-search-result-grid-element.component.html |  76 ++--
 ...me-search-result-grid-element.component.ts |   7 +-
 ...-search-result-grid-element.component.html |  86 +++--
 ...al-search-result-grid-element.component.ts |   7 +-
 ...-search-result-list-element.component.html |  94 +++--
 ...ue-search-result-list-element.component.ts |   9 +-
 ...-search-result-list-element.component.html |  94 +++--
 ...me-search-result-list-element.component.ts |   9 +-
 ...-search-result-list-element.component.html |  76 ++--
 ...al-search-result-list-element.component.ts |   9 +-
 .../journal-issue.component.html              |   4 +-
 .../journal-issue/journal-issue.component.ts  |   7 +-
 .../journal-volume.component.html             |   4 +-
 .../journal-volume.component.ts               |   7 +-
 .../item-pages/journal/journal.component.html |   4 +-
 .../item-pages/journal/journal.component.ts   |   7 +-
 ...-search-result-grid-element.component.html |  88 +++--
 ...it-search-result-grid-element.component.ts |   7 +-
 ...-search-result-grid-element.component.html |  74 ++--
 ...on-search-result-grid-element.component.ts |   7 +-
 ...-search-result-grid-element.component.html |  62 +--
 ...ct-search-result-grid-element.component.ts |   7 +-
 ...-search-result-list-element.component.html |  80 ++--
 ...it-search-result-list-element.component.ts |   8 +-
 ...-search-result-list-element.component.html |  82 ++--
 ...on-search-result-list-element.component.ts |   9 +-
 ...-search-result-list-element.component.html |  76 ++--
 ...ct-search-result-list-element.component.ts |   8 +-
 .../org-unit/org-unit.component.html          |  14 +-
 .../item-pages/org-unit/org-unit.component.ts |   7 +-
 .../item-pages/person/person.component.html   |  10 +-
 .../item-pages/person/person.component.ts     |   7 +-
 .../item-pages/project/project.component.html | 106 ++---
 .../item-pages/project/project.component.ts   |   7 +-
 ...-item-metadata-list-element.component.html |  35 +-
 ...on-item-metadata-list-element.component.ts |   7 +-
 ...try-list-submission-element.component.html |   4 +-
 ...entry-list-submission-element.component.ts |   4 +-
 ...esult-list-submission-element.component.ts |   4 +-
 .../org-unit-input-suggestions.component.html |  46 +--
 .../org-unit-input-suggestions.component.ts   |   8 +-
 ...ult-list-submission-element.component.html |  64 +--
 ...esult-list-submission-element.component.ts |   9 +-
 .../person-input-suggestions.component.html   |  48 +--
 .../person-input-suggestions.component.ts     |   8 +-
 src/app/footer/footer.component.ts            |   8 +-
 .../forgot-password-form.component.ts         |  10 +-
 .../context-help-toggle.component.html        |  22 +-
 .../context-help-toggle.component.ts          |   7 +-
 src/app/header/header.component.ts            |   7 +-
 .../health-info-component.component.ts        |   8 +-
 .../health-info/health-info.component.ts      |   8 +-
 .../health-page/health-page.component.html    |  54 +--
 src/app/health-page/health-page.component.ts  |   7 +-
 .../health-component.component.ts             |   8 +-
 .../health-panel/health-panel.component.ts    |   8 +-
 .../health-status/health-status.component.ts  |   7 +-
 src/app/home-page/home-page.component.html    |  36 +-
 src/app/home-page/home-page.component.ts      |   9 +-
 .../recent-item-list.component.ts             |  10 +-
 .../top-level-community-list.component.html   |  34 +-
 .../top-level-community-list.component.ts     |   7 +-
 .../feedback-form.component.html              |  28 +-
 .../feedback-form/feedback-form.component.ts  |   4 +-
 .../alerts/item-alerts.component.html         |  30 +-
 .../item-page/alerts/item-alerts.component.ts |  10 +-
 ...bitstream-request-a-copy-page.component.ts |  11 +-
 .../upload/upload-bitstream.component.ts      |  10 +-
 .../edit-item-page.component.ts               |  13 +-
 .../item-access-control.component.html        |  13 +-
 .../item-access-control.component.ts          |  10 +-
 .../item-authorizations.component.html        |  31 +-
 .../item-authorizations.component.ts          |  12 +-
 .../item-bitstreams.component.ts              |  13 +-
 .../item-collection-mapper.component.html     |  42 +-
 .../item-collection-mapper.component.ts       |  10 +-
 .../item-curate/item-curate.component.html    |   5 +-
 .../item-curate/item-curate.component.ts      |  10 +-
 .../item-delete/item-delete.component.ts      |  12 +-
 .../item-move/item-move.component.ts          |  10 +-
 .../item-operation.component.ts               |   7 +-
 .../item-register-doi.component.ts            |  12 +-
 ...t-relationship-list-wrapper.component.html |  58 +--
 ...dit-relationship-list-wrapper.component.ts |  10 +-
 .../edit-relationship-list.component.ts       |  13 +-
 .../edit-relationship.component.ts            |  10 +-
 .../item-relationships.component.html         |  78 ++--
 .../item-relationships.component.ts           |  13 +-
 .../item-status/item-status.component.ts      |  13 +-
 .../item-version-history.component.html       |   6 +-
 .../item-version-history.component.ts         |  10 +-
 .../modify-item-overview.component.html       |  26 +-
 .../modify-item-overview.component.ts         |   7 +-
 .../virtual-metadata.component.ts             |  11 +-
 .../collections/collections.component.html    |  43 ++-
 .../collections/collections.component.ts      |  12 +-
 .../metadata-uri-values.component.html        |  10 +-
 .../metadata-uri-values.component.ts          |  11 +-
 .../metadata-values.component.html            |  30 +-
 .../metadata-values.component.ts              |   9 +-
 .../full-file-section.component.html          | 160 ++++----
 .../full-file-section.component.ts            |  12 +-
 .../full/full-item-page.component.ts          |  14 +-
 .../media-viewer-video.component.html         |  74 ++--
 .../media-viewer-video.component.ts           |  11 +-
 .../media-viewer/media-viewer.component.html  |  71 ++--
 .../media-viewer/media-viewer.component.ts    |  10 +-
 .../mirador-viewer.component.html             |   8 +-
 .../mirador-viewer.component.ts               |  11 +-
 .../orcid-auth/orcid-auth.component.ts        |  12 +-
 .../orcid-page/orcid-page.component.ts        |   5 +-
 .../orcid-queue/orcid-queue.component.html    |  97 ++---
 .../orcid-sync-settings.component.ts          |   7 +-
 .../item-page-cc-license-field.component.html |  50 +--
 .../item-page-cc-license-field.component.ts   |   8 +-
 .../item-page-title-field.component.html      |   8 +-
 .../title/item-page-title-field.component.ts  |   4 +-
 .../item-page/simple/item-page.component.html |  34 +-
 .../item-page/simple/item-page.component.ts   |  11 +-
 .../publication/publication.component.html    |  34 +-
 .../publication/publication.component.ts      |   7 +-
 .../untyped-item/untyped-item.component.html  |  34 +-
 .../untyped-item/untyped-item.component.ts    |  10 +-
 .../metadata-representation-list.component.ts |   8 +-
 .../notify-requests-status.component.html     |   8 +-
 .../notify-requests-status.component.ts       |  13 +-
 .../request-status-alert-box.component.html   |  10 +-
 .../request-status-alert-box.component.ts     |  12 +-
 .../qa-event-notification.component.ts        |  12 +-
 ...bed-related-entities-search.component.html |  54 +--
 ...abbed-related-entities-search.component.ts |   8 +-
 .../related-items/related-items-component.ts  |  10 +-
 ...-versions-row-element-version.component.ts |  11 +-
 .../item-versions-summary-modal.component.ts  |   7 +-
 .../versions/item-versions.component.ts       |  14 +-
 .../item-versions-notice.component.html       |  12 +-
 .../notice/item-versions-notice.component.ts  |   7 +-
 ...ce-new-external-dropdown.component.spec.ts |   2 +-
 ...-dspace-new-external-dropdown.component.ts |  10 +-
 ...-new-submission-dropdown.component.spec.ts |   2 +-
 ...space-new-submission-dropdown.component.ts |  10 +-
 .../my-dspace-new-submission.component.html   |  12 +-
 .../my-dspace-new-submission.component.ts     |   7 +-
 .../my-dspace-page.component.html             |  14 +-
 .../my-dspace-page.component.ts               |  10 +-
 ...space-qa-events-notifications.component.ts |  12 +-
 .../expandable-navbar-section.component.html  |  64 +--
 .../expandable-navbar-section.component.ts    |  13 +-
 src/app/navbar/navbar.component.ts            |  10 +-
 .../ePerson-data/ePerson-data.component.html  |  20 +-
 .../ePerson-data/ePerson-data.component.ts    |  12 +-
 ...quality-assurance-events.component.spec.ts |   2 +-
 .../quality-assurance-events.component.ts     |   8 +-
 .../project-entry-import-modal.component.html |  66 ++--
 ...oject-entry-import-modal.component.spec.ts |   2 +-
 .../project-entry-import-modal.component.ts   |   7 +-
 ...quality-assurance-source.component.spec.ts |   2 +-
 .../quality-assurance-source.component.ts     |   9 +-
 ...quality-assurance-topics.component.spec.ts |   2 +-
 .../quality-assurance-topics.component.ts     |   9 +-
 .../suggestion-actions.component.ts           |   7 +-
 .../suggestion-evidences.component.html       |  40 +-
 .../suggestion-evidences.component.ts         |  11 +-
 .../suggestion-list-element.component.html    |  42 +-
 .../suggestion-list-element.component.ts      |   7 +-
 .../publication-claim.component.html          |  91 +++--
 .../publication-claim.component.ts            |  12 +-
 .../suggestions-notification.component.html   |  22 +-
 .../suggestions-notification.component.ts     |  12 +-
 .../suggestions-popup.component.ts            |  12 +-
 .../detail/process-detail.component.ts        |  10 +-
 .../form/process-form.component.ts            |   7 +-
 .../parameter-select.component.ts             |   7 +-
 .../date-value-input.component.html           |  14 +-
 .../date-value-input.component.ts             |   4 +-
 .../file-value-input.component.ts             |   4 +-
 .../parameter-value-input.component.html      |  24 +-
 .../parameter-value-input.component.ts        |   7 +-
 .../string-value-input.component.html         |  14 +-
 .../string-value-input.component.ts           |   4 +-
 .../process-parameters.component.ts           |   7 +-
 .../script-help/script-help.component.html    |  34 +-
 .../form/script-help/script-help.component.ts |   9 +-
 .../scripts-select.component.ts               |   8 +-
 .../new/new-process.component.html            |  11 +-
 .../process-page/new/new-process.component.ts |   7 +-
 .../overview/process-overview.component.ts    |  10 +-
 .../table/process-overview-table.component.ts |  14 +-
 .../profile-claim-item-modal.component.ts     |  10 +-
 .../profile-page-metadata-form.component.html |  16 +-
 .../profile-page-metadata-form.component.ts   |   7 +-
 .../profile-page-researcher-form.component.ts |  10 +-
 .../profile-page-security-form.component.html |  24 +-
 .../profile-page-security-form.component.ts   |   7 +-
 .../profile-page/profile-page.component.ts    |  13 +-
 .../register-email-form.component.ts          |   7 +-
 .../create-profile.component.ts               |  12 +-
 .../deny-request-copy.component.html          |  15 +-
 .../deny-request-copy.component.ts            |   7 +-
 .../email-request-copy.component.ts           |   8 +-
 .../grant-deny-request-copy.component.html    |  58 +--
 .../grant-deny-request-copy.component.ts      |   7 +-
 .../grant-request-copy.component.html         |  31 +-
 .../grant-request-copy.component.ts           |   7 +-
 src/app/root/root.component.html              |  16 +-
 src/app/root/root.component.ts                |  11 +-
 .../access-control-array-form.component.ts    |   7 +-
 ...s-control-form-container.component.spec.ts |   5 +-
 ...access-control-form-container.component.ts |   7 +-
 ...ntrol-select-bitstreams-modal.component.ts |   7 +-
 src/app/shared/alert/alert.component.spec.ts  |   2 +-
 src/app/shared/alert/alert.component.ts       |   4 +-
 .../auth-nav-menu/auth-nav-menu.component.ts  |   8 +-
 .../user-menu/user-menu.component.html        |  58 +--
 .../user-menu/user-menu.component.ts          |   8 +-
 .../shared/browse-by/browse-by.component.html |  58 +--
 .../shared/browse-by/browse-by.component.ts   |   9 +-
 .../collection-dropdown.component.ts          |   8 +-
 .../comcol-form/comcol-form.component.ts      |  11 +-
 .../comcol-role/comcol-role.component.html    |  66 ++--
 .../comcol-role/comcol-role.component.ts      |  10 +-
 .../comcol-page-browse-by.component.ts        |  12 +-
 .../comcol-page-content.component.html        |  18 +-
 .../comcol-page-content.component.ts          |   7 +-
 .../comcol-page-handle.component.html         |  12 +-
 .../comcol-page-handle.component.ts           |   7 +-
 .../comcol-page-header.component.html         |   2 +-
 .../comcol-page-header.component.ts           |   6 +-
 .../comcol-page-logo.component.html           |   6 +-
 .../comcol-page-logo.component.ts             |   4 +-
 .../confirmation-modal.component.html         |   8 +-
 .../confirmation-modal.component.ts           |   4 +-
 .../context-help-wrapper.component.html       |  39 +-
 .../context-help-wrapper.component.ts         |  16 +-
 ...tem-withdrawn-reinstate-modal.component.ts |  10 +-
 .../shared/ds-select/ds-select.component.ts   |   4 +-
 ...-edit-menu-expandable-section.component.ts |   9 +-
 .../dso-edit-menu-section.component.html      |  36 +-
 .../dso-edit-menu-section.component.ts        |   4 +-
 .../dso-edit-menu/dso-edit-menu.component.ts  |   8 +-
 .../dso-selector/dso-selector.component.ts    |   9 +-
 ...te-collection-parent-selector.component.ts |   4 +-
 ...create-item-parent-selector.component.html |  10 +-
 .../create-item-parent-selector.component.ts  |   4 +-
 .../dso-selector-modal-wrapper.component.html |   4 +-
 .../edit-item-selector.component.html         |   4 +-
 .../edit-item-selector.component.ts           |   4 +-
 .../entity-dropdown.component.ts              |   8 +-
 .../eperson-group-list.component.html         |  72 ++--
 .../eperson-group-list.component.ts           |   8 +-
 .../file-download-link.component.ts           |   9 +-
 ...ynamic-form-control-container.component.ts |  14 +-
 .../ds-dynamic-form.component.html            |  30 +-
 .../ds-dynamic-form.component.ts              |   7 +-
 ...xisting-metadata-list-element.component.ts |  10 +-
 ...xisting-relation-list-element.component.ts |  10 +-
 .../dynamic-form-array.component.ts           |  11 +-
 .../dynamic-date-picker-inline.component.ts   |  10 +-
 .../dynamic-form-group.component.html         |  46 +--
 .../dynamic-form-group.component.ts           |  10 +-
 .../models/list/dynamic-list.component.ts     |  13 +-
 .../models/lookup/dynamic-lookup.component.ts |  13 +-
 .../models/onebox/dynamic-onebox.component.ts |  13 +-
 .../dynamic-relation-group.component.spec.ts  |  11 +-
 .../dynamic-relation-group.components.ts      |  11 +-
 ...dynamic-scrollable-dropdown.component.html | 106 ++---
 .../dynamic-scrollable-dropdown.component.ts  |  12 +-
 .../models/tag/dynamic-tag.component.ts       |   7 +-
 ...dynamic-lookup-relation-modal.component.ts |  12 +-
 ...elation-external-source-tab.component.html |  46 ++-
 ...-relation-external-source-tab.component.ts |  10 +-
 ...nal-source-entry-import-modal.component.ts |  10 +-
 ...ic-lookup-relation-search-tab.component.ts |  10 +-
 ...okup-relation-selection-tab.component.html |  46 ++-
 ...lookup-relation-selection-tab.component.ts |  10 +-
 .../shared/form/chips/chips.component.spec.ts |   2 +-
 src/app/shared/form/chips/chips.component.ts  |  13 +-
 src/app/shared/form/form.component.spec.ts    |   4 +-
 src/app/shared/form/form.component.ts         |  10 +-
 .../vocabulary-treeview.component.ts          |  10 +-
 .../impersonate-navbar.component.html         |  16 +-
 .../impersonate-navbar.component.ts           |   7 +-
 .../dso-input-suggestions.component.html      |  42 +-
 .../dso-input-suggestions.component.ts        |   8 +-
 .../filter-input-suggestions.component.ts     |  10 +-
 .../input-suggestions.component.html          |  42 +-
 .../input-suggestions.component.ts            |   8 +-
 .../validation-suggestions.component.html     |  32 +-
 .../validation-suggestions.component.ts       |   8 +-
 .../lang-switch/lang-switch.component.html    |  46 ++-
 .../lang-switch/lang-switch.component.ts      |   7 +-
 .../live-region/live-region.component.html    |   4 +-
 .../live-region/live-region.component.ts      |   8 +-
 src/app/shared/loading/loading.component.ts   |   4 +-
 src/app/shared/log-in/log-in.component.html   |  20 +-
 src/app/shared/log-in/log-in.component.ts     |   8 +-
 .../password/log-in-password.component.ts     |   7 +-
 src/app/shared/log-out/log-out.component.html |   4 +-
 src/app/shared/log-out/log-out.component.ts   |   7 +-
 .../onclick-menu-item.component.html          |  26 +-
 .../menu-item/onclick-menu-item.component.ts  |   4 +-
 .../metadata-field-wrapper.component.html     |   4 +-
 .../metadata-field-wrapper.component.ts       |   4 +-
 ...laimed-task-actions-approve.component.html |  16 +-
 .../claimed-task-actions-approve.component.ts |   7 +-
 .../claimed-task-actions.component.html       |  16 +-
 .../claimed-task-actions.component.ts         |   7 +-
 ...d-task-actions-decline-task.component.html |  24 +-
 ...med-task-actions-decline-task.component.ts |   7 +-
 ...-task-actions-edit-metadata.component.html |  16 +-
 ...ed-task-actions-edit-metadata.component.ts |   7 +-
 .../claimed-task-actions-reject.component.ts  |   7 +-
 ...task-actions-return-to-pool.component.html |  16 +-
 ...d-task-actions-return-to-pool.component.ts |   7 +-
 .../pool-task-actions.component.html          |  12 +-
 .../pool-task/pool-task-actions.component.ts  |   7 +-
 .../workspaceitem-actions.component.html      |  42 +-
 .../workspaceitem-actions.component.ts        |   7 +-
 .../notification-box.component.html           |  24 +-
 .../notification-box.component.ts             |  10 +-
 .../notification/notification.component.ts    |  10 +-
 .../notifications-board.component.html        |  17 +-
 .../notifications-board.component.ts          |   7 +-
 .../object-collection.component.html          | 152 ++++----
 .../object-collection.component.ts            |   9 +-
 .../access-status-badge.component.ts          |   7 +-
 .../shared/badges/badges.component.ts         |   4 +-
 .../status-badge/status-badge.component.ts    |   4 +-
 .../badges/type-badge/type-badge.component.ts |   4 +-
 .../item-collection.component.ts              |   7 +-
 .../item-submitter.component.ts               |   7 +-
 .../selectable-list-item-control.component.ts |   7 +-
 ...earch-result-detail-element.component.html |  17 +-
 ...-search-result-detail-element.component.ts |   7 +-
 .../item-detail-preview-field.component.html  |  18 +-
 .../item-detail-preview-field.component.ts    |  11 +-
 .../item-detail-preview.component.html        | 120 +++---
 .../item-detail-preview.component.ts          |   8 +-
 ...earch-result-detail-element.component.html |  17 +-
 ...-search-result-detail-element.component.ts |   7 +-
 .../object-detail.component.html              |  30 +-
 .../object-detail/object-detail.component.ts  |   7 +-
 .../collection-grid-element.component.html    |  32 +-
 .../collection-grid-element.component.ts      |   7 +-
 .../community-grid-element.component.html     |  32 +-
 .../community-grid-element.component.ts       |   7 +-
 .../object-grid/object-grid.component.html    |  32 +-
 .../object-grid/object-grid.component.ts      |  10 +-
 ...-search-result-grid-element.component.html |  36 +-
 ...on-search-result-grid-element.component.ts |   7 +-
 ...-search-result-grid-element.component.html |  42 +-
 ...ty-search-result-grid-element.component.ts |   7 +-
 ...em-search-result-grid-element.component.ts |   8 +-
 .../browse-entry-list-element.component.ts    |   7 +-
 .../collection-list-element.component.ts      |   4 +-
 .../community-list-element.component.ts       |   4 +-
 .../identifier-data.component.html            |   8 +-
 .../identifier-data.component.ts              |  10 +-
 ...-link-metadata-list-element.component.html |  14 +-
 ...se-link-metadata-list-element.component.ts |   4 +-
 ...-text-metadata-list-element.component.html |  36 +-
 ...in-text-metadata-list-element.component.ts |   4 +-
 ...-search-result-list-element.component.html |  12 +-
 ...ed-search-result-list-element.component.ts |   7 +-
 ...-search-result-list-element.component.html |  12 +-
 ...ed-search-result-list-element.component.ts |   7 +-
 ...-search-result-list-element.component.html |  14 +-
 ...sk-search-result-list-element.component.ts |   7 +-
 ...-search-result-list-element.component.html |  32 +-
 ...ed-search-result-list-element.component.ts |   8 +-
 .../item-list-preview.component.html          |  73 ++--
 .../item-list-preview.component.ts            |  13 +-
 ...-search-result-list-element.component.html |  36 +-
 ...ol-search-result-list-element.component.ts |   8 +-
 ...em-search-result-list-element.component.ts |   8 +-
 ...em-search-result-list-element.component.ts |   8 +-
 .../object-list/object-list.component.html    |  70 ++--
 .../object-list/object-list.component.ts      |   8 +-
 ...on-search-result-list-element.component.ts |   7 +-
 ...ty-search-result-list-element.component.ts |   7 +-
 ...-search-result-list-element.component.html | 106 +++--
 ...em-search-result-list-element.component.ts |   9 +-
 .../sidebar-search-list-element.component.ts  |   8 +-
 .../collection-select.component.ts            |   9 +-
 .../item-select/item-select.component.ts      |   9 +-
 .../object-table/object-table.component.html  |  28 +-
 .../object-table/object-table.component.ts    |   7 +-
 .../orcid-badge-and-tooltip.component.ts      |  10 +-
 .../page-size-selector.component.html         |  22 +-
 .../page-size-selector.component.ts           |   7 +-
 .../pagination/pagination.component.spec.ts   |   5 +-
 .../shared/pagination/pagination.component.ts |   9 +-
 .../resource-policy-entry.component.html      |  24 +-
 .../entry/resource-policy-entry.component.ts  |   5 +-
 .../resource-policy-form.component.spec.ts    |   4 +-
 .../form/resource-policy-form.component.ts    |  12 +-
 .../resource-policies.component.html          |  96 ++---
 .../resource-policies.component.spec.ts       |   4 +-
 .../resource-policies.component.ts            |  12 +-
 src/app/shared/rss-feed/rss.component.ts      |   7 +-
 .../search-form/search-form.component.ts      |   7 +-
 .../advanced-search.component.html            |  38 +-
 .../advanced-search.component.ts              |  11 +-
 .../search-export-csv.component.html          |  14 +-
 .../search-export-csv.component.ts            |   7 +-
 .../search-authority-filter.component.ts      |   8 +-
 .../search-boolean-filter.component.ts        |   8 +-
 .../search-facet-option.component.ts          |   7 +-
 .../search-facet-range-option.component.ts    |   7 +-
 .../search-filter.component.html              |  56 +--
 .../search-filter/search-filter.component.ts  |   9 +-
 .../search-hierarchy-filter.component.ts      |   9 +-
 .../search-range-filter.component.ts          |   9 +-
 .../search-text-filter.component.ts           |   8 +-
 .../search-label-range.component.ts           |  10 +-
 .../search-labels.component.html              |  10 +-
 .../search-labels/search-labels.component.ts  |   8 +-
 .../search-results-skeleton.component.ts      |  10 +-
 .../search-results.component.html             |  75 ++--
 .../search-settings.component.html            |  30 +-
 .../search-settings.component.ts              |   7 +-
 .../search-sidebar.component.ts               |   7 +-
 .../search-switch-configuration.component.ts  |   7 +-
 src/app/shared/search/search.component.ts     |  12 +-
 .../sidebar/page-with-sidebar.component.ts    |  11 +-
 .../date/starts-with-date.component.ts        |   4 +-
 .../subscription-modal.component.ts           |   9 +-
 .../subscription-view.component.html          |  36 +-
 .../subscription-view.component.ts            |   7 +-
 .../truncatable-part.component.ts             |   4 +-
 .../view-mode-switch.component.html           |  70 ++--
 .../view-mode-switch.component.ts             |   4 +-
 .../statistics-page.component.html            |  34 +-
 .../statistics-table.component.html           |  71 ++--
 .../statistics-table.component.ts             |   8 +-
 ...submission-form-section-add.component.html |  48 +--
 .../submission-upload-files.component.html    |  18 +-
 .../submission-upload-files.component.ts      |   7 +-
 ...-import-external-collection.component.html |  10 +-
 ...on-import-external-collection.component.ts |  10 +-
 ...ssion-import-external-preview.component.ts |   7 +-
 .../submission-import-external.component.html |  78 ++--
 .../submission-import-external.component.ts   |  10 +-
 .../accesses/section-accesses.component.html  |  16 +-
 .../accesses/section-accesses.component.ts    |   7 +-
 ...ubmission-section-cc-licenses.component.ts |  12 +-
 .../container/section-container.component.ts  |  14 +-
 .../section-duplicates.component.html         |  30 +-
 .../section-duplicates.component.spec.ts      |   6 +-
 .../section-duplicates.component.ts           |  12 +-
 .../sections/form/section-form.component.html |  26 +-
 .../form/section-form.component.spec.ts       |   2 +-
 .../sections/form/section-form.component.ts   |   7 +-
 .../section-identifiers.component.html        |  26 +-
 .../section-identifiers.component.spec.ts     |   4 +-
 .../section-identifiers.component.ts          |  12 +-
 .../license/section-license.component.html    |  16 +-
 .../license/section-license.component.spec.ts |   5 +-
 .../license/section-license.component.ts      |  10 +-
 .../section-coar-notify.component.ts          |  13 +-
 .../content-accordion.component.ts            |  12 +-
 .../metadata-information.component.ts         |  10 +-
 .../publication-information.component.ts      |  11 +-
 .../publisher-policy.component.ts             |  12 +-
 .../section-sherpa-policies.component.ts      |  12 +-
 ...tion-upload-access-conditions.component.ts |  10 +-
 .../section-upload-file-edit.component.html   |  20 +-
 ...section-upload-file-edit.component.spec.ts |   5 +-
 .../section-upload-file-edit.component.ts     |   7 +-
 .../section-upload-file.component.spec.ts     |   4 +-
 .../file/section-upload-file.component.ts     |  10 +-
 .../section-upload-file-view.component.html   |  58 +--
 .../section-upload-file-view.component.ts     |  11 +-
 .../upload/section-upload.component.html      |  66 ++--
 .../upload/section-upload.component.spec.ts   |   3 +-
 .../upload/section-upload.component.ts        |  12 +-
 .../subscriptions-page.component.html         |  68 ++--
 .../subscriptions-page.component.ts           |   8 +-
 .../suggestions-page.component.html           |  76 ++--
 .../suggestions-page.component.ts             |  12 +-
 .../system-wide-alert-banner.component.ts     |   8 +-
 .../system-wide-alert-form.component.ts       |   7 +-
 src/app/thumbnail/thumbnail.component.html    |  30 +-
 ...vanced-workflow-action-rating.component.ts |  11 +-
 ...flow-action-select-reviewer.component.html |  42 +-
 ...rkflow-action-select-reviewer.component.ts |   5 +-
 .../workflow-item-action-page.component.html  |  10 +-
 .../workflow-item-delete.component.ts         |   5 +-
 .../workspaceitems-delete-page.component.html |   8 +-
 .../workspaceitems-delete-page.component.ts   |   5 +-
 .../header-navbar-wrapper.component.html      |  12 +-
 .../dspace/app/header/header.component.ts     |   7 +-
 .../dspace/app/navbar/navbar.component.html   |  10 +-
 598 files changed, 5674 insertions(+), 6015 deletions(-)

diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
index a400742f01..9649277cdf 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -59,15 +55,13 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     NgbAccordionModule,
     TranslateModule,
-    NgIf,
     NgbNavModule,
     ThemedSearchComponent,
     BrowserOnlyPipe,
-    NgForOf,
     NgxPaginationModule,
     SelectableListItemControlComponent,
-    ListableObjectComponentLoaderComponent,
-  ],
+    ListableObjectComponentLoaderComponent
+],
   standalone: true,
 })
 export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
index 264cefc708..12d501c7d6 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ViewChild,
@@ -16,9 +16,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   imports: [
     NgbAccordionModule,
     TranslateModule,
-    NgIf,
-    AccessControlFormContainerComponent,
-  ],
+    AccessControlFormContainerComponent
+],
   standalone: true,
 })
 export class BulkAccessSettingsComponent {
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index 6b62a13ecf..80aeab3417 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -72,14 +67,12 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component';
     TranslateModule,
     RouterModule,
     AsyncPipe,
-    NgIf,
     EPersonFormComponent,
     ReactiveFormsModule,
     ThemedLoadingComponent,
     PaginationComponent,
-    NgClass,
-    NgForOf,
-  ],
+    NgClass
+],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index c7b57c986d..586339a4d6 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -84,8 +79,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
   templateUrl: './eperson-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
-    NgFor,
     AsyncPipe,
     TranslateModule,
     NgClass,
@@ -93,8 +86,8 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
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 7e8c1ed1b4..060cc5b86d 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
@@ -2,13 +2,7 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeGroup$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeGroup$ | async) {
         <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
@@ -17,47 +11,61 @@
               iconPlacement: 'right',
               tooltipPlacement: ['right', 'bottom']
             }"
-          >
+            >
             {{messagePrefix + '.head.edit' | translate}}
           </span>
         </h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
+      }
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
-        <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
-                  [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-        <ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
-          <ds-alert *ngIf="(canEdit$ | async) !== true" [type]="AlertType.Warning"
-                    [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
-          </ds-alert>
-        </ng-container>
-      </ng-container>
+
+
+      @if ((activeGroup$ | async); as groupBeingEdited) {
+        @if (groupBeingEdited?.permanent) {
+          <ds-alert [type]="AlertType.Warning"
+          [content]="messagePrefix + '.alert.permanent'"></ds-alert>
+        }
+        @if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) {
+          @if ((canEdit$ | async) !== true) {
+            <ds-alert [type]="AlertType.Warning"
+              [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
+            </ds-alert>
+          }
+        }
+      }
 
       <ds-form [formId]="formId"
-               [formModel]="formModel"
-               [formGroup]="formGroup"
-               [formLayout]="formLayout"
-               [displayCancel]="false"
-               (submitForm)="onSubmit()">
+        [formModel]="formModel"
+        [formGroup]="formGroup"
+        [formLayout]="formLayout"
+        [displayCancel]="false"
+        (submitForm)="onSubmit()">
         <div before class="btn-group">
           <button (click)="onCancel()" type="button"
-                  class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
-        </div>
-        <div after *ngIf="(canEdit$ | async) && !(activeGroup$ | async)?.permanent" class="btn-group">
-          <button (click)="delete()" class="btn btn-danger delete-button" type="button">
-            <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
-          </button>
-        </div>
-      </ds-form>
+            class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
+          </div>
+          @if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
+            <div after class="btn-group">
+              <button (click)="delete()" class="btn btn-danger delete-button" type="button">
+                <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
+              </button>
+            </div>
+          }
+        </ds-form>
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
-        <div class="mb-5">
-          <ds-members-list *ngIf="groupBeingEdited !== undefined"
-                           [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-        </div>
-        <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
-                           [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-      </ng-container>
+        @if ((activeGroup$ | async); as groupBeingEdited) {
+          <div class="mb-5">
+            @if (groupBeingEdited !== undefined) {
+              <ds-members-list
+              [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+            }
+          </div>
+          @if (groupBeingEdited !== undefined) {
+            <ds-subgroups-list
+            [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
+          }
+        }
+      </div>
     </div>
   </div>
-</div>
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 d2ddb3266b..ca83c0af7e 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
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -92,13 +89,12 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
   imports: [
     FormComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     TranslateModule,
     ContextHelpDirective,
     MembersListComponent,
-    SubgroupsListComponent,
-  ],
+    SubgroupsListComponent
+],
   standalone: true,
 })
 /**
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 82e07a898d..44a3775c05 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
@@ -3,63 +3,70 @@
 
   <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
-                 [paginationOptions]="config"
-                 [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
+  @if ((ePeopleMembersOfGroup | async)?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="config"
+      [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+              <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (epersonDTO of (ePeopleMembersOfGroup | async)?.page; track epersonDTO) {
+              <tr>
+                <td class="align-middle">{{epersonDTO.eperson.id}}</td>
+                <td class="align-middle">
+                  <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
+                    {{ dsoNameService.getName(epersonDTO.eperson) }}
+                  </a>
+                </td>
+                <td class="align-middle">
+                  {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}<br/>
+                  {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }}
+                </td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    @if (epersonDTO.ableToDelete) {
+                      <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
+                        [dsBtnDisabled]="actionConfig.remove.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.remove.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
+                        <i [ngClass]="actionConfig.remove.icon"></i>
+                      </button>
+                    }
+                    @if (!epersonDTO.ableToDelete) {
+                      <button
+                        (click)="addMemberToGroup(epersonDTO.eperson)"
+                        [dsBtnDisabled]="actionConfig.add.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.add.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
+                        <i [ngClass]="actionConfig.add.icon"></i>
+                      </button>
+                    }
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-    <div class="table-responsive">
-      <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let epersonDTO of (ePeopleMembersOfGroup | async)?.page">
-          <td class="align-middle">{{epersonDTO.eperson.id}}</td>
-          <td class="align-middle">
-            <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
-              {{ dsoNameService.getName(epersonDTO.eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
-                      *ngIf="epersonDTO.ableToDelete"
-                      [dsBtnDisabled]="actionConfig.remove.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
-                <i [ngClass]="actionConfig.remove.icon"></i>
-              </button>
-              <button *ngIf="!epersonDTO.ableToDelete"
-                      (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [dsBtnDisabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
+  @if ((ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-members-yet' | translate}}
     </div>
-
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-members-yet' | translate}}
-  </div>
+  }
 
   <h3 id="search" class="border-bottom pb-2">
     <span
@@ -69,7 +76,7 @@
         iconPlacement: 'right',
         tooltipPlacement: ['top', 'right', 'bottom']
       }"
-    >
+      >
       {{messagePrefix + '.search.head' | translate}}
     </span>
   </h3>
@@ -78,68 +85,72 @@
     <div class="flex-grow-1 me-3">
       <div class="form-group input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
+          class="form-control" aria-label="Search input">
         <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
-        </span>
+          <button type="submit" class="search-button btn btn-primary">
+            <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
+          </span>
+        </div>
       </div>
-    </div>
-    <div>
-      <button (click)="clearFormAndResetResult();"
-              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
-    </div>
-  </form>
+      <div>
+        <button (click)="clearFormAndResetResult();"
+        class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
+      </div>
+    </form>
 
-  <ds-pagination *ngIf="(ePeopleSearch | async)?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [collectionSize]="(ePeopleSearch | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
+    @if ((ePeopleSearch | async)?.totalElements > 0) {
+      <ds-pagination
+        [paginationOptions]="configSearch"
+        [collectionSize]="(ePeopleSearch | async)?.totalElements"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+        <div class="table-responsive">
+          <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
+            <thead>
+              <tr>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+                <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (eperson of (ePeopleSearch | async)?.page; track eperson) {
+                <tr>
+                  <td class="align-middle">{{eperson.id}}</td>
+                  <td class="align-middle">
+                    <a [routerLink]="getEPersonEditRoute(eperson.id)">
+                      {{ dsoNameService.getName(eperson) }}
+                    </a>
+                  </td>
+                  <td class="align-middle">
+                    {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+                    {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
+                  </td>
+                  <td class="align-middle">
+                    <div class="btn-group edit-field">
+                      <button (click)="addMemberToGroup(eperson)"
+                        [dsBtnDisabled]="actionConfig.add.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.add.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
+                        <i [ngClass]="actionConfig.add.icon"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      </ds-pagination>
+    }
 
-    <div class="table-responsive">
-      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
-          <td class="align-middle">{{eperson.id}}</td>
-          <td class="align-middle">
-            <a [routerLink]="getEPersonEditRoute(eperson.id)">
-              {{ dsoNameService.getName(eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="addMemberToGroup(eperson)"
-                      [dsBtnDisabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
+    @if ((ePeopleSearch | async)?.totalElements === 0 && searchDone) {
+      <div
+        class="alert alert-info w-100 mb-2"
+        role="alert">
+        {{messagePrefix + '.no-items' | translate}}
+      </div>
+    }
 
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleSearch | async)?.totalElements === 0 && searchDone"
-       class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
-
-</ng-container>
+  </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 22934394c8..84782ad0eb 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -109,13 +104,11 @@ export interface EPersonListActionConfig {
     ContextHelpDirective,
     ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
     AsyncPipe,
     RouterLink,
     NgClass,
-    NgForOf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
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 32525fb2b5..d09ab08c42 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
@@ -3,51 +3,56 @@
 
   <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
 
-  <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="config"
-                 [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th>{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-            {{ dsoNameService.getName(group) }}
-          </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteSubgroupFromGroup(group)"
+  @if ((subGroups$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="config"
+      [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              <th>{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (group of (subGroups$ | async)?.payload?.page; track group) {
+              <tr>
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupDataService.startEditingNewGroup(group)"
+                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    <button (click)="deleteSubgroupFromGroup(group)"
                       class="btn btn-outline-danger btn-sm deleteButton"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-trash-alt fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-  <div *ngIf="(subGroups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-subgroups-yet' | translate}}
-  </div>
+  @if ((subGroups$ | async)?.payload?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-subgroups-yet' | translate}}
+    </div>
+  }
 
   <h4 id="search" class="border-bottom pb-2">
     <span *dsContextHelp="{
@@ -56,7 +61,7 @@
             iconPlacement: 'right',
             tooltipPlacement: ['top', 'right', 'bottom']
           }"
-    >
+      >
       {{messagePrefix + '.search.head' | translate}}
     </span>
 
@@ -65,11 +70,11 @@
     <div class="flex-grow-1 me-3">
       <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
+          class="form-control" aria-label="Search input">
         <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
-            </button>
+          <button type="submit" class="search-button btn btn-primary">
+            <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
+          </button>
         </span>
 
       </div>
@@ -81,50 +86,55 @@
     </div>
   </form>
 
-  <ds-pagination *ngIf="(searchResults$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="groupsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-              {{ dsoNameService.getName(group) }}
-            </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="addSubgroupToGroup(group)"
+  @if ((searchResults$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="configSearch"
+      [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="groupsSearch" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (group of (searchResults$ | async)?.payload?.page; track group) {
+              <tr>
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupDataService.startEditingNewGroup(group)"
+                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    <button (click)="addSubgroupToGroup(group)"
                       class="btn btn-outline-primary btn-sm addButton"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-plus fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-plus fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements === 0 && searchDone" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
+  @if ((searchResults$ | async)?.payload?.totalElements === 0 && searchDone) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-items' | translate}}
+    </div>
+  }
 
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 95c1b7f249..e5bd6448ab 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -65,13 +61,11 @@ enum SubKey {
   imports: [
     RouterLink,
     AsyncPipe,
-    NgForOf,
     ContextHelpDirective,
     TranslateModule,
     ReactiveFormsModule,
-    PaginationComponent,
-    NgIf,
-  ],
+    PaginationComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 07b7317a1e..c45692cab2 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -79,14 +73,10 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     RouterLink,
     ReactiveFormsModule,
     AsyncPipe,
-    NgIf,
     PaginationComponent,
-    NgSwitch,
-    NgSwitchCase,
     NgbTooltipModule,
-    NgForOf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index 1f54b801c8..c953ce2ad5 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  Location,
-  NgIf,
-} from '@angular/common';
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
@@ -36,12 +33,11 @@ import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzo
   selector: 'ds-batch-import-page',
   templateUrl: './batch-import-page.component.html',
   imports: [
-    NgIf,
     TranslateModule,
     FormsModule,
     UiSwitchModule,
-    FileDropzoneNoUploaderComponent,
-  ],
+    FileDropzoneNoUploaderComponent
+],
   standalone: true,
 })
 export class BatchImportPageComponent {
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
index 667669646c..832e6e78f3 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -5,11 +5,7 @@ import {
   transition,
   trigger,
 } from '@angular/animations';
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -77,11 +73,9 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter
   imports: [
     ReactiveFormsModule,
     TranslateModule,
-    NgIf,
     NgbDropdownModule,
-    NgForOf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
 })
 export class LdnServiceFormComponent implements OnInit, OnDestroy {
   formModel: FormGroup;
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
index cc2cba4704..e2f956ea48 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -54,16 +49,14 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
   styleUrls: ['./ldn-services-directory.component.scss'],
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
-    NgIf,
-    NgFor,
     TranslateModule,
     AsyncPipe,
     PaginationComponent,
     TruncatableComponent,
     TruncatablePartComponent,
     NgClass,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class LdnServicesOverviewComponent implements OnInit, OnDestroy {
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 3adb7e857b..0e0183fe84 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -13,11 +13,13 @@
           </li>
           <li class="nav-item">
             <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
-        </ul>
-        <div class="mt-2">
-          <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+          </ul>
+          <div class="mt-2">
+            @if ((notifyMetricsRows$ | async)?.length) {
+              <ds-admin-notify-metrics [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+            }
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 5508c18030..41d067ac95 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -46,10 +43,9 @@ import {
   imports: [
     AdminNotifyMetricsComponent,
     RouterLink,
-    NgIf,
     TranslateModule,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
 })
 
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 52d93cbb62..3760dc341d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -5,12 +5,14 @@
   </button>
 </div>
 <div class="modal-body p-4">
-    <div *ngFor="let key of notifyMessageKeys">
+  @for (key of notifyMessageKeys; track key) {
+    <div>
       <div class="row mb-4">
         <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
         <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
       </div>
     </div>
+  }
 
   <div class="d-flex justify-content-end">
     <button class="btn-primary" (click)="toggleCoarMessage()">
@@ -18,5 +20,7 @@
     </button>
   </div>
 
-  <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2" *ngIf="isCoarMessageVisible"></pre>
+  @if (isCoarMessageVisible) {
+    <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2"></pre>
+  }
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index 717d24a9fc..de3141b870 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -26,10 +23,8 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model';
   ],
   standalone: true,
   imports: [
-    NgForOf,
-    TranslateModule,
-    NgIf,
-  ],
+    TranslateModule
+],
 })
 /**
  * Component for detailed view of LDN messages displayed in search result in AdminNotifyDashboardComponent
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
index 2c6164ecda..45f3269cc9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,9 +35,8 @@ import { ThemedSearchComponent } from '../../../../shared/search/themed-search.c
     SearchLabelsComponent,
     ThemedSearchComponent,
     AsyncPipe,
-    TranslateModule,
-    NgIf,
-  ],
+    TranslateModule
+],
 })
 
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
index 3257bdd5ba..5c7910284f 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -1,9 +1,13 @@
-<div class="mb-5" *ngFor="let row of boxesConfig">
-  <div class="mb-2">{{ row.title | translate }}</div>
-  <div class="row justify-content-between">
-    <div class="col-sm" *ngFor="let box of row.boxes">
-      <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+@for (row of boxesConfig; track row) {
+  <div class="mb-5">
+    <div class="mb-2">{{ row.title | translate }}</div>
+    <div class="row justify-content-between">
+      @for (box of row.boxes; track box) {
+        <div class="col-sm">
+          <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+        </div>
+      }
     </div>
   </div>
-</div>
+}
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index af5345f512..680ef53dcf 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -16,9 +16,8 @@ import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
   standalone: true,
   imports: [
     NotificationBoxComponent,
-    TranslateModule,
-    NgForOf,
-  ],
+    TranslateModule
+],
 })
 /**
  * Component used to display the number of notification for each configured box in the notifyMetrics section
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index af540b094e..5c8360c726 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -11,41 +11,57 @@
       </tr>
     </thead>
     <tbody>
-      <tr *ngFor="let message of (messagesSubject$ | async)">
-        <td class="text-nowrap">
-          <div *ngIf="message.queueLastStartTime">{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
-          <div *ngIf="!message.queueLastStartTime">n/a</div>
-        </td>
-        <td>
-          <ds-truncatable [id]="message.id">
-            <ds-truncatable-part [id]="message.id" [minLines]="2">
-              <a *ngIf="message.relatedItem" [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
-            </ds-truncatable-part>
-          </ds-truncatable>
-          <div *ngIf="!message.relatedItem">n/a</div>
-        </td>
-        <td>
-          <div *ngIf="message.ldnService">{{ message.ldnService }}</div>
-          <div *ngIf="!message.ldnService">n/a</div>
-        </td>
-        <td>
-          <div>{{ message.activityStreamType }}</div>
-        </td>
-        <td>
-          <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
-        </td>
-        <td>
-          <div class="d-flex flex-column">
-            <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
-            <button *ngIf="message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)"
-                    (click)="reprocessMessage(message)"
-                    class="btn btn-warning"
-            >
-              {{ 'notify-message-result.reprocess' | translate }}
-            </button>
-          </div>
-        </td>
-      </tr>
+      @for (message of (messagesSubject$ | async); track message) {
+        <tr>
+          <td class="text-nowrap">
+            @if (message.queueLastStartTime) {
+              <div>{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
+            }
+            @if (!message.queueLastStartTime) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            <ds-truncatable [id]="message.id">
+              <ds-truncatable-part [id]="message.id" [minLines]="2">
+                @if (message.relatedItem) {
+                  <a [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
+                }
+              </ds-truncatable-part>
+            </ds-truncatable>
+            @if (!message.relatedItem) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            @if (message.ldnService) {
+              <div>{{ message.ldnService }}</div>
+            }
+            @if (!message.ldnService) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            <div>{{ message.activityStreamType }}</div>
+          </td>
+          <td>
+            <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
+          </td>
+          <td>
+            <div class="d-flex flex-column">
+              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+              @if (message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)) {
+                <button
+                  (click)="reprocessMessage(message)"
+                  class="btn btn-warning"
+                  >
+                  {{ 'notify-message-result.reprocess' | translate }}
+                </button>
+              }
+            </div>
+          </td>
+        </tr>
+      }
     </tbody>
   </table>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index f1c8d9ead6..d615313e6e 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,14 +37,12 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se
   standalone: true,
   imports: [
     TranslateModule,
-    NgForOf,
-    NgIf,
     DatePipe,
     AsyncPipe,
     TruncatableComponent,
     TruncatablePartComponent,
-    RouterLink,
-  ],
+    RouterLink
+],
 })
 /**
  * Component for visualization in table format of the search results related to the AdminNotifyDashboardComponent
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 74869670c5..b33ff31728 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -41,13 +37,11 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
   selector: 'ds-bitstream-formats',
   templateUrl: './bitstream-formats.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
-    PaginationComponent,
-    NgForOf,
-  ],
+    PaginationComponent
+],
   standalone: true,
 })
 export class BitstreamFormatsComponent implements OnInit, OnDestroy {
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
index be6ebf2599..7403623747 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
@@ -1,3 +1,5 @@
-<ds-form *ngIf="formModel"
-         [formId]="'comcol-form-id'"
-         [formModel]="formModel" (submitForm)="onSubmit()" (cancel)="onCancel()"></ds-form>
\ No newline at end of file
+@if (formModel) {
+  <ds-form
+    [formId]="'comcol-form-id'"
+  [formModel]="formModel" (submitForm)="onSubmit()" (cancel)="onCancel()"></ds-form>
+}
\ No newline at end of file
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 08c3343aa8..f69e27242d 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,9 +34,8 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
   selector: 'ds-bitstream-format-form',
   templateUrl: './format-form.component.html',
   imports: [
-    FormComponent,
-    NgIf,
-  ],
+    FormComponent
+],
   standalone: true,
 })
 export class FormatFormComponent implements OnInit {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index be1239ab95..575d4586b9 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -49,11 +44,9 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
     TranslateModule,
     AsyncPipe,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index 15cc81d9ca..343e107e01 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,18 +1,16 @@
-<div *ngIf="activeMetadataSchema$ | async; then editheader; else createHeader"></div>
+@if (activeMetadataSchema$ | async) {
+  <h2>{{messagePrefix + '.edit' | translate}}</h2>
+} @else {
+  <h2>{{messagePrefix + '.create' | translate}}</h2>
+}
 
-<ng-template #createHeader>
-    <h2>{{messagePrefix + '.create' | translate}}</h2>
-</ng-template>
 
-<ng-template #editheader>
-    <h2>{{messagePrefix + '.edit' | translate}}</h2>
-</ng-template>
 
 <ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [formLayout]="formLayout"
-         (cancel)="onCancel()"
-         (submitForm)="onSubmit()">
+  [formModel]="formModel"
+  [formGroup]="formGroup"
+  [formLayout]="formLayout"
+  (cancel)="onCancel()"
+  (submitForm)="onSubmit()">
 
 </ds-form>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index c58c4bef10..e3ce9f895a 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -39,11 +36,10 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-schema-form',
   templateUrl: './metadata-schema-form.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     TranslateModule,
-    FormComponent,
-  ],
+    FormComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 44b6bfb697..c799d87b26 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,18 +1,16 @@
-<div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
+@if (registryService.getActiveMetadataField() | async) {
+  <h2>{{messagePrefix + '.edit' | translate}}</h2>
+} @else {
+  <h2>{{messagePrefix + '.create' | translate}}</h2>
+}
 
-<ng-template #createHeader>
-    <h2>{{messagePrefix + '.create' | translate}}</h2>
-</ng-template>
 
-<ng-template #editheader>
-    <h2>{{messagePrefix + '.edit' | translate}}</h2>
-</ng-template>
 
 <ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [formGroup]="formGroup"
-         (cancel)="onCancel()"
-         (submit)="onSubmit()">
+  [formModel]="formModel"
+  [formLayout]="formLayout"
+  [formGroup]="formGroup"
+  (cancel)="onCancel()"
+  (submit)="onSubmit()">
 
 </ds-form>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index bfadd018ef..2075a1a702 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -35,11 +32,10 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-field-form',
   templateUrl: './metadata-field-form.component.html',
   imports: [
-    NgIf,
     FormComponent,
     TranslateModule,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index ec5d6b4cb0..efabc0ae76 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -59,11 +54,9 @@ import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field
     MetadataFieldFormComponent,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
index 5199a115a6..c696fa23ba 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -1,64 +1,72 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
 
-            <div id="metadatadiv">
-                <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
-                    <ngb-panel id="filters">
-                        <ng-template ngbPanelTitle>
-                          {{ "admin.reports.commons.filters" | translate }}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="container">
-                                <div class="row">
-                                    <span class="col-3"></span>
-                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
-                                </div>
-                                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
-                                <div class="row">
-                                    <span class="col-3"></span>
-                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
-                                </div>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="collections">
-                        <ng-template ngbPanelTitle>
-                          {{ "admin.reports.collections.collections-report" | translate }}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <table id="table" class="table table-striped">
-                                <thead>
-                                    <tr class="header">
-                                        <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
-                                        <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
-                                        <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
-                                        <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
-                                        <th *ngFor="let filter of results.summary.values | keyvalue">{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
-                                    </tr>
-                                    <tr class="header">
-                                        <th class="num">{{ results.summary.nbTotalItems }}</th>
-                                        <th class="num">{{ results.summary.allFiltersValue }}</th>
-                                        <th class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ filter.value }}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr *ngFor="let coll of results.collections">
-                                        <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
-                                        <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
-                                        <td class="num">{{ coll.nbTotalItems }}</td>
-                                        <td class="num">{{ coll.allFiltersValue }}</td>
-                                        <td class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ coll.values[filter.key] || 0 }}</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </ng-template>
-                    </ngb-panel>
-                </ngb-accordion>
-            </div>
+      <div id="metadatadiv">
+        <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
+          <ngb-panel id="filters">
+            <ng-template ngbPanelTitle>
+              {{ "admin.reports.commons.filters" | translate }}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="container">
+                <div class="row">
+                  <span class="col-3"></span>
+                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                </div>
+                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                <div class="row">
+                  <span class="col-3"></span>
+                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                </div>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="collections">
+            <ng-template ngbPanelTitle>
+              {{ "admin.reports.collections.collections-report" | translate }}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <table id="table" class="table table-striped">
+                <thead>
+                  <tr class="header">
+                    <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
+                    <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
+                    <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
+                    <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      <th>{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
+                    }
+                  </tr>
+                  <tr class="header">
+                    <th class="num">{{ results.summary.nbTotalItems }}</th>
+                    <th class="num">{{ results.summary.allFiltersValue }}</th>
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      <th class="num">{{ filter.value }}</th>
+                    }
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (coll of results.collections; track coll) {
+                    <tr>
+                      <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
+                      <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
+                      <td class="num">{{ coll.nbTotalItems }}</td>
+                      <td class="num">{{ coll.allFiltersValue }}</td>
+                      @for (filter of results.summary.values | keyvalue; track filter) {
+                        <td class="num">{{ coll.values[filter.key] || 0 }}</td>
+                      }
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </ng-template>
+          </ngb-panel>
+        </ngb-accordion>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index e1f54bd8d3..4382a5c16e 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgForOf,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -36,9 +33,8 @@ import { FilteredCollections } from './filtered-collections.model';
     TranslateModule,
     NgbAccordionModule,
     FiltersComponent,
-    KeyValuePipe,
-    NgForOf,
-  ],
+    KeyValuePipe
+],
   standalone: true,
 })
 export class FilteredCollectionsComponent implements OnInit {
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
index b5bc55f6ff..f4d1e226d0 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -1,8 +1,10 @@
 import { Item } from 'src/app/core/shared/item.model';
+import { Observable } from "rxjs";
+import { Collection } from "../../../core/shared/collection.model";
 
 export class FilteredItems {
 
-  public items: Item[] = [];
+  public items: FilteredItem[] = [];
   public itemCount: number;
 
   public clear() {
@@ -21,3 +23,8 @@ export class FilteredItems {
   }
 
 }
+
+export interface FilteredItem extends Omit<Item, 'owningCollection'> {
+  index: number;
+  owningCollection?: Collection;
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index a765c4a190..6b67a12769 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -1,175 +1,201 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
 
-            <div id="querydiv" [formGroup]="queryForm">
-                <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
-                    <ngb-panel id="collectionSelector">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.collectionSelector' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
-                            </select>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="metadataFieldQueries">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.metadataFieldQueries' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <fieldset id="predefqueries" class="form-group">
-                                <label>
-                                    {{'admin.reports.items.predefinedQueries' | translate}}
-                                </label>
-                                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
-                                    <option *ngFor="let item of presetQueries" [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
-                                </select>
-                            </fieldset>
-                            <div class="row">&nbsp;</div>
-                            <div id="queries">
-                                <div class="metadata" *ngFor="let pred of queryPredicatesArray().controls; let i = index">
-                                    <div [formGroup]="pred" class="form-group">
-                                        <div class="form-row">
-                                            <div class="col-4">
-                                                <select class="query-tool" formControlName="field" class="form-control">
-                                                    <option *ngFor="let item of metadataFieldsWithAny" [value]="item.id">{{item.name$ | async}}</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-auto">
-                                                <select class="query-tool" formControlName="operator" class="form-control">
-                                                    <option *ngFor="let item of predicates" [value]="item.id">{{item.name$ | async | translate}}</option>
-                                                </select>
-                                            </div>
-                                            <div class="col">
-                                                <input class="form-control" formControlName="value"/>
-                                            </div>
-                                            <div class="col-auto">
-                                                <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
-                                                &nbsp;
-                                                <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="limitPaginateQueries">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.limitPaginateQueries' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="row align-items-center">
-                                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
-                                <div class="col-6">
-                                    <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
-                                        <option *ngFor="let item of pageLimits" value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="row align-items-center">
-                                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
-                                <div class="col-6">
-                                    <input id="offset" name="offset" value="0" class="form-control col-6">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="filters">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.commons.filters' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                            <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="additionalData">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.commons.additional-data' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div id="show-fields">
-                                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
-                                    <option *ngFor="let item of metadataFields" [value]="item.id">{{item.name$ | async}}</option>
-                                </select>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="itemResults">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.collections.item-results' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <table id="table" class="table table-striped">
-                                <thead>
-                                    <tr class="header">
-                                        <th>{{ "admin.reports.items.number" | translate }}</th>
-                                        <th>{{ "admin.reports.items.id" | translate }}</th>
-                                        <th>{{ "admin.reports.items.collection" | translate }}</th>
-                                        <th>{{ "admin.reports.items.handle" | translate }}</th>
-                                        <th>{{ "admin.reports.items.title" | translate }}</th>
-                                        <th *ngFor="let field of queryForm.value['additionalFields']">{{ field }}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr *ngFor="let item of results$ | async">
-                                        <td class="num">{{ item.index }}</td>
-                                        <td>{{ item.uuid }}</td>
-                                        <td><a *ngIf="item.owningCollection" href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a></td>
-                                        <td><a *ngIf="item.handle" href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a></td>
-                                        <td>{{ item.name }}</td>
-                                        <td class="num" *ngFor="let field of queryForm.value['additionalFields']">
-                                            <span *ngFor="let mdvalue of item.metadata[field]">
-                                                {{ mdvalue.value || "" }}
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <div>
-                                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
-                            </div>
-                            <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
-<!--
-                                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
--->
-                            </div>
-                            <table id="itemtable" class="sortable"></table>
-                        </ng-template>
-                    </ngb-panel>
-                </ngb-accordion>
-            </div>
+      <div id="querydiv" [formGroup]="queryForm">
+        <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
+          <ngb-panel id="collectionSelector">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.collectionSelector' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                @for (item of collections; track item) {
+                  <option [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                }
+              </select>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="metadataFieldQueries">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.metadataFieldQueries' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <fieldset id="predefqueries" class="form-group">
+                <label>
+                  {{'admin.reports.items.predefinedQueries' | translate}}
+                </label>
+                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                  @for (item of presetQueries; track item.id) {
+                    <option [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
+                  }
+                </select>
+              </fieldset>
+              <div class="row">&nbsp;</div>
+              <div id="queries">
+                @for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
+                  <div class="metadata">
+                    <div [formGroup]="pred" class="form-group">
+                      <div class="form-row">
+                        <div class="col-4">
+                          <select class="query-tool" formControlName="field" class="form-control">
+                            @for (item of metadataFieldsWithAny; track item) {
+                              <option [value]="item.id">{{item.name$ | async}}</option>
+                            }
+                          </select>
+                        </div>
+                        <div class="col-auto">
+                          <select class="query-tool" formControlName="operator" class="form-control">
+                            @for (item of predicates; track item) {
+                              <option [value]="item.id">{{item.name$ | async | translate}}</option>
+                            }
+                          </select>
+                        </div>
+                        <div class="col">
+                          <input class="form-control" formControlName="value"/>
+                        </div>
+                        <div class="col-auto">
+                          <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
+                          &nbsp;
+                          <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="limitPaginateQueries">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.limitPaginateQueries' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="row align-items-center">
+                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
+                <div class="col-6">
+                  <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                    @for (item of pageLimits; track item) {
+                      <option value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
+                    }
+                  </select>
+                </div>
+              </div>
+              <div class="row align-items-center">
+                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
+                <div class="col-6">
+                  <input id="offset" name="offset" value="0" class="form-control col-6">
+                </div>
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="filters">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.commons.filters' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+              <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="additionalData">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.commons.additional-data' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div id="show-fields">
+                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                  @for (item of metadataFields; track item) {
+                    <option [value]="item.id">{{item.name$ | async}}</option>
+                  }
+                </select>
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="itemResults">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.collections.item-results' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <table id="table" class="table table-striped">
+                <thead>
+                  <tr class="header">
+                    <th>{{ "admin.reports.items.number" | translate }}</th>
+                    <th>{{ "admin.reports.items.id" | translate }}</th>
+                    <th>{{ "admin.reports.items.collection" | translate }}</th>
+                    <th>{{ "admin.reports.items.handle" | translate }}</th>
+                    <th>{{ "admin.reports.items.title" | translate }}</th>
+                    @for (field of queryForm.value['additionalFields']; track field) {
+                      <th>{{ field }}</th>
+                    }
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (item of results$ | async; track item) {
+                    <tr>
+                      <td class="num">{{ item.index }}</td>
+                      <td>{{ item.uuid }}</td>
+                      <td>@if (item.owningCollection) {
+                        <a href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a>
+                      }</td>
+                      <td>@if (item.handle) {
+                        <a href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a>
+                      }</td>
+                      <td>{{ item.name }}</td>
+                      @for (field of queryForm.value['additionalFields']; track field) {
+                        <td class="num">
+                          @for (mdvalue of item.metadata[field]; track mdvalue) {
+                            <span>
+                              {{ mdvalue.value || "" }}
+                            </span>
+                          }
+                        </td>
+                      }
+                    </tr>
+                  }
+                </tbody>
+              </table>
+              <div>
+                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
+              </div>
+              <div>
+                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                <!--
+                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
+                -->
+              </div>
+              <table id="itemtable" class="sortable"></table>
+            </ng-template>
+          </ngb-panel>
+        </ngb-accordion>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 04ee4894ec..f4023e8678 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -38,14 +34,13 @@ import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
 import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
 import { Collection } from 'src/app/core/shared/collection.model';
 import { Community } from 'src/app/core/shared/community.model';
-import { Item } from 'src/app/core/shared/item.model';
 import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators';
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
-import { FilteredItems } from './filtered-items-model';
+import { FilteredItem, FilteredItems } from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
 import { PresetQuery } from './preset-query.model';
 import { QueryPredicate } from './query-predicate.model';
@@ -62,11 +57,9 @@ import { QueryPredicate } from './query-predicate.model';
     NgbAccordionModule,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     FiltersComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class FilteredItemsComponent implements OnInit {
@@ -81,7 +74,7 @@ export class FilteredItemsComponent implements OnInit {
   queryForm: FormGroup;
   currentPage = 0;
   results: FilteredItems = new FilteredItems();
-  results$: Observable<Item[]>;
+  results$: Observable<FilteredItem[]>;
   @ViewChild('acc') accordionComponent: NgbAccordion;
 
   constructor(
diff --git a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
index 56334b041f..b26a42a8d8 100644
--- a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
@@ -9,6 +9,7 @@ export class OptionVO {
   id: string;
   name$: Observable<string>;
   disabled = false;
+  isDefault?: boolean;
 
   static collection(id: string, name: string, disabled: boolean = false): OptionVO {
     const opt = new OptionVO();
diff --git a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
index 213819b70e..9f0fb01ce3 100644
--- a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
@@ -5,6 +5,7 @@ export class PresetQuery {
   id: string;
   label: string;
   predicates: QueryPredicate[];
+  isDefault?: boolean;
 
   static of(id: string, label: string, predicates: QueryPredicate[]) {
     const query = new PresetQuery();
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
index 85b7932ab4..30ca74cd20 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.ts
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -23,10 +23,9 @@ import { FilterGroup } from './filter-group.model';
   templateUrl: './filters-section.component.html',
   styleUrls: ['./filters-section.component.scss'],
   imports: [
-    NgForOf,
     ReactiveFormsModule,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class FiltersComponent {
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
index ba4ab15363..5028070c90 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -1,30 +1,52 @@
 <div class="space-children-mr my-1">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary move-link" [routerLink]="[getMoveRoute()]" [title]="'admin.search.item.move' | translate">
-    <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
-  </a>
+    <i class="fa fa-arrow-circle-right"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
+  }
+</a>
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-secondary private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
-    <i class="fa fa-eye-slash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
-  </a>
+@if (item && item.isDiscoverable) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
+    <i class="fa fa-eye-slash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-secondary public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
-    <i class="fa fa-eye"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
-  </a>
+@if (item && !item.isDiscoverable) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
+    <i class="fa fa-eye"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
-    <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
-  </a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-secondary edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
+  <i class="fa fa-edit"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
+}
+</a>
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-warning t withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
-    <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
-  </a>
+@if (item && !item.isWithdrawn) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-warning t withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
+    <i class="fa fa-ban"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-warning reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
-    <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
-  </a>
+@if (item && item.isWithdrawn) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-warning reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
+    <i class="fa fa-undo"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-danger delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
-  </a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-danger delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
+  <i class="fa fa-trash"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
+}
+</a>
 </div>
 
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index 89d51481d7..681b02ce0e 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -26,7 +23,7 @@ import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
   styleUrls: ['./item-admin-search-result-actions.component.scss'],
   templateUrl: './item-admin-search-result-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 41376f777e..fc79c58b99 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,64 +1,62 @@
-<nav class="navbar navbar-dark p-0 vh-100"
-     id="admin-sidebar"
-     [attr.aria-label]="'menu.header.nav.description' | translate"
-     [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
+@if (menuVisible | async) {
+  <nav class="navbar navbar-dark p-0 vh-100"
+    id="admin-sidebar"
+    [attr.aria-label]="'menu.header.nav.description' | translate"
+    [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
      [@slideSidebar]="{
       value: ((sidebarExpanded | async) !== true ? 'collapsed' : 'expanded'),
       params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
      }" (@slideSidebar.done)="finishSlide($event)" (@slideSidebar.start)="startSlide($event)"
-     *ngIf="menuVisible | async"
-     (mouseenter)="handleMouseEnter($event)"
-     (mouseleave)="handleMouseLeave($event)">
-
-  <!-- HEADER -->
-
-  <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
-    <div class="sidebar-section-wrapper">
-      <div class="sidebar-fixed-element-wrapper">
-        <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
-      </div>
-      <div class="sidebar-collapsible-element-outer-wrapper">
-        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-          <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
+    (mouseenter)="handleMouseEnter($event)"
+    (mouseleave)="handleMouseLeave($event)">
+    <!-- HEADER -->
+    <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
+      <div class="sidebar-section-wrapper">
+        <div class="sidebar-fixed-element-wrapper">
+          <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
+        </div>
+        <div class="sidebar-collapsible-element-outer-wrapper">
+          <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+            <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-
-  <!-- ITEMS -->
-
-  <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
-    <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+    <!-- ITEMS -->
+    <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
+      <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
         [attr.aria-label]="'menu.header.admin.description' |translate">
-      <ng-container *ngFor="let section of (sections | async)">
-        <ng-container
+        @for (section of (sections | async); track section) {
+          <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-      </ng-container>
+        }
+      </div>
     </div>
-  </div>
-
-  <!-- TOGGLER -->
-
-  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
-    <a class="sidebar-section-wrapper sidebar-full-width-container"
-       id="sidebar-collapse-toggle"
-       [attr.data-test]="'sidebar-collapse-toggle' | dsBrowserOnly"
-       href="javascript:void(0);"
-       (click)="toggle($event)"
-       (keyup.space)="toggle($event)"
-    >
-      <div class="sidebar-fixed-element-wrapper">
-        <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
-           [title]="'menu.section.icon.pin' | translate"></i>
-                <i *ngIf="(menuCollapsed | async) !== true" class="fas fa-fw fa-angle-double-left"
-           [title]="'menu.section.icon.unpin' | translate"></i>
-      </div>
-      <div class="sidebar-collapsible-element-outer-wrapper">
-        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-          {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+    <!-- TOGGLER -->
+    <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
+      <a class="sidebar-section-wrapper sidebar-full-width-container"
+        id="sidebar-collapse-toggle"
+        [attr.data-test]="'sidebar-collapse-toggle' | dsBrowserOnly"
+        href="javascript:void(0);"
+        (click)="toggle($event)"
+        (keyup.space)="toggle($event)"
+        >
+        <div class="sidebar-fixed-element-wrapper">
+          @if ((menuCollapsed | async)) {
+            <i class="fas fa-fw fa-angle-double-right"
+            [title]="'menu.section.icon.pin' | translate"></i>
+          }
+          @if ((menuCollapsed | async) !== true) {
+            <i class="fas fa-fw fa-angle-double-left"
+            [title]="'menu.section.icon.unpin' | translate"></i>
+          }
         </div>
-      </div>
-    </a>
-  </div>
-
-</nav>
+        <div class="sidebar-collapsible-element-outer-wrapper">
+          <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+            {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+          </div>
+        </div>
+      </a>
+    </div>
+  </nav>
+}
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index f882a5b2f3..76e3e01c4b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgComponentOutlet,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   HostListener,
@@ -47,7 +41,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
   styleUrls: ['./admin-sidebar.component.scss'],
   animations: [slideSidebar],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgbDropdownModule, NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index d051136921..0450d90a6f 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -4,16 +4,16 @@
      params: {endColor: (sidebarActiveBg$ | async)}
      }">
   <a class="sidebar-section-wrapper"
-     role="menuitem" tabindex="0"
-     aria-haspopup="menu"
-     [attr.aria-controls]="adminMenuSectionId(section.id)"
-     [attr.aria-expanded]="isExpanded$ | async"
-     [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
-     [class.disabled]="section.model?.disabled"
-     (click)="toggleSection($event)"
-     (keyup.space)="toggleSection($event)"
-     href="javascript:void(0);"
-  >
+    role="menuitem" tabindex="0"
+    aria-haspopup="menu"
+    [attr.aria-controls]="adminMenuSectionId(section.id)"
+    [attr.aria-expanded]="isExpanded$ | async"
+    [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+    [class.disabled]="section.model?.disabled"
+    (click)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    href="javascript:void(0);"
+    >
     <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
     </div>
@@ -21,25 +21,29 @@
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
         <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
           <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
         <i class="fas fa-chevron-right fa-xs" aria-hidden="true"
-           [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
+          [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
         ></i>
       </div>
     </div>
   </a>
-  <div class="sidebar-section-wrapper subsection" @slide *ngIf="(isExpanded$ | async)">
-    <div class="sidebar-fixed-element-wrapper"></div>
-    <div class="sidebar-collapsible-element-outer-wrapper">
-      <div class="sidebar-collapsible-element-inner-wrapper">
-        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
-          <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
-            <ng-container
-              *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+  @if ((isExpanded$ | async)) {
+    <div class="sidebar-section-wrapper subsection" @slide>
+      <div class="sidebar-fixed-element-wrapper"></div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper">
+          <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+            @for (subSection of (subSections$ | async); track subSection) {
+              <div class="sidebar-item">
+                <ng-container
+                *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+              </div>
+            }
           </div>
         </div>
       </div>
     </div>
-  </div>
+  }
 </div>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 37a4d0c30f..f7415e7b16 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgComponentOutlet,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   Inject,
@@ -37,7 +31,7 @@ import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor],
   standalone: true,
-  imports: [NgClass, NgComponentOutlet, NgIf, NgFor, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionComponent implements OnInit {
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
index 7f19ef3c2e..b2ce95bf7c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
@@ -1,8 +1,12 @@
 <div class="space-children-mr">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
-    <i class="fa fa-hand-point-left"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
-  </a>
+    <i class="fa fa-trash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
+  }
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
+  <i class="fa fa-hand-point-left"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
+}
+</a>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
index 29e1b65eda..a565c4d9b2 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,7 +17,7 @@ import {
   styleUrls: ['./workflow-item-admin-workflow-actions.component.scss'],
   templateUrl: './workflow-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workflow-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
index 67dcd09b8e..6dea020c59 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +34,7 @@ import { ErrorComponent } from '../../../../../../shared/error/error.component';
   styleUrls: ['./supervision-order-group-selector.component.scss'],
   templateUrl: './supervision-order-group-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, ErrorComponent, EpersonGroupListComponent, TranslateModule],
+  imports: [FormsModule, ErrorComponent, EpersonGroupListComponent, TranslateModule],
 })
 export class SupervisionOrderGroupSelectorComponent {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
index fbd48d4078..ae5e85019c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -42,7 +38,7 @@ export interface SupervisionOrderListEntry {
   templateUrl: './supervision-order-status.component.html',
   styleUrls: ['./supervision-order-status.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgFor, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class SupervisionOrderStatusComponent implements OnChanges {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
index 2b904a5429..98405fffeb 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
@@ -1,16 +1,22 @@
 <div class="my-1">
   <ds-supervision-order-status [supervisionOrderList]="supervisionOrderList"
-                               (delete)="deleteSupervisionOrder($event)"></ds-supervision-order-status>
+  (delete)="deleteSupervisionOrder($event)"></ds-supervision-order-status>
 </div>
 
 <div class="space-children-mr">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 policies-link" [routerLink]="resourcePoliciesPageRoute" [title]="'admin.workflow.item.policies' | translate">
-    <i class="fas fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.policies' | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 supervision-group-selector" [title]="'admin.workflow.item.supervision' | translate" (click)="openSupervisionModal()">
-    <i class="fas fa-users-cog"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.supervision' | translate}}</span>
-  </a>
+    <i class="fa fa-trash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
+  }
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 policies-link" [routerLink]="resourcePoliciesPageRoute" [title]="'admin.workflow.item.policies' | translate">
+  <i class="fas fa-edit"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{'admin.workflow.item.policies' | translate}}</span>
+}
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 supervision-group-selector" [title]="'admin.workflow.item.supervision' | translate" (click)="openSupervisionModal()">
+  <i class="fas fa-users-cog"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{'admin.workflow.item.supervision' | translate}}</span>
+}
+</a>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
index 2e407f92db..04264b2c8f 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -52,7 +49,7 @@ import {
   styleUrls: ['./workspace-item-admin-workflow-actions.component.scss'],
   templateUrl: './workspace-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workspace-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
index 8ceb4b12bc..8df382a7b3 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ComponentRef,
@@ -43,7 +43,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
+  imports: [WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
 })
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
index 60740fb34b..584e79dccc 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,7 +39,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
index 7cf63a603b..c9b0e6ca67 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -52,7 +49,7 @@ import { WorkspaceItemAdminWorkflowActionsComponent } from '../../actions/worksp
   styleUrls: ['./workspace-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index 259ab599cb..acbb38fe27 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,33 +1,41 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
   <div class="container">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded">
-      <div class="col-md-2">
-        <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
-      </div>
-      <div class="col-md-10">
-        <div class="container">
-          <div class="row">
-            <div class="col-12">
-              <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
+    @if (bitstreamRD?.hasSucceeded) {
+      <div class="row">
+        <div class="col-md-2">
+          <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
+        </div>
+        <div class="col-md-10">
+          <div class="container">
+            <div class="row">
+              <div class="col-12">
+                <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
+              </div>
             </div>
           </div>
+          @if (formGroup) {
+            <ds-form [formId]="'edit-bitstream-form-id'"
+              [formGroup]="formGroup"
+              [formModel]="formModel"
+              [formLayout]="formLayout"
+              [submitLabel]="'form.save'"
+              (submitForm)="onSubmit()"
+              (cancel)="onCancel()"
+              (dfChange)="onChange($event)">
+              <div additional class="container py-3">
+                <a [routerLink]="['/bitstreams', bitstreamRD?.payload?.id, 'authorizations']">{{'bitstream.edit.authorizations.link' | translate}}</a>
+              </div>
+            </ds-form>
+          }
         </div>
-        <ds-form *ngIf="formGroup" [formId]="'edit-bitstream-form-id'"
-                  [formGroup]="formGroup"
-                  [formModel]="formModel"
-                  [formLayout]="formLayout"
-                  [submitLabel]="'form.save'"
-                  (submitForm)="onSubmit()"
-                  (cancel)="onCancel()"
-                  (dfChange)="onChange($event)">
-          <div additional class="container py-3">
-            <a [routerLink]="['/bitstreams', bitstreamRD?.payload?.id, 'authorizations']">{{'bitstream.edit.authorizations.link' | translate}}</a>
-          </div>
-        </ds-form>
       </div>
-    </div>
-    <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-loading *ngIf="!bitstreamRD || bitstreamRD?.isLoading"
-                message="{{'loading.bitstream' | translate}}"></ds-loading>
+    }
+    @if (bitstreamRD?.hasFailed) {
+      <ds-error message="{{'error.bitstream' | translate}}"></ds-error>
+    }
+    @if (!bitstreamRD || bitstreamRD?.isLoading) {
+      <ds-loading
+      message="{{'loading.bitstream' | translate}}"></ds-loading>
+    }
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index b54a7bbaed..c5390eeedf 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -87,7 +84,6 @@ import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.compo
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     FormComponent,
-    NgIf,
     VarDirective,
     ThemedThumbnailComponent,
     AsyncPipe,
@@ -95,8 +91,8 @@ import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.compo
     ErrorComponent,
     ThemedLoadingComponent,
     TranslateModule,
-    FileSizePipe,
-  ],
+    FileSizePipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index 3bba89622f..cbf9f0c886 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,20 +1,22 @@
 <ng-container *ngVar="(breadcrumbs$ | async) as breadcrumbs">
-    <nav *ngIf="(showBreadcrumbs$ | async)" aria-label="breadcrumb" class="nav-breadcrumb">
-        <ol class="container breadcrumb my-0">
-            <ng-container
-                    *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
-            <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
-                <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
-            </ng-container>
-        </ol>
+  @if ((showBreadcrumbs$ | async)) {
+    <nav aria-label="breadcrumb" class="nav-breadcrumb">
+      <ol class="container breadcrumb my-0">
+        <ng-container
+        *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
+        @for (bc of breadcrumbs; track bc; let last = $last) {
+          <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
+        }
+      </ol>
     </nav>
+  }
 
-    <ng-template #breadcrumb let-text="text" let-url="url">
-        <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
-    </ng-template>
+  <ng-template #breadcrumb let-text="text" let-url="url">
+    <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
+  </ng-template>
 
-    <ng-template #activeBreadcrumb let-text="text">
-        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><div class="text-truncate">{{text | translate}}</div></div></li>
-    </ng-template>
+  <ng-template #activeBreadcrumb let-text="text">
+    <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><div class="text-truncate">{{text | translate}}</div></div></li>
+  </ng-template>
 </ng-container>
 
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 9820d672c9..7db7345c04 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -22,7 +17,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
   templateUrl: './breadcrumbs.component.html',
   styleUrls: ['./breadcrumbs.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgTemplateOutlet, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class BreadcrumbsComponent {
 
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
index 6642b724bb..ffb7d9feed 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -1,21 +1,27 @@
-<section class="comcol-page-browse-section" *ngIf="(!ssrRenderingDisabled)">
-  <div class="browse-by-metadata w-100">
-    <ds-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
+@if ((!ssrRenderingDisabled)) {
+  <section class="comcol-page-browse-section">
+    <div class="browse-by-metadata w-100">
+      @if ((loading$ | async) !== true) {
+        <ds-browse-by class="col-xs-12 w-100"
                          title="{{'browse.title' | translate:{
                            field: 'browse.metadata.' + browseId | translate,
                            startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
                            value: (value)? '&quot;' + value + '&quot;': ''
                          } }}"
-                         [displayTitle]="displayTitle"
-                         [objects$]="(items$ !== undefined)? items$ : browseEntries$"
-                         [paginationConfig]="(currentPagination$ |async)"
-                         [sortConfig]="(currentSort$ |async)"
-                         [type]="startsWithType"
-                         [startsWithOptions]="startsWithOptions"
-                         (prev)="goPrev()"
-                         (next)="goNext()">
-    </ds-browse-by>
-    <ds-loading *ngIf="loading$ | async"
-                       message="{{'loading.browse-by-page' | translate}}"></ds-loading>
-  </div>
-</section>
+          [displayTitle]="displayTitle"
+          [objects$]="(items$ !== undefined)? items$ : browseEntries$"
+          [paginationConfig]="(currentPagination$ |async)"
+          [sortConfig]="(currentSort$ |async)"
+          [type]="startsWithType"
+          [startsWithOptions]="startsWithOptions"
+          (prev)="goPrev()"
+          (next)="goNext()">
+        </ds-browse-by>
+      }
+      @if (loading$ | async) {
+        <ds-loading
+        message="{{'loading.browse-by-page' | translate}}"></ds-loading>
+      }
+    </div>
+  </section>
+}
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 4cb07abd87..8c4c259b23 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformServer,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformServer } from '@angular/common';
 import {
   Component,
   Inject,
@@ -69,11 +65,10 @@ export const BBM_PAGINATION_ID = 'bbm';
   templateUrl: './browse-by-metadata.component.html',
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
-    ThemedBrowseByComponent,
-  ],
+    ThemedBrowseByComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
index e2c0c52827..f533757d68 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
@@ -1,23 +1,25 @@
 <section>
-  <h1 *ngIf="displayTitle">
-    {{ ('browse.title') | translate:{
-    field: 'browse.metadata.' + vocabularyName | translate,
-    startsWith: '',
-    value: '',
-  } }}
-  </h1>
+  @if (displayTitle) {
+    <h1>
+      {{ ('browse.title') | translate:{
+      field: 'browse.metadata.' + vocabularyName | translate,
+      startsWith: '',
+      value: '',
+      } }}
+    </h1>
+  }
   <div class="mb-3">
     <ds-vocabulary-treeview [description]="description"
-                            [vocabularyOptions]=vocabularyOptions
-                            [multiSelect]="true"
-                            [showAdd]="false"
-                            (select)="onSelect($event)"
-                            (deselect)="onDeselect($event)">
+      [vocabularyOptions]=vocabularyOptions
+      [multiSelect]="true"
+      [showAdd]="false"
+      (select)="onSelect($event)"
+      (deselect)="onDeselect($event)">
     </ds-vocabulary-treeview>
   </div>
   <a class="btn btn-primary"
-     [routerLink]="['/search']"
-     [queryParams]="queryParams"
-     [queryParamsHandling]="'merge'">
-    {{ 'browse.taxonomy.button' | translate }}</a>
+    [routerLink]="['/search']"
+    [queryParams]="queryParams"
+    [queryParamsHandling]="'merge'">
+  {{ 'browse.taxonomy.button' | translate }}</a>
 </section>
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index 2372c7d0c7..30f8ef8781 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -52,7 +49,6 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
     AsyncPipe,
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
-    NgIf,
     ThemedComcolPageHandleComponent,
     ThemedComcolPageContentComponent,
     DsoEditMenuComponent,
@@ -61,8 +57,8 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
     VocabularyTreeviewComponent,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 /**
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index f3124720ca..96bea31837 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -19,7 +19,7 @@
                 [dangerConfirm]="true"
                 [hideCollection]="true"
                 (confirm)="mapItems($event, true)"
-                (cancel)="onCancel()"></ds-item-select>
+              (cancel)="onCancel()"></ds-item-select>
             </div>
           </ng-template>
         </li>
@@ -29,30 +29,34 @@
             <div class="row mt-2">
               <div class="col-12 col-lg-6">
                 <ds-search-form id="search-form"
-                                [query]="(searchOptions$ | async)?.query"
-                                [scope]="(searchOptions$ | async)?.scope"
-                                [currentUrl]="'./'"
-                                [inPlaceSearch]="true"
-                                [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
-                                (submitSearch)="performedSearch = true">
+                  [query]="(searchOptions$ | async)?.query"
+                  [scope]="(searchOptions$ | async)?.scope"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 </ds-search-form>
               </div>
             </div>
 
-            <div *ngIf="performedSearch">
-              <ds-item-select class="mt-2"
-                [key]="'map'"
-                [dsoRD$]="mappedItemsRD$"
-                [paginationOptions]="(searchOptions$ | async)?.pagination"
-                [featureId]="FeatureIds.CanManageMappings"
-                [confirmButton]="'collection.edit.item-mapper.confirm'"
-                [cancelButton]="'collection.edit.item-mapper.cancel'"
-                (confirm)="mapItems($event)"
+            @if (performedSearch) {
+              <div>
+                <ds-item-select class="mt-2"
+                  [key]="'map'"
+                  [dsoRD$]="mappedItemsRD$"
+                  [paginationOptions]="(searchOptions$ | async)?.pagination"
+                  [featureId]="FeatureIds.CanManageMappings"
+                  [confirmButton]="'collection.edit.item-mapper.confirm'"
+                  [cancelButton]="'collection.edit.item-mapper.cancel'"
+                  (confirm)="mapItems($event)"
                 (cancel)="onCancel()"></ds-item-select>
-            </div>
-            <div *ngIf="!performedSearch" class="alert alert-info w-100" role="alert">
-              {{'collection.edit.item-mapper.no-search' | translate}}
-            </div>
+              </div>
+            }
+            @if (!performedSearch) {
+              <div class="alert alert-info w-100" role="alert">
+                {{'collection.edit.item-mapper.no-search' | translate}}
+              </div>
+            }
           </ng-template>
         </li>
       </ul>
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 351a5daf60..33bffcf611 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -86,9 +83,8 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     TranslateModule,
     AsyncPipe,
     ItemSelectComponent,
-    NgIf,
-    BrowserOnlyPipe,
-  ],
+    BrowserOnlyPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 0d240f5328..b7978b82ab 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -65,7 +62,6 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
   imports: [
     ThemedComcolPageContentComponent,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
@@ -77,8 +73,8 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
     DsoEditMenuComponent,
     ThemedComcolPageBrowseByComponent,
     ObjectCollectionComponent,
-    RouterOutlet,
-  ],
+    RouterOutlet
+],
   standalone: true,
 })
 export class CollectionPageComponent implements OnInit {
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index 5c1b7b32a5..63e52925b9 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,15 +1,19 @@
-<div class="container" *ngIf="(isLoading$ | async) === false">
-  <div class="row">
-    <div class="col-12 pb-4">
-      <h1 id="sub-header"
-          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
+@if ((isLoading$ | async) === false) {
+  <div class="container">
+    <div class="row">
+      <div class="col-12 pb-4">
+        <h1 id="sub-header"
+        class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
+      </div>
     </div>
+    <ds-collection-form (submitForm)="onSubmit($event)"
+      [isCreation]="true"
+    (back)="navigateToHome()"></ds-collection-form>
   </div>
-  <ds-collection-form (submitForm)="onSubmit($event)"
-                      [isCreation]="true"
-                      (back)="navigateToHome()"></ds-collection-form>
-</div>
+}
 
 <div class="container">
-  <ds-loading *ngIf="isLoading$ | async"></ds-loading>
+  @if (isLoading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index a26bc9d6f8..f0658056f9 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -31,9 +28,8 @@ import { CollectionFormComponent } from '../collection-form/collection-form.comp
     CollectionFormComponent,
     TranslateModule,
     AsyncPipe,
-    ThemedLoadingComponent,
-    NgIf,
-  ],
+    ThemedLoadingComponent
+],
   standalone: true,
 })
 export class CreateCollectionPageComponent extends CreateComColPageComponent<Collection> {
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index acc716b52a..6e06763751 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -30,10 +27,9 @@ import { VarDirective } from '../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Collection> {
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
index 4e957cf867..5f7ed57dcd 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
@@ -1,7 +1,8 @@
-<ds-access-control-form-container
-  titleMessage="collection-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="false">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="collection-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="false">
+  </ds-access-control-form-container>
+}
 
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
index 809fdcede8..f1581c8bd9 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,9 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./collection-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class CollectionAccessControlComponent  implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index 845c82458a..28c5f21869 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,23 +1,29 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
   <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
-    <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
-      <i class="fas fa-plus" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
-    </button>
-    <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
-      <i class="fas fa-trash-alt" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
-    </button>
-    <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
-            [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
-      <i class="fas fa-edit" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
-    </button>
+    @if (!itemTemplateRD?.payload) {
+      <button class="btn btn-success" (click)="addItemTemplate()">
+        <i class="fas fa-plus" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
+      </button>
+    }
+    @if (itemTemplateRD?.payload) {
+      <button class="btn btn-danger" (click)="deleteItemTemplate()">
+        <i class="fas fa-trash-alt" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
+      </button>
+    }
+    @if (itemTemplateRD?.payload) {
+      <button class="btn btn-primary"
+        [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
+        <i class="fas fa-edit" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
+      </button>
+    }
   </div>
 </div>
 <ds-collection-form [dso]="(dsoRD$ | async)?.payload"
-                    [isCreation]="false"
-                    (submitForm)="onSubmit($event)"
-                    (back)="navigateToHomePage()"
-                    (finish)="navigateToHomePage()"></ds-collection-form>
+  [isCreation]="false"
+  (submitForm)="onSubmit($event)"
+  (back)="navigateToHomePage()"
+(finish)="navigateToHomePage()"></ds-collection-form>
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index df35199755..e715a3369c 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -56,9 +53,8 @@ import { getCollectionItemTemplateRoute } from '../../collection-page-routing-pa
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    NgIf,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index f402c99caf..b378c6d24b 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,9 +28,8 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './collection-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    NgForOf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class CollectionRolesComponent implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index e35a64af16..56b44568ee 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
   Component,
@@ -55,10 +52,9 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index afeb2e2352..938bbeab88 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  Location,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, Location } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -78,12 +74,11 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
   imports: [
     AsyncPipe,
     TranslateModule,
-    NgIf,
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class CollectionSourceComponent extends AbstractTrackableComponent implements OnInit, OnDestroy {
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 7f0b2efba2..765d49b7bf 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
@@ -1,13 +1,17 @@
 <div class="container" *ngVar="(collectionRD$ | async)?.payload as collection">
   <div class="row">
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
-      <ng-container *ngIf="itemRD?.hasSucceeded">
+      @if (itemRD?.hasSucceeded) {
         <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <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>
-      <ds-alert *ngIf="itemRD?.hasFailed" [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
+      }
+      @if (itemRD?.isLoading) {
+        <ds-loading [message]="'collection.edit.template.loading' | translate"></ds-loading>
+      }
+      @if (itemRD?.hasFailed) {
+        <ds-alert [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index f7c5dc4b14..7602e58799 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -39,11 +36,10 @@ import { getCollectionEditRoute } from '../collection-page-routing-paths';
     RouterLink,
     AsyncPipe,
     VarDirective,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
-    AlertComponent,
-  ],
+    AlertComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 5819471d7e..b5b2ba13f0 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -2,11 +2,7 @@ import {
   CdkTreeModule,
   FlatTreeControl,
 } from '@angular/cdk/tree';
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -42,7 +38,7 @@ import { FlatNode } from '../flat-node.model';
   templateUrl: './community-list.component.html',
   styleUrls: ['./community-list.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index d04ecbee19..a6e3dd8e3a 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -56,7 +53,6 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
     ThemedComcolPageContentComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
@@ -69,8 +65,8 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
     ViewTrackerComponent,
     VarDirective,
     RouterOutlet,
-    RouterModule,
-  ],
+    RouterModule
+],
   standalone: true,
 })
 /**
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 1d3d6eb871..c07ca9c2e8 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -1,18 +1,25 @@
-<div class="container" *ngIf="(isLoading$ | async) === false">
-  <div class="row">
-    <div class="col-12 pb-4">
-      <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h1 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
-        <h1 *ngIf="parent" id="sub-header"
+@if ((isLoading$ | async) === false) {
+  <div class="container">
+    <div class="row">
+      <div class="col-12 pb-4">
+        <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
+          @if (!parent) {
+            <h1 id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
+          } @else {
+            <h1 id="sub-header"
             class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
-      </ng-container>
+          }
+        </ng-container>
+      </div>
     </div>
+    <ds-community-form (submitForm)="onSubmit($event)"
+      [isCreation]="true"
+    (back)="navigateToHome()"></ds-community-form>
   </div>
-  <ds-community-form (submitForm)="onSubmit($event)"
-                     [isCreation]="true"
-                     (back)="navigateToHome()"></ds-community-form>
-</div>
+}
 
 <div class="container">
-  <ds-loading *ngIf="isLoading$ | async"></ds-loading>
+  @if (isLoading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index 082f6c4f0b..7368bec955 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -31,10 +28,9 @@ import { CommunityFormComponent } from '../community-form/community-form.compone
     CommunityFormComponent,
     TranslateModule,
     VarDirective,
-    NgIf,
     AsyncPipe,
-    ThemedLoadingComponent,
-  ],
+    ThemedLoadingComponent
+],
   standalone: true,
 })
 export class CreateCommunityPageComponent extends CreateComColPageComponent<Community> {
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 9c19a5eb47..0ba25effea 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -31,9 +28,8 @@ import { VarDirective } from '../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Community> {
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
index b4f2123b86..5f7d1d8fc4 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
@@ -1,6 +1,7 @@
-<ds-access-control-form-container
-  titleMessage="community-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="false">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="community-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="false">
+  </ds-access-control-form-container>
+}
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
index a0e094e21d..05c42b61d6 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,9 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./community-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class CommunityAccessControlComponent implements OnInit {
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 2e85cbe4c3..1fbf307886 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -30,9 +27,8 @@ import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-co
   templateUrl: './community-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    AsyncPipe,
-    NgForOf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class CommunityRolesComponent implements OnInit {
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index 194976c3a8..ec46d1ef26 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -28,11 +23,9 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
   type = 'community';
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
index 59d7b3bb5e..825399c23b 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,13 +1,19 @@
 <ng-container *ngVar="(subCollectionsRDObs | async) as subCollectionsRD">
-  <div *ngIf="subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0" @fadeIn>
-    <h3>{{'community.sub-collection-list.head' | translate}}</h3>
-    <ds-viewable-collection
-      [config]="config"
-      [sortConfig]="sortConfig"
-      [objects]="subCollectionsRD"
-      [hideGear]="false">
-    </ds-viewable-collection>
-  </div>
-  <ds-error *ngIf="subCollectionsRD?.hasFailed" message="{{'error.sub-collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-loading>
+  @if (subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0) {
+    <div @fadeIn>
+      <h3>{{'community.sub-collection-list.head' | translate}}</h3>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="subCollectionsRD"
+        [hideGear]="false">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (subCollectionsRD?.hasFailed) {
+    <ds-error message="{{'error.sub-collections' | translate}}"></ds-error>
+  }
+  @if (subCollectionsRD?.isLoading) {
+    <ds-loading message="{{'loading.sub-collections' | translate}}"></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index 1e8ff1d46c..fe00325317 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -44,11 +41,10 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
index a811014bcc..151737573e 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
@@ -1,8 +1,8 @@
-<ng-container *ngIf="(community$ | async) as community">
+@if ((community$ | async); as community) {
   <ds-community-page-sub-community-list
-      [community]="community">
+    [community]="community">
   </ds-community-page-sub-community-list>
   <ds-community-page-sub-collection-list
-      [community]="community">
+    [community]="community">
   </ds-community-page-sub-collection-list>
-</ng-container>
+}
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
index 7aed3be076..f53c5346df 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -25,9 +22,8 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sub-community-li
   imports: [
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
-    AsyncPipe,
-    NgIf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class SubComColSectionComponent implements OnInit {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
index 7f9840f6b7..7c3d23b809 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
@@ -1,13 +1,19 @@
 <ng-container *ngVar="(subCommunitiesRDObs | async) as subCommunitiesRD">
-  <div *ngIf="subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0" @fadeIn>
-    <h3>{{'community.sub-community-list.head' | translate}}</h3>
-    <ds-viewable-collection
-      [config]="config"
-      [sortConfig]="sortConfig"
-      [objects]="subCommunitiesRD"
-      [hideGear]="false">
-    </ds-viewable-collection>
-  </div>
-  <ds-error *ngIf="subCommunitiesRD?.hasFailed" message="{{'error.sub-communities' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCommunitiesRD?.isLoading" message="{{'loading.sub-communities' | translate}}"></ds-loading>
+  @if (subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0) {
+    <div @fadeIn>
+      <h3>{{'community.sub-community-list.head' | translate}}</h3>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="subCommunitiesRD"
+        [hideGear]="false">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (subCommunitiesRD?.hasFailed) {
+    <ds-error message="{{'error.sub-communities' | translate}}"></ds-error>
+  }
+  @if (subCommunitiesRD?.isLoading) {
+    <ds-loading message="{{'loading.sub-communities' | translate}}"></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 36bd9919bb..1b255bdb29 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -43,15 +40,14 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ErrorComponent,
     ThemedLoadingComponent,
     VarDirective,
-    NgIf,
     ObjectCollectionComponent,
     AsyncPipe,
     TranslateModule,
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
index e015dd01d9..e2a00f2e75 100644
--- a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
+++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
@@ -88,6 +88,15 @@ export interface SourceQualityAssuranceEventMessageObject {
    */
   pidHref: string;
 
+  /**
+   * Possible link to a page
+   */
+  href?: string;
+
+  /**
+   * The service Id
+   */
+  serviceId?: string;
 }
 
 /**
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index 9bac2af51d..b0f6009e98 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -44,7 +44,7 @@ import { RegistryService } from './registry.service';
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index 64b305ff64..403def3d32 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -40,7 +40,7 @@ import anything = jasmine.anything;
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 8e1c1b26c8..3a69a09466 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -53,7 +50,7 @@ export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
   selector: 'ds-curation-form',
   templateUrl: './curation-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, NgIf, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class CurationFormComponent implements OnDestroy, OnInit {
 
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 aee9fb980c..d1ec80376e 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,16 +1,18 @@
 <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"
-                              [mdField]="mdField"
-                              [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.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>
+  @for (mdValue of form.fields[mdField]; track mdValue; let idx = $index) {
+    <ds-dso-edit-metadata-value role="presentation"
+      [dso]="dso"
+      [mdValue]="mdValue"
+      [mdField]="mdField"
+      [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.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>
+  }
 </div>
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 a96b77be62..003ce13ad3 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
@@ -3,10 +3,7 @@ import {
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -32,7 +29,7 @@ import { DsoEditMetadataValueHeadersComponent } from '../dso-edit-metadata-value
   styleUrls: ['./dso-edit-metadata-field-values.component.scss'],
   templateUrl: './dso-edit-metadata-field-values.component.html',
   standalone: true,
-  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, NgFor, DsoEditMetadataValueComponent, AsyncPipe],
+  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, AsyncPipe],
 })
 /**
  * Component displaying table rows for each value for a certain metadata field within a form
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 4b79ae303c..7956095806 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
@@ -2,11 +2,7 @@ import {
   CdkDrag,
   CdkDragHandle,
 } from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -95,7 +91,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
+  imports: [VarDirective, CdkDrag, NgClass, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
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 4a40e3c26a..31d44928e9 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,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -67,7 +63,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
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 a82f31b953..20cf35aabc 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,15 +1,17 @@
 <div class="w-100 position-relative">
   <input type="text" #mdFieldInput
-         class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
-         [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
-         [value]="mdField"
-         [formControl]="input"
-         (focusin)="query$.next(mdField)"
-         (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();"
-         (keyup)="this.selectedValueLoading = false"
-  />
-  <div class="invalid-feedback show-feedback" *ngIf="showInvalid">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
+    class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+    [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
+    [value]="mdField"
+    [formControl]="input"
+    (focusin)="query$.next(mdField)"
+    (dsClickOutside)="query$.next(null)"
+    (click)="$event.stopPropagation();"
+    (keyup)="this.selectedValueLoading = false"
+    />
+  @if (showInvalid) {
+    <div class="invalid-feedback show-feedback">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
+  }
   <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
     <div  class="dropdown-list">
       <div
@@ -19,18 +21,22 @@
         [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
         [fromRoot]="true"
         (scrolled)="onScrollDown()">
-        <ng-container *ngIf="mdFieldOptions$ | async">
-          <button *ngFor="let listEntry of (mdFieldOptions$ | async)"
-                  class="d-block dropdown-item"
-                  dsHoverClass="ds-hover"
-                  (click)="select(listEntry)" #listEntryElement>
-            <span [innerHTML]="listEntry"></span>
+        @if (mdFieldOptions$ | async) {
+          @for (listEntry of (mdFieldOptions$ | async); track listEntry) {
+            <button
+              class="d-block dropdown-item"
+              dsHoverClass="ds-hover"
+              (click)="select(listEntry)" #listEntryElement>
+              <span [innerHTML]="listEntry"></span>
+            </button>
+          }
+        }
+        @if (loading) {
+          <button
+            class="list-group-item list-group-item-action border-0 list-entry">
+            <ds-loading [showMessage]="false"></ds-loading>
           </button>
-        </ng-container>
-        <button *ngIf="loading"
-                class="list-group-item list-group-item-action border-0 list-entry">
-          <ds-loading [showMessage]="false"></ds-loading>
-        </button>
+        }
       </div>
     </div>
   </div>
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 abdf2f14d8..f57e651a7c 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,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -62,7 +57,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
+  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
 })
 /**
  * Component displaying a searchable input for metadata-fields
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index e62da86922..786e3b5466 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -3,42 +3,54 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.datePublished')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('journal.title')" class="item-journal-title card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('journal.title')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('journal.title')) {
+        <p class="item-journal-title card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('journal.title')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
index ce56496198..61c1e5d80e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-issue-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 7e0ab3f9e3..22903638d3 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -3,42 +3,54 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-                <div>
-                    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                    </ds-thumbnail>
-                </div>
-            </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.datePublished')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
index 4fcc8ade5d..001c06186d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-volume-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index a157089b02..18a5ffc5cc 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -3,46 +3,60 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.editor')"
-         class="item-publisher card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
-          <span *ngIf="dso.hasMetadata('creativework.publisher')" class="item-publisher">
-            <span>, </span>
-            {{firstMetadataValue('creativework.publisher')}}
-          </span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.editor')) {
+        <p
+          class="item-publisher card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
+            @if (dso.hasMetadata('creativework.publisher')) {
+              <span class="item-publisher">
+                <span>, </span>
+                {{firstMetadataValue('creativework.publisher')}}
+              </span>
+            }
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
index 38a7cf3210..72fb8dadb4 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 961cbfd8c4..1807147bdb 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,42 +1,68 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                class="item-list-journal-issues">
-            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-            </span>
-            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                  class="item-list-journal-issue-numbers">
-              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
-                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+          @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+            <span
+              class="item-list-journal-issues">
+              @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
               </span>
-            </span>
+            }
+            @if (dso.allMetadata(['publicationissue.issueNumber']).length > 0) {
+              <span
+                class="item-list-journal-issue-numbers">
+                @for (value of allMetadataValues(['publicationissue.issueNumber']); track value; let first = $first; let last = $last) {
+                  <span>
+                    @if (first) {
+                      <span> - </span>
+                      }<span [innerHTML]="value"></span>@if (!last) {
+                      <span>; </span>
+                    }
+                  </span>
+                }
+              </span>
+            }
           </span>
-        </ds-truncatable-part>
-      </span>
-    </ds-truncatable>
-  </div>
+        }
+      </ds-truncatable-part>
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index f3f8d79809..1adb79d60b 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -21,7 +16,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
   templateUrl: './journal-issue-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index b161874fdf..a153592638 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,42 +1,66 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
-                  class="item-list-journal-volumes">
-                    <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['journal.title']).length > 0) {
+            <span
+              class="item-list-journal-volumes">
+              @for (value of allMetadataValues(['journal.title']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+          </span>
+        }
+        @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+          <span
+            class="item-list-journal-volume-identifiers">
+            @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+              <span>
+                <span> (</span><span [innerHTML]="value"></span><span>)</span>@if (!last) {
+                <span>;</span>
+              }
             </span>
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-volume-identifiers">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
-                    </span>
-            </span>
-        </ds-truncatable-part>
+          }
+        </span>
+      }
+    </ds-truncatable-part>
   </span>
-    </ds-truncatable>
-  </div>
+</ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 4aee64c4f5..dcd62ce29d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -21,7 +16,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
   templateUrl: './journal-volume-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index 8acdfed9b5..c74b01934a 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,34 +1,52 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
-                  class="item-list-journals">
-                    <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                    </span>
-            </span>
-        </ds-truncatable-part>
-  </span>
-    </ds-truncatable>
-  </div>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['creativeworkseries.issn']).length > 0) {
+            <span
+              class="item-list-journals">
+              @for (value of allMetadataValues(['creativeworkseries.issn']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+          </span>
+        }
+      </ds-truncatable-part>
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 8ef14120e0..234307c210 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -21,7 +16,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-search-result-list-element.component.scss'],
   templateUrl: './journal-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal
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 9469dcc7b5..a693891ae6 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index ca6bb56e79..ed52174054 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-issue.component.scss'],
   templateUrl: './journal-issue.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
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 ff8811b4a6..13c8e12939 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index fab0e105be..81764dd3ee 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-volume.component.scss'],
   templateUrl: './journal-volume.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
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 b5a09a842f..ddd15b5573 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 179355d869..7e3dc40c1e 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal.component.scss'],
   templateUrl: './journal.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 95c3ae70f2..2836fbfbe1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -3,48 +3,62 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('organization.foundingDate')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('organization.address.addressCountry')"
-         class="item-location card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span
+      @if (dso.hasMetadata('organization.foundingDate')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('organization.address.addressCountry')) {
+        <p
+          class="item-location card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span
             class="item-country">{{firstMetadataValue('organization.address.addressCountry')}}</span>
-          <span *ngIf="dso.hasMetadata('organization.address.addressLocality')" class="item-city">
-            <span>, </span>
-            {{firstMetadataValue('organization.address.addressLocality')}}
-          </span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+            @if (dso.hasMetadata('organization.address.addressLocality')) {
+              <span class="item-city">
+                <span>, </span>
+                {{firstMetadataValue('organization.address.addressLocality')}}
+              </span>
+            }
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
index 6b4dd0e21d..ae681a3129 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './org-unit-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 7d8ea40f38..f3613a8637 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -3,41 +3,53 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('person.email')" class="item-email card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('person.email')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('person.jobTitle')" class="item-jobtitle card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('person.email')) {
+        <p class="item-email card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('person.email')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('person.jobTitle')) {
+        <p class="item-jobtitle card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
index dc9b1f8f47..aaa0434c02 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './person-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index cc9c7f6f35..0c266c09dc 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -3,36 +3,46 @@
     <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
index 0ba8ce6f75..77f67f5756 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './project-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 91b694c072..6c6218dc43 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,40 +1,54 @@
 <div class="row">
-    <div *ngIf="showThumbnails" class="col-3 col-md-2">
-        <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-           [routerLink]="[itemPageRoute]" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                                 [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                                 [alt]="'thumbnail.orgunit.alt'"
-                                 [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+            [alt]="'thumbnail.orgunit.alt'"
+            [placeholder]="'thumbnail.orgunit.placeholder'">
+          </ds-thumbnail>
         </a>
-        <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                          [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                          [alt]="'thumbnail.orgunit.alt'"
-                          [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+            [alt]="'thumbnail.orgunit.alt'"
+            [placeholder]="'thumbnail.orgunit.placeholder'">
+          </ds-thumbnail>
         </span>
+      }
     </div>
-    <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-        <ds-truncatable [id]="dso.id">
-            <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-               [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-               [routerLink]="[itemPageRoute]" class="lead"
-               [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
-            <span *ngIf="linkType === linkTypes.None"
-                  class="lead"
-                  [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
-            <span class="text-muted">
-      <span *ngIf="dso.allMetadata(['dc.description']).length > 0"
+  }
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    <ds-truncatable [id]="dso.id">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead"
+        [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead"
+        [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
+      }
+      <span class="text-muted">
+        @if (dso.allMetadata(['dc.description']).length > 0) {
+          <span
             class="item-list-org-unit-description">
             <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                    [innerHTML]="firstMetadataValue('dc.description')"></span>
-            </ds-truncatable-part>
-      </span>
-  </span>
-        </ds-truncatable>
-    </div>
+            [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </span>
+      }
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 9fb88d0eac..16cb34e25d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -21,7 +17,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
   templateUrl: './org-unit-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index cc7905e719..b625212240 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,42 +1,58 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                           [defaultImage]="'assets/images/person-placeholder.svg'"
-                           [alt]="'thumbnail.person.alt'"
-                           [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead"
-         [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead"
-            [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead"
+        [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead"
+        [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-                  class="item-list-job-title">
-                    <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            <span
+              class="item-list-job-title">
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                </span>
+              }
             </span>
+          }
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 86ead8b825..eba98bddb1 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -32,7 +27,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./person-search-result-list-element.component.scss'],
   templateUrl: './person-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 65cf6fa1f8..294f3d909c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,42 +1,54 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                           [defaultImage]="'assets/images/project-placeholder.svg'"
-                           [alt]="'thumbnail.project.alt'"
-                           [placeholder]="'thumbnail.project.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/project-placeholder.svg'"
-                    [alt]="'thumbnail.project.alt'"
-                    [placeholder]="'thumbnail.project.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/project-placeholder.svg'"
+            [alt]="'thumbnail.project.alt'"
+            [placeholder]="'thumbnail.project.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/project-placeholder.svg'"
+            [alt]="'thumbnail.project.alt'"
+            [placeholder]="'thumbnail.project.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <!--<span class="text-muted">-->
       <!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
       <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
-      <!--</span>-->
-      <!--</span>-->
-      <!--</ds-truncatable-part>-->
-      <!--</span>-->
-    </ds-truncatable>
-  </div>
+    <!--</span>-->
+  <!--</span>-->
+<!--</ds-truncatable-part>-->
+<!--</span>-->
+</ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 825f7be387..736dfaa8ee 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -19,7 +15,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./project-search-result-list-element.component.scss'],
   templateUrl: './project-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Project
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 80cf2c11be..36ec0e48c0 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
@@ -8,10 +10,10 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
-                    [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                    [alt]="'thumbnail.orgunit.alt'"
-                    [placeholder]="'thumbnail.orgunit.placeholder'"
-      >
+        [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+        [alt]="'thumbnail.orgunit.alt'"
+        [placeholder]="'thumbnail.orgunit.placeholder'"
+        >
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
@@ -42,7 +44,7 @@
       [item]="object"
       [label]="'orgunit.page.ror'"
       [urlRegex]="'(.*)ror.org'"
-    >
+      >
     </ds-item-page-img-field>
     <ds-related-items
       [parentItem]="object"
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index a5d101c5d0..41e798fb6f 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -25,7 +22,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./org-unit.component.scss'],
   templateUrl: './org-unit.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule, ItemPageImgFieldComponent],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule, ItemPageImgFieldComponent],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
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 da0d5e6c47..efeec4bc04 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field class="me-auto" [item]="object">
   </ds-item-page-title-field>
@@ -8,9 +10,9 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
+        [defaultImage]="'assets/images/person-placeholder.svg'"
+        [alt]="'thumbnail.person.alt'"
+        [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index 56cb2b3fa9..4071d9a709 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./person.component.scss'],
   templateUrl: './person.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Person
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 73dc9b4e09..86c49a7608 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,6 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
@@ -15,56 +17,56 @@
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <!--<ds-generic-item-page-field [item]="object"-->
-      <!--[fields]="['project.identifier.status']"-->
-      <!--[label]="'project.page.status'">-->
-    <!--</ds-generic-item-page-field>-->
-    <ds-metadata-representation-list
-      [parentItem]="object"
-      [itemType]="'OrgUnit'"
-      [metadataFields]="['project.contributor.other']"
-      [label]="'project.page.contributor' | translate">
-    </ds-metadata-representation-list>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['project.identifier.funder']"
-      [label]="'project.page.funder'">
-    </ds-generic-item-page-field>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.identifier']"
-      [label]="'project.page.id'">
-    </ds-generic-item-page-field>
-    <!--<ds-generic-item-page-field [item]="object"-->
-      <!--[fields]="['project.identifier.expectedcompletion']"-->
-      <!--[label]="'project.page.expectedcompletion'">-->
-    <!--</ds-generic-item-page-field>-->
-  </div>
-  <div class="col-xs-12 col-md-7">
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isPersonOfProject'"
-      [label]="'relationships.isPersonOf' | translate">
-    </ds-related-items>
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isPublicationOfProject'"
-      [label]="'relationships.isPublicationOf' | translate">
-    </ds-related-items>
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isOrgUnitOfProject'"
-      [label]="'relationships.isOrgUnitOf' | translate">
-    </ds-related-items>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.description']"
-      [label]="'project.page.description'">
-    </ds-generic-item-page-field>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.subject']"
-      [label]="'project.page.keyword'">
-    </ds-generic-item-page-field>
-    <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
-        {{"item.page.link.full" | translate}}
-      </a>
-    </div>
+    <!--[fields]="['project.identifier.status']"-->
+    <!--[label]="'project.page.status'">-->
+  <!--</ds-generic-item-page-field>-->
+  <ds-metadata-representation-list
+    [parentItem]="object"
+    [itemType]="'OrgUnit'"
+    [metadataFields]="['project.contributor.other']"
+    [label]="'project.page.contributor' | translate">
+  </ds-metadata-representation-list>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['project.identifier.funder']"
+    [label]="'project.page.funder'">
+  </ds-generic-item-page-field>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.identifier']"
+    [label]="'project.page.id'">
+  </ds-generic-item-page-field>
+  <!--<ds-generic-item-page-field [item]="object"-->
+  <!--[fields]="['project.identifier.expectedcompletion']"-->
+  <!--[label]="'project.page.expectedcompletion'">-->
+<!--</ds-generic-item-page-field>-->
+</div>
+<div class="col-xs-12 col-md-7">
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isPersonOfProject'"
+    [label]="'relationships.isPersonOf' | translate">
+  </ds-related-items>
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isPublicationOfProject'"
+    [label]="'relationships.isPublicationOf' | translate">
+  </ds-related-items>
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isOrgUnitOfProject'"
+    [label]="'relationships.isOrgUnitOf' | translate">
+  </ds-related-items>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.description']"
+    [label]="'project.page.description'">
+  </ds-generic-item-page-field>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.subject']"
+    [label]="'project.page.keyword'">
+  </ds-generic-item-page-field>
+  <div>
+    <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      {{"item.page.link.full" | translate}}
+    </a>
   </div>
 </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index b654f5e17c..d5d33919a9 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./project.component.scss'],
   templateUrl: './project.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index cbc68ef7cf..edb3aa7834 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -1,20 +1,27 @@
 <ng-template #descTemplate>
   <span class="text-muted">
-      <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
-            class="item-list-job-title">
-              <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-              </span>
-      </span>
-  </span>
+    @if (mdRepresentation.allMetadata(['person.jobTitle']).length > 0) {
+      <span
+        class="item-list-job-title">
+        @for (value of mdRepresentation.allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+          <span>
+            <span [innerHTML]="value"></span>@if (!last) {
+            <span>; </span>
+          }
+        </span>
+      }
+    </span>
+  }
+</span>
 </ng-template>
 <ds-truncatable [id]="mdRepresentation.id">
   <a [routerLink]="[itemPageRoute]"
-     [innerHTML]="mdRepresentation.getValue()"
-     [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
-  <ds-orcid-badge-and-tooltip class="ml-1"
-                              *ngIf="mdRepresentation.firstMetadata('person.identifier.orcid')"
-                              [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
-                              [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
-  </ds-orcid-badge-and-tooltip>
+    [innerHTML]="mdRepresentation.getValue()"
+  [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  @if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
+    <ds-orcid-badge-and-tooltip class="ml-1"
+      [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+      [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+    </ds-orcid-badge-and-tooltip>
+  }
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index c7b9e1a333..82e5f54ebb 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -14,7 +11,7 @@ import { TruncatableComponent } from '../../../../shared/truncatable/truncatable
   selector: 'ds-person-item-metadata-list-element',
   templateUrl: './person-item-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
+  imports: [TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
index 9d4a3566ad..78c86ae639 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
@@ -1,4 +1,6 @@
 <div class="d-inline-block">
   <div>{{object.display}}</div>
-  <div *ngIf="uri"><a target="_blank" [href]="uri.value">{{uri.value}}</a></div>
+  @if (uri) {
+    <div><a target="_blank" [href]="uri.value">{{uri.value}}</a></div>
+  }
 </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index d7c5b8aafd..c9eea61118 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -19,7 +19,7 @@ import { AbstractListableElementComponent } from '../../../../../shared/object-c
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
   templateUrl: './external-source-entry-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 /**
  * The component for displaying a list element of an external source entry
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 cff764d744..e08f917fe9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -37,7 +37,7 @@ import { OrgUnitInputSuggestionsComponent } from './org-unit-suggestions/org-uni
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, OrgUnitInputSuggestionsComponent, FormsModule],
+  imports: [OrgUnitInputSuggestionsComponent, FormsModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index 58f39b8d0b..45a4dc9bb3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -1,26 +1,28 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           (focus)="open()"
-           (click)="open()"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <span [innerHTML]="suggestionOption"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input"
+    (focus)="open()"
+    (click)="open()"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index 073a7aacce..9d7c134148 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   forwardRef,
@@ -33,7 +29,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 122c8bb59e..cc6e09ab7f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,36 +1,48 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
       <div class="flex-grow-1">
         <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName"
-                                     (clickSuggestion)="select($event)"
-                                     (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
+          (clickSuggestion)="select($event)"
+        (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-                class="item-list-job-title">
-                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
-                  </span>
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            <span
+              class="item-list-job-title">
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
           </span>
-        </span>
-      </div>
+        }
+      </span>
     </div>
   </div>
 </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 1145fb78e3..71477f3d73 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -39,7 +34,7 @@ import { PersonInputSuggestionsComponent } from './person-suggestions/person-inp
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
   templateUrl: './person-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, NgFor, AsyncPipe],
+  imports: [ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, AsyncPipe],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index 53260ceaa3..e2bdaab5a4 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -1,27 +1,29 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(inputField.value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [ngModel]="value" [name]="name"
-           class="form-control suggestion_input"
-           (focus)="open()"
-           (blur)="onSubmit(inputField.value)"
-           (click)="open()"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <span [innerHTML]="suggestionOption"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [ngModel]="value" [name]="name"
+    class="form-control suggestion_input"
+    (focus)="open()"
+    (blur)="onSubmit(inputField.value)"
+    (click)="open()"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 0058789811..36440dbd8d 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   forwardRef,
@@ -33,7 +29,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index 6a6e5e94d7..f7485c1179 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -31,7 +27,7 @@ import { hasValue } from '../shared/empty.util';
   styleUrls: ['footer.component.scss'],
   templateUrl: 'footer.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
+  imports: [RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
 export class FooterComponent implements OnInit {
   dateObj: number = Date.now();
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 68f0f9d203..638151c9b7 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -42,9 +39,8 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
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 6f04326d56..f815312739 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,10 +1,12 @@
-<div *ngIf="buttonVisible$ | async">
-  <a href="javascript:void(0);"
-     role="menuitem"
-     (click)="onClick()"
-     [attr.aria-label]="'nav.context-help-toggle' | translate"
-     [title]="'nav.context-help-toggle' | translate"
-  >
-    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
-  </a>
-</div>
+@if (buttonVisible$ | async) {
+  <div>
+    <a href="javascript:void(0);"
+      role="menuitem"
+      (click)="onClick()"
+      [attr.aria-label]="'nav.context-help-toggle' | translate"
+      [title]="'nav.context-help-toggle' | translate"
+      >
+      <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.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 8ef0d107e0..84eeb4013b 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,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -25,7 +22,7 @@ import { ContextHelpService } from '../../shared/context-help.service';
   templateUrl: './context-help-toggle.component.html',
   styleUrls: ['./context-help-toggle.component.scss'],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable<boolean>;
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 25e3b55766..48fad0b56b 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,7 @@ import { ContextHelpToggleComponent } from './context-help-toggle/context-help-t
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent implements OnInit {
   /**
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
index 5c65586327..531efe6059 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +17,7 @@ import { HealthInfoComponent } from '../../models/health-component.model';
   templateUrl: './health-info-component.component.html',
   styleUrls: ['./health-info-component.component.scss'],
   standalone: true,
-  imports: [NgFor, NgIf, NgbCollapseModule, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponentComponent extends HealthComponentComponent {
 
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
index fe795104e8..3e6f7714ff 100644
--- a/src/app/health-page/health-info/health-info.component.ts
+++ b/src/app/health-page/health-info/health-info.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -28,7 +24,7 @@ import { HealthInfoComponentComponent } from './health-info-component/health-inf
   templateUrl: './health-info.component.html',
   styleUrls: ['./health-info.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbAccordionModule, NgFor, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbAccordionModule, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponent implements OnInit  {
 
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 797ca0bc6e..10e34b392a 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,27 +1,33 @@
-<div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
-  <h1>{{'health-page.heading' | translate}}</h1>
-  <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
-    <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
-      <li [ngbNavItem]="'status'" role="presentation">
-        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
-        <ng-template ngbNavContent>
-          <div id="status">
-            <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
-          </div>
-        </ng-template>
-      </li>
-      <li [ngbNavItem]="'info'" role="presentation">
-        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
-        <ng-template ngbNavContent>
-          <div id="info">
-            <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
-          </div>
-        </ng-template>
-      </li>
-    </ul>
-    <div [ngbNavOutlet]="nav" class="mt-2"></div>
+@if ((healthResponseInitialised | async) && (healthInfoResponseInitialised | async)) {
+  <div class="container">
+    <h1>{{'health-page.heading' | translate}}</h1>
+    @if ((healthResponse | async) && (healthInfoResponse | async)) {
+      <div>
+        <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
+          <li [ngbNavItem]="'status'" role="presentation">
+            <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="status">
+                <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'info'" role="presentation">
+            <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="info">
+                <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
+              </div>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-2"></div>
+      </div>
+    }
+    @if ((healthResponse | async) === null || (healthInfoResponse | async) === null) {
+      <ds-alert [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
+    }
   </div>
-  <ds-alert *ngIf="(healthResponse | async) === null || (healthInfoResponse | async) === null" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
-</div>
+}
 
 
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index 778e63ed50..d1c322bff2 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,7 @@ import {
   templateUrl: './health-page.component.html',
   styleUrls: ['./health-page.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
 })
 export class HealthPageComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
index 769f5b545b..a7ec69d06f 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthComponent } from '../../models/health-component.model';
   templateUrl: './health-component.component.html',
   styleUrls: ['./health-component.component.scss'],
   standalone: true,
-  imports: [NgIf, NgFor, NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthComponentComponent {
 
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
index 3d72f6b6b7..d1b233df64 100644
--- a/src/app/health-page/health-panel/health-panel.component.ts
+++ b/src/app/health-page/health-panel/health-panel.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthStatusComponent } from './health-status/health-status.component';
   templateUrl: './health-panel.component.html',
   styleUrls: ['./health-panel.component.scss'],
   standalone: true,
-  imports: [HealthStatusComponent, NgbAccordionModule, NgFor, NgIf, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
+  imports: [HealthStatusComponent, NgbAccordionModule, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
 })
 export class HealthPanelComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
index 1a1c15bf0b..050dd2c621 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -19,7 +16,7 @@ import { HealthStatus } from '../../models/health-component.model';
   templateUrl: './health-status.component.html',
   styleUrls: ['./health-status.component.scss'],
   standalone: true,
-  imports: [NgSwitch, NgSwitchCase, NgbTooltipModule, TranslateModule],
+  imports: [NgbTooltipModule, TranslateModule],
 })
 export class HealthStatusComponent {
   /**
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index ad48fb328c..43f7977bf2 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,25 +1,31 @@
 <ds-home-coar></ds-home-coar>
 <ds-home-news></ds-home-news>
-<ds-configuration-search-page *ngIf="showDiscoverFilters"
-                              [sideBarWidth]="3"
-                              [showViewModes]="false"
-                              [searchEnabled]="false"
-                              [inPlaceSearch]="false"
-                              [showScopeSelector]="false">
-  <ng-container searchContentTop *ngTemplateOutlet="homeContent"></ng-container>
-</ds-configuration-search-page>
-<div *ngIf="!showDiscoverFilters" class="container">
-  <ng-container *ngTemplateOutlet="homeContent"></ng-container>
-</div>
+@if (showDiscoverFilters) {
+  <ds-configuration-search-page
+    [sideBarWidth]="3"
+    [showViewModes]="false"
+    [searchEnabled]="false"
+    [inPlaceSearch]="false"
+    [showScopeSelector]="false">
+    <ng-container searchContentTop *ngTemplateOutlet="homeContent"></ng-container>
+  </ds-configuration-search-page>
+}
+@if (!showDiscoverFilters) {
+  <div class="container">
+    <ng-container *ngTemplateOutlet="homeContent"></ng-container>
+  </div>
+}
 <ds-suggestions-popup></ds-suggestions-popup>
 
 <ng-template #homeContent>
-  <ng-container *ngIf="(site$ | async) as site">
+  @if ((site$ | async); as site) {
     <ds-view-tracker [object]="site"></ds-view-tracker>
-  </ng-container>
+  }
   <ds-search-form [inPlaceSearch]="false"
-                         [searchPlaceholder]="'home.search-form.placeholder' | translate">
+    [searchPlaceholder]="'home.search-form.placeholder' | translate">
   </ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
-  <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
+  @if (recentSubmissionspageSize>0) {
+    <ds-recent-item-list></ds-recent-item-list>
+  }
 </ng-template>
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index c954e90402..ba526940b5 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Inject,
@@ -34,7 +29,7 @@ import { ThemedTopLevelCommunityListComponent } from './top-level-community-list
   styleUrls: ['./home-page.component.scss'],
   templateUrl: './home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent implements OnInit {
 
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index c7383dd883..35dcdbd0c8 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -61,7 +55,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgIf, NgClass, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgClass, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class RecentItemListComponent implements OnInit, OnDestroy {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
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 2a4325428f..00446d658a 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,15 +1,21 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
-  <div *ngIf="communitiesRD?.hasSucceeded ">
-    <h2>
-      {{'home.top-level-communities.head' | translate}}
-    </h2>
-  <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
-  <ds-viewable-collection
-    [config]="config"
-    [sortConfig]="sortConfig"
-    [objects]="communitiesRD$ | async"
-    [hideGear]="true">
-  </ds-viewable-collection>
-</div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
-<ds-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-loading></ng-container>
+  @if (communitiesRD?.hasSucceeded ) {
+    <div>
+      <h2>
+        {{'home.top-level-communities.head' | translate}}
+      </h2>
+      <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="communitiesRD$ | async"
+        [hideGear]="true">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (communitiesRD?.hasFailed ) {
+    <ds-error message="{{'error.top-level-communities' | translate}}"></ds-error>
+  }
+  @if (communitiesRD?.isLoading ) {
+    <ds-loading message="{{'loading.top-level-communities' | translate}}"></ds-loading>
+  }</ng-container>
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index c562d38ff2..4af7bcc483 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -48,7 +45,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut],
   standalone: true,
-  imports: [VarDirective, NgIf, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index 7909c02272..a1ee88df3b 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -11,12 +11,18 @@
         </div>
       </div>
 
-      <div *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)" class="row">
-        <div class="col-sm-12 alert">
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+      @if (feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)) {
+        <div class="row">
+          <div class="col-sm-12 alert">
+            @if (feedbackForm.controls.email.errors?.required) {
+              <ds-error message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+            }
+            @if (feedbackForm.controls.email.errors?.pattern) {
+              <ds-error message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+            }
+          </div>
         </div>
-      </div>
+      }
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
@@ -25,11 +31,15 @@
         </div>
       </div>
 
-      <div *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)" class="row">
-        <div class="col-sm-12 alert">
-          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+      @if (feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)) {
+        <div class="row">
+          <div class="col-sm-12 alert">
+            @if (feedbackForm.controls.message.errors?.required) {
+              <ds-error message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+            }
+          </div>
         </div>
-      </div>
+      }
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index db98a2ee01..fd7bb09eb8 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -39,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index b964327e39..cb69f873bb 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -1,16 +1,22 @@
 <div>
-    <div *ngIf="item && !item.isDiscoverable" class="private-warning">
-        <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
+  @if (item && !item.isDiscoverable) {
+    <div class="private-warning">
+      <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
     </div>
-    <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
-        <ds-alert [type]="AlertTypeEnum.Warning">
-            <div class="d-flex justify-content-between flex-wrap">
-                <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
-                <div class="gap-2 d-flex">
-                  <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
-                  <a *ngIf="showReinstateButton$ | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
-                </div>
-            </div>
-        </ds-alert>
+  }
+  @if (item && item.isWithdrawn) {
+    <div class="withdrawn-warning">
+      <ds-alert [type]="AlertTypeEnum.Warning">
+        <div class="d-flex justify-content-between flex-wrap">
+          <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
+          <div class="gap-2 d-flex">
+            <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+            @if (showReinstateButton$ | async) {
+              <a class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+            }
+          </div>
+        </div>
+      </ds-alert>
     </div>
+  }
 </div>
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index bcf940e69d..9d2c31f279 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -37,11 +34,10 @@ import {
   styleUrls: ['./item-alerts.component.scss'],
   imports: [
     AlertComponent,
-    NgIf,
     TranslateModule,
     RouterLink,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 454725f2e6..db4e078ff2 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  Location,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, Location } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -71,9 +67,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     RouterLink,
     AsyncPipe,
     ReactiveFormsModule,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index e8b216aa52..3fe0e0eb86 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -62,11 +59,10 @@ import { getEntityEditRoute } from '../../item-page-routing-paths';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
     DsoInputSuggestionsComponent,
     FormsModule,
-    UploaderComponent,
-  ],
+    UploaderComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index cd3e1ff215..b547aaa2cb 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -48,13 +43,11 @@ import { getItemPageRoute } from '../item-page-routing-paths';
   imports: [
     TranslateModule,
     NgClass,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     NgbTooltipModule,
     RouterLink,
-    RouterOutlet,
-  ],
+    RouterOutlet
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
index 782e24fa2d..1e862c344d 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
@@ -1,6 +1,7 @@
-<ds-access-control-form-container
-  titleMessage="item-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="true">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="item-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="true">
+  </ds-access-control-form-container>
+}
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
index 1a2fc7292b..e4aa8c6488 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,9 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./item-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class ItemAccessControlComponent implements OnInit {
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
index 7f121081f2..4aca189e16 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -3,10 +3,10 @@
   <ds-resource-policies [resourceType]="'item'" [resourceName]="(getItemName() | async)"
     [resourceUUID]="(getItemUUID() | async)">
   </ds-resource-policies>
-  <ng-container *ngFor="let bundle of (bundles$ | async); trackById">
+  @for (bundle of (bundles$ | async); track bundle) {
     <ds-resource-policies [resourceType]="'bundle'" [resourceUUID]="bundle.id" [resourceName]="bundle.name">
     </ds-resource-policies>
-    <ng-container *ngIf="(bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0">
+    @if ((bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0) {
       <div class="card auth-bitstream-container">
         <div class="card-header">
           <button type="button" class="btn btn-outline-primary" (click)="collapseArea(bundle.id)"
@@ -15,19 +15,22 @@
           </button>
         </div>
         <div class="card-body" [id]="bundle.id" [ngbCollapse]="bundleBitstreamsMap.get(bundle.id).isCollapsed">
-          <ng-container
-            *ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); trackById">
+          @for (bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); track bitstream) {
             <ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="bitstream.id"
-              [resourceName]="bitstream.name"></ds-resource-policies>
-          </ng-container>
-          <div class="row justify-content-center" *ngIf="!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded">
-            <button type="button" class="btn btn-link" (click)="onBitstreamsLoad(bundle)">{{ 'collection.edit.item.authorizations.load-more-button' | translate }}</button>
-          </div>
+            [resourceName]="bitstream.name"></ds-resource-policies>
+          }
+          @if (!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded) {
+            <div class="row justify-content-center">
+              <button type="button" class="btn btn-link" (click)="onBitstreamsLoad(bundle)">{{ 'collection.edit.item.authorizations.load-more-button' | translate }}</button>
+            </div>
+          }
         </div>
       </div>
-    </ng-container>
-  </ng-container>
-  <div class="row justify-content-center" *ngIf="!allBundlesLoaded">
-    <button type="button" class="btn btn-link" (click)="onBundleLoad()">{{ 'collection.edit.item.authorizations.load-bundle-button' | translate }}</button>
-  </div>
+    }
+  }
+  @if (!allBundlesLoaded) {
+    <div class="row justify-content-center">
+      <button type="button" class="btn btn-link" (click)="onBundleLoad()">{{ 'collection.edit.item.authorizations.load-bundle-button' | translate }}</button>
+    </div>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 30d1fce2bc..ecca674a1c 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -65,12 +61,10 @@ interface BundleBitstreamsMapEntry {
     ResourcePoliciesComponent,
     NgbCollapseModule,
     TranslateModule,
-    NgForOf,
     NgForTrackByIdDirective,
     AsyncPipe,
-    NgIf,
-    AlertComponent,
-  ],
+    AlertComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index c10586db47..1960cf1443 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  CommonModule,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -77,13 +72,11 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
     TranslateModule,
     ItemEditBitstreamBundleComponent,
     RouterLink,
-    NgIf,
     VarDirective,
-    NgForOf,
     ThemedLoadingComponent,
     AlertComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   providers: [ObjectValuesPipe],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 0aa7b27d2e..7c56da4c0e 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -18,7 +18,7 @@
                 [cancelButton]="'item.edit.item-mapper.cancel'"
                 [dangerConfirm]="true"
                 (confirm)="removeMappings($event)"
-                (cancel)="onCancel()"></ds-collection-select>
+              (cancel)="onCancel()"></ds-collection-select>
             </div>
           </ng-template>
         </li>
@@ -28,29 +28,33 @@
             <div class="row mt-2">
               <div class="col-12 col-lg-6">
                 <ds-search-form id="search-form"
-                                [query]="(searchOptions$ | async)?.query"
-                                [currentUrl]="'./'"
-                                [inPlaceSearch]="true"
-                                [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
-                                (submitSearch)="performedSearch = true">
+                  [query]="(searchOptions$ | async)?.query"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 </ds-search-form>
               </div>
             </div>
 
-            <div *ngIf="performedSearch">
-              <ds-collection-select class="mt-2"
-                [key]="'map'"
-                [dsoRD$]="mappedCollectionsRD$"
-                [paginationOptions]="(searchOptions$ | async)?.pagination"
-                [sortOptions]="(searchOptions$ | async)?.sort"
-                [confirmButton]="'item.edit.item-mapper.buttons.add'"
-                [cancelButton]="'item.edit.item-mapper.cancel'"
-                (confirm)="mapCollections($event)"
+            @if (performedSearch) {
+              <div>
+                <ds-collection-select class="mt-2"
+                  [key]="'map'"
+                  [dsoRD$]="mappedCollectionsRD$"
+                  [paginationOptions]="(searchOptions$ | async)?.pagination"
+                  [sortOptions]="(searchOptions$ | async)?.sort"
+                  [confirmButton]="'item.edit.item-mapper.buttons.add'"
+                  [cancelButton]="'item.edit.item-mapper.cancel'"
+                  (confirm)="mapCollections($event)"
                 (cancel)="onCancel()"></ds-collection-select>
-            </div>
-            <div *ngIf="!performedSearch" class="alert alert-info w-100" role="alert">
-              {{'item.edit.item-mapper.no-search' | translate}}
-            </div>
+              </div>
+            }
+            @if (!performedSearch) {
+              <div class="alert alert-info w-100" role="alert">
+                {{'item.edit.item-mapper.no-search' | translate}}
+              </div>
+            }
           </ng-template>
         </li>
       </ul>
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 3c93780a87..ce71b0617b 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -79,9 +76,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     ThemedSearchFormComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
-    BrowserOnlyPipe,
-  ],
+    BrowserOnlyPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 22b10b28b6..a16fc5cba3 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,7 +1,8 @@
 <div class="container mt-3">
-    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
+  <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
+  @if (dsoRD$ | async; as dsoRD) {
     <ds-curation-form
-      *ngIf="dsoRD$ | async as dsoRD"
       [dsoHandle]="dsoRD?.payload.handle"
     ></ds-curation-form>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
index d7f1d8135e..a5a3042474 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -29,10 +26,9 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './item-curate.component.html',
   imports: [
     CurationFormComponent,
-    NgIf,
     TranslateModule,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class ItemCurateComponent implements OnInit {
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index c044f62e65..f08831dc2c 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,9 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -104,14 +100,12 @@ class RelationshipDTO {
   imports: [
     TranslateModule,
     ListableObjectComponentLoaderComponent,
-    NgIf,
     ModifyItemOverviewComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
     RouterLink,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 07098aab11..ed6ad8d407 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -56,9 +53,8 @@ import {
     RouterLink,
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 7c3793cc57..0f4973d46f 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -17,9 +17,8 @@ import { ItemOperation } from './itemOperation.model';
     TranslateModule,
     RouterLink,
     NgbTooltipModule,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index d9e0283267..f2e403c5ab 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -41,10 +37,8 @@ import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstrac
     ModifyItemOverviewComponent,
     RouterLink,
     TranslateModule,
-    AsyncPipe,
-    NgIf,
-    NgForOf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
index ed7fb190f2..e16c5f9b46 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
@@ -1,31 +1,31 @@
-<ng-container *ngIf="shouldDisplayBothRelationshipSides$ | async">
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="isLeftItem$"
-            class="d-block mb-4"
-    ></ds-edit-relationship-list>
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="isRightItem$"
-    ></ds-edit-relationship-list>
-</ng-container>
+@if (shouldDisplayBothRelationshipSides$ | async) {
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="isLeftItem$"
+    class="d-block mb-4"
+  ></ds-edit-relationship-list>
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="isRightItem$"
+  ></ds-edit-relationship-list>
+}
 
-<ng-container *ngIf="(shouldDisplayBothRelationshipSides$ | async) === false">
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="currentItemIsLeftItem$"
-    ></ds-edit-relationship-list>
-</ng-container>
+@if ((shouldDisplayBothRelationshipSides$ | async) === false) {
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="currentItemIsLeftItem$"
+  ></ds-edit-relationship-list>
+}
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
index 943a147546..41b88bfcd8 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -30,9 +27,8 @@ import { EditRelationshipListComponent } from '../edit-relationship-list/edit-re
   standalone: true,
   imports: [
     AsyncPipe,
-    EditRelationshipListComponent,
-    NgIf,
-  ],
+    EditRelationshipListComponent
+],
 })
 /**
  * A component creating a list of editable relationships of a certain type
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index be74be2fa0..cdcc11b94b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -96,13 +91,11 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     AsyncPipe,
     ObjectValuesPipe,
     VarDirective,
-    NgIf,
-    NgFor,
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index e711de94c6..4dd27c0930 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -52,11 +49,10 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
   imports: [
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
-    NgIf,
     TranslateModule,
     VirtualMetadataComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class EditRelationshipComponent implements OnChanges {
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 6376585ba5..b62256e18e 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,54 +1,64 @@
 <div class="item-relationships">
-  <ng-container *ngIf="entityType$ | async as entityType; else noEntityType">
+  @if (entityType$ | async; as entityType) {
     <div class="button-row top d-flex justify-content-end">
       <ng-container *ngTemplateOutlet="buttons"></ng-container>
     </div>
-    <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
-      <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
-        <ds-edit-relationship-list-wrapper
-          [url]="url"
-          [item]="item"
-          [itemType]="entityType"
-          [relationshipType]="relationshipType"
-          [hasChanges]="hasChanges$"
-        ></ds-edit-relationship-list-wrapper>
+    @if (relationshipTypes$ | async; as relationshipTypes) {
+      <div class="mb-4">
+        @for (relationshipType of relationshipTypes; track trackById($index, relationshipType)) {
+          <div class="mb-4">
+            <ds-edit-relationship-list-wrapper
+              [url]="url"
+              [item]="item"
+              [itemType]="entityType"
+              [relationshipType]="relationshipType"
+              [hasChanges]="hasChanges$"
+            ></ds-edit-relationship-list-wrapper>
+          </div>
+        }
       </div>
-    </div>
+    } @else {
+      <ds-loading></ds-loading>
+    }
     <div class="button-row bottom">
       <div class="float-end ms-gap">
         <ng-container *ngTemplateOutlet="buttons"></ng-container>
       </div>
     </div>
-  </ng-container>
+  } @else {
+    <ds-alert [type]="AlertType.Info" class="d-block mt-2">
+      {{ 'item.edit.relationships.no-entity-type' | translate }}
+    </ds-alert>
+  }
 </div>
 
-<ng-template #noEntityType>
-  <ds-alert [type]="AlertType.Info" class="d-block mt-2">
-    {{ 'item.edit.relationships.no-entity-type' | translate }}
-  </ds-alert>
-</ng-template>
 
-<ng-template #loading>
-  <ds-loading></ds-loading>
-</ng-template>
 
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
-    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [dsBtnDisabled]="(hasChanges$ | async) !== true"
-            (click)="discard()">
-      <i aria-hidden="true" class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable$ | async" (click)="reinstate()">
-      <i aria-hidden="true" class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
-    </button>
+    @if ((isReinstatable$ | async) !== true) {
+      <button class="btn btn-danger"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true"
+        (click)="discard()">
+        <i aria-hidden="true" class="fas fa-times"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
+      </button>
+    }
+    @if (isReinstatable$ | async) {
+      <button class="btn btn-warning" (click)="reinstate()">
+        <i aria-hidden="true" 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"
-            [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
-            (click)="submit()">
-      <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
-      <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
+      [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+      (click)="submit()">
+      @if (isSaving$ | async) {
+        <span aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
+      }
+      @if ((isSaving$ | async) !== true) {
+        <i aria-hidden="true" class="fas fa-save"></i>
+      }
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.save-button' | translate }}</span>
     </button>
   </div>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 42309116f2..df68a34f8a 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -61,15 +56,13 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     AlertComponent,
     AsyncPipe,
     EditRelationshipListComponent,
-    NgForOf,
-    NgIf,
     NgTemplateOutlet,
     ThemedLoadingComponent,
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 1bb17dc77c..58dbbf264b 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -68,13 +63,11 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
   ],
   imports: [
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    NgIf,
     RouterLink,
     ItemOperationComponent,
-    NgClass,
-  ],
+    NgClass
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
index ec0c345d82..2a88d94f55 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
@@ -1,4 +1,6 @@
 <div class="mt-2" *ngVar="(itemRD$ | async)?.payload as item">
-  <ds-item-versions *ngIf="item" [item]="item" [displayWhenEmpty]="true" [displayTitle]="false"
-                    [displayActions]="true"></ds-item-versions>
+  @if (item) {
+    <ds-item-versions [item]="item" [displayWhenEmpty]="true" [displayTitle]="false"
+    [displayActions]="true"></ds-item-versions>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index a414af0ce4..3ce1dbb7a4 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -23,9 +20,8 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
   imports: [
     ItemVersionsComponent,
     VarDirective,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index dbef279d8c..62a1c48c4d 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -1,18 +1,20 @@
 <table id="metadata" class="table table-striped table-hover table-responsive">
   <thead>
-  <tr>
-    <th scope="col">{{'item.edit.modify.overview.field'| translate}}</th>
-    <th scope="col">{{'item.edit.modify.overview.value'| translate}}</th>
-    <th scope="col">{{'item.edit.modify.overview.language'| translate}}</th>
-  </tr>
+    <tr>
+      <th scope="col">{{'item.edit.modify.overview.field'| translate}}</th>
+      <th scope="col">{{'item.edit.modify.overview.value'| translate}}</th>
+      <th scope="col">{{'item.edit.modify.overview.language'| translate}}</th>
+    </tr>
   </thead>
   <tbody>
-  <ng-container *ngFor="let mdEntry of metadata | keyvalue">
-    <tr *ngFor="let mdValue of mdEntry.value" class="metadata-row">
-      <td>{{mdEntry.key}}</td>
-      <td>{{mdValue.value}}</td>
-      <td>{{mdValue.language}}</td>
-    </tr>
-  </ng-container>
+    @for (mdEntry of metadata | keyvalue; track mdEntry) {
+      @for (mdValue of mdEntry.value; track mdValue) {
+        <tr class="metadata-row">
+          <td>{{mdEntry.key}}</td>
+          <td>{{mdValue.value}}</td>
+          <td>{{mdValue.language}}</td>
+        </tr>
+      }
+    }
   </tbody>
 </table>
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index 3bd5024837..223c6b58c5 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgFor,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -16,7 +13,7 @@ import { MetadataMap } from '../../../core/shared/metadata.models';
   selector: 'ds-modify-item-overview',
   templateUrl: './modify-item-overview.component.html',
   standalone: true,
-  imports: [NgFor, KeyValuePipe, TranslateModule],
+  imports: [KeyValuePipe, TranslateModule],
 })
 /**
  * Component responsible for rendering a table containing the metadatavalues from the to be edited item
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index e8f42c8fc0..9b336c18ed 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -45,11 +41,10 @@ interface ItemDTO {
   imports: [
     NgClass,
     TranslateModule,
-    NgForOf,
     VarDirective,
     AsyncPipe,
-    ListableObjectComponentLoaderComponent,
-  ],
+    ListableObjectComponentLoaderComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 7c08ce5c1c..f5f42bd272 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,21 +1,28 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <div class="collections">
-        <a *ngFor="let collection of (this.collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]">
-            <span>{{ dsoNameService.getName(collection) }}</span><span *ngIf="!last" [innerHTML]="separator"></span>
-        </a>
-    </div>
-
-    <div *ngIf="isLoading$ | async">
-        {{'item.page.collections.loading' | translate}}
-    </div>
-
-    <a
-        *ngIf="(isLoading$ | async) !== true && (hasMore$ | async)"
-        (click)="$event.preventDefault(); handleLoadMore()"
-        class="load-more-btn btn btn-sm btn-outline-secondary"
-        role="button"
-        href="javascript:void(0);"
-    >
-        {{'item.page.collections.load-more' | translate}}
+  <div class="collections">
+    @for (collection of (this.collections$ | async); track collection; let last = $last) {
+      <a [routerLink]="['/collections', collection.id]">
+        <span>{{ dsoNameService.getName(collection) }}</span>@if (!last) {
+        <span [innerHTML]="separator"></span>
+      }
     </a>
+  }
+</div>
+
+@if (isLoading$ | async) {
+  <div>
+    {{'item.page.collections.loading' | translate}}
+  </div>
+}
+
+@if ((isLoading$ | async) !== true && (hasMore$ | async)) {
+  <a
+    (click)="$event.preventDefault(); handleLoadMore()"
+    class="load-more-btn btn btn-sm btn-outline-secondary"
+    role="button"
+    href="javascript:void(0);"
+    >
+    {{'item.page.collections.load-more' | translate}}
+  </a>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index e70dcfba2c..e545781d26 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -51,11 +47,9 @@ import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wr
   imports: [
     MetadataFieldWrapperComponent,
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    RouterLink,
-    NgIf,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class CollectionsComponent implements OnInit {
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 4cef0a1592..2093318e66 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,9 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
-       {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
-    </a>
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    <a class="dont-break-out" [href]="mdValue.value" [target]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
+      {{ linktext || mdValue.value }}@if (!last) {
+      <span [innerHTML]="separator"></span>
+    }
+  </a>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index 944c70f49a..e3c89b3b20 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -25,10 +22,8 @@ import { MetadataValuesComponent } from '../metadata-values/metadata-values.comp
   templateUrl: './metadata-uri-values.component.html',
   imports: [
     MetadataFieldWrapperComponent,
-    TranslateModule,
-    NgForOf,
-    NgIf,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class MetadataUriValuesComponent extends MetadataValuesComponent {
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 4fc0b41136..015398f041 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,13 +1,15 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <ng-container *ngFor="let mdValue of mdValues; let last=last;">
-      <!--
-      Choose a template. Priority: markdown, link, browse link.
-      -->
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    <!--
+    Choose a template. Priority: markdown, link, browse link.
+    -->
       <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (hasValue(img) ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple)));
         context: {value: mdValue.value, img}">
-      </ng-container>
-      <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
     </ng-container>
+    @if (!last) {
+      <span class="separator" [innerHTML]="separator"></span>
+    }
+  }
 </ds-metadata-field-wrapper>
 
 <!-- Render value as markdown -->
@@ -18,12 +20,12 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link"
-      [href]="value"
-      [attr.target]="getLinkAttributes(value).target"
-      [attr.rel]="getLinkAttributes(value).rel">
-      {{value}}
-    </a>
+  <a class="dont-break-out ds-simple-metadata-link"
+    [href]="value"
+    [attr.target]="getLinkAttributes(value).target"
+    [attr.rel]="getLinkAttributes(value).rel">
+    {{value}}
+  </a>
 </ng-template>
 
 <!-- Render value as a link with icon -->
@@ -45,6 +47,6 @@
 <!-- Render value as a link to browse index -->
 <ng-template #browselink let-value="value">
   <a class="dont-break-out preserve-line-breaks ds-browse-link"
-     [routerLink]="['/browse', browseDefinition.id]"
-     [queryParams]="getQueryParams(value)">{{value}}</a>
+    [routerLink]="['/browse', browseDefinition.id]"
+  [queryParams]="getQueryParams(value)">{{value}}</a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index b42caace7b..986e93b960 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Inject,
@@ -36,7 +31,7 @@ import { ImageField } from '../../simple/field-components/specific-field/image-f
   styleUrls: ['./metadata-values.component.scss'],
   templateUrl: './metadata-values.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, NgTemplateOutlet, NgIf, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
+  imports: [MetadataFieldWrapperComponent, NgTemplateOutlet, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
 })
 export class MetadataValuesComponent implements OnChanges {
 
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8c534e6630..b04d636a13 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,84 +1,84 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <div *ngVar="(originals$ | async)?.payload as originals">
-        <div *ngIf="hasValuesInBundle(originals)">
-            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
-            <ds-pagination *ngIf="originals?.page?.length > 0"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true"
-                           [paginationOptions]="originalOptions"
-                           [collectionSize]="originals?.totalElements"
-                           [retainScrollPosition]="true">
-
-
-                <div class="file-section row mb-3" *ngFor="let file of originals?.page;">
-                    <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
-                    </div>
-                    <div class="col-7">
-                        <dl class="row">
-                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
-
-
-                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
-
-                          <ng-container *ngIf="file.hasMetadata('dc.description')">
-                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-                          </ng-container>
-                        </dl>
-                    </div>
-                    <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
-                            {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
-                    </div>
+  <div *ngVar="(originals$ | async)?.payload as originals">
+    @if (hasValuesInBundle(originals)) {
+      <div>
+        <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
+        @if (originals?.page?.length > 0) {
+          <ds-pagination
+            [hideGear]="true"
+            [hidePagerWhenSinglePage]="true"
+            [paginationOptions]="originalOptions"
+            [collectionSize]="originals?.totalElements"
+            [retainScrollPosition]="true">
+            @for (file of originals?.page; track file) {
+              <div class="file-section row mb-3">
+                <div class="col-3">
+                  <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
                 </div>
-            </ds-pagination>
-        </div>
-    </div>
-    <div *ngVar="(licenses$ | async)?.payload as licenses">
-        <div *ngIf="hasValuesInBundle(licenses)">
-            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
-            <ds-pagination *ngIf="licenses?.page?.length > 0"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true"
-                           [paginationOptions]="licenseOptions"
-                           [collectionSize]="licenses?.totalElements"
-                           [retainScrollPosition]="true">
-
-
-                <div class="file-section row" *ngFor="let file of licenses?.page;">
-                    <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
-                    </div>
-                    <div class="col-7">
-                        <dl class="row">
-                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
-
-
-                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-                        </dl>
-                    </div>
-                    <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
-                            {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
-                    </div>
+                <div class="col-7">
+                  <dl class="row">
+                    <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                    <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+                    @if (file.hasMetadata('dc.description')) {
+                      <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                      <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                    }
+                  </dl>
                 </div>
-            </ds-pagination>
-        </div>
-    </div>
+                <div class="col-2">
+                  <ds-file-download-link [bitstream]="file" [item]="item">
+                    {{"item.page.filesection.download" | translate}}
+                  </ds-file-download-link>
+                </div>
+              </div>
+            }
+          </ds-pagination>
+        }
+      </div>
+    }
+  </div>
+  <div *ngVar="(licenses$ | async)?.payload as licenses">
+    @if (hasValuesInBundle(licenses)) {
+      <div>
+        <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
+        @if (licenses?.page?.length > 0) {
+          <ds-pagination
+            [hideGear]="true"
+            [hidePagerWhenSinglePage]="true"
+            [paginationOptions]="licenseOptions"
+            [collectionSize]="licenses?.totalElements"
+            [retainScrollPosition]="true">
+            @for (file of licenses?.page; track file) {
+              <div class="file-section row">
+                <div class="col-3">
+                  <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                </div>
+                <div class="col-7">
+                  <dl class="row">
+                    <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                    <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                    <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                  </dl>
+                </div>
+                <div class="col-2">
+                  <ds-file-download-link [bitstream]="file" [item]="item">
+                    {{"item.page.filesection.download" | translate}}
+                  </ds-file-download-link>
+                </div>
+              </div>
+            }
+          </ds-pagination>
+        }
+      </div>
+    }
+  </div>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index f038b18bfc..8f5c614e89 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -57,16 +53,14 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
   templateUrl: './full-file-section.component.html',
   imports: [
     PaginationComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
     ThemedThumbnailComponent,
-    NgForOf,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    MetadataFieldWrapperComponent,
-  ],
+    MetadataFieldWrapperComponent
+],
   standalone: true,
 })
 export class FullFileSectionComponent extends FileSectionComponent implements OnDestroy, OnInit {
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 88a1254feb..07c7ab45ba 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  KeyValuePipe,
-  Location,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, KeyValuePipe, Location } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -71,8 +65,6 @@ import { ThemedFullFileSectionComponent } from './field-components/file-section/
     ThemedFullFileSectionComponent,
     CollectionsComponent,
     ItemVersionsComponent,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     KeyValuePipe,
     RouterLink,
@@ -81,8 +73,8 @@ import { ThemedFullFileSectionComponent } from './field-components/file-section/
     ItemVersionsNoticeComponent,
     ViewTrackerComponent,
     ThemedItemAlertsComponent,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit, OnDestroy {
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 a64b4ce548..a3d87c780d 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
@@ -8,47 +8,49 @@
   "
   preload="none"
   controls
->
-  <ng-container *ngIf="getMediaCap(medias[currentIndex].bitstream.name, captions) as capInfos">
-    <ng-container *ngFor="let capInfo of capInfos">
+  >
+  @if (getMediaCap(medias[currentIndex].bitstream.name, captions); as capInfos) {
+    @for (capInfo of capInfos; track capInfo) {
       <track [src]="capInfo.src" [label]="capInfo.langLabel" [srclang]="capInfo.srclang" />
-    </ng-container>
-  </ng-container>
+    }
+  }
 
 </video>
-<div class="buttons" *ngIf="medias?.length > 1">
-  <button
-    class="btn btn-primary previous"
-    [dsBtnDisabled]="currentIndex === 0"
-    (click)="prevMedia()"
-  >
-    {{ "media-viewer.previous" | translate }}
-  </button>
-
-  <button
-    class="btn btn-primary next"
-    [dsBtnDisabled]="currentIndex === medias.length - 1"
-    (click)="nextMedia()"
-  >
-    {{ "media-viewer.next" | translate }}
-  </button>
-  <div ngbDropdown class="d-inline-block">
+@if (medias?.length > 1) {
+  <div class="buttons">
     <button
-      class="btn btn-outline-primary playlist"
-      id="dropdownBasic1"
-      ngbDropdownToggle
-    >
-      {{ "media-viewer.playlist" | translate }}
-    </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-      <button
-        ngbDropdownItem
-        *ngFor="let item of medias; index as indexOfelement"
-        class="list-element"
-        (click)="selectedMedia(indexOfelement)"
+      class="btn btn-primary previous"
+      [dsBtnDisabled]="currentIndex === 0"
+      (click)="prevMedia()"
       >
-        {{ dsoNameService.getName(item.bitstream) }}
+      {{ "media-viewer.previous" | translate }}
+    </button>
+    <button
+      class="btn btn-primary next"
+      [dsBtnDisabled]="currentIndex === medias.length - 1"
+      (click)="nextMedia()"
+      >
+      {{ "media-viewer.next" | translate }}
+    </button>
+    <div ngbDropdown class="d-inline-block">
+      <button
+        class="btn btn-outline-primary playlist"
+        id="dropdownBasic1"
+        ngbDropdownToggle
+        >
+        {{ "media-viewer.playlist" | translate }}
       </button>
+      <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+        @for (item of medias; track item; let indexOfelement = $index) {
+          <button
+            ngbDropdownItem
+            class="list-element"
+            (click)="selectedMedia(indexOfelement)"
+            >
+            {{ dsoNameService.getName(item.bitstream) }}
+          </button>
+        }
+      </div>
     </div>
   </div>
-</div>
+}
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 6f962bfa8c..12d71bbca1 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,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -24,12 +21,10 @@ import { languageHelper } from './language-helper';
   templateUrl: './media-viewer-video.component.html',
   styleUrls: ['./media-viewer-video.component.scss'],
   imports: [
-    NgForOf,
     NgbDropdownModule,
     TranslateModule,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class MediaViewerVideoComponent {
diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
index a76ee73963..934687c4a0 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -1,27 +1,50 @@
 <ng-container *ngVar="mediaList$ | async as mediaList">
-  <ds-loading
-    *ngIf="isLoading"
-    message="{{ 'loading.default' | translate }}"
-    [showMessage]="false"
-  ></ds-loading>
-  <div class="media-viewer" *ngIf="!isLoading">
-    <ng-container *ngIf="mediaList.length > 0; else showThumbnail">
-      <ng-container *ngVar="mediaOptions.video && ['audio', 'video'].includes(mediaList[0]?.format) as showVideo">
-        <ng-container *ngVar="mediaOptions.image && mediaList[0]?.format === 'image' as showImage">
-          <ds-media-viewer-video *ngIf="showVideo" [medias]="mediaList" [captions]="captions$ | async"></ds-media-viewer-video>
-          <ds-media-viewer-image *ngIf="showImage" [images]="mediaList"></ds-media-viewer-image>
-          <ng-container *ngIf="showImage || showVideo; else showThumbnail"></ng-container>
-        </ng-container>
-      </ng-container>
-    </ng-container>
-  </div>
-  <ng-template #showThumbnail>
-    <ds-media-viewer-image *ngIf="mediaOptions.image && mediaOptions.video"
-      [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
-      [preview]="false"
-    ></ds-media-viewer-image>
-    <ds-thumbnail *ngIf="!(mediaOptions.image && mediaOptions.video)"
+  @if (isLoading) {
+    <ds-loading
+      message="{{ 'loading.default' | translate }}"
+      [showMessage]="false"
+    ></ds-loading>
+  }
+  @if (!isLoading) {
+    <div class="media-viewer">
+      @if (mediaList.length > 0) {
+        <ng-container *ngVar="mediaOptions.video && ['audio', 'video'].includes(mediaList[0]?.format) as showVideo">
+          <ng-container *ngVar="mediaOptions.image && mediaList[0]?.format === 'image' as showImage">
+            @if (showVideo) {
+              <ds-media-viewer-video [medias]="mediaList" [captions]="captions$ | async"></ds-media-viewer-video>
+            }
+            @if (showImage) {
+              <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
+            }
+            @if (showImage || showVideo) {
+            } @else {
+              @if (mediaOptions.image && mediaOptions.video) {
+                <ds-media-viewer-image
+                  [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
+                  [preview]="false"
+                ></ds-media-viewer-image>
+              }
+              @if (!(mediaOptions.image && mediaOptions.video)) {
+                <ds-thumbnail
                   [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
-    </ds-thumbnail>
-  </ng-template>
+                </ds-thumbnail>
+              }
+            }
+          </ng-container>
+        </ng-container>
+      } @else {
+        @if (mediaOptions.image && mediaOptions.video) {
+          <ds-media-viewer-image
+            [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
+            [preview]="false"
+          ></ds-media-viewer-image>
+        }
+        @if (!(mediaOptions.image && mediaOptions.video)) {
+          <ds-thumbnail
+            [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
+          </ds-thumbnail>
+        }
+      }
+    </div>
+  }
 </ng-container>
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 7513f5dada..46a9a862a2 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -49,12 +46,11 @@ import { ThemedMediaViewerVideoComponent } from './media-viewer-video/themed-med
     ThemedMediaViewerImageComponent,
     ThemedThumbnailComponent,
     AsyncPipe,
-    NgIf,
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class MediaViewerComponent implements OnDestroy, OnInit {
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.html b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
index fe8ede6cee..7f2d0c0aac 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.html
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
@@ -1,4 +1,8 @@
 <p class="full-text-op">{{'iiifviewer.fullscreen.notice' | translate}}</p>
-<p *ngIf="!isViewerAvailable" id="viewer-message">{{viewerMessage}}</p>
-<iframe title="Mirador Viewer" allowtransparency="true" *ngIf="isViewerAvailable" [src]="iframeViewerUrl | async" id="mirador-viewer"></iframe>
+@if (!isViewerAvailable) {
+  <p id="viewer-message">{{viewerMessage}}</p>
+}
+@if (isViewerAvailable) {
+  <iframe title="Mirador Viewer" allowtransparency="true" [src]="iframeViewerUrl | async" id="mirador-viewer"></iframe>
+}
 
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index 5ad17569be..73395eb84f 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -42,9 +38,8 @@ import { MiradorViewerService } from './mirador-viewer.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     TranslateModule,
-    AsyncPipe,
-    NgIf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class MiradorViewerComponent implements OnInit {
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 63b908fb83..c4ce598965 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -45,11 +41,9 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     AlertComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class OrcidAuthComponent implements OnInit, OnChanges {
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index 7e634fdeca..b2ed23af89 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  CommonModule,
-  isPlatformBrowser,
-} from '@angular/common';
+import { CommonModule, isPlatformBrowser } from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index e9d9ec035b..014f995ae0 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -1,53 +1,60 @@
 <div>
-  <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+  @if ((processing$ | async)) {
+    <ds-loading></ds-loading>
+  }
   <div class="container">
     <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-    <ds-alert *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0"
-              [type]="AlertTypeEnum.Info">
-      {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-    </ds-alert>
-    <ds-pagination *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0"
-                   [paginationOptions]="paginationOptions"
-                   [collectionSize]="(getList() | async)?.payload?.totalElements"
-                   [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
-
-      <div class="table-responsive">
-        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-          <thead>
-          <tr class="text-center align-middle">
-            <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
-            <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
-            <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let entry of (getList() | async)?.payload?.page" data-test="orcidQueueElementRow">
-            <td style="width: 15%" class="text-center align-middle">
-              <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
-                 class="fa-2x" aria-hidden="true"></i>
-            </td>
-            <td class="text-center align-middle">
-              {{ entry.description }}
-            </td>
-            <td style="width: 20%" class="text-center">
-              <div class="btn-group edit-field">
-                <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+    @if ((processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0) {
+      <ds-alert
+        [type]="AlertTypeEnum.Info">
+        {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+      </ds-alert>
+    }
+    @if ((processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0) {
+      <ds-pagination
+        [paginationOptions]="paginationOptions"
+        [collectionSize]="(getList() | async)?.payload?.totalElements"
+        [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
+        <div class="table-responsive">
+          <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+            <thead>
+              <tr class="text-center align-middle">
+                <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
+                <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
+                <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (entry of (getList() | async)?.payload?.page; track entry) {
+                <tr data-test="orcidQueueElementRow">
+                  <td style="width: 15%" class="text-center align-middle">
+                    <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
+                    class="fa-2x" aria-hidden="true"></i>
+                  </td>
+                  <td class="text-center align-middle">
+                    {{ entry.description }}
+                  </td>
+                  <td style="width: 20%" class="text-center">
+                    <div class="btn-group edit-field">
+                      <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
                         class="btn btn-outline-primary my-1 col-md" (click)="send(entry)">
-                  <span [ngClass]="getOperationClass(entry)"></span>
-                  <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
-                </button>
-                <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                        <span [ngClass]="getOperationClass(entry)"></span>
+                        <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
+                      </button>
+                      <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
                         class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
-                  <span class="fas fa-unlink"></span>
-                  <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
-                </button>
-              </div>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </ds-pagination>
+                        <span class="fas fa-unlink"></span>
+                        <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      </ds-pagination>
+    }
   </div>
 </div>
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 7c3f71785c..ec3ee5718e 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -50,9 +50,8 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
   imports: [
     AlertComponent,
     FormsModule,
-    TranslateModule,
-    NgForOf,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
index e496676847..c4fdd24d13 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
@@ -1,28 +1,32 @@
-<div *ngIf="uri && name" class="item-page-field">
-  <ds-metadata-field-wrapper [label]="'item.page.cc.license.title' | translate">
-    <div [ngClass]="{'row': variant === 'full', 'col': variant === 'small'}">
-
-      <!-- 'img' tag is not rendered if any errors occurs when loading it -->
-      <div *ngIf="showImage" [ngClass]="{'col-auto': variant === 'full', 'row': variant === 'small'}"
-        style="align-content: center;"
-      >
-        <a [href]="uri" target="_blank" class="link-anchor dont-break-out ds-simple-metadata-link">
-          <img (error)="showImage = false" [src]="imgSrc" [alt]="name" class="cc-image"
+@if (uri && name) {
+  <div class="item-page-field">
+    <ds-metadata-field-wrapper [label]="'item.page.cc.license.title' | translate">
+      <div [ngClass]="{'row': variant === 'full', 'col': variant === 'small'}">
+        <!-- 'img' tag is not rendered if any errors occurs when loading it -->
+        @if (showImage) {
+          <div [ngClass]="{'col-auto': variant === 'full', 'row': variant === 'small'}"
+            style="align-content: center;"
+            >
+            <a [href]="uri" target="_blank" class="link-anchor dont-break-out ds-simple-metadata-link">
+              <img (error)="showImage = false" [src]="imgSrc" [alt]="name" class="cc-image"
             [ngStyle]="{
               'width': 'var(--ds-thumbnail-max-width)',
               'margin-bottom': variant === 'small'? '1ch' : '0',
             }"
-          />
-        </a>
+                />
+            </a>
+          </div>
+        }
+        <!-- CC name is always displayed if the image fails to load -->
+        <div [ngClass]="{ 'row': variant === 'small', 'col': variant === 'full' }">
+          <span>
+            {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
+            @if (showName || !showImage) {
+              <a [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
+            }
+          </span>
+        </div>
       </div>
-
-      <!-- CC name is always displayed if the image fails to load -->
-      <div [ngClass]="{ 'row': variant === 'small', 'col': variant === 'full' }">
-        <span>
-          {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
-          <a *ngIf="showName || !showImage" [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
-        </span>
-      </div>
-    </div>
-  </ds-metadata-field-wrapper>
-</div>
+    </ds-metadata-field-wrapper>
+  </div>
+}
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
index e06d0c25b5..b8681eed50 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-  NgStyle,
-} from '@angular/common';
+import { NgClass, NgStyle } from '@angular/common';
 import {
   Component,
   Input,
@@ -16,7 +12,7 @@ import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wra
   selector: 'ds-item-page-cc-license-field',
   templateUrl: './item-page-cc-license-field.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
+  imports: [NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
 })
 /**
  * Displays the item's Creative Commons license image in it's simple item page
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 85975d4533..34b6682a25 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,8 @@
 <h1 class="item-page-title-field">
-  <div *ngIf="item.firstMetadataValue('dspace.entity.type') as type" class="d-inline">
-    {{ type.toLowerCase() + '.page.titleprefix' | translate }}
-  </div>
+  @if (item.firstMetadataValue('dspace.entity.type'); as type) {
+    <div class="d-inline">
+      {{ type.toLowerCase() + '.page.titleprefix' | translate }}
+    </div>
+  }
   <span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
 </h1>
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index 27d7fc585e..3655a864bf 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -12,7 +12,7 @@ import { Item } from '../../../../../core/shared/item.model';
   selector: 'ds-base-item-page-title-field',
   templateUrl: './item-page-title-field.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 912115c961..207fcdab5b 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -1,15 +1,25 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
-  <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
-      <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
-      <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
-      <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
-      <ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
-      <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
+  @if (itemRD?.hasSucceeded) {
+    <div class="item-page" @fadeInOut>
+      @if (itemRD?.payload; as item) {
+        <div>
+          <ds-item-alerts [item]="item"></ds-item-alerts>
+          <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
+          <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
+          <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
+          <ds-view-tracker [object]="item"></ds-view-tracker>
+          @if (!item.isWithdrawn || (isAdmin$|async)) {
+            <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
+          }
+          <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
+        </div>
+      }
     </div>
-  </div>
-  <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.item' | translate}}"></ds-error>
+  }
+  @if (itemRD?.isLoading) {
+    <ds-loading message="{{'loading.item' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index fb2db4ad05..ef8cc9fced 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformServer,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformServer } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -79,10 +75,9 @@ import { QaEventNotificationComponent } from './qa-event-notification/qa-event-n
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
     NotifyRequestsStatusComponent,
-    QaEventNotificationComponent,
-  ],
+    QaEventNotificationComponent
+],
 })
 export class ItemPageComponent implements OnInit, OnDestroy {
 
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 cfd4c818fc..b70aa7e0b9 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,13 +1,17 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
-<div class="row" *ngIf="iiifEnabled">
-  <div class="col-12">
-    <ds-mirador-viewer  id="iiif-viewer"
-                        [object]="object"
-                        [searchable]="iiifSearchEnabled"
-                        [query]="iiifQuery$ | async">
-    </ds-mirador-viewer>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
+@if (iiifEnabled) {
+  <div class="row">
+    <div class="col-12">
+      <ds-mirador-viewer  id="iiif-viewer"
+        [object]="object"
+        [searchable]="iiifSearchEnabled"
+        [query]="iiifQuery$ | async">
+      </ds-mirador-viewer>
+    </div>
   </div>
-</div>
+}
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
@@ -15,14 +19,16 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
-    </ng-container>
-    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
-      <ds-media-viewer [item]="object"></ds-media-viewer>
-    </div>
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      <div class="mb-2">
+        <ds-media-viewer [item]="object"></ds-media-viewer>
+      </div>
+    }
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index 2acb02377b..276d9d3534 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -39,7 +36,7 @@ import { ItemComponent } from '../shared/item.component';
   templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 export class PublicationComponent extends ItemComponent {
 
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 5d1b2c6715..c74be549a8 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,13 +1,17 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
-<div class="row" *ngIf="iiifEnabled">
-  <div class="col-12">
-    <ds-mirador-viewer id="iiif-viewer"
-                   [object]="object"
-                   [searchable]="iiifSearchEnabled"
-                   [query]="iiifQuery$ | async">
-    </ds-mirador-viewer>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
+@if (iiifEnabled) {
+  <div class="row">
+    <div class="col-12">
+      <ds-mirador-viewer id="iiif-viewer"
+        [object]="object"
+        [searchable]="iiifSearchEnabled"
+        [query]="iiifQuery$ | async">
+      </ds-mirador-viewer>
+    </div>
   </div>
-</div>
+}
 
 <div class="d-flex flex-row">
   <ds-item-page-title-field [item]="object" class="me-auto">
@@ -16,14 +20,16 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
-    </ng-container>
-    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
-      <ds-media-viewer [item]="object"></ds-media-viewer>
-    </div>
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      <div class="mb-2">
+        <ds-media-viewer [item]="object"></ds-media-viewer>
+      </div>
+    }
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index a9ef9b2ead..617b63a80a 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,7 +38,6 @@ import { ItemComponent } from '../shared/item.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     ThemedResultsBackButtonComponent,
     MiradorViewerComponent,
     ThemedItemPageTitleFieldComponent,
@@ -59,7 +55,7 @@ import { ItemComponent } from '../shared/item.component';
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    ItemPageCcLicenseFieldComponent,
-  ],
+    ItemPageCcLicenseFieldComponent
+],
 })
 export class UntypedItemComponent extends ItemComponent {}
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 d8e5cb0e53..f222fc42f6 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,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -33,7 +29,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   selector: 'ds-base-metadata-representation-list',
   templateUrl: './metadata-representation-list.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, VarDirective, MetadataRepresentationLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, VarDirective, MetadataRepresentationLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying metadata
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
index c68255f2ed..4dc04e79ad 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="(requestMap$ | async)?.size > 0">
-  <ng-container *ngFor="let entry of (requestMap$ | async) | keyvalue ">
+@if ((requestMap$ | async)?.size > 0) {
+  @for (entry of (requestMap$ | async) | keyvalue ; track entry) {
     <ds-request-status-alert-box [status]="entry.key" [data]="entry.value"></ds-request-status-alert-box>
-  </ng-container>
-</ng-container>
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
index 305e3cf8f7..aaa1fa5267 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  KeyValuePipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, KeyValuePipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -38,10 +33,8 @@ import { RequestStatusAlertBoxComponent } from '../request-status-alert-box/requ
   imports: [
     RequestStatusAlertBoxComponent,
     AsyncPipe,
-    KeyValuePipe,
-    NgForOf,
-    NgIf,
-  ],
+    KeyValuePipe
+],
 })
 
 /**
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
index f5b1f745f4..4171687cd1 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
@@ -1,23 +1,23 @@
-<ng-container *ngIf="data?.length > 0 && displayOptions">
+@if (data?.length > 0 && displayOptions) {
   <div [ngClass]="{'align-items-center': data.length === 1}"
     class="alert d-flex flex-row sections-gap {{displayOptions.alertType}}">
     <img
       class="source-logo"
       src="assets/images/qa-coar-notify-logo.png"
       alt="notify logo"
-    />
+      />
     <ds-truncatable [id]="status">
       <ds-truncatable-part [id]="status" [minLines]="1">
         <div class="w-100 d-flex flex-column">
-          <ng-container *ngFor="let request of data">
+          @for (request of data; track request) {
             <div [innerHTML]="displayOptions.text | translate: {
                   serviceName: request.serviceName,
                   serviceUrl: request.serviceUrl,
                   offerType: request.offerType
                 }"></div>
-          </ng-container>
+          }
         </div>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>
-</ng-container>
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
index e6059688fb..fb5d5fa3f5 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -23,13 +19,11 @@ import { RequestStatusEnum } from '../notify-status.enum';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     TruncatablePartComponent,
     TruncatableComponent,
-    NgForOf,
     TranslateModule,
-    NgClass,
-  ],
+    NgClass
+],
 })
 /**
  * Represents a component that displays the status of a request.
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
index a428f7feb4..783ea8accb 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,13 +32,11 @@ import { SplitPipe } from '../../../shared/utils/split.pipe';
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [QualityAssuranceSourceDataService],
   imports: [
-    NgIf,
-    NgForOf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
-    SplitPipe,
-  ],
+    SplitPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 3ce96b2ce3..147650b11a 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,28 +1,32 @@
-<ng-container *ngIf="relationTypes.length > 1">
+@if (relationTypes.length > 1) {
   <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
-      <a ngbNavLink role="tab">
-        {{'item.page.relationships.' + relationType.label | translate}}
-      </a>
-      <ng-template ngbNavContent>
-        <div class="mt-4">
-          <ds-related-entities-search [item]="item"
-                                      [relationType]="relationType.filter"
-                                      [configuration]="relationType.configuration"
-                                      [searchEnabled]="searchEnabled"
-                                      [sideBarWidth]="sideBarWidth">
-          </ds-related-entities-search>
-        </div>
-      </ng-template>
-    </li>
+    @for (relationType of relationTypes; track relationType) {
+      <li [ngbNavItem]="relationType.filter" role="presentation">
+        <a ngbNavLink role="tab">
+          {{'item.page.relationships.' + relationType.label | translate}}
+        </a>
+        <ng-template ngbNavContent>
+          <div class="mt-4">
+            <ds-related-entities-search [item]="item"
+              [relationType]="relationType.filter"
+              [configuration]="relationType.configuration"
+              [searchEnabled]="searchEnabled"
+              [sideBarWidth]="sideBarWidth">
+            </ds-related-entities-search>
+          </div>
+        </ng-template>
+      </li>
+    }
   </ul>
   <div [ngbNavOutlet]="tabs"></div>
-</ng-container>
-<div *ngIf="relationTypes.length === 1" class="mt-4">
-  <ds-related-entities-search *ngVar="relationTypes[0] as relationType" [item]="item"
-                              [relationType]="relationType.filter"
-                              [configuration]="relationType.configuration"
-                              [searchEnabled]="searchEnabled"
-                              [sideBarWidth]="sideBarWidth">
-  </ds-related-entities-search>
-</div>
+}
+@if (relationTypes.length === 1) {
+  <div class="mt-4">
+    <ds-related-entities-search *ngVar="relationTypes[0] as relationType" [item]="item"
+      [relationType]="relationType.filter"
+      [configuration]="relationType.configuration"
+      [searchEnabled]="searchEnabled"
+      [sideBarWidth]="sideBarWidth">
+    </ds-related-entities-search>
+  </div>
+}
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
index fc27a9a1e4..b41f00e104 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -25,7 +21,7 @@ import { RelatedEntitiesSearchComponent } from '../related-entities-search/relat
   selector: 'ds-tabbed-related-entities-search',
   templateUrl: './tabbed-related-entities-search.component.html',
   standalone: true,
-  imports: [NgIf, NgbNavModule, NgFor, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
 })
 /**
  * A component to show related items as search results, split into tabs by relationship-type
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 434093ba2a..3b4f2de61e 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -38,7 +32,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   styleUrls: ['./related-items.component.scss'],
   templateUrl: './related-items.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgClass, NgFor, VarDirective, ListableObjectComponentLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, NgClass, VarDirective, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying relations between items
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index e142f7854c..760d5f4d96 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -67,9 +63,8 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     RouterLink,
     TranslateModule,
     NgClass,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
 })
diff --git a/src/app/item-page/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
index 8d21501b49..45d0878586 100644
--- a/src/app/item-page/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,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,7 +18,7 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
   templateUrl: './item-versions-summary-modal.component.html',
   styleUrls: ['./item-versions-summary-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 90d70b90d3..7c93cdc414 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe, NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -82,12 +76,10 @@ interface VersionDTO {
     FormsModule,
     ItemVersionsRowElementVersionComponent,
     NgClass,
-    NgFor,
-    NgIf,
     PaginationComponent,
     TranslateModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
 })
 
 /**
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
index 90502c5df7..1ceaf16d41 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.html
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.html
@@ -1,5 +1,7 @@
-<ds-alert *ngIf="(showLatestVersionNotice$ | async) === true"
-          [content]="('item.version.notice' | translate:{ destination: getItemPage(((latestVersion$ | async)?.item | async)?.payload) })"
-          [dismissible]="false"
-          [type]="AlertTypeEnum.Warning">
-</ds-alert>
+@if ((showLatestVersionNotice$ | async) === true) {
+  <ds-alert
+    [content]="('item.version.notice' | translate:{ destination: getItemPage(((latestVersion$ | async)?.item | async)?.payload) })"
+    [dismissible]="false"
+    [type]="AlertTypeEnum.Warning">
+  </ds-alert>
+}
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index c136d3f06f..adbc41b511 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   selector: 'ds-item-versions-notice',
   templateUrl: './item-versions-notice.component.html',
   standalone: true,
-  imports: [NgIf, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [AlertComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for displaying a warning notice when the item is not the latest version within its version history
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index e9787e8645..2d39ef241d 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -191,7 +191,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index cf242670b3..77f8fdf7ba 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -45,9 +42,8 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 9e50556fe3..3da919a009 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -196,7 +196,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index f06df3082e..8beef0f99e 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -47,9 +44,8 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
index d0052b9355..6cdc1c0722 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
@@ -1,10 +1,12 @@
 <div class="parent mb-3">
   <div class="upload">
-    <ds-uploader *ngIf="uploadFilesOptions.url !== ''"
-                 [uploadFilesOptions]="uploadFilesOptions"
-                 (onCompleteItem)="onCompleteItem($event)"
-                 (onUploadError)="onUploadError($event)"
-                 (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
+    @if (uploadFilesOptions.url !== '') {
+      <ds-uploader
+        [uploadFilesOptions]="uploadFilesOptions"
+        (onCompleteItem)="onCompleteItem($event)"
+        (onUploadError)="onUploadError($event)"
+      (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
+    }
 
   </div>
   <div class="add">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index cf7cb7ab72..bdfd28fe0a 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -37,9 +37,8 @@ import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submissi
   imports: [
     MyDSpaceNewExternalDropdownComponent,
     MyDSpaceNewSubmissionDropdownComponent,
-    UploaderComponent,
-    NgIf,
-  ],
+    UploaderComponent
+],
   standalone: true,
 })
 export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index 9e5cadc12b..564946edcd 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -4,9 +4,11 @@
   <ds-my-dspace-new-submission *dsShowOnlyForRole="[roleTypeEnum.Submitter]"></ds-my-dspace-new-submission>
 </div>
 
-<ds-search *ngIf="configuration && context"
-           [configuration]="configuration"
-           [configurationList]="(configurationList$ | async)"
-           [context]="context"
-           [viewModeList]="viewModeList"
-></ds-search>
+@if (configuration && context) {
+  <ds-search
+    [configuration]="configuration"
+    [configurationList]="(configurationList$ | async)"
+    [context]="context"
+    [viewModeList]="viewModeList"
+  ></ds-search>
+}
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 0607b27fef..832c19a40c 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -49,10 +46,9 @@ export const MYDSPACE_ROUTE = '/mydspace';
     MyDSpaceNewSubmissionComponent,
     AsyncPipe,
     RoleDirective,
-    NgIf,
     SuggestionsNotificationComponent,
-    MyDspaceQaEventsNotificationsComponent,
-  ],
+    MyDspaceQaEventsNotificationsComponent
+],
   standalone: true,
 })
 export class MyDSpacePageComponent implements OnInit {
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
index 9da65fb2e6..f9da5035b2 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -32,11 +28,9 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     AsyncPipe,
-    NgForOf,
     TranslateModule,
-    RouterLink,
-    NgIf,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class MyDspaceQaEventsNotificationsComponent  implements OnInit {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 0af5c706b7..116e3a4a4e 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,37 +1,41 @@
 <div class="ds-menu-item-wrapper text-md-center"
-     [id]="'expandable-navbar-section-' + section.id"
-     (mouseenter)="onMouseEnter($event)"
-     (mouseleave)="onMouseLeave($event)"
-     data-test="navbar-section-wrapper">
+  [id]="'expandable-navbar-section-' + section.id"
+  (mouseenter)="onMouseEnter($event)"
+  (mouseleave)="onMouseLeave($event)"
+  data-test="navbar-section-wrapper">
   <a href="javascript:void(0);" routerLinkActive="active"
-     role="menuitem"
-     (keyup.enter)="toggleSection($event)"
-     (keyup.space)="toggleSection($event)"
-     (click)="toggleSection($event)"
-     (keydown)="keyDown($event)"
-     aria-haspopup="menu"
-     data-test="navbar-section-toggler"
-     [attr.aria-expanded]="(active$ | async).valueOf()"
-     [attr.aria-controls]="expandableNavbarSectionId()"
-     class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
-     [class.disabled]="section.model?.disabled">
-      <span class="flex-fill">
-        <ng-container
-          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-      </span>
+    role="menuitem"
+    (keyup.enter)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    (click)="toggleSection($event)"
+    (keydown)="keyDown($event)"
+    aria-haspopup="menu"
+    data-test="navbar-section-toggler"
+    [attr.aria-expanded]="(active$ | async).valueOf()"
+    [attr.aria-controls]="expandableNavbarSectionId()"
+    class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+    [class.disabled]="section.model?.disabled">
+    <span class="flex-fill">
+      <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+    </span>
     <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
   </a>
-  <div *ngIf="(active$ | async).valueOf() === true" (click)="deactivateSection($event)"
-       [id]="expandableNavbarSectionId()"
-       [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
-       (dsHoverOutside)="deactivateSection($event, false)"
-       role="menu"
-       class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-    <div @slide role="presentation">
-      <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
-        <ng-container
-          *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+  @if ((active$ | async).valueOf() === true) {
+    <div (click)="deactivateSection($event)"
+      [id]="expandableNavbarSectionId()"
+      [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
+      (dsHoverOutside)="deactivateSection($event, false)"
+      role="menu"
+      class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+      <div @slide role="presentation">
+        @for (subSection of (subSections$ | async); track subSection) {
+          <div class="text-nowrap" role="presentation">
+            <ng-container
+            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+        }
       </div>
     </div>
-  </div>
+  }
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index dc3db79aca..0a350f890b 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgComponentOutlet,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgComponentOutlet } from '@angular/common';
 import {
   AfterViewChecked,
   Component,
@@ -38,10 +33,8 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
     AsyncPipe,
     HoverOutsideDirective,
     NgComponentOutlet,
-    NgFor,
-    NgIf,
-    RouterLinkActive,
-  ],
+    RouterLinkActive
+],
 })
 export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
 
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 8b922439cf..b8afb46e89 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgComponentOutlet,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   Injector,
@@ -43,7 +37,7 @@ import { ThemeService } from '../shared/theme-support/theme.service';
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
index 058457fd40..2955a44998 100644
--- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
@@ -1,10 +1,12 @@
-<ng-container *ngIf="ePersonId">
-  <ng-container *ngIf="getEPersonData$() | async as ePersonData">
-    <ng-container *ngFor="let property of properties">
-      <span *ngIf="ePersonData[property]">
-        {{ ePersonData[property] }}
-      </span>
+@if (ePersonId) {
+  @if (getEPersonData$() | async; as ePersonData) {
+    @for (property of properties; track property) {
+      @if (ePersonData[property]) {
+        <span>
+          {{ ePersonData[property] }}
+        </span>
+      }
       <br>
-    </ng-container>
-  </ng-container>
-</ng-container>
+      }
+    }
+  }
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
index 7fe17040e8..0c070deb3b 100644
--- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,10 +17,8 @@ import {
   templateUrl: './ePerson-data.component.html',
   standalone: true,
   imports: [
-    NgIf,
-    NgFor,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   styleUrls: ['./ePerson-data.component.scss'],
 })
 /**
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
index 0d96e7e065..bcefd317c8 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -351,7 +351,7 @@ describe('QualityAssuranceEventsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 23fc73345d..6adaf9dea9 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -87,7 +83,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 4b9bbe64f3..36ac863cf4 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -1,7 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
   <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
-          (click)="close()">
+    (click)="close()">
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
@@ -14,16 +14,18 @@
       </a>
     </div>
   </div>
-  <div *ngIf="externalSourceEntry.projectTitle">
-    <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
-    <div class="mb-3">
-      <div class="text-truncate">
-        <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
-          {{externalSourceEntry.projectTitle}}
-        </a>
+  @if (externalSourceEntry.projectTitle) {
+    <div>
+      <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
+      <div class="mb-3">
+        <div class="text-truncate">
+          <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
+            {{externalSourceEntry.projectTitle}}
+          </a>
+        </div>
       </div>
     </div>
-  </div>
+  }
 
   <h4>{{ (labelPrefix + label + '.select' | translate) }}</h4>
 
@@ -37,27 +39,33 @@
       </div>
     </div>
 
-    <ds-loading *ngIf="(isLoading$ | async)" message="{{'loading.search-results' | translate}}"></ds-loading>
-    <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true"
-                              [searchResults]="(localEntitiesRD$ | async)"
-                              [sortConfig]="this.searchOptions?.sort"
-                              [searchConfig]="this.searchOptions"
-                              [selectable]="true"
-                              [disableHeader]="true"
-                              [hidePaginationDetail]="false"
-                              [selectionConfig]="{ repeatable: false, listId: entityListId }"
-                              [showCsvExport]="false"
-                              [linkType]="linkTypes.ExternalLink"
-                              [context]="context"
-                              (deselectObject)="deselectEntity()"
-                              (selectObject)="selectEntity($event)">
-    </ds-search-results>
+    @if ((isLoading$ | async)) {
+      <ds-loading message="{{'loading.search-results' | translate}}"></ds-loading>
+    }
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true) {
+      <ds-search-results
+        [searchResults]="(localEntitiesRD$ | async)"
+        [sortConfig]="this.searchOptions?.sort"
+        [searchConfig]="this.searchOptions"
+        [selectable]="true"
+        [disableHeader]="true"
+        [hidePaginationDetail]="false"
+        [selectionConfig]="{ repeatable: false, listId: entityListId }"
+        [showCsvExport]="false"
+        [linkType]="linkTypes.ExternalLink"
+        [context]="context"
+        (deselectObject)="deselectEntity()"
+        (selectObject)="selectEntity($event)">
+      </ds-search-results>
+    }
 
-    <div *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true">
-      <ds-alert [type]="'alert-info'">
-        <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
-      </ds-alert>
-    </div>
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true) {
+      <div>
+        <ds-alert [type]="'alert-info'">
+          <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
+        </ds-alert>
+      </div>
+    }
 
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
index fb331fafa4..bc0fb62326 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -231,7 +231,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   eventData = eventData;
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4954a32747..63e9848020 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -106,7 +103,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [RouterLink, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
index 36309fd937..e9c0133725 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -167,7 +167,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index 44a748d1a0..db2d92164e 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -40,7 +35,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-source.component.html',
   styleUrls: ['./quality-assurance-source.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceSourceComponent implements OnDestroy, OnInit, AfterViewInit {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
index c764128e46..38792eb632 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -175,7 +175,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 176dba95ac..3792e95f85 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -54,7 +49,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-topics.component.html',
   styleUrls: ['./quality-assurance-topics.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit {
   /**
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 0362e50f4c..482cedd3a8 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -30,10 +30,9 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
   imports: [
     EntityDropdownComponent,
     TranslateModule,
-    NgIf,
     NgbDropdownModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class SuggestionActionsComponent {
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
index e23c244eb4..a343f5dc7e 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
@@ -1,20 +1,24 @@
 <div>
-  <div class="table-responsive" *ngIf="evidences">
-    <table class="table">
-      <thead>
-        <tr>
-          <th>{{'suggestion.evidence.score' | translate}}</th>
-          <th>{{'suggestion.evidence.type' | translate}}</th>
-          <th>{{'suggestion.evidence.notes' | translate}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let evidence of evidences | dsObjectKeys">
-          <td>{{evidences[evidence].score}}</td>
-          <td>{{evidence | translate}}</td>
-          <td>{{evidences[evidence].notes}}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+  @if (evidences) {
+    <div class="table-responsive">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>{{'suggestion.evidence.score' | translate}}</th>
+            <th>{{'suggestion.evidence.type' | translate}}</th>
+            <th>{{'suggestion.evidence.notes' | translate}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (evidence of evidences | dsObjectKeys; track evidence) {
+            <tr>
+              <td>{{evidences[evidence].score}}</td>
+              <td>{{evidence | translate}}</td>
+              <td>{{evidences[evidence].notes}}</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
 </div>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
index e07a1dce75..4dc8874886 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,10 +19,8 @@ import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
   animations: [fadeIn],
   imports: [
     TranslateModule,
-    NgIf,
-    NgFor,
-    ObjectKeysPipe,
-  ],
+    ObjectKeysPipe
+],
   standalone: true,
 })
 export class SuggestionEvidencesComponent {
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
index ef27876f2c..63fda69813 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
@@ -4,8 +4,8 @@
     <div class="col-1 text-center align-self-center">
       <div class="">
         <input type="checkbox" class="form-check-input"
-               [checked]="isSelected" (change)="changeSelected($event)"
-               [attr.aria-label]="object.display"/>
+          [checked]="isSelected" (change)="changeSelected($event)"
+          [attr.aria-label]="object.display"/>
       </div>
     </div>
     <!-- Total Score Panel -->
@@ -17,29 +17,31 @@
     </div>
     <!-- Suggestion Panel -->
     <div class="col">
-        <!-- Object Preview -->
-        <ds-item-search-result-list-element
-          [showLabel]="false"
-          [showThumbnails]="false"
-          [object]="listableObject"
-          [linkType]="0"
-        ></ds-item-search-result-list-element>
-        <!-- Actions -->
+      <!-- Object Preview -->
+      <ds-item-search-result-list-element
+        [showLabel]="false"
+        [showThumbnails]="false"
+        [object]="listableObject"
+        [linkType]="0"
+      ></ds-item-search-result-list-element>
+      <!-- Actions -->
       <ds-suggestion-actions class="parent mt-2" [hasEvidence]="hasEvidences()"
-                             [seeEvidence]="seeEvidence"
-                             [object]="object"
-                             [isCollectionFixed]="isCollectionFixed"
-                             (approveAndImport)="onApproveAndImport($event)"
-                             (seeEvidences)="onSeeEvidences($event)"
-                             (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
+        [seeEvidence]="seeEvidence"
+        [object]="object"
+        [isCollectionFixed]="isCollectionFixed"
+        (approveAndImport)="onApproveAndImport($event)"
+        (seeEvidences)="onSeeEvidences($event)"
+        (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
       ></ds-suggestion-actions>
     </div>
   </div>
   <!-- Evidences Panel -->
-  <div *ngIf="seeEvidence" class="mt-2 row">
-    <div class="col offset-3">
-      <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+  @if (seeEvidence) {
+    <div class="mt-2 row">
+      <div class="col offset-3">
+        <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+      </div>
     </div>
-  </div>
+  }
 </div>
 <hr>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
index 99a22f89ea..7e0c0b4db9 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -26,12 +26,11 @@ import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-
   templateUrl: './suggestion-list-element.component.html',
   animations: [fadeIn],
   imports: [
-    NgIf,
     TranslateModule,
     ItemSearchResultListElementComponent,
     SuggestionActionsComponent,
-    SuggestionEvidencesComponent,
-  ],
+    SuggestionEvidencesComponent
+],
   standalone: true,
 })
 export class SuggestionListElementComponent implements OnInit {
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
index 2b2a668916..25c1268dc5 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
@@ -3,49 +3,60 @@
     <div class="col-12">
       <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1>
 
-      <ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading>
-      <ds-pagination *ngIf="(isTargetsLoading() | async) !== true"
-                     [paginationOptions]="paginationConfig"
-                     [collectionSize]="(totalElements$ | async)"
-                     [hideGear]="false"
-                     [retainScrollPosition]="false"
-                     (paginationChange)="getSuggestionTargets()">
-
-        <ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
-        <ng-container *ngIf="(isTargetsProcessing() | async) !== true">
-          <div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'suggestion.noTargets' | translate}}
-          </div>
-          <div *ngIf="(targets$|async)?.length !== 0" class="table-responsive mt-2">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-                <tr class="text-center">
-                  <th scope="col">{{'suggestion.table.name' | translate}}</th>
-                  <th scope="col">{{'suggestion.table.actions' | translate}}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let targetElement of (targets$ | async); let i = index" class="text-center">
-                  <td>
-                    <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
-                  </td>
-                  <td>
-                    <div class="btn-group edit-field">
-                      <button (click)="redirectToSuggestions(targetElement.id)"
+      @if ((isTargetsLoading() | async)) {
+        <ds-loading class="container" message="{{'suggestion.loading' | translate}}"></ds-loading>
+      }
+      @if ((isTargetsLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [retainScrollPosition]="false"
+          (paginationChange)="getSuggestionTargets()">
+          @if ((isTargetsProcessing() | async)) {
+            <ds-loading class="container" message="'suggestion.loading' | translate"></ds-loading>
+          }
+          @if ((isTargetsProcessing() | async) !== true) {
+            @if ((targets$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'suggestion.noTargets' | translate}}
+              </div>
+            }
+            @if ((targets$|async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr class="text-center">
+                      <th scope="col">{{'suggestion.table.name' | translate}}</th>
+                      <th scope="col">{{'suggestion.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (targetElement of (targets$ | async); track targetElement; let i = $index) {
+                      <tr class="text-center">
+                        <td>
+                          <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
+                        </td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button (click)="redirectToSuggestions(targetElement.id)"
                               class="btn btn-outline-primary btn-sm"
                               title="{{('suggestion.button.review.title' | translate: { total: targetElement.total.toString() }) +
                                 targetElement.display}}">
-                        <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
-                        <i class="fas fa-lightbulb"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+                              <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
+                              <i class="fas fa-lightbulb"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 8654890138..7d8cd087ba 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -46,10 +42,8 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
     AsyncPipe,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgFor,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class PublicationClaimComponent implements AfterViewInit, OnDestroy, OnInit {
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
index 838bdb95ad..476cbe5109 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.html
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
@@ -1,9 +1,13 @@
-<ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
-  <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
-    <div class="alert alert-success d-block" *ngIf="suggestion.total > 0">
-      <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
-      {{ 'notification.suggestion.please' | translate }}
-      <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
-    </div>
-  </ng-container>
-</ng-container>
+@if ((suggestionsRD$ | async); as suggestions) {
+  @for (suggestion of suggestions; track suggestion) {
+    <ng-container class="alert alert-info">
+      @if (suggestion.total > 0) {
+        <div class="alert alert-success d-block">
+          <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+          {{ 'notification.suggestion.please' | translate }}
+          <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+        </div>
+      }
+    </ng-container>
+  }
+}
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
index 568cafb9de..ac3bc202b9 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -25,10 +21,8 @@ import { SuggestionsService } from '../suggestions.service';
   imports: [
     RouterLink,
     TranslateModule,
-    AsyncPipe,
-    NgIf,
-    NgForOf,
-  ],
+    AsyncPipe
+],
   styleUrls: ['./suggestions-notification.component.scss'],
 })
 export class SuggestionsNotificationComponent implements OnInit {
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
index d2256c789d..c2b15c75e3 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
@@ -1,9 +1,5 @@
 import { trigger } from '@angular/animations';
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -44,10 +40,8 @@ import { SuggestionsService } from '../suggestions.service';
   imports: [
     AsyncPipe,
     TranslateModule,
-    RouterLink,
-    NgIf,
-    NgForOf,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class SuggestionsPopupComponent implements OnInit, OnDestroy {
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index 957df17b69..010f1a6522 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  isPlatformBrowser,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, DatePipe, isPlatformBrowser } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
   Component,
@@ -76,7 +70,7 @@ import { ProcessDetailFieldComponent } from './process-detail-field/process-deta
   selector: 'ds-process-detail',
   templateUrl: './process-detail.component.html',
   standalone: true,
-  imports: [NgIf, ProcessDetailFieldComponent, NgFor, VarDirective, ThemedFileDownloadLinkComponent, ThemedLoadingComponent, RouterLink, AsyncPipe, DatePipe, FileSizePipe, TranslateModule, HasNoValuePipe],
+  imports: [ProcessDetailFieldComponent, VarDirective, ThemedFileDownloadLinkComponent, ThemedLoadingComponent, RouterLink, AsyncPipe, DatePipe, FileSizePipe, TranslateModule, HasNoValuePipe],
 })
 /**
  * A component displaying detailed information about a DSpace Process
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
index b85c1cd0bf..65c1f20a8c 100644
--- a/src/app/process-page/form/process-form.component.ts
+++ b/src/app/process-page/form/process-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -43,7 +40,7 @@ import { ScriptsSelectComponent } from './scripts-select/scripts-select.componen
   templateUrl: './process-form.component.html',
   styleUrls: ['./process-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ScriptsSelectComponent, ProcessParametersComponent, RouterLink, ScriptHelpComponent, NgIf, NgFor, TranslateModule],
+  imports: [FormsModule, ScriptsSelectComponent, ProcessParametersComponent, RouterLink, ScriptHelpComponent, TranslateModule],
 })
 export class ProcessFormComponent implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
index cbb4abfae3..73cb655267 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +31,7 @@ import { ParameterValueInputComponent } from '../parameter-value-input/parameter
     deps: [[new Optional(), NgForm]],
   }],
   standalone: true,
-  imports: [FormsModule, NgFor, ParameterValueInputComponent, NgIf, TranslateModule],
+  imports: [FormsModule, ParameterValueInputComponent, TranslateModule],
 })
 export class ParameterSelectComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
index 4e77f4ed1b..59876136fe 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -1,7 +1,11 @@
 <input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
-<div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error mb-0">
-    <div *ngIf="string.errors.required">
+@if (string.invalid && (string.dirty || string.touched)) {
+  <div
+    class="alert alert-danger validation-error mb-0">
+    @if (string.errors.required) {
+      <div>
         {{'process.new.parameter.string.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index 74ee21471c..f87fdeab55 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FormsModule, NgIf, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 export class DateValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
index 7e64382ba2..6cf098f983 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Optional,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FileValueAccessorDirective, FormsModule, FileValidator, NgIf, TranslateModule],
+  imports: [FileValueAccessorDirective, FormsModule, FileValidator, TranslateModule],
 })
 export class FileValueInputComponent extends ValueInputComponent<File> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
index 57bd4ee7e5..aa2425562e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
@@ -1,7 +1,19 @@
-<div [ngSwitch]="parameter?.type">
-  <ds-string-value-input *ngSwitchCase="parameterTypes.STRING" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
-  <ds-string-value-input *ngSwitchCase="parameterTypes.OUTPUT" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
-  <ds-date-value-input *ngSwitchCase="parameterTypes.DATE" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
-  <ds-file-value-input *ngSwitchCase="parameterTypes.FILE" (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
-  <ds-boolean-value-input *ngSwitchCase="parameterTypes.BOOLEAN" (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+<div>
+  @switch (parameter?.type) {
+    @case (parameterTypes.STRING) {
+      <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+    }
+    @case (parameterTypes.OUTPUT) {
+      <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+    }
+    @case (parameterTypes.DATE) {
+      <ds-date-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
+    }
+    @case (parameterTypes.FILE) {
+      <ds-file-value-input (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
+    }
+    @case (parameterTypes.BOOLEAN) {
+      <ds-boolean-value-input (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+    }
+  }
 </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
index 0a65011105..45d069c9ba 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +30,7 @@ import { StringValueInputComponent } from './string-value-input/string-value-inp
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgSwitch, NgSwitchCase, StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent],
+  imports: [StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent],
 })
 export class ParameterValueInputComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
index bf60f9f024..fc6fab9c0d 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -1,7 +1,11 @@
 <input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
-<div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error mb-0">
-    <div *ngIf="string.errors.required">
+@if (string.invalid && (string.dirty || string.touched)) {
+  <div
+    class="alert alert-danger validation-error mb-0">
+    @if (string.errors.required) {
+      <div>
         {{'process.new.parameter.string.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index d7fa528544..1e718379eb 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FormsModule, NgIf, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 export class StringValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index ac174e338b..81d260577b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -38,7 +35,7 @@ import { ParameterSelectComponent } from './parameter-select/parameter-select.co
     deps: [[new Optional(), NgForm]],
   }],
   standalone: true,
-  imports: [NgIf, NgFor, ParameterSelectComponent, TranslateModule],
+  imports: [ParameterSelectComponent, TranslateModule],
 })
 export class ProcessParametersComponent implements OnChanges, OnInit {
   /**
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
index 7615edcfd4..1412138a9c 100644
--- a/src/app/process-page/form/script-help/script-help.component.html
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -3,20 +3,30 @@
   <span>{{script?.description}}</span>
 
   <table class="table-borderless mt-3">
-    <tr *ngFor="let param of script?.parameters">
-      <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
-        <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
-      </td>
-      <td>{{param.description}}</td>
-    </tr>
+    @for (param of script?.parameters; track param) {
+      <tr>
+        <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
+          <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
+        </td>
+        <td>{{param.description}}</td>
+      </tr>
+    }
   </table>
 </div>
 
 <ng-template #type let-type="type">
-    <ng-container [ngSwitch]="type">
-        <span *ngSwitchCase="parameterTypes.DATE"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.STRING"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.OUTPUT"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.FILE"><{{'process.new.parameter.type.file' | translate}}></span>
-    </ng-container>
+  @switch (type) {
+    @case (parameterTypes.DATE) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.STRING) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.OUTPUT) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.FILE) {
+      <span><{{'process.new.parameter.type.file' | translate}}></span>
+    }
+  }
 </ng-template>
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
index d06bf13f32..81bd9d710b 100644
--- a/src/app/process-page/form/script-help/script-help.component.ts
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -1,9 +1,4 @@
-import {
-  NgFor,
-  NgSwitch,
-  NgSwitchCase,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +16,7 @@ import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
   templateUrl: './script-help.component.html',
   styleUrls: ['./script-help.component.scss'],
   standalone: true,
-  imports: [NgFor, NgTemplateOutlet, NgSwitch, NgSwitchCase, TranslateModule],
+  imports: [NgTemplateOutlet, TranslateModule],
 })
 export class ScriptHelpComponent {
   /**
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 9eccb7ceff..9216a8cfc2 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -58,7 +54,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule, InfiniteScrollModule, ThemedLoadingComponent, NgbDropdownModule],
+  imports: [FormsModule, AsyncPipe, TranslateModule, InfiniteScrollModule, ThemedLoadingComponent, NgbDropdownModule],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
index 6e86952638..91ecd4a75b 100644
--- a/src/app/process-page/new/new-process.component.html
+++ b/src/app/process-page/new/new-process.component.html
@@ -1,6 +1,5 @@
-<ng-container *ngIf="fromExisting$ | async | dsHasValue; else newProcess">
-    <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
-</ng-container>
-<ng-template #newProcess>
-    <ds-process-form headerKey="process.new.header"></ds-process-form>
-</ng-template>
+@if (fromExisting$ | async | dsHasValue) {
+  <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
+} @else {
+  <ds-process-form headerKey="process.new.header"></ds-process-form>
+}
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
index 12a7ea682e..bed8ddbd6c 100644
--- a/src/app/process-page/new/new-process.component.ts
+++ b/src/app/process-page/new/new-process.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,7 @@ import { Script } from '../scripts/script.model';
   templateUrl: './new-process.component.html',
   styleUrls: ['./new-process.component.scss'],
   standalone: true,
-  imports: [NgIf, VarDirective, ProcessFormComponent, AsyncPipe, HasValuePipe],
+  imports: [VarDirective, ProcessFormComponent, AsyncPipe, HasValuePipe],
 })
 export class NewProcessComponent implements OnInit {
   /**
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 47efe888bf..f8c0c4cd52 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  DatePipe,
-  NgFor,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, DatePipe, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -32,7 +26,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, BtnDisabledDirective],
+  imports: [RouterLink, PaginationComponent, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, BtnDisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts
index 492b44af1f..bde235eea7 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.ts
+++ b/src/app/process-page/overview/table/process-overview-table.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -91,11 +85,9 @@ export interface ProcessOverviewTableEntry {
     TranslateModule,
     PaginationComponent,
     RouterLink,
-    NgForOf,
-    NgIf,
     ThemedLoadingComponent,
-    VarDirective,
-  ],
+    VarDirective
+],
 })
 export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 7730b1e4dd..f2d9529469 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -42,9 +39,8 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
     TranslateModule,
-    NgForOf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
index b9142fa2c6..669748e190 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
@@ -1,7 +1,9 @@
-<ds-form *ngIf="formModel"
-         [formId]="'profile-page-metadata-form-id'"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [displaySubmit]="false"
-         [displayCancel]="false">
-</ds-form>
+@if (formModel) {
+  <ds-form
+    [formId]="'profile-page-metadata-form-id'"
+    [formModel]="formModel"
+    [formGroup]="formGroup"
+    [displaySubmit]="false"
+    [displayCancel]="false">
+  </ds-form>
+}
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index b1529fdb57..800822a916 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -34,9 +34,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   selector: 'ds-base-profile-page-metadata-form',
   templateUrl: './profile-page-metadata-form.component.html',
   imports: [
-    FormComponent,
-    NgIf,
-  ],
+    FormComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index 5d09097e6b..808d2e40de 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -49,13 +46,12 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
   selector: 'ds-profile-page-researcher-form',
   templateUrl: './profile-page-researcher-form.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     TranslateModule,
     UiSwitchModule,
     VarDirective,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 0f944e0016..228a85bdf4 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -1,10 +1,16 @@
 <ds-alert class="mb-4" [type]="'alert-info'">{{FORM_PREFIX + 'info' | translate}}</ds-alert>
-<ds-form *ngIf="formModel"
-         [formId]="FORM_PREFIX"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [displaySubmit]="false"
-         [displayCancel]="false">
-</ds-form>
-<div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
-<div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
+@if (formModel) {
+  <ds-form
+    [formId]="FORM_PREFIX"
+    [formModel]="formModel"
+    [formGroup]="formGroup"
+    [displaySubmit]="false"
+    [displayCancel]="false">
+  </ds-form>
+}
+@if (formGroup.hasError('notSame')) {
+  <div id="notSame" class="container-fluid text-danger">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
+}
+@if ((formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')) {
+  <div id="emptyPassword" class="container-fluid text-danger">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
+}
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 0fdee2080b..d17c5adc16 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,11 +34,10 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   selector: 'ds-profile-page-security-form',
   templateUrl: './profile-page-security-form.component.html',
   imports: [
-    NgIf,
     FormComponent,
     AlertComponent,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index f3f7a4e7f1..6a63215981 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -69,14 +64,12 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     TranslateModule,
     ProfilePageResearcherFormComponent,
     VarDirective,
-    NgIf,
-    NgForOf,
     SuggestionsNotificationComponent,
     NgTemplateOutlet,
     PaginationComponent,
     ThemedLoadingComponent,
-    ErrorComponent,
-  ],
+    ErrorComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index a2c8957a9f..ca9a0e8ded 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -67,7 +64,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 43ee0c8cd3..b9bfb3b9b1 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -57,12 +53,10 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   imports: [
     ProfilePageSecurityFormComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
     ReactiveFormsModule,
-    NgForOf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class CreateProfileComponent implements OnInit {
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
index b00bc079dd..8fa823d455 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
@@ -1,9 +1,12 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'deny-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <p>{{'deny-request-copy.intro' | translate}}</p>
-
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      <p>{{'deny-request-copy.intro' | translate}}</p>
+      <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
+    </div>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index 7d87755f9e..745516ea66 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -48,7 +45,7 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   styleUrls: ['./deny-request-copy.component.scss'],
   templateUrl: './deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for denying an item request
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index 34adfff97d..537027fb7e 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,8 +1,4 @@
-import {
-  Location,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { Location, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,7 +17,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, NgClass, TranslateModule, BtnDisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
index 37b275d8f8..2b15f577f8 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
@@ -1,30 +1,36 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'grant-deny-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <div *ngIf="!itemRequestRD.payload.decisionDate">
-      <p [innerHTML]="'grant-deny-request-copy.intro1' | translate:{ url: (itemUrl$ | async), name: (itemName$ | async) }"></p>
-      <p>{{'grant-deny-request-copy.intro2' | translate}}</p>
-
-      <div class="btn-group ">
-        <a [routerLink]="grantRoute$ | async"
-           class="btn btn-outline-primary"
-           title="{{'grant-deny-request-copy.grant' | translate }}">
-          {{'grant-deny-request-copy.grant' | translate }}
-        </a>
-
-        <a [routerLink]="denyRoute$ | async"
-           class="btn btn-outline-danger"
-           title="{{'grant-deny-request-copy.deny' | translate }}">
-          {{'grant-deny-request-copy.deny' | translate }}
-        </a>
-      </div>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      @if (!itemRequestRD.payload.decisionDate) {
+        <div>
+          <p [innerHTML]="'grant-deny-request-copy.intro1' | translate:{ url: (itemUrl$ | async), name: (itemName$ | async) }"></p>
+          <p>{{'grant-deny-request-copy.intro2' | translate}}</p>
+          <div class="btn-group ">
+            <a [routerLink]="grantRoute$ | async"
+              class="btn btn-outline-primary"
+              title="{{'grant-deny-request-copy.grant' | translate }}">
+              {{'grant-deny-request-copy.grant' | translate }}
+            </a>
+            <a [routerLink]="denyRoute$ | async"
+              class="btn btn-outline-danger"
+              title="{{'grant-deny-request-copy.deny' | translate }}">
+              {{'grant-deny-request-copy.deny' | translate }}
+            </a>
+          </div>
+        </div>
+      }
+      @if (itemRequestRD.payload.decisionDate) {
+        <div class="processed-message">
+          <p>{{'grant-deny-request-copy.processed' | translate}}</p>
+          <p class="text-center">
+            <a routerLink="/home" class="btn btn-primary">{{'grant-deny-request-copy.home-page' | translate}}</a>
+          </p>
+        </div>
+      }
     </div>
-    <div *ngIf="itemRequestRD.payload.decisionDate" class="processed-message">
-      <p>{{'grant-deny-request-copy.processed' | translate}}</p>
-      <p class="text-center">
-        <a routerLink="/home" class="btn btn-primary">{{'grant-deny-request-copy.home-page' | translate}}</a>
-      </p>
-    </div>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
index 101b462914..53ec4b7eec 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -42,7 +39,7 @@ import {
   styleUrls: ['./grant-deny-request-copy.component.scss'],
   templateUrl: './grant-deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, RouterLink, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, RouterLink, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for an author to decide to grant or deny an item request
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
index d2c2cfc3c8..c85f9005b6 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
@@ -1,17 +1,20 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'grant-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <p>{{'grant-request-copy.intro' | translate}}</p>
-
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
-      <p>{{ 'grant-deny-request-copy.email.permissions.info' | translate }}</p>
-      <form class="mb-3">
-        <div class="form-check">
-          <input class="form-check-input" type="checkbox" value="" id="permissions" [(ngModel)]="suggestOpenAccess" name="permissions">
-          <label class="form-check-label" for="permissions">{{ 'grant-deny-request-copy.email.permissions.label' | translate }}</label>
-        </div>
-      </form>
-    </ds-email-request-copy>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      <p>{{'grant-request-copy.intro' | translate}}</p>
+      <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
+        <p>{{ 'grant-deny-request-copy.email.permissions.info' | translate }}</p>
+        <form class="mb-3">
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" value="" id="permissions" [(ngModel)]="suggestOpenAccess" name="permissions">
+            <label class="form-check-label" for="permissions">{{ 'grant-deny-request-copy.email.permissions.label' | translate }}</label>
+          </div>
+        </form>
+      </ds-email-request-copy>
+    </div>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index b14f15f34b..4a71226919 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -41,7 +38,7 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   styleUrls: ['./grant-request-copy.component.scss'],
   templateUrl: './grant-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for granting an item request
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 1fb9f786b4..91cb236abe 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -13,9 +13,11 @@
     <ds-breadcrumbs></ds-breadcrumbs>
     <main class="my-cs" id="main-content">
 
-      <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
-        <ds-loading [showMessage]="false"></ds-loading>
-      </div>
+      @if (shouldShowRouteLoader) {
+        <div class="container d-flex justify-content-center align-items-center h-100">
+          <ds-loading [showMessage]="false"></ds-loading>
+        </div>
+      }
       <div [class.d-none]="shouldShowRouteLoader">
         <router-outlet></router-outlet>
       </div>
@@ -28,8 +30,10 @@
 <ds-notifications-board [options]="notificationOptions">
 </ds-notifications-board>
 
-<div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
-  <ds-loading [showMessage]="false"></ds-loading>
-</div>
+@if (shouldShowFullscreenLoader) {
+  <div class="ds-full-screen-loader">
+    <ds-loading [showMessage]="false"></ds-loading>
+  </div>
+}
 
 <ds-live-region></ds-live-region>
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index b5c1c9be48..9a6fe5ff71 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -61,15 +57,14 @@ import { SystemWideAlertBannerComponent } from '../system-wide-alert/alert-banne
     SystemWideAlertBannerComponent,
     ThemedHeaderNavbarWrapperComponent,
     ThemedBreadcrumbsComponent,
-    NgIf,
     NgClass,
     ThemedLoadingComponent,
     RouterOutlet,
     ThemedFooterComponent,
     NotificationsBoardComponent,
     AsyncPipe,
-    LiveRegionComponent,
-  ],
+    LiveRegionComponent
+],
 })
 export class RootComponent implements OnInit {
   theme: Observable<ThemeConfig> = of({} as any);
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 3dc84a833a..10366446f6 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,7 +23,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, BtnDisabledDirective],
+  imports: [FormsModule, NgbDatepickerModule, TranslateModule, ToDatePipe, BtnDisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
index 69368b16c5..0fc12a7889 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
@@ -32,10 +32,7 @@ describe('AccessControlFormContainerComponent', () => {
   @Component({
     selector: 'ds-ngb-modal', template: '',
     standalone: true,
-    imports: [CommonModule,
-      FormsModule,
-      NgbDatepickerModule,
-      UiSwitchModule],
+    imports: [FormsModule, NgbDatepickerModule, UiSwitchModule],
   })
   class MockNgbModalComponent {
   }
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 46895b8532..515faabbac 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -47,7 +44,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
index 12b38a419b..75ab8c8878 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -33,7 +30,7 @@ export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-contro
   templateUrl: './item-access-control-select-bitstreams-modal.component.html',
   styleUrls: ['./item-access-control-select-bitstreams-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, ObjectCollectionComponent, AsyncPipe, TranslateModule],
+  imports: [ObjectCollectionComponent, AsyncPipe, TranslateModule],
 })
 export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
 
diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts
index 244fe3ad99..c89bc3b235 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -111,7 +111,7 @@ describe('AlertComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 15dcd51ddd..54a8febce7 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,5 +1,5 @@
 import { trigger } from '@angular/animations';
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -30,7 +30,7 @@ import { AlertType } from './alert-type';
   templateUrl: './alert.component.html',
   styleUrls: ['./alert.component.scss'],
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class AlertComponent {
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index 16899cf73e..eea1eccbeb 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -58,7 +54,7 @@ import { ThemedUserMenuComponent } from './user-menu/themed-user-menu.component'
   styleUrls: ['./auth-nav-menu.component.scss'],
   animations: [fadeInOut, fadeOut],
   standalone: true,
-  imports: [NgClass, NgIf, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AuthNavMenuComponent implements OnInit {
   /**
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 130c01c049..7e3232701b 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,32 +1,36 @@
-<ds-loading *ngIf="(loading$ | async)"></ds-loading>
-<ul *ngIf="(loading$ | async) !== true" class="user-menu" role="menu"
+@if ((loading$ | async)) {
+  <ds-loading></ds-loading>
+}
+@if ((loading$ | async) !== true) {
+  <ul class="user-menu" role="menu"
     [ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
     [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
-  <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
-    {{dsoNameService.getName(user$ | async)}}<br>
-    <span class="text-muted">{{(user$ | async)?.email}}</span>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[profileRoute]"
-       routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[mydspaceRoute]"
-       routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[subscriptionsRoute]"
-       routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
-  </li>
-  <ng-container *ngIf="!inExpandableNavbar">
-    <li class="dropdown-divider" aria-hidden="true"></li>
-    <li class="ds-menu-item-wrapper" role="presentation">
-      <ds-log-out data-test="log-out-component"></ds-log-out>
+    <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
+      {{dsoNameService.getName(user$ | async)}}<br>
+      <span class="text-muted">{{(user$ | async)?.email}}</span>
     </li>
-  </ng-container>
-</ul>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[profileRoute]"
+      routerLinkActive="active">{{'nav.profile' | translate}}</a>
+    </li>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[mydspaceRoute]"
+      routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
+    </li>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[subscriptionsRoute]"
+      routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
+    </li>
+    @if (!inExpandableNavbar) {
+      <li class="dropdown-divider" aria-hidden="true"></li>
+      <li class="ds-menu-item-wrapper" role="presentation">
+        <ds-log-out data-test="log-out-component"></ds-log-out>
+      </li>
+    }
+  </ul>
+}
 
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 6a601bd9a3..e725f361e3 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -42,7 +38,7 @@ import { LogOutComponent } from '../../log-out/log-out.component';
   templateUrl: './user-menu.component.html',
   styleUrls: ['./user-menu.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
 })
 export class UserMenuComponent implements OnInit {
 
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 675a2392b2..bd8f70932d 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,29 +1,43 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h1 *ngIf="displayTitle">{{title | translate}}</h1>
+  @if (displayTitle) {
+    <h1>{{title | translate}}</h1>
+  }
   <ds-starts-with-loader [paginationId]="paginationConfig?.id" [startsWithOptions]="startsWithOptions" [type]="type">
   </ds-starts-with-loader>
-  <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
-      <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+  @if (objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0) {
+    <div @fadeIn>
+      @if (shouldDisplayResetButton$ |async) {
+        <div class="mb-2 reset">
+          <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+        </div>
+      }
+      <ds-viewable-collection
+        [config]="paginationConfig"
+        [sortConfig]="sortConfig"
+        [showPaginator]="showPaginator"
+        [objects]="objects"
+        (prev)="goPrev()"
+        (next)="goNext()">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (!objects || objects?.isLoading) {
+    <ds-loading message="{{'loading.browse-by' | translate}}"></ds-loading>
+  }
+  @if (objects?.hasFailed) {
+    <ds-error message="{{'error.browse-by' | translate}}"></ds-error>
+  }
+  @if (!objects?.isLoading && objects?.payload?.page.length === 0) {
+    <div>
+      @if (shouldDisplayResetButton$ |async) {
+        <div class="d-inline-block mb-4 reset">
+          <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+        </div>
+      }
+      <div class="alert alert-info w-100" role="alert">
+        {{'browse.empty' | translate}}
       </div>
-    <ds-viewable-collection
-      [config]="paginationConfig"
-      [sortConfig]="sortConfig"
-      [showPaginator]="showPaginator"
-      [objects]="objects"
-      (prev)="goPrev()"
-      (next)="goNext()">
-    </ds-viewable-collection>
-  </div>
-  <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
-  <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 [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
     </div>
-    <div class="alert alert-info w-100" role="alert">
-      {{'browse.empty' | translate}}
-    </div>
-  </div>
+  }
 </ng-container>
 
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 361bc39492..75cf6a367d 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgComponentOutlet,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -59,7 +54,7 @@ import { VarDirective } from '../utils/var.directive';
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
+  imports: [VarDirective, NgClass, NgComponentOutlet, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
 })
 /**
  * Component to display a browse-by page for any ListableObject
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index 0fef74b389..a55b0b9558 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -76,7 +72,7 @@ export interface CollectionListEntry {
   templateUrl: './collection-dropdown.component.html',
   styleUrls: ['./collection-dropdown.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class CollectionDropdownComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
index 0c80ce0d1d..1484c860a3 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -81,10 +77,9 @@ import { ComcolPageLogoComponent } from '../../comcol-page-logo/comcol-page-logo
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
     NgClass,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class ComColFormComponent<T extends Collection | Community> implements OnInit, OnDestroy {
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 32985c5d3d..b136f83dc5 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -1,7 +1,7 @@
 <div class="card p-2 mb-3 mt-3 custom-alignment {{(comcolRole$ | async)?.name}}">
 
   <div class="card-body d-flex flex-column"
-       *ngVar="group$ | async as group">
+    *ngVar="group$ | async as group">
 
     <h2 class="h4 w-100">
       {{ roleName$ | async }}
@@ -13,34 +13,48 @@
 
     <div class="d-flex flex-md-row justify-content-between flex-column">
       <div class="w-100 d-flex align-items-center">
-        <ds-loading *ngIf="groupRD$ | async | dsHasNoValue"></ds-loading>
-        <div *ngIf="hasNoGroup$ | async">
-          {{'comcol-role.edit.no-group' | translate}}
-        </div>
-        <div *ngIf="hasAnonymousGroup$ | async">
-          {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
-        </div>
-        <a *ngIf="hasCustomGroup$ | async" [routerLink]="editGroupLink$ | async">
-          {{ dsoNameService.getName(group) }}
-        </a>
+        @if (groupRD$ | async | dsHasNoValue) {
+          <ds-loading></ds-loading>
+        }
+        @if (hasNoGroup$ | async) {
+          <div>
+            {{'comcol-role.edit.no-group' | translate}}
+          </div>
+        }
+        @if (hasAnonymousGroup$ | async) {
+          <div>
+            {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
+          </div>
+        }
+        @if (hasCustomGroup$ | async) {
+          <a [routerLink]="editGroupLink$ | async">
+            {{ dsoNameService.getName(group) }}
+          </a>
+        }
       </div>
 
       <div class="flex-shrink-0">
-        <button *ngIf="hasNoGroup$ | async"
-             class="btn btn-primary create"
-             (click)="create()">
-          <i class="fas fa-plus" aria-hidden="true"></i> {{'comcol-role.edit.create' | translate}}
-        </button>
-        <button *ngIf="hasAnonymousGroup$ | async"
-             class="btn btn-primary restrict"
-             (click)="create()">
-          {{'comcol-role.edit.restrict' | translate}}
-        </button>
-        <button *ngIf="hasCustomGroup$ | async"
-             class="btn btn-danger delete"
-             (click)="delete()">
-          <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
-        </button>
+        @if (hasNoGroup$ | async) {
+          <button
+            class="btn btn-primary create"
+            (click)="create()">
+            <i class="fas fa-plus" aria-hidden="true"></i> {{'comcol-role.edit.create' | translate}}
+          </button>
+        }
+        @if (hasAnonymousGroup$ | async) {
+          <button
+            class="btn btn-primary restrict"
+            (click)="create()">
+            {{'comcol-role.edit.restrict' | translate}}
+          </button>
+        }
+        @if (hasCustomGroup$ | async) {
+          <button
+            class="btn btn-danger delete"
+            (click)="delete()">
+            <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
+          </button>
+        }
       </div>
 
     </div>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 22c4ed49f3..3d301acd44 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -58,11 +55,10 @@ import { VarDirective } from '../../../../utils/var.directive';
     AlertComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     RouterLink,
     VarDirective,
-    HasNoValuePipe,
-  ],
+    HasNoValuePipe
+],
   standalone: true,
 })
 export class ComcolRoleComponent implements OnInit {
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index a7730ee7dd..ace21e48e4 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -59,13 +55,11 @@ export interface ComColPageNavOption {
   templateUrl: './comcol-page-browse-by.component.html',
   imports: [
     FormsModule,
-    NgForOf,
     RouterLink,
     RouterLinkActive,
     TranslateModule,
-    AsyncPipe,
-    NgIf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
index 16b20cde20..062fc4c242 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
@@ -1,5 +1,13 @@
-<div *ngIf="content" class="content-with-optional-title mb-2">
-    <h2 *ngIf="title">{{ title | translate }}</h2>
-    <div *ngIf="hasInnerHtml" [innerHtml]="content"></div>
-    <div *ngIf="!hasInnerHtml">{{content}}</div>
-</div>
+@if (content) {
+  <div class="content-with-optional-title mb-2">
+    @if (title) {
+      <h2>{{ title | translate }}</h2>
+    }
+    @if (hasInnerHtml) {
+      <div [innerHtml]="content"></div>
+    }
+    @if (!hasInnerHtml) {
+      <div>{{content}}</div>
+    }
+  </div>
+}
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 636b311165..b6100eb917 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -16,9 +16,8 @@ import { TranslateModule } from '@ngx-translate/core';
   styleUrls: ['./comcol-page-content.component.scss'],
   templateUrl: './comcol-page-content.component.html',
   imports: [
-    TranslateModule,
-    NgIf,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class ComcolPageContentComponent {
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 01a71ab142..64f3c3c96b 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,8 @@
-<p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
-  <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
-  <a [href]="getHandle()">{{getHandle()}}</a>
-</p>
+@if (content) {
+  <p class="d-flex flex-wrap gapx-2 text-break">
+    @if (title) {
+      <span class="mb-0">{{ title | translate }}</span>
+    }
+    <a [href]="getHandle()">{{getHandle()}}</a>
+  </p>
+}
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 538ed51a32..30a52f41ba 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -14,9 +14,8 @@ import { TranslateModule } from '@ngx-translate/core';
   styleUrls: ['./comcol-page-handle.component.scss'],
   templateUrl: './comcol-page-handle.component.html',
   imports: [
-    NgIf,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class ComcolPageHandleComponent {
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
index 21f1f65331..ee685e393e 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
@@ -1 +1 @@
-<h1 *ngIf="name">{{ name }}</h1>
\ No newline at end of file
+@if (name) {<h1>{{ name }}</h1>}
\ No newline at end of file
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
index f409e991ec..62227f2317 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -8,9 +8,7 @@ import {
   selector: 'ds-comcol-page-header',
   styleUrls: ['./comcol-page-header.component.scss'],
   templateUrl: './comcol-page-header.component.html',
-  imports: [
-    NgIf,
-  ],
+  imports: [],
   standalone: true,
 })
 export class ComcolPageHeaderComponent {
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index cb3feecbe5..59ed2fae17 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,5 @@
-<div *ngIf="logo" class="dso-logo mb-3">
+@if (logo) {
+  <div class="dso-logo mb-3">
     <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
-</div>
+  </div>
+}
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
index 589f54d45c..4cb3539616 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -10,7 +10,7 @@ import { Bitstream } from '../../../core/shared/bitstream.model';
   selector: 'ds-comcol-page-logo',
   styleUrls: ['./comcol-page-logo.component.scss'],
   templateUrl: './comcol-page-logo.component.html',
-  imports: [NgIf],
+  imports: [],
   standalone: true,
 })
 export class ComcolPageLogoComponent {
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
index d0ce017965..12789691ea 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -11,7 +11,9 @@
       <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
-    </button>
+      @if (confirmIcon) {
+        <i class="{{confirmIcon}}"></i>
+        } {{ confirmLabel | translate:{ dsoName: name } }}
+      </button>
+    </div>
   </div>
-</div>
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 7618706ab4..aa05c09c24 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
   selector: 'ds-confirmation-modal',
   templateUrl: 'confirmation-modal.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class ConfirmationModalComponent {
   @Input() headerLabel: string;
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 083b8163ff..82714fb366 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,25 +1,26 @@
 <ng-template #help>
-    <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" rel="noopener noreferrer">{{elem.text}}</a>
-            </ng-container>
-            <ng-container *ngIf="elem.href === undefined">
-                {{ elem }}
-            </ng-container>
-        </ng-container>
-    </div>
+  <div class="preserve-line-breaks ds-context-help-content">
+    @for (elem of (parsedContent$ | async); track elem) {
+      @if (elem.href) {
+        <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
+      } @else {
+        {{ elem }}
+      }
+    }
+  </div>
 </ng-template>
-<i *ngIf="shouldShowIcon$ | async"
+@if (shouldShowIcon$ | async) {
+  <i
    [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"
-   #tooltip="ngbTooltip"
-   (click)="onClick()">
-</i>
+    [ngbTooltip]="help"
+    [placement]="tooltipPlacement"
+    autoClose="outside"
+    triggers="manual"
+    container="body"
+    #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 f889366dfe..31176e48ed 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,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Input,
@@ -36,7 +30,7 @@ import { ContextHelpService } from '../context-help.service';
 import { hasValueOperator } from '../empty.util';
 import { PlacementDir } from './placement-dir.model';
 
-type ParsedContent = (string | {href: string, text: string})[];
+type ParsedContent = ({href?: string, text: string})[];
 
 /**
  * This component renders an info icon next to the wrapped element which
@@ -47,7 +41,7 @@ type ParsedContent = (string | {href: string, text: string})[];
   templateUrl: './context-help-wrapper.component.html',
   styleUrls: ['./context-help-wrapper.component.scss'],
   standalone: true,
-  imports: [NgFor, NgIf, NgClass, NgbTooltipModule, NgTemplateOutlet, AsyncPipe],
+  imports: [NgClass, NgbTooltipModule, NgTemplateOutlet, AsyncPipe],
 })
 export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   /**
@@ -103,7 +97,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
       this.dontParseLinks$.pipe(distinctUntilChanged()),
     ]).pipe(
       map(([text, dontParseLinks]) =>
-        dontParseLinks ? [text] : this.parseLinks(text)),
+        dontParseLinks ? [{text}] : this.parseLinks(text)),
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
   }
@@ -181,7 +175,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
     return text.match(splitRegexp).map((substring: string) => {
       const match = substring.match(parseRegexp);
       return match === null
-        ? substring
+        ? {text: substring}
         : ({ href: match[2], text: match[1] });
     });
   }
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
index decd7c8d38..6b25d090c8 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,12 +18,11 @@ import { ThemedLoadingComponent } from '../loading/themed-loading.component';
   templateUrl: './item-withdrawn-reinstate-modal.component.html',
   styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'],
   imports: [
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     FormsModule,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index 2616ce4a9f..7ee3ab5d87 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -18,7 +18,7 @@ import { BtnDisabledDirective } from '../btn-disabled.directive';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule, BtnDisabledDirective],
+  imports: [NgbDropdownModule, TranslateModule, BtnDisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index fadaee8b22..38041e194f 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgComponentOutlet,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   Inject,
@@ -34,7 +29,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, BtnDisabledDirective],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgComponentOutlet, TranslateModule, AsyncPipe, BtnDisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index 0738e2f28a..b2c8ca84ce 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -1,21 +1,29 @@
-<div *ngIf="!canActivate" class="dso-button-menu mb-1"
-     [ngbTooltip]="itemModel.text | translate">
-    <a *ngIf="!section.model.disabled" class="btn btn-dark btn-sm"
-       [routerLink]="itemModel.link">
+@if (!canActivate) {
+  <div class="dso-button-menu mb-1"
+    [ngbTooltip]="itemModel.text | translate">
+    @if (!section.model.disabled) {
+      <a class="btn btn-dark btn-sm"
+        [routerLink]="itemModel.link">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
-    </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
+      </a>
+    }
+    @if (section.model.disabled) {
+      <button class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
-    </button>
-</div>
+      </button>
+    }
+  </div>
+}
 
-<div *ngIf="canActivate" class="dso-button-menu mb-1"
-     [ngbTooltip]="itemModel.text | translate">
+@if (canActivate) {
+  <div class="dso-button-menu mb-1"
+    [ngbTooltip]="itemModel.text | translate">
     <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
-            (click)="activate($event)">
-        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
-        <span class="sr-only">{{itemModel.text | translate}}</span>
+      (click)="activate($event)">
+      <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+      <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
-</div>
+  </div>
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 246f9efb6e..a3f39eadd9 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -24,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index a4b8b728f9..10f8aa63f5 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgComponentOutlet,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   Injector,
@@ -23,7 +19,7 @@ import { ThemeService } from '../../theme-support/theme.service';
   styleUrls: ['./dso-edit-menu.component.scss'],
   templateUrl: './dso-edit-menu.component.html',
   standalone: true,
-  imports: [NgFor, NgComponentOutlet, AsyncPipe],
+  imports: [NgComponentOutlet, AsyncPipe],
 })
 export class DsoEditMenuComponent extends MenuComponent {
   /**
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 1f4e5aa397..7c9cab1aa2 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -79,7 +74,7 @@ import { SearchResult } from '../../search/models/search-result.model';
   styleUrls: ['./dso-selector.component.scss'],
   templateUrl: './dso-selector.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgIf, NgFor, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 05efb987a3..52dad5a9a4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -36,7 +36,7 @@ import {
   selector: 'ds-base-create-collection-parent-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 70f4d0302c..30cc1d1070 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -4,10 +4,12 @@
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
-                                       [entityType]="entityType"
-                                       [types]="selectorTypes"
-                                       (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
+      [entityType]="entityType"
+      [types]="selectorTypes"
+    (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index ede3cc3609..efc79596b0 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -36,7 +36,7 @@ import {
   // templateUrl: '../dso-selector-modal-wrapper.component.html',
   templateUrl: './create-item-parent-selector.component.html',
   standalone: true,
-  imports: [NgIf, AuthorizedCollectionSelectorComponent, TranslateModule],
+  imports: [AuthorizedCollectionSelectorComponent, TranslateModule],
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index dab24d8aa3..2d139a3f53 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 1fbdd9ca9a..210f6a6d20 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 903f432734..d5ac19c392 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -29,7 +29,7 @@ import {
   selector: 'ds-base-edit-item-selector',
   templateUrl: 'edit-item-selector.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index 61bfd853ca..37d5a40155 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -41,7 +37,7 @@ import { ThemedLoadingComponent } from '../loading/themed-loading.component';
   templateUrl: './entity-dropdown.component.html',
   styleUrls: ['./entity-dropdown.component.scss'],
   standalone: true,
-  imports: [InfiniteScrollModule, NgIf, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class EntityDropdownComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.html b/src/app/shared/eperson-group-list/eperson-group-list.component.html
index 6ee5aad943..1b1d2d5115 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.html
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.html
@@ -1,36 +1,42 @@
 <div class="mt-3" @fadeInOut>
-  <ds-eperson-search-box *ngIf="isListOfEPerson" (search)="onSearch($event)"></ds-eperson-search-box>
-  <ds-group-search-box *ngIf="!isListOfEPerson" (search)="onSearch($event)"></ds-group-search-box>
+  @if (isListOfEPerson) {
+    <ds-eperson-search-box (search)="onSearch($event)"></ds-eperson-search-box>
+  }
+  @if (!isListOfEPerson) {
+    <ds-group-search-box (search)="onSearch($event)"></ds-group-search-box>
+  }
 
-  <ds-pagination *ngIf="(getList() | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="paginationOptions"
-                 [collectionSize]="(getList() | async)?.payload?.totalElements"
-                 [retainScrollPosition]="true"
-                 [hideGear]="true">
-
-    <div class="table-responsive">
-      <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-        <thead>
-        <tr class="text-center">
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let entry of (getList() | async)?.payload?.page"
-            [class.table-primary]="isSelected(entry) | async">
-          <td>{{entry.id}}</td>
-          <td>{{dsoNameService.getName(entry)}}</td>
-          <td class="text-center">
-            <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
-              {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
-            </button>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-
-  </ds-pagination>
+  @if ((getList() | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [collectionSize]="(getList() | async)?.payload?.totalElements"
+      [retainScrollPosition]="true"
+      [hideGear]="true">
+      <div class="table-responsive">
+        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+          <thead>
+            <tr class="text-center">
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (entry of (getList() | async)?.payload?.page; track entry) {
+              <tr
+                [class.table-primary]="isSelected(entry) | async">
+                <td>{{entry.id}}</td>
+                <td>{{dsoNameService.getName(entry)}}</td>
+                <td class="text-center">
+                  <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
+                    {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
+                  </button>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 </div>
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
index a600e479c4..60feb186ba 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -58,7 +54,7 @@ import { GroupSearchBoxComponent } from './group-search-box/group-search-box.com
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, EpersonSearchBoxComponent, GroupSearchBoxComponent, PaginationComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [EpersonSearchBoxComponent, GroupSearchBoxComponent, PaginationComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component that shows a list of eperson or group
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index 3080a94bd3..b86d2143a6 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Input,
@@ -37,7 +32,7 @@ import {
   templateUrl: './file-download-link.component.html',
   styleUrls: ['./file-download-link.component.scss'],
   standalone: true,
-  imports: [RouterLink, NgClass, NgIf, NgTemplateOutlet, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a download link
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index ab50bd19df..1dcf458d6f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -133,18 +127,16 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     ExistingMetadataListElementComponent,
-    NgIf,
     NgClass,
     AsyncPipe,
     TranslateModule,
     ReactiveFormsModule,
-    NgForOf,
     FormsModule,
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index 4c1ea2dd96..9b2a67a96d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -1,14 +1,16 @@
-<ds-dynamic-form-control-container *ngFor="let model of formModel; trackBy: trackByFn"
-                                   [formId]="formId"
-                                   [group]="formGroup"
-                                   [hasErrorMessaging]="model.hasErrorMessages"
-                                   [hidden]="model.hidden"
-                                   [class.d-none]="model.hidden"
-                                   [layout]="formLayout"
-                                   [model]="model"
-                                   [templates]="templates"
-                                   [asBootstrapFormGroup]="true"
-                                   (dfBlur)="onCustomEvent($event, blur)"
-                                   (dfChange)="onCustomEvent($event, change)"
-                                   (dfFocus)="onCustomEvent($event, focus)"
-                                   (ngbEvent)="onCustomEvent($event, ngbEvent)"></ds-dynamic-form-control-container>
+@for (model of formModel; track trackByFn($index, model)) {
+  <ds-dynamic-form-control-container
+    [formId]="formId"
+    [group]="formGroup"
+    [hasErrorMessaging]="model.hasErrorMessages"
+    [hidden]="model.hidden"
+    [class.d-none]="model.hidden"
+    [layout]="formLayout"
+    [model]="model"
+    [templates]="templates"
+    [asBootstrapFormGroup]="true"
+    (dfBlur)="onCustomEvent($event, blur)"
+    (dfChange)="onCustomEvent($event, change)"
+    (dfFocus)="onCustomEvent($event, focus)"
+  (ngbEvent)="onCustomEvent($event, ngbEvent)"></ds-dynamic-form-control-container>
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index 4146fc8e4d..ccae3a7a6c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -27,9 +27,8 @@ import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-contro
   selector: 'ds-dynamic-form',
   templateUrl: './ds-dynamic-form.component.html',
   imports: [
-    forwardRef(() => DsDynamicFormControlContainerComponent),
-    NgForOf,
-  ],
+    forwardRef(() => DsDynamicFormControlContainerComponent)
+],
   standalone: true,
 })
 export class DsDynamicFormComponent extends DynamicFormComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index f3ca411853..644067677a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -1,8 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -166,12 +163,11 @@ export class ReorderableRelationship extends Reorderable {
   templateUrl: './existing-metadata-list-element.component.html',
   styleUrls: ['./existing-metadata-list-element.component.scss'],
   imports: [
-    NgIf,
     ThemedLoadingComponent,
     AsyncPipe,
     MetadataRepresentationLoaderComponent,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class ExistingMetadataListElementComponent implements OnInit, OnChanges, OnDestroy   {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
index 7523bafb00..af39dfd38e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -1,8 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -82,9 +79,8 @@ export abstract class Reorderable {
   imports: [
     ThemedLoadingComponent,
     AsyncPipe,
-    ListableObjectComponentLoaderComponent,
-    NgIf,
-  ],
+    ListableObjectComponentLoaderComponent
+],
   standalone: true,
 })
 export class ExistingRelationListElementComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 220143291e..311fcfdb4f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -4,11 +4,7 @@ import {
   CdkDragHandle,
   CdkDropList,
 } from '@angular/cdk/drag-drop';
-import {
-  NgClass,
-  NgForOf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -51,13 +47,12 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
     ReactiveFormsModule,
     CdkDropList,
     NgClass,
-    NgForOf,
     CdkDrag,
     CdkDragHandle,
     forwardRef(() => DsDynamicFormControlContainerComponent),
     NgTemplateOutlet,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index bc47884198..af9cb952c6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -35,9 +32,8 @@ import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
     NgClass,
     NgbDatepickerModule,
     ReactiveFormsModule,
-    NgIf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 8e1645633e..f778d976da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -1,25 +1,27 @@
 <div style="width: 100%">
-<ng-container [formGroup]="group">
+  <ng-container [formGroup]="group">
 
-  <div role="group" [formGroupName]="model.id"
-                    [id]="id"
-                    [class.d-none]="model.hidden"
-                    [ngClass]="getClass('element','control')">
-     <ds-dynamic-form-control-container *ngFor="let _model of model.group"
-                                       [formGroup]="group"
-                                       [formModel]="formModel"
-                                       [group]="control"
-                                       [hasErrorMessaging]="model.hasErrorMessages"
-                                       [hidden]="_model.hidden"
-                                        [class.d-none]="_model.hidden"
-                                       [layout]="formLayout"
-                                       [model]="_model"
-                                       [templates]="templates"
-                                       [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                       (dfBlur)="onBlur($event)"
-                                       (dfChange)="onChange($event)"
-                                       (dfFocus)="onFocus($event)"
-                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-  </div>
-</ng-container>
+    <div role="group" [formGroupName]="model.id"
+      [id]="id"
+      [class.d-none]="model.hidden"
+      [ngClass]="getClass('element','control')">
+      @for (_model of model.group; track _model) {
+        <ds-dynamic-form-control-container
+          [formGroup]="group"
+          [formModel]="formModel"
+          [group]="control"
+          [hasErrorMessaging]="model.hasErrorMessages"
+          [hidden]="_model.hidden"
+          [class.d-none]="_model.hidden"
+          [layout]="formLayout"
+          [model]="_model"
+          [templates]="templates"
+          [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+          (dfBlur)="onBlur($event)"
+          (dfChange)="onChange($event)"
+          (dfFocus)="onFocus($event)"
+        (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+      }
+    </div>
+  </ng-container>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index dee7df289b..3f054c3b5f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -37,9 +34,8 @@ import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-co
   imports: [
     ReactiveFormsModule,
     NgClass,
-    NgForOf,
-    forwardRef(() => DsDynamicFormControlContainerComponent),
-  ],
+    forwardRef(() => DsDynamicFormControlContainerComponent)
+],
   standalone: true,
 })
 export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index c1964db1e7..15bcbec368 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -68,14 +63,12 @@ export interface ListItem {
   templateUrl: './dynamic-list.component.html',
   imports: [
     NgClass,
-    NgIf,
     NgbButtonsModule,
-    NgForOf,
     ReactiveFormsModule,
     AsyncPipe,
     TranslateModule,
-    ThemedLoadingComponent,
-  ],
+    ThemedLoadingComponent
+],
   standalone: true,
 })
 export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 39c39cf8bc..48d044681e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,9 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -71,14 +66,12 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgbDropdownModule,
     AuthorityConfidenceStateDirective,
     FormsModule,
-    NgIf,
     NgClass,
     InfiniteScrollModule,
-    NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index de6b50d589..d8e4cff5ac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -83,16 +78,14 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
   templateUrl: './dynamic-onebox.component.html',
   imports: [
     NgbTypeaheadModule,
-    NgIf,
     AsyncPipe,
     AuthorityConfidenceStateDirective,
     NgTemplateOutlet,
     TranslateModule,
     ObjNgFor,
-    NgForOf,
     FormsModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index 05da3cc583..0ded66a0c8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -1,9 +1,5 @@
 // Load the implementations that should be tested
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -374,12 +370,11 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
   standalone: true,
   imports: [
     DsDynamicRelationGroupComponent,
-    NgIf,
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
-    NgClass,
-  ],
+    NgClass
+],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index f397687686..ad5e36a1a9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -74,7 +70,6 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
   templateUrl: './dynamic-relation-group.component.html',
   animations: [shrinkInOut],
   imports: [
-    NgIf,
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
@@ -82,8 +77,8 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index d5d202d22a..e48eea8052 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -1,62 +1,72 @@
 <div #sdRef="ngbDropdown" ngbDropdown display="dynamic" placement="bottom-right" class="w-100">
   <div class="position-relative right-addon"
-       role="combobox"
-       [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'"
-       [attr.aria-expanded]="sdRef.isOpen()"
-       [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
-       <i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
-          aria-hidden="true"></i>
-       <i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
-          aria-hidden="true"></i>
+    role="combobox"
+    [attr.aria-label]="model.label"
+    [attr.aria-owns]="'combobox_' + id + '_listbox'"
+    [attr.aria-expanded]="sdRef.isOpen()"
+    [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
+    @if (!model.readOnly) {
+      <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+      aria-hidden="true"></i>
+    }
+    @if (model.readOnly) {
+      <i class="dropdown-toggle position-absolute toggle-icon"
+      aria-hidden="true"></i>
+    }
     <input class="form-control"
-           [attr.aria-controls]="'combobox_' + id + '_listbox'"
-           [attr.aria-label]="model.placeholder"
-           [attr.autoComplete]="model.autoComplete"
-           [class.is-invalid]="showErrorMessages"
-           [class.scrollable-dropdown-input]="!model.readOnly"
-           [id]="id"
-           [name]="model.name"
-           [readonly]="true"
-           [disabled]="model.readOnly"
-           [type]="model.inputType"
-           [value]="(currentValue | async)"
-           (blur)="onBlur($event)"
-           (click)="$event.stopPropagation(); openDropdown(sdRef);"
-           (focus)="onFocus($event)"
-           (keydown)="selectOnKeyDown($event, sdRef)">
+      [attr.aria-controls]="'combobox_' + id + '_listbox'"
+      [attr.aria-label]="model.placeholder"
+      [attr.autoComplete]="model.autoComplete"
+      [class.is-invalid]="showErrorMessages"
+      [class.scrollable-dropdown-input]="!model.readOnly"
+      [id]="id"
+      [name]="model.name"
+      [readonly]="true"
+      [disabled]="model.readOnly"
+      [type]="model.inputType"
+      [value]="(currentValue | async)"
+      (blur)="onBlur($event)"
+      (click)="$event.stopPropagation(); openDropdown(sdRef);"
+      (focus)="onFocus($event)"
+      (keydown)="selectOnKeyDown($event, sdRef)">
   </div>
 
   <div #dropdownMenu ngbDropdownMenu
-       class="dropdown-menu scrollable-dropdown-menu w-100"
-       [attr.aria-label]="model.placeholder">
+    class="dropdown-menu scrollable-dropdown-menu w-100"
+    [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
-         role="listbox"
-         [id]="'combobox_' + id + '_listbox'"
-         [attr.aria-label]="model.placeholder"
-         infiniteScroll
-         [infiniteScrollDistance]="2"
-         [infiniteScrollThrottle]="50"
-         (scrolled)="onScroll()"
-         [scrollWindow]="false">
+      role="listbox"
+      [id]="'combobox_' + id + '_listbox'"
+      [attr.aria-label]="model.placeholder"
+      infiniteScroll
+      [infiniteScrollDistance]="2"
+      [infiniteScrollThrottle]="50"
+      (scrolled)="onScroll()"
+      [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" type="button" *ngIf="optionsList && optionsList.length === 0">
-        {{ 'form.no-results' | translate }}
-      </button>
+      @if (optionsList && optionsList.length === 0) {
+        <button class="dropdown-item disabled" type="button">
+          {{ 'form.no-results' | translate }}
+        </button>
+      }
       <button class="dropdown-item collection-item text-truncate"
-              (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
-              title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
-              type="button">
+        (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
+        title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
+        type="button">
         <i>{{ 'dropdown.clear' | translate }}</i>
       </button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
-              [class.active]="i === selectedIndex"
-              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ inputFormatter(listEntry) }}" role="option" type="button"
-              [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
-        {{inputFormatter(listEntry)}}
-      </button>
-      <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
+      @for (listEntry of optionsList; track listEntry; let i = $index) {
+        <button class="dropdown-item collection-item text-truncate"
+          [class.active]="i === selectedIndex"
+          (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
+          title="{{ inputFormatter(listEntry) }}" role="option" type="button"
+          [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+          {{inputFormatter(listEntry)}}
+        </button>
+      }
+      @if (loading) {
+        <div class="scrollable-dropdown-loading text-center"><p>{{'form.loading' | translate}}</p></div>
+      }
     </div>
 
   </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index b55c62ec48..a153218e6f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -72,13 +68,11 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
   templateUrl: './dynamic-scrollable-dropdown.component.html',
   imports: [
     NgbDropdownModule,
-    NgIf,
     AsyncPipe,
     InfiniteScrollModule,
-    NgForOf,
     TranslateModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index d8f12197d2..66b6090bd5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -64,9 +64,8 @@ import { DynamicTagModel } from './dynamic-tag.model';
   imports: [
     NgbTypeaheadModule,
     FormsModule,
-    NgIf,
-    ChipsComponent,
-  ],
+    ChipsComponent
+],
   standalone: true,
 })
 export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implements OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 3cbcbc8460..ffb405416a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -86,14 +82,12 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     ThemedDynamicLookupRelationExternalSourceTabComponent,
     TranslateModule,
     ThemedLoadingComponent,
-    NgIf,
     NgbNavModule,
     ThemedDynamicLookupRelationSearchTabComponent,
     AsyncPipe,
-    NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index 4282eb5888..d3c26224b9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -5,29 +5,37 @@
   </div>
   <div class="col-8">
     <ds-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query"
-                    [inPlaceSearch]="true"
-                    [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
+      [inPlaceSearch]="true"
+      [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
     </ds-search-form>
     <div>
       <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + externalSource.id | translate}}</h3>
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0" @fadeIn
-                                [objects]="entriesRD"
-                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                [config]="(currentPagination$ |async)"
-                                [hideGear]="true"
-                                [context]="context"
-                                [importable]="true"
-                                [importConfig]="importConfig"
-                                (importObject)="import($event)">
-        </ds-viewable-collection>
-        <ds-loading *ngIf="!entriesRD || entriesRD?.isLoading"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
-        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)"
-                    message="{{'error.search-results' | translate}}"></ds-error>
-        <div *ngIf="entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400" id="empty-external-entry-list">
-          {{ 'search.results.empty' | translate }}
-        </div>
+        @if (entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0) {
+          <ds-viewable-collection @fadeIn
+            [objects]="entriesRD"
+            [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+            [config]="(currentPagination$ |async)"
+            [hideGear]="true"
+            [context]="context"
+            [importable]="true"
+            [importConfig]="importConfig"
+            (importObject)="import($event)">
+          </ds-viewable-collection>
+        }
+        @if (!entriesRD || entriesRD?.isLoading) {
+          <ds-loading
+          message="{{'loading.search-results' | translate}}"></ds-loading>
+        }
+        @if (entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)) {
+          <ds-error
+          message="{{'error.search-results' | translate}}"></ds-error>
+        }
+        @if (entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400) {
+          <div id="empty-external-entry-list">
+            {{ 'search.results.empty' | translate }}
+          </div>
+        }
       </ng-container>
     </div>
   </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 5a1f13544f..6c0c5fa0f9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ComponentRef,
@@ -84,9 +81,8 @@ import { ThemedExternalSourceEntryImportModalComponent } from './external-source
     AsyncPipe,
     TranslateModule,
     ErrorComponent,
-    NgIf,
-    ThemedLoadingComponent,
-  ],
+    ThemedLoadingComponent
+],
   standalone: true,
 })
 /**
diff --git a/src/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.ts b/src/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.ts
index e0cc90ceaa..13ec3c3c66 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -68,10 +65,9 @@ export enum ImportType {
   imports: [
     TranslateModule,
     ThemedSearchResultsComponent,
-    NgIf,
     AsyncPipe,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index ceee05fee0..59f2efaccc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -60,9 +57,8 @@ import { RelationshipOptions } from '../../../models/relationship-options.model'
     VarDirective,
     TranslateModule,
     NgbDropdownModule,
-    NgIf,
-    ThemedSearchComponent,
-  ],
+    ThemedSearchComponent
+],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
index 8d0053a1df..ee5940031d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -1,23 +1,27 @@
 <div class="row">
-    <div class="col-4">
-        <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
-        <ds-page-size-selector></ds-page-size-selector>
-    </div>
-    <div class="col-8">
-        <div *ngIf="(selectionRD$ | async)?.payload.page < 1">
-            {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
-        </div>
-        <div *ngIf="(selectionRD$ | async)?.payload.page.length >= 1">
-            <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
-            <ds-viewable-collection [objects]="selectionRD$ | async"
-                                    [selectable]="true"
-                                    [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                    [config]="(currentPagination$ |async)"
-                                    [hideGear]="true"
-                                    [context]="context"
-                                    (deselectObject)="deselectObject.emit($event)"
-                                    (selectObject)="selectObject.emit($event)"
-            ></ds-viewable-collection>
-        </div>
-    </div>
+  <div class="col-4">
+    <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
+    <ds-page-size-selector></ds-page-size-selector>
+  </div>
+  <div class="col-8">
+    @if ((selectionRD$ | async)?.payload.page < 1) {
+      <div>
+        {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
+      </div>
+    }
+    @if ((selectionRD$ | async)?.payload.page.length >= 1) {
+      <div>
+        <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
+        <ds-viewable-collection [objects]="selectionRD$ | async"
+          [selectable]="true"
+          [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+          [config]="(currentPagination$ |async)"
+          [hideGear]="true"
+          [context]="context"
+          (deselectObject)="deselectObject.emit($event)"
+          (selectObject)="selectObject.emit($event)"
+        ></ds-viewable-collection>
+      </div>
+    }
+  </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index ace5e9bdc7..8027e9a551 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -51,9 +48,8 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
     PageSizeSelectorComponent,
     ObjectCollectionComponent,
     AsyncPipe,
-    NgIf,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index d53d173d0b..d633c1b2ac 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -193,7 +193,7 @@ describe('ChipsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [NgbModule, NgIf],
+  imports: [NgbModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index ff05e6d2b7..2121fb65b1 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -4,12 +4,7 @@ import {
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -41,14 +36,12 @@ import { ChipsItem } from './models/chips-item.model';
   imports: [
     NgbTooltipModule,
     NgClass,
-    NgForOf,
     AsyncPipe,
     AuthorityConfidenceStateDirective,
-    NgIf,
     TranslateModule,
     CdkDrag,
-    CdkDropList,
-  ],
+    CdkDropList
+],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 431ae3387f..9f974cb493 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -471,13 +471,13 @@ describe('FormComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormComponent,
     DsDynamicFormComponent,
     FormsModule,
     ReactiveFormsModule,
     NgbModule,
-    DynamicFormsCoreModule],
+    DynamicFormsCoreModule
+],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index a757239aea..c663ee6ca9 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -68,10 +65,9 @@ import { FormService } from './form.service';
     ReactiveFormsModule,
     TranslateModule,
     DynamicFormsCoreModule,
-    NgIf,
     AsyncPipe,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class FormComponent implements OnDestroy, OnInit {
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 3893dac4ea..43aa2d67ef 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -2,10 +2,7 @@ import {
   CdkTreeModule,
   FlatTreeControl,
 } from '@angular/cdk/tree';
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -62,14 +59,13 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
   imports: [
     FormsModule,
     NgbTooltipModule,
-    NgIf,
     CdkTreeModule,
     TranslateModule,
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
index 9581ba8ea8..f751d60d75 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
@@ -1,7 +1,9 @@
-<ul class="navbar-nav" *ngIf="isImpersonating$ | async">
-  <li class="nav-item">
-    <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
-      <i class="fa fa-user-secret"></i>
-    </button>
-  </li>
-</ul>
+@if (isImpersonating$ | async) {
+  <ul class="navbar-nav">
+    <li class="nav-item">
+      <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
+        <i class="fa fa-user-secret"></i>
+      </button>
+    </li>
+  </ul>
+}
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
index a6510f8eb2..745d49a5cd 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -27,7 +24,7 @@ import { isAuthenticated } from '../../core/auth/selectors';
   selector: 'ds-impersonate-navbar',
   templateUrl: 'impersonate-navbar.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 /**
  * Navbar component for actions to take concerning impersonating users
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index 17e7197261..dfa3e241fd 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -1,25 +1,27 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(currentObject)"
-      [action]="action"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input mb-2"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
-                </button>
-            </div>
+  [action]="action"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input mb-2"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
+          </button>
         </div>
+      }
     </div>
+  </div>
 </form>
 
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index af3b7cc010..72fe0e4129 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   forwardRef,
@@ -38,7 +34,7 @@ import { InputSuggestionsComponent } from '../input-suggestions.component';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, ListableObjectComponentLoaderComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, ListableObjectComponentLoaderComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index addc1999d1..7638533295 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   forwardRef,
@@ -35,7 +29,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, NgIf, NgTemplateOutlet, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, NgTemplateOutlet, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
index 188dcbcb6a..35f95f7313 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -1,24 +1,26 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
-                    <span [innerHTML]="suggestionOption.displayValue"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 0ef8d753e0..1dc350d319 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -33,7 +29,7 @@ import { DebounceDirective } from '../utils/debounce.directive';
   selector: 'ds-input-suggestions',
   templateUrl: './input-suggestions.component.html',
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index c5d71e33fd..f0867ad874 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -1,25 +1,27 @@
 <form [formGroup]="form" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="checkIfValidInput(form);close();">
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="checkIfValidInput(form);close();">
   <input [readonly]="disable" #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
-         class="form-control suggestion_input"
-         [ngClass]="{'is-invalid': !valid}"
-         [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-         [placeholder]="placeholder"
-         ng-model-options="{standalone: true}"
-         autocomplete="off">
+    class="form-control suggestion_input"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    ng-model-options="{standalone: true}"
+    autocomplete="off">
   <button class="sr-only" type="submit">
     {{'search.filters.search.submit' | translate}}
   </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
-      <div *ngFor="let suggestionOption of suggestions">
-        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
-          <span [innerHTML]="suggestionOption.displayValue"></span>
-        </a>
-      </div>
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
+        </div>
+      }
     </div>
   </div>
 </form>
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index 6160b9ef09..3f1b69c351 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   forwardRef,
@@ -41,7 +37,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 6d1727cfe7..b9b3aa5b7c 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,21 +1,25 @@
-<div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="javascript:void(0);" role="menuitem"
-     [attr.aria-label]="'nav.language' |translate"
-     aria-controls="language-menu-list"
-     aria-haspopup="menu"
-     [title]="'nav.language' | translate"
-     (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
-     data-test="lang-switch"
-     tabindex="0">
-    <i class="fas fa-globe-asia fa-lg fa-fw"></i>
-  </a>
-  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
-    <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
-        role="menuitem"
-            (keyup.enter)="useLang(lang)"
-            (click)="useLang(lang)"
-            [class.active]="lang === translate.currentLang">
-                {{ langLabel(lang) }}
-    </li>
-  </ul>
-</div>
+@if (moreThanOneLanguage) {
+  <div ngbDropdown class="navbar-nav" display="dynamic" placement="bottom-right">
+    <a href="javascript:void(0);" role="menuitem"
+      [attr.aria-label]="'nav.language' |translate"
+      aria-controls="language-menu-list"
+      aria-haspopup="menu"
+      [title]="'nav.language' | translate"
+      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+      data-test="lang-switch"
+      tabindex="0">
+      <i class="fas fa-globe-asia fa-lg fa-fw"></i>
+    </a>
+    <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
+      @for (lang of translate.getLangs(); track lang) {
+        <li class="dropdown-item" tabindex="0" #langSelect
+          role="menuitem"
+          (keyup.enter)="useLang(lang)"
+          (click)="useLang(lang)"
+          [class.active]="lang === translate.currentLang">
+          {{ langLabel(lang) }}
+        </li>
+      }
+    </ul>
+  </div>
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 3acb169419..c78ae18929 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   ElementRef,
@@ -22,7 +19,7 @@ import { LocaleService } from '../../core/locale/locale.service';
   styleUrls: ['lang-switch.component.scss'],
   templateUrl: 'lang-switch.component.html',
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
+  imports: [NgbDropdownModule, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/live-region/live-region.component.html b/src/app/shared/live-region/live-region.component.html
index a48f3ad52e..5f0d81c43f 100644
--- a/src/app/shared/live-region/live-region.component.html
+++ b/src/app/shared/live-region/live-region.component.html
@@ -1,3 +1,5 @@
 <div class="live-region" [ngClass]="{'visually-hidden': !isVisible }" aria-live="assertive" role="log" aria-relevant="additions" aria-atomic="true">
-  <div class="live-region-message" *ngFor="let message of (messages$ | async)">{{ message }}</div>
+  @for (message of (messages$ | async); track message) {
+    <div class="live-region-message">{{ message }}</div>
+  }
 </div>
diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
index 7fb4a8b52b..4842dfcd42 100644
--- a/src/app/shared/live-region/live-region.component.ts
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -22,7 +18,7 @@ import { LiveRegionService } from './live-region.service';
   templateUrl: './live-region.component.html',
   styleUrls: ['./live-region.component.scss'],
   standalone: true,
-  imports: [NgClass, NgFor, AsyncPipe],
+  imports: [NgClass, AsyncPipe],
 })
 export class LiveRegionComponent implements OnInit {
 
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index b982af4208..6d9008deaf 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -15,7 +15,7 @@ import { hasValue } from '../empty.util';
   styleUrls: ['./loading.component.scss'],
   templateUrl: './loading.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 export class LoadingComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 309e226772..8fdd91b4fa 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,7 +1,13 @@
-<ds-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-loading>
-<div *ngIf="(loading | async) !== true && (isAuthenticated | async) !== true" class="px-4 py-3 mx-auto login-container">
-  <ng-container *ngFor="let authMethod of (authMethods | async); let last = last">
-    <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
-    <div *ngIf="!last" class="dropdown-divider my-2"></div>
-  </ng-container>
-</div>
+@if ((loading | async) || (isAuthenticated | async)) {
+  <ds-loading class="m-5"></ds-loading>
+}
+@if ((loading | async) !== true && (isAuthenticated | async) !== true) {
+  <div class="px-4 py-3 mx-auto login-container">
+    @for (authMethod of (authMethods | async); track authMethod; let last = $last) {
+      <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
+      @if (!last) {
+        <div class="dropdown-divider my-2"></div>
+      }
+    }
+  </div>
+}
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 3c7d829a48..be3f20c99f 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -38,7 +34,7 @@ import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
   styleUrls: ['./log-in.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, NgFor, LogInContainerComponent, AsyncPipe],
+  imports: [ThemedLoadingComponent, LogInContainerComponent, AsyncPipe],
 })
 export class LogInComponent implements OnInit {
 
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index 25ec0cba74..d7d772633d 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -63,7 +60,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, BtnDisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index de029622c0..86dd33fcc5 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -1,6 +1,8 @@
 <div class="form-login px-4">
 
-  <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
+  @if ((error | async)) {
+    <div class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
+  }
 
   <button role="menuitem" class="btn btn-lg btn-primary w-100" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts
index 73927a9be6..3c629e250b 100644
--- a/src/app/shared/log-out/log-out.component.ts
+++ b/src/app/shared/log-out/log-out.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,7 @@ import { BrowserOnlyPipe } from '../utils/browser-only.pipe';
   styleUrls: ['./log-out.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class LogOutComponent implements OnInit {
   /**
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index b8ee6ebe17..cada06e1b3 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,11 +1,15 @@
-<a *ngIf="!item.disabled"
-   class="ds-menu-item" role="menuitem"
-   routerLinkActive="active"
-   href="javascript:void(0);"
-   [title]="item.text | translate"
-   (click)="activate($event)"
-   (keyup.space)="activate($event)"
-   (keyup.enter)="activate($event)"
-   [attr.data-test]="item.text"
->{{item.text | translate}}</a>
-<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+@if (!item.disabled) {
+  <a
+    class="ds-menu-item" role="menuitem"
+    routerLinkActive="active"
+    href="javascript:void(0);"
+    [title]="item.text | translate"
+    (click)="activate($event)"
+    (keyup.space)="activate($event)"
+    (keyup.enter)="activate($event)"
+    [attr.data-test]="item.text"
+  >{{item.text | translate}}</a>
+}
+@if (item.disabled) {
+  <span [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+}
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 3073ecc470..79497a76df 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -16,7 +16,7 @@ import { OnClickMenuItemModel } from './models/onclick.model';
   styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
   templateUrl: './onclick-menu-item.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule, RouterLinkActive],
+  imports: [TranslateModule, RouterLinkActive],
 })
 export class OnClickMenuItemComponent {
   item: OnClickMenuItemModel;
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index 7748e385ca..47af6e1859 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,5 +1,7 @@
 <div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
-  <h2 class="simple-view-element-header" *ngIf="label">{{ label }}</h2>
+  @if (label) {
+    <h2 class="simple-view-element-header">{{ label }}</h2>
+  }
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
index af139e78e6..c97ac07b4a 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -13,7 +13,7 @@ import {
   styleUrls: ['./metadata-field-wrapper.component.scss'],
   templateUrl: './metadata-field-wrapper.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 export class MetadataFieldWrapperComponent {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index affbec108c..eab9a2671d 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,8 +1,12 @@
 <button type="button"
-        [className]="'btn btn-success'"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [dsBtnDisabled]="processing$ | async"
-        (click)="submitTask()">
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
+  [className]="'btn btn-success'"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="submitTask()">
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index f154837be6..8d56f55cbd 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -34,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 50e3b46dfe..b3eb6b2165 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -1,12 +1,14 @@
 <ng-container *ngVar="(actionRD$ | async)?.payload as workflowAction">
   <div class="mt-1 mb-3 space-children-mr">
-    <ds-claimed-task-actions-loader *ngFor="let option of workflowAction?.options"
-                                    [item]="item"
-                                    [option]="option"
-                                    [object]="object"
-                                    [workflowitem]="workflowitem"
-                                    (processCompleted)="this.processCompleted.emit($event)">
-    </ds-claimed-task-actions-loader>
+    @for (option of workflowAction?.options; track option) {
+      <ds-claimed-task-actions-loader
+        [item]="item"
+        [option]="option"
+        [object]="object"
+        [workflowitem]="workflowitem"
+        (processCompleted)="this.processCompleted.emit($event)">
+      </ds-claimed-task-actions-loader>
+    }
 
     <button class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
       [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index b18d2bebc9..2cc71bfc74 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -42,7 +39,7 @@ import { ClaimedTaskActionsLoaderComponent } from './switcher/claimed-task-actio
   styleUrls: ['./claimed-task-actions.component.scss'],
   templateUrl: './claimed-task-actions.component.html',
   standalone: true,
-  imports: [VarDirective, NgFor, ClaimedTaskActionsLoaderComponent, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ClaimedTaskActionsLoaderComponent, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<ClaimedTask, ClaimedTaskDataService> implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 0d1f0d471e..4787e3dd69 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,12 +1,16 @@
 <button (click)="submitTask()"
-        [dsBtnDisabled]="processing$ | async"
-        class="declineTaskAction btn btn-warning"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
-        type="button">
-  <span *ngIf="processing$ | async">
-    <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
-  </span>
-  <span *ngIf="(processing$ | async) !== true">
-    <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
-  </span>
+  [dsBtnDisabled]="processing$ | async"
+  class="declineTaskAction btn btn-warning"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
+  type="button">
+  @if (processing$ | async) {
+    <span>
+      <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+    </span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span>
+      <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
+    </span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index e021a21ae0..8e8d1ebc50 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -33,7 +30,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
index 3f3670e17f..c8a8837fa8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
@@ -1,7 +1,9 @@
-<a *ngIf="object"
-   class="btn btn-primary"
-   ngbTooltip="{{'submission.workflow.tasks.claimed.edit_help' | translate}}"
-   [routerLink]="['/workflowitems/' + (object.workflowitem | async)?.payload?.id + '/edit']"
-   role="button">
-  <i class="fa fa-edit"></i> {{'submission.workflow.tasks.claimed.edit' | translate}}
-</a>
+@if (object) {
+  <a
+    class="btn btn-primary"
+    ngbTooltip="{{'submission.workflow.tasks.claimed.edit_help' | translate}}"
+    [routerLink]="['/workflowitems/' + (object.workflowitem | async)?.payload?.id + '/edit']"
+    role="button">
+    <i class="fa fa-edit"></i> {{'submission.workflow.tasks.claimed.edit' | translate}}
+  </a>
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
index ec9ef2cc51..5d2a80830a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -28,7 +25,7 @@ export const WORKFLOW_TASK_OPTION_EDIT_METADATA = 'submit_edit_metadata';
   styleUrls: ['./claimed-task-actions-edit-metadata.component.scss'],
   templateUrl: './claimed-task-actions-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * Component for displaying the edit metadata action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 6d7ec9c036..02e7d9e469 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -45,7 +42,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index 32a619d671..ad560757a2 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,8 +1,12 @@
 <button type="button"
-        [className]="'btn btn-secondary'"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [dsBtnDisabled]="processing$ | async"
-        (click)="submitTask()">
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
+  [className]="'btn btn-secondary'"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="submitTask()">
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index a7d510a8e6..40e75324de 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -31,7 +28,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 13d432259a..7df692c69f 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,10 +1,14 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
   ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
-  <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
-    {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
-    translate}}</span>
+  @if ((processing$ | async)) {
+    <span><i class='fas fa-circle-notch fa-spin'></i>
+  {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+}
+@if ((processing$ | async) !== true) {
+  <span><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
+translate}}</span>
+}
 </button>
 <button class="btn btn-primary workflow-view ms-1 mt-1 mb-3" data-test="view-btn"
   ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 67340c9ec7..18941b1a6c 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -46,7 +43,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 9f8999f333..21191ea032 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -7,24 +7,30 @@
     <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
   </button>
 
-  <a class="btn btn-primary mt-1 mb-3 edit-btn" id="{{'edit_' + object.id}}"
-   *ngIf="(canEditItem$ | async)"
-    ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
-    [attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
-    [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
-    <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
-  </a>
+  @if ((canEditItem$ | async)) {
+    <a class="btn btn-primary mt-1 mb-3 edit-btn" id="{{'edit_' + object.id}}"
+      ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
+      [attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
+      [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
+      <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
+    </a>
+  }
 
-  <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
-    *ngIf="(canEditItem$ | async)"
-    ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
-    [attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
-    (click)="$event.preventDefault();confirmDiscard(content)">
-    <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
+  @if ((canEditItem$ | async)) {
+    <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
+      ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
+      [attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
+      (click)="$event.preventDefault();confirmDiscard(content)">
+      @if ((processingDelete$ | async)) {
+        <span><i class='fas fa-circle-notch fa-spin'></i>
       {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-    <span *ngIf="(processingDelete$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
-      translate}}</span>
-  </button>
+    }
+    @if ((processingDelete$ | async) !== true) {
+      <span><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
+    translate}}</span>
+  }
+</button>
+}
 </div>
 
 
@@ -39,8 +45,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" id="delete_cancel" class="btn btn-secondary"
-      (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
+    (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
     <button type="button" id="delete_confirm" class="btn btn-danger"
-      (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
+    (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
   </div>
 </ng-template>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index 64dfd9f7aa..68f66b4986 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -52,7 +49,7 @@ import { MyDSpaceActionsComponent } from '../mydspace-actions';
   styleUrls: ['./workspaceitem-actions.component.scss'],
   templateUrl: './workspaceitem-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, RouterLink, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<WorkspaceItem, WorkspaceitemDataService> implements OnInit {
 
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
index 29be1f475e..c10e5c6649 100644
--- a/src/app/shared/notification-box/notification-box.component.html
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -1,12 +1,14 @@
-<div role="button" *ngIf="boxConfig"
-     class="w-100 h-100 pt-4 pb-3 px-2 box-container"
-     [ngStyle]="{'background-color': boxConfig.color}"
-     [dsHoverClass]="'shadow-lg'"
-     (click)="onClick(boxConfig)"
-     [title]="boxConfig.description | translate"
->
-  <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
-    <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
-    <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+@if (boxConfig) {
+  <div role="button"
+    class="w-100 h-100 pt-4 pb-3 px-2 box-container"
+    [ngStyle]="{'background-color': boxConfig.color}"
+    [dsHoverClass]="'shadow-lg'"
+    (click)="onClick(boxConfig)"
+    [title]="boxConfig.description | translate"
+    >
+    <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
+      <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+      <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+    </div>
   </div>
-</div>
+}
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
index 51736b22ff..bfcf5729e0 100644
--- a/src/app/shared/notification-box/notification-box.component.ts
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgIf,
-  NgStyle,
-} from '@angular/common';
+import { NgStyle } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -25,9 +22,8 @@ import { listableObjectComponent } from '../object-collection/shared/listable-ob
   imports: [
     NgStyle,
     HoverClassDirective,
-    TranslateModule,
-    NgIf,
-  ],
+    TranslateModule
+],
 })
 /**
  * Component to display the count of notifications for each type of LDN message and to access the related filtered search
diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts
index 7e71fa3996..4c73bf3c23 100644
--- a/src/app/shared/notifications/notification/notification.component.ts
+++ b/src/app/shared/notifications/notification/notification.component.ts
@@ -1,11 +1,5 @@
 import { trigger } from '@angular/animations';
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-  NgStyle,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgStyle, NgTemplateOutlet } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -92,7 +86,7 @@ import { NotificationsService } from '../notifications.service';
   styleUrls: ['./notification.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, NgStyle, NgClass, NgTemplateOutlet, AsyncPipe],
+  imports: [NgStyle, NgClass, NgTemplateOutlet, AsyncPipe],
 })
 
 export class NotificationComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.html b/src/app/shared/notifications/notifications-board/notifications-board.component.html
index 854842f30d..8272ec69a6 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.html
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.html
@@ -1,10 +1,11 @@
 <div class="notifications-wrapper position-fixed"
-     [ngClass]="position"
-     (mouseenter)="this.isPaused$.next(true);"
-     (mouseleave)="this.isPaused$.next(false);">
-  <ds-notification
-    class="notification"
-    *ngFor="let a of notifications; let i = index"
-    [notification]="a" [isPaused$]="isPaused$">
-  </ds-notification>
+  [ngClass]="position"
+  (mouseenter)="this.isPaused$.next(true);"
+  (mouseleave)="this.isPaused$.next(false);">
+  @for (a of notifications; track a; let i = $index) {
+    <ds-notification
+      class="notification"
+      [notification]="a" [isPaused$]="isPaused$">
+    </ds-notification>
+  }
 </div>
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 495a6fd048..e4c55e1e28 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -43,7 +40,7 @@ import { notificationsStateSelector } from '../selectors';
   styleUrls: ['./notifications-board.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgClass, NgFor, NotificationComponent],
+  imports: [NgClass, NotificationComponent],
 })
 export class NotificationsBoardComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 9d7851428d..efed2d968b 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -1,76 +1,84 @@
-<ds-object-list [ngClass]="placeholderFontClass"
-                [config]="config"
-                [sortConfig]="sortConfig"
-                [objects]="objects"
-                [hasBorder]="hasBorder"
-                [hideGear]="hideGear"
-                [linkType]="linkType"
-                [context]="context"
-                [hidePaginationDetail]="hidePaginationDetail"
-                [showPaginator]="showPaginator"
-                [showThumbnails]="showThumbnails"
-                (paginationChange)="onPaginationChange($event)"
-                (pageChange)="onPageChange($event)"
-                (pageSizeChange)="onPageSizeChange($event)"
-                (sortDirectionChange)="onSortDirectionChange($event)"
-                (deselectObject)="deselectObject.emit($event)"
-                (selectObject)="selectObject.emit($event)"
-                (sortFieldChange)="onSortFieldChange($event)"
-                [selectable]="selectable"
-                [selectionConfig]="selectionConfig"
-                [importable]="importable"
-                [importConfig]="importConfig"
-                (importObject)="importObject.emit($event)"
-                (contentChange)="contentChange.emit($event)"
-                (prev)="goPrev()"
-                (next)="goNext()"
-                *ngIf="(currentMode$ | async) === viewModeEnum.ListElement">
-</ds-object-list>
+@if ((currentMode$ | async) === viewModeEnum.ListElement) {
+  <ds-object-list [ngClass]="placeholderFontClass"
+    [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hasBorder]="hasBorder"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (deselectObject)="deselectObject.emit($event)"
+    (selectObject)="selectObject.emit($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    [selectable]="selectable"
+    [selectionConfig]="selectionConfig"
+    [importable]="importable"
+    [importConfig]="importConfig"
+    (importObject)="importObject.emit($event)"
+    (contentChange)="contentChange.emit($event)"
+    (prev)="goPrev()"
+    (next)="goNext()"
+    >
+  </ds-object-list>
+}
 
-<ds-object-grid [config]="config"
-                [sortConfig]="sortConfig"
-                [objects]="objects"
-                [hideGear]="hideGear"
-                [linkType]="linkType"
-                [context]="context"
-                [hidePaginationDetail]="hidePaginationDetail"
-                [showPaginator]="showPaginator"
-                [showThumbnails]="showThumbnails"
-                (paginationChange)="onPaginationChange($event)"
-                (pageChange)="onPageChange($event)"
-                (pageSizeChange)="onPageSizeChange($event)"
-                (sortDirectionChange)="onSortDirectionChange($event)"
-                (sortFieldChange)="onSortFieldChange($event)"
-                *ngIf="(currentMode$ | async) === viewModeEnum.GridElement">
-</ds-object-grid>
+@if ((currentMode$ | async) === viewModeEnum.GridElement) {
+  <ds-object-grid [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    >
+  </ds-object-grid>
+}
 
-<ds-object-detail [config]="config"
-                  [sortConfig]="sortConfig"
-                  [objects]="objects"
-                  [hideGear]="hideGear"
-                  [linkType]="linkType"
-                  [context]="context"
-                  [hidePaginationDetail]="hidePaginationDetail"
-                  [showPaginator]="showPaginator"
-                  [showThumbnails]="showThumbnails"
-                  (contentChange)="contentChange.emit($event)"
-                  *ngIf="(currentMode$ | async) === viewModeEnum.DetailedListElement">
-</ds-object-detail>
+@if ((currentMode$ | async) === viewModeEnum.DetailedListElement) {
+  <ds-object-detail [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (contentChange)="contentChange.emit($event)"
+    >
+  </ds-object-detail>
+}
 
 
-<ds-object-table  [config]="config"
-                  [sortConfig]="sortConfig"
-                  [objects]="objects"
-                  [hideGear]="hideGear"
-                  [linkType]="linkType"
-                  [context]="context"
-                  [hidePaginationDetail]="hidePaginationDetail"
-                  [showPaginator]="showPaginator"
-                  [showThumbnails]="showThumbnails"
-                  (paginationChange)="onPaginationChange($event)"
-                  (pageChange)="onPageChange($event)"
-                  (pageSizeChange)="onPageSizeChange($event)"
-                  (sortDirectionChange)="onSortDirectionChange($event)"
-                  (sortFieldChange)="onSortFieldChange($event)"
-                  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
-</ds-object-table>
+@if ((currentMode$ | async) === viewModeEnum.Table) {
+  <ds-object-table  [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    >
+  </ds-object-table>
+}
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index bae371cd73..4ab61acfc4 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -52,7 +47,7 @@ import { ListableObject } from './shared/listable-object.model';
   styleUrls: ['./object-collection.component.scss'],
   templateUrl: './object-collection.component.html',
   standalone: true,
-  imports: [NgIf, ThemedObjectListComponent, NgClass, ObjectGridComponent, ObjectDetailComponent, AsyncPipe, ObjectTableComponent],
+  imports: [ThemedObjectListComponent, NgClass, ObjectGridComponent, ObjectDetailComponent, AsyncPipe, ObjectTableComponent],
 })
 export class ObjectCollectionComponent implements OnInit {
   /**
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 0b86b782f6..5fafb5db77 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -32,7 +29,7 @@ import { AccessStatusObject } from './access-status.model';
   templateUrl: './access-status-badge.component.html',
   styleUrls: ['./access-status-badge.component.scss'],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 /**
  * Component rendering the access status of an item as a badge
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts
index 923ef4af8f..df82dfe991 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -32,7 +32,7 @@ const MY_DSPACE_STATUS_CONTEXTS = [
   templateUrl: './badges.component.html',
   styleUrls: ['./badges.component.scss'],
   standalone: true,
-  imports: [ThemedStatusBadgeComponent, NgIf, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
+  imports: [ThemedStatusBadgeComponent, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
 })
 export class BadgesComponent {
   /**
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index 7ed015f13c..eb9c372831 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -13,7 +13,7 @@ import { hasValue } from '../../../../empty.util';
   selector: 'ds-base-status-badge',
   templateUrl: './status-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * Component rendering the status of an item as a badge
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 703263efb6..0cc00397a9 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -16,7 +16,7 @@ import {
   selector: 'ds-base-type-badge',
   templateUrl: './type-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * Component rendering the type of an item as a badge
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
index 9836736b76..ef5a32f5fb 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -35,7 +32,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
   styleUrls: ['./item-collection.component.scss'],
   templateUrl: './item-collection.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, TranslateModule],
+  imports: [RouterLink, AsyncPipe, TranslateModule],
 })
 export class ItemCollectionComponent implements OnInit {
 
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
index 5f71640359..de44ce0ddb 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -34,7 +31,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
   styleUrls: ['./item-submitter.component.scss'],
   templateUrl: './item-submitter.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class ItemSubmitterComponent implements OnInit {
 
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
index 4a923f7e16..7466da5967 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -27,7 +24,7 @@ import { ListableObject } from '../listable-object.model';
   // styleUrls: ['./selectable-list-item-control.component.scss'],
   templateUrl: './selectable-list-item-control.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, FormsModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, FormsModule, AsyncPipe, TranslateModule],
 })
 /**
  * Component for rendering list item that has a control (checkbox or radio button) because it's selectable
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
index 9a80421fbf..9a2260f29d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
@@ -1,12 +1,11 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-detail-preview [item]="item$?.value"
-                          [object]="object"
-                          [showSubmitter]="showSubmitter"
-                          [badgeContext]="badgeContext">
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext">
   </ds-item-detail-preview>
-
   <ds-claimed-task-actions [item]="item$.value"
-                           [object]="dso"
-                           [workflowitem]="workflowitem$.value"
-                           (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
-</ng-container>
+    [object]="dso"
+    [workflowitem]="workflowitem$.value"
+  (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
+}
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index be3153fc13..482550c3f1 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -46,7 +43,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
   styleUrls: ['../search-result-detail-element.component.scss'],
   templateUrl: './claimed-task-search-result-detail-element.component.html',
   standalone: true,
-  imports: [NgIf, ItemDetailPreviewComponent, ClaimedTaskActionsComponent, AsyncPipe],
+  imports: [ItemDetailPreviewComponent, ClaimedTaskActionsComponent, AsyncPipe],
 })
 
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.DetailedListElement)
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
index 2b7e7f8f6e..0fa8da1f72 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
@@ -1,10 +1,14 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-  <ng-container *ngIf="item.hasMetadata(metadata)">
-    <span *ngFor="let mdValue of allMetadataValues(metadata); let last=last;">
-      {{mdValue}}<span *ngIf="!last" [innerHTML]="separator"></span>
+  @if (item.hasMetadata(metadata)) {
+    @for (mdValue of allMetadataValues(metadata); track mdValue; let last = $last) {
+      <span>
+        {{mdValue}}@if (!last) {
+        <span [innerHTML]="separator"></span>
+      }
     </span>
-  </ng-container>
-  <ng-container *ngIf="!item.hasMetadata(metadata)">
-    <span class="text-muted">{{(placeholder | translate)}}</span>
-  </ng-container>
+  }
+}
+@if (!item.hasMetadata(metadata)) {
+  <span class="text-muted">{{(placeholder | translate)}}</span>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 5bcda37837..caca143990 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,10 +19,8 @@ import { SearchResult } from '../../../../search/models/search-result.model';
   standalone: true,
   imports: [
     MetadataFieldWrapperComponent,
-    NgFor,
-    NgIf,
-    TranslateModule,
-  ],
+    TranslateModule
+],
 })
 export class ItemDetailPreviewFieldComponent {
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index 67abfc33a2..0325b55cda 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -1,58 +1,70 @@
-<div *ngIf="item" class="item-page" @fadeInOut>
-  <ds-badges [object]="item" [context]="badgeContext"></ds-badges>
-  <div *ngIf="item">
-    <ds-item-page-title-field [item]="item">
-    </ds-item-page-title-field>
-    <div class="row mb-1">
-      <div class="col-xs-12 col-md-4">
-        <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-          <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
-        </ds-metadata-field-wrapper>
-        <ng-container *ngIf="(bitstreams$ | async) as bitstreams">
-          <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
-            <div *ngIf="bitstreams?.length > 0" class="file-section">
-              <button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">
-                <span>{{ dsoNameService.getName(file) }}</span>
-                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-                <span *ngIf="!last" innerHTML="{{separator}}"></span>
-              </button>
+@if (item) {
+  <div class="item-page" @fadeInOut>
+    <ds-badges [object]="item" [context]="badgeContext"></ds-badges>
+    @if (item) {
+      <div>
+        <ds-item-page-title-field [item]="item">
+        </ds-item-page-title-field>
+        <div class="row mb-1">
+          <div class="col-xs-12 col-md-4">
+            <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
+              <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
+            </ds-metadata-field-wrapper>
+            @if ((bitstreams$ | async); as bitstreams) {
+              <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
+                @if (bitstreams?.length > 0) {
+                  <div class="file-section">
+                    @for (file of bitstreams; track file; let last = $last) {
+                      <button class="btn btn-link" (click)="downloadBitstreamFile(file?.uuid)">
+                        <span>{{ dsoNameService.getName(file) }}</span>
+                        <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+                        @if (!last) {
+                          <span innerHTML="{{separator}}"></span>
+                        }
+                      </button>
+                    }
+                  </div>
+                }
+                @if (bitstreams?.length === 0) {
+                  <span class="text-muted">{{('mydspace.results.no-files' | translate)}}</span>
+                }
+              </ds-metadata-field-wrapper>
+            }
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.date' | translate)"
+              [metadata]="'dc.date.issued'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.author' | translate)"
+              [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>
+          </div>
+          <div class="col-xs-12 col-md-6">
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.abstract' | translate)"
+              [metadata]="'dc.description.abstract'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-abstract' | translate)"></ds-item-detail-preview-field>
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.uri' | translate)"
+              [metadata]="'dc.identifier.uri'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-uri' | translate)"></ds-item-detail-preview-field>
+            <div>
+              <ng-content></ng-content>
             </div>
-            <ng-container *ngIf="bitstreams?.length === 0">
-              <span class="text-muted">{{('mydspace.results.no-files' | translate)}}</span>
-            </ng-container>
-          </ds-metadata-field-wrapper>
-        </ng-container>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.date' | translate)"
-                                      [metadata]="'dc.date.issued'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.author' | translate)"
-                                      [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>
-      </div>
-      <div class="col-xs-12 col-md-6">
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.abstract' | translate)"
-                                      [metadata]="'dc.description.abstract'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-abstract' | translate)"></ds-item-detail-preview-field>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.uri' | translate)"
-                                      [metadata]="'dc.identifier.uri'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-uri' | translate)"></ds-item-detail-preview-field>
-        <div>
-          <ng-content></ng-content>
+          </div>
         </div>
       </div>
-    </div>
+    }
   </div>
-</div>
-<ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+}
+@if (showSubmitter) {
+  <ds-item-submitter [object]="object.indexableObject"></ds-item-submitter>
+}
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index 20a8374bcc..cead47a179 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -42,7 +38,7 @@ import { ThemedItemDetailPreviewFieldComponent } from './item-detail-preview-fie
   templateUrl: './item-detail-preview.component.html',
   animations: [fadeInOut],
   standalone: true,
-  imports: [NgIf, ThemedBadgesComponent, ThemedItemPageTitleFieldComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, VarDirective, NgFor, ThemedItemDetailPreviewFieldComponent, ItemSubmitterComponent, AsyncPipe, FileSizePipe, TranslateModule],
+  imports: [ThemedBadgesComponent, ThemedItemPageTitleFieldComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, VarDirective, ThemedItemDetailPreviewFieldComponent, ItemSubmitterComponent, AsyncPipe, FileSizePipe, TranslateModule],
 })
 export class ItemDetailPreviewComponent implements OnChanges {
   /**
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
index d2a15b016f..9d5baec37c 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
@@ -1,12 +1,11 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-detail-preview [item]="item$?.value"
-                          [object]="object"
-                          [showSubmitter]="showSubmitter"
-                          [badgeContext]="badgeContext"></ds-item-detail-preview>
-
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+  [badgeContext]="badgeContext"></ds-item-detail-preview>
   <ds-pool-task-actions [item]="item$.value"
-                        [object]="dso"
-                        [workflowitem]="workflowitem$.value"
-                        (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
-</ng-container>
+    [object]="dso"
+    [workflowitem]="workflowitem$.value"
+  (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+}
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index 80341b5137..7b0884f2ce 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -46,7 +43,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
   styleUrls: ['../search-result-detail-element.component.scss'],
   templateUrl: './pool-search-result-detail-element.component.html',
   standalone: true,
-  imports: [NgIf, ItemDetailPreviewComponent, PoolTaskActionsComponent, AsyncPipe],
+  imports: [ItemDetailPreviewComponent, PoolTaskActionsComponent, AsyncPipe],
 })
 
 @listableObjectComponent(PoolTaskSearchResult, ViewMode.DetailedListElement)
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index c57d5344cd..ad9f0bce0e 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -14,16 +14,24 @@
   (paginationChange)="onPaginationChange($event)"
   (prev)="goPrev()"
   (next)="goNext()">
-    <div class="row mt-2" *ngIf="objects?.hasSucceeded" @fadeIn>
-      <div class="col"
-           *ngFor="let object of objects?.payload?.page">
-        <ds-listable-object-component-loader [object]="object"
-                                             [viewMode]="viewMode"
-                                             [context]="context"
-                                             [showThumbnails]="showThumbnails"
-                                             (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
-      </div>
+  @if (objects?.hasSucceeded) {
+    <div class="row mt-2" @fadeIn>
+      @for (object of objects?.payload?.page; track object) {
+        <div class="col"
+          >
+          <ds-listable-object-component-loader [object]="object"
+            [viewMode]="viewMode"
+            [context]="context"
+            [showThumbnails]="showThumbnails"
+          (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
+        </div>
+      }
     </div>
-  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index 0c3098e941..01e1795fcb 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,7 +37,7 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
   templateUrl: './object-detail.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, TranslateModule],
+  imports: [PaginationComponent, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, TranslateModule],
 })
 export class ObjectDetailComponent {
   /**
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index 6b5cb23252..e039584583 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,17 +1,25 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (object.shortDescription) {
+      <p class="card-text">{{object.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index 178c1bd5b9..92df8ae9af 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -30,7 +27,7 @@ import { followLink } from '../../utils/follow-link-config.model';
   styleUrls: ['./collection-grid-element.component.scss'],
   templateUrl: './collection-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
 })
 @listableObjectComponent(Collection, ViewMode.GridElement)
 export class CollectionGridElementComponent extends AbstractListableElementComponent<
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index c00c26d3fe..53928cbed4 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,17 +1,25 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (object.shortDescription) {
+      <p class="card-text">{{object.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index c134af774e..2b4a028dc3 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -30,7 +27,7 @@ import { followLink } from '../../utils/follow-link-config.model';
   styleUrls: ['./community-grid-element.component.scss'],
   templateUrl: './community-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
 })
 
 @listableObjectComponent(Community, ViewMode.GridElement)
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 014d31fb90..1d6727ff4b 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -15,19 +15,29 @@
   (prev)="goPrev()"
   (next)="goNext()"
   >
-    <div class="card-columns row" *ngIf="objects?.hasSucceeded">
-      <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
-        <div class="card-element" *ngFor="let object of column" [attr.data-test]="'grid-object' | dsBrowserOnly">
-          <ds-listable-object-component-loader [object]="object"
-                                               [viewMode]="viewMode"
-                                               [context]="context"
-                                               [showThumbnails]="showThumbnails"
-                                               [linkType]="linkType"></ds-listable-object-component-loader>
+  @if (objects?.hasSucceeded) {
+    <div class="card-columns row">
+      @for (column of (columns$ | async); track column) {
+        <div class="card-column col col-sm-6 col-lg-4" @fadeIn>
+          @for (object of column; track object) {
+            <div class="card-element" [attr.data-test]="'grid-object' | dsBrowserOnly">
+              <ds-listable-object-component-loader [object]="object"
+                [viewMode]="viewMode"
+                [context]="context"
+                [showThumbnails]="showThumbnails"
+              [linkType]="linkType"></ds-listable-object-component-loader>
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
-  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
 
 
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index f4b23340e8..25e42d5231 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -58,7 +54,7 @@ import { BrowserOnlyPipe } from '../utils/browser-only.pipe';
   templateUrl: './object-grid.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [PaginationComponent, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ObjectGridComponent implements OnInit {
@@ -184,7 +180,7 @@ export class ObjectGridComponent implements OnInit {
   @Output() next = new EventEmitter<boolean>();
 
   data: any = {};
-  columns$: Observable<ListableObject[]>;
+  columns$: Observable<ListableObject[][]>;
 
   constructor(private hostWindow: HostWindowService) {
     this._objects$ = new BehaviorSubject(undefined);
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index 4a097b46dc..cb24748133 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,19 +1,29 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-    <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (dso.shortDescription) {
+      <p class="card-text">{{dso.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
   <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index 8700541a6c..0e797175ba 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -31,7 +28,7 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
   styleUrls: ['../search-result-grid-element.component.scss', 'collection-search-result-grid-element.component.scss'],
   templateUrl: 'collection-search-result-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component representing a grid element for a collection search result
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index 63b6139613..d98b8a6052 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,19 +1,29 @@
 <div class="card">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-        <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-        </ds-thumbnail>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
     </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
-    <div class="card-body">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-        <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-        <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-        <div *ngIf="linkType !== linkTypes.None" class="text-center">
-            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-        </div>
-    </div>
-    <ng-content></ng-content>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
+  <div class="card-body">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
+    @if (dso.shortDescription) {
+      <p class="card-text">{{dso.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
+  </div>
+  <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index e83182b33a..9845ec10d5 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -34,7 +31,7 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
   ],
   templateUrl: 'community-search-result-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component representing a grid element for a community search result
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 a0c8ec84ce..02b48d7e78 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
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +29,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
   templateUrl: './item-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Publication
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index 6a5a3bebb5..d3379aedc2 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -27,7 +24,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./browse-entry-list-element.component.scss'],
   templateUrl: './browse-entry-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe],
+  imports: [RouterLink, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index c03598d954..edfecd2dda 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -12,7 +12,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./collection-list-element.component.scss'],
   templateUrl: './collection-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * Component representing list element for a collection
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
index adde4420ec..c4ff30e268 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -13,7 +13,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./community-list-element.component.scss'],
   templateUrl: './community-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * Component representing a list element for a community
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.html b/src/app/shared/object-list/identifier-data/identifier-data.component.html
index ec1ac6d644..573b048b42 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.html
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.html
@@ -1,3 +1,5 @@
-<div *ngIf="identifiers$ | async as identifiers">
-  <span class="">{{ identifiers[0].value | translate }}</span>
-</div>
+@if (identifiers$ | async; as identifiers) {
+  <div>
+    <span class="">{{ identifiers[0].value | translate }}</span>
+  </div>
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index af658c6cf2..2663effc9c 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,9 +18,8 @@ import { IdentifierData } from './identifier-data.model';
   templateUrl: './identifier-data.component.html',
   imports: [
     TranslateModule,
-    AsyncPipe,
-    NgIf,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
index bdf14463ad..7777f0d26f 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
@@ -1,9 +1,11 @@
 <div>
-  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
-     target="_blank" class="dont-break-out"
-     [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
-     [queryParams]="getQueryParams()">
-    {{mdRepresentation.getValue()}}
-  </a>
+  @if ((mdRepresentation.representationType==='browse_link')) {
+    <a
+      target="_blank" class="dont-break-out"
+      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
+      [queryParams]="getQueryParams()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
   <b>(new browse link page)</b>
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
index 85013671fb..0c4b007bf0 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -9,7 +9,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
   selector: 'ds-browse-link-metadata-list-element',
   templateUrl: './browse-link-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
index f88347a8b7..ecaec7ff64 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
@@ -1,17 +1,25 @@
 <div>
   <!-- Because this template is used by default, we will additionally test for representation type and display accordingly -->
-  <span *ngIf="(mdRepresentation.representationType==='plain_text') && !isLink()" class="dont-break-out">
-    {{mdRepresentation.getValue()}}
-  </span>
-  <a *ngIf="(mdRepresentation.representationType==='plain_text') && isLink()" class="dont-break-out"
-  target="_blank" [href]="mdRepresentation.getValue()">
-    {{mdRepresentation.getValue()}}
-  </a>
-  <span *ngIf="(mdRepresentation.representationType==='authority_controlled')" class="dont-break-out">{{mdRepresentation.getValue()}}</span>
-  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
-     class="dont-break-out ds-browse-link"
-     [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
-     [queryParams]="getQueryParams()">
-    {{mdRepresentation.getValue()}}
-  </a>
+  @if ((mdRepresentation.representationType==='plain_text') && !isLink()) {
+    <span class="dont-break-out">
+      {{mdRepresentation.getValue()}}
+    </span>
+  }
+  @if ((mdRepresentation.representationType==='plain_text') && isLink()) {
+    <a class="dont-break-out"
+      target="_blank" [href]="mdRepresentation.getValue()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
+  @if ((mdRepresentation.representationType==='authority_controlled')) {
+    <span class="dont-break-out">{{mdRepresentation.getValue()}}</span>
+  }
+  @if ((mdRepresentation.representationType==='browse_link')) {
+    <a
+      class="dont-break-out ds-browse-link"
+      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
+      [queryParams]="getQueryParams()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index 6eae7507e8..4976029573 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -9,7 +9,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
   selector: 'ds-plain-text-metadata-list-element',
   templateUrl: './plain-text-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
index f71bc136a0..5acf7c7d3f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-success w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                          [item]="(workflowitem?.item | async)?.payload"
-                          [object]="object"
-                          [badgeContext]="badgeContext"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+      [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index f94effe2a4..b1d8afd365 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-approved-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
index 836df02354..e3501b0543 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-secondary w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                          [item]="(workflowitem?.item | async)?.payload"
-                          [object]="object"
-                          [badgeContext]="badgeContext"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+      [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index d69b9ecda0..6f2529b45f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-declined-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
index a10f511135..ea877eaf9e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
@@ -1,11 +1,13 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-warning w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                                 [item]="(workflowitem?.item | async)?.payload"
-                                 [object]="object"
-                                 [badgeContext]="badgeContext"
-                                 [showSubmitter]="showSubmitter">
-    </ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+        [showSubmitter]="showSubmitter">
+      </ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
index e7e72189f8..1d3b99c37f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-declined-task-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index 5fc4bb6f40..4a4889c31d 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -1,26 +1,28 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-list-preview [item]="item$.value"
-                               [object]="object"
-                               [showSubmitter]="showSubmitter"
-                               [badgeContext]="badgeContext"
-                               [workflowItem]="workflowitem$.value"></ds-item-list-preview>
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext"
+  [workflowItem]="workflowitem$.value"></ds-item-list-preview>
   <!-- Display duplicate alert, if feature enabled and duplicates detected -->
   <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
-    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
-      <div [ngClass]="'col-2'"></div>
-      <div [ngClass]="'col-10'">
-        <div class="d-flex alert alert-warning w-100">
-          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+    @if (duplicateCount > 0) {
+      <div [ngClass]="'row'">
+        <div [ngClass]="'col-2'"></div>
+        <div [ngClass]="'col-10'">
+          <div class="d-flex alert alert-warning w-100">
+            {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-claimed-task-actions [item]="item$.value"
-                               [object]="dso"
-                               [workflowitem]="workflowitem$.value"
-                               (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
+        [object]="dso"
+        [workflowitem]="workflowitem$.value"
+      (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
     </div>
   </div>
-</ng-container>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 293ee040e3..72ad1b6d99 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -59,7 +55,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit, OnDestroy {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 035a7ff9f5..b005af46ec 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -1,46 +1,59 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
+      </ds-thumbnail>
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <div *ngIf="item" @fadeInOut>
-      <div class="d-flex">
-        <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
-      </div>
-      <ds-truncatable [id]="item.id">
-        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
-        <div>
-          <span class="text-muted">
-            <ds-truncatable-part [id]="item.id" [minLines]="1">
-              (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
+    @if (item) {
+      <div @fadeInOut>
+        <div class="d-flex">
+          <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
+        </div>
+        <ds-truncatable [id]="item.id">
+          <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
+          <div>
+            <span class="text-muted">
+              <ds-truncatable-part [id]="item.id" [minLines]="1">
+                (@if (item.hasMetadata('dc.publisher')) {
+                <span class="item-list-publisher"
                 [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
+              }
               <span class="item-list-date"
-                [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
-              <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
-                class="item-list-authors">
+              [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
+              @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
                 <span
-                  *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors'
-                 | translate}}</span>
-                <span
-                  *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                  <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                  <span *ngIf="!last">; </span>
+                  class="item-list-authors">
+                  @if (item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0) {
+                    <span
+                      >{{'mydspace.results.no-authors'
+                    | translate}}</span>
+                  }
+                  @for (author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author; let last = $last) {
+                    <span
+                      >
+                      <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                      @if (!last) {
+                        <span>; </span>
+                      }
+                    </span>
+                  }
                 </span>
-              </span>
-
+              }
             </ds-truncatable-part>
           </span>
-
           <ds-truncatable-part [id]="item.id" [minLines]="1" class="item-list-abstract">
             <span [ngClass]="{'text-muted': !item.firstMetadataValue('dc.description.abstract')}"
-              [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
+            [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
           </ds-truncatable-part>
-
         </div>
       </ds-truncatable>
-      <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+      @if (showSubmitter) {
+        <ds-item-submitter [object]="object.indexableObject"></ds-item-submitter>
+      }
       <ds-item-collection [object]="object.indexableObject"></ds-item-collection>
     </div>
-  </div>
+  }
+</div>
 </div>
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 583b857063..2cff0a2c48 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -43,14 +38,12 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
     ItemCollectionComponent,
     ItemSubmitterComponent,
     NgClass,
-    NgFor,
-    NgIf,
     ThemedBadgesComponent,
     ThemedThumbnailComponent,
     TranslateModule,
     TruncatableComponent,
-    TruncatablePartComponent,
-  ],
+    TruncatablePartComponent
+],
 })
 export class ItemListPreviewComponent implements OnInit {
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 77dd7d56bc..14c39dfa6c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -1,29 +1,29 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-list-preview [item]="item$.value"
-                               [object]="object"
-                               [showSubmitter]="showSubmitter"
-                               [badgeContext]="badgeContext"
-                               [workflowItem]="workflowitem$.value"></ds-item-list-preview>
-
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext"
+  [workflowItem]="workflowitem$.value"></ds-item-list-preview>
   <!-- Display duplicate alert, if feature enabled and duplicates detected -->
   <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
-    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
-      <div [ngClass]="'col-2'"></div>
-      <div [ngClass]="'col-10'">
-        <div class="d-flex alert alert-warning w-100">
-          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+    @if (duplicateCount > 0) {
+      <div [ngClass]="'row'">
+        <div [ngClass]="'col-2'"></div>
+        <div [ngClass]="'col-10'">
+          <div class="d-flex alert alert-warning w-100">
+            {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
-
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-pool-task-actions id="actions"
-                            [item]="item$.value"
-                            [object]="dso"
-                            [workflowitem]="workflowitem$.value"
-                            (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+        [item]="item$.value"
+        [object]="dso"
+        [workflowitem]="workflowitem$.value"
+      (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
     </div>
   </div>
-</ng-container>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 98e9129b68..2ed7dcb868 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -62,7 +58,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './pool-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 
 @listableObjectComponent(PoolTaskSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index d7f735e1ad..305b3b5576 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -40,7 +36,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './workflow-item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, NgClass, WorkflowitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
+  imports: [ListableObjectComponentLoaderComponent, NgClass, WorkflowitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 4a8863d22f..54d93dd708 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Inject,
@@ -40,7 +36,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss', './workspace-item-search-result-list-element.component.scss'],
   templateUrl: './workspace-item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, NgClass, WorkspaceitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
+  imports: [ListableObjectComponentLoaderComponent, NgClass, WorkspaceitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 1b70b81242..3073623c2e 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -1,36 +1,44 @@
 <ds-pagination
-        [paginationOptions]="config"
-        [collectionSize]="objects?.payload?.totalElements"
-        [objects]="objects"
-        [sortOptions]="sortConfig"
-        [hideGear]="hideGear"
-        [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
-        [hidePaginationDetail]="hidePaginationDetail"
-        [showPaginator]="showPaginator"
-        (pageChange)="onPageChange($event)"
-        (pageSizeChange)="onPageSizeChange($event)"
-        (sortDirectionChange)="onSortDirectionChange($event)"
-        (sortFieldChange)="onSortFieldChange($event)"
-        (paginationChange)="onPaginationChange($event)"
-        (prev)="goPrev()"
-        (next)="goNext()">
-    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
-        <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
-          <ds-selectable-list-item-control *ngIf="selectable" [index]="i"
-                                           [object]="object"
-                                           [selectionConfig]="selectionConfig"
-                                           (deselectObject)="deselectObject.emit($event)"
-                                           (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
-          <ds-importable-list-item-control *ngIf="importable" [object]="object"
-                                           [importConfig]="importConfig"
-                                           (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
+  [paginationOptions]="config"
+  [collectionSize]="objects?.payload?.totalElements"
+  [objects]="objects"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  (paginationChange)="onPaginationChange($event)"
+  (prev)="goPrev()"
+  (next)="goNext()">
+  @if (objects?.hasSucceeded) {
+    <ul class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
+      @for (object of objects?.payload?.page; track object; let i = $index; let last = $last) {
+        <li class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
+          @if (selectable) {
+            <ds-selectable-list-item-control [index]="i"
+              [object]="object"
+              [selectionConfig]="selectionConfig"
+              (deselectObject)="deselectObject.emit($event)"
+            (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
+          }
+          @if (importable) {
+            <ds-importable-list-item-control [object]="object"
+              [importConfig]="importConfig"
+            (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
+          }
           <ds-listable-object-component-loader [object]="object"
-                                               [viewMode]="viewMode"
-                                               [index]="i"
-                                               [context]="context"
-                                               [linkType]="linkType"
-                                               [listID]="selectionConfig?.listId"
-                                               (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
+            [viewMode]="viewMode"
+            [index]="i"
+            [context]="context"
+            [linkType]="linkType"
+            [listID]="selectionConfig?.listId"
+          (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
         </li>
+      }
     </ul>
+  }
 </ds-pagination>
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 707792bec9..cf3e0164f6 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -39,7 +35,7 @@ import { SelectableListService } from './selectable-list/selectable-list.service
   templateUrl: './object-list.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
+  imports: [PaginationComponent, NgClass, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
 })
 export class ObjectListComponent {
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 2641792b02..550f235180 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -20,7 +17,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
   styleUrls: ['../search-result-list-element.component.scss', 'collection-search-result-list-element.component.scss'],
   templateUrl: 'collection-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, ThemedBadgesComponent, RouterLink],
+  imports: [NgClass, ThemedBadgesComponent, RouterLink],
 })
 /**
  * Component representing a collection search result in list view
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index e8e3c57959..17e7631945 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -20,7 +17,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
   styleUrls: ['../search-result-list-element.component.scss', 'community-search-result-list-element.component.scss'],
   templateUrl: 'community-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, ThemedBadgesComponent, RouterLink],
+  imports: [NgClass, ThemedBadgesComponent, RouterLink],
 })
 /**
  * Component representing a community search result in list view
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 baebf5fe86..db647b6e74 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,46 +1,74 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+      }
     </div>
 
-    <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
-      <span class="text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
-            (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
-            <span *ngIf="dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')">, </span>
-          <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
-          </ng-container>
-          <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                <span *ngIf="!last">; </span>
-            </span>
-          </span>
-        </ds-truncatable-part>
-      </span>
-      <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-          [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-        </ds-truncatable-part>
-      </div>
+    @if (object !== undefined && object !== null) {
+      <ds-truncatable [id]="dso.id">
+        @if (linkType !== linkTypes.None) {
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+            [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+          [innerHTML]="dsoTitle"></a>
+        }
+        @if (linkType === linkTypes.None) {
+          <span class="lead item-list-title dont-break-out"
+          [innerHTML]="dsoTitle"></span>
+        }
+        <span class="text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            @if (dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')) {
+              (@if (dso.firstMetadataValue('dc.publisher')) {
+              <span class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
+            }
+            @if (dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')) {
+              <span>, </span>
+            }
+            @if (dso.firstMetadataValue('dc.date.issued')) {
+              <span class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>
+              })
+            }
+            @if (dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
+              <span class="item-list-authors">
+                @for (author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author; let last = $last) {
+                  <span>
+                    <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                    @if (!last) {
+                      <span>; </span>
+                    }
+                  </span>
+                }
+              </span>
+            }
+          </ds-truncatable-part>
+        </span>
+        @if (dso.firstMetadataValue('dc.description.abstract')) {
+          <div class="item-list-abstract">
+            <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
+            [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+          </ds-truncatable-part>
+        </div>
+      }
     </ds-truncatable>
-  </div>
+  }
+</div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 26a1d7e655..76f5b420c0 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -28,7 +23,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
   styleUrls: ['./item-search-result-list-element.component.scss'],
   templateUrl: './item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Publication
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index e65883cd3e..11efa36011 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -37,7 +33,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
   selector: 'ds-sidebar-search-list-element',
   templateUrl: './sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 1d1b8ed06b..684e731dbd 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -37,7 +32,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [VarDirective, PaginationComponent, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 2267a65686..7006978c56 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -35,7 +30,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [VarDirective, PaginationComponent, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
index 2bb15aaf1c..8e76f3127a 100644
--- a/src/app/shared/object-table/object-table.component.html
+++ b/src/app/shared/object-table/object-table.component.html
@@ -15,18 +15,24 @@
   (prev)="goPrev()"
   (next)="goNext()"
   [retainScrollPosition]="true"
->
-  <div *ngIf="objects?.hasSucceeded">
-    <div @fadeIn>
-      <ds-tabulatable-objects-loader [objects]="objects.payload"
-                                     [context]="context"
-                                     [showThumbnails]="showThumbnails"
-                                     [linkType]="linkType">
-      </ds-tabulatable-objects-loader>
+  >
+  @if (objects?.hasSucceeded) {
+    <div>
+      <div @fadeIn>
+        <ds-tabulatable-objects-loader [objects]="objects.payload"
+          [context]="context"
+          [showThumbnails]="showThumbnails"
+          [linkType]="linkType">
+        </ds-tabulatable-objects-loader>
+      </div>
     </div>
-  </div>
-  <ds-error *ngIf="objects?.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects?.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects?.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects?.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
 
 
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
index 438097e902..67939a00ad 100644
--- a/src/app/shared/object-table/object-table.component.ts
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,12 +36,11 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
   animations: [fadeIn],
   imports: [
     PaginationComponent,
-    NgIf,
     ThemedLoadingComponent,
     ErrorComponent,
     TranslateModule,
-    TabulatableObjectsLoaderComponent,
-  ],
+    TabulatableObjectsLoaderComponent
+],
   standalone: true,
 })
 
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
index 6e8ba7100f..df643607cf 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,10 +17,9 @@ import { MetadataValue } from '../../core/shared/metadata.models';
   selector: 'ds-orcid-badge-and-tooltip',
   standalone: true,
   imports: [
-    NgIf,
     NgbTooltipModule,
-    NgClass,
-  ],
+    NgClass
+],
   templateUrl: './orcid-badge-and-tooltip.component.html',
   styleUrl: './orcid-badge-and-tooltip.component.scss',
 })
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.html b/src/app/shared/page-size-selector/page-size-selector.component.html
index de7cb34967..b52a0640fc 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.html
+++ b/src/app/shared/page-size-selector/page-size-selector.component.html
@@ -1,13 +1,15 @@
 <div class="page-size-settings">
-    <ds-sidebar-dropdown
-            [id]="'search-sidebar-rpp'"
-            [label]="'search.sidebar.settings.rpp'"
-            (changed)="reloadRPP($event)"
+  <ds-sidebar-dropdown
+    [id]="'search-sidebar-rpp'"
+    [label]="'search.sidebar.settings.rpp'"
+    (changed)="reloadRPP($event)"
     >
-        <option *ngFor="let pageSizeOption of (paginationOptions$ | async).pageSizeOptions"
-                [value]="pageSizeOption"
-                [selected]="pageSizeOption === +((paginationOptions$ | async).pageSize) ? 'selected': null">
-            {{pageSizeOption}}
-        </option>
-    </ds-sidebar-dropdown>
+    @for (pageSizeOption of (paginationOptions$ | async).pageSizeOptions; track pageSizeOption) {
+      <option
+        [value]="pageSizeOption"
+        [selected]="pageSizeOption === +((paginationOptions$ | async).pageSize) ? 'selected': null">
+        {{pageSizeOption}}
+      </option>
+    }
+  </ds-sidebar-dropdown>
 </div>
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 80a612aacb..02e9327911 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -30,7 +27,7 @@ import { SidebarDropdownComponent } from '../sidebar/sidebar-dropdown.component'
   styleUrls: ['./page-size-selector.component.scss'],
   templateUrl: './page-size-selector.component.html',
   standalone: true,
-  imports: [SidebarDropdownComponent, NgFor, FormsModule, AsyncPipe],
+  imports: [SidebarDropdownComponent, FormsModule, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index 625cfe3998..353ba05ad9 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -397,10 +397,7 @@ describe('Pagination component', () => {
 @Component({
   selector: 'ds-test-cmp', template: '',
   standalone: true,
-  imports: [CommonModule,
-    NgxPaginationModule,
-    PaginationComponent,
-    NgbModule],
+  imports: [NgxPaginationModule, PaginationComponent, NgbModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index ee82138a0e..ca87571671 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -71,7 +66,7 @@ interface PaginationDetails {
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, BtnDisabledDirective],
+  imports: [NgbDropdownModule, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, BtnDisabledDirective],
 })
 export class PaginationComponent implements OnChanges, OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index cd3b5b932f..49f94970c5 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -1,10 +1,10 @@
 <td class="text-center">
   <div class="custom-control custom-checkbox">
     <input type="checkbox"
-           class="custom-control-input"
-           [id]="entry.id"
-           [ngModel]="entry.checked"
-           (ngModelChange)="this.toggleCheckbox.emit($event);">
+      class="custom-control-input"
+      [id]="entry.id"
+      [ngModel]="entry.checked"
+      (ngModelChange)="this.toggleCheckbox.emit($event);">
     <label class="custom-control-label" [for]="entry.id">
       <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
     </label>
@@ -28,14 +28,16 @@
 
   <div class="btn-group edit-field">
     <button class="btn btn-outline-primary btn-sm"
-            [title]="'resource-policies.table.headers.edit.policy' | translate"
-            (click)="redirectToResourcePolicyEditPage()">
+      [title]="'resource-policies.table.headers.edit.policy' | translate"
+      (click)="redirectToResourcePolicyEditPage()">
       <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
-    <button *ngIf="groupName$ | async | dsHasValue" class="btn btn-outline-primary btn-sm"
-            [title]="'resource-policies.table.headers.edit.group' | translate"
-            (click)="redirectToGroupEditPage()">
-      <i class="fas fa-users fa-fw" aria-hidden="true"></i>
-    </button>
+    @if (groupName$ | async | dsHasValue) {
+      <button class="btn btn-outline-primary btn-sm"
+        [title]="'resource-policies.table.headers.edit.group' | translate"
+        (click)="redirectToGroupEditPage()">
+        <i class="fas fa-users fa-fw" aria-hidden="true"></i>
+      </button>
+    }
   </div>
 </td>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
index 491ebffb86..5d1ca74df4 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -60,9 +60,8 @@ export interface ResourcePolicyCheckboxEntry {
     AsyncPipe,
     TranslateModule,
     FormsModule,
-    NgIf,
-    HasValuePipe,
-  ],
+    HasValuePipe
+],
   standalone: true,
 })
 export class ResourcePolicyEntryComponent implements OnInit {
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index deaef6c611..6481e942b3 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -496,10 +496,10 @@ describe('ResourcePolicyFormComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormsModule,
     NgbModule,
-    ReactiveFormsModule],
+    ReactiveFormsModule
+],
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 08a7f18492..28f1f9176a 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -94,10 +90,8 @@ export interface ResourcePolicyEvent {
     EpersonGroupListComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgFor,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 04d5fb7960..b560e25267 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -7,27 +7,31 @@
             <span>
               {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }}
               <span class="text-info"> {{resourceName}} </span>
-              <ng-container *ngIf="resourceType !== 'item'">
+              @if (resourceType !== 'item') {
                 ({{resourceUUID}})
-              </ng-container>
+              }
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
-                      [title]="'resource-policies.delete.btn.title' | translate"
-                      (click)="deleteSelectedResourcePolicies()">
-                <span *ngIf="(isProcessingDelete() | async)">
-                  <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
-                </span>
-                <span *ngIf="(isProcessingDelete() | async) !== true">
-                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
-                  {{'resource-policies.delete.btn' | translate}}
-                </span>
+                [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                [title]="'resource-policies.delete.btn.title' | translate"
+                (click)="deleteSelectedResourcePolicies()">
+                @if ((isProcessingDelete() | async)) {
+                  <span>
+                    <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                  </span>
+                }
+                @if ((isProcessingDelete() | async) !== true) {
+                  <span>
+                    <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
+                    {{'resource-policies.delete.btn' | translate}}
+                  </span>
+                }
               </button>
               <button class="btn btn-success p-1"
-                      [dsBtnDisabled]="(isProcessingDelete() | async)"
-                      [title]="'resource-policies.add.for.' + resourceType | translate"
-                      (click)="redirectToResourcePolicyCreatePage()">
+                [dsBtnDisabled]="(isProcessingDelete() | async)"
+                [title]="'resource-policies.add.for.' + resourceType | translate"
+                (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
                 {{'resource-policies.add.button' | translate}}
               </button>
@@ -35,34 +39,40 @@
           </div>
         </th>
       </tr>
-      <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
-        <th>
-          <div class="custom-control custom-checkbox">
-            <input #selectAllBtn type="checkbox"
-                   class="custom-control-input"
-                   [id]="'selectAll_' + resourceUUID"
-                   (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
-              <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
-            </label>
-          </div>
-        </th>
-        <th>{{'resource-policies.table.headers.id' | translate}}</th>
-        <th>{{'resource-policies.table.headers.name' | translate}}</th>
-        <th>{{'resource-policies.table.headers.policyType' | translate}}</th>
-        <th>{{'resource-policies.table.headers.action' | translate}}</th>
-        <th>{{'resource-policies.table.headers.eperson' | translate}}</th>
-        <th>{{'resource-policies.table.headers.group' | translate}}</th>
-        <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
-        <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
-        <th>{{'resource-policies.table.headers.edit' | translate}}</th>
-      </tr>
+      @if ((getResourcePolicies() | async)?.length > 0) {
+        <tr class="text-center">
+          <th>
+            <div class="custom-control custom-checkbox">
+              <input #selectAllBtn type="checkbox"
+                class="custom-control-input"
+                [id]="'selectAll_' + resourceUUID"
+                (change)="selectAllCheckbox($event)">
+              <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+                <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
+              </label>
+            </div>
+          </th>
+          <th>{{'resource-policies.table.headers.id' | translate}}</th>
+          <th>{{'resource-policies.table.headers.name' | translate}}</th>
+          <th>{{'resource-policies.table.headers.policyType' | translate}}</th>
+          <th>{{'resource-policies.table.headers.action' | translate}}</th>
+          <th>{{'resource-policies.table.headers.eperson' | translate}}</th>
+          <th>{{'resource-policies.table.headers.group' | translate}}</th>
+          <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
+          <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
+          <th>{{'resource-policies.table.headers.edit' | translate}}</th>
+        </tr>
+      }
     </thead>
-    <tbody *ngIf="(getResourcePolicies() | async)?.length > 0">
-      <tr ds-resource-policy-entry *ngFor="let entry of (getResourcePolicies() | async)"
-          [entry]="entry"
-          (toggleCheckbox)="selectCheckbox(entry, $event)"
-      ></tr>
-    </tbody>
+    @if ((getResourcePolicies() | async)?.length > 0) {
+      <tbody>
+        @for (entry of (getResourcePolicies() | async); track entry) {
+          <tr ds-resource-policy-entry
+            [entry]="entry"
+            (toggleCheckbox)="selectCheckbox(entry, $event)"
+          ></tr>
+        }
+      </tbody>
+    }
   </table>
 </div>
diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
index af9b134e5e..917aec5941 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -447,9 +447,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule,
-    FormsModule,
-    ReactiveFormsModule],
+  imports: [FormsModule, ReactiveFormsModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 729789bc6e..e29304382c 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -61,11 +57,9 @@ import {
   imports: [
     ResourcePolicyEntryComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
-    NgForOf,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index 7d0338ba97..8d2b49f0e1 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -52,7 +49,7 @@ import { SearchFilter } from '../search/models/search-filter.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class RSSComponent implements OnInit, OnDestroy  {
 
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 14eb2e2f9f..dba8c67ed8 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -40,7 +37,7 @@ import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-select
   styleUrls: ['./search-form.component.scss'],
   templateUrl: './search-form.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 /**
  * Component that represents the search form
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index 259e10c275..64b4a0197f 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -5,30 +5,34 @@
     {{ 'search.sidebar.advanced-search.filters' | translate }}
   </label>
   <select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()"
-          (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
-          class="form-control mb-2" id="advanced-search-filters">
-    <option *ngFor="let advancedFilter of (advancedFilters$ | async) | keyvalue" [value]="advancedFilter.value.filter">
-      {{ 'search.filters.filter.' + advancedFilter.value.filter + '.head' | translate }}
-    </option>
+    (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
+    class="form-control mb-2" id="advanced-search-filters">
+    @for (advancedFilter of (advancedFilters$ | async); track advancedFilter.filter) {
+      <option [value]="advancedFilter.filter">
+        {{ 'search.filters.filter.' + advancedFilter.filter + '.head' | translate }}
+      </option>
+    }
   </select>
   <label class="sr-only" for="advanced-search-operators">
     {{ 'search.sidebar.advanced-search.operators' | translate }}
   </label>
   <select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()"
-          class="form-control mb-2" id="advanced-search-operators">
-    <option *ngFor="let operator of advancedFilterMap.get(currentFilter)?.operators" [value]="operator.operator">
-      {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
-    </option>
+    class="form-control mb-2" id="advanced-search-operators">
+    @for (operator of advancedFilterMap.get(currentFilter)?.operators; track operator) {
+      <option [value]="operator.operator">
+        {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
+      </option>
+    }
   </select>
   <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                               [placeholder]="'search.filters.filter.' + currentFilter + '.placeholder' | translate"
-                               [label]="'search.filters.filter.' + currentFilter + '.label' | translate"
-                               [action]="router.url"
-                               [name]="'f.' + currentFilter"
-                               [(ngModel)]="currentValue"
-                               (submitSuggestion)="applyFilter()"
-                               (findSuggestions)="findSuggestions($event)"
-                               ngDefaultControl>
+    [placeholder]="'search.filters.filter.' + currentFilter + '.placeholder' | translate"
+    [label]="'search.filters.filter.' + currentFilter + '.label' | translate"
+    [action]="router.url"
+    [name]="'f.' + currentFilter"
+    [(ngModel)]="currentValue"
+    (submitSuggestion)="applyFilter()"
+    (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl>
   </ds-filter-input-suggestions>
   <button (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index 99eaa23a0d..3b4d6117fd 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  KeyValuePipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe, KeyValuePipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -54,10 +50,9 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     FilterInputSuggestionsComponent,
     FormsModule,
     KeyValuePipe,
-    NgForOf,
     TranslateModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.html b/src/app/shared/search/search-export-csv/search-export-csv.component.html
index 7bf8704300..efc5c5dc4a 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.html
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.html
@@ -1,7 +1,9 @@
-<button *ngIf="shouldShowButton$ | async"
-   class="export-button btn btn-dark btn-sm"
-   [ngbTooltip]="tooltipMsg | translate"
-   (click)="export()"
-   [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
+@if (shouldShowButton$ | async) {
+  <button
+    class="export-button btn btn-dark btn-sm"
+    [ngbTooltip]="tooltipMsg | translate"
+    (click)="export()"
+    [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
     <i class="fas fa-file-export fa-fw"></i>
-</button>
\ No newline at end of file
+  </button>
+}
\ No newline at end of file
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index f8ec2012b1..579cabca94 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ import { SearchFilter } from '../models/search-filter.model';
   styleUrls: ['./search-export-csv.component.scss'],
   templateUrl: './search-export-csv.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 /**
  * Display a button to export the current search results as csv
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index eaf5768cce..309d75c42f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -24,7 +20,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-authority-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index 5c52b5b529..7fb5ec6019 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -22,7 +18,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-boolean-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 17615e6221..b0b255615b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -35,7 +32,7 @@ import { getFacetValueForType } from '../../../../search.utils';
   styleUrls: ['./search-facet-option.component.scss'],
   templateUrl: './search-facet-option.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, TranslateModule, ShortNumberPipe],
+  imports: [RouterLink, AsyncPipe, TranslateModule, ShortNumberPipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 3c2028664c..893691fc0f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ const rangeDelimiter = '-';
   // templateUrl: './search-facet-range-option.component.html',
   templateUrl: './search-facet-range-option.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, ShortNumberPipe],
+  imports: [RouterLink, AsyncPipe, ShortNumberPipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index f20a256063..32821d27b6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -1,28 +1,30 @@
-<div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async"
-     [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
-  <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
-          class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
-          [attr.aria-expanded]="(collapsed$ | async) !== true"
-          [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
-          [attr.data-test]="'filter-toggle' | dsBrowserOnly"
-  >
-    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
-      {{'search.filters.filter.' + filter.name + '.head'| translate}}
-    </span>
-    <i class="filter-toggle flex-grow-1 fas p-auto"
-       aria-hidden="true"
-       [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-       [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
-    </i>
-  </button>
-  <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
-       (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
-       class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
-    <ds-search-facet-filter-wrapper
-      [scope]="scope"
-      [filterConfig]="filter"
-      [inPlaceSearch]="inPlaceSearch"
-      [refreshFilters]="refreshFilters">
-    </ds-search-facet-filter-wrapper>
+@if (active$ | async) {
+  <div class="facet-filter d-block mb-3 p-3"
+    [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
+    <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
+      class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
+      [attr.aria-expanded]="(collapsed$ | async) !== true"
+      [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
+      [attr.data-test]="'filter-toggle' | dsBrowserOnly"
+      >
+      <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
+        {{'search.filters.filter.' + filter.name + '.head'| translate}}
+      </span>
+      <i class="filter-toggle flex-grow-1 fas p-auto"
+        aria-hidden="true"
+        [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
+        [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+      </i>
+    </button>
+    <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
+      (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
+      class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
+      <ds-search-facet-filter-wrapper
+        [scope]="scope"
+        [filterConfig]="filter"
+        [inPlaceSearch]="inPlaceSearch"
+        [refreshFilters]="refreshFilters">
+      </ds-search-facet-filter-wrapper>
+    </div>
   </div>
-</div>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 734e372e5b..1605298cd9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  LowerCasePipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, LowerCasePipe, NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -53,7 +48,7 @@ import { SearchFacetFilterWrapperComponent } from './search-facet-filter-wrapper
   templateUrl: './search-filter.component.html',
   animations: [slide],
   standalone: true,
-  imports: [NgIf, NgClass, SearchFacetFilterWrapperComponent, AsyncPipe, LowerCasePipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, SearchFacetFilterWrapperComponent, AsyncPipe, LowerCasePipe, TranslateModule, BrowserOnlyPipe],
 })
 
 /**
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 3442780919..cce308bdb1 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,9 +1,4 @@
-import {
-  AsyncPipe,
-  LowerCasePipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, LowerCasePipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -61,7 +56,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-hierarchy-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 85f3a4c42c..d4e51c8299 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser } from '@angular/common';
 import {
   Component,
   Inject,
@@ -53,7 +48,7 @@ import {
   templateUrl: './search-range-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [FormsModule, NgIf, NouisliderComponent, DebounceDirective, NgFor, SearchFacetRangeOptionComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, NouisliderComponent, DebounceDirective, SearchFacetRangeOptionComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index 3db6bfc027..f478588415 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +27,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-text-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
index 0c3079cf5e..8b35001f7d 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -32,10 +29,9 @@ import { AppliedFilter } from '../../models/applied-filter.model';
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     RouterLink,
-    TranslateModule,
-  ],
+    TranslateModule
+],
 })
 export class SearchLabelRangeComponent implements OnInit {
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
index 4e84de0ceb..de8e59de78 100644
--- a/src/app/shared/search/search-labels/search-labels.component.html
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -1,6 +1,8 @@
 <div class="labels">
-  <ds-search-label-loader *ngFor="let appliedFilter of appliedFilters$ | async"
-                          [appliedFilter]="appliedFilter"
-                          [inPlaceSearch]="inPlaceSearch">
-  </ds-search-label-loader>
+  @for (appliedFilter of appliedFilters$ | async; track appliedFilter) {
+    <ds-search-label-loader
+      [appliedFilter]="appliedFilter"
+      [inPlaceSearch]="inPlaceSearch">
+    </ds-search-label-loader>
+  }
 </div>
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index b7fe4db780..307dc80d35 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  KeyValuePipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe, KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +17,7 @@ import { SearchLabelLoaderComponent } from './search-label-loader/search-label-l
   styleUrls: ['./search-labels.component.scss'],
   templateUrl: './search-labels.component.html',
   standalone: true,
-  imports: [NgFor, SearchLabelComponent, AsyncPipe, ObjectKeysPipe, SearchLabelLoaderComponent, KeyValuePipe],
+  imports: [SearchLabelComponent, AsyncPipe, ObjectKeysPipe, SearchLabelLoaderComponent, KeyValuePipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index 3fba70b119..33a54a7c75 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -19,9 +16,8 @@ import { hasValue } from '../../../empty.util';
   standalone: true,
   imports: [
     NgxSkeletonLoaderModule,
-    AsyncPipe,
-    NgForOf,
-  ],
+    AsyncPipe
+],
   templateUrl: './search-results-skeleton.component.html',
   styleUrl: './search-results-skeleton.component.scss',
 })
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index d56d69761b..0026d0ea5b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -2,49 +2,60 @@
   <div class="row">
     <div class="col-12">
       <div class="filters-badge-skeleton-container">
-          <div class="filter-badge-skeleton">
-            <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
-          </div>
+        <div class="filter-badge-skeleton">
+          <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
+        </div>
       </div>
     </div>
   </div>
 }
 
 <div class="d-flex justify-content-between">
-    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
-    <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
+  @if (!disableHeader) {
+    <h1>{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
+  }
+  @if (showCsvExport) {
+    <ds-search-export-csv [searchConfig]="searchConfig"></ds-search-export-csv>
+  }
 </div>
-<div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
+@if (searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0) {
+  <div @fadeIn>
     <ds-viewable-collection
-            [config]="searchConfig.pagination"
-            [sortConfig]="searchConfig.sort"
-            [objects]="searchResults"
-            [hideGear]="true"
-            [selectable]="selectable"
-            [selectionConfig]="selectionConfig"
-            [linkType]="linkType"
-            [context]="context"
-            [hidePaginationDetail]="hidePaginationDetail"
-            [showThumbnails]="showThumbnails"
-            (contentChange)="contentChange.emit($event)"
-            (deselectObject)="deselectObject.emit($event)"
-            (selectObject)="selectObject.emit($event)">
+      [config]="searchConfig.pagination"
+      [sortConfig]="searchConfig.sort"
+      [objects]="searchResults"
+      [hideGear]="true"
+      [selectable]="selectable"
+      [selectionConfig]="selectionConfig"
+      [linkType]="linkType"
+      [context]="context"
+      [hidePaginationDetail]="hidePaginationDetail"
+      [showThumbnails]="showThumbnails"
+      (contentChange)="contentChange.emit($event)"
+      (deselectObject)="deselectObject.emit($event)"
+      (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
-</div>
+  </div>
+}
 
-<ds-search-results-skeleton
-  *ngIf="isLoading()"
-  [showThumbnails]="showThumbnails"
-  [numberOfResults]="searchConfig.pagination.pageSize"
-></ds-search-results-skeleton>
+@if (isLoading()) {
+  <ds-search-results-skeleton
+    [showThumbnails]="showThumbnails"
+    [numberOfResults]="searchConfig.pagination.pageSize"
+  ></ds-search-results-skeleton>
+}
 
-<ds-error *ngIf="showError()"
-          message="{{errorMessageLabel() | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
+@if (showError()) {
+  <ds-error
+  message="{{errorMessageLabel() | translate}}"></ds-error>
+}
+@if (searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400) {
+  <div>
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
-       [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
-       queryParamsHandling="merge">
-        {{"search.results.no-results-link" | translate}}
+      [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
+      queryParamsHandling="merge">
+      {{"search.results.no-results-link" | translate}}
     </a>
-</div>
+  </div>
+}
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
index 6469f8ce7e..55b94bf694 100644
--- a/src/app/shared/search/search-settings/search-settings.component.html
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -1,16 +1,20 @@
 <ng-container>
-    <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
-    <div class="result-order-settings">
-    <ds-sidebar-dropdown *ngIf="sortOptionsList"
-                         [id]="'search-sidebar-sort'"
-                         [label]="'search.sidebar.settings.sort-by'"
-                         (changed)="reloadOrder($event)">
-        <option *ngFor="let sortOptionsEntry of sortOptionsList"
-                [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
-                [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
+  <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
+  <div class="result-order-settings">
+    @if (sortOptionsList) {
+      <ds-sidebar-dropdown
+        [id]="'search-sidebar-sort'"
+        [label]="'search.sidebar.settings.sort-by'"
+        (changed)="reloadOrder($event)">
+        @for (sortOptionsEntry of sortOptionsList; track sortOptionsEntry) {
+          <option
+            [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
+            [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
             {{'sorting.' + sortOptionsEntry.field + '.' + sortOptionsEntry.direction | translate}}
-        </option>
-    </ds-sidebar-dropdown>
-    </div>
-    <ds-page-size-selector></ds-page-size-selector>
+          </option>
+        }
+      </ds-sidebar-dropdown>
+    }
+  </div>
+  <ds-page-size-selector></ds-page-size-selector>
 </ng-container>
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 68f118bd1c..14e0b1a62a 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -25,7 +22,7 @@ import { SidebarDropdownComponent } from '../../sidebar/sidebar-dropdown.compone
   styleUrls: ['./search-settings.component.scss'],
   templateUrl: './search-settings.component.html',
   standalone: true,
-  imports: [NgIf, SidebarDropdownComponent, NgFor, FormsModule, PageSizeSelectorComponent, TranslateModule],
+  imports: [SidebarDropdownComponent, FormsModule, PageSizeSelectorComponent, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index d6cbc82ce2..77b05ef0dd 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -46,7 +43,7 @@ import { SearchSwitchConfigurationComponent } from '../search-switch-configurati
   styleUrls: ['./search-sidebar.component.scss'],
   templateUrl: './search-sidebar.component.html',
   standalone: true,
-  imports: [NgIf, ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
+  imports: [ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index e301a3729e..5828e69c3b 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +30,7 @@ import { SearchConfigurationOption } from './search-configuration-option.model';
   styleUrls: ['./search-switch-configuration.component.scss'],
   templateUrl: './search-switch-configuration.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 /**
  * Represents a select that allow to switch over available search configurations
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 45c7eb6f7e..24f3c9ecf1 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformServer,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, isPlatformServer, NgTemplateOutlet } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -93,7 +88,6 @@ import { SearchConfigurationOption } from './search-switch-configuration/search-
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     NgTemplateOutlet,
     PageWithSidebarComponent,
     ThemedSearchFormComponent,
@@ -101,8 +95,8 @@ import { SearchConfigurationOption } from './search-switch-configuration/search-
     ThemedSearchSidebarComponent,
     TranslateModule,
     SearchLabelsComponent,
-    ViewModeSwitchComponent,
-  ],
+    ViewModeSwitchComponent
+],
 })
 
 /**
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index aa7ae23a8b..a7eae5d31c 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Input,
@@ -24,9 +20,8 @@ import { SidebarService } from './sidebar.service';
   standalone: true,
   imports: [
     AsyncPipe,
-    NgTemplateOutlet,
-    NgIf,
-  ],
+    NgTemplateOutlet
+],
 })
 /**
  * This component takes care of displaying the sidebar properly on all viewports. It does not
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.ts b/src/app/shared/starts-with/date/starts-with-date.component.ts
index 726f708fe8..53b9bb52f5 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,4 +1,4 @@
-import { NgFor } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -21,7 +21,7 @@ import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
   styleUrls: ['./starts-with-date.component.scss'],
   templateUrl: './starts-with-date.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class StartsWithDateComponent extends StartsWithAbstractComponent implements OnInit {
 
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 05ee5bcc51..8572d31a0a 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  KeyValuePipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, KeyValuePipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -62,7 +57,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 6bdc0d397a..41e00be702 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -1,34 +1,40 @@
 <td class="dso-info">
-  <ng-container *ngIf="!!dso">
+  @if (!!dso) {
     <ds-type-badge [object]="dso"></ds-type-badge>
     <p><a [routerLink]="getPageRoute(dso)">{{ dsoNameService.getName(dso) }}</a></p>
-  </ng-container>
-  <ng-container *ngIf="!dso">
+  }
+  @if (!dso) {
     <p class="my-0">{{ 'subscriptions.table.not-available' | translate }}</p>
     <p class="text-muted my-0">{{ 'subscriptions.table.not-available-message' | translate }}</p>
-  </ng-container>
+  }
 </td>
 <td>
-  <span *ngIf="!!subscription" class="subscription-type">{{subscription.subscriptionType}}</span>
+  @if (!!subscription) {
+    <span class="subscription-type">{{subscription.subscriptionType}}</span>
+  }
 </td>
 <td class="subscription-parameters">
-  <ng-container *ngIf="!!subscription">
-		<span *ngFor="let parameterList of subscription.subscriptionParameterList; let i = index">
-			{{ 'subscriptions.frequency.' + parameterList.value | translate}}<span
-      *ngIf="i < subscription.subscriptionParameterList.length-1 ">,</span>
-		</span>
-  </ng-container>
+  @if (!!subscription) {
+    @for (parameterList of subscription.subscriptionParameterList; track parameterList; let i = $index) {
+      <span>
+        {{ 'subscriptions.frequency.' + parameterList.value | translate}}@if (i < subscription.subscriptionParameterList.length-1 ) {
+        <span
+        >,</span>
+      }
+    </span>
+  }
+}
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
     <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
-            [title]="'subscriptions.table.edit' | translate"
-            class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
+      [title]="'subscriptions.table.edit' | translate"
+      class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
     </button>
     <button (click)="deleteSubscriptionPopup(subscription)"
-            [title]="'subscriptions.table.delete' | translate"
-            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
+      [title]="'subscriptions.table.delete' | translate"
+      class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
       <i class="fas fa-trash-alt fa-fw"></i>
     </button>
   </div>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index f940e69795..ae590edb2a 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +30,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, BtnDisabledDirective],
+  imports: [ThemedTypeBadgeComponent, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 0c49a56405..61f637c16a 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   AfterViewChecked,
   Component,
@@ -19,7 +19,7 @@ import { TruncatableService } from '../truncatable.service';
   templateUrl: './truncatable-part.component.html',
   styleUrls: ['./truncatable-part.component.scss'],
   standalone: true,
-  imports: [DragClickDirective, NgIf, TranslateModule],
+  imports: [DragClickDirective, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 74ee22533d..79fa5f471a 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,38 +1,44 @@
 <div class="btn-group" data-toggle="buttons">
-    <button *ngIf="isToShow(viewModeEnum.ListElement)"
-            [attr.aria-current]="currentMode === viewModeEnum.ListElement"
-            [attr.aria-label]="'search.view-switch.show-list' | translate"
-       routerLink="."
-       [queryParams]="{view: 'list'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.ListElement)"
-       [class.active]="currentMode === viewModeEnum.ListElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'list-view' | dsBrowserOnly">
-       <i class="fas fa-list"></i>
+  @if (isToShow(viewModeEnum.ListElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.ListElement"
+      [attr.aria-label]="'search.view-switch.show-list' | translate"
+      routerLink="."
+      [queryParams]="{view: 'list'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.ListElement)"
+      [class.active]="currentMode === viewModeEnum.ListElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'list-view' | dsBrowserOnly">
+      <i class="fas fa-list"></i>
     </button>
-    <button *ngIf="isToShow(viewModeEnum.GridElement)"
-            [attr.aria-current]="currentMode === viewModeEnum.GridElement"
-            [attr.aria-label]="'search.view-switch.show-grid' | translate"
-       routerLink="."
-       [queryParams]="{view: 'grid'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.GridElement)"
-       [class.active]="currentMode === viewModeEnum.GridElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'grid-view' | dsBrowserOnly">
-       <i class="fas fa-th-large"></i>
+  }
+  @if (isToShow(viewModeEnum.GridElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.GridElement"
+      [attr.aria-label]="'search.view-switch.show-grid' | translate"
+      routerLink="."
+      [queryParams]="{view: 'grid'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.GridElement)"
+      [class.active]="currentMode === viewModeEnum.GridElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'grid-view' | dsBrowserOnly">
+      <i class="fas fa-th-large"></i>
     </button>
-    <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
-          [attr.aria-current]="currentMode === viewModeEnum.DetailedListElement"
-          [attr.aria-label]="'search.view-switch.show-detail' | translate"
-       routerLink="."
-       [queryParams]="{view: 'detailed'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.DetailedListElement)"
-       [class.active]="currentMode === viewModeEnum.DetailedListElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'detail-view' | dsBrowserOnly">
+  }
+  @if (isToShow(viewModeEnum.DetailedListElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.DetailedListElement"
+      [attr.aria-label]="'search.view-switch.show-detail' | translate"
+      routerLink="."
+      [queryParams]="{view: 'detailed'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.DetailedListElement)"
+      [class.active]="currentMode === viewModeEnum.DetailedListElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'detail-view' | dsBrowserOnly">
       <i class="far fa-square"></i>
     </button>
+  }
 </div>
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index baed3c9336..cf94e62544 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +33,7 @@ import { currentPath } from '../utils/route.utils';
   styleUrls: ['./view-mode-switch.component.scss'],
   templateUrl: './view-mode-switch.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, RouterLinkActive, TranslateModule, BrowserOnlyPipe],
+  imports: [RouterLink, RouterLinkActive, TranslateModule, BrowserOnlyPipe],
 })
 export class ViewModeSwitchComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index 78e736bd3a..a61e57faf5 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -1,28 +1,34 @@
 <div class="container">
 
   <ng-container *ngVar="(scope$ | async) as scope">
-    <h1 *ngIf="scope"
+    @if (scope) {
+      <h1
         class="header"
         id="{{ scope.id }}">
-      {{ 'statistics.header' | translate: { scope: getName(scope) } }}
-    </h1>
+        {{ 'statistics.header' | translate: { scope: getName(scope) } }}
+      </h1>
+    }
   </ng-container>
 
   <ng-container *ngVar="reports$ | async as reports">
 
-    <ng-container *ngIf="!reports">
+    @if (!reports) {
       <ds-loading></ds-loading>
-    </ng-container>
+    }
 
-    <ng-container *ngIf="reports">
-      <ds-statistics-table *ngFor="let report of reports"
-                           [report]="report"
-                           class="m-2 {{ report.id }}">
-      </ds-statistics-table>
-      <div *ngIf="(hasData$ | async) !== true">
-        {{ 'statistics.page.no-data' | translate }}
-      </div>
-    </ng-container>
+    @if (reports) {
+      @for (report of reports; track report) {
+        <ds-statistics-table
+          [report]="report"
+          class="m-2 {{ report.id }}">
+        </ds-statistics-table>
+      }
+      @if ((hasData$ | async) !== true) {
+        <div>
+          {{ 'statistics.page.no-data' | translate }}
+        </div>
+      }
+    }
 
   </ng-container>
 
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
index efa9ce43d9..4a0f87076c 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.html
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -1,36 +1,35 @@
-<div *ngIf="hasData"
-     class="m-1">
-
-  <h2 class="m-1">
-    {{ 'statistics.table.title.' + report.reportType | translate }}
-  </h2>
-
-  <table class="table table-striped" [attr.data-test]="report.reportType">
-
-    <tbody>
-
-    <tr>
-      <td></td>
-      <th scope="col"
-          *ngFor="let header of headers"
-          class="{{header}}-header">
-        {{ header }}
-      </th>
-    </tr>
-
-    <tr *ngFor="let point of report.points"
-        class="{{point.id}}-data">
-      <th scope="row" data-test="statistics-label">
-        {{ getLabel(point) | async }}
-      </th>
-      <td *ngFor="let header of headers"
-          class="{{point.id}}-{{header}}-data">
-        {{ point.values[header] }}
-      </td>
-    </tr>
-
-    </tbody>
-
-  </table>
-
-</div>
+@if (hasData) {
+  <div
+    class="m-1">
+    <h2 class="m-1">
+      {{ 'statistics.table.title.' + report.reportType | translate }}
+    </h2>
+    <table class="table table-striped" [attr.data-test]="report.reportType">
+      <tbody>
+        <tr>
+          <td></td>
+          @for (header of headers; track header) {
+            <th scope="col"
+              class="{{header}}-header">
+              {{ header }}
+            </th>
+          }
+        </tr>
+        @for (point of report.points; track point) {
+          <tr
+            class="{{point.id}}-data">
+            <th scope="row" data-test="statistics-label">
+              {{ getLabel(point) | async }}
+            </th>
+            @for (header of headers; track header) {
+              <td
+                class="{{point.id}}-{{header}}-data">
+                {{ point.values[header] }}
+              </td>
+            }
+          </tr>
+        }
+      </tbody>
+    </table>
+  </div>
+}
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts
index cd71730568..9f59e33fa8 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -38,7 +34,7 @@ import { isEmpty } from '../../shared/empty.util';
   templateUrl: './statistics-table.component.html',
   styleUrls: ['./statistics-table.component.scss'],
   standalone: true,
-  imports: [NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class StatisticsTableComponent implements OnInit {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 563044d270..5f2a26b8a1 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -1,26 +1,30 @@
 <div ngbDropdown
-     #sectionAdd="ngbDropdown"
-     placement="bottom-right"
-     class="d-inline-block"
-     [ngClass]="{'w-100': windowService.isXs()}">
-  <ng-container *ngIf="hasSections$ | async">
-  <button class="btn btn-outline-primary dropdown-toggle"
-          id="sectionControls"
-          [dsBtnDisabled]="(hasSections$ | async) !== true"
-          [ngClass]="{'w-100': (windowService.isXs() | async)}"
-          ngbDropdownToggle>
-          {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
-  </button>
-  </ng-container>
+  #sectionAdd="ngbDropdown"
+  placement="bottom-right"
+  class="d-inline-block"
+  [ngClass]="{'w-100': windowService.isXs()}">
+  @if (hasSections$ | async) {
+    <button class="btn btn-outline-primary dropdown-toggle"
+      id="sectionControls"
+      [dsBtnDisabled]="(hasSections$ | async) !== true"
+      [ngClass]="{'w-100': (windowService.isXs() | async)}"
+      ngbDropdownToggle>
+      {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
+    </button>
+  }
   <div ngbDropdownMenu
-       class="sections-dropdown-menu"
-       aria-labelledby="sectionControls"
-       [ngClass]="{'w-100': (windowService.isXs() | async)}">
-    <button class="dropdown-item disabled" *ngIf="(hasSections$ | async) !== true">
-      {{ 'submission.sections.general.no-sections' | translate }}
-    </button>
-    <button class="dropdown-item" *ngFor="let listItem of (sectionList$ | async)" (click)="addSection(listItem.id)">
-      {{'submission.sections.'+listItem.header | translate }}
-    </button>
+    class="sections-dropdown-menu"
+    aria-labelledby="sectionControls"
+    [ngClass]="{'w-100': (windowService.isXs() | async)}">
+    @if ((hasSections$ | async) !== true) {
+      <button class="dropdown-item disabled">
+        {{ 'submission.sections.general.no-sections' | translate }}
+      </button>
+    }
+    @for (listItem of (sectionList$ | async); track listItem) {
+      <button class="dropdown-item" (click)="addSection(listItem.id)">
+        {{'submission.sections.'+listItem.header | translate }}
+      </button>
+    }
   </div>
 </div>
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
index dfad8c422e..a8c8b9ca48 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
@@ -1,8 +1,10 @@
-<ds-uploader *ngIf="uploadFilesOptions.url"
-             [dropMsg]="dropMsg"
-             [dropOverDocumentMsg]="dropOverDocumentMsg"
-             [enableDragOverDocument]="enableDragOverDocument"
-             [onBeforeUpload]="onBeforeUpload"
-             [uploadFilesOptions]="uploadFilesOptions"
-             (onCompleteItem)="onCompleteItem($event)"
-             (onUploadError)="onUploadError()"></ds-uploader>
+@if (uploadFilesOptions.url) {
+  <ds-uploader
+    [dropMsg]="dropMsg"
+    [dropOverDocumentMsg]="dropOverDocumentMsg"
+    [enableDragOverDocument]="enableDragOverDocument"
+    [onBeforeUpload]="onBeforeUpload"
+    [uploadFilesOptions]="uploadFilesOptions"
+    (onCompleteItem)="onCompleteItem($event)"
+  (onUploadError)="onUploadError()"></ds-uploader>
+}
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 3632ec6760..218e56de92 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -39,9 +39,8 @@ import parseSectionErrors from '../../utils/parseSectionErrors';
   selector: 'ds-base-submission-upload-files',
   templateUrl: './submission-upload-files.component.html',
   imports: [
-    UploaderComponent,
-    NgIf,
-  ],
+    UploaderComponent
+],
   standalone: true,
 })
 export class SubmissionUploadFilesComponent implements OnChanges, OnDestroy {
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
index 234fbe9233..c1de983b38 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -4,11 +4,13 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-loading *ngIf="isLoading()"></ds-loading>
+    @if (isLoading()) {
+      <ds-loading></ds-loading>
+    }
     <ds-collection-dropdown [ngClass]="{'d-none': isLoading()}"
-                            (selectionChange)="selectObject($event)"
-                            (searchComplete)="searchComplete()"
-                            [entityType]="entityType">
+      (selectionChange)="selectObject($event)"
+      (searchComplete)="searchComplete()"
+      [entityType]="entityType">
     </ds-collection-dropdown>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index 03bd10cfc2..b5651c8f3f 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -25,9 +22,8 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
     ThemedLoadingComponent,
     ThemedCollectionDropdownComponent,
     TranslateModule,
-    NgClass,
-    NgIf,
-  ],
+    NgClass
+],
   standalone: true,
 })
 export class SubmissionImportExternalCollectionComponent {
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index c7f434b23c..353a298a6e 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -1,4 +1,4 @@
-import { NgFor } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -30,9 +30,8 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external-
   styleUrls: ['./submission-import-external-preview.component.scss'],
   templateUrl: './submission-import-external-preview.component.html',
   imports: [
-    NgFor,
-    TranslateModule,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class SubmissionImportExternalPreviewComponent implements OnInit {
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index 21783f9a2e..3d0580f37e 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -8,43 +8,59 @@
       </ds-submission-import-external-searchbar>
     </div>
   </div>
-  <div class="row" *ngIf="reload$.value.entity">
-    <div *ngIf="reload$.value.sourceId !== ''" class="col-md-12">
-      <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <h2 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0" @fadeIn
-                                [objects]="entriesRD"
-                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                [config]="initialPagination"
-                                [hideGear]="true"
-                                [context]="context"
-                                [importable]="true"
-                                [importConfig]="importConfig"
-                                (importObject)="import($event)">
-        </ds-viewable-collection>
-        <ds-loading *ngIf="(isLoading$ | async)"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
-        <div *ngIf="(isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
-          <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
+  @if (reload$.value.entity) {
+    <div class="row">
+      @if (reload$.value.sourceId !== '') {
+        <div class="col-md-12">
+          <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
+            @if (entriesRD && entriesRD?.payload?.page?.length !== 0) {
+              <h2>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
+            }
+            @if (entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0) {
+              <ds-viewable-collection @fadeIn
+                [objects]="entriesRD"
+                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                [config]="initialPagination"
+                [hideGear]="true"
+                [context]="context"
+                [importable]="true"
+                [importConfig]="importConfig"
+                (importObject)="import($event)">
+              </ds-viewable-collection>
+            }
+            @if ((isLoading$ | async)) {
+              <ds-loading
+              message="{{'loading.search-results' | translate}}"></ds-loading>
+            }
+            @if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0) {
+              <div data-test="empty-external-entry-list">
+                <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
+              </div>
+            }
+            @if ((isLoading$ | async) !== true && entriesRD.statusCode === 500) {
+              <div data-test="empty-external-error-500">
+                <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
+              </div>
+            }
+          </ng-container>
         </div>
-        <div *ngIf="(isLoading$ | async) !== true && entriesRD.statusCode === 500" data-test="empty-external-error-500">
-          <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
+      }
+      @if (reload$.value.sourceId === '') {
+        <div class="col-md-12">
+          <ds-alert [type]="AlertType.Info">
+            <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
+          </ds-alert>
         </div>
-      </ng-container>
+      }
     </div>
-    <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
-      <ds-alert [type]="AlertType.Info">
-        <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
-      </ds-alert>
-    </div>
-  </div>
+  }
 
   <div class="row">
     <div class="col-md-12">
       <hr>
-      <a class="btn btn-outline-secondary" [routerLink]="['/mydspace']" role="button">
-        <i class="fa fa-chevron-left" aria-hidden="true"></i> {{'submission.import-external.back-to-my-dspace' | translate}}
-      </a>
+        <a class="btn btn-outline-secondary" [routerLink]="['/mydspace']" role="button">
+          <i class="fa fa-chevron-left" aria-hidden="true"></i> {{'submission.import-external.back-to-my-dspace' | translate}}
+        </a>
+      </div>
     </div>
   </div>
-</div>
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 47b5c09d66..b78f398830 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -72,13 +69,12 @@ import {
     ObjectCollectionComponent,
     ThemedLoadingComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     SubmissionImportExternalSearchbarComponent,
     TranslateModule,
     VarDirective,
-    RouterLink,
-  ],
+    RouterLink
+],
   standalone: true,
 })
 export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
diff --git a/src/app/submission/sections/accesses/section-accesses.component.html b/src/app/submission/sections/accesses/section-accesses.component.html
index 1ba2d4fe6d..009a0ca675 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.html
+++ b/src/app/submission/sections/accesses/section-accesses.component.html
@@ -1,7 +1,9 @@
-<ds-form *ngIf="!!formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [displaySubmit]="false"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"
-         (removeArrayItem)="onRemove($event)"></ds-form>
+@if (!!formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [displaySubmit]="false"
+    [displayCancel]="false"
+    (dfChange)="onChange($event)"
+  (removeArrayItem)="onRemove($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index b47f1cf8ff..8f98f68660 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -78,9 +78,8 @@ import { SectionAccessesService } from './section-accesses.service';
   templateUrl: './section-accesses.component.html',
   styleUrls: ['./section-accesses.component.scss'],
   imports: [
-    FormComponent,
-    NgIf,
-  ],
+    FormComponent
+],
   standalone: true,
 })
 export class SubmissionSectionAccessesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index a633e640ab..21a1885f92 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -65,17 +61,15 @@ import { SectionsType } from '../sections-type';
   styleUrls: ['./submission-section-cc-licenses.component.scss'],
   imports: [
     TranslateModule,
-    NgIf,
     ThemedLoadingComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
     DsSelectComponent,
     NgbDropdownModule,
     FormsModule,
     InfiniteScrollModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class SubmissionSectionCcLicensesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 6f4126a173..02a6d4e557 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgComponentOutlet,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
 import {
   Component,
   Injector,
@@ -30,15 +24,13 @@ import { rendersSectionType } from '../sections-decorator';
   styleUrls: ['./section-container.component.scss'],
   imports: [
     AlertComponent,
-    NgForOf,
     NgbAccordionModule,
     NgComponentOutlet,
     TranslateModule,
     NgClass,
-    NgIf,
     AsyncPipe,
-    SectionsDirective,
-  ],
+    SectionsDirective
+],
   standalone: true,
 })
 export class SubmissionSectionContainerComponent implements OnInit {
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html
index d9e33a70f7..d8c9467efe 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.html
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.html
@@ -3,18 +3,26 @@ Template for the detect duplicates submission section component
 @author Kim Shepherd
 -->
 <div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
-  <ng-container *ngIf="data?.potentialDuplicates.length === 0">
+  @if (data?.potentialDuplicates.length === 0) {
     <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
-  </ng-container>
-    <ng-container *ngIf="data?.potentialDuplicates.length > 0">
-      <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
-      <div *ngFor="let dupe of data?.potentialDuplicates" class="ds-duplicate">
+  }
+  @if (data?.potentialDuplicates.length > 0) {
+    <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
+    @for (dupe of data?.potentialDuplicates; track dupe) {
+      <div class="ds-duplicate">
         <a target="_blank" [href]="getItemLink(dupe.uuid)">{{dupe.title}}</a>
-        <div *ngFor="let metadatum of Metadata.toViewModelList(dupe.metadata)">
-          {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
-        </div>
-        <p *ngIf="dupe.workspaceItemId">{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
-        <p *ngIf="dupe.workflowItemId">{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+        @for (metadatum of Metadata.toViewModelList(dupe.metadata); track metadatum) {
+          <div>
+            {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
+          </div>
+        }
+        @if (dupe.workspaceItemId) {
+          <p>{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
+        }
+        @if (dupe.workflowItemId) {
+          <p>{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+        }
       </div>
-    </ng-container>
+    }
+  }
 </div>
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
index 501a60e3b8..a86d44ab17 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
@@ -255,11 +255,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [BrowserModule,
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    NgxPaginationModule],
+  imports: [BrowserModule, FormsModule, ReactiveFormsModule, NgxPaginationModule],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
index 885511ca52..5471dbc78c 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,11 +37,9 @@ import { SectionsService } from '../sections.service';
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     VarDirective,
-    NgIf,
     AsyncPipe,
-    TranslateModule,
-    NgForOf,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 
diff --git a/src/app/submission/sections/form/section-form.component.html b/src/app/submission/sections/form/section-form.component.html
index cd7b45bb00..58032131af 100644
--- a/src/app/submission/sections/form/section-form.component.html
+++ b/src/app/submission/sections/form/section-form.component.html
@@ -1,11 +1,15 @@
-<ds-loading *ngIf="isLoading" message="Loading..."></ds-loading>
-<ds-form *ngIf="!isLoading && formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [displaySubmit]="false"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"
-         (dfFocus)="onFocus($event)"
-         (remove)="onRemove($event)"
-         (ngbEvent)="onCustomEvent($event)"
-         (removeArrayItem)="onRemove($event)"></ds-form>
+@if (isLoading) {
+  <ds-loading message="Loading..."></ds-loading>
+}
+@if (!isLoading && formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [displaySubmit]="false"
+    [displayCancel]="false"
+    (dfChange)="onChange($event)"
+    (dfFocus)="onFocus($event)"
+    (remove)="onRemove($event)"
+    (ngbEvent)="onCustomEvent($event)"
+  (removeArrayItem)="onRemove($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index efd410713f..4cce0daa7b 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -659,6 +659,6 @@ describe('SubmissionSectionFormComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule, FormsModule, ReactiveFormsModule],
+  imports: [FormsModule, ReactiveFormsModule],
 })
 class TestComponent {}
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 26285320b0..553bcf2d5c 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -77,9 +77,8 @@ import { SectionFormOperationsService } from './section-form-operations.service'
   templateUrl: './section-form.component.html',
   imports: [
     FormComponent,
-    ThemedLoadingComponent,
-    NgIf,
-  ],
+    ThemedLoadingComponent
+],
   standalone: true,
 })
 export class SubmissionSectionFormComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
index dd0b5d2930..e86742caf1 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.html
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -4,17 +4,17 @@ Template for the identifiers submission section component
 -->
 <!-- Main identifier data -->
 <ng-container *ngVar="(getIdentifierData() | async) as identifierData">
-  <ng-container *ngIf="identifierData && identifierData.identifiers">
-  <div>
-  <span>{{'submission.sections.identifiers.info' | translate}}</span>
-  <ul>
-    <ng-container *ngFor="let identifier of identifierData.identifiers">
-      <ng-container *ngIf="identifierData.displayTypes.includes(identifier.identifierType) && identifier.value">
-        <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
-          {{identifier.value}}</li>
-      </ng-container>
-    </ng-container>
-  </ul>
- </div>
- </ng-container>
+  @if (identifierData && identifierData.identifiers) {
+    <div>
+      <span>{{'submission.sections.identifiers.info' | translate}}</span>
+      <ul>
+        @for (identifier of identifierData.identifiers; track identifier) {
+          @if (identifierData.displayTypes.includes(identifier.identifierType) && identifier.value) {
+            <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
+            {{identifier.value}}</li>
+          }
+        }
+      </ul>
+    </div>
+  }
 </ng-container>
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
index 8aa760bb3e..42aeb8719f 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -276,10 +276,10 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    NgxPaginationModule],
+    NgxPaginationModule
+],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index e297c795df..cc42066534 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,11 +36,9 @@ import { SectionsService } from '../sections.service';
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     TranslateModule,
-    NgForOf,
-    NgIf,
     AsyncPipe,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 
diff --git a/src/app/submission/sections/license/section-license.component.html b/src/app/submission/sections/license/section-license.component.html
index ed10203596..4918a3e32a 100644
--- a/src/app/submission/sections/license/section-license.component.html
+++ b/src/app/submission/sections/license/section-license.component.html
@@ -1,9 +1,11 @@
 <span class="mb-5 preserve-line-breaks" [innerHTML]="licenseText$ | async"></span>
 <br> <br>
-<ds-form *ngIf="formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [displaySubmit]="displaySubmit"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"></ds-form>
+@if (formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [formLayout]="formLayout"
+    [displaySubmit]="displaySubmit"
+    [displayCancel]="false"
+  (dfChange)="onChange($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 95b2e7f50a..14d7cb51ad 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -377,11 +377,10 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
   standalone: true,
   imports: [
     SubmissionSectionLicenseComponent,
-    CommonModule,
     FormsModule,
     FormComponent,
-    ReactiveFormsModule,
-  ],
+    ReactiveFormsModule
+],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index 86a0455c30..88f36875f6 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   AfterViewChecked,
   ChangeDetectorRef,
@@ -67,9 +64,8 @@ import {
   providers: [],
   imports: [
     FormComponent,
-    NgIf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class SubmissionSectionLicenseComponent   extends SectionModelComponent implements AfterViewChecked {
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
index c47e4c644d..842108a1b0 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -1,9 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -59,14 +54,12 @@ import { LdnPattern } from './submission-coar-notify.config';
   styleUrls: ['./section-coar-notify.component.scss'],
   standalone: true,
   imports: [
-    NgIf,
-    NgForOf,
     AsyncPipe,
     TranslateModule,
     NgbDropdownModule,
     NgClass,
-    InfiniteScrollModule,
-  ],
+    InfiniteScrollModule
+],
   providers: [NgbDropdown],
 })
 export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 2fde4f37cd..5c10a0b259 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,12 +16,10 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol
   templateUrl: './content-accordion.component.html',
   styleUrls: ['./content-accordion.component.scss'],
   imports: [
-    NgForOf,
     TranslateModule,
-    NgIf,
     NgbCollapseModule,
-    TitleCasePipe,
-  ],
+    TitleCasePipe
+],
   standalone: true,
 })
 export class ContentAccordionComponent {
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 4eb9567abb..e7f8e22aa1 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -1,7 +1,4 @@
-import {
-  DatePipe,
-  NgIf,
-} from '@angular/common';
+import { DatePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -18,10 +15,9 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det
   templateUrl: './metadata-information.component.html',
   styleUrls: ['./metadata-information.component.scss'],
   imports: [
-    NgIf,
     TranslateModule,
-    DatePipe,
-  ],
+    DatePipe
+],
   standalone: true,
 })
 export class MetadataInformationComponent {
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index 8f256700a0..df7daf75e9 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -18,10 +15,8 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta
   templateUrl: './publication-information.component.html',
   styleUrls: ['./publication-information.component.scss'],
   imports: [
-    NgIf,
-    TranslateModule,
-    NgForOf,
-  ],
+    TranslateModule
+],
   standalone: true,
 })
 export class PublicationInformationComponent {
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index 8cbe2f6904..c827555a2b 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -1,8 +1,4 @@
-import {
-  KeyValuePipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -23,10 +19,8 @@ import { ContentAccordionComponent } from '../content-accordion/content-accordio
   imports: [
     ContentAccordionComponent,
     TranslateModule,
-    KeyValuePipe,
-    NgForOf,
-    NgIf,
-  ],
+    KeyValuePipe
+],
   standalone: true,
 })
 export class PublisherPolicyComponent {
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index 86d55ce8d0..950fe1b4dc 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -47,12 +43,10 @@ import { PublisherPolicyComponent } from './publisher-policy/publisher-policy.co
     AlertComponent,
     TranslateModule,
     PublisherPolicyComponent,
-    NgIf,
     PublicationInformationComponent,
     AsyncPipe,
-    VarDirective,
-    NgForOf,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
index 84eff58f72..eb167f5501 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,10 +19,7 @@ import { isEmpty } from '../../../../shared/empty.util';
 @Component({
   selector: 'ds-submission-section-upload-access-conditions',
   templateUrl: './submission-section-upload-access-conditions.component.html',
-  imports: [
-    NgForOf,
-    NgIf,
-  ],
+  imports: [],
   standalone: true,
 })
 export class SubmissionSectionUploadAccessConditionsComponent implements OnInit {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 761ac9537e..9187915dcf 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -5,15 +5,17 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-form *ngIf="formModel"
-             #formRef="formComponent"
-             [formId]="formId"
-             [formModel]="formModel"
-             [displaySubmit]="!isSaving"
-             [displayCancel]="!isSaving"
-             (submitForm)="onSubmit()"
-             (cancel)="onModalClose()"
-             (dfChange)="onChange($event)"></ds-form>
+    @if (formModel) {
+      <ds-form
+        #formRef="formComponent"
+        [formId]="formId"
+        [formModel]="formModel"
+        [displaySubmit]="!isSaving"
+        [displayCancel]="!isSaving"
+        (submitForm)="onSubmit()"
+        (cancel)="onModalClose()"
+      (dfChange)="onChange($event)"></ds-form>
+    }
 
   </div>
 </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index 015ccd4ae4..7082e38d7b 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -403,11 +403,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   standalone: true,
   imports: [
     SubmissionSectionUploadFileEditComponent,
-    CommonModule,
     FormsModule,
     FormComponent,
-    ReactiveFormsModule,
-  ],
+    ReactiveFormsModule
+],
 })
 class TestComponent {
 }
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 79b3d3a565..cf577bf6f5 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -79,10 +79,9 @@ import {
   templateUrl: './section-upload-file-edit.component.html',
   imports: [
     FormComponent,
-    NgIf,
     TranslateModule,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class SubmissionSectionUploadFileEditComponent
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index c1487b0559..a1edfefb65 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -286,9 +286,9 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   standalone: true,
   imports: [
     ThemedSubmissionSectionUploadFileComponent,
-    CommonModule,
     AsyncPipe,
-    NgbModule],
+    NgbModule
+],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 09ea3cb112..eccdf9b949 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -51,12 +48,11 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
   imports: [
     TranslateModule,
     SubmissionSectionUploadFileViewComponent,
-    NgIf,
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    BtnDisabledDirective,
-  ],
+    BtnDisabledDirective
+],
   standalone: true,
 })
 export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy {
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index dc72fbdad0..73e18afeb5 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -1,38 +1,46 @@
 <div>
-  <ng-container *ngIf="metadata">
-    <ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
-      <ng-container *ngIf="entry.value !== ''">
+  @if (metadata) {
+    @for (entry of getAllMetadataValue(fileTitleKey); track entry) {
+      @if (entry.value !== '') {
         <h3>
           {{entry.value}}
           <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
         </h3>
-      </ng-container>
-      <ng-container *ngIf="entry.value === ''">
-        <h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">
-          <span class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}}</span>
-        </h5>
-      </ng-container>
+      }
+      @if (entry.value === '') {
+        @if (metadata[fileTitleKey].indexOf(entry) === 0) {
+          <h5>
+            <span class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}}</span>
+          </h5>
+        }
+      }
       <span class="clearfix"></span>
-    </ng-container>
-    <ng-container *ngFor="let entry of getAllMetadataValue(fileDescrKey)">
-      <ng-container *ngIf="entry.value !== ''">
+    }
+    @for (entry of getAllMetadataValue(fileDescrKey); track entry) {
+      @if (entry.value !== '') {
         {{entry.value | dsTruncate:['150']}}
-      </ng-container>
-      <ng-container *ngIf="entry.value === ''">
-        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0"
-              class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
-      </ng-container>
+      }
+      @if (entry.value === '') {
+        @if (metadata[fileDescrKey].indexOf(entry) === 0) {
+          <span
+          class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
+        }
+      }
       <span class="clearfix"></span>
-    </ng-container>
-  </ng-container>
+    }
+  }
 
 
-  <div class="mt-1" *ngIf="fileFormat">
-    {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
-  </div>
-  <div class="mt-1" *ngIf="fileCheckSum">
-    Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
-  </div>
+  @if (fileFormat) {
+    <div class="mt-1">
+      {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
+    </div>
+  }
+  @if (fileCheckSum) {
+    <div class="mt-1">
+      Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
+    </div>
+  }
   <span class="clearfix"></span>
   <ds-submission-section-upload-access-conditions [accessConditions]="fileData.accessConditions"></ds-submission-section-upload-access-conditions>
 </div>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index f065fc9e19..0a7871fa35 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -30,10 +27,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
     SubmissionSectionUploadAccessConditionsComponent,
     TranslateModule,
     TruncatePipe,
-    NgIf,
-    NgForOf,
-    FileSizePipe,
-  ],
+    FileSizePipe
+],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index 9d916a4f98..a9fd762f89 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -1,23 +1,24 @@
 <ds-alert [content]="'submission.sections.upload.info'"
-          [dismissible]="true"
-          [type]="AlertTypeEnum.Info"></ds-alert>
+  [dismissible]="true"
+[type]="AlertTypeEnum.Info"></ds-alert>
 
-<ng-container *ngIf="fileList.length > 0; else noFileUploaded">
-
-  <div *ngIf="collectionDefaultAccessConditions.length > 0" class="row">
-    <div class="col-sm-12" >
-      <ds-alert [type]="AlertTypeEnum.Warning">
-        <ng-container *ngIf="collectionPolicyType === 1">
-          {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }}
-        </ng-container>
-        <ng-container *ngIf="collectionPolicyType === 2">
-          {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
-        </ng-container>
-        <span class="clearfix"></span>
-        <ds-submission-section-upload-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-submission-section-upload-access-conditions>
-      </ds-alert>
+@if (fileList.length > 0) {
+  @if (collectionDefaultAccessConditions.length > 0) {
+    <div class="row">
+      <div class="col-sm-12" >
+        <ds-alert [type]="AlertTypeEnum.Warning">
+          @if (collectionPolicyType === 1) {
+            {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }}
+          }
+          @if (collectionPolicyType === 2) {
+            {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
+          }
+          <span class="clearfix"></span>
+          <ds-submission-section-upload-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-submission-section-upload-access-conditions>
+        </ds-alert>
+      </div>
     </div>
-  </div>
+  }
   <div class="row">
     <div class="col-md-2">
       <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
@@ -28,30 +29,29 @@
       <hr/>
     </div>
   </div>
-  <ng-container *ngFor="let fileEntry of fileList; let i = index;">
+  @for (fileEntry of fileList; track fileEntry; let i = $index) {
     <ds-submission-upload-section-file
-                                       [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
-                                       [availableAccessConditionOptions]="availableAccessConditionOptions"
-                                       [collectionId]="collectionId"
-                                       [collectionPolicyType]="collectionPolicyType"
-                                       [configMetadataForm]="(configMetadataForm$ | async)"
-                                       [fileId]="fileEntry.uuid"
-                                       [fileIndex]="i"
-                                       [fileName]="fileNames[i]"
-                                       [sectionId]="sectionData.id"
-                                       [submissionId]="submissionId"></ds-submission-upload-section-file>
+      [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
+      [availableAccessConditionOptions]="availableAccessConditionOptions"
+      [collectionId]="collectionId"
+      [collectionPolicyType]="collectionPolicyType"
+      [configMetadataForm]="(configMetadataForm$ | async)"
+      [fileId]="fileEntry.uuid"
+      [fileIndex]="i"
+      [fileName]="fileNames[i]"
+      [sectionId]="sectionData.id"
+    [submissionId]="submissionId"></ds-submission-upload-section-file>
     <div class="row">
       <div class="col-md-12">
         <hr/>
       </div>
     </div>
-  </ng-container>
-</ng-container>
-
-<ng-template #noFileUploaded>
+  }
+} @else {
   <div class="row">
     <div class="col-md-12">
       <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
-</ng-template>
+}
+
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 61db6c6885..36f1bd4a4d 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -382,8 +382,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [
-    CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 58008c9dfb..11a0ca4077 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -74,12 +70,10 @@ export interface AccessConditionGroupsMapEntry {
   imports: [
     ThemedSubmissionSectionUploadFileComponent,
     SubmissionSectionUploadAccessConditionsComponent,
-    NgIf,
     AlertComponent,
     TranslateModule,
-    NgForOf,
-    AsyncPipe,
-  ],
+    AsyncPipe
+],
   standalone: true,
 })
 export class SubmissionSectionUploadComponent extends SectionModelComponent {
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index e8dfc8fc6a..b3489ce66c 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -4,39 +4,47 @@
       <h1>{{'subscriptions.title' | translate}}</h1>
       <div class="row">
         <div class="col-md-12 m-40">
-          <ds-loading *ngIf="loading$ | async"></ds-loading>
+          @if (loading$ | async) {
+            <ds-loading></ds-loading>
+          }
           <ng-container *ngVar="(subscriptions$ | async) as subscriptions">
 
-            <ds-pagination *ngIf="subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true"
-                           [paginationOptions]="config"
-                           [collectionSize]="subscriptions?.pageInfo?.totalElements"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true">
-              <div class="table-responsive">
-                <table id="formats" class="table table-striped table-hover" data-test="subscription-table">
-                  <thead>
-                    <tr>
-                      <th style="width: 50%" scope="col">{{'subscriptions.table.dso' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.subscription_type' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.subscription_frequency' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.action' | translate}}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr ds-subscription-view *ngFor="let subscription of subscriptions?.page"
-                                             [dso]="(subscription?.resource | async)?.payload"
-                                             [eperson]="(subscription?.eperson | async)?.payload?.id"
-                                             [subscription]="subscription"
-                                             (reload)="refresh()">
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </ds-pagination>
+            @if (subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true) {
+              <ds-pagination
+                [paginationOptions]="config"
+                [collectionSize]="subscriptions?.pageInfo?.totalElements"
+                [hideGear]="true"
+                [hidePagerWhenSinglePage]="true">
+                <div class="table-responsive">
+                  <table id="formats" class="table table-striped table-hover" data-test="subscription-table">
+                    <thead>
+                      <tr>
+                        <th style="width: 50%" scope="col">{{'subscriptions.table.dso' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.subscription_type' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.subscription_frequency' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.action' | translate}}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      @for (subscription of subscriptions?.page; track subscription) {
+                        <tr ds-subscription-view
+                          [dso]="(subscription?.resource | async)?.payload"
+                          [eperson]="(subscription?.eperson | async)?.payload?.id"
+                          [subscription]="subscription"
+                          (reload)="refresh()">
+                        </tr>
+                      }
+                    </tbody>
+                  </table>
+                </div>
+              </ds-pagination>
+            }
 
-            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true" [type]="AlertType.Info" data-test="empty-alert">
-              {{ 'subscriptions.table.empty.message' | translate }}
-            </ds-alert>
+            @if (subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true) {
+              <ds-alert [type]="AlertType.Info" data-test="empty-alert">
+                {{ 'subscriptions.table.empty.message' | translate }}
+              </ds-alert>
+            }
 
           </ng-container>
         </div>
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
index 5d0b4b258d..1d967d3332 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -49,7 +45,7 @@ import { VarDirective } from '../shared/utils/var.directive';
   templateUrl: './subscriptions-page.component.html',
   styleUrls: ['./subscriptions-page.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, VarDirective, PaginationComponent, NgFor, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, VarDirective, PaginationComponent, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule],
 })
 /**
  * List and allow to manage all the active subscription for the current user
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
index 1fe3ffb4ce..452f47f9b6 100644
--- a/src/app/suggestions-page/suggestions-page.component.html
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -1,50 +1,62 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-        <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
-          <ds-loading *ngIf="(processing$ | async)"></ds-loading>
-          <div *ngIf="(processing$ | async) !== true && suggestionsRD?.pageInfo?.totalElements > 0">
-
+      <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
+        @if ((processing$ | async)) {
+          <ds-loading></ds-loading>
+        }
+        @if ((processing$ | async) !== true && suggestionsRD?.pageInfo?.totalElements > 0) {
+          <div>
             <h1>
               {{'suggestion.suggestionFor' | translate}}
               <a target="_blank" [routerLink]="['/entities/person/', researcherUuid]">{{researcherName}}</a>
               {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
             </h1>
-
             <div class="mb-3 mt-3">
               <button class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
               <em>({{ getSelectedSuggestionsCount() }})</em>
-              <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
-                                      class="m-2"
-                                     [isBulk]="true"
-                                     [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
-                                     (approveAndImport)="approveAndImportAllSelected($event)"
-                                     (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
-              <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
+              @if (getSelectedSuggestionsCount() > 0) {
+                <ds-suggestion-actions
+                  class="m-2"
+                  [isBulk]="true"
+                  [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
+                  (approveAndImport)="approveAndImportAllSelected($event)"
+                (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
+              }
+              @if (isBulkOperationPending) {
+                <i class='fas fa-circle-notch fa-spin'></i>
+              }
             </div>
-            <ds-pagination *ngIf="(processing$ | async) !== true"
-                           [paginationOptions]="paginationOptions"
-                           [sortOptions]="paginationSortConfig"
-                           [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
-                           [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
-                           (paginationChange)="onPaginationChange()">
-              <ul class="list-unstyled">
-                <li *ngFor="let object of suggestionsRD?.page; let i = index; let last = last" class="mt-4 mb-4">
-                  <ds-suggestion-list-item
-                    [object]="object"
-                    [isSelected]="!!selectedSuggestions[object.id]"
-                    [isCollectionFixed]="isCollectionFixed([object])"
-                    (ignoreSuggestionClicked)="ignoreSuggestion($event)"
-                    (selected)="onSelected(object, $event)"
-                    (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
-                </li>
-              </ul>
-            </ds-pagination>
+            @if ((processing$ | async) !== true) {
+              <ds-pagination
+                [paginationOptions]="paginationOptions"
+                [sortOptions]="paginationSortConfig"
+                [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
+                [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
+                (paginationChange)="onPaginationChange()">
+                <ul class="list-unstyled">
+                  @for (object of suggestionsRD?.page; track object; let i = $index; let last = $last) {
+                    <li class="mt-4 mb-4">
+                      <ds-suggestion-list-item
+                        [object]="object"
+                        [isSelected]="!!selectedSuggestions[object.id]"
+                        [isCollectionFixed]="isCollectionFixed([object])"
+                        (ignoreSuggestionClicked)="ignoreSuggestion($event)"
+                        (selected)="onSelected(object, $event)"
+                      (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
+                    </li>
+                  }
+                </ul>
+              </ds-pagination>
+            }
           </div>
-          <ds-alert *ngIf="(processing$ | async) !== true && (suggestionsRD?.pageInfo?.totalElements === 0 || !suggestionsRD)" [type]="'alert-info'">
+        }
+        @if ((processing$ | async) !== true && (suggestionsRD?.pageInfo?.totalElements === 0 || !suggestionsRD)) {
+          <ds-alert [type]="'alert-info'">
             {{'suggestion.count.missing'  | translate}}
           </ds-alert>
-        </ng-container>
+        }
+      </ng-container>
     </div>
   </div>
 </div>
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts
index 0fc790a125..9e411e8336 100644
--- a/src/app/suggestions-page/suggestions-page.component.ts
+++ b/src/app/suggestions-page/suggestions-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -70,16 +66,14 @@ import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowit
   imports: [
     AsyncPipe,
     VarDirective,
-    NgIf,
     RouterLink,
     TranslateModule,
     SuggestionActionsComponent,
     ThemedLoadingComponent,
     PaginationComponent,
     SuggestionListElementComponent,
-    NgForOf,
-    AlertComponent,
-  ],
+    AlertComponent
+],
   standalone: true,
 })
 
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
index 79ecf2117a..364d721aa1 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  isPlatformBrowser,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, isPlatformBrowser } from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,7 +38,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-banner.component.scss'],
   templateUrl: './system-wide-alert-banner.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index 73517e5b0d..bc8e8fa49d 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -60,7 +57,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index e151684a01..de569270e0 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,19 +1,25 @@
 <div class="thumbnail" [class.limit-width]="limitWidth">
-  <div *ngIf="isLoading" class="thumbnail-content outer">
-    <div class="inner">
-      <div class="centered">
-        <ds-loading [spinner]="true"></ds-loading>
+  @if (isLoading) {
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="centered">
+          <ds-loading [spinner]="true"></ds-loading>
+        </div>
       </div>
     </div>
-  </div>
+  }
   <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-  <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-  <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-    <div class="inner">
-      <div class="thumbnail-placeholder centered lead">
-        {{ placeholder | translate }}
+  @if (src !== null) {
+    <img class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
+      [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  }
+  @if (src === null && !isLoading) {
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="thumbnail-placeholder centered lead">
+          {{ placeholder | translate }}
+        </div>
       </div>
     </div>
-  </div>
+  }
 </div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
index b8620e7d89..6ee9c8d500 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe, NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -35,14 +31,13 @@ export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
   preserveWhitespaces: false,
   imports: [
     ModifyItemOverviewComponent,
-    NgIf,
     AsyncPipe,
     TranslateModule,
     NgbRatingModule,
     NgClass,
     ReactiveFormsModule,
-    VarDirective,
-  ],
+    VarDirective
+],
   standalone: true,
 })
 export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit {
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
index d4ac620811..2d7a7ff8cd 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
@@ -1,22 +1,32 @@
 <div>
-  <p *ngIf="multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}</p>
-  <p *ngIf="!multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}</p>
+  @if (multipleReviewers) {
+    <p>{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}</p>
+  }
+  @if (!multipleReviewers) {
+    <p>{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}</p>
+  }
 
-  <ds-reviewers-list *ngIf="groupId !== undefined"
-                     [actionConfig]="reviewersListActionConfig"
-                     [groupId]="groupId"
-                     [ngClass]="groupId ? 'reviewersListWithGroup' : ''"
-                     [multipleReviewers]="multipleReviewers"
-                     (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false"
-                     messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list"
-  ></ds-reviewers-list>
-  <small *ngIf="displayError" class="invalid-feedback d-block mb-3">
-    {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }}
-  </small>
+  @if (groupId !== undefined) {
+    <ds-reviewers-list
+      [actionConfig]="reviewersListActionConfig"
+      [groupId]="groupId"
+      [ngClass]="groupId ? 'reviewersListWithGroup' : ''"
+      [multipleReviewers]="multipleReviewers"
+      (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false"
+      messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list"
+    ></ds-reviewers-list>
+  }
+  @if (displayError) {
+    <small class="invalid-feedback d-block mb-3">
+      {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }}
+    </small>
+  }
 
-  <ds-modify-item-overview *ngIf="item$ | async"
-                           [item]="item$ | async">
-  </ds-modify-item-overview>
+  @if (item$ | async) {
+    <ds-modify-item-overview
+      [item]="item$ | async">
+    </ds-modify-item-overview>
+  }
 
   <div class="d-flex flex-wrap justify-content-end">
     <button class="btn btn-default" (click)="previousPage()">
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
index 72f5623626..97ad697e13 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  CommonModule,
-  Location,
-} from '@angular/common';
+import { CommonModule, Location } from '@angular/common';
 import {
   Component,
   OnDestroy,
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
index 76808c7e14..cd858b01e4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
@@ -1,6 +1,8 @@
 <div class="container" *ngVar="item$ | async as item">
-    <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
-    <ds-modify-item-overview *ngIf="item" [item]="item"></ds-modify-item-overview>
-    <button class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
-    <button class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
+  <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
+  @if (item) {
+    <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+  }
+  <button class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
+  <button class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
 </div>
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 0352eba098..9fdb123566 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,7 +1,4 @@
-import {
-  CommonModule,
-  Location,
-} from '@angular/common';
+import { CommonModule, Location } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index 059d3b7e3b..8b8dda97b7 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,6 +1,8 @@
 <div class="container">
   <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
-  <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
+  @if ((dso$ | async)) {
+    <ds-modify-item-overview [item]="$any(dso$ | async)"></ds-modify-item-overview>
+  }
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
 </div>
@@ -16,8 +18,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" id="delete_cancel" class="btn btn-secondary"
-      (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }}</button>
+    (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }}</button>
     <button type="button" id="delete_confirm" class="btn btn-danger"
-      (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}</button>
+    (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
index 00ab6e969c..2f9ac81308 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  CommonModule,
-  Location,
-} from '@angular/common';
+import { CommonModule, Location } from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
index d2b977ff84..4fa423d1ef 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,9 +1,11 @@
 <div id="header-navbar-wrapper"><!-- [class.open]="!(isNavBarCollapsed$ | async)" -->
   <ds-header></ds-header>
   <!-- Collapsible navbar (mobile only) -->
-  <div *ngIf="(isMobile$ | async)" id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
-    <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
-      <ds-navbar></ds-navbar>
-    </nav>
-  </div>
+  @if ((isMobile$ | async)) {
+    <div id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+      <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
+        <ds-navbar></ds-navbar>
+      </nav>
+    </div>
+  }
 </div>
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
index 1931838923..791959dd9c 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -27,7 +24,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
   standalone: true,
-  imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent extends BaseComponent implements OnInit {
   public isNavBarCollapsed$: Observable<boolean>;
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index d828206e7a..8ecb8c5667 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,9 +1,9 @@
-<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+@if ((isMobile$ | async) && (isAuthenticated$ | async)) {
   <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-</ng-container>
+}
 <div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
-  <ng-container *ngFor="let section of (sections | async)">
+  @for (section of (sections | async); track section) {
     <ng-container
-      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-  </ng-container>
+    *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  }
 </div>

From c4696c9ba819db60cc5bd2367163327bb7649e23 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 6 Feb 2025 13:14:41 +0100
Subject: [PATCH 1279/1286] [DURACOM-307] fix lint

---
 .../bulk-access/browse/bulk-access-browse.component.ts |  4 ++--
 .../settings/bulk-access-settings.component.ts         |  4 ++--
 .../epeople-registry/epeople-registry.component.ts     |  9 ++++++---
 .../eperson-form/eperson-form.component.ts             |  9 ++++++---
 .../group-registry/group-form/group-form.component.ts  |  4 ++--
 .../group-form/members-list/members-list.component.ts  |  9 ++++++---
 .../subgroup-list/subgroups-list.component.ts          |  4 ++--
 .../group-registry/groups-registry.component.ts        |  4 ++--
 .../batch-import-page.component.ts                     |  4 ++--
 .../ldn-service-form/ldn-service-form.component.ts     |  4 ++--
 .../ldn-services-directory.component.ts                |  9 ++++++---
 .../admin-notify-dashboard.component.ts                |  4 ++--
 .../admin-notify-detail-modal.component.ts             |  4 ++--
 .../admin-notify-logs-result.component.ts              |  4 ++--
 .../admin-notify-metrics.component.ts                  |  4 ++--
 .../admin-notify-search-result.component.ts            |  9 ++++++---
 .../bitstream-formats/bitstream-formats.component.ts   |  4 ++--
 .../format-form/format-form.component.ts               |  4 ++--
 .../metadata-registry/metadata-registry.component.ts   |  9 ++++++---
 .../metadata-schema-form.component.ts                  |  4 ++--
 .../metadata-field-form.component.ts                   |  4 ++--
 .../metadata-schema/metadata-schema.component.ts       |  9 ++++++---
 .../filtered-collections.component.ts                  |  4 ++--
 .../filtered-items/filtered-items-model.ts             |  4 ++--
 .../filtered-items/filtered-items.component.ts         |  9 ++++++---
 .../filters-section/filters-section.component.ts       |  4 ++--
 src/app/admin/admin-sidebar/admin-sidebar.component.ts |  6 +++++-
 .../expandable-admin-sidebar-section.component.ts      |  6 +++++-
 .../edit-bitstream-page.component.ts                   |  4 ++--
 src/app/breadcrumbs/breadcrumbs.component.ts           |  5 ++++-
 .../browse-by-metadata/browse-by-metadata.component.ts |  9 ++++++---
 .../browse-by-taxonomy/browse-by-taxonomy.component.ts |  4 ++--
 .../collection-form/collection-form.component.ts       |  8 +-------
 .../collection-item-mapper.component.ts                |  4 ++--
 src/app/collection-page/collection-page.component.ts   |  4 ++--
 .../create-collection-page.component.ts                |  4 ++--
 .../delete-collection-page.component.ts                |  4 ++--
 .../collection-access-control.component.ts             |  4 ++--
 .../collection-metadata.component.ts                   |  4 ++--
 .../collection-roles/collection-roles.component.ts     |  4 ++--
 .../collection-source-controls.component.ts            |  4 ++--
 .../collection-source/collection-source.component.ts   |  9 ++++++---
 .../edit-collection-page.component.ts                  |  4 ----
 .../edit-item-template-page.component.ts               |  4 ++--
 .../community-list/community-list.component.ts         |  5 ++++-
 src/app/community-page/community-page.component.ts     |  4 ++--
 .../create-community-page.component.ts                 |  4 ++--
 .../delete-community-page.component.ts                 |  4 ++--
 .../community-access-control.component.ts              |  4 ++--
 .../community-roles/community-roles.component.ts       |  4 ++--
 .../edit-community-page.component.ts                   |  9 ++++++---
 .../community-page-sub-collection-list.component.ts    |  4 ++--
 .../sub-com-col-section.component.ts                   |  4 ++--
 .../community-page-sub-community-list.component.ts     |  4 ++--
 .../dso-edit-metadata-value.component.ts               |  5 ++++-
 .../metadata-field-selector.component.ts               |  5 ++++-
 ...urnal-issue-search-result-list-element.component.ts |  5 ++++-
 ...rnal-volume-search-result-list-element.component.ts |  5 ++++-
 .../journal-search-result-list-element.component.ts    |  5 ++++-
 .../org-unit-search-result-list-element.component.ts   |  5 ++++-
 .../person-search-result-list-element.component.ts     |  5 ++++-
 .../project-search-result-list-element.component.ts    |  5 ++++-
 .../org-unit-input-suggestions.component.ts            |  5 ++++-
 ...-search-result-list-submission-element.component.ts |  5 ++++-
 .../person-input-suggestions.component.ts              |  5 ++++-
 src/app/footer/footer.component.ts                     |  5 ++++-
 .../forgot-password-form.component.ts                  |  4 ++--
 src/app/home-page/home-page.component.ts               |  6 +++++-
 .../recent-item-list/recent-item-list.component.ts     |  6 +++++-
 src/app/item-page/alerts/item-alerts.component.ts      |  4 ++--
 .../bitstream-request-a-copy-page.component.ts         |  9 ++++++---
 .../bitstreams/upload/upload-bitstream.component.ts    |  4 ++--
 .../edit-item-page/edit-item-page.component.ts         |  9 ++++++---
 .../item-access-control.component.ts                   |  4 ++--
 .../item-authorizations.component.ts                   |  4 ++--
 .../item-bitstreams/item-bitstreams.component.ts       |  9 ++++++---
 .../item-collection-mapper.component.ts                |  4 ++--
 .../item-curate/item-curate.component.ts               |  4 ++--
 .../item-delete/item-delete.component.ts               |  4 ++--
 .../edit-item-page/item-move/item-move.component.ts    |  4 ++--
 .../item-operation/item-operation.component.ts         |  4 ++--
 .../item-register-doi/item-register-doi.component.ts   |  4 ++--
 .../edit-relationship-list-wrapper.component.ts        |  4 ++--
 .../edit-relationship-list.component.ts                |  9 ++++++---
 .../edit-relationship/edit-relationship.component.ts   |  4 ++--
 .../item-relationships/item-relationships.component.ts |  9 ++++++---
 .../item-status/item-status.component.ts               |  9 ++++++---
 .../item-version-history.component.ts                  |  4 ++--
 .../virtual-metadata/virtual-metadata.component.ts     |  9 ++++++---
 .../collections/collections.component.ts               |  4 ++--
 .../metadata-uri-values.component.ts                   |  4 ++--
 .../metadata-values/metadata-values.component.ts       |  5 ++++-
 .../file-section/full-file-section.component.ts        |  4 ++--
 src/app/item-page/full/full-item-page.component.ts     | 10 +++++++---
 .../media-viewer-video/media-viewer-video.component.ts |  4 ++--
 .../item-page/media-viewer/media-viewer.component.ts   |  4 ++--
 .../mirador-viewer/mirador-viewer.component.ts         |  9 ++++++---
 .../orcid-page/orcid-auth/orcid-auth.component.ts      |  4 ++--
 src/app/item-page/orcid-page/orcid-page.component.ts   |  5 ++++-
 .../orcid-sync-settings.component.ts                   |  4 ++--
 .../cc-license/item-page-cc-license-field.component.ts |  5 ++++-
 src/app/item-page/simple/item-page.component.ts        |  9 ++++++---
 .../item-types/untyped-item/untyped-item.component.ts  |  4 ++--
 .../notify-requests-status.component.ts                |  9 ++++++---
 .../request-status-alert-box.component.ts              |  4 ++--
 .../qa-event-notification.component.ts                 |  4 ++--
 .../simple/related-items/related-items-component.ts    |  6 +++++-
 .../item-versions-row-element-version.component.ts     |  9 ++++++---
 src/app/item-page/versions/item-versions.component.ts  | 10 +++++++---
 .../my-dspace-new-external-dropdown.component.ts       |  4 ++--
 .../my-dspace-new-submission-dropdown.component.ts     |  4 ++--
 .../my-dspace-new-submission.component.ts              |  4 ++--
 src/app/my-dspace-page/my-dspace-page.component.ts     |  4 ++--
 .../my-dspace-qa-events-notifications.component.ts     |  4 ++--
 .../expandable-navbar-section.component.ts             |  9 ++++++---
 src/app/navbar/navbar.component.ts                     |  6 +++++-
 .../qa/events/ePerson-data/ePerson-data.component.ts   |  4 ++--
 .../qa/source/quality-assurance-source.component.ts    |  5 ++++-
 .../qa/topics/quality-assurance-topics.component.ts    |  5 ++++-
 .../suggestion-actions/suggestion-actions.component.ts |  4 ++--
 .../suggestion-evidences.component.ts                  |  4 ++--
 .../suggestion-list-element.component.ts               |  4 ++--
 .../publication-claim/publication-claim.component.ts   |  4 ++--
 .../suggestions-notification.component.ts              |  4 ++--
 .../suggestions-popup/suggestions-popup.component.ts   |  4 ++--
 .../process-page/detail/process-detail.component.ts    |  6 +++++-
 .../overview/process-overview.component.ts             |  6 +++++-
 .../overview/table/process-overview-table.component.ts | 10 +++++++---
 .../profile-claim-item-modal.component.ts              |  4 ++--
 .../profile-page-metadata-form.component.ts            |  4 ++--
 .../profile-page-researcher-form.component.ts          |  4 ++--
 .../profile-page-security-form.component.ts            |  4 ++--
 src/app/profile-page/profile-page.component.ts         |  9 ++++++---
 .../create-profile/create-profile.component.ts         |  4 ++--
 .../email-request-copy/email-request-copy.component.ts |  5 ++++-
 src/app/root/root.component.ts                         |  9 ++++++---
 src/app/shared/alert/alert.component.ts                |  1 -
 .../shared/auth-nav-menu/auth-nav-menu.component.ts    |  5 ++++-
 .../auth-nav-menu/user-menu/user-menu.component.ts     |  5 ++++-
 src/app/shared/browse-by/browse-by.component.ts        |  6 +++++-
 .../comcol-forms/comcol-form/comcol-form.component.ts  |  9 ++++++---
 .../comcol-role/comcol-role.component.ts               |  4 ++--
 .../comcol-page-browse-by.component.ts                 |  4 ++--
 .../comcol-page-content.component.ts                   |  4 ++--
 .../comcol-page-handle/comcol-page-handle.component.ts |  4 ++--
 .../context-help-wrapper.component.ts                  | 10 +++++++---
 .../item-withdrawn-reinstate-modal.component.ts        |  4 ++--
 .../dso-edit-menu-expandable-section.component.ts      |  5 ++++-
 .../dso-page/dso-edit-menu/dso-edit-menu.component.ts  |  5 ++++-
 .../dso-selector/dso-selector.component.ts             |  5 ++++-
 .../file-download-link/file-download-link.component.ts |  6 +++++-
 .../ds-dynamic-form-control-container.component.ts     | 10 +++++++---
 .../ds-dynamic-form-ui/ds-dynamic-form.component.ts    |  4 ++--
 .../existing-metadata-list-element.component.ts        |  4 ++--
 .../existing-relation-list-element.component.ts        |  4 ++--
 .../models/array-group/dynamic-form-array.component.ts |  9 ++++++---
 .../dynamic-date-picker-inline.component.ts            |  4 ++--
 .../models/form-group/dynamic-form-group.component.ts  |  4 ++--
 .../models/list/dynamic-list.component.ts              |  9 ++++++---
 .../models/lookup/dynamic-lookup.component.ts          |  9 ++++++---
 .../models/onebox/dynamic-onebox.component.ts          |  9 ++++++---
 .../dynamic-relation-group.component.spec.ts           |  9 ++++++---
 .../dynamic-relation-group.components.ts               |  9 ++++++---
 .../dynamic-scrollable-dropdown.component.ts           |  4 ++--
 .../models/tag/dynamic-tag.component.ts                |  4 ++--
 .../dynamic-lookup-relation-modal.component.ts         |  4 ++--
 ...ic-lookup-relation-external-source-tab.component.ts |  4 ++--
 .../external-source-entry-import-modal.component.ts    |  4 ++--
 .../dynamic-lookup-relation-search-tab.component.ts    |  4 ++--
 .../dynamic-lookup-relation-selection-tab.component.ts |  4 ++--
 src/app/shared/form/chips/chips.component.spec.ts      |  5 +----
 src/app/shared/form/chips/chips.component.ts           |  9 ++++++---
 src/app/shared/form/form.component.spec.ts             |  4 ++--
 src/app/shared/form/form.component.ts                  |  4 ++--
 .../vocabulary-treeview.component.ts                   |  4 ++--
 .../dso-input-suggestions.component.ts                 |  5 ++++-
 .../filter-input-suggestions.component.ts              |  6 +++++-
 .../input-suggestions/input-suggestions.component.ts   |  5 ++++-
 .../validation-suggestions.component.ts                |  5 ++++-
 src/app/shared/live-region/live-region.component.ts    |  5 ++++-
 .../notification-box/notification-box.component.ts     |  4 ++--
 .../notification/notification.component.ts             |  7 ++++++-
 .../object-collection/object-collection.component.ts   |  6 +++++-
 .../item-detail-preview-field.component.ts             |  4 ++--
 .../identifier-data/identifier-data.component.ts       |  4 ++--
 .../claimed-search-result-list-element.component.ts    |  5 ++++-
 .../item-list-preview/item-list-preview.component.ts   |  9 ++++++---
 .../pool-search-result-list-element.component.ts       |  5 ++++-
 ...rkflow-item-search-result-list-element.component.ts |  5 ++++-
 ...kspace-item-search-result-list-element.component.ts |  5 ++++-
 .../item/item-search-result-list-element.component.ts  |  5 ++++-
 ...collection-sidebar-search-list-element.component.ts |  3 +--
 .../sidebar-search-list-element.component.ts           |  5 ++++-
 .../collection-select/collection-select.component.ts   |  5 ++++-
 .../object-select/item-select/item-select.component.ts |  5 ++++-
 src/app/shared/object-table/object-table.component.ts  |  4 ++--
 .../orcid-badge-and-tooltip.component.ts               |  4 ++--
 src/app/shared/pagination/pagination.component.ts      |  5 ++++-
 .../entry/resource-policy-entry.component.ts           |  9 +++------
 .../form/resource-policy-form.component.spec.ts        |  4 ++--
 .../form/resource-policy-form.component.ts             |  4 ++--
 .../resource-policies/resource-policies.component.ts   |  4 ++--
 .../advanced-search/advanced-search.component.ts       |  9 ++++++---
 .../search-filter/search-filter.component.ts           |  6 +++++-
 .../search-hierarchy-filter.component.ts               |  5 ++++-
 .../search-range-filter.component.ts                   |  5 ++++-
 .../search-label-range/search-label-range.component.ts |  4 ++--
 .../search/search-labels/search-labels.component.ts    |  5 ++++-
 .../search-results-skeleton.component.ts               |  4 ++--
 src/app/shared/search/search.component.ts              | 10 +++++++---
 src/app/shared/sidebar/page-with-sidebar.component.ts  |  9 ++++++---
 .../subscription-modal/subscription-modal.component.ts |  5 ++++-
 .../submission-upload-files.component.ts               |  4 ++--
 .../submission-import-external-collection.component.ts |  4 ++--
 .../submission-import-external-preview.component.ts    |  4 ++--
 .../submission-import-external.component.ts            |  4 ++--
 .../sections/accesses/section-accesses.component.ts    |  4 ++--
 .../submission-section-cc-licenses.component.ts        |  4 ++--
 .../sections/container/section-container.component.ts  | 10 +++++++---
 .../duplicates/section-duplicates.component.ts         |  4 ++--
 .../submission/sections/form/section-form.component.ts |  4 ++--
 .../identifiers/section-identifiers.component.spec.ts  |  4 ++--
 .../identifiers/section-identifiers.component.ts       |  4 ++--
 .../sections/license/section-license.component.spec.ts |  4 ++--
 .../sections/license/section-license.component.ts      |  4 ++--
 .../section-coar-notify.component.ts                   |  9 ++++++---
 .../content-accordion/content-accordion.component.ts   |  4 ++--
 .../metadata-information.component.ts                  |  4 ++--
 .../publication-information.component.ts               |  4 ++--
 .../publisher-policy/publisher-policy.component.ts     |  4 ++--
 .../section-sherpa-policies.component.ts               |  4 ++--
 .../edit/section-upload-file-edit.component.spec.ts    |  4 ++--
 .../file/edit/section-upload-file-edit.component.ts    |  4 ++--
 .../upload/file/section-upload-file.component.spec.ts  |  4 ++--
 .../upload/file/section-upload-file.component.ts       |  4 ++--
 .../file/view/section-upload-file-view.component.ts    |  4 ++--
 .../sections/upload/section-upload.component.ts        |  4 ++--
 src/app/suggestions-page/suggestions-page.component.ts |  4 ++--
 .../alert-banner/system-wide-alert-banner.component.ts |  5 ++++-
 .../advanced-workflow-action-rating.component.ts       |  9 ++++++---
 ...vanced-workflow-action-select-reviewer.component.ts |  5 ++++-
 .../workflow-item-delete.component.ts                  |  5 ++++-
 .../workspaceitems-delete-page.component.ts            |  5 ++++-
 243 files changed, 802 insertions(+), 483 deletions(-)

diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
index 9649277cdf..fc7e86ad4c 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -60,8 +60,8 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     NgxPaginationModule,
     SelectableListItemControlComponent,
-    ListableObjectComponentLoaderComponent
-],
+    ListableObjectComponentLoaderComponent,
+  ],
   standalone: true,
 })
 export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
index 12d501c7d6..a8c527c755 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -16,8 +16,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   imports: [
     NgbAccordionModule,
     TranslateModule,
-    AccessControlFormContainerComponent
-],
+    AccessControlFormContainerComponent,
+  ],
   standalone: true,
 })
 export class BulkAccessSettingsComponent {
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index 80aeab3417..1aee792aba 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -71,8 +74,8 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component';
     ReactiveFormsModule,
     ThemedLoadingComponent,
     PaginationComponent,
-    NgClass
-],
+    NgClass,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 586339a4d6..8b5a8817a9 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -86,8 +89,8 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
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 ca83c0af7e..087db617e7 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
@@ -93,8 +93,8 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
     TranslateModule,
     ContextHelpDirective,
     MembersListComponent,
-    SubgroupsListComponent
-],
+    SubgroupsListComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 84782ad0eb..737e08427b 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Input,
@@ -107,8 +110,8 @@ export interface EPersonListActionConfig {
     AsyncPipe,
     RouterLink,
     NgClass,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index e5bd6448ab..a42b56d6e2 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -64,8 +64,8 @@ enum SubKey {
     ContextHelpDirective,
     TranslateModule,
     ReactiveFormsModule,
-    PaginationComponent
-],
+    PaginationComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index c45692cab2..d3cf50ad4b 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -75,8 +75,8 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     AsyncPipe,
     PaginationComponent,
     NgbTooltipModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index c953ce2ad5..d4a578411d 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -36,8 +36,8 @@ import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzo
     TranslateModule,
     FormsModule,
     UiSwitchModule,
-    FileDropzoneNoUploaderComponent
-],
+    FileDropzoneNoUploaderComponent,
+  ],
   standalone: true,
 })
 export class BatchImportPageComponent {
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
index 832e6e78f3..07c0453be9 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -74,8 +74,8 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter
     ReactiveFormsModule,
     TranslateModule,
     NgbDropdownModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
 })
 export class LdnServiceFormComponent implements OnInit, OnDestroy {
   formModel: FormGroup;
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
index e2f956ea48..59f21bb14a 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -55,8 +58,8 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
     TruncatableComponent,
     TruncatablePartComponent,
     NgClass,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class LdnServicesOverviewComponent implements OnInit, OnDestroy {
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 41d067ac95..4fe93f4c86 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -44,8 +44,8 @@ import {
     AdminNotifyMetricsComponent,
     RouterLink,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
 })
 
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index de3141b870..1bd5eb9ec7 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -23,8 +23,8 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model';
   ],
   standalone: true,
   imports: [
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 /**
  * Component for detailed view of LDN messages displayed in search result in AdminNotifyDashboardComponent
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
index 45f3269cc9..7aa1e63c56 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -35,8 +35,8 @@ import { ThemedSearchComponent } from '../../../../shared/search/themed-search.c
     SearchLabelsComponent,
     ThemedSearchComponent,
     AsyncPipe,
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index 680ef53dcf..6519826ddf 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -16,8 +16,8 @@ import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
   standalone: true,
   imports: [
     NotificationBoxComponent,
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 /**
  * Component used to display the number of notification for each configured box in the notifyMetrics section
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index d615313e6e..ece05c30bb 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -41,8 +44,8 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se
     AsyncPipe,
     TruncatableComponent,
     TruncatablePartComponent,
-    RouterLink
-],
+    RouterLink,
+  ],
 })
 /**
  * Component for visualization in table format of the search results related to the AdminNotifyDashboardComponent
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index b33ff31728..bc0f76ea17 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -40,8 +40,8 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
     AsyncPipe,
     RouterLink,
     TranslateModule,
-    PaginationComponent
-],
+    PaginationComponent,
+  ],
   standalone: true,
 })
 export class BitstreamFormatsComponent implements OnInit, OnDestroy {
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index f69e27242d..59fa50ee5b 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -34,8 +34,8 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
   selector: 'ds-bitstream-format-form',
   templateUrl: './format-form.component.html',
   imports: [
-    FormComponent
-],
+    FormComponent,
+  ],
   standalone: true,
 })
 export class FormatFormComponent implements OnInit {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 575d4586b9..8e5adeddf7 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -45,8 +48,8 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
     AsyncPipe,
     PaginationComponent,
     NgClass,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index e3ce9f895a..139f711920 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -38,8 +38,8 @@ import { FormComponent } from '../../../../shared/form/form.component';
   imports: [
     AsyncPipe,
     TranslateModule,
-    FormComponent
-],
+    FormComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 2075a1a702..63f93961be 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -34,8 +34,8 @@ import { FormComponent } from '../../../../shared/form/form.component';
   imports: [
     FormComponent,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index efabc0ae76..52f927073f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -55,8 +58,8 @@ import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field
     TranslateModule,
     PaginationComponent,
     NgClass,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index 4382a5c16e..85924dd82f 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -33,8 +33,8 @@ import { FilteredCollections } from './filtered-collections.model';
     TranslateModule,
     NgbAccordionModule,
     FiltersComponent,
-    KeyValuePipe
-],
+    KeyValuePipe,
+  ],
   standalone: true,
 })
 export class FilteredCollectionsComponent implements OnInit {
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
index f4d1e226d0..b12a7967c8 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -1,6 +1,6 @@
 import { Item } from 'src/app/core/shared/item.model';
-import { Observable } from "rxjs";
-import { Collection } from "../../../core/shared/collection.model";
+
+import { Collection } from '../../../core/shared/collection.model';
 
 export class FilteredItems {
 
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index f4023e8678..7782b0e416 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -40,7 +40,10 @@ import { environment } from 'src/environments/environment';
 
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
-import { FilteredItem, FilteredItems } from './filtered-items-model';
+import {
+  FilteredItem,
+  FilteredItems,
+} from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
 import { PresetQuery } from './preset-query.model';
 import { QueryPredicate } from './query-predicate.model';
@@ -58,8 +61,8 @@ import { QueryPredicate } from './query-predicate.model';
     TranslateModule,
     AsyncPipe,
     FiltersComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class FilteredItemsComponent implements OnInit {
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
index 30ca74cd20..24bd1103c9 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.ts
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -24,8 +24,8 @@ import { FilterGroup } from './filter-group.model';
   styleUrls: ['./filters-section.component.scss'],
   imports: [
     ReactiveFormsModule,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class FiltersComponent {
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 76e3e01c4b..910a384a8b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   HostListener,
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index f7415e7b16..03f9397819 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index c5390eeedf..6ad82b2a74 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -91,8 +91,8 @@ import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.compo
     ErrorComponent,
     ThemedLoadingComponent,
     TranslateModule,
-    FileSizePipe
-],
+    FileSizePipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 7db7345c04..a137a3aaa2 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 8c4c259b23..87366d38c6 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, isPlatformServer } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformServer,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -67,8 +70,8 @@ export const BBM_PAGINATION_ID = 'bbm';
     AsyncPipe,
     TranslateModule,
     ThemedLoadingComponent,
-    ThemedBrowseByComponent
-],
+    ThemedBrowseByComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index 30f8ef8781..4115bc7349 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -57,8 +57,8 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
     VocabularyTreeviewComponent,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index 0758435db8..49890c7cb5 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -64,8 +60,6 @@ import {
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 33bffcf611..4fce1601a9 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -83,8 +83,8 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     TranslateModule,
     AsyncPipe,
     ItemSelectComponent,
-    BrowserOnlyPipe
-],
+    BrowserOnlyPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index b7978b82ab..043d7e6426 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -73,8 +73,8 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
     DsoEditMenuComponent,
     ThemedComcolPageBrowseByComponent,
     ObjectCollectionComponent,
-    RouterOutlet
-],
+    RouterOutlet,
+  ],
   standalone: true,
 })
 export class CollectionPageComponent implements OnInit {
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index f0658056f9..989d77c15b 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -28,8 +28,8 @@ import { CollectionFormComponent } from '../collection-form/collection-form.comp
     CollectionFormComponent,
     TranslateModule,
     AsyncPipe,
-    ThemedLoadingComponent
-],
+    ThemedLoadingComponent,
+  ],
   standalone: true,
 })
 export class CreateCollectionPageComponent extends CreateComColPageComponent<Collection> {
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 6e06763751..61a6bd3336 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -28,8 +28,8 @@ import { VarDirective } from '../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Collection> {
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
index f1581c8bd9..6d63b69533 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -18,8 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./collection-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class CollectionAccessControlComponent  implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index e715a3369c..26f55770c1 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -53,8 +53,8 @@ import { getCollectionItemTemplateRoute } from '../../collection-page-routing-pa
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index b378c6d24b..bde3d30828 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -28,8 +28,8 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './collection-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class CollectionRolesComponent implements OnInit {
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 56b44568ee..1e07978af7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -53,8 +53,8 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 938bbeab88..50b869e636 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, Location } from '@angular/common';
+import {
+  AsyncPipe,
+  Location,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -77,8 +80,8 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class CollectionSourceComponent extends AbstractTrackableComponent implements OnInit, OnDestroy {
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index e629f80570..03fe92faa8 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -28,9 +26,7 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index 7602e58799..eb8b36ec89 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -38,8 +38,8 @@ import { getCollectionEditRoute } from '../collection-page-routing-paths';
     VarDirective,
     TranslateModule,
     ThemedLoadingComponent,
-    AlertComponent
-],
+    AlertComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index b5b2ba13f0..c87fbf5d13 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -2,7 +2,10 @@ import {
   CdkTreeModule,
   FlatTreeControl,
 } from '@angular/cdk/tree';
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index a6e3dd8e3a..c8c947c900 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -65,8 +65,8 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
     ViewTrackerComponent,
     VarDirective,
     RouterOutlet,
-    RouterModule
-],
+    RouterModule,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index 7368bec955..7c0c26ffcd 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -29,8 +29,8 @@ import { CommunityFormComponent } from '../community-form/community-form.compone
     TranslateModule,
     VarDirective,
     AsyncPipe,
-    ThemedLoadingComponent
-],
+    ThemedLoadingComponent,
+  ],
   standalone: true,
 })
 export class CreateCommunityPageComponent extends CreateComColPageComponent<Community> {
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 0ba25effea..4799cd2db8 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -28,8 +28,8 @@ import { VarDirective } from '../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Community> {
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
index 05c42b61d6..cc632c0e94 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -18,8 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./community-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class CommunityAccessControlComponent implements OnInit {
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 1fbf307886..69234e07c3 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -27,8 +27,8 @@ import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-co
   templateUrl: './community-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class CommunityRolesComponent implements OnInit {
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index ec46d1ef26..77300023be 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -24,8 +27,8 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
     TranslateModule,
     NgClass,
     RouterOutlet,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
   type = 'community';
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index fe00325317..1d12860628 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -43,8 +43,8 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
index f53c5346df..ea21c66b54 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -22,8 +22,8 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sub-community-li
   imports: [
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class SubComColSectionComponent implements OnInit {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 1b255bdb29..972ba3d7fb 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -46,8 +46,8 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 /**
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 7956095806..e718080eb6 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
@@ -2,7 +2,10 @@ import {
   CdkDrag,
   CdkDragHandle,
 } from '@angular/cdk/drag-drop';
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
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 f57e651a7c..65bd8bfa7b 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,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   AfterViewInit,
   Component,
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index 1adb79d60b..7ce5ac9df1 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index dcd62ce29d..f01c859fdd 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 234307c210..f589e2ffc5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 16cb34e25d..47cbefd4f5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index eba98bddb1..870d3222b5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 736dfaa8ee..dd8f6acb44 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index 9d7c134148..6896da5783 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   forwardRef,
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 71477f3d73..f5973408f6 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 36440dbd8d..b5645ff3f1 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   forwardRef,
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index f7485c1179..c691203c02 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 638151c9b7..37d964084a 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -39,8 +39,8 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index ba526940b5..33a8216a8a 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index 35dcdbd0c8..b336cf7e9b 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index 9d2c31f279..3dbe0f2562 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -36,8 +36,8 @@ import {
     AlertComponent,
     TranslateModule,
     RouterLink,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index db4e078ff2..dfbcef4111 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, Location } from '@angular/common';
+import {
+  AsyncPipe,
+  Location,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -67,8 +70,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     RouterLink,
     AsyncPipe,
     ReactiveFormsModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index 3fe0e0eb86..00d0a9a420 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -61,8 +61,8 @@ import { getEntityEditRoute } from '../../item-page-routing-paths';
     VarDirective,
     DsoInputSuggestionsComponent,
     FormsModule,
-    UploaderComponent
-],
+    UploaderComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index b547aaa2cb..64a32968e5 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -46,8 +49,8 @@ import { getItemPageRoute } from '../item-page-routing-paths';
     AsyncPipe,
     NgbTooltipModule,
     RouterLink,
-    RouterOutlet
-],
+    RouterOutlet,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
index e4aa8c6488..926afad490 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -18,8 +18,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./item-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class ItemAccessControlComponent implements OnInit {
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index ecca674a1c..6e700fd48e 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -63,8 +63,8 @@ interface BundleBitstreamsMapEntry {
     TranslateModule,
     NgForTrackByIdDirective,
     AsyncPipe,
-    AlertComponent
-],
+    AlertComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 1960cf1443..ea56a4274a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, CommonModule } from '@angular/common';
+import {
+  AsyncPipe,
+  CommonModule,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -75,8 +78,8 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
     VarDirective,
     ThemedLoadingComponent,
     AlertComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   providers: [ObjectValuesPipe],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index ce71b0617b..f1be1a99a6 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -76,8 +76,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     ThemedSearchFormComponent,
     AsyncPipe,
     TranslateModule,
-    BrowserOnlyPipe
-],
+    BrowserOnlyPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
index a5a3042474..6767d507f2 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -27,8 +27,8 @@ import { hasValue } from '../../../shared/empty.util';
   imports: [
     CurationFormComponent,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class ItemCurateComponent implements OnInit {
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index f08831dc2c..e1bd37f9e5 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -104,8 +104,8 @@ class RelationshipDTO {
     AsyncPipe,
     VarDirective,
     RouterLink,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index ed6ad8d407..1c6e78850a 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -53,8 +53,8 @@ import {
     RouterLink,
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 0f4973d46f..cb8a754bfb 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -17,8 +17,8 @@ import { ItemOperation } from './itemOperation.model';
     TranslateModule,
     RouterLink,
     NgbTooltipModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index f2e403c5ab..4c484d2f4f 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -37,8 +37,8 @@ import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstrac
     ModifyItemOverviewComponent,
     RouterLink,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
index 41b88bfcd8..a81a940fe2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -27,8 +27,8 @@ import { EditRelationshipListComponent } from '../edit-relationship-list/edit-re
   standalone: true,
   imports: [
     AsyncPipe,
-    EditRelationshipListComponent
-],
+    EditRelationshipListComponent,
+  ],
 })
 /**
  * A component creating a list of editable relationships of a certain type
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index cdcc11b94b..a5d79bb880 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -94,8 +97,8 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index 4dd27c0930..f14cb8c24f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -51,8 +51,8 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
     AsyncPipe,
     TranslateModule,
     VirtualMetadataComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class EditRelationshipComponent implements OnChanges {
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index df68a34f8a..38bc6b8805 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -61,8 +64,8 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 58dbbf264b..d693d7758b 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -66,8 +69,8 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
     AsyncPipe,
     RouterLink,
     ItemOperationComponent,
-    NgClass
-],
+    NgClass,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index 3ce1dbb7a4..f2af333be7 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -20,8 +20,8 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
   imports: [
     ItemVersionsComponent,
     VarDirective,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index 9b336c18ed..ad413db962 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -43,8 +46,8 @@ interface ItemDTO {
     TranslateModule,
     VarDirective,
     AsyncPipe,
-    ListableObjectComponentLoaderComponent
-],
+    ListableObjectComponentLoaderComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index e545781d26..d5347c3285 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -48,8 +48,8 @@ import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wr
     MetadataFieldWrapperComponent,
     TranslateModule,
     AsyncPipe,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class CollectionsComponent implements OnInit {
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index e3c89b3b20..a583873d6e 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -22,8 +22,8 @@ import { MetadataValuesComponent } from '../metadata-values/metadata-values.comp
   templateUrl: './metadata-uri-values.component.html',
   imports: [
     MetadataFieldWrapperComponent,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class MetadataUriValuesComponent extends MetadataValuesComponent {
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index 986e93b960..d12881ce91 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index 8f5c614e89..463ee85635 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -59,8 +59,8 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
     ThemedThumbnailComponent,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    MetadataFieldWrapperComponent
-],
+    MetadataFieldWrapperComponent,
+  ],
   standalone: true,
 })
 export class FullFileSectionComponent extends FileSectionComponent implements OnDestroy, OnInit {
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 07c7ab45ba..9b982c7a5f 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, KeyValuePipe, Location } from '@angular/common';
+import {
+  AsyncPipe,
+  KeyValuePipe,
+  Location,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -73,8 +77,8 @@ import { ThemedFullFileSectionComponent } from './field-components/file-section/
     ItemVersionsNoticeComponent,
     ViewTrackerComponent,
     ThemedItemAlertsComponent,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit, OnDestroy {
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 12d71bbca1..3c4c9b94c6 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
@@ -23,8 +23,8 @@ import { languageHelper } from './language-helper';
   imports: [
     NgbDropdownModule,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class MediaViewerVideoComponent {
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 46a9a862a2..9e5d9bd028 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -49,8 +49,8 @@ import { ThemedMediaViewerVideoComponent } from './media-viewer-video/themed-med
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class MediaViewerComponent implements OnDestroy, OnInit {
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index 73395eb84f..f1cdb6e4f4 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, isPlatformBrowser } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -38,8 +41,8 @@ import { MiradorViewerService } from './mirador-viewer.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class MiradorViewerComponent implements OnInit {
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index c4ce598965..2d39ee25a8 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -42,8 +42,8 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
     TranslateModule,
     AsyncPipe,
     AlertComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class OrcidAuthComponent implements OnInit, OnChanges {
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index b2ed23af89..7e634fdeca 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,4 +1,7 @@
-import { CommonModule, isPlatformBrowser } from '@angular/common';
+import {
+  CommonModule,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index ec3ee5718e..5685627345 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -50,8 +50,8 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
   imports: [
     AlertComponent,
     FormsModule,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class OrcidSyncSettingsComponent implements OnInit, OnDestroy {
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
index b8681eed50..9653b9932c 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -1,4 +1,7 @@
-import { NgClass, NgStyle } from '@angular/common';
+import {
+  NgClass,
+  NgStyle,
+} from '@angular/common';
 import {
   Component,
   Input,
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index ef8cc9fced..0571f99bea 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, isPlatformServer } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformServer,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -76,8 +79,8 @@ import { QaEventNotificationComponent } from './qa-event-notification/qa-event-n
     TranslateModule,
     AsyncPipe,
     NotifyRequestsStatusComponent,
-    QaEventNotificationComponent
-],
+    QaEventNotificationComponent,
+  ],
 })
 export class ItemPageComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 617b63a80a..1402831c33 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -55,7 +55,7 @@ import { ItemComponent } from '../shared/item.component';
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    ItemPageCcLicenseFieldComponent
-],
+    ItemPageCcLicenseFieldComponent,
+  ],
 })
 export class UntypedItemComponent extends ItemComponent {}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
index aaa1fa5267..ffaf8ab000 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, KeyValuePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  KeyValuePipe,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -33,8 +36,8 @@ import { RequestStatusAlertBoxComponent } from '../request-status-alert-box/requ
   imports: [
     RequestStatusAlertBoxComponent,
     AsyncPipe,
-    KeyValuePipe
-],
+    KeyValuePipe,
+  ],
 })
 
 /**
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
index fb5d5fa3f5..db5efd9b2c 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -22,8 +22,8 @@ import { RequestStatusEnum } from '../notify-status.enum';
     TruncatablePartComponent,
     TruncatableComponent,
     TranslateModule,
-    NgClass
-],
+    NgClass,
+  ],
 })
 /**
  * Represents a component that displays the status of a request.
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
index 783ea8accb..e681db4a0a 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -35,8 +35,8 @@ import { SplitPipe } from '../../../shared/utils/split.pipe';
     AsyncPipe,
     RouterLink,
     TranslateModule,
-    SplitPipe
-],
+    SplitPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 3b4f2de61e..e6132661fd 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   ElementRef,
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 760d5f4d96..92597c044f 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -63,8 +66,8 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     RouterLink,
     TranslateModule,
     NgClass,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
 })
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 7c93cdc414..6ae2af1438 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, DatePipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Input,
@@ -78,8 +82,8 @@ interface VersionDTO {
     NgClass,
     PaginationComponent,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
 })
 
 /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 77f8fdf7ba..7a89089051 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -42,8 +42,8 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 8beef0f99e..25cfe437bd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -44,8 +44,8 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index bdfd28fe0a..7d014b9393 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -37,8 +37,8 @@ import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submissi
   imports: [
     MyDSpaceNewExternalDropdownComponent,
     MyDSpaceNewSubmissionDropdownComponent,
-    UploaderComponent
-],
+    UploaderComponent,
+  ],
   standalone: true,
 })
 export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 832c19a40c..7acb900739 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -47,8 +47,8 @@ export const MYDSPACE_ROUTE = '/mydspace';
     AsyncPipe,
     RoleDirective,
     SuggestionsNotificationComponent,
-    MyDspaceQaEventsNotificationsComponent
-],
+    MyDspaceQaEventsNotificationsComponent,
+  ],
   standalone: true,
 })
 export class MyDSpacePageComponent implements OnInit {
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
index f9da5035b2..8bc141e258 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -29,8 +29,8 @@ import {
   imports: [
     AsyncPipe,
     TranslateModule,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class MyDspaceQaEventsNotificationsComponent  implements OnInit {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 0a350f890b..84a7cad594 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   AfterViewChecked,
   Component,
@@ -33,8 +36,8 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
     AsyncPipe,
     HoverOutsideDirective,
     NgComponentOutlet,
-    RouterLinkActive
-],
+    RouterLinkActive,
+  ],
 })
 export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
 
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index b8afb46e89..eb5fb89ffa 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   Injector,
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
index 0c070deb3b..36b9a606d8 100644
--- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
@@ -17,8 +17,8 @@ import {
   templateUrl: './ePerson-data.component.html',
   standalone: true,
   imports: [
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   styleUrls: ['./ePerson-data.component.scss'],
 })
 /**
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index db2d92164e..575394fd2f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+} from '@angular/common';
 import {
   AfterViewInit,
   Component,
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 3792e95f85..f700b68689 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, DatePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+} from '@angular/common';
 import {
   AfterViewInit,
   Component,
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 482cedd3a8..dc0e075667 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -31,8 +31,8 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
     EntityDropdownComponent,
     TranslateModule,
     NgbDropdownModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class SuggestionActionsComponent {
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
index 4dc8874886..d968826b70 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -19,8 +19,8 @@ import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
   animations: [fadeIn],
   imports: [
     TranslateModule,
-    ObjectKeysPipe
-],
+    ObjectKeysPipe,
+  ],
   standalone: true,
 })
 export class SuggestionEvidencesComponent {
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
index 7e0c0b4db9..9e55ba0825 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -29,8 +29,8 @@ import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-
     TranslateModule,
     ItemSearchResultListElementComponent,
     SuggestionActionsComponent,
-    SuggestionEvidencesComponent
-],
+    SuggestionEvidencesComponent,
+  ],
   standalone: true,
 })
 export class SuggestionListElementComponent implements OnInit {
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 7d8cd087ba..ccb56629c6 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -42,8 +42,8 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
     AsyncPipe,
     TranslateModule,
     PaginationComponent,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class PublicationClaimComponent implements AfterViewInit, OnDestroy, OnInit {
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
index ac3bc202b9..208c1bfcbd 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -21,8 +21,8 @@ import { SuggestionsService } from '../suggestions.service';
   imports: [
     RouterLink,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   styleUrls: ['./suggestions-notification.component.scss'],
 })
 export class SuggestionsNotificationComponent implements OnInit {
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
index c2b15c75e3..ab5a9bbab0 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
@@ -40,8 +40,8 @@ import { SuggestionsService } from '../suggestions.service';
   imports: [
     AsyncPipe,
     TranslateModule,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class SuggestionsPopupComponent implements OnInit, OnDestroy {
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index 010f1a6522..0be0a69454 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, DatePipe, isPlatformBrowser } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+  isPlatformBrowser,
+} from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
   Component,
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index f8c0c4cd52..16f405feaf 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, DatePipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  DatePipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts
index bde235eea7..d1c1f27f52 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.ts
+++ b/src/app/process-page/overview/table/process-overview-table.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -86,8 +90,8 @@ export interface ProcessOverviewTableEntry {
     PaginationComponent,
     RouterLink,
     ThemedLoadingComponent,
-    VarDirective
-],
+    VarDirective,
+  ],
 })
 export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index f2d9529469..6adca2cbe7 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -39,8 +39,8 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index 800822a916..13dca64f8a 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -34,8 +34,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   selector: 'ds-base-profile-page-metadata-form',
   templateUrl: './profile-page-metadata-form.component.html',
   imports: [
-    FormComponent
-],
+    FormComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index 808d2e40de..4c87eee07e 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -50,8 +50,8 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
     TranslateModule,
     UiSwitchModule,
     VarDirective,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index d17c5adc16..228535297f 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -36,8 +36,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   imports: [
     FormComponent,
     AlertComponent,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 6a63215981..7799615bc6 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   OnInit,
@@ -68,8 +71,8 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     NgTemplateOutlet,
     PaginationComponent,
     ThemedLoadingComponent,
-    ErrorComponent
-],
+    ErrorComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index b9bfb3b9b1..e1c523427a 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -55,8 +55,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
     TranslateModule,
     AsyncPipe,
     ReactiveFormsModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class CreateProfileComponent implements OnInit {
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index 537027fb7e..fc9d42aa60 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,4 +1,7 @@
-import { Location, NgClass } from '@angular/common';
+import {
+  Location,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 9a6fe5ff71..69cc73547a 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -63,8 +66,8 @@ import { SystemWideAlertBannerComponent } from '../system-wide-alert/alert-banne
     ThemedFooterComponent,
     NotificationsBoardComponent,
     AsyncPipe,
-    LiveRegionComponent
-],
+    LiveRegionComponent,
+  ],
 })
 export class RootComponent implements OnInit {
   theme: Observable<ThemeConfig> = of({} as any);
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 54a8febce7..7cad34f592 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,5 +1,4 @@
 import { trigger } from '@angular/animations';
-
 import {
   ChangeDetectorRef,
   Component,
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index eea1eccbeb..49c701f77d 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index e725f361e3..af59028ced 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 75cf6a367d..84a48172df 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
index 1484c860a3..23b58cad34 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -78,8 +81,8 @@ import { ComcolPageLogoComponent } from '../../comcol-page-logo/comcol-page-logo
     AsyncPipe,
     ComcolPageLogoComponent,
     NgClass,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class ComColFormComponent<T extends Collection | Community> implements OnInit, OnDestroy {
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 3d301acd44..0dddb2a4dd 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -57,8 +57,8 @@ import { VarDirective } from '../../../../utils/var.directive';
     TranslateModule,
     RouterLink,
     VarDirective,
-    HasNoValuePipe
-],
+    HasNoValuePipe,
+  ],
   standalone: true,
 })
 export class ComcolRoleComponent implements OnInit {
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index ace21e48e4..33b6d91e22 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -58,8 +58,8 @@ export interface ComColPageNavOption {
     RouterLink,
     RouterLinkActive,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index b6100eb917..2f60bdf97c 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -16,8 +16,8 @@ import { TranslateModule } from '@ngx-translate/core';
   styleUrls: ['./comcol-page-content.component.scss'],
   templateUrl: './comcol-page-content.component.html',
   imports: [
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class ComcolPageContentComponent {
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 30a52f41ba..115717a714 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -14,8 +14,8 @@ import { TranslateModule } from '@ngx-translate/core';
   styleUrls: ['./comcol-page-handle.component.scss'],
   templateUrl: './comcol-page-handle.component.html',
   imports: [
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class ComcolPageHandleComponent {
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 31176e48ed..3bb7205234 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,4 +1,8 @@
-import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   Input,
@@ -97,7 +101,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
       this.dontParseLinks$.pipe(distinctUntilChanged()),
     ]).pipe(
       map(([text, dontParseLinks]) =>
-        dontParseLinks ? [{text}] : this.parseLinks(text)),
+        dontParseLinks ? [{ text }] : this.parseLinks(text)),
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
   }
@@ -175,7 +179,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
     return text.match(splitRegexp).map((substring: string) => {
       const match = substring.match(parseRegexp);
       return match === null
-        ? {text: substring}
+        ? { text: substring }
         : ({ href: match[2], text: match[1] });
     });
   }
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
index 6b25d090c8..bdf76bfa20 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
@@ -21,8 +21,8 @@ import { ThemedLoadingComponent } from '../loading/themed-loading.component';
     TranslateModule,
     ThemedLoadingComponent,
     FormsModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 38041e194f..a2f0af6dd4 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index 10f8aa63f5..fa3d07ae5d 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   Injector,
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 7c9cab1aa2..52436e3975 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   ElementRef,
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index b86d2143a6..a8475ee841 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   Input,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 1dcf458d6f..957fab2b1e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -135,8 +139,8 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index ccae3a7a6c..49dea60998 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -27,8 +27,8 @@ import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-contro
   selector: 'ds-dynamic-form',
   templateUrl: './ds-dynamic-form.component.html',
   imports: [
-    forwardRef(() => DsDynamicFormControlContainerComponent)
-],
+    forwardRef(() => DsDynamicFormControlContainerComponent),
+  ],
   standalone: true,
 })
 export class DsDynamicFormComponent extends DynamicFormComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index 644067677a..9f0ecf91cc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -166,8 +166,8 @@ export class ReorderableRelationship extends Reorderable {
     ThemedLoadingComponent,
     AsyncPipe,
     MetadataRepresentationLoaderComponent,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class ExistingMetadataListElementComponent implements OnInit, OnChanges, OnDestroy   {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
index af39dfd38e..ffbaef8664 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -79,8 +79,8 @@ export abstract class Reorderable {
   imports: [
     ThemedLoadingComponent,
     AsyncPipe,
-    ListableObjectComponentLoaderComponent
-],
+    ListableObjectComponentLoaderComponent,
+  ],
   standalone: true,
 })
 export class ExistingRelationListElementComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 311fcfdb4f..1385859b94 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -4,7 +4,10 @@ import {
   CdkDragHandle,
   CdkDropList,
 } from '@angular/cdk/drag-drop';
-import { NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -51,8 +54,8 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
     CdkDragHandle,
     forwardRef(() => DsDynamicFormControlContainerComponent),
     NgTemplateOutlet,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index af9cb952c6..0cecc8e676 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -32,8 +32,8 @@ import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
     NgClass,
     NgbDatepickerModule,
     ReactiveFormsModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index 3f054c3b5f..828824df54 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -34,8 +34,8 @@ import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-co
   imports: [
     ReactiveFormsModule,
     NgClass,
-    forwardRef(() => DsDynamicFormControlContainerComponent)
-],
+    forwardRef(() => DsDynamicFormControlContainerComponent),
+  ],
   standalone: true,
 })
 export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 15bcbec368..11db7e75de 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -67,8 +70,8 @@ export interface ListItem {
     ReactiveFormsModule,
     AsyncPipe,
     TranslateModule,
-    ThemedLoadingComponent
-],
+    ThemedLoadingComponent,
+  ],
   standalone: true,
 })
 export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 48d044681e..7ca4dbedb5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,4 +1,7 @@
-import { NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -70,8 +73,8 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     InfiniteScrollModule,
     NgTemplateOutlet,
     ObjNgFor,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index d8e4cff5ac..93f6e80f32 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -84,8 +87,8 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
     TranslateModule,
     ObjNgFor,
     FormsModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index 0ded66a0c8..faecacd12d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -1,5 +1,8 @@
 // Load the implementations that should be tested
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -373,8 +376,8 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
-    NgClass
-],
+    NgClass,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index ad5e36a1a9..096f1b7004 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -77,8 +80,8 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent implements OnDestroy, OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index a153218e6f..f3cbf8fb20 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -71,8 +71,8 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
     AsyncPipe,
     InfiniteScrollModule,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 66b6090bd5..7b133ded9b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -64,8 +64,8 @@ import { DynamicTagModel } from './dynamic-tag.model';
   imports: [
     NgbTypeaheadModule,
     FormsModule,
-    ChipsComponent
-],
+    ChipsComponent,
+  ],
   standalone: true,
 })
 export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implements OnInit {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index ffb405416a..cec976267f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -86,8 +86,8 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     ThemedDynamicLookupRelationSearchTabComponent,
     AsyncPipe,
     DsDynamicLookupRelationSelectionTabComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 6c0c5fa0f9..c27acf337e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -81,8 +81,8 @@ import { ThemedExternalSourceEntryImportModalComponent } from './external-source
     AsyncPipe,
     TranslateModule,
     ErrorComponent,
-    ThemedLoadingComponent
-],
+    ThemedLoadingComponent,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/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.ts b/src/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.ts
index 13ec3c3c66..edfd0f9b3d 100644
--- a/src/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.ts
+++ b/src/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.ts
@@ -66,8 +66,8 @@ export enum ImportType {
     TranslateModule,
     ThemedSearchResultsComponent,
     AsyncPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 59f2efaccc..d3903fbc54 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -57,8 +57,8 @@ import { RelationshipOptions } from '../../../models/relationship-options.model'
     VarDirective,
     TranslateModule,
     NgbDropdownModule,
-    ThemedSearchComponent
-],
+    ThemedSearchComponent,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index 8027e9a551..a92720fc7c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -48,8 +48,8 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
     PageSizeSelectorComponent,
     ObjectCollectionComponent,
     AsyncPipe,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index d633c1b2ac..6035da3d15 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -1,8 +1,5 @@
 // Load the implementations that should be tested
-import {
-  CommonModule,
-  NgIf,
-} from '@angular/common';
+import { CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index 2121fb65b1..c7d607cbf9 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -4,7 +4,10 @@ import {
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -40,8 +43,8 @@ import { ChipsItem } from './models/chips-item.model';
     AuthorityConfidenceStateDirective,
     TranslateModule,
     CdkDrag,
-    CdkDropList
-],
+    CdkDropList,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 9f974cb493..f593d9bad6 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -476,8 +476,8 @@ describe('FormComponent test suite', () => {
     FormsModule,
     ReactiveFormsModule,
     NgbModule,
-    DynamicFormsCoreModule
-],
+    DynamicFormsCoreModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index c663ee6ca9..0e0c80dd9a 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -66,8 +66,8 @@ import { FormService } from './form.service';
     TranslateModule,
     DynamicFormsCoreModule,
     AsyncPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class FormComponent implements OnDestroy, OnInit {
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 43aa2d67ef..fcbc8413b9 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -64,8 +64,8 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index 72fe0e4129..5e9e1e58a1 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   forwardRef,
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index 7638533295..bffbb966ea 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   forwardRef,
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 1dc350d319..ce17f00718 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   ElementRef,
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index 3f1b69c351..bcfb4768fd 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   forwardRef,
diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
index 4842dfcd42..d62b0d6dd7 100644
--- a/src/app/shared/live-region/live-region.component.ts
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
index bfcf5729e0..56a63c44a5 100644
--- a/src/app/shared/notification-box/notification-box.component.ts
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -22,8 +22,8 @@ import { listableObjectComponent } from '../object-collection/shared/listable-ob
   imports: [
     NgStyle,
     HoverClassDirective,
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 /**
  * Component to display the count of notifications for each type of LDN message and to access the related filtered search
diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts
index 4c73bf3c23..c56345534f 100644
--- a/src/app/shared/notifications/notification/notification.component.ts
+++ b/src/app/shared/notifications/notification/notification.component.ts
@@ -1,5 +1,10 @@
 import { trigger } from '@angular/animations';
-import { AsyncPipe, NgClass, NgStyle, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgStyle,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 4ab61acfc4..00cf58155f 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index caca143990..2f78f778f8 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -19,8 +19,8 @@ import { SearchResult } from '../../../../search/models/search-result.model';
   standalone: true,
   imports: [
     MetadataFieldWrapperComponent,
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 export class ItemDetailPreviewFieldComponent {
 
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index 2663effc9c..9c970c2934 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -18,8 +18,8 @@ import { IdentifierData } from './identifier-data.model';
   templateUrl: './identifier-data.component.html',
   imports: [
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 72ad1b6d99..d3adc9b3ab 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
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 2cff0a2c48..9ffb1000b6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,8 +45,8 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
     ThemedThumbnailComponent,
     TranslateModule,
     TruncatableComponent,
-    TruncatablePartComponent
-],
+    TruncatablePartComponent,
+  ],
 })
 export class ItemListPreviewComponent implements OnInit {
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 2ed7dcb868..e5327d9863 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 305b3b5576..504d1d7168 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 54d93dd708..2a71308c4b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 76f5b420c0..cf7fa597b3 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
index 9cc2206bd7..d446416ca8 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { SidebarSearchListElementComponent } from '../sidebar-search-list-elemen
   selector: 'ds-collection-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index 11efa36011..396790debd 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 684e731dbd..9b05e53e46 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 7006978c56..c9a46a5ba4 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   Input,
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
index 67939a00ad..003534ddc1 100644
--- a/src/app/shared/object-table/object-table.component.ts
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -39,8 +39,8 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
     ThemedLoadingComponent,
     ErrorComponent,
     TranslateModule,
-    TabulatableObjectsLoaderComponent
-],
+    TabulatableObjectsLoaderComponent,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
index df643607cf..677c752d4b 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -18,8 +18,8 @@ import { MetadataValue } from '../../core/shared/metadata.models';
   standalone: true,
   imports: [
     NgbTooltipModule,
-    NgClass
-],
+    NgClass,
+  ],
   templateUrl: './orcid-badge-and-tooltip.component.html',
   styleUrl: './orcid-badge-and-tooltip.component.scss',
 })
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index ca87571671..907b427354 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
index 5d1ca74df4..8a9bed8726 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -5,10 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -60,8 +57,8 @@ export interface ResourcePolicyCheckboxEntry {
     AsyncPipe,
     TranslateModule,
     FormsModule,
-    HasValuePipe
-],
+    HasValuePipe,
+  ],
   standalone: true,
 })
 export class ResourcePolicyEntryComponent implements OnInit {
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 6481e942b3..678b893c87 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -498,8 +498,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
   imports: [
     FormsModule,
     NgbModule,
-    ReactiveFormsModule
-],
+    ReactiveFormsModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 28f1f9176a..ce33a8e8c1 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -90,8 +90,8 @@ export interface ResourcePolicyEvent {
     EpersonGroupListComponent,
     TranslateModule,
     AsyncPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index e29304382c..90e133dc41 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -58,8 +58,8 @@ import {
     ResourcePolicyEntryComponent,
     TranslateModule,
     AsyncPipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 /**
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index 3b4d6117fd..574ffb2c4f 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, KeyValuePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  KeyValuePipe,
+} from '@angular/common';
 import {
   Component,
   Inject,
@@ -51,8 +54,8 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     FormsModule,
     KeyValuePipe,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 1605298cd9..03081581ee 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, LowerCasePipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  LowerCasePipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
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 cce308bdb1..1b0f88684e 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,4 +1,7 @@
-import { AsyncPipe, LowerCasePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  LowerCasePipe,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index d4e51c8299..ded7d98c02 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, isPlatformBrowser } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
index 8b35001f7d..ade3e43227 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
@@ -30,8 +30,8 @@ import { AppliedFilter } from '../../models/applied-filter.model';
   imports: [
     AsyncPipe,
     RouterLink,
-    TranslateModule
-],
+    TranslateModule,
+  ],
 })
 export class SearchLabelRangeComponent implements OnInit {
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index 307dc80d35..b7a9b7a82c 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, KeyValuePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  KeyValuePipe,
+} from '@angular/common';
 import {
   Component,
   Input,
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
index 33a54a7c75..56742f75f5 100644
--- a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -16,8 +16,8 @@ import { hasValue } from '../../../empty.util';
   standalone: true,
   imports: [
     NgxSkeletonLoaderModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   templateUrl: './search-results-skeleton.component.html',
   styleUrl: './search-results-skeleton.component.scss',
 })
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 24f3c9ecf1..aa1a37fe27 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, isPlatformServer, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformServer,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -95,8 +99,8 @@ import { SearchConfigurationOption } from './search-switch-configuration/search-
     ThemedSearchSidebarComponent,
     TranslateModule,
     SearchLabelsComponent,
-    ViewModeSwitchComponent
-],
+    ViewModeSwitchComponent,
+  ],
 })
 
 /**
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index a7eae5d31c..fa2460995b 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgTemplateOutlet,
+} from '@angular/common';
 import {
   Component,
   Input,
@@ -20,8 +23,8 @@ import { SidebarService } from './sidebar.service';
   standalone: true,
   imports: [
     AsyncPipe,
-    NgTemplateOutlet
-],
+    NgTemplateOutlet,
+  ],
 })
 /**
  * This component takes care of displaying the sidebar properly on all viewports. It does not
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 8572d31a0a..c6eee27e94 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, KeyValuePipe } from '@angular/common';
+import {
+  AsyncPipe,
+  KeyValuePipe,
+} from '@angular/common';
 import {
   Component,
   EventEmitter,
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 218e56de92..13d7bf8fb8 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -39,8 +39,8 @@ import parseSectionErrors from '../../utils/parseSectionErrors';
   selector: 'ds-base-submission-upload-files',
   templateUrl: './submission-upload-files.component.html',
   imports: [
-    UploaderComponent
-],
+    UploaderComponent,
+  ],
   standalone: true,
 })
 export class SubmissionUploadFilesComponent implements OnChanges, OnDestroy {
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index b5651c8f3f..57171ebe8e 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -22,8 +22,8 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
     ThemedLoadingComponent,
     ThemedCollectionDropdownComponent,
     TranslateModule,
-    NgClass
-],
+    NgClass,
+  ],
   standalone: true,
 })
 export class SubmissionImportExternalCollectionComponent {
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index 353a298a6e..7194b59f6a 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -30,8 +30,8 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external-
   styleUrls: ['./submission-import-external-preview.component.scss'],
   templateUrl: './submission-import-external-preview.component.html',
   imports: [
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class SubmissionImportExternalPreviewComponent implements OnInit {
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index b78f398830..a67520b636 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -73,8 +73,8 @@ import {
     SubmissionImportExternalSearchbarComponent,
     TranslateModule,
     VarDirective,
-    RouterLink
-],
+    RouterLink,
+  ],
   standalone: true,
 })
 export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index 8f98f68660..53c67a8bf2 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -78,8 +78,8 @@ import { SectionAccessesService } from './section-accesses.service';
   templateUrl: './section-accesses.component.html',
   styleUrls: ['./section-accesses.component.scss'],
   imports: [
-    FormComponent
-],
+    FormComponent,
+  ],
   standalone: true,
 })
 export class SubmissionSectionAccessesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index 21a1885f92..8681c33f66 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -68,8 +68,8 @@ import { SectionsType } from '../sections-type';
     NgbDropdownModule,
     FormsModule,
     InfiniteScrollModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class SubmissionSectionCcLicensesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 02a6d4e557..96f8cbcff6 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -1,4 +1,8 @@
-import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+  NgComponentOutlet,
+} from '@angular/common';
 import {
   Component,
   Injector,
@@ -29,8 +33,8 @@ import { rendersSectionType } from '../sections-decorator';
     TranslateModule,
     NgClass,
     AsyncPipe,
-    SectionsDirective
-],
+    SectionsDirective,
+  ],
   standalone: true,
 })
 export class SubmissionSectionContainerComponent implements OnInit {
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
index 5471dbc78c..cd7f0b4bea 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -38,8 +38,8 @@ import { SectionsService } from '../sections.service';
   imports: [
     VarDirective,
     AsyncPipe,
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 553bcf2d5c..75950bfe52 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -77,8 +77,8 @@ import { SectionFormOperationsService } from './section-form-operations.service'
   templateUrl: './section-form.component.html',
   imports: [
     FormComponent,
-    ThemedLoadingComponent
-],
+    ThemedLoadingComponent,
+  ],
   standalone: true,
 })
 export class SubmissionSectionFormComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
index 42aeb8719f..85cda85241 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -278,8 +278,8 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
   imports: [
     FormsModule,
     ReactiveFormsModule,
-    NgxPaginationModule
-],
+    NgxPaginationModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index cc42066534..4105ff6187 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -37,8 +37,8 @@ import { SectionsService } from '../sections.service';
   imports: [
     TranslateModule,
     AsyncPipe,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 14d7cb51ad..5c274d0a59 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -379,8 +379,8 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
     SubmissionSectionLicenseComponent,
     FormsModule,
     FormComponent,
-    ReactiveFormsModule
-],
+    ReactiveFormsModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index 88f36875f6..c3fbb3946f 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -64,8 +64,8 @@ import {
   providers: [],
   imports: [
     FormComponent,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class SubmissionSectionLicenseComponent   extends SectionModelComponent implements AfterViewChecked {
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
index 842108a1b0..ed0ee65994 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -58,8 +61,8 @@ import { LdnPattern } from './submission-coar-notify.config';
     TranslateModule,
     NgbDropdownModule,
     NgClass,
-    InfiniteScrollModule
-],
+    InfiniteScrollModule,
+  ],
   providers: [NgbDropdown],
 })
 export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 5c10a0b259..29d947fdef 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -18,8 +18,8 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol
   imports: [
     TranslateModule,
     NgbCollapseModule,
-    TitleCasePipe
-],
+    TitleCasePipe,
+  ],
   standalone: true,
 })
 export class ContentAccordionComponent {
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index e7f8e22aa1..27e5939083 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -16,8 +16,8 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det
   styleUrls: ['./metadata-information.component.scss'],
   imports: [
     TranslateModule,
-    DatePipe
-],
+    DatePipe,
+  ],
   standalone: true,
 })
 export class MetadataInformationComponent {
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index df7daf75e9..27f54a1bba 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -15,8 +15,8 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta
   templateUrl: './publication-information.component.html',
   styleUrls: ['./publication-information.component.scss'],
   imports: [
-    TranslateModule
-],
+    TranslateModule,
+  ],
   standalone: true,
 })
 export class PublicationInformationComponent {
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index c827555a2b..e2fd37f645 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -19,8 +19,8 @@ import { ContentAccordionComponent } from '../content-accordion/content-accordio
   imports: [
     ContentAccordionComponent,
     TranslateModule,
-    KeyValuePipe
-],
+    KeyValuePipe,
+  ],
   standalone: true,
 })
 export class PublisherPolicyComponent {
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index 950fe1b4dc..88f72ef94e 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -45,8 +45,8 @@ import { PublisherPolicyComponent } from './publisher-policy/publisher-policy.co
     PublisherPolicyComponent,
     PublicationInformationComponent,
     AsyncPipe,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index 7082e38d7b..70bb064aee 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -405,8 +405,8 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     SubmissionSectionUploadFileEditComponent,
     FormsModule,
     FormComponent,
-    ReactiveFormsModule
-],
+    ReactiveFormsModule,
+  ],
 })
 class TestComponent {
 }
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index cf577bf6f5..1dc4c1ee52 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -80,8 +80,8 @@ import {
   imports: [
     FormComponent,
     TranslateModule,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadFileEditComponent
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index a1edfefb65..996ee34cd2 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -287,8 +287,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   imports: [
     ThemedSubmissionSectionUploadFileComponent,
     AsyncPipe,
-    NgbModule
-],
+    NgbModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index eccdf9b949..cda5d429b5 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -51,8 +51,8 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
-    BtnDisabledDirective
-],
+    BtnDisabledDirective,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy {
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index 0a7871fa35..0bb7cab947 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -27,8 +27,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
     SubmissionSectionUploadAccessConditionsComponent,
     TranslateModule,
     TruncatePipe,
-    FileSizePipe
-],
+    FileSizePipe,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadFileViewComponent implements OnInit {
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 11a0ca4077..16075f83b3 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -72,8 +72,8 @@ export interface AccessConditionGroupsMapEntry {
     SubmissionSectionUploadAccessConditionsComponent,
     AlertComponent,
     TranslateModule,
-    AsyncPipe
-],
+    AsyncPipe,
+  ],
   standalone: true,
 })
 export class SubmissionSectionUploadComponent extends SectionModelComponent {
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts
index 9e411e8336..dfddc164c2 100644
--- a/src/app/suggestions-page/suggestions-page.component.ts
+++ b/src/app/suggestions-page/suggestions-page.component.ts
@@ -72,8 +72,8 @@ import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowit
     ThemedLoadingComponent,
     PaginationComponent,
     SuggestionListElementComponent,
-    AlertComponent
-],
+    AlertComponent,
+  ],
   standalone: true,
 })
 
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
index 364d721aa1..cf98fe9339 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, isPlatformBrowser } from '@angular/common';
+import {
+  AsyncPipe,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
   Inject,
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
index 6ee9c8d500..1e12a6390c 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
@@ -1,4 +1,7 @@
-import { AsyncPipe, NgClass } from '@angular/common';
+import {
+  AsyncPipe,
+  NgClass,
+} from '@angular/common';
 import {
   Component,
   OnInit,
@@ -36,8 +39,8 @@ export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
     NgbRatingModule,
     NgClass,
     ReactiveFormsModule,
-    VarDirective
-],
+    VarDirective,
+  ],
   standalone: true,
 })
 export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit {
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
index 97ad697e13..72f5623626 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
@@ -1,4 +1,7 @@
-import { CommonModule, Location } from '@angular/common';
+import {
+  CommonModule,
+  Location,
+} from '@angular/common';
 import {
   Component,
   OnDestroy,
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 9fdb123566..0352eba098 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,4 +1,7 @@
-import { CommonModule, Location } from '@angular/common';
+import {
+  CommonModule,
+  Location,
+} from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
index 2f9ac81308..00ab6e969c 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -1,4 +1,7 @@
-import { CommonModule, Location } from '@angular/common';
+import {
+  CommonModule,
+  Location,
+} from '@angular/common';
 import {
   Component,
   OnInit,

From d1b9d4f692fd5f3b29a89f5a44bff843d38f8aac Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 6 Feb 2025 13:38:56 +0100
Subject: [PATCH 1280/1286] [DURACOM-307] remove NgIf and NgFor imports

---
 .../community-form/community-form.component.ts            | 8 +-------
 ...journal-issue-sidebar-search-list-element.component.ts | 3 +--
 ...ournal-volume-sidebar-search-list-element.component.ts | 3 +--
 .../journal-sidebar-search-list-element.component.ts      | 3 +--
 .../org-unit-sidebar-search-list-element.component.ts     | 3 +--
 .../person-sidebar-search-list-element.component.ts       | 3 +--
 .../project-sidebar-search-list-element.component.ts      | 3 +--
 .../search-page/configuration-search-page.component.ts    | 3 +--
 .../authorized-collection-selector.component.ts           | 4 +---
 .../edit-collection-selector.component.ts                 | 3 +--
 .../edit-community-selector.component.ts                  | 3 +--
 .../export-batch-selector.component.ts                    | 3 +--
 .../import-batch-selector.component.ts                    | 3 +--
 .../community-sidebar-search-list-element.component.ts    | 3 +--
 .../publication-sidebar-search-list-element.component.ts  | 3 +--
 .../reviewers-list/reviewers-list.component.ts            | 4 ----
 .../app/admin/admin-sidebar/admin-sidebar.component.ts    | 4 +---
 .../edit-bitstream-page/edit-bitstream-page.component.ts  | 6 +-----
 .../custom/app/breadcrumbs/breadcrumbs.component.ts       | 4 +---
 .../app/collection-page/collection-page.component.ts      | 6 +-----
 .../edit-item-template-page.component.ts                  | 6 +-----
 .../community-list/community-list.component.ts            | 3 +--
 .../custom/app/community-page/community-page.component.ts | 6 +-----
 .../dso-edit-metadata/dso-edit-metadata.component.ts      | 8 ++------
 .../item-pages/journal-issue/journal-issue.component.ts   | 7 ++-----
 .../item-pages/journal-volume/journal-volume.component.ts | 7 ++-----
 .../item-pages/journal/journal.component.ts               | 7 ++-----
 src/themes/custom/app/footer/footer.component.ts          | 3 +--
 .../forgot-password-form.component.ts                     | 6 +-----
 src/themes/custom/app/header/header.component.ts          | 7 ++-----
 src/themes/custom/app/home-page/home-page.component.ts    | 3 +--
 .../feedback/feedback-form/feedback-form.component.ts     | 3 +--
 .../custom/app/item-page/alerts/item-alerts.component.ts  | 6 +-----
 .../edit-item-page/item-status/item-status.component.ts   | 4 ----
 .../file-section/full-file-section.component.ts           | 8 +-------
 .../custom/app/item-page/full/full-item-page.component.ts | 4 ----
 .../media-viewer-video/media-viewer-video.component.ts    | 6 ------
 .../app/item-page/media-viewer/media-viewer.component.ts  | 6 +-----
 .../custom/app/item-page/simple/item-page.component.ts    | 6 +-----
 .../item-types/publication/publication.component.ts       | 7 ++-----
 .../item-types/untyped-item/untyped-item.component.ts     | 6 +-----
 .../custom/app/my-dspace-page/my-dspace-page.component.ts | 6 +-----
 .../expandable-navbar-section.component.ts                | 4 ----
 src/themes/custom/app/navbar/navbar.component.ts          | 4 +---
 .../register-email-form/register-email-form.component.ts  | 7 ++-----
 .../create-profile/create-profile.component.ts            | 8 +-------
 .../deny-request-copy/deny-request-copy.component.ts      | 7 ++-----
 .../email-request-copy/email-request-copy.component.ts    | 7 ++-----
 .../grant-request-copy/grant-request-copy.component.ts    | 7 ++-----
 src/themes/custom/app/root/root.component.ts              | 2 --
 .../search-page/configuration-search-page.component.ts    | 3 +--
 .../app/shared/auth-nav-menu/auth-nav-menu.component.ts   | 3 +--
 .../collection-dropdown/collection-dropdown.component.ts  | 8 ++------
 .../create-collection-parent-selector.component.ts        | 3 +--
 .../create-item-parent-selector.component.ts              | 3 +--
 .../edit-collection-selector.component.ts                 | 3 +--
 .../edit-community-selector.component.ts                  | 3 +--
 .../edit-item-selector/edit-item-selector.component.ts    | 3 +--
 .../file-download-link/file-download-link.component.ts    | 3 +--
 .../external-source-entry-import-modal.component.ts       | 6 +-----
 src/themes/custom/app/shared/loading/loading.component.ts | 2 --
 .../collection-list-element.component.ts                  | 3 +--
 .../community-list-element.component.ts                   | 3 +--
 .../app/shared/object-list/object-list.component.ts       | 8 ++------
 .../search/search-settings/search-settings.component.ts   | 6 +-----
 .../submission-import-external.component.ts               | 6 +-----
 66 files changed, 71 insertions(+), 241 deletions(-)

diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
index d32d9e408f..147f6254ea 100644
--- a/src/app/community-page/community-form/community-form.component.ts
+++ b/src/app/community-page/community-form/community-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -49,8 +45,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index c0400d97fa..919d712c32 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-issue-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 2275c23a4d..d9ec174b16 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-volume-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index 077d2ee390..2c17494f87 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-journal-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 54885c4b86..9d41175ecd 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-org-unit-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index 81739063e8..5a115f74de 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -29,7 +28,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-person-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index f3e2881bed..3002f3b283 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
   selector: 'ds-project-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 89d408542a..61d7776594 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -47,7 +46,7 @@ import { ViewModeSwitchComponent } from '../shared/view-mode-switch/view-mode-sw
     },
   ],
   standalone: true,
-  imports: [NgIf, NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
+  imports: [NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
 })
 
 export class ConfigurationSearchPageComponent extends SearchComponent {
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
index 7e8019a54b..7f5bf3664b 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -47,7 +45,7 @@ import { DSOSelectorComponent } from '../dso-selector.component';
   styleUrls: ['../dso-selector.component.scss'],
   templateUrl: '../dso-selector.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgIf, NgFor, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component rendering a list of collections to select from
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 611a4f13de..107e250b48 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +32,7 @@ import {
   selector: 'ds-base-edit-collection-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 3f7ede0de0..e2e498f3a4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +32,7 @@ import {
   selector: 'ds-base-edit-community-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 
 export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
index 0fb80e769b..627baaba1f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -57,7 +56,7 @@ import {
   selector: 'ds-export-batch-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
index 2b3785c0f9..bf68cb87a3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -30,7 +29,7 @@ import {
   selector: 'ds-import-batch-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 7dc0c266e9..e019217ace 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { SidebarSearchListElementComponent } from '../sidebar-search-list-elemen
   selector: 'ds-community-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index 9675a162f1..38240b59f8 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele
   selector: 'ds-publication-sidebar-search-list-element',
   templateUrl: '../../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index c43fabdb83..1644d22697 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -72,11 +70,9 @@ enum SubKey {
     ContextHelpDirective,
     ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
     AsyncPipe,
     RouterLink,
     NgClass,
-    NgForOf,
     BtnDisabledDirective,
   ],
 })
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
index 66e66e86e6..237d107083 100644
--- a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -22,7 +20,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   // styleUrls: ['./admin-sidebar.component.scss']
   styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [ NgbDropdownModule, NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 1fc23a1bd0..989e6535aa 100644
--- a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -27,7 +24,6 @@ import { ThemedThumbnailComponent } from '../../../../../app/thumbnail/themed-th
   standalone: true,
   imports: [
     FormComponent,
-    NgIf,
     VarDirective,
     ThemedThumbnailComponent,
     AsyncPipe,
diff --git a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
index c71caf9f02..e2589ba238 100644
--- a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -22,7 +20,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
   // styleUrls: ['./breadcrumbs.component.scss']
   styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgTemplateOutlet, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class BreadcrumbsComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts
index 4b2f9e3245..0439149373 100644
--- a/src/themes/custom/app/collection-page/collection-page.component.ts
+++ b/src/themes/custom/app/collection-page/collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,7 +38,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
   imports: [
     ThemedComcolPageContentComponent,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index f69fcc868c..e33ee21978 100644
--- a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     RouterLink,
     AsyncPipe,
     VarDirective,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     AlertComponent,
diff --git a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
index 8a48901634..334829942a 100644
--- a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
@@ -2,7 +2,6 @@ import { CdkTreeModule } from '@angular/cdk/tree';
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -26,7 +25,7 @@ import { TruncatablePartComponent } from '../../../../../app/shared/truncatable/
   // templateUrl: './community-list.component.html'
   templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html',
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent extends BaseComponent {}
 
diff --git a/src/themes/custom/app/community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts
index 5aa7e85527..b4ff1d0453 100644
--- a/src/themes/custom/app/community-page/community-page.component.ts
+++ b/src/themes/custom/app/community-page/community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,7 +37,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
     ThemedComcolPageContentComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
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
index f74a73a4b8..fbafb647bb 100644
--- 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
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -23,7 +19,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [ DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index 66803ffd84..237a457b0a 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal-issue.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index c63f68bd70..c370c7afa9 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal-volume.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 104f1b40b0..5389f75d43 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -27,7 +24,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/themes/custom/app/footer/footer.component.ts b/src/themes/custom/app/footer/footer.component.ts
index a2e782a0db..04b4f69f14 100644
--- a/src/themes/custom/app/footer/footer.component.ts
+++ b/src/themes/custom/app/footer/footer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -16,7 +15,7 @@ import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.
   // templateUrl: './footer.component.html'
   templateUrl: '../../../../app/footer/footer.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
+  imports: [ RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
 export class FooterComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 37fb383429..21169b8797 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,7 +19,6 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    NgIf,
     BtnDisabledDirective,
   ],
 })
diff --git a/src/themes/custom/app/header/header.component.ts b/src/themes/custom/app/header/header.component.ts
index f6ae52de4f..b337939ecd 100644
--- a/src/themes/custom/app/header/header.component.ts
+++ b/src/themes/custom/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -24,7 +21,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   // templateUrl: 'header.component.html',
   templateUrl: '../../../../app/header/header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts
index 2b45f69754..0be74993f0 100644
--- a/src/themes/custom/app/home-page/home-page.component.ts
+++ b/src/themes/custom/app/home-page/home-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -25,7 +24,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
   // templateUrl: './home-page.component.html'
   templateUrl: '../../../../app/home-page/home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index 3835667111..27365901d1 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -17,7 +16,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, ReactiveFormsModule, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
index 4cfa632f02..bf8396e7c0 100644
--- a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
+++ b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -18,7 +15,6 @@ import { AlertComponent } from '../../../../../app/shared/alert/alert.component'
   standalone: true,
   imports: [
     AlertComponent,
-    NgIf,
     TranslateModule,
     RouterLink,
     AsyncPipe,
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
index a39d2e4cda..07b3d28e14 100644
--- a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -30,9 +28,7 @@ import {
   standalone: true,
   imports: [
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    NgIf,
     RouterLink,
     ItemOperationComponent,
     NgClass,
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
index 1475cd04ee..4c71a9eb23 100644
--- a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -23,12 +19,10 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   standalone: true,
   imports: [
     PaginationComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
     ThemedThumbnailComponent,
-    NgForOf,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
diff --git a/src/themes/custom/app/item-page/full/full-item-page.component.ts b/src/themes/custom/app/item-page/full/full-item-page.component.ts
index c1bad7ba89..00b69192b7 100644
--- a/src/themes/custom/app/item-page/full/full-item-page.component.ts
+++ b/src/themes/custom/app/item-page/full/full-item-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -46,8 +44,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
     ThemedFullFileSectionComponent,
     CollectionsComponent,
     ItemVersionsComponent,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     KeyValuePipe,
     RouterLink,
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 0efa013064..bb50876c97 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,7 +1,3 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,10 +13,8 @@ import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.
   styleUrls: ['../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss'],
   standalone: true,
   imports: [
-    NgForOf,
     NgbDropdownModule,
     TranslateModule,
-    NgIf,
     BtnDisabledDirective,
   ],
 })
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
index 35336e6086..b74e9abb2c 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -23,7 +20,6 @@ import { ThemedThumbnailComponent } from '../../../../../app/thumbnail/themed-th
     ThemedMediaViewerImageComponent,
     ThemedThumbnailComponent,
     AsyncPipe,
-    NgIf,
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
diff --git a/src/themes/custom/app/item-page/simple/item-page.component.ts b/src/themes/custom/app/item-page/simple/item-page.component.ts
index 7daa65287a..9a9551012a 100644
--- a/src/themes/custom/app/item-page/simple/item-page.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -46,7 +43,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
     NotifyRequestsStatusComponent,
     QaEventNotificationComponent,
   ],
diff --git a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
index ce56724e4a..fec0873c6a 100644
--- a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -42,7 +39,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 export class PublicationComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 6fbb035d2f..57d7c1598c 100644
--- a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -46,7 +43,6 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     ThemedResultsBackButtonComponent,
     MiradorViewerComponent,
     ThemedItemPageTitleFieldComponent,
diff --git a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
index 39156a0ac7..64d93c41b4 100644
--- a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -42,7 +39,6 @@ import { ThemedSearchComponent } from '../../../../app/shared/search/themed-sear
     MyDSpaceNewSubmissionComponent,
     AsyncPipe,
     RoleDirective,
-    NgIf,
     SuggestionsNotificationComponent,
     MyDspaceQaEventsNotificationsComponent,
   ],
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index b0b57a75aa..b30da7e365 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
@@ -23,8 +21,6 @@ import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-out
     AsyncPipe,
     HoverOutsideDirective,
     NgComponentOutlet,
-    NgFor,
-    NgIf,
     RouterLinkActive,
   ],
 })
diff --git a/src/themes/custom/app/navbar/navbar.component.ts b/src/themes/custom/app/navbar/navbar.component.ts
index 9a5ee91b60..09bed20ad4 100644
--- a/src/themes/custom/app/navbar/navbar.component.ts
+++ b/src/themes/custom/app/navbar/navbar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -24,7 +22,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   templateUrl: '../../../../app/navbar/navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index d1f4a6d3ff..4819880ff3 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -19,7 +16,7 @@ import { BtnDisabledDirective } from '../../../../app/shared/btn-disabled.direct
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
+  imports: [ FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index 7c1ff908c3..893afb50d2 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,10 +20,8 @@ import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.dir
   imports: [
     ProfilePageSecurityFormComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
     ReactiveFormsModule,
-    NgForOf,
     BtnDisabledDirective,
   ],
 })
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index f15193dd43..b885bcd06a 100644
--- a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { DenyRequestCopyComponent as BaseComponent } from 'src/app/request-copy/deny-request-copy/deny-request-copy.component';
@@ -17,7 +14,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './deny-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class DenyRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index cf4981d289..e3fd757ea7 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,7 +13,7 @@ import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.dir
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective],
+  imports: [FormsModule, NgClass, TranslateModule, BtnDisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index b121c09cdb..e7ed8935c3 100644
--- a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -18,6 +15,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './grant-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class GrantRequestCopyComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/root/root.component.ts b/src/themes/custom/app/root/root.component.ts
index 4894746e52..a3e75ad630 100644
--- a/src/themes/custom/app/root/root.component.ts
+++ b/src/themes/custom/app/root/root.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
@@ -32,7 +31,6 @@ import { SystemWideAlertBannerComponent } from '../../../../app/system-wide-aler
     SystemWideAlertBannerComponent,
     ThemedHeaderNavbarWrapperComponent,
     ThemedBreadcrumbsComponent,
-    NgIf,
     NgClass,
     ThemedLoadingComponent,
     RouterOutlet,
diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts
index 8635cd2edb..5fe918703e 100644
--- a/src/themes/custom/app/search-page/configuration-search-page.component.ts
+++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -35,7 +34,7 @@ import { ViewModeSwitchComponent } from '../../../../app/shared/view-mode-switch
     },
   ],
   standalone: true,
-  imports: [NgIf, NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
+  imports: [ NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index bddca78604..627c0582a5 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -31,7 +30,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
   animations: [fadeInOut, fadeOut],
   standalone: true,
-  imports: [NgClass, NgIf, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AuthNavMenuComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
index 0217a309f6..88c7fea4ad 100644
--- a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -21,7 +17,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'],
   // styleUrls: ['./collection-dropdown.component.scss']
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [ FormsModule, ReactiveFormsModule, InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class CollectionDropdownComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 4b7ee16d68..19a5eb8f19 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { CreateCollectionParentSelectorComponent as BaseComponent } from '../../
   // templateUrl: './create-collection-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class CreateCollectionParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index 8b7867e362..c04d9ccbdb 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { CreateItemParentSelectorComponent as BaseComponent } from '../../../../
   // templateUrl: './create-item-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
   standalone: true,
-  imports: [NgIf, AuthorizedCollectionSelectorComponent, TranslateModule],
+  imports: [AuthorizedCollectionSelectorComponent, TranslateModule],
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 89616d560a..b53cf4fac0 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { EditCollectionSelectorComponent as BaseComponent } from '../../../../..
   // templateUrl: './edit-collection-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditCollectionSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 491a99aae3..63428a021b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { EditCommunitySelectorComponent as BaseComponent } from '../../../../../
   // templateUrl: './edit-community-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditCommunitySelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index fa65ffd691..6a069bd5fa 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { EditItemSelectorComponent as BaseComponent } from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
@@ -11,7 +10,7 @@ import { DSOSelectorComponent } from '../../../../../../../app/shared/dso-select
   // templateUrl: './edit-item-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditItemSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
index 491d20e79c..fe11b5e6b7 100644
--- a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -17,7 +16,7 @@ import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/s
   // styleUrls: ['./file-download-link.component.scss'],
   styleUrls: ['../../../../../app/shared/file-download-link/file-download-link.component.scss'],
   standalone: true,
-  imports: [RouterLink, NgClass, NgIf, NgTemplateOutlet, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule],
 })
 export class FileDownloadLinkComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/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.ts b/src/themes/custom/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.ts
index aec7bfd6db..fb29b8f526 100644
--- a/src/themes/custom/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.ts
+++ b/src/themes/custom/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.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,6 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
   imports: [
     TranslateModule,
     ThemedSearchResultsComponent,
-    NgIf,
     AsyncPipe,
     BtnDisabledDirective,
   ],
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
index 891381e77e..8bd9dba45a 100644
--- a/src/themes/custom/app/shared/loading/loading.component.ts
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
@@ -10,7 +9,6 @@ import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loa
   templateUrl: '../../../../../app/shared/loading/loading.component.html',
   // templateUrl: './loading.component.html'
   standalone: true,
-  imports: [NgIf],
 })
 export class LoadingComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index d7db69198b..a0e8ecb542 100644
--- a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -17,7 +16,7 @@ import { CollectionListElementComponent as BaseComponent } from '../../../../../
   // templateUrl: './collection-list-element.component.html'
   templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [ RouterLink],
 })
 /**
  * Component representing list element for a collection
diff --git a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
index 50f24ae91a..32be7bc306 100644
--- a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -17,7 +16,7 @@ import { CommunityListElementComponent as BaseComponent } from '../../../../../.
   // templateUrl: './community-list-element.component.html'
   templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [ RouterLink],
 })
 /**
  * Component representing a list element for a community
diff --git a/src/themes/custom/app/shared/object-list/object-list.component.ts b/src/themes/custom/app/shared/object-list/object-list.component.ts
index f94c31aeb0..10a83d02ec 100644
--- a/src/themes/custom/app/shared/object-list/object-list.component.ts
+++ b/src/themes/custom/app/shared/object-list/object-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { ImportableListItemControlComponent } from '../../../../../app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component';
@@ -22,7 +18,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
   // templateUrl: './object-list.component.html'
   templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
-  imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
+  imports: [PaginationComponent,  NgClass, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
   standalone: true,
 })
 
diff --git a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
index 111b7b0c7c..2f1455f33d 100644
--- a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
@@ -5,10 +5,6 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -33,7 +29,7 @@ import { SidebarDropdownComponent } from '../../../../../../app/shared/sidebar/s
     },
   ],
   standalone: true,
-  imports: [NgIf, SidebarDropdownComponent, NgFor, FormsModule, PageSizeSelectorComponent, TranslateModule],
+  imports: [ SidebarDropdownComponent, FormsModule, PageSizeSelectorComponent, TranslateModule],
 })
 
 export class SearchSettingsComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
index cda5c207bf..9222fbd5c3 100644
--- a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
+++ b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,7 +26,6 @@ import { SubmissionImportExternalComponent as BaseComponent } from '../../../../
     ObjectCollectionComponent,
     ThemedLoadingComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     SubmissionImportExternalSearchbarComponent,
     TranslateModule,

From dc70ec0ef05e324f09978786ede4c8474af3df3a Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 6 Feb 2025 15:40:28 +0100
Subject: [PATCH 1281/1286] [DURACOM-307] remove not migrated directives, clean
 up

---
 .../browse-by/browse-by-date/browse-by-date.component.ts  | 2 --
 .../browse-by-title/browse-by-title.component.ts          | 2 --
 .../export-metadata-selector.component.ts                 | 3 +--
 .../browse-by-taxonomy/browse-by-taxonomy.component.ts    | 6 +-----
 .../community-page-sub-collection-list.component.ts       | 6 +-----
 .../community-page-sub-community-list.component.ts        | 6 +-----
 .../item-pages/person/person.component.ts                 | 7 ++-----
 .../top-level-community-list.component.ts                 | 7 ++-----
 .../title/item-page-title-field.component.ts              | 3 +--
 .../metadata-representation-list.component.ts             | 8 ++------
 .../profile-page-metadata-form.component.ts               | 2 --
 .../shared/auth-nav-menu/user-menu/user-menu.component.ts | 3 +--
 .../custom/app/shared/browse-by/browse-by.component.ts    | 3 +--
 .../comcol-page-browse-by.component.ts                    | 8 +-------
 .../comcol-page-content/comcol-page-content.component.ts  | 2 --
 .../comcol-page-handle/comcol-page-handle.component.ts    | 2 --
 .../create-collection-parent-selector.component.html      | 4 +++-
 .../create-item-parent-selector.component.html            | 4 +++-
 .../edit-collection-selector.component.html               | 4 +++-
 .../edit-community-selector.component.html                | 4 +++-
 .../edit-item-selector/edit-item-selector.component.html  | 4 +++-
 ...namic-lookup-relation-external-source-tab.component.ts | 6 +-----
 .../dynamic-lookup-relation-search-tab.component.ts       | 6 +-----
 .../app/shared/lang-switch/lang-switch.component.ts       | 6 +-----
 src/themes/custom/app/shared/log-in/log-in.component.ts   | 8 ++------
 .../access-status-badge/access-status-badge.component.ts  | 7 ++-----
 .../object-collection/shared/badges/badges.component.ts   | 3 +--
 .../shared/badges/status-badge/status-badge.component.ts  | 3 +--
 .../shared/badges/type-badge/type-badge.component.ts      | 3 +--
 .../item-detail-preview-field.component.ts                | 6 ------
 .../browse-entry-list-element.component.ts                | 7 ++-----
 .../item-list-preview/item-list-preview.component.ts      | 4 ----
 .../item/item-search-result-list-element.component.ts     | 4 +---
 .../publication-sidebar-search-list-element.component.ts  | 3 +--
 .../app/shared/search-form/search-form.component.ts       | 7 ++-----
 .../search/search-sidebar/search-sidebar.component.ts     | 7 ++-----
 src/themes/custom/app/shared/search/search.component.ts   | 2 --
 .../submission-upload-files.component.ts                  | 2 --
 .../sections/upload/file/section-upload-file.component.ts | 6 +-----
 39 files changed, 48 insertions(+), 132 deletions(-)

diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index 1ebdcc838e..3cf4e94de7 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -62,7 +61,6 @@ import {
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index 7d6e3ce716..2c8f9eeaa1 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -39,7 +38,6 @@ import {
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index 6907ee0d58..d2afb176fe 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -58,7 +57,7 @@ import {
   selector: 'ds-export-metadata-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index edf2a35c74..4c4dc0a332 100644
--- a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +27,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     AsyncPipe,
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
-    NgIf,
     ThemedComcolPageHandleComponent,
     ThemedComcolPageContentComponent,
     DsoEditMenuComponent,
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index ab2d49b920..0f890f3a32 100644
--- a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -21,7 +18,6 @@ import { VarDirective } from '../../../../../../../app/shared/utils/var.directiv
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 3b48efcb0e..fb68aa911e 100644
--- a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,7 +19,6 @@ import { VarDirective } from '../../../../../../../app/shared/utils/var.directiv
     ErrorComponent,
     ThemedLoadingComponent,
     VarDirective,
-    NgIf,
     ObjectCollectionComponent,
     AsyncPipe,
     TranslateModule,
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
index f1a60957ed..c537835117 100644
--- a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -27,7 +24,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object-
   // templateUrl: './person.component.html',
   templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 export class PersonComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 0613377e14..18ec70e0bf 100644
--- a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './top-level-community-list.component.html'
   templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 export class TopLevelCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index 4b0bfa4c91..f710884d48 100644
--- a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -9,7 +8,7 @@ import { ItemPageTitleFieldComponent as BaseComponent } from '../../../../../../
   // templateUrl: './item-page-title-field.component.html',
   templateUrl: '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [ TranslateModule],
 })
 export class ItemPageTitleFieldComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 6d2ddb8f1f..919930dc11 100644
--- a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -17,7 +13,7 @@ import { VarDirective } from '../../../../../../app/shared/utils/var.directive';
   // templateUrl: './metadata-representation-list.component.html'
   templateUrl: '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, VarDirective, MetadataRepresentationLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, VarDirective, MetadataRepresentationLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class MetadataRepresentationListComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index 9a3994172d..10d02e7196 100644
--- a/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { ProfilePageMetadataFormComponent as BaseComponent } from '../../../../../app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component';
@@ -10,7 +9,6 @@ import { FormComponent } from '../../../../../app/shared/form/form.component';
   // templateUrl: './profile-page-metadata-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 80df685729..b230b53a3c 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -24,7 +23,7 @@ import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared
   // styleUrls: ['user-menu.component.scss'],
   styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
 
 })
 export class UserMenuComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.ts b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
index 34c0bf965a..929b7721f3 100644
--- a/src/themes/custom/app/shared/browse-by/browse-by.component.ts
+++ b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
@@ -2,7 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +29,7 @@ import { StartsWithLoaderComponent } from '../../../../../app/shared/starts-with
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
+  imports: [VarDirective, NgClass, NgComponentOutlet, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
 })
 export class BrowseByComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 9495ae45d5..bf5a5005d5 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import {
@@ -22,12 +18,10 @@ import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../
   standalone: true,
   imports: [
     FormsModule,
-    NgForOf,
     RouterLink,
     RouterLinkActive,
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
 })
 export class ComcolPageBrowseByComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 1d98892e33..758e24bb51 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -12,7 +11,6 @@ import { ComcolPageContentComponent as BaseComponent } from '../../../../../../a
   templateUrl: '../../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component.html',
   imports: [
     TranslateModule,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 7609879f78..45b27a0c78 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -12,7 +11,6 @@ import { ComcolPageHandleComponent as BaseComponent } from '../../../../../../ap
   styleUrls: ['../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'],
   standalone: true,
   imports: [
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
index b2831d5c33..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 6fc90cbf2d..88d3051d8b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -5,7 +5,9 @@
   </div>
   <div class="modal-body">
     <div [innerHTML]="'dso-selector.create.item.intro' | translate"></div>
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
                                        [entityType]="entityType"
                                        [types]="selectorTypes"
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
index b2831d5c33..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
index b2831d5c33..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 6dafc18209..7a7611da4f 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -4,7 +4,9 @@
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index ff1f3d9c5e..d85a4130fc 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -44,7 +41,6 @@ import { VarDirective } from '../../../../../../../../../app/shared/utils/var.di
     AsyncPipe,
     TranslateModule,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
   ],
 })
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 3843c95811..e010faafac 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +27,6 @@ import { VarDirective } from '../../../../../../../../../app/shared/utils/var.di
     VarDirective,
     TranslateModule,
     NgbDropdownModule,
-    NgIf,
     ThemedSearchComponent,
   ],
 })
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
index ce9c192723..0568c5fc73 100644
--- a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
@@ -1,7 +1,3 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,7 +11,7 @@ import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/
   // templateUrl: './lang-switch.component.html',
   templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
+  imports: [NgbDropdownModule, TranslateModule],
 })
 export class LangSwitchComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.ts b/src/themes/custom/app/shared/log-in/log-in.component.ts
index 1af5505835..0790a9f14d 100644
--- a/src/themes/custom/app/shared/log-in/log-in.component.ts
+++ b/src/themes/custom/app/shared/log-in/log-in.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { ThemedLoadingComponent } from 'src/app/shared/loading/themed-loading.component';
 import { LogInContainerComponent } from 'src/app/shared/log-in/container/log-in-container.component';
@@ -16,7 +12,7 @@ import { LogInComponent as BaseComponent } from '../../../../../app/shared/log-i
   // styleUrls: ['./log-in.component.scss'],
   styleUrls: ['../../../../../app/shared/log-in/log-in.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, NgFor, LogInContainerComponent, AsyncPipe],
+  imports: [ ThemedLoadingComponent, LogInContainerComponent, AsyncPipe],
 })
 export class LogInComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 24e0006b88..c1684a7689 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { AccessStatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
@@ -12,7 +9,7 @@ import { AccessStatusBadgeComponent as BaseComponent } from 'src/app/shared/obje
   // templateUrl: './access-status-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class AccessStatusBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
index f374a9707c..2ae0161c27 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { BadgesComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/badges.component';
 
@@ -14,7 +13,7 @@ import { ThemedTypeBadgeComponent } from '../../../../../../../app/shared/object
   // templateUrl: './badges.component.html',
   templateUrl: '../../../../../../../app/shared/object-collection/shared/badges/badges.component.html',
   standalone: true,
-  imports: [ThemedStatusBadgeComponent, NgIf, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
+  imports: [ThemedStatusBadgeComponent, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
 })
 export class BadgesComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index c39b0849ba..7af7de024e 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/status-badge/status-badge.component';
@@ -9,7 +8,7 @@ import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-col
   // templateUrl: './status-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/status-badge/status-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [ TranslateModule],
 })
 export class StatusBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 5f7d87f706..4d3a5a01dd 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/type-badge/type-badge.component';
@@ -9,7 +8,7 @@ import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-colle
   // templateUrl: './type-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/type-badge/type-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class TypeBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 241ac0289a..951d10bb3d 100644
--- a/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,3 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -15,8 +11,6 @@ import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../..
   standalone: true,
   imports: [
     MetadataFieldWrapperComponent,
-    NgFor,
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index 5391c51624..faf006518f 100644
--- a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -18,7 +15,7 @@ import { BrowseEntryListElementComponent as BaseComponent } from '../../../../..
   // templateUrl: './browse-entry-list-element.component.html',
   templateUrl: '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe],
+  imports: [RouterLink, AsyncPipe],
 })
 @listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom')
 export class BrowseEntryListElementComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 54634fd952..cf3cbbabe6 100644
--- a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,8 +27,6 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
     ItemCollectionComponent,
     ItemSubmitterComponent,
     NgClass,
-    NgFor,
-    NgIf,
     ThemedBadgesComponent,
     ThemedThumbnailComponent,
     TranslateModule,
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 7d2913dc1f..cf81cc62ea 100644
--- a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -26,7 +24,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../../../app/thumbna
   // templateUrl: './item-search-result-list-element.component.html',
   templateUrl: '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [ RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 
 })
 export class ItemSearchResultListElementComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index dbb4526a9a..a31bcc80c3 100644
--- a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../../../../app/shared/tru
   // templateUrl: './publication-sidebar-search-list-element.component.html',
   templateUrl: '../../../../../../../../app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 export class PublicationSidebarSearchListElementComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.ts b/src/themes/custom/app/shared/search-form/search-form.component.ts
index 729a001f61..f9c5b1d910 100644
--- a/src/themes/custom/app/shared/search-form/search-form.component.ts
+++ b/src/themes/custom/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -17,7 +14,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   // templateUrl: './search-form.component.html',
   templateUrl: '../../../../../app/shared/search-form/search-form.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class SearchFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
index 94892ad57b..3281359f30 100644
--- a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -5,10 +5,7 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -35,7 +32,7 @@ import { ViewModeSwitchComponent } from '../../../../../../app/shared/view-mode-
     },
   ],
   standalone: true,
-  imports: [NgIf, ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
+  imports: [ ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
 })
 export class SearchSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search.component.ts b/src/themes/custom/app/shared/search/search.component.ts
index 85a453c16c..4b2810ad73 100644
--- a/src/themes/custom/app/shared/search/search.component.ts
+++ b/src/themes/custom/app/shared/search/search.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -29,7 +28,6 @@ import { ViewModeSwitchComponent } from '../../../../../app/shared/view-mode-swi
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     NgTemplateOutlet,
     PageWithSidebarComponent,
     ThemedSearchFormComponent,
diff --git a/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 9c479cb129..a8fe3f19db 100644
--- a/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { UploaderComponent } from '../../../../../../app/shared/upload/uploader/uploader.component';
@@ -10,7 +9,6 @@ import { SubmissionUploadFilesComponent as BaseComponent } from '../../../../../
   templateUrl: '../../../../../../app/submission/form/submission-upload-files/submission-upload-files.component.html',
   imports: [
     UploaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index cea515102a..c8440ccf72 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
@@ -24,7 +21,6 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
   imports: [
     TranslateModule,
     SubmissionSectionUploadFileViewComponent,
-    NgIf,
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,

From b1eb4a8bf9a40ab3098f8afa5afb11a29ffefbbd Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 6 Feb 2025 17:53:31 +0100
Subject: [PATCH 1282/1286] [DURACOM-307] fix tests

---
 .../context-help-wrapper.component.html       |  2 +-
 .../context-help-wrapper.component.ts         |  4 ++--
 ...o-selector-modal-wrapper.component.spec.ts |  2 --
 .../shared/form/chips/chips.component.spec.ts | 11 +++++-----
 src/app/shared/form/form.component.spec.ts    |  6 ++++--
 .../orcid-badge-and-tooltip.component.spec.ts |  6 +-----
 .../section-duplicates.component.spec.ts      | 20 ++++++++++---------
 .../date/starts-with-date.component.ts        |  3 +--
 8 files changed, 26 insertions(+), 28 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 82714fb366..bb17493c52 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
@@ -4,7 +4,7 @@
       @if (elem.href) {
         <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
       } @else {
-        {{ elem }}
+        {{ elem.text }}
       }
     }
   </div>
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 3bb7205234..57fcb888cb 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
@@ -84,7 +84,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   @Input() set content(translateKey: string) {
     this.content$.next(translateKey);
   }
-  private content$: BehaviorSubject<string | undefined> = new BehaviorSubject(undefined);
+  private content$: BehaviorSubject<string> = new BehaviorSubject(null);
 
   parsedContent$: Observable<ParsedContent>;
 
@@ -100,7 +100,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
       this.content$.pipe(distinctUntilChanged(), mergeMap(translateKey => this.translateService.get(translateKey))),
       this.dontParseLinks$.pipe(distinctUntilChanged()),
     ]).pipe(
-      map(([text, dontParseLinks]) =>
+      map(([text, dontParseLinks]: [string, boolean]) =>
         dontParseLinks ? [{ text }] : this.parseLinks(text)),
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index 4bbdd11a04..91dc1598af 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   DebugElement,
@@ -164,7 +163,6 @@ describe('DSOSelectorModalWrapperComponent', () => {
   templateUrl: './dso-selector-modal-wrapper.component.html',
   imports: [
     DSOSelectorComponent,
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index 6035da3d15..7d4ba95345 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -59,11 +59,12 @@ describe('ChipsComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       html = `
-      <ds-chips
-        *ngIf="chips.hasItems()"
-        [chips]="chips"
-        [editable]="editable"
-        (selected)="onChipSelected($event)"></ds-chips>`;
+        @if(chips.hasItems()) {
+          <ds-chips
+            [chips]="chips"
+            [editable]="editable"
+            (selected)="onChipSelected($event)"></ds-chips>
+        }`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index f593d9bad6..b8933a64cc 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -195,11 +195,13 @@ describe('FormComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       html = `
-        <ds-form *ngIf="formModel" #formRef="formComponent"
+        @if('formModel') {
+            <ds-form #formRef="formComponent"
                  [formId]="formId"
                  [formModel]="formModel"
                  [displaySubmit]="displaySubmit"
-                 [displayCancel]="displayCancel"></ds-form>`;
+                 [displayCancel]="displayCancel"></ds-form>
+        }`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
index dd47fd918b..8ed97ddb37 100644
--- a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ComponentFixture,
   TestBed,
@@ -24,7 +21,6 @@ describe('OrcidBadgeAndTooltipComponent', () => {
         OrcidBadgeAndTooltipComponent,
         NgbTooltipModule,
         NgClass,
-        NgIf,
       ],
       providers: [
         { provide: TranslateService, useValue: { instant: (key: string) => key } },
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
index a86d44ab17..8aa2cfee24 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
@@ -6,7 +6,9 @@ import {
 } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -210,6 +212,11 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
       formOperationsService = TestBed.inject(SectionFormOperationsService);
       collectionDataService = TestBed.inject(CollectionDataService);
       compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
     });
 
     afterEach(() => {
@@ -219,18 +226,13 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
     });
 
     // Test initialisation of the submission section
-    it('Should init section properly', () => {
-      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
-      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
-      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
-      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+    it('Should init section properly', fakeAsync(() => {
       spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
-      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
       expect(comp.isLoading).toBeTruthy();
       comp.onSectionInit();
-      fixture.detectChanges();
+      tick(100);
       expect(comp.isLoading).toBeFalsy();
-    });
+    }));
 
     // The following tests look for proper logic in the getSectionStatus() implementation
     // These are very simple as we don't really have a 'false' state unless we're still loading
@@ -241,7 +243,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
       }));
     });
     it('Should return FALSE', () => {
-      compAsAny.isLoadin = true;
+      compAsAny.isLoading = true;
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
         a: false,
       }));
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
index 3f57274d36..f14d1f39c5 100644
--- a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,4 +1,3 @@
-import { NgFor } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -15,7 +14,7 @@ import { StartsWithDateComponent as BaseComponent } from '../../../../../../app/
   // templateUrl: './starts-with-date.component.html',
   templateUrl: '../../../../../../app/shared/starts-with/date/starts-with-date.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class StartsWithDateComponent extends BaseComponent {
 }

From 1aa9faeb2f95862c9a18196d9e92674d2cc93e3b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 7 Feb 2025 17:07:32 +0100
Subject: [PATCH 1283/1286] [DURACOM-307] add eslint rule to enforce control
 flow

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

diff --git a/.eslintrc.json b/.eslintrc.json
index 888c968b5c..6ee63b269f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -294,7 +294,8 @@
       "rules": {
         // Custom DSpace Angular rules
         "dspace-angular-html/themed-component-usages": "error",
-        "dspace-angular-html/no-disabled-attribute-on-button": "error"
+        "dspace-angular-html/no-disabled-attribute-on-button": "error",
+        "@angular-eslint/template/prefer-control-flow": "error"
       }
     },
     {

From 51c95de793c42f92acac7b60a90392bad4d437cb Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Mon, 10 Mar 2025 18:11:22 +0100
Subject: [PATCH 1284/1286] [DURACOM-307] apply migration script to conflicted
 files resolved in favor of Angular 18 update

---
 .../browse/bulk-access-browse.component.html  |  46 +-
 .../epeople-registry.component.html           | 121 ++---
 .../eperson-form/eperson-form.component.html  | 170 ++++---
 .../groups-registry.component.html            | 134 ++---
 .../batch-import-page.component.html          |  47 +-
 .../ldn-service-form.component.html           | 475 +++++++++--------
 .../ldn-services-directory.component.html     | 126 ++---
 .../admin-notify-logs-result.component.html   |  10 +-
 .../bitstream-formats.component.html          |  95 ++--
 .../metadata-registry.component.html          | 107 ++--
 .../metadata-schema.component.html            |  83 +--
 .../filters-section.component.html            |  30 +-
 ...vision-order-group-selector.component.html |  82 +--
 .../supervision-order-status.component.html   |  28 +-
 ...admin-workflow-grid-element.component.html |  14 +-
 ...admin-workflow-list-element.component.html |  16 +-
 ...admin-workflow-list-element.component.html |  22 +-
 .../collection-page.component.html            | 122 +++--
 .../delete-collection-page.component.html     |  42 +-
 .../collection-roles.component.html           |  13 +-
 .../collection-source-controls.component.html | 101 ++--
 .../collection-source.component.html          | 148 +++---
 .../community-list.component.html             | 106 ++--
 .../community-page.component.html             |  88 ++--
 .../delete-community-page.component.html      |  42 +-
 .../community-roles.component.html            |  13 +-
 .../curation-form.component.html              |  36 +-
 .../dso-edit-metadata-value.component.html    | 198 ++++----
 .../dso-edit-metadata.component.html          | 206 ++++----
 ...ult-list-submission-element.component.html |  44 +-
 src/app/footer/footer.component.html          | 140 ++---
 .../forgot-password-form.component.html       |  55 +-
 src/app/header/header.component.html          |  16 +-
 .../health-info-component.component.html      |  56 +-
 .../health-info/health-info.component.html    |  40 +-
 .../health-component.component.html           |  58 ++-
 .../health-panel/health-panel.component.html  |  36 +-
 .../health-status.component.html              |  28 +-
 .../recent-item-list.component.html           |  30 +-
 ...tstream-request-a-copy-page.component.html | 168 +++---
 .../upload/upload-bitstream.component.html    |  58 ++-
 .../edit-item-page.component.html             |  74 +--
 .../item-bitstreams.component.html            | 156 +++---
 .../item-edit-bitstream-bundle.component.html | 249 +++++----
 .../item-delete/item-delete.component.html    | 174 +++----
 .../item-move/item-move.component.html        | 106 ++--
 .../item-operation.component.html             |  30 +-
 .../item-register-doi-component.html          |  16 +-
 .../edit-relationship-list.component.html     |  54 +-
 .../edit-relationship.component.html          |  60 +--
 .../item-status/item-status.component.html    |  44 +-
 .../virtual-metadata.component.html           |  68 +--
 .../full/full-item-page.component.html        |  94 ++--
 .../orcid-auth/orcid-auth.component.html      | 197 +++++--
 .../orcid-page/orcid-page.component.html      |  40 +-
 .../orcid-sync-settings.component.html        |  52 +-
 .../file-section/file-section.component.html  |  50 +-
 ...etadata-representation-list.component.html |  40 +-
 .../qa-event-notification.component.html      |  42 +-
 .../related-items.component.html              |  40 +-
 ...ersions-row-element-version.component.html |  93 ++--
 ...item-versions-summary-modal.component.html |  65 +--
 .../versions/item-versions.component.html     | 202 ++++----
 ...space-new-external-dropdown.component.html |  30 +-
 ...ace-new-submission-dropdown.component.html |  26 +-
 ...ace-qa-events-notifications.component.html |  55 +-
 src/app/navbar/navbar.component.html          |  16 +-
 .../quality-assurance-events.component.html   | 479 ++++++++++--------
 .../quality-assurance-source.component.html   | 119 +++--
 .../quality-assurance-topics.component.html   | 105 ++--
 .../suggestion-actions.component.html         |  34 +-
 .../suggestions-popup.component.html          |  49 +-
 .../detail/process-detail.component.html      | 165 +++---
 .../form/process-form.component.html          |  46 +-
 .../parameter-select.component.html           |  36 +-
 .../file-value-input.component.html           |  22 +-
 .../process-parameters.component.html         |  25 +-
 .../scripts-select.component.html             |  75 +--
 .../overview/process-overview.component.html  | 134 ++---
 .../process-overview-table.component.html     |  95 ++--
 .../profile-claim-item-modal.component.html   |  52 +-
 ...rofile-page-researcher-form.component.html |  72 +--
 .../profile-page/profile-page.component.html  | 144 +++---
 .../register-email-form.component.html        | 103 ++--
 .../create-profile.component.html             | 161 +++---
 .../email-request-copy.component.html         |  18 +-
 .../access-control-array-form.component.html  | 143 +++---
 ...cess-control-form-container.component.html | 134 ++---
 ...rol-select-bitstreams-modal.component.html |  41 +-
 src/app/shared/alert/alert.component.html     |  20 +-
 .../auth-nav-menu.component.html              | 101 ++--
 .../collection-dropdown.component.html        |  88 ++--
 .../comcol-form/comcol-form.component.html    |  74 +--
 .../edit-comcol-page.component.html           |  52 +-
 .../comcol-page-browse-by.component.html      |  60 ++-
 ...m-withdrawn-reinstate-modal.component.html |  92 ++--
 .../shared/ds-select/ds-select.component.html |  26 +-
 ...dit-menu-expandable-section.component.html |  41 +-
 .../dso-edit-menu.component.html              |   8 +-
 .../dso-selector/dso-selector.component.html  |  56 +-
 ...e-community-parent-selector.component.html |  26 +-
 ...ate-community-parent-selector.component.ts |   6 +-
 .../entity-dropdown.component.html            |  66 +--
 .../file-download-link.component.html         |  12 +-
 ...amic-form-control-container.component.html | 152 +++---
 ...sting-metadata-list-element.component.html |  26 +-
 ...sting-relation-list-element.component.html |  24 +-
 .../dynamic-form-array.component.html         |  84 +--
 .../dynamic-date-picker-inline.component.html |  66 +--
 .../date-picker/date-picker.component.html    | 102 ++--
 .../date-picker/date-picker.component.ts      |   2 -
 .../models/list/dynamic-list.component.html   | 132 ++---
 .../lookup/dynamic-lookup.component.html      | 200 ++++----
 .../onebox/dynamic-onebox.component.html      | 127 ++---
 .../dynamic-relation-group.component.html     | 143 +++---
 .../models/tag/dynamic-tag.component.html     |  92 ++--
 ...namic-lookup-relation-modal.component.html | 166 +++---
 ...l-source-entry-import-modal.component.html |  49 +-
 ...-lookup-relation-search-tab.component.html |  87 ++--
 .../shared/form/chips/chips.component.html    |  69 +--
 src/app/shared/form/form.component.html       | 106 ++--
 .../vocabulary-treeview.component.html        | 144 +++---
 .../filter-input-suggestions.component.html   |  54 +-
 src/app/shared/loading/loading.component.html |  40 +-
 .../password/log-in-password.component.html   |  70 +--
 ...claimed-task-actions-reject.component.html |  40 +-
 .../notification/notification.component.html  |  77 +--
 .../access-status-badge.component.html        |  12 +-
 .../shared/badges/badges.component.html       |  14 +-
 .../status-badge/status-badge.component.html  |  12 +-
 .../type-badge/type-badge.component.html      |   8 +-
 .../item-collection.component.html            |  14 +-
 .../item-submitter.component.html             |   7 +-
 ...electable-list-item-control.component.html |  32 +-
 ...-search-result-grid-element.component.html | 100 ++--
 .../browse-entry-list-element.component.html  |  16 +-
 .../collection-list-element.component.html    |  26 +-
 .../community-list-element.component.html     |  26 +-
 ...-search-result-list-element.component.html |  27 +-
 ...-search-result-list-element.component.html |  27 +-
 ...-search-result-list-element.component.html |  16 +-
 ...-search-result-list-element.component.html |  16 +-
 ...sidebar-search-list-element.component.html |  18 +-
 .../collection-select.component.html          |  71 +--
 .../item-select/item-select.component.html    |  99 ++--
 .../pagination/pagination.component.html      | 150 +++---
 .../form/resource-policy-form.component.html  |  84 +--
 src/app/shared/rss-feed/rss.component.html    |  19 +-
 .../search-form/search-form.component.html    |  26 +-
 .../search-authority-filter.component.html    |  63 ++-
 .../search-boolean-filter.component.html      |  42 +-
 .../search-facet-option.component.html        |  29 +-
 .../search-facet-range-option.component.html  |  20 +-
 .../search-hierarchy-filter.component.html    |  77 +--
 .../search-range-filter.component.html        |  98 ++--
 .../search-text-filter.component.html         |  63 ++-
 .../search-label-range.component.html         |  48 +-
 .../search-results.component.ts               |   6 +-
 .../search-sidebar.component.html             |  80 +--
 ...search-switch-configuration.component.html |  30 +-
 src/app/shared/search/search.component.html   | 192 +++----
 .../sidebar/page-with-sidebar.component.html  |  18 +-
 .../date/starts-with-date.component.html      |  62 +--
 .../subscription-modal.component.html         |  78 +--
 .../file-dropzone-no-uploader.component.html  |  36 +-
 .../upload/uploader/uploader.component.html   | 107 ++--
 .../submission-form-collection.component.html |  73 +--
 .../submission-form-footer.component.html     | 118 +++--
 .../form/submission-form.component.html       |  75 +--
 ...ion-import-external-preview.component.html |  48 +-
 ...n-import-external-searchbar.component.html |  36 +-
 ...mission-section-cc-licenses.component.html | 230 +++++----
 .../section-container.component.html          |  94 ++--
 .../section-coar-notify.component.html        | 307 +++++------
 .../content-accordion.component.html          | 203 ++++----
 .../metadata-information.component.html       |  74 +--
 .../publication-information.component.html    | 126 +++--
 .../publisher-policy.component.html           |  30 +-
 .../section-sherpa-policies.component.html    | 147 +++---
 ...on-upload-access-conditions.component.html |  20 +-
 .../file/section-upload-file.component.html   |  52 +-
 .../system-wide-alert-banner.component.html   |  46 +-
 .../system-wide-alert-form.component.html     | 186 +++----
 ...nced-workflow-action-rating.component.html |  85 ++--
 .../browse-by-date.component.ts               |   6 +-
 .../browse-by-metadata.component.ts           |   6 +-
 .../browse-by-title.component.ts              |   6 +-
 .../profile-page/profile-page.component.ts    |   4 -
 ...ate-community-parent-selector.component.ts |   6 +-
 .../search-results.component.ts               |   6 +-
 .../header-navbar-wrapper.component.ts        |   7 +-
 .../dspace/app/header/header.component.html   |  28 +-
 .../dspace/app/navbar/navbar.component.ts     |   4 +-
 193 files changed, 7962 insertions(+), 6485 deletions(-)

diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index 6c748ca2e7..8c2b37adbd 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -2,10 +2,10 @@
   <ngb-panel [id]="'browse'">
     <ng-template ngbPanelTitle>
       <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle('browse')"
-           data-test="browse">
+        data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="acc.isExpanded('browse')"
-                aria-controls="bulk-access-browse-panel-content">
+          [attr.aria-expanded]="acc.isExpanded('browse')"
+          aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
       </div>
@@ -18,9 +18,9 @@
             <ng-template ngbNavContent>
               <div class="bulk-access-search">
                 <ds-search [configuration]="'administrativeBulkAccess'"
-                                  [selectable]="true"
-                                  [selectionConfig]="{ repeatable: true, listId: listId }"
-                                  [showThumbnails]="false"></ds-search>
+                  [selectable]="true"
+                  [selectionConfig]="{ repeatable: true, listId: listId }"
+                [showThumbnails]="false"></ds-search>
               </div>
             </ng-template>
           </li>
@@ -36,21 +36,25 @@
                 [showPaginator]="false"
                 (prev)="pagePrev()"
                 (next)="pageNext()">
-              <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ms-4">
-                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
-                      class="mt-4 mb-4 d-flex"
-                      [attr.data-test]="'list-object' | dsBrowserOnly">
-                    <ds-selectable-list-item-control [index]="i"
-                                                     [object]="object"
-                                                     [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
-                    <ds-listable-object-component-loader [listID]="listId"
-                                                         [index]="i"
-                                                         [object]="object"
-                                                         [showThumbnails]="false"
-                                                         [viewMode]="'list'"></ds-listable-object-component-loader>
-                  </li>
-                </ul>
+                @if ((objectsSelected$|async)?.hasSucceeded) {
+                  <ul class="list-unstyled ms-4">
+                    @for (object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                      currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; track object; let i = $index; let last = $last) {
+                      <li
+                        class="mt-4 mb-4 d-flex"
+                        [attr.data-test]="'list-object' | dsBrowserOnly">
+                        <ds-selectable-list-item-control [index]="i"
+                          [object]="object"
+                        [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
+                        <ds-listable-object-component-loader [listID]="listId"
+                          [index]="i"
+                          [object]="object"
+                          [showThumbnails]="false"
+                        [viewMode]="'list'"></ds-listable-object-component-loader>
+                      </li>
+                    }
+                  </ul>
+                }
               </ds-pagination>
             </ng-template>
           </li>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index 8c462daf6b..c054a5dd55 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -6,7 +6,7 @@
 
         <div>
           <button class="me-auto btn btn-success addEPerson-button"
-                  [routerLink]="'create'">
+            [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ms-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
@@ -18,77 +18,84 @@
       </h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div>
-            <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
+          <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
             <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
             <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
           </select>
         </div>
-          <div class="flex-grow-1 me-3 ms-3">
-            <div class="mb-3 input-group">
+        <div class="flex-grow-1 me-3 ms-3">
+          <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
-                   [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
-              <span class="input-group-append">
-                <button type="submit" class="search-button btn btn-primary">
-                  <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
-                </button>
-              </span>
+              class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
+              [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
+            <span class="input-group-append">
+              <button type="submit" class="search-button btn btn-primary">
+                <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
+              </button>
+            </span>
           </div>
         </div>
         <div>
           <button (click)="clearFormAndResetResult();"
-                  class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
+          class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
         </div>
       </form>
 
-      <ds-loading *ngIf="searching$ | async"></ds-loading>
-      <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true"
-        [paginationOptions]="config"
-        [collectionSize]="(pageInfoState$ | async)?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true">
-
-        <div class="table-responsive">
-          <table id="epeople" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-              <th>{{labelPrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
-                [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
-              <td>{{epersonDto.eperson.id}}</td>
-              <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
-              <td>{{epersonDto.eperson.email}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
+      @if (searching$ | async) {
+        <ds-loading></ds-loading>
+      }
+      @if ((pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(pageInfoState$ | async)?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr>
+                  <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+                  <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+                  <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+                  <th>{{labelPrefix + 'table.edit' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (epersonDto of (ePeopleDto$ | async)?.page; track epersonDto) {
+                  <tr
+                    [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
+                    <td>{{epersonDto.eperson.id}}</td>
+                    <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
+                    <td>{{epersonDto.eperson.email}}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
                           class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
                           title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button *ngIf="epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
-                          class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                          <i class="fas fa-edit fa-fw"></i>
+                        </button>
+                        @if (epersonDto.ableToDelete) {
+                          <button (click)="deleteEPerson(epersonDto.eperson)"
+                            class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                            <i class="fas fa-trash-alt fa-fw"></i>
+                          </button>
+                        }
+                      </div>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+
+      @if ((pageInfoState$ | async)?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{labelPrefix + 'no-items' | translate}}
         </div>
-
-      </ds-pagination>
-
-      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{labelPrefix + 'no-items' | translate}}
-      </div>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index c6f3a915a9..9947d775a2 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -2,97 +2,111 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeEPerson$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeEPerson$ | async) {
         <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
+      }
+
+
 
       <ds-form [formId]="formId"
-               [formModel]="formModel"
-               [formGroup]="formGroup"
-               [formLayout]="formLayout"
-               [displayCancel]="false"
-               [submitLabel]="submitLabel"
-               (submitForm)="onSubmit()">
+        [formModel]="formModel"
+        [formGroup]="formGroup"
+        [formLayout]="formLayout"
+        [displayCancel]="false"
+        [submitLabel]="submitLabel"
+        (submitForm)="onSubmit()">
         <div before class="btn-group">
           <button (click)="onCancel()" type="button" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}
           </button>
         </div>
-        <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
-            <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+        @if (displayResetPassword) {
+          <div between class="btn-group">
+            <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+              <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+            </button>
+          </div>
+        }
+        @if (canImpersonate$ | async) {
+          <div between class="btn-group ms-1">
+            @if (!isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="impersonate()">
+                <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
+              </button>
+            }
+            @if (isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="stopImpersonating()">
+                <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
+              </button>
+            }
+          </div>
+        }
+        @if (canDelete$ | async) {
+          <button after class="btn btn-danger delete-button" type="button" (click)="delete()">
+            <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
           </button>
-        </div>
-        <div *ngIf="canImpersonate$ | async" between class="btn-group ms-1">
-          <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
-            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
-          </button>
-          <button *ngIf="isImpersonated" class="btn btn-primary" type="button" (click)="stopImpersonating()">
-            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
-          </button>
-        </div>
-        <button *ngIf="canDelete$ | async" after class="btn btn-danger delete-button" type="button" (click)="delete()">
-          <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
-        </button>
+        }
       </ds-form>
 
-      <ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
+      @if (!formGroup) {
+        <ds-loading [showMessage]="false"></ds-loading>
+      }
 
-      <div *ngIf="activeEPerson$ | async">
-        <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
-
-        <ds-loading [showMessage]="false" *ngIf="groups$ | async | dsHasNoValue"></ds-loading>
-
-        <ds-pagination
-          *ngIf="(groups$ | async)?.payload?.totalElements > 0"
-          [paginationOptions]="config"
-          [collectionSize]="(groups$ | async)?.payload?.totalElements"
-          [hideGear]="true"
-          [hidePagerWhenSinglePage]="true"
-          (pageChange)="onPageChange($event)">
-
-          <div class="table-responsive">
-            <table id="groups" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let group of (groups$ | async)?.payload?.page">
-                <td class="align-middle">{{group.id}}</td>
-                <td class="align-middle">
-                  <a (click)="groupsDataService.startEditingNewGroup(group)"
-                     [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
-                    {{ dsoNameService.getName(group) }}
-                  </a>
-                </td>
-                <td class="align-middle">
-                  {{ dsoNameService.getName((group.object | async)?.payload) }}
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-
-        </ds-pagination>
-
-        <div *ngIf="(groups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-          <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
-          <div>
-            <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
-                    class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
-          </div>
+      @if (activeEPerson$ | async) {
+        <div>
+          <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
+          @if (groups$ | async | dsHasNoValue) {
+            <ds-loading [showMessage]="false"></ds-loading>
+          }
+          @if ((groups$ | async)?.payload?.totalElements > 0) {
+            <ds-pagination
+              [paginationOptions]="config"
+              [collectionSize]="(groups$ | async)?.payload?.totalElements"
+              [hideGear]="true"
+              [hidePagerWhenSinglePage]="true"
+              (pageChange)="onPageChange($event)">
+              <div class="table-responsive">
+                <table id="groups" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (group of (groups$ | async)?.payload?.page; track group) {
+                      <tr>
+                        <td class="align-middle">{{group.id}}</td>
+                        <td class="align-middle">
+                          <a (click)="groupsDataService.startEditingNewGroup(group)"
+                            [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
+                            {{ dsoNameService.getName(group) }}
+                          </a>
+                        </td>
+                        <td class="align-middle">
+                          {{ dsoNameService.getName((group.object | async)?.payload) }}
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            </ds-pagination>
+          }
+          @if ((groups$ | async)?.payload?.totalElements === 0) {
+            <div class="alert alert-info w-100 mb-2" role="alert">
+              <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
+              <div>
+                <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+                class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+              </div>
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 8dd88e23fb..510a156476 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -5,7 +5,7 @@
         <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
           <button class="me-auto btn btn-success"
-                  [routerLink]="'create'">
+            [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ms-1">{{messagePrefix + 'button.add' | translate}}</span>
           </button>
@@ -17,8 +17,8 @@
         <div class="flex-grow-1 me-3">
           <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
-                   [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
+              class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
+              [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
             <span class="input-group-append">
               <button type="submit" class="search-button btn btn-primary">
                 <i class="fas fa-search"></i> {{ messagePrefix + 'search.button' | translate }}
@@ -33,66 +33,78 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="loading$ | async"></ds-loading>
-      <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true"
-        [paginationOptions]="config"
-        [collectionSize]="(pageInfoState$ | async)?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true">
+      @if (loading$ | async) {
+        <ds-loading></ds-loading>
+      }
+      @if ((pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(pageInfoState$ | async)?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div  class="table-responsive">
+            <table id="groups" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr>
+                  <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
+                  <th>{{messagePrefix + 'table.edit' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (groupDto of (groupsDto$ | async)?.page; track groupDto) {
+                  <tr>
+                    <td>{{groupDto.group.id}}</td>
+                    <td>{{ dsoNameService.getName(groupDto.group) }}</td>
+                    <td>{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}</td>
+                    <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        @switch (groupDto.ableToEdit) {
+                          @case (true) {
+                            <button
+                              [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
+                              class="btn btn-outline-primary btn-sm btn-edit"
+                              title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
+                              >
+                              <i class="fas fa-edit fa-fw"></i>
+                            </button>
+                          }
+                          @case (false) {
+                            <button
+                              [dsBtnDisabled]="true"
+                              class="btn btn-outline-primary btn-sm btn-edit"
+                              placement="left"
+                              [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
+                              >
+                              <i class="fas fa-edit fa-fw"></i>
+                            </button>
+                          }
+                        }
+                        @if (!groupDto.group?.permanent && groupDto.ableToDelete) {
+                          <button
+                            (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
+                            title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
+                            <i class="fas fa-trash-alt fa-fw"></i>
+                          </button>
+                        }
+                      </div>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
 
-        <div  class="table-responsive">
-          <table id="groups" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
-              <th>{{messagePrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let groupDto of (groupsDto$ | async)?.page">
-              <td>{{groupDto.group.id}}</td>
-              <td>{{ dsoNameService.getName(groupDto.group) }}</td>
-              <td>{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}</td>
-              <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <ng-container [ngSwitch]="groupDto.ableToEdit">
-                    <button *ngSwitchCase="true"
-                      [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
-                      class="btn btn-outline-primary btn-sm btn-edit"
-                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
-                    >
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                    <button *ngSwitchCase="false"
-                      [dsBtnDisabled]="true"
-                      class="btn btn-outline-primary btn-sm btn-edit"
-                      placement="left"
-                      [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
-                    >
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                  </ng-container>
-                  <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
-                          (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
-                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+      @if ((pageInfoState$ | async)?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{messagePrefix + 'no-items' | translate}}
         </div>
-      </ds-pagination>
-
-      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{messagePrefix + 'no-items' | translate}}
-      </div>
+      }
 
     </div>
   </div>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index c321fb235d..38c6a1f349 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -1,10 +1,12 @@
 <div class="container">
   <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   <p>{{'admin.batch-import.page.help' | translate}}</p>
-  <p *ngIf="dso">
-    selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
-    <a href="javascript:void(0)" (click)="removeDspaceObject()">{{'admin.batch-import.page.remove' | translate}}</a>
-  </p>
+  @if (dso) {
+    <p>
+      selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
+      <a href="javascript:void(0)" (click)="removeDspaceObject()">{{'admin.batch-import.page.remove' | translate}}</a>
+    </p>
+  }
   <p>
     <button class="btn btn-primary" (click)="this.selectCollection();">{{'admin.metadata-import.page.button.select-collection' | translate}}</button>
   </p>
@@ -21,32 +23,35 @@
   </div>
 
   <ui-switch color="#ebebeb"
-             [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
-             [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
-             [checked]="isUpload"
-             (change)="toggleUpload()" ></ui-switch>
+    [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
+    [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
+    [checked]="isUpload"
+  (change)="toggleUpload()" ></ui-switch>
   <small class="form-text text-muted d-block">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
 
 
-  <ds-file-dropzone-no-uploader
-    *ngIf="isUpload"
-    data-test="file-dropzone"
-    (onFileAdded)="setFile($event)"
-    [dropMessageLabel]="'admin.batch-import.page.dropMsg'"
-    [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
-  </ds-file-dropzone-no-uploader>
+  @if (isUpload) {
+    <ds-file-dropzone-no-uploader
+      data-test="file-dropzone"
+      (onFileAdded)="setFile($event)"
+      [dropMessageLabel]="'admin.batch-import.page.dropMsg'"
+      [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
+    </ds-file-dropzone-no-uploader>
+  }
 
-  <div class="mb-3 mt-2" *ngIf="!isUpload">
-    <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
-           data-test="file-url-input" [(ngModel)]="fileURL">
-  </div>
+  @if (!isUpload) {
+    <div class="mb-3 mt-2">
+      <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
+        data-test="file-url-input" [(ngModel)]="fileURL">
+    </div>
+  }
 
   <div class="space-children-mr">
     <button class="btn btn-secondary" id="backButton"
-            (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
+    (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
     <button class="btn btn-primary" id="proceedButton"
-            (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+    (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index 3a42eb7825..eefc372ac8 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -4,34 +4,38 @@
       <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
     </div>
     <!-- In the toggle section -->
-    <div class="toggle-switch-container" *ngIf="!isNewService">
-      <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
-      <div>
-        <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
-        <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
-          <div class="slider"></div>
+    @if (!isNewService) {
+      <div class="toggle-switch-container">
+        <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+        <div>
+          <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
+          <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
+            <div class="slider"></div>
+          </div>
         </div>
       </div>
-    </div>
+    }
     <!-- In the Name section -->
     <div class="mb-5">
       <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
       <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
-             formControlName="name"
-             id="name"
-             name="name"
-             type="text">
-      <div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
-        {{ 'ldn-new-service.form.error.name' | translate }}
-      </div>
+        [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
+        formControlName="name"
+        id="name"
+        name="name"
+        type="text">
+      @if (formModel.get('name').invalid && formModel.get('name').touched) {
+        <div class="error-text">
+          {{ 'ldn-new-service.form.error.name' | translate }}
+        </div>
+      }
     </div>
 
     <!-- In the description section -->
     <div class="mb-5 mt-5 d-flex flex-column">
       <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
       <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
-                class="form-control" formControlName="description" id="description" name="description"></textarea>
+      class="form-control" formControlName="description" id="description" name="description"></textarea>
     </div>
 
     <div class="mb-5 mt-5">
@@ -40,30 +44,34 @@
         <div class="d-flex flex-column w-50 me-2">
           <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
-                 [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
-                 formControlName="url"
-                 id="url"
-                 name="url"
-                 type="text">
-          <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
-            {{ 'ldn-new-service.form.error.url' | translate }}
-          </div>
+            [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
+            formControlName="url"
+            id="url"
+            name="url"
+            type="text">
+          @if (formModel.get('url').invalid && formModel.get('url').touched) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.url' | translate }}
+            </div>
+          }
         </div>
 
         <div class="d-flex flex-column w-50">
           <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
           <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
-                 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
-                 id="score"
-                 name="score"
-                 min="0"
-                 max="1"
-                 step=".01"
-                 class="form-control"
-                 type="number">
-          <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
-            {{ 'ldn-new-service.form.error.score' | translate }}
-          </div>
+            [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
+            id="score"
+            name="score"
+            min="0"
+            max="1"
+            step=".01"
+            class="form-control"
+            type="number">
+          @if (formModel.get('score').invalid && formModel.get('score').touched) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.score' | translate }}
+            </div>
+          }
         </div>
       </div>
     </div>
@@ -73,21 +81,23 @@
       <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
       <div class="d-flex">
         <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
-               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
-               formControlName="lowerIp"
-               id="lowerIp"
-               name="lowerIp"
-               type="text">
+          [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
+          formControlName="lowerIp"
+          id="lowerIp"
+          name="lowerIp"
+          type="text">
         <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
-               [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
-               formControlName="upperIp"
-               id="upperIp"
-               name="upperIp"
-               type="text">
-      </div>
-      <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
-        {{ 'ldn-new-service.form.error.ipRange' | translate }}
+          [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
+          formControlName="upperIp"
+          id="upperIp"
+          name="upperIp"
+          type="text">
       </div>
+      @if ((formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)) {
+        <div class="error-text">
+          {{ 'ldn-new-service.form.error.ipRange' | translate }}
+        </div>
+      }
       <div class="text-muted">
         {{ 'ldn-new-service.form.hint.ipRange' | translate }}
       </div>
@@ -97,223 +107,242 @@
     <div class="mb-5 mt-5">
       <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
       <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
-             formControlName="ldnUrl"
-             id="ldnUrl"
-             name="ldnUrl"
-             type="text">
-      <div *ngIf="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched" >
-        <div *ngIf="formModel.get('ldnUrl').errors['required']" class="error-text">
-          {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+        [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
+        formControlName="ldnUrl"
+        id="ldnUrl"
+        name="ldnUrl"
+        type="text">
+      @if (formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched) {
+        <div >
+          @if (formModel.get('ldnUrl').errors['required']) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+            </div>
+          }
+          @if (formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
+            </div>
+          }
         </div>
-        <div *ngIf="formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']" class="error-text">
-          {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
-        </div>
-      </div>
+      }
     </div>
 
 
     <!-- In the Inbound Patterns Labels section -->
-    <div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
-      <div class="col">
-        <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
-      </div>
-      <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
+    @if (areControlsInitialized) {
+      <div class="row mb-1 mt-5">
         <div class="col">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
         </div>
-        <div class="col-sm-1">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+        @if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
+          <div class="col">
+            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+          </div>
+          <div class="col-sm-1">
+            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+          </div>
+        }
+        <div class="col-sm-2">
         </div>
-      </ng-container>
-      <div class="col-sm-2">
       </div>
-    </div>
+    }
 
     <!-- In the Inbound Patterns section -->
-    <div *ngIf="areControlsInitialized">
-      <div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
-           [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
-           formGroupName="notifyServiceInboundPatterns">
-
-        <ng-container [formGroupName]="i">
-
-
-          <div class="row mb-1 align-items-center">
-            <div class="col">
-              <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
-                   id="additionalInboundPattern{{i}}"
-                   ngbDropdown placement="top-start">
-                <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
-                  <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
-                     ngbDropdownToggle></i>
-                  <input
-                    (click)="inboundPatternDropdown.open();"
-                    [readonly]="true"
-                    [value]="selectedInboundPatterns"
-                    class="form-control w-80 scrollable-dropdown-input"
-                    formControlName="patternLabel"
-                    id="inboundPatternDropdownButton"
-                    ngbDropdownAnchor
-                    type="text"
-                    [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
-                  />
-                  <div aria-labelledby="inboundPatternDropdownButton"
-                       class="dropdown-menu dropdown-menu-top w-100 "
-                       ngbDropdownMenu>
-                    <div class="scrollable-menu" role="listbox">
-                      <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
-                              *ngFor="let pattern of inboundPatterns; let internalIndex = index"
+    @if (areControlsInitialized) {
+      <div>
+        @for (patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; track patternGroup; let i = $index) {
+          <div
+            [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
+            formGroupName="notifyServiceInboundPatterns">
+            <ng-container [formGroupName]="i">
+              <div class="row mb-1 align-items-center">
+                <div class="col">
+                  <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
+                    id="additionalInboundPattern{{i}}"
+                    ngbDropdown placement="top-start">
+                    <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
+                      <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                      ngbDropdownToggle></i>
+                      <input
+                        (click)="inboundPatternDropdown.open();"
+                        [readonly]="true"
+                        [value]="selectedInboundPatterns"
+                        class="form-control w-80 scrollable-dropdown-input"
+                        formControlName="patternLabel"
+                        id="inboundPatternDropdownButton"
+                        ngbDropdownAnchor
+                        type="text"
+                        [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
+                        />
+                      <div aria-labelledby="inboundPatternDropdownButton"
+                        class="dropdown-menu dropdown-menu-top w-100 "
+                        ngbDropdownMenu>
+                        <div class="scrollable-menu" role="listbox">
+                          @for (pattern of inboundPatterns; track pattern; let internalIndex = $index) {
+                            <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
                               [title]="'ldn-service.form.pattern.' + pattern + '.description' | translate"
                               class="dropdown-item collection-item text-truncate w-100"
                               ngbDropdownItem
                               type="button">
-                        <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="col">
-              <ng-container
-                *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
-                <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
-                     placement="top-start">
-                  <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
-                    <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
-                       ngbDropdownToggle></i>
-                    <input
-                      [readonly]="true"
-                      class="form-control d-none w-100 scrollable-dropdown-input"
-                      formControlName="constraint"
-                      id="inboundItemfilterDropdown"
-                      ngbDropdownAnchor
-                      type="text"
-                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
-                    />
-                    <input
-                      (click)="inboundItemfilterDropdown.open();"
-                      [readonly]="true"
-                      class="form-control w-100 scrollable-dropdown-input"
-                      formControlName="constraintFormatted"
-                      id="inboundItemfilterDropdownPrettified"
-                      ngbDropdownAnchor
-                      type="text"
-                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
-                    />
-                    <div aria-labelledby="inboundItemfilterDropdownButton"
-                         class="dropdown-menu scrollable-dropdown-menu w-100 "
-                         ngbDropdownMenu>
-                      <div class="scrollable-menu" role="listbox">
-                        <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
-                                class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
-                          <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
-                        </button>
-                        <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
-                                *ngFor="let constraint of (itemFiltersRD$ | async)?.payload?.page; let internalIndex = index"
-                                class="dropdown-item collection-item text-truncate w-100"
-                                ngbDropdownItem
-                                type="button">
-                          <div>{{ constraint.id + '.label' | translate }}</div>
-                        </button>
+                              <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
+                            </button>
+                          }
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              </ng-container>
-            </div>
-
-            <div
-              [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
-              class="col-sm-1">
-              <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
-                     type="checkbox">
-              <div (click)="toggleAutomatic(i)"
-                   [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
-                   class="toggle-switch">
-                <div class="slider"></div>
-              </div>
-            </div>
-
-
-            <div class="col-sm-2">
-              <div class="btn-group">
-                <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
-                        [title]="'ldn-service-button-mark-inbound-deletion' | translate"
-                        type="button">
-                  <i class="fas fa-trash"></i>
-                </button>
-
-
-                <button (click)="unmarkForInboundPatternDeletion(i)"
-                        *ngIf="markedForDeletionInboundPattern.includes(i)"
+                <div class="col">
+                  @if (formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern) {
+                    <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
+                      placement="top-start">
+                      <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
+                        <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                        ngbDropdownToggle></i>
+                        <input
+                          [readonly]="true"
+                          class="form-control d-none w-100 scrollable-dropdown-input"
+                          formControlName="constraint"
+                          id="inboundItemfilterDropdown"
+                          ngbDropdownAnchor
+                          type="text"
+                          [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                          />
+                        <input
+                          (click)="inboundItemfilterDropdown.open();"
+                          [readonly]="true"
+                          class="form-control w-100 scrollable-dropdown-input"
+                          formControlName="constraintFormatted"
+                          id="inboundItemfilterDropdownPrettified"
+                          ngbDropdownAnchor
+                          type="text"
+                          [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                          />
+                        <div aria-labelledby="inboundItemfilterDropdownButton"
+                          class="dropdown-menu scrollable-dropdown-menu w-100 "
+                          ngbDropdownMenu>
+                          <div class="scrollable-menu" role="listbox">
+                            <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
+                              class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
+                              <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
+                            </button>
+                            @for (constraint of (itemFiltersRD$ | async)?.payload?.page; track constraint; let internalIndex = $index) {
+                              <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
+                                class="dropdown-item collection-item text-truncate w-100"
+                                ngbDropdownItem
+                                type="button">
+                                <div>{{ constraint.id + '.label' | translate }}</div>
+                              </button>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  }
+                </div>
+                <div
+                  [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
+                  class="col-sm-1">
+                  <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
+                    type="checkbox">
+                  <div (click)="toggleAutomatic(i)"
+                    [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
+                    class="toggle-switch">
+                    <div class="slider"></div>
+                  </div>
+                </div>
+                <div class="col-sm-2">
+                  <div class="btn-group">
+                    <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
+                      [title]="'ldn-service-button-mark-inbound-deletion' | translate"
+                      type="button">
+                      <i class="fas fa-trash"></i>
+                    </button>
+                    @if (markedForDeletionInboundPattern.includes(i)) {
+                      <button (click)="unmarkForInboundPatternDeletion(i)"
                         [title]="'ldn-service-button-unmark-inbound-deletion' | translate"
                         class="btn btn-warning "
                         type="button">
-                  <i class="fas fa-undo"></i>
-                </button>
+                        <i class="fas fa-undo"></i>
+                      </button>
+                    }
+                  </div>
+                </div>
               </div>
-            </div>
+            </ng-container>
           </div>
-        </ng-container>
+        }
       </div>
-    </div>
+    }
 
     <span (click)="addInboundPattern()"
-          class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
+    class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
     <hr>
-    <div class="form-group row">
-      <div class="col text-right space-children-mr">
-        <ng-content select="[before]"></ng-content>
-        <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
-          <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
-        </button>
-        <button class="btn btn-primary" type="submit">
-          <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
-        </button>
+      <div class="form-group row">
+        <div class="col text-right space-children-mr">
+          <ng-content select="[before]"></ng-content>
+          <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
+            <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
+          </button>
+          <button class="btn btn-primary" type="submit">
+            <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
+          </button>
 
+        </div>
       </div>
-    </div>
-  </form>
-</div>
-<ng-template #confirmModal>
+    </form>
+  </div>
+  <ng-template #confirmModal>
     <div class="modal-header">
-      <h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
-      <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
+      @if (!isNewService) {
+        <h4>{{'service.overview.edit.modal' | translate }}</h4>
+      }
+      @if (isNewService) {
+        <h4>{{'service.overview.create.modal' | translate }}</h4>
+      }
       <button (click)="closeModal()" aria-label="Close"
-              class="close" type="button">
+        class="close" type="button">
         <span aria-hidden="true">×</span>
       </button>
     </div>
 
     <div class="modal-body">
-      <div *ngIf="!isNewService">
-        {{ 'service.overview.edit.body' | translate }}
-      </div>
-      <span *ngIf="isNewService">
-        {{ 'service.overview.create.body' | translate }}
-      </span>
-    </div>
-      <div class="modal-footer">
-        <div *ngIf="!isNewService">
-          <button (click)="closeModal()" class="btn btn-outline-secondary me-2"
-                  id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
-          </button>
-          <button *ngIf="!isNewService" (click)="patchService()"
-                  class="btn btn-primary">{{ 'service.detail.update' | translate }}
-          </button>
+      @if (!isNewService) {
+        <div>
+          {{ 'service.overview.edit.body' | translate }}
         </div>
-        <div *ngIf="isNewService">
+      }
+      @if (isNewService) {
+        <span>
+          {{ 'service.overview.create.body' | translate }}
+        </span>
+      }
+    </div>
+    <div class="modal-footer">
+      @if (!isNewService) {
+        <div>
+          <button (click)="closeModal()" class="btn btn-outline-secondary me-2"
+            id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
+          </button>
+          @if (!isNewService) {
+            <button (click)="patchService()"
+              class="btn btn-primary">{{ 'service.detail.update' | translate }}
+            </button>
+          }
+        </div>
+      }
+      @if (isNewService) {
+        <div>
           <button (click)="closeModal()" class="btn btn-outline-secondary me-2 "
-                  id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
+            id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
           </button>
           <button (click)="createService()"
-                  class="btn btn-primary">{{ 'service.confirm.create' | translate }}
+            class="btn btn-primary">{{ 'service.confirm.create' | translate }}
           </button>
         </div>
-      </div>
-</ng-template>
+      }
+    </div>
+  </ng-template>
 
 
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
index 1e43cfad5d..bd156cc0af 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -4,63 +4,67 @@
   </div>
   <div class="d-flex justify-content-end">
     <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
-      class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
+    class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
   </div>
-  <ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
-                 [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true"
-                 [paginationOptions]="pageConfig">
-    <div class="table-responsive">
-      <table class="table table-striped table-hover">
-        <thead>
-        <tr>
-          <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let ldnService of (ldnServicesRD$ | async)?.payload?.page">
-          <td class="col-3">{{ ldnService.name }}</td>
-          <td>
-            <ds-truncatable [id]="ldnService.id">
-              <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
-                <div>
-                  {{ ldnService.description }}
-                </div>
-              </ds-truncatable-part>
-            </ds-truncatable>
-          </td>
-          <td>
-                        <span (click)="toggleStatus(ldnService, ldnServicesService)"
-                              [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
-                              [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
-                              class="status-indicator">
-                            {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
-                        </span>
-          </td>
-          <td>
-            <div class="btn-group">
-              <button
-                (click)="selectServiceToDelete(ldnService.id)"
-                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
-                class="btn btn-outline-danger">
-                <i class="fas fa-trash"></i>
-              </button>
-              <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+  @if ((ldnServicesRD$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true"
+      [paginationOptions]="pageConfig">
+      <div class="table-responsive">
+        <table class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (ldnService of (ldnServicesRD$ | async)?.payload?.page; track ldnService) {
+              <tr>
+                <td class="col-3">{{ ldnService.name }}</td>
+                <td>
+                  <ds-truncatable [id]="ldnService.id">
+                    <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
+                      <div>
+                        {{ ldnService.description }}
+                      </div>
+                    </ds-truncatable-part>
+                  </ds-truncatable>
+                </td>
+                <td>
+                  <span (click)="toggleStatus(ldnService, ldnServicesService)"
+                    [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
+                    [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
+                    class="status-indicator">
+                    {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
+                  </span>
+                </td>
+                <td>
+                  <div class="btn-group">
+                    <button
+                      (click)="selectServiceToDelete(ldnService.id)"
+                      [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                      class="btn btn-outline-danger">
+                      <i class="fas fa-trash"></i>
+                    </button>
+                    <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
                       [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
                       class="btn btn-outline-dark">
-                <i class="fas fa-edit"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-edit"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 </div>
 
 <ng-template #deleteModal>
@@ -72,8 +76,8 @@
         <h4>{{'service.overview.delete.header' | translate }}</h4>
       </div>
       <button (click)="closeModal()" aria-label="Close"
-              [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-              class="close" type="button">
+        [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+        class="close" type="button">
         <span aria-hidden="true">×</span>
       </button>
     </div>
@@ -84,12 +88,12 @@
       </div>
       <div class="mt-4 text-right">
         <button (click)="closeModal()"
-                [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-                class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
+          [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+        class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
         <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
-                class="btn btn-danger"
-                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
-                id="delete-confirm">{{ 'service.overview.delete' | translate }}
+          class="btn btn-danger"
+          [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+          id="delete-confirm">{{ 'service.overview.delete' | translate }}
         </button>
       </div>
     </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
index 48e2a42fe2..ce394175c3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -3,10 +3,12 @@
     <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
     <div class="col-md-9">
       <div class="h4">
-        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge bg-primary me-1 mb-1">
-          {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
-          <span> ×</span>
-        </button>
+        @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
+          <button (click)="resetDefaultConfiguration()" class="badge bg-primary me-1 mb-1">
+            {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
+            <span> ×</span>
+          </button>
+        }
       </div>
       <ds-search-labels [inPlaceSearch]="true"></ds-search-labels>
     </div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index cc544476cc..c063384389 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -8,51 +8,62 @@
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
 
 
-      <ds-pagination
-        *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements > 0"
-        [paginationOptions]="pageConfig"
-        [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true">
-        <div class="table-responsive">
-          <table id="formats" class="table table-striped table-hover">
-            <thead>
-            <tr>
-              <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page">
-              <td>
-                <label class="form-label mb-0">
-                  <input type="checkbox"
-                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
-                         [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
-                         (change)="selectBitStreamFormat(bitstreamFormat, $event)"
-                  >
-                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
-                </label>
-              </td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
-            </tr>
-            </tbody>
-          </table>
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="pageConfig"
+          [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="formats" class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page; track bitstreamFormat) {
+                  <tr>
+                    <td>
+                      <label class="form-label mb-0">
+                        <input type="checkbox"
+                          [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
+                          [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
+                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
+                          >
+                        <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
+                      </label>
+                    </td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} @if (bitstreamFormat.internal) {
+                      <span>({{'admin.registries.bitstream-formats.table.internal' | translate}})</span>
+                    }</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements === 0) {
+        <div class="alert alert-info" role="alert">
+          {{'admin.registries.bitstream-formats.no-items' | translate}}
         </div>
-      </ds-pagination>
-      <div *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements === 0" class="alert alert-info" role="alert">
-        {{'admin.registries.bitstream-formats.no-items' | translate}}
-      </div>
+      }
 
       <div>
-        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
-        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          <button class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
+        }
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          <button type="submit" class="btn btn-danger float-end" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        }
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index ff70c04d11..73072b6104 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -1,60 +1,65 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
 
-            <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
+      <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
-            <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
+      <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
 
-            <ds-pagination
-                    *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
-                    [paginationOptions]="config"
-                    [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
-                    [hideGear]="true"
-                    [hidePagerWhenSinglePage]="true">
-
-                <div class="table-responsive">
-                    <table id="metadata-schemas" class="table table-striped table-hover">
-                        <thead>
-                        <tr>
-                            <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                            [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
-                            <td>
-                                <label class="form-label mb-0">
-                                    <input type="checkbox"
-                                           [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
-                                           (change)="selectMetadataSchema(schema, $event)"
-                                    >
-                                    <span class="sr-only">{{(((selectedMetadataSchemaIDs$ | async)?.includes(schema.id)) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
-                                </label>
-                            </td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-
-            </ds-pagination>
-
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-              {{'admin.registries.metadata.schemas.no-items' | translate}}
-            </div>
-
-            <div>
-              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
-            </div>
+      @if ((metadataSchemas | async)?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="metadata-schemas" class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (schema of (metadataSchemas | async)?.payload?.page; track schema) {
+                  <tr
+                    [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
+                    <td>
+                      <label class="form-label mb-0">
+                        <input type="checkbox"
+                          [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
+                          (change)="selectMetadataSchema(schema, $event)"
+                          >
+                        <span class="sr-only">{{(((selectedMetadataSchemaIDs$ | async)?.includes(schema.id)) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
+                      </label>
+                    </td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
 
+      @if ((metadataSchemas | async)?.payload?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.metadata.schemas.no-items' | translate}}
         </div>
+      }
+
+      <div>
+        @if ((metadataSchemas | async)?.payload?.page?.length > 0) {
+          <button type="submit" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
+        }
+      </div>
+
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 19c5370a9c..438b37d3aa 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -8,52 +8,59 @@
 
       <ds-metadata-field-form
         [metadataSchema]="schema"
-        (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
+      (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
 
       <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
-        <ds-pagination
-          *ngIf="fields?.totalElements > 0"
-          [paginationOptions]="config"
-          [collectionSize]="fields?.totalElements"
-          [hideGear]="false"
-          [hidePagerWhenSinglePage]="true">
-          <div class="table-responsive">
-            <table id="metadata-fields" class="table table-striped table-hover">
-              <thead>
-              <tr>
-                <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
-                <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
-                <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
-                <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let field of fields?.page"
-                  [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
-                <td *ngVar="(selectedMetadataFieldIDs$ | async)?.includes(field.id) as selected">
-                  <input type="checkbox"
-                         [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
-                         [checked]="selected"
-                         (change)="selectMetadataField(field, $event)">
-                </td>
-                <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-        </ds-pagination>
+        @if (fields?.totalElements > 0) {
+          <ds-pagination
+            [paginationOptions]="config"
+            [collectionSize]="fields?.totalElements"
+            [hideGear]="false"
+            [hidePagerWhenSinglePage]="true">
+            <div class="table-responsive">
+              <table id="metadata-fields" class="table table-striped table-hover">
+                <thead>
+                  <tr>
+                    <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (field of fields?.page; track field) {
+                    <tr
+                      [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
+                      <td *ngVar="(selectedMetadataFieldIDs$ | async)?.includes(field.id) as selected">
+                        <input type="checkbox"
+                          [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
+                          [checked]="selected"
+                          (change)="selectMetadataField(field, $event)">
+                      </td>
+                      <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
+                      <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
+                      <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          </ds-pagination>
+        }
 
-        <div *ngIf="fields?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-          {{'admin.registries.schema.fields.no-items' | translate}}
-        </div>
+        @if (fields?.totalElements === 0) {
+          <div class="alert alert-info w-100 mb-2" role="alert">
+            {{'admin.registries.schema.fields.no-items' | translate}}
+          </div>
+        }
 
         <div>
           <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-end" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+          @if (fields?.page?.length > 0) {
+            <button type="submit" class="btn btn-danger float-end" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+          }
         </div>
       </ng-container>
 
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
index 2fa1a2f547..88e4335506 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.html
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -1,19 +1,23 @@
 <fieldset class="row row-cols-2">
-    <ng-container>
-        <span class="col-12">&nbsp;</span>
-        <span class="col-1">&nbsp;</span>
-        <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
-        <span class="col-2">&nbsp;</span>
-        <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
-        <span class="col-1">&nbsp;</span>
-        <span class="col-12">&nbsp;</span>
-    </ng-container>
+  <ng-container>
+    <span class="col-12">&nbsp;</span>
+    <span class="col-1">&nbsp;</span>
+    <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
+    <span class="col-2">&nbsp;</span>
+    <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
+    <span class="col-1">&nbsp;</span>
+    <span class="col-12">&nbsp;</span>
+  </ng-container>
 </fieldset>
-<fieldset class="row row-cols-2" *ngFor="let group of allFilters()">
+@for (group of allFilters(); track group) {
+  <fieldset class="row row-cols-2">
     <legend>{{group.key | translate}}</legend>
     <ng-container [formGroup]="filtersForm">
-        <div *ngFor="let filter of group.filters" class="col-6">
-            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
+      @for (filter of group.filters; track filter) {
+        <div class="col-6">
+          <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
         </div>
+      }
     </ng-container>
-</fieldset>
+  </fieldset>
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
index 200286e08f..150411ec40 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -1,43 +1,47 @@
 <div>
-    <div class="modal-header">{{'supervision-group-selector.header' | translate}}
-        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
-        </button>
+  <div class="modal-header">{{'supervision-group-selector.header' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    <div class="row">
+      <div class="control-group col-sm-12">
+        <label for="supervisionOrder" class="form-label">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
+        <select name="supervisionOrder" id="supervisionOrder" class="form-select"
+          [(ngModel)]="selectedOrderType"
+          attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
+          <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
+          <option value="OBSERVER">{{'supervision-group-selector.select.type-of-order.option.observer' | translate}}</option>
+        </select>
+        @if (isSubmitted && (!selectedOrderType || selectedOrderType === '')) {
+          <ds-error
+          message="{{'supervision-group-selector.select.type-of-order.error' | translate}}"></ds-error>
+        }
+      </div>
     </div>
-    <div class="modal-body">
-        <div class="row">
-            <div class="control-group col-sm-12">
-                <label for="supervisionOrder" class="form-label">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
-                <select name="supervisionOrder" id="supervisionOrder" class="form-select"
-                        [(ngModel)]="selectedOrderType"
-                        attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
-                    <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
-                    <option value="OBSERVER">{{'supervision-group-selector.select.type-of-order.option.observer' | translate}}</option>
-                </select>
-                <ds-error *ngIf="isSubmitted && (!selectedOrderType || selectedOrderType === '')"
-                          message="{{'supervision-group-selector.select.type-of-order.error' | translate}}"></ds-error>
-            </div>
-        </div>
-        <div class="row">
-            <div class="control-group col-sm-12">
-                <label for="supervisionGroup" class="form-label">{{'supervision-group-selector.select.group.label' | translate}}</label>
-                <ng-container class="mb-3">
-                    <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
-                    <ds-error *ngIf="isSubmitted && !selectedGroup" message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
-                </ng-container>
-                <ds-eperson-group-list [isListOfEPerson]="false"
-                                       (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
-            </div>
-        </div>
-<!--        <div class="d-flex flex-row-reverse m-2">          -->
-        <div class="modal-footer">
-          <button class="btn btn-outline-secondary"
-                  (click)="close()">
-            <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
-          </button>
-          <button class="btn btn-primary save"
-                  (click)="save()">
-            <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
-          </button>
-        </div>
+    <div class="row">
+      <div class="control-group col-sm-12">
+        <label for="supervisionGroup" class="form-label">{{'supervision-group-selector.select.group.label' | translate}}</label>
+        <ng-container class="mb-3">
+          <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
+          @if (isSubmitted && !selectedGroup) {
+            <ds-error message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
+          }
+        </ng-container>
+        <ds-eperson-group-list [isListOfEPerson]="false"
+        (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
+      </div>
     </div>
+    <!--        <div class="d-flex flex-row-reverse m-2">          -->
+    <div class="modal-footer">
+      <button class="btn btn-outline-secondary"
+        (click)="close()">
+        <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
+      </button>
+      <button class="btn btn-primary save"
+        (click)="save()">
+        <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
+      </button>
+    </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
index 75e10a10df..3d3e912f91 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
@@ -1,15 +1,19 @@
 <ng-container *ngVar="(supervisionOrderEntries$ | async) as supervisionOrders">
-  <div class="item-list-supervision" *ngIf="supervisionOrders?.length > 0">
-    <div>
-      <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
+  @if (supervisionOrders?.length > 0) {
+    <div class="item-list-supervision">
+      <div>
+        <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
+      </div>
+      <div>
+        @for (supervisionOrder of supervisionOrders; track supervisionOrder) {
+          <a class="badge bg-primary me-1 mb-1 text-capitalize mw-100 text-truncate" data-test="soBadge"
+            [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
+            (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
+            {{ dsoNameService.getName(supervisionOrder.group) }}
+            <span aria-hidden="true"> ×</span>
+          </a>
+        }
+      </div>
     </div>
-    <div>
-      <a class="badge bg-primary me-1 mb-1 text-capitalize mw-100 text-truncate" *ngFor="let supervisionOrder of supervisionOrders" data-test="soBadge"
-         [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
-         (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
-        {{ dsoNameService.getName(supervisionOrder.group) }}
-        <span aria-hidden="true"> ×</span>
-      </a>
-    </div>
-  </div>
+  }
 </ng-container>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
index 70fbc6f667..38703c3182 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
@@ -1,12 +1,14 @@
 <ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges class="position-absolute ms-1">
-    <div class="workflow-badge">
-        <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
-    </div>
+  <div class="workflow-badge">
+    <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+  </div>
 </div>
 <ul #buttons class="list-group list-group-flush">
-    <li class="list-group-item">
-        <ds-workflow-item-admin-workflow-actions-element *ngIf="object" class="d-flex justify-content-between" [wfi]="dso" [small]="true"></ds-workflow-item-admin-workflow-actions-element>
-    </li>
+  <li class="list-group-item">
+    @if (object) {
+      <ds-workflow-item-admin-workflow-actions-element class="d-flex justify-content-between" [wfi]="dso" [small]="true"></ds-workflow-item-admin-workflow-actions-element>
+    }
+  </li>
 </ul>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
index f34d17da51..2ecd0a72a1 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
@@ -1,10 +1,12 @@
 <div class="workflow-badge">
-    <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+  <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
 </div>
-<ds-listable-object-component-loader *ngIf="item$ | async"
-                                     [object]="item$ | async"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
+@if (item$ | async) {
+  <ds-listable-object-component-loader
+    [object]="item$ | async"
+    [viewMode]="viewModes.ListElement"
+    [index]="index"
+    [linkType]="linkType"
+  [listID]="listID"></ds-listable-object-component-loader>
+}
 <ds-workflow-item-admin-workflow-actions-element [wfi]="dso" [small]="false"></ds-workflow-item-admin-workflow-actions-element>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
index 15e0699f28..32777bfa39 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
@@ -1,13 +1,15 @@
 <span class="badge bg-info">{{ "admin.workflow.item.workspace" | translate }}</span>
-<ds-listable-object-component-loader *ngIf="item$ | async"
-                                     [object]="item$ | async"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
+@if (item$ | async) {
+  <ds-listable-object-component-loader
+    [object]="item$ | async"
+    [viewMode]="viewModes.ListElement"
+    [index]="index"
+    [linkType]="linkType"
+  [listID]="listID"></ds-listable-object-component-loader>
+}
 
 <ds-workspace-item-admin-workflow-actions-element [small]="false"
-                                                  [supervisionOrderList]="supervisionOrder$ | async"
-                                                  [wsi]="dso"
-                                                  (create)="reloadObject($event)"
-                                                  (delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
+  [supervisionOrderList]="supervisionOrder$ | async"
+  [wsi]="dso"
+  (create)="reloadObject($event)"
+(delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index e5b8bd6945..d38e38dd83 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,61 +1,71 @@
 <div class="container">
   <div class="collection-page"
-       *ngVar="(collectionRD$ | async) as collectionRD">
-    <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-      <div *ngIf="collectionRD?.payload as collection">
-        <ds-view-tracker [object]="collection"></ds-view-tracker>
-        <div class="d-flex flex-row border-bottom mb-4 pb-4">
-                <header class="comcol-header me-auto">
-            <!-- Collection Name -->
-            <ds-comcol-page-header
-                [name]="dsoNameService.getName(collection)">
-            </ds-comcol-page-header>
-            <!-- Collection logo -->
-            <ds-comcol-page-logo *ngIf="logoRD$"
-                                 [logo]="(logoRD$ | async)?.payload"
-                                 [alternateText]="'collection.logo' | translate">
-            </ds-comcol-page-logo>
-
-            <!-- Handle -->
-            <ds-comcol-page-handle
-                [content]="collection.handle"
-                [title]="'collection.page.handle'">
-            </ds-comcol-page-handle>
-            <!-- Introductory text -->
-            <ds-comcol-page-content
-                [content]="collection.introductoryText"
-                [hasInnerHtml]="true">
-            </ds-comcol-page-content>
-            <!-- News -->
-            <ds-comcol-page-content
-                [content]="collection.sidebarText"
-                [hasInnerHtml]="true"
-                [title]="'collection.page.news'">
-            </ds-comcol-page-content>
-          </header>
-          <ds-dso-edit-menu></ds-dso-edit-menu>
-        </div>
-        <section class="comcol-page-browse-section">
-          <!-- Browse-By Links -->
-          <ds-comcol-page-browse-by
-              [id]="collection.id"
-              [contentType]="collection.type">
-          </ds-comcol-page-browse-by>
-
-          <router-outlet></router-outlet>
-        </section>
-        <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
-          <!-- Copyright -->
-          <ds-comcol-page-content
-              [content]="collection.copyrightText"
-              [hasInnerHtml]="true">
-          </ds-comcol-page-content>
-        </footer>
+    *ngVar="(collectionRD$ | async) as collectionRD">
+    @if (collectionRD?.hasSucceeded) {
+      <div @fadeInOut>
+        @if (collectionRD?.payload; as collection) {
+          <div>
+            <ds-view-tracker [object]="collection"></ds-view-tracker>
+            <div class="d-flex flex-row border-bottom mb-4 pb-4">
+              <header class="comcol-header me-auto">
+                <!-- Collection Name -->
+                <ds-comcol-page-header
+                  [name]="dsoNameService.getName(collection)">
+                </ds-comcol-page-header>
+                <!-- Collection logo -->
+                @if (logoRD$) {
+                  <ds-comcol-page-logo
+                    [logo]="(logoRD$ | async)?.payload"
+                    [alternateText]="'collection.logo' | translate">
+                  </ds-comcol-page-logo>
+                }
+                <!-- Handle -->
+                <ds-comcol-page-handle
+                  [content]="collection.handle"
+                  [title]="'collection.page.handle'">
+                </ds-comcol-page-handle>
+                <!-- Introductory text -->
+                <ds-comcol-page-content
+                  [content]="collection.introductoryText"
+                  [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+                <!-- News -->
+                <ds-comcol-page-content
+                  [content]="collection.sidebarText"
+                  [hasInnerHtml]="true"
+                  [title]="'collection.page.news'">
+                </ds-comcol-page-content>
+              </header>
+              <ds-dso-edit-menu></ds-dso-edit-menu>
+            </div>
+            <section class="comcol-page-browse-section">
+              <!-- Browse-By Links -->
+              <ds-comcol-page-browse-by
+                [id]="collection.id"
+                [contentType]="collection.type">
+              </ds-comcol-page-browse-by>
+              <router-outlet></router-outlet>
+            </section>
+            @if (collection.copyrightText) {
+              <footer class="border-top my-5 pt-4">
+                <!-- Copyright -->
+                <ds-comcol-page-content
+                  [content]="collection.copyrightText"
+                  [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+              </footer>
+            }
+          </div>
+        }
       </div>
-    </div>
-    <ds-error *ngIf="collectionRD?.hasFailed"
-              message="{{'error.collection' | translate}}"></ds-error>
-    <ds-loading *ngIf="collectionRD?.isLoading"
-                       message="{{'loading.collection' | translate}}"></ds-loading>
+    }
+    @if (collectionRD?.hasFailed) {
+      <ds-error
+      message="{{'error.collection' | translate}}"></ds-error>
+    }
+    @if (collectionRD?.isLoading) {
+      <ds-loading
+      message="{{'loading.collection' | translate}}"></ds-loading>
+    }
   </div>
 </div>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index 3bc2d23c34..2147cb85c0 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -1,23 +1,27 @@
 <div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
-                <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="mb-3 row">
-                  <div class="col text-end space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
-                      <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
-                    </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
-                      <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
-                      <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
-                    </button>
-                  </div>
-                </div>
-            </div>
-        </ng-container>
+  <div class="row">
+    <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
+      <div class="col-12 pb-4">
+        <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
+        <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
+        <div class="mb-3 row">
+          <div class="col text-end space-children-mr">
+            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+              <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
+            </button>
+            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+              @if (processing$ | async) {
+                <span><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
+              }
+              @if ((processing$ | async) !== true) {
+                <span><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
+              }
+            </button>
+          </div>
+        </div>
+      </div>
+    </ng-container>
 
-    </div>
+  </div>
 
 </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
index 7cd3d6a342..9408bd2ab3 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
@@ -1,8 +1,9 @@
 <div class="custom-alignment">
-  <ds-comcol-role
-    *ngFor="let comcolRole of comcolRoles$ | async"
-    [dso]="collection$ | async"
-    [comcolRole]="comcolRole"
-  >
-  </ds-comcol-role>
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    <ds-comcol-role
+      [dso]="collection$ | async"
+      [comcolRole]="comcolRole"
+      >
+    </ds-comcol-role>
+  }
 </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 9a46fac09a..147b10ff62 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,54 +1,65 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
-    <div class="container-fluid space-children-mr" *ngIf="shouldShow">
-        <h3>{{ 'collection.source.controls.head' | translate }}</h3>
-        <div>
-            <span class="fw-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
-            <span>{{contentSource?.harvestStatus}}</span>
-        </div>
-        <div>
-            <span class="fw-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
-            <span>{{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-        <div>
-            <span class="fw-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
-            <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-        <div>
-            <span class="fw-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
-            <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-
-        <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [dsBtnDisabled]="!(isEnabled)"
-                (click)="testConfiguration(contentSource)">
-            <span>{{'collection.source.controls.test.submit' | translate}}</span>
+  @if (shouldShow) {
+    <div class="container-fluid space-children-mr">
+      <h3>{{ 'collection.source.controls.head' | translate }}</h3>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
+        <span>{{contentSource?.harvestStatus}}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
+        <span>{{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
+        <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
+        <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      @if ((testConfigRunning$ |async) !== true) {
+        <button class="btn btn-secondary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="testConfiguration(contentSource)">
+          <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
-        <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [dsBtnDisabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span>{{'collection.source.controls.test.running' | translate}}</span>
+      }
+      @if ((testConfigRunning$ |async)) {
+        <button class="btn btn-secondary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
-        <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [dsBtnDisabled]="!(isEnabled)"
-                (click)="importNow()">
-            <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
+      }
+      @if ((importRunning$ |async) !== true) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="importNow()">
+          <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
-        <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [dsBtnDisabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
+      }
+      @if ((importRunning$ |async)) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
-        <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [dsBtnDisabled]="!(isEnabled)"
-                (click)="resetAndReimport()">
-            <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
+      }
+      @if ((reImportRunning$ |async) !== true) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="resetAndReimport()">
+          <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
-        <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [dsBtnDisabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
+      }
+      @if ((reImportRunning$ |async)) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
-
-
+      }
     </div>
+  }
 </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 715ef9e726..7f392b2f02 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,74 +1,92 @@
 <div class="container-fluid">
-    <div class="d-inline-block float-end space-children-mr">
-        <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [dsBtnDisabled]="(hasChanges$ | async) !== true"
-                (click)="discard()"><i
-                class="fas fa-times"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-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"
-                [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-                (click)="onSubmit()"><i
-                class="fas fa-save"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-        </button>
-    </div>
-    <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
-    <div *ngIf="contentSource" class="form-check mb-4">
-        <input type="checkbox" class="form-check-input" id="externalSourceCheck"
-               [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
-        <label class="form-check-label"
-               for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
-    </div>
-    <ds-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-loading>
-    <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
+  <div class="d-inline-block float-end space-children-mr">
+    @if ((isReinstatable$ | async) !== true) {
+      <button class=" btn btn-danger"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true"
+        (click)="discard()"><i
+      class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+    </button>
+  }
+  @if (isReinstatable$ | async) {
+    <button class="btn btn-warning"
+      (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"
+  [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+  (click)="onSubmit()"><i
+class="fas fa-save"></i>
+<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+</button>
+</div>
+<h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
+@if (contentSource) {
+  <div class="form-check mb-4">
+    <input type="checkbox" class="form-check-input" id="externalSourceCheck"
+      [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
+    <label class="form-check-label"
+    for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
+  </div>
+}
+@if (!contentSource) {
+  <ds-loading [message]="'loading.content-source' | translate"></ds-loading>
+}
+@if (contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+  <h3>{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
+}
 </div>
 <div class="row">
-    <ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"
-             [formId]="'collection-source-form-id'"
-             [formGroup]="formGroup"
-             [formModel]="formModel"
-             [formLayout]="formLayout"
-             [displaySubmit]="false"
-             [displayCancel]="false"
-             (dfChange)="onChange($event)"
-             (submitForm)="onSubmit()"
-             (cancel)="onCancel()"></ds-form>
+  @if (formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+    <ds-form
+      [formId]="'collection-source-form-id'"
+      [formGroup]="formGroup"
+      [formModel]="formModel"
+      [formLayout]="formLayout"
+      [displaySubmit]="false"
+      [displayCancel]="false"
+      (dfChange)="onChange($event)"
+      (submitForm)="onSubmit()"
+    (cancel)="onCancel()"></ds-form>
+  }
 </div>
-<div class="container mt-2" *ngIf="(contentSource?.harvestType !== harvestTypeNone)">
+@if ((contentSource?.harvestType !== harvestTypeNone)) {
+  <div class="container mt-2">
     <div class="row">
-        <div class="col-12">
-            <div class="d-inline-block float-end ms-1 space-children-mr">
-                <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [dsBtnDisabled]="(hasChanges$ | async) !== true"
-                        (click)="discard()"><i
-                        class="fas fa-times"></i>
-                    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-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"
-                        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-                        (click)="onSubmit()"><i
-                        class="fas fa-save"></i>
-                    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-                </button>
-            </div>
-        </div>
-    </div>
+      <div class="col-12">
+        <div class="d-inline-block float-end ms-1 space-children-mr">
+          @if ((isReinstatable$ | async) !== true) {
+            <button class=" btn btn-danger"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true"
+              (click)="discard()"><i
+            class="fas fa-times"></i>
+            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+          </button>
+        }
+        @if (isReinstatable$ | async) {
+          <button class="btn btn-warning"
+            (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"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+        (click)="onSubmit()"><i
+      class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+    </button>
+  </div>
 </div>
+</div>
+</div>
+}
 <ds-collection-source-controls
-        [isEnabled]="(hasChanges$ | async) !== true"
-        [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
-        [collection]="(collectionRD$ |async)?.payload"
->
+  [isEnabled]="(hasChanges$ | async) !== true"
+  [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
+  [collection]="(collectionRD$ |async)?.payload"
+  >
 </ds-collection-source-controls>
 
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 6f3fc66705..864b5032d5 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,18 +1,24 @@
-<ds-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-loading>
+@if ((dataSource.loading$ | async) && !loadingNode) {
+  <ds-loading class="ds-themed-loading"></ds-loading>
+}
 <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl" [trackBy]="trackBy">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
-                 class="example-tree-node show-more-node">
+    class="example-tree-node show-more-node">
     <div class="btn-group">
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
       </span>
       <div class="align-middle my-auto">
-        <button *ngIf="(dataSource.loading$ | async) !== true" (click)="getNextPage(node)"
-           class="btn btn-outline-primary btn-sm" role="button">
-           <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
-        </button>
-        <ds-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-loading>
+        @if ((dataSource.loading$ | async) !== true) {
+          <button (click)="getNextPage(node)"
+            class="btn btn-outline-primary btn-sm" role="button">
+            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
+          </button>
+        }
+        @if (node===loadingNode && dataSource.loading$ | async) {
+          <ds-loading class="ds-themed-loading"></ds-loading>
+        }
       </div>
     </div>
     <div class="text-muted" cdkTreeNodePadding>
@@ -22,51 +28,61 @@
   </cdk-tree-node>
   <!-- This is the tree node template for expandable nodes (coms and subcoms with children) -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
-                 class="example-tree-node expandable-node">
+    class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
-              [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
-              (click)="toggleExpanded(node)"
-              data-test="expand-button">
-        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-              aria-hidden="true"></span>
-        <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
-      </button>
+      @if (hasChild(null, node) | async) {
+        <button type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
+          [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
+          (click)="toggleExpanded(node)"
+          data-test="expand-button">
+          <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
+          aria-hidden="true"></span>
+          <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
+        </button>
+      }
       <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
-      <span *ngIf="(hasChild(null, node) | async) !== true" aria-hidden="true" class="btn btn-default invisible">
-        <span class="fa fa-chevron-right"></span>
-      </span>
+      @if ((hasChild(null, node) | async) !== true) {
+        <span aria-hidden="true" class="btn btn-default invisible">
+          <span class="fa fa-chevron-right"></span>
+        </span>
+      }
       <div class="d-flex flex-row">
         <span class="d-flex align-middle my-auto">
           <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
           <span class="pe-2">&nbsp;</span>
-          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-top archived-items-lead my-auto ps-2 pe-2">{{node.payload.archivedItemsCount}}</span>
+          @if (node.payload.archivedItemsCount >= 0) {
+            <span class="badge rounded-pill bg-secondary align-top archived-items-lead my-auto ps-2 pe-2">{{node.payload.archivedItemsCount}}</span>
+          }
         </span>
       </div>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <span aria-hidden="true" class="btn btn-default invisible">
-            <span class="fa fa-chevron-right"></span>
-          </span>
-          <ds-truncatable-part [id]="node.id" [minLines]="3">
-            <span>{{node.payload.shortDescription}}</span>
-          </ds-truncatable-part>
-        </div>
+        @if (node.payload.shortDescription) {
+          <div class="d-flex">
+            <span aria-hidden="true" class="btn btn-default invisible">
+              <span class="fa fa-chevron-right"></span>
+            </span>
+            <ds-truncatable-part [id]="node.id" [minLines]="3">
+              <span>{{node.payload.shortDescription}}</span>
+            </ds-truncatable-part>
+          </div>
+        }
       </div>
     </ds-truncatable>
-    <div class="d-flex" *ngIf="node===loadingNode && dataSource.loading$ | async"
-         cdkTreeNodePadding>
-      <span aria-hidden="true" class="btn btn-default invisible">
-        <span class="fa fa-chevron-right"></span>
-      </span>
-      <ds-loading class="ds-themed-loading"></ds-loading>
-    </div>
+    @if (node===loadingNode && dataSource.loading$ | async) {
+      <div class="d-flex"
+        cdkTreeNodePadding>
+        <span aria-hidden="true" class="btn btn-default invisible">
+          <span class="fa fa-chevron-right"></span>
+        </span>
+        <ds-loading class="ds-themed-loading"></ds-loading>
+      </div>
+    }
   </cdk-tree-node>
   <!-- This is the tree node template for leaf nodes (collections and (sub)coms without children) -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
-                 class="example-tree-node childless-node">
+    class="example-tree-node childless-node">
     <div class="btn-group">
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
@@ -77,14 +93,16 @@
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <span aria-hidden="true" class="btn btn-default invisible">
-            <span class="fa fa-chevron-right"></span>
-          </span>
-          <ds-truncatable-part [id]="node.id" [minLines]="3">
-            <span>{{node.payload.shortDescription}}</span>
-          </ds-truncatable-part>
-        </div>
+        @if (node.payload.shortDescription) {
+          <div class="d-flex">
+            <span aria-hidden="true" class="btn btn-default invisible">
+              <span class="fa fa-chevron-right"></span>
+            </span>
+            <ds-truncatable-part [id]="node.id" [minLines]="3">
+              <span>{{node.payload.shortDescription}}</span>
+            </ds-truncatable-part>
+          </div>
+        }
       </div>
     </ds-truncatable>
   </cdk-tree-node>
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index c04575841e..13e5558d1b 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -1,43 +1,53 @@
 <div class="container" *ngVar="(communityRD$ | async) as communityRD">
-  <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="communityRD?.payload; let communityPayload">
-      <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
-      <div class="d-flex flex-row border-bottom mb-4 pb-4">
-        <header class="comcol-header me-auto">
-          <!-- Community name -->
-          <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
-          <!-- Community logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
-          </ds-comcol-page-logo>
-          <!-- Handle -->
-          <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
-          </ds-comcol-page-handle>
-          <!-- Introductory text -->
-          <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
-          </ds-comcol-page-content>
-          <!-- News -->
-          <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
-                                  [title]="'community.page.news'">
-          </ds-comcol-page-content>
-        </header>
-        <ds-dso-edit-menu></ds-dso-edit-menu>
-      </div>
-      <section class="comcol-page-browse-section">
-
-        <!-- Browse-By Links -->
-        <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
-        </ds-comcol-page-browse-by>
-
-        <router-outlet></router-outlet>
-      </section>
-      <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
-        <!-- Copyright -->
-        <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-      </footer>
+  @if (communityRD?.hasSucceeded) {
+    <div class="community-page" @fadeInOut>
+      @if (communityRD?.payload; as communityPayload) {
+        <div>
+          <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
+          <div class="d-flex flex-row border-bottom mb-4 pb-4">
+            <header class="comcol-header me-auto">
+              <!-- Community name -->
+              <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
+              <!-- Community logo -->
+              @if (logoRD$) {
+                <ds-comcol-page-logo [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
+                </ds-comcol-page-logo>
+              }
+              <!-- Handle -->
+              <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
+              </ds-comcol-page-handle>
+              <!-- Introductory text -->
+              <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
+              </ds-comcol-page-content>
+              <!-- News -->
+              <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
+                [title]="'community.page.news'">
+              </ds-comcol-page-content>
+            </header>
+            <ds-dso-edit-menu></ds-dso-edit-menu>
+          </div>
+          <section class="comcol-page-browse-section">
+            <!-- Browse-By Links -->
+            <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
+            </ds-comcol-page-browse-by>
+            <router-outlet></router-outlet>
+          </section>
+          @if (communityPayload.copyrightText) {
+            <footer class="border-top my-5 pt-4">
+              <!-- Copyright -->
+              <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
+              </ds-comcol-page-content>
+            </footer>
+          }
+        </div>
+      }
     </div>
-  </div>
+  }
 
-  <ds-error *ngIf="communityRD?.hasFailed" message="{{'error.community' | translate}}"></ds-error>
-  <ds-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-loading>
+  @if (communityRD?.hasFailed) {
+    <ds-error message="{{'error.community' | translate}}"></ds-error>
+  }
+  @if (communityRD?.isLoading) {
+    <ds-loading message="{{'loading.community' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 07b0bdfa9d..3403cc45db 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -1,22 +1,26 @@
 <div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="mb-3 row">
-                    <div class="col text-end space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
-                            <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
-                        </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
-                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
-                            <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </ng-container>
-    </div>
+  <div class="row">
+    <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
+      <div class="col-12 pb-4">
+        <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
+        <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
+        <div class="mb-3 row">
+          <div class="col text-end space-children-mr">
+            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+              <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
+            </button>
+            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+              @if (processing$ | async) {
+                <span><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
+              }
+              @if ((processing$ | async) !== true) {
+                <span><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
+              }
+            </button>
+          </div>
+        </div>
+      </div>
+    </ng-container>
+  </div>
 
 </div>
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
index 7a048cf923..86e5b113fd 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
@@ -1,8 +1,9 @@
 <div class="custom-alignment">
-  <ds-comcol-role
-    *ngFor="let comcolRole of comcolRoles$ | async"
-    [dso]="community$ | async"
-    [comcolRole]="comcolRole"
-  >
-  </ds-comcol-role>
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    <ds-comcol-role
+      [dso]="community$ | async"
+      [comcolRole]="comcolRole"
+      >
+    </ds-comcol-role>
+  }
 </div>
diff --git a/src/app/curation-form/curation-form.component.html b/src/app/curation-form/curation-form.component.html
index 93c89499f3..b312a75dd7 100644
--- a/src/app/curation-form/curation-form.component.html
+++ b/src/app/curation-form/curation-form.component.html
@@ -1,20 +1,24 @@
 <form [formGroup]="form" (ngSubmit)="submit()">
-    <div class="mb-3">
-        <div class="row mb-2">
-            <div class="col-12 col-sm-6">
-                <label class="fw-bold form-label" for="task">{{'curation.form.task-select.label' |translate }}</label>
-                <select id="task" formControlName="task" class="form-select">
-                    <option *ngFor="let task of tasks" [value]="task">
-                        {{ 'curation-task.task.' + task + '.label' | translate }}
-                    </option>
-                </select>
-            </div>
-            <div *ngIf="!hasHandleValue()" class="col-12 col-sm-6">
-                <label class="fw-bold form-label" for="handle">{{'curation.form.handle.label' |translate }}</label>
-                <input id="handle" class="form-control" formControlName="handle">
-                <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
-            </div>
+  <div class="mb-3">
+    <div class="row mb-2">
+      <div class="col-12 col-sm-6">
+        <label class="fw-bold form-label" for="task">{{'curation.form.task-select.label' |translate }}</label>
+        <select id="task" formControlName="task" class="form-select">
+          @for (task of tasks; track task) {
+            <option [value]="task">
+              {{ 'curation-task.task.' + task + '.label' | translate }}
+            </option>
+          }
+        </select>
+      </div>
+      @if (!hasHandleValue()) {
+        <div class="col-12 col-sm-6">
+          <label class="fw-bold form-label" for="handle">{{'curation.form.handle.label' |translate }}</label>
+          <input id="handle" class="form-control" formControlName="handle">
+          <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
         </div>
-        <button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
+      }
     </div>
+    <button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
+  </div>
 </form>
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 3bddba534d..fb765583b5 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,107 +1,135 @@
 <div class="d-flex flex-row ds-value-row" *ngVar="metadataService.isVirtual(mdValue.newValue) 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 }">
+  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 flex-column" *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 && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))" [(ngModel)]="mdValue.newValue.value"
-              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
-              [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing"
-                                    [bindId]="mdField"
-                                    [group]="group"
-                                    [model]="getModel()"
-                                    (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-scrollable-dropdown>
-    <ds-dynamic-onebox *ngIf="mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))"
-                      [group]="group"
-                      [model]="getModel()"
-                      (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-onebox>
-    <button class="btn btn-secondary mt-2" *ngIf="mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))"
+    @if (!mdValue.editing && !mdRepresentation) {
+      <div class="dont-break-out preserve-line-breaks">{{ mdValue.newValue.value }}</div>
+    }
+    @if (mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))) {
+      <textarea class="form-control" rows="5" [(ngModel)]="mdValue.newValue.value"
+        [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
+      [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    }
+    @if (mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing) {
+      <ds-dynamic-scrollable-dropdown
+        [bindId]="mdField"
+        [group]="group"
+        [model]="getModel()"
+        (change)="onChangeAuthorityField($event)">
+      </ds-dynamic-scrollable-dropdown>
+    }
+    @if (mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))) {
+      <ds-dynamic-onebox
+        [group]="group"
+        [model]="getModel()"
+        (change)="onChangeAuthorityField($event)">
+      </ds-dynamic-onebox>
+    }
+    @if (mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))) {
+      <button class="btn btn-secondary mt-2"
         [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
         (click)="toggleFreeTextEdition()">
-    <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
-    {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
-    </button>
-    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
-      <span class="badge bg-light border" >
-        <i dsAuthorityConfidenceState
-           class="fas fa-fw p-0"
-           aria-hidden="true"
-           [authorityValue]="mdValue.newValue"
-           [iconMode]="true"
-        ></i>
-        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
-      </span>
-    </div>
-    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
-      <div class="btn-group w-75">
-        <i dsAuthorityConfidenceState
-          class="fas fa-fw p-0 me-1 mt-auto mb-auto"
-          aria-hidden="true"
-          [authorityValue]="mdValue.newValue.confidence"
-          [iconMode]="true"
-      ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
-              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
-              (change)="onChangeAuthorityKey()" />
-        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(true)">
-          <i class="fas fa-lock fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(false)">
-          <i class="fas fa-lock-open fa-fw"></i>
-        </button>
+        <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
+        {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
+      </button>
+    }
+    @if (!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE) {
+      <div>
+        <span class="badge bg-light border" >
+          <i dsAuthorityConfidenceState
+            class="fas fa-fw p-0"
+            aria-hidden="true"
+            [authorityValue]="mdValue.newValue"
+            [iconMode]="true"
+          ></i>
+          {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+        </span>
       </div>
-    </div>
-    <div class="d-flex" *ngIf="mdRepresentation">
-      <a class="me-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
-      <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
-    </div>
+    }
+    @if ( mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)) {
+      <div class="mt-2">
+        <div class="btn-group w-75">
+          <i dsAuthorityConfidenceState
+            class="fas fa-fw p-0 me-1 mt-auto mb-auto"
+            aria-hidden="true"
+            [authorityValue]="mdValue.newValue.confidence"
+            [iconMode]="true"
+          ></i>
+          <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+            [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
+            (change)="onChangeAuthorityKey()" />
+          @if (!editingAuthority) {
+            <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
+              (click)="onChangeEditingAuthorityStatus(true)">
+              <i class="fas fa-lock fa-fw"></i>
+            </button>
+          }
+          @if (editingAuthority) {
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
+              (click)="onChangeEditingAuthorityStatus(false)">
+              <i class="fas fa-lock-open fa-fw"></i>
+            </button>
+          }
+        </div>
+      </div>
+    }
+    @if (mdRepresentation) {
+      <div class="d-flex">
+        <a class="me-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" 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"
-           [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
-           [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
+    @if (!mdValue.editing) {
+      <div class="dont-break-out preserve-line-breaks">{{ mdValue.newValue.language }}</div>
+    }
+    @if (mdValue.editing) {
+      <input class="form-control" type="text" [(ngModel)]="mdValue.newValue.language"
+        [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
+        [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
+    }
   </div>
   <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" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [dsBtnDisabled]="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" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
-            <i class="fas fa-check fa-fw"></i>
-          </button>
+          @if (!mdValue.editing) {
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
+              [dsBtnDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+              <i class="fas fa-edit fa-fw"></i>
+            </button>
+          }
+          @if (mdValue.editing) {
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
+              [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+              <i class="fas fa-check fa-fw"></i>
+            </button>
+          }
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [dsBtnDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+            [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
+            ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+            [dsBtnDisabled]="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" data-test="metadata-undo-btn"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+            [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
+            ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+            [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="disabled"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
+            cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="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.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index 53ebd02491..e8dfce3a7b 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,102 +1,120 @@
-<div class="item-metadata" *ngIf="form">
-  <div class="button-row top d-flex my-2 space-children-mr ms-gap">
-    <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
-            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
-            [title]="dsoType + '.edit.metadata.add-button' | translate"
-            (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
-    </button>
-    <button class="btn btn-warning ms-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
+@if (form) {
+  <div class="item-metadata">
+    <div class="button-row top d-flex my-2 space-children-mr ms-gap">
+      <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
+        [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
+        [title]="dsoType + '.edit.metadata.add-button' | translate"
+        (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
+      </button>
+      @if (isReinstatable) {
+        <button class="btn btn-warning ms-1" id="dso-reinstate-btn" [dsBtnDisabled]="(saving$ | async)"
+          [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
+          [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
+          (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
+        </button>
+      }
+      <button class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+        [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
+        [title]="dsoType + '.edit.metadata.save-button' | translate"
+        (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
+      </button>
+      @if (!isReinstatable) {
+        <button class="btn btn-danger ms-1" id="dso-discard-btn"
+          [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
+          [title]="dsoType + '.edit.metadata.discard-button' | translate"
+          [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+          (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
+        </button>
+      }
+    </div>
+    <div role="table" [attr.aria-label]="'item.edit.head' | translate">
+      <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
+      @if (form.newValue) {
+        <div class="d-flex flex-row ds-field-row" role="row">
+          <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"
+                [mdField]="newMdField"
+                (confirm)="confirmNewValue($event)"
+                (remove)="form.newValue = undefined"
+                (undo)="form.newValue = undefined">
+              </ds-dso-edit-metadata-value>
+            </div>
+          </div>
+        </div>
+      }
+      @for (mdField of form.fieldKeys; track mdField) {
+        <div class="d-flex flex-row ds-field-row" role="row">
+          <div class="lbl-cell" role="rowheader">
+            <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
+            @if (form.hasOrderChanges(mdField)) {
+              <div class="btn btn-warning reset-order-button mt-2 w-100"
+                (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>
+    @if (isEmpty && !form.newValue) {
+      <div>
+        <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
+      </div>
+    }
+    <div class="button-row bottom d-inline-block w-100">
+      <div class="mt-2 float-end space-children-mr ms-gap">
+        @if (isReinstatable) {
+          <button class="btn btn-warning" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-            (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
-    </button>
-    <button class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
-            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
-            [title]="dsoType + '.edit.metadata.save-button' | translate"
-            (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
-    </button>
-    <button class="btn btn-danger ms-1" id="dso-discard-btn" *ngIf="!isReinstatable"
+            (click)="reinstate()">
+            <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
+          </button>
+        }
+        <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+          [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
+          [title]="dsoType + '.edit.metadata.save-button' | translate"
+          (click)="submit()">
+          <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
+        </button>
+        @if (!isReinstatable) {
+          <button class="btn btn-danger"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
             [dsBtnDisabled]="!hasChanges || (saving$ | async)"
-            (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
-    </button>
-  </div>
-
-  <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"
-                                      [mdField]="newMdField"
-                                      (confirm)="confirmNewValue($event)"
-                                      (remove)="form.newValue = undefined"
-                                      (undo)="form.newValue = undefined">
-          </ds-dso-edit-metadata-value>
-        </div>
+            (click)="discard()">
+            <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+          </button>
+        }
       </div>
     </div>
-    <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">
-    <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-  </div>
-  <div class="button-row bottom d-inline-block w-100">
-    <div class="mt-2 float-end space-children-mr ms-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable" [dsBtnDisabled]="(saving$ | async)"
-              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              (click)="reinstate()">
-        <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
-      </button>
-      <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
-              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
-              [title]="dsoType + '.edit.metadata.save-button' | translate"
-              (click)="submit()">
-        <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
-      </button>
-      <button class="btn btn-danger" *ngIf="!isReinstatable"
-              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
-              [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [dsBtnDisabled]="!hasChanges || (saving$ | async)"
-              (click)="discard()">
-        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
-      </button>
-    </div>
-  </div>
-</div>
-<ds-loading *ngIf="!form"></ds-loading>
+}
+@if (!form) {
+  <ds-loading></ds-loading>
+}
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index 6b9a775391..90ec0261e2 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,22 +1,32 @@
 <div class="d-flex">
-<!--    <div class="person-thumbnail pe-2">-->
-<!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
+  <!--    <div class="person-thumbnail pe-2">-->
+  <!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
 <!--    </div>-->
-    <div class="flex-grow-1">
-        <ds-org-unit-input-suggestions *ngIf="useNameVariants" [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
-                                       (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+<div class="flex-grow-1">
+  @if (useNameVariants) {
+    <ds-org-unit-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
+    (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+  }
 
-      <div *ngIf="!useNameVariants" class="lead" [innerHTML]="dsoTitle"></div>
+  @if (!useNameVariants) {
+    <div class="lead" [innerHTML]="dsoTitle"></div>
+  }
 
-        <span class="text-muted">
-        <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
-              class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
-        </span>
-        <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
-              class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
-        </span>
-        </span>
-    </div>
+  <span class="text-muted">
+    @if (dso.allMetadata('organization.address.addressLocality').length > 0) {
+      <span
+        class="item-list-address-locality">
+        <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span>@if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+        <span>, </span>
+      }
+    </span>
+  }
+  @if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+    <span
+      class="item-list-address-country">
+      <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
+    </span>
+  }
+</span>
+</div>
 </div>
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 5bac874479..bd18fc2a37 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,55 +1,51 @@
 <footer>
-  <div *ngIf="showTopFooter" class="top-footer">
-    <!-- Grid container -->
-    <div class=" container p-4">
-      <!--Grid row-->
-      <div class="row">
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <ul class="list-unstyled mb-0">
-            <li>
-              <a routerLink="./" class="">Lorem ipsum</a>
-            </li>
-            <li>
-              <a routerLink="./" class="">Ut facilisis</a>
-            </li>
-            <li>
-              <a routerLink="./" class="">Aenean sit</a>
-            </li>
-          </ul>
+  @if (showTopFooter) {
+    <div class="top-footer">
+      <!-- Grid container -->
+      <div class=" container p-4">
+        <!--Grid row-->
+        <div class="row">
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a routerLink="./" class="">Lorem ipsum</a>
+              </li>
+              <li>
+                <a routerLink="./" class="">Ut facilisis</a>
+              </li>
+              <li>
+                <a routerLink="./" class="">Aenean sit</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a routerLink="./" class="">Suspendisse potenti</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <p>
+              Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
+              molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
+              voluptatem veniam, est atque cumque eum delectus sint!
+            </p>
+          </div>
+          <!--Grid column-->
         </div>
-        <!--Grid column-->
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <ul class="list-unstyled mb-0">
-            <li>
-              <a routerLink="./" class="">Suspendisse potenti</a>
-            </li>
-          </ul>
-        </div>
-        <!--Grid column-->
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <p>
-            Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
-            molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
-            voluptatem veniam, est atque cumque eum delectus sint!
-          </p>
-        </div>
-        <!--Grid column-->
+        <!--Grid row-->
       </div>
-      <!--Grid row-->
     </div>
-  </div>
+  }
   <!-- Grid container -->
 
   <!-- Copyright -->
@@ -57,10 +53,10 @@
     <div class="content-container">
       <p class="m-0">
         <a class="text-white"
-           href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
+        href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
         {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
         <a class="text-white"
-           href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
+        href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
       <ul class="footer-info list-unstyled d-flex justify-content-center mb-0">
         <li>
@@ -68,26 +64,34 @@
             {{ 'footer.link.cookies' | translate}}
           </button>
         </li>
-        <li *ngIf="showPrivacyPolicy">
-          <a class="btn text-white"
-             routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
-        </li>
-        <li *ngIf="showEndUserAgreement">
-          <a class="btn text-white"
-             routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
-        </li>
-        <li *ngIf="showSendFeedback$ | async">
-          <a class="btn text-white"
-             routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
-        </li>
+        @if (showPrivacyPolicy) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
+          </li>
+        }
+        @if (showEndUserAgreement) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
+          </li>
+        }
+        @if (showSendFeedback$ | async) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
+          </li>
+        }
       </ul>
     </div>
-    <div *ngIf="coarLdnEnabled$ | async" class="notify-enabled text-white">
-      <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
-        <img class="n-coar" src="assets/images/n-coar.svg" [attr.alt]="'menu.header.image.logo' | translate" />
-        {{ 'footer.link.coar-notify-support' | translate }}
-      </a>
-    </div>
+    @if (coarLdnEnabled$ | async) {
+      <div class="notify-enabled text-white">
+        <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
+          <img class="n-coar" src="assets/images/n-coar.svg" [attr.alt]="'menu.header.image.logo' | translate" />
+          {{ 'footer.link.coar-notify-support' | translate }}
+        </a>
+      </div>
+    }
   </div>
   <!-- Copyright -->
 </footer>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index f8cad64fd5..59ce7311f8 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,36 +1,35 @@
-<div class="container" *ngIf="(registration$ |async)">
+@if ((registration$ |async)) {
+  <div class="container">
     <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="card mb-4">
-        <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
-        <div class="card-body">
-            <div class="row">
-                <div class="col-12">
-                    <span class="fw-bold form-label">{{'forgot-password.form.identification.email' | translate}} </span>
-                    <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
-                </div>
-            </div>
+      <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
+      <div class="card-body">
+        <div class="row">
+          <div class="col-12">
+            <span class="fw-bold form-label">{{'forgot-password.form.identification.email' | translate}} </span>
+            <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
+          </div>
         </div>
+      </div>
     </div>
-
     <div class="card mb-4">
-        <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
-        <div class="card-body">
-
-            <ds-profile-page-security-form
-                    [passwordCanBeEmpty]="false"
-                    [FORM_PREFIX]="'forgot-password.form.'"
-                    (isInvalid)="setInValid($event)"
-                    (passwordValue)="setPasswordValue($event)"
-            ></ds-profile-page-security-form>
-        </div>
+      <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
+      <div class="card-body">
+        <ds-profile-page-security-form
+          [passwordCanBeEmpty]="false"
+          [FORM_PREFIX]="'forgot-password.form.'"
+          (isInvalid)="setInValid($event)"
+          (passwordValue)="setPasswordValue($event)"
+        ></ds-profile-page-security-form>
+      </div>
     </div>
-
     <div class="row">
-        <div class="col-12">
-            <button
-                    [dsBtnDisabled]="isInValid"
-                    class="btn btn-default btn-primary"
-                    (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
-        </div>
+      <div class="col-12">
+        <button
+          [dsBtnDisabled]="isInValid"
+          class="btn btn-default btn-primary"
+        (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
+      </div>
     </div>
-</div>
+  </div>
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 80873e7ede..67a4a96c23 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -11,13 +11,15 @@
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-auth-nav-menu></ds-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div *ngIf="isMobile$ | async" class="ps-2">
-          <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
-                  aria-controls="collapsingNav"
-                  aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-            <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
-          </button>
-        </div>
+        @if (isMobile$ | async) {
+          <div class="ps-2">
+            <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
+              aria-controls="collapsingNav"
+              aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
+              <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
+            </button>
+          </div>
+        }
       </nav>
     </div>
   </div>
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index 073f194f7b..f15d8f17b1 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,27 +1,35 @@
-<div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
-  <div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
-    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
-      <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
-        {{ entry.key | titlecase }}
-      </button>
-      <div class="d-flex my-auto">
-        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-      </div>
-    </div>
-    <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
-      <div class="card border-0">
-        <div class="card-body">
-          <ds-health-info-component [healthInfoComponent]="entry.value"
-                                    [healthInfoComponentName]="entry.key"
-                                    [isNested]="true"
-                                    data-test="info-component"></ds-health-info-component>
+@for (entry of healthInfoComponent | dsObjNgFor; track entry) {
+  <div data-test="collapse">
+    @if (entry && !isPlainProperty(entry.value)) {
+      <div class="mb-3 border-bottom">
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
+            [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
+            {{ entry.key | titlecase }}
+          </button>
+          <div class="d-flex my-auto">
+            @if (collapse.collapsed) {
+              <span class="fas fa-chevron-down"></span>
+            }
+            @if (!collapse.collapsed) {
+              <span class="fas fa-chevron-up"></span>
+            }
+          </div>
+        </div>
+        <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
+          <div class="card border-0">
+            <div class="card-body">
+              <ds-health-info-component [healthInfoComponent]="entry.value"
+                [healthInfoComponentName]="entry.key"
+                [isNested]="true"
+              data-test="info-component"></ds-health-info-component>
+            </div>
+          </div>
         </div>
       </div>
-    </div>
+    }
+    @if (entry && isPlainProperty(entry.value)) {
+      <p data-test="property"> <span class="fw-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
+    }
   </div>
-  <ng-container *ngIf="entry && isPlainProperty(entry.value)">
-    <p data-test="property"> <span class="fw-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
-  </ng-container>
-</div>
+}
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index e8d1bfb56c..432570cef0 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -1,22 +1,24 @@
-<ng-container *ngIf="healthInfoResponse">
+@if (healthInfoResponse) {
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
-    <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
-      <ng-template ngbPanelTitle>
-        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="info-component">
-          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
-                  [attr.aria-controls]="'health-info-' + entry.key + '-content'">
-            {{ getPanelLabel(entry.key) | titlecase }}
-          </button>
-          <div class="text-end d-flex gap-2">
-            <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
+    @for (entry of healthInfoResponse | dsObjNgFor; track entry) {
+      <ngb-panel [id]="entry.key">
+        <ng-template ngbPanelTitle>
+          <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="info-component">
+            <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+              [attr.aria-controls]="'health-info-' + entry.key + '-content'">
+              {{ getPanelLabel(entry.key) | titlecase }}
+            </button>
+            <div class="text-end d-flex gap-2">
+              <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
+            </div>
           </div>
-        </div>
-      </ng-template>
-      <ng-template ngbPanelContent>
-        <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
-                                  [id]="'health-info-' + entry.key + '-content'">
-        </ds-health-info-component>
-      </ng-template>
-    </ngb-panel>
+        </ng-template>
+        <ng-template ngbPanelContent>
+          <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
+            [id]="'health-info-' + entry.key + '-content'">
+          </ds-health-info-component>
+        </ng-template>
+      </ngb-panel>
+    }
   </ngb-accordion>
-</ng-container>
+}
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index 55e11ed6ad..37dedd7b98 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,30 +1,38 @@
-<ng-container *ngIf="healthComponent?.components">
-  <div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
-      <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              [attr.aria-controls]="'health-component-' + entry.key + 'content'">
-        {{ entry.key | titlecase }}
-      </button>
-      <div class="d-flex my-auto">
-        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
+@if (healthComponent?.components) {
+  @for (entry of healthComponent?.components | dsObjNgFor; track entry) {
+    <div class="mb-3 border-bottom" data-test="collapse">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
+          [attr.aria-controls]="'health-component-' + entry.key + 'content'">
+          {{ entry.key | titlecase }}
+        </button>
+        <div class="d-flex my-auto">
+          @if (collapse.collapsed) {
+            <span class="fas fa-chevron-down"></span>
+          }
+          @if (!collapse.collapsed) {
+            <span class="fas fa-chevron-up"></span>
+          }
+        </div>
       </div>
-    </div>
-    <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
-      <div class="card border-0">
-        <div class="card-body">
-          <ds-health-component [healthComponent]="entry.value"
-                               [healthComponentName]="entry.key"></ds-health-component>
+      <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
+        <div class="card border-0">
+          <div class="card-body">
+            <ds-health-component [healthComponent]="entry.value"
+            [healthComponentName]="entry.key"></ds-health-component>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-</ng-container>
-<ng-container *ngIf="healthComponent?.details">
-  <div *ngFor="let item of healthComponent?.details | dsObjNgFor" data-test="details">
-    <p data-test="property"><span class="fw-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
-  </div>
-</ng-container>
-<ng-container *ngIf="!healthComponent?.details && !healthComponent?.components">
+  }
+}
+@if (healthComponent?.details) {
+  @for (item of healthComponent?.details | dsObjNgFor; track item) {
+    <div data-test="details">
+      <p data-test="property"><span class="fw-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
+    </div>
+  }
+}
+@if (!healthComponent?.details && !healthComponent?.components) {
   <ds-alert [content]="'health-page.section.no-issues'" [type]="AlertTypeEnum.Info"></ds-alert>
-</ng-container>
+}
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index 169cb05575..50caff35dd 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -3,22 +3,24 @@
   <ds-health-status [status]="healthResponse.status" class="d-inline-flex"></ds-health-status>
 </p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
-  <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
-    <ng-template ngbPanelTitle>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="component">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
-                [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
-          {{ getPanelLabel(entry.key) | titlecase }}
-        </button>
-        <div class="text-end d-flex gap-2">
-          <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
+  @for (entry of healthResponse.components | dsObjNgFor; track entry) {
+    <ngb-panel [id]="entry.key">
+      <ng-template ngbPanelTitle>
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="component">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+            [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
+            {{ getPanelLabel(entry.key) | titlecase }}
+          </button>
+          <div class="text-end d-flex gap-2">
+            <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
+          </div>
         </div>
-      </div>
-    </ng-template>
-    <ng-template ngbPanelContent>
-      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
-                           [id]="'health-panel-' + entry.key + '-content'" role="presentation">
-      </ds-health-component>
-    </ng-template>
-  </ngb-panel>
+      </ng-template>
+      <ng-template ngbPanelContent>
+        <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
+          [id]="'health-panel-' + entry.key + '-content'" role="presentation">
+        </ds-health-component>
+      </ng-template>
+    </ngb-panel>
+  }
 </ngb-accordion>
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index ee1dabc2de..6e6a8ea190 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,18 @@
-<ng-container [ngSwitch]="status">
-  <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success ms-2 mt-1"
-     ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
-  <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning ms-2 mt-1"
-     ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
-  <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger ms-2 mt-1"
-     ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
-</ng-container>
+@switch (status) {
+  @case (HealthStatus.UP) {
+    <i
+      class="fa fa-check-circle text-success ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
+  }
+  @case (HealthStatus.UP_WITH_ISSUES) {
+    <i
+      class="fa fa-exclamation-triangle text-warning ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
+  }
+  @case (HealthStatus.DOWN) {
+    <i
+      class="fa fa-times-circle text-danger ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
+  }
+}
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index 7bf89b232f..4d77e5027e 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -1,14 +1,22 @@
 <ng-container *ngVar="(itemRD$ | async) as itemRD">
-        <div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
-                <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
-                <h2> {{'home.recent-submissions.head' | translate}}</h2>
-                <div class="my-4" *ngFor="let item of itemRD?.payload?.page">
-                        <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
-                        </ds-listable-object-component-loader>
-                </div>
-                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+  @if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
+    <div class="mt-4" [ngClass]="placeholderFontClass" @fadeIn>
+      <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
+      <h2> {{'home.recent-submissions.head' | translate}}</h2>
+      @for (item of itemRD?.payload?.page; track item) {
+        <div class="my-4">
+          <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
+          </ds-listable-object-component-loader>
         </div>
-        <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
-        <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
-        </ds-loading>
+      }
+      <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+    </div>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.recent-submissions' | translate}}"></ds-error>
+  }
+  @if (!itemRD || itemRD.isLoading) {
+    <ds-loading message="{{'loading.recent-submissions' | translate}}">
+    </ds-loading>
+  }
 </ng-container>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index dde13db9a6..4e40883602 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,87 +1,101 @@
 <div class="container">
-    <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
-    <div *ngIf="canDownload$|async" class="alert alert-success">
-        <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
-        <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
+  <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
+  @if (canDownload$|async) {
+    <div class="alert alert-success">
+      <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
+      <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
     </div>
-    <div>
-        <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
-        <p *ngIf="bitstream !== undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
-        <p *ngIf="allfiles.value === 'true'">{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
-    </div>
-    <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
+  }
+  <div>
+    <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
+    @if (bitstream !== undefined && allfiles.value === 'false') {
+      <p>{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
+    }
+    @if (allfiles.value === 'true') {
+      <p>{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
+    }
+  </div>
+  <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
 
-        <div class="mb-3">
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label for="name" class="form-label">{{'bitstream-request-a-copy.name.label' | translate}}</label>
-                    <input [className]="(name.invalid) && (name.dirty || name.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="name" formControlName="name"/>
-                    <div *ngIf="name.invalid && (name.dirty || name.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="name.errors && name.errors.required">
-                        {{ 'bitstream-request-a-copy.name.error' | translate }}
-                    </span>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label
-                            for="email" class="form-label">{{'bitstream-request-a-copy.email.label' | translate}}</label>
-                    <input
-                            [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                            id="email" formControlName="email">
-                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors">
-                        {{ 'bitstream-request-a-copy.email.error' | translate }}
-                    </span>
-                    </div>
-                    <small class="text-muted ds-hint">{{'bitstream-request-a-copy.email.hint' |translate}}</small>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
-                    <div class="ms-4 form-check">
-                        <input [className]="'form-check-input'" type="radio"
-                               id="allfiles-true" formControlName="allfiles" value="true">
-                        <label class="form-check-label"
-                               for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
-                    </div>
-                    <div class="ms-4">
-                        <input [className]="'form-check-input'" type="radio"
-                               id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
-                        <label class="form-check-label"
-                               for="allfiles-false">{{'bitstream-request-a-copy.files-all-false.label' | translate}}</label>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label
-                            for="message" class="form-label">{{'bitstream-request-a-copy.message.label' | translate}}</label>
-                    <textarea rows="5"
-                              [className]="'form-control'"
-                              id="message" formControlName="message"></textarea>
-                </div>
+    <div class="mb-3">
+      <div class="row mb-4">
+        <div class="col-12">
+          <label for="name" class="form-label">{{'bitstream-request-a-copy.name.label' | translate}}</label>
+          <input [className]="(name.invalid) && (name.dirty || name.touched) ? 'form-control is-invalid' :'form-control'"
+            type="text" id="name" formControlName="name"/>
+          @if (name.invalid && (name.dirty || name.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (name.errors && name.errors.required) {
+                <span>
+                  {{ 'bitstream-request-a-copy.name.error' | translate }}
+                </span>
+              }
             </div>
+          }
         </div>
-    </form>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <label
+          for="email" class="form-label">{{'bitstream-request-a-copy.email.label' | translate}}</label>
+          <input
+            [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+            id="email" formControlName="email">
+          @if (email.invalid && (email.dirty || email.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (email.errors) {
+                <span>
+                  {{ 'bitstream-request-a-copy.email.error' | translate }}
+                </span>
+              }
+            </div>
+          }
+          <small class="text-muted ds-hint">{{'bitstream-request-a-copy.email.hint' |translate}}</small>
+        </div>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
+          <div class="ms-4 form-check">
+            <input [className]="'form-check-input'" type="radio"
+              id="allfiles-true" formControlName="allfiles" value="true">
+            <label class="form-check-label"
+            for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
+          </div>
+          <div class="ms-4">
+            <input [className]="'form-check-input'" type="radio"
+              id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
+            <label class="form-check-label"
+            for="allfiles-false">{{'bitstream-request-a-copy.files-all-false.label' | translate}}</label>
+          </div>
+        </div>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <label
+          for="message" class="form-label">{{'bitstream-request-a-copy.message.label' | translate}}</label>
+          <textarea rows="5"
+            [className]="'form-control'"
+          id="message" formControlName="message"></textarea>
+        </div>
+      </div>
+    </div>
+  </form>
 
-    <hr>
+  <hr>
     <div class="row">
-        <div class="col-12 text-end">
+      <div class="col-12 text-end">
 
-            <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary me-1">
-                <i class="fas fa-arrow-left"></i> {{'bitstream-request-a-copy.return' | translate}}
-            </a>
+        <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary me-1">
+          <i class="fas fa-arrow-left"></i> {{'bitstream-request-a-copy.return' | translate}}
+        </a>
 
-            <button
-                    [dsBtnDisabled]="requestCopyForm.invalid"
-                    class="btn btn-default btn-primary"
-                    (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
-        </div>
+        <button
+          [dsBtnDisabled]="requestCopyForm.invalid"
+          class="btn btn-default btn-primary"
+        (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
+      </div>
     </div>
-</div>
+  </div>
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index c055fdde68..a0f25a9d3c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -1,41 +1,47 @@
 <div class="container">
-  <ng-container *ngIf="bundles">
+  @if (bundles) {
     <div class="row">
       <div class="col-12 mb-2">
         <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
-          <div *ngIf="item">
-            <span class="fw-bold">{{'item.bitstreams.upload.item' | translate}}</span>
-            <span>{{ dsoNameService.getName(item) }}</span>
-          </div>
+          @if (item) {
+            <div>
+              <span class="fw-bold">{{'item.bitstreams.upload.item' | translate}}</span>
+              <span>{{ dsoNameService.getName(item) }}</span>
+            </div>
+          }
         </ng-container>
       </div>
       <div class="col-12">
         <label class="fw-bold form-label">{{'item.bitstreams.upload.bundle' | translate}}</label>
         <ds-dso-input-suggestions #f id="search-form"
-                                  [suggestions]="bundles"
-                                  [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
-                                  [action]="getCurrentUrl()"
-                                  [name]="'bundle-select'"
-                                  [debounceTime]="50"
-                                  [(ngModel)]="selectedBundleName"
-                                  (typeSuggestion)="bundleNameChange()"
-                                  (clickSuggestion)="onClick($event)"
-                                  (click)="f.open()"
-                                  ngDefaultControl>
+          [suggestions]="bundles"
+          [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
+          [action]="getCurrentUrl()"
+          [name]="'bundle-select'"
+          [debounceTime]="50"
+          [(ngModel)]="selectedBundleName"
+          (typeSuggestion)="bundleNameChange()"
+          (clickSuggestion)="onClick($event)"
+          (click)="f.open()"
+          ngDefaultControl>
         </ds-dso-input-suggestions>
-        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success me-2" (click)="createBundle()">
-          <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
-        </button>
-        <ds-uploader  class="w-100" *ngIf="selectedBundleId"
-                      [dropMsg]="'item.bitstreams.upload.drop-message'"
-                      [dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
-                      [enableDragOverDocument]="true"
-                      [uploadFilesOptions]="uploadFilesOptions"
-                      (onCompleteItem)="onCompleteItem($event)"
-                      (onUploadError)="onUploadError()"></ds-uploader>
+        @if (!selectedBundleId && selectedBundleName?.length > 0) {
+          <button class="btn btn-success me-2" (click)="createBundle()">
+            <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
+          </button>
+        }
+        @if (selectedBundleId) {
+          <ds-uploader  class="w-100"
+            [dropMsg]="'item.bitstreams.upload.drop-message'"
+            [dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
+            [enableDragOverDocument]="true"
+            [uploadFilesOptions]="uploadFilesOptions"
+            (onCompleteItem)="onCompleteItem($event)"
+          (onUploadError)="onUploadError()"></ds-uploader>
+        }
         <button class="btn btn-outline-secondary" (click)="onCancel()">{{'item.bitstreams.upload.cancel' | translate}}</button>
       </div>
     </div>
-  </ng-container>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index ecba905297..0d3907c431 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,38 +1,46 @@
 <div class="container">
-    <div class="row">
-        <div class="col-12">
-            <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
-            <div class="pt-2">
-              <ul *ngIf="pages.length > 0" class="nav nav-tabs justify-content-start" role="tablist">
-                    <li *ngFor="let page of pages" class="nav-item" role="presentation">
-                        <a *ngIf="(page.enabled | async)"
-                           [attr.aria-selected]="page.page === currentPage"
-                           class="nav-link"
-                           [ngClass]="{'active' : page.page === currentPage}"
-                           [routerLink]="['./' + page.page]"
-                           [attr.data-test]="page.page"
-                           role="tab">
-                            {{'item.edit.tabs.' + page.page + '.head' | translate}}
-                        </a>
-                        <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
-                            <button *ngIf="(page.enabled | async) !== true"
-                                 class="nav-link disabled">
-                                {{'item.edit.tabs.' + page.page + '.head' | translate}}
-                            </button>
-                        </span>
-                    </li>
-                </ul>
-                <div class="tab-pane active">
-                    <div class="mb-4">
-                        <router-outlet></router-outlet>
-                    </div>
-                    <div class="button-row bottom">
-                      <div class="text-end">
-                        <a [routerLink]="getItemPage((itemRD$ | async)?.payload)" role="button" class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{'item.edit.return' | translate}}</a>
-                      </div>
-                    </div>
-                </div>
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
+      <div class="pt-2">
+        @if (pages.length > 0) {
+          <ul class="nav nav-tabs justify-content-start" role="tablist">
+            @for (page of pages; track page) {
+              <li class="nav-item" role="presentation">
+                @if ((page.enabled | async)) {
+                  <a
+                    [attr.aria-selected]="page.page === currentPage"
+                    class="nav-link"
+                    [ngClass]="{'active' : page.page === currentPage}"
+                    [routerLink]="['./' + page.page]"
+                    [attr.data-test]="page.page"
+                    role="tab">
+                    {{'item.edit.tabs.' + page.page + '.head' | translate}}
+                  </a>
+                }
+                <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
+                  @if ((page.enabled | async) !== true) {
+                    <button
+                      class="nav-link disabled">
+                      {{'item.edit.tabs.' + page.page + '.head' | translate}}
+                    </button>
+                  }
+                </span>
+              </li>
+            }
+          </ul>
+        }
+        <div class="tab-pane active">
+          <div class="mb-4">
+            <router-outlet></router-outlet>
+          </div>
+          <div class="button-row bottom">
+            <div class="text-end">
+              <a [routerLink]="getItemPage((itemRD$ | async)?.payload)" role="button" class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{'item.edit.return' | translate}}</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index b5d74d81f3..15d713bdaf 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -5,73 +5,93 @@
 
   <div class="button-row top d-flex mt-2 space-children-mr">
     <button class="me-auto btn btn-success"
-            [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
-            [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
-            class="fas fa-upload"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-            [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
-            (click)="reinstate()"><i
-            class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-            [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
-            (click)="submit()"><i
-            class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-    </button>
-    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-            (click)="discard()"><i
-            class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-    </button>
-  </div>
-
-  <div *ngIf="item && bundles?.length > 0" class="mt-4 table-border scrollable-table" [ngClass]="{'disabled-overlay': (isProcessingMoveRequest | async)}">
-    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles; first as isFirst"
-                                   [bundle]="bundle"
-                                   [item]="item"
-                                   [columnSizes]="columnSizes"
-                                   [isFirstTable]="isFirst"
-                                   aria-describedby="reorder-description">
-    </ds-item-edit-bitstream-bundle>
-    <div class="d-flex justify-content-center" *ngIf="showLoadMoreLink$ | async">
-      <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
-    </div>
-  </div>
-  <div *ngIf="bundles?.length === 0"
-       class="alert alert-info w-100 d-inline-block mt-4" role="alert">
-    {{'item.edit.bitstreams.empty' | translate}}
-  </div>
-  <ds-loading *ngIf="!bundles" message="{{'loading.bitstreams' | translate}}"></ds-loading>
-
-  <div class="button-row bottom">
-    <div class="mt-4 float-end space-children-mr ms-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-              [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
-      </button>
-      <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-              [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
-              (click)="submit()"><i
-        class="fas fa-save"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-      </button>
-      <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-              [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-              (click)="discard()"><i
-        class="fas fa-times"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-      </button>
-    </div>
-  </div>
+      [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
+      [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
+    class="fas fa-upload"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
+  </button>
+  @if (isReinstatable$ | async) {
+    <button class="btn btn-warning"
+      [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
+      (click)="reinstate()"><i
+    class="fas fa-undo-alt"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
+  </button>
+}
+<button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+  [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
+  (click)="submit()"><i
+class="fas fa-save"></i>
+<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+</button>
+@if ((isReinstatable$ | async) !== true) {
+  <button class="btn btn-danger"
+    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    (click)="discard()"><i
+  class="fas fa-times"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+</button>
+}
 </div>
 
-<ds-loading *ngIf="isProcessingMoveRequest | async" class="loading-overlay"></ds-loading>
+@if (item && bundles?.length > 0) {
+  <div class="mt-4 table-border scrollable-table" [ngClass]="{'disabled-overlay': (isProcessingMoveRequest | async)}">
+    @for (bundle of bundles; track bundle; let isFirst = $first) {
+      <ds-item-edit-bitstream-bundle
+        [bundle]="bundle"
+        [item]="item"
+        [columnSizes]="columnSizes"
+        [isFirstTable]="isFirst"
+        aria-describedby="reorder-description">
+      </ds-item-edit-bitstream-bundle>
+    }
+    @if (showLoadMoreLink$ | async) {
+      <div class="d-flex justify-content-center">
+        <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
+      </div>
+    }
+  </div>
+}
+@if (bundles?.length === 0) {
+  <div
+    class="alert alert-info w-100 d-inline-block mt-4" role="alert">
+    {{'item.edit.bitstreams.empty' | translate}}
+  </div>
+}
+@if (!bundles) {
+  <ds-loading message="{{'loading.bitstreams' | translate}}"></ds-loading>
+}
+
+<div class="button-row bottom">
+  <div class="mt-4 float-end space-children-mr ms-gap">
+    @if (isReinstatable$ | async) {
+      <button class="btn btn-warning"
+        [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
+        (click)="reinstate()"><i
+      class="fas fa-undo-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
+    </button>
+  }
+  <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
+    (click)="submit()"><i
+  class="fas fa-save"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+</button>
+@if ((isReinstatable$ | async) !== true) {
+  <button class="btn btn-danger"
+    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    (click)="discard()"><i
+  class="fas fa-times"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+</button>
+}
+</div>
+</div>
+</div>
+
+@if (isProcessingMoveRequest | async) {
+  <ds-loading class="loading-overlay"></ds-loading>
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 4450e62ec7..f55821f04f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -1,140 +1,137 @@
 <ng-template #bundleView>
 
-  <ds-pagination *ngIf="(bitstreamsRD$ | async)?.payload as bitstreamsList"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true"
-                 [hidePaginationDetail]="true"
-                 [paginationOptions]="paginationOptions"
-                 [collectionSize]="bitstreamsList.totalElements"
-                 [retainScrollPosition]="true"
-                 [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom"
-                 [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
-    <ng-container *ngIf="(updates$ | async) as updates">
-
-      <table class="table" [class.mt-n1]="!isFirstTable"
-             [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
-        <thead [class.visually-hidden]="!isFirstTable">
-        <tr class="header-row font-weight-bold">
-          <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
-            {{'item.edit.bitstreams.headers.name' | translate}}
-          </th>
-          <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
-            {{'item.edit.bitstreams.headers.description' | translate}}
-          </th>
-          <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
-            {{'item.edit.bitstreams.headers.format' | translate}}
-          </th>
-          <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
-            {{'item.edit.bitstreams.headers.actions' | translate}}
-          </th>
-        </tr>
-        </thead>
-
-        <tbody cdkDropList (cdkDropListDropped)="drop($event)">
-        <tr class="bundle-row">
-          <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
-            {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
-          </th>
-          <td class="text-center">
-
-            <div class="btn-group">
-              <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
-                      [queryParams]="{bundle: bundle.id}"
-                      [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
-                      class="btn btn-outline-success btn-sm"
-                      title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
-                <i class="fas fa-upload fa-fw"></i>
-              </button>
-              <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
-                   placement="bottom-right">
-                <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
-                        [title]="'pagination.options.description' | translate"
-                        [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
-                        aria-expanded="false">
-                  <i class="fas fa-cog" aria-hidden="true"></i>
-                </button>
-
-                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
-                    ngbDropdownMenu>
-                  <li role="menuitem">
-                    <span class="dropdown-header" id="pagination-control_results-per-page"
-                          role="heading">{{ 'pagination.results-per-page' | translate}}</span>
-                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
-                      <li *ngFor="let size of paginationOptions.pageSizeOptions" role="option"
-                          [attr.aria-selected]="size === (pageSize$ | async)">
-                        <button (click)="doPageSizeChange(size)" class="dropdown-item">
-                          <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
-                             aria-hidden="true"></i> {{size}}
-                        </button>
+  @if ((bitstreamsRD$ | async)?.payload; as bitstreamsList) {
+    <ds-pagination
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true"
+      [hidePaginationDetail]="true"
+      [paginationOptions]="paginationOptions"
+      [collectionSize]="bitstreamsList.totalElements"
+      [retainScrollPosition]="true"
+      [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom"
+      [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
+      @if ((updates$ | async); as updates) {
+        <table class="table" [class.mt-n1]="!isFirstTable"
+          [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
+          <thead [class.visually-hidden]="!isFirstTable">
+            <tr class="header-row font-weight-bold">
+              <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.name' | translate}}
+              </th>
+              <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.description' | translate}}
+              </th>
+              <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.format' | translate}}
+              </th>
+              <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
+                {{'item.edit.bitstreams.headers.actions' | translate}}
+              </th>
+            </tr>
+          </thead>
+          <tbody cdkDropList (cdkDropListDropped)="drop($event)">
+            <tr class="bundle-row">
+              <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+                {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
+              </th>
+              <td class="text-center">
+                <div class="btn-group">
+                  <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                    [queryParams]="{bundle: bundle.id}"
+                    [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
+                    class="btn btn-outline-success btn-sm"
+                    title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
+                    <i class="fas fa-upload fa-fw"></i>
+                  </button>
+                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
+                    placement="bottom-right">
+                    <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                      [title]="'pagination.options.description' | translate"
+                      [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
+                      aria-expanded="false">
+                      <i class="fas fa-cog" aria-hidden="true"></i>
+                    </button>
+                    <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
+                      ngbDropdownMenu>
+                      <li role="menuitem">
+                        <span class="dropdown-header" id="pagination-control_results-per-page"
+                        role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                        <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                          @for (size of paginationOptions.pageSizeOptions; track size) {
+                            <li role="option"
+                              [attr.aria-selected]="size === (pageSize$ | async)">
+                              <button (click)="doPageSizeChange(size)" class="dropdown-item">
+                                <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
+                                aria-hidden="true"></i> {{size}}
+                              </button>
+                            </li>
+                          }
+                        </ul>
                       </li>
                     </ul>
-                  </li>
-                </ul>
-              </div>
-            </div>
-
-          </td>
-        </tr>
-
-        <ng-container *ngFor="let entry of (tableEntries$ | async)">
-          <tr *ngIf="updates[entry.id] as update" [ngClass]="getRowClass(update, entry)" class="bitstream-row" cdkDrag
-              (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
-
-            <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
-                scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
-              <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
-                   (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
-                <i class="fas fa-grip-vertical fa-fw"
-                   [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
-              </div>
-              {{ entry.name }}
-            </th>
-            <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} description">
-              {{ entry.description }}
-            </td>
-            <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} format">
-              {{ (entry.format | async)?.shortDescription }}
-            </td>
-            <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
-                headers="{{ entry.nameStripped }} {{ bundleName }} actions">
-              <div class="text-center w-100">
-                <div class="btn-group relationship-action-buttons">
-                  <a [href]="entry.downloadUrl"
-                     [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
-                     class="btn btn-outline-primary btn-sm"
-                     title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-                     [attr.data-test]="'download-button' | dsBrowserOnly">
-                    <i class="fas fa-download fa-fw"></i>
-                  </a>
-                  <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                  </div>
+                </div>
+              </td>
+            </tr>
+            @for (entry of (tableEntries$ | async); track entry) {
+              @if (updates[entry.id]; as update) {
+                <tr [ngClass]="getRowClass(update, entry)" class="bitstream-row" cdkDrag
+                  (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
+                  <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
+                    scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+                    <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
+                      (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
+                      <i class="fas fa-grip-vertical fa-fw"
+                      [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
+                    </div>
+                    {{ entry.name }}
+                  </th>
+                  <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} description">
+                    {{ entry.description }}
+                  </td>
+                  <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} format">
+                    {{ (entry.format | async)?.shortDescription }}
+                  </td>
+                  <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+                    <div class="text-center w-100">
+                      <div class="btn-group relationship-action-buttons">
+                        <a [href]="entry.downloadUrl"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
+                          class="btn btn-outline-primary btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+                          [attr.data-test]="'download-button' | dsBrowserOnly">
+                          <i class="fas fa-download fa-fw"></i>
+                        </a>
+                        <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                          <i class="fas fa-edit fa-fw"></i>
+                        </button>
+                        <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
                           [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
                           class="btn btn-outline-danger btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                  <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                          <i class="fas fa-trash-alt fa-fw"></i>
+                        </button>
+                        <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                           class="btn btn-outline-warning btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
-                    <i class="fas fa-undo-alt fa-fw"></i>
-                  </button>
-                </div>
-              </div>
-            </td>
-          </tr>
-        </ng-container>
-
-        </tbody>
-      </table>
-
-    </ng-container>
-  </ds-pagination>
+                          <i class="fas fa-undo-alt fa-fw"></i>
+                        </button>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+              }
+            }
+          </tbody>
+        </table>
+      }
+    </ds-pagination>
+  }
 
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 5ed36347cb..dc236be398 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -1,99 +1,99 @@
 <div class="container">
-    <div class="row">
-        <div class="col-12">
+  <div class="row">
+    <div class="col-12">
 
-            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
-            <p>{{descriptionMessage | translate}}</p>
-            <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+      <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
+      <p>{{descriptionMessage | translate}}</p>
+      <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
-            <ng-container *ngVar="(typeDTOs$ | async) as types">
+      <ng-container>
 
-                <div *ngIf="types && types.length > 0" class="mb-4">
-
-                    {{'virtual-metadata.delete-item.info' | translate}}
-
-                    <div *ngFor="let typeDto of types" class="mb-4">
-                        <div *ngVar="(typeDto.isSelected$ | async) as selected"
-                             class="d-flex flex-row">
-
-                            <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
-                                <label>
-                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
-                                </label>
+        @if ((typeDTOs$ | async) && (typeDTOs$ | async).length > 0) {
+          <div class="mb-4">
+            {{'virtual-metadata.delete-item.info' | translate}}
+            @for (typeDto of (typeDTOs$ | async); track typeDto) {
+              <div class="mb-4">
+                <div *ngVar="(typeDto.isSelected$ | async) as selected"
+                  class="d-flex flex-row">
+                  <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
+                    <label>
+                      <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
+                    </label>
+                  </div>
+                  <div class="flex-column flex-grow-1">
+                    <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
+                      {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
+                    </h5>
+                    @for (relationshipDto of (typeDto.relationshipDTOs$ | async); track relationshipDto.relationship.id) {
+                      <div
+                        class="d-flex flex-row">
+                        <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
+                          @if (relatedItem) {
+                            <ds-listable-object-component-loader
+                              [object]="relatedItem"
+                              [viewMode]="viewMode">
+                            </ds-listable-object-component-loader>
+                          }
+                          <div class="ms-auto">
+                            <div class="btn-group">
+                              <button class="btn btn-outline-info btn-sm"
+                                (click)="openVirtualMetadataModal(virtualMetadataModal)">
+                                <i class="fas fa-info fa-fw"></i>
+                              </button>
                             </div>
-
-                            <div class="flex-column flex-grow-1">
-                                <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
-                                    {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
-                                </h5>
-                                <div *ngFor="let relationshipDto of (typeDto.relationshipDTOs$ | async)"
-                                     class="d-flex flex-row">
-                                    <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
-
-                                        <ds-listable-object-component-loader
-                                                *ngIf="relatedItem"
-                                                [object]="relatedItem"
-                                                [viewMode]="viewMode">
-                                        </ds-listable-object-component-loader>
-                                        <div class="ms-auto">
-                                            <div class="btn-group">
-                                                <button class="btn btn-outline-info btn-sm"
-                                                        (click)="openVirtualMetadataModal(virtualMetadataModal)">
-                                                    <i class="fas fa-info fa-fw"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-                                        <ng-template #virtualMetadataModal>
-                                            <div class="thumb-font-1">
-                                                <div class="modal-header">
-                                                    {{'virtual-metadata.delete-item.modal-head' | translate}}
-                                                    <button type="button" class="btn-close"
-                                                            (click)="closeVirtualMetadataModal()" aria-label="Close">
-                                                    </button>
-                                                </div>
-                                                <div class="modal-body">
-                                                    <ds-listable-object-component-loader
-                                                            *ngIf="relatedItem"
-                                                            [object]="relatedItem"
-                                                            [viewMode]="viewMode">
-                                                    </ds-listable-object-component-loader>
-                                                    <div *ngFor="let metadata of (relationshipDto.virtualMetadata$ | async)">
-                                                        <div>
-                                                            <div class="fw-bold">
-                                                                {{metadata.metadataField}}
-                                                            </div>
-                                                            <div>
-                                                                {{metadata.metadataValue.value}}
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </ng-template>
-
-                                    </ng-container>
-                                </div>
+                          </div>
+                          <ng-template #virtualMetadataModal>
+                            <div class="thumb-font-1">
+                              <div class="modal-header">
+                                {{'virtual-metadata.delete-item.modal-head' | translate}}
+                                <button type="button" class="btn-close"
+                                  (click)="closeVirtualMetadataModal()" aria-label="Close">
+                                </button>
+                              </div>
+                              <div class="modal-body">
+                                @if (relatedItem) {
+                                  <ds-listable-object-component-loader
+                                    [object]="relatedItem"
+                                    [viewMode]="viewMode">
+                                  </ds-listable-object-component-loader>
+                                }
+                                @for (metadata of (relationshipDto.virtualMetadata$ | async); track metadata) {
+                                  <div>
+                                    <div>
+                                      <div class="fw-bold">
+                                        {{metadata.metadataField}}
+                                      </div>
+                                      <div>
+                                        {{metadata.metadataValue.value}}
+                                      </div>
+                                    </div>
+                                  </div>
+                                }
+                              </div>
                             </div>
-
-                        </div>
-
-                    </div>
-
+                          </ng-template>
+                        </ng-container>
+                      </div>
+                    }
+                  </div>
                 </div>
+              </div>
+            }
+          </div>
+        }
 
-            </ng-container>
+      </ng-container>
 
-            <div class="space-children-mr">
-              <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
-                      class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
-              </button>
-              <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
-                      class="btn btn-outline-secondary cancel">
-                {{cancelMessage| translate}}
-              </button>
-            </div>
+      <div class="space-children-mr">
+        <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
+          class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+        </button>
+        <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+          class="btn btn-outline-secondary cancel">
+          {{cancelMessage| translate}}
+        </button>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index fa4bacab0e..e2cd2d88af 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,58 +1,62 @@
 <div class="container">
-    <div class="row">
+  <div class="row">
+    <div class="col-12">
+      <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
+      <p>{{'item.edit.move.description' | translate}}</p>
+      <div class="row">
         <div class="col-12">
-            <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
-            <p>{{'item.edit.move.description' | translate}}</p>
-            <div class="row">
-                <div class="col-12">
-                  <div class="card mb-3">
-                    <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}</div>
-                    <div class="card-body">
-                      <ds-authorized-collection-selector [types]="COLLECTIONS"
-                                                         [currentDSOId]="selectedCollection ? selectedCollection.id : originalCollection.id"
-                                                         (onSelect)="selectDso($event)">
-                      </ds-authorized-collection-selector>
-                    </div>
-                    <div></div>
-                  </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-12">
-                    <p>
-                      <label class="form-label" for="inheritPoliciesCheckbox">
-                        <ng-template #tooltipContent>
-                          {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
-                        </ng-template>
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
-                        >
-                        {{'item.edit.move.inheritpolicies.checkbox' |translate}}
-                      </label>
-                    </p>
-                    <p>
-                        {{'item.edit.move.inheritpolicies.description' | translate}}
-                    </p>
-                </div>
-            </div>
-
-          <div class="button-row bottom">
-            <div class="float-end space-children-mr">
-              <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
-                <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
-              </button>
-              <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
-              <span *ngIf="!processing">
-                <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
-              </span>
-              <span *ngIf="processing">
-                <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
-              </span>
-              </button>
-              <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
-                <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
-              </button>
+          <div class="card mb-3">
+            <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}</div>
+            <div class="card-body">
+              <ds-authorized-collection-selector [types]="COLLECTIONS"
+                [currentDSOId]="selectedCollection ? selectedCollection.id : originalCollection.id"
+                (onSelect)="selectDso($event)">
+              </ds-authorized-collection-selector>
             </div>
+            <div></div>
           </div>
         </div>
+      </div>
+      <div class="row">
+        <div class="col-12">
+          <p>
+            <label class="form-label" for="inheritPoliciesCheckbox">
+              <ng-template #tooltipContent>
+                {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
+              </ng-template>
+              <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
+                >
+              {{'item.edit.move.inheritpolicies.checkbox' |translate}}
+            </label>
+          </p>
+          <p>
+            {{'item.edit.move.inheritpolicies.description' | translate}}
+          </p>
+        </div>
+      </div>
+
+      <div class="button-row bottom">
+        <div class="float-end space-children-mr">
+          <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
+          </button>
+          <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
+            @if (!processing) {
+              <span>
+                <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
+              </span>
+            }
+            @if (processing) {
+              <span>
+                <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
+              </span>
+            }
+          </button>
+          <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
+            <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
+          </button>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
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 83c720bcb6..4948bb282c 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
@@ -1,17 +1,21 @@
 <div class="col-12 col-md-3 h-auto float-start d-flex action-label">
-      <span class="justify-content-center align-self-center font-weight-bold">
-        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
-      </span>
+  <span class="justify-content-center align-self-center font-weight-bold">
+    {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
+  </span>
 </div>
 <div class="col-12 col-md-9 float-start action-button">
-  <span *ngIf="operation.authorized">
-    <button class="btn btn-outline-primary" [dsBtnDisabled]="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" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
-      {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
-    </button>
-  </span>
+  @if (operation.authorized) {
+    <span>
+      <button class="btn btn-outline-primary" [dsBtnDisabled]="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>
+  }
+  @if (!operation.authorized) {
+    <span [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
+      <button class="btn btn-outline-primary" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
+      </button>
+    </span>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 4cb5db3f1e..2b08842e6d 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -3,13 +3,17 @@
     <div class="col-12">
       <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
       <p>{{descriptionMessage | translate}}</p>
-      <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
-        <div *ngIf="(identifier.identifierType === 'doi')">
-          <p class="float-start">{{doiToUpdateMessage | translate}}: {{identifier.value}}
-            ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
-          </p>
+      @for (identifier of (identifiers$ | async); track identifier) {
+        <div class="w-100 p">
+          @if ((identifier.identifierType === 'doi')) {
+            <div>
+              <p class="float-start">{{doiToUpdateMessage | translate}}: {{identifier.value}}
+                ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
+              </p>
+            </div>
+          }
         </div>
-      </div>
+      }
       <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
       <div class="space-children-mr">
         <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index aede31e737..4f0de1a789 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,34 +1,40 @@
 <h2 class="h4">
-    {{relationshipMessageKey$ | async | translate}}
-    <button class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
-        <i class="fas fa-plus"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
-    </button>
+  {{relationshipMessageKey$ | async | translate}}
+  <button class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <i class="fas fa-plus"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
+  </button>
 </h2>
 <ng-container *ngVar="updates$ | async as updates">
-    <ng-container *ngIf="updates && (loading$ | async) !== true">
-        <ng-container *ngVar="updates | dsObjectValues as updateValues">
-          <ds-pagination
-            [paginationOptions]="paginationConfig"
-            [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
-            [hideGear]="true"
-            [hidePagerWhenSinglePage]="true">
-            <div class="my-2">
-              <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
-                                    class="relationship-row d-block alert"
-                                    [fieldUpdate]="updateValue || {}"
-                                    [url]="url"
-                                    [editItem]="item"
+  @if (updates && (loading$ | async) !== true) {
+    <ng-container *ngVar="updates | dsObjectValues as updateValues">
+      <ds-pagination
+        [paginationOptions]="paginationConfig"
+        [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+        <div class="my-2">
+          @for (updateValue of updateValues; track trackUpdate($index, updateValue)) {
+            <ds-edit-relationship
+              class="relationship-row d-block alert"
+              [fieldUpdate]="updateValue || {}"
+              [url]="url"
+              [editItem]="item"
                                     [ngClass]="{
                                         'alert-success': updateValue.changeType === 1,
                                         'alert-warning': updateValue.changeType === 0,
                                         'alert-danger': updateValue.changeType === 2
                                   }">
-              </ds-edit-relationship>
-            </div>
-          </ds-pagination>
-          <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
-        </ng-container>
+            </ds-edit-relationship>
+          }
+        </div>
+      </ds-pagination>
+      @if (updateValues.length === 0) {
+        <div>{{"item.edit.relationships.no-relationships" | translate}}</div>
+      }
     </ng-container>
-    <ds-loading *ngIf="loading$ | async"></ds-loading>
+  }
+  @if (loading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index d33323759b..68539d8dc6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -1,35 +1,37 @@
-<div class="row" *ngIf="relatedItem$ | async">
-  <div class="col-10 relationship">
-    <ds-listable-object-component-loader
-      [object]="relatedItem$ | async"
-      [viewMode]="viewMode"
-      [value]="nameVariant"
-    >
-    </ds-listable-object-component-loader>
-  </div>
-  <div class="col-2 position-relative">
-    <div class="btn-group relationship-action-buttons">
-      <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
-              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 [dsBtnDisabled]="!canUndo()" (click)="undo()"
-              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>
+@if (relatedItem$ | async) {
+  <div class="row">
+    <div class="col-10 relationship">
+      <ds-listable-object-component-loader
+        [object]="relatedItem$ | async"
+        [viewMode]="viewMode"
+        [value]="nameVariant"
+        >
+      </ds-listable-object-component-loader>
+    </div>
+    <div class="col-2 position-relative">
+      <div class="btn-group relationship-action-buttons">
+        <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+          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 [dsBtnDisabled]="!canUndo()" (click)="undo()"
+          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>
     </div>
   </div>
-</div>
+}
 <ng-template #virtualMetadataModal>
   <ds-virtual-metadata
-          [relationshipId]="relationship.id"
-          [leftItem]="leftItem$ | async"
-          [rightItem]="rightItem$ | async"
-          [url]="url"
-          (close)="closeVirtualMetadataModal()"
-          (save)="remove()"
-  >
+    [relationshipId]="relationship.id"
+    [leftItem]="leftItem$ | async"
+    [rightItem]="rightItem$ | async"
+    [url]="url"
+    (close)="closeVirtualMetadataModal()"
+    (save)="remove()"
+    >
   </ds-virtual-metadata>
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index a640bc72cc..ee3004f315 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,23 +1,29 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
-    <div class="col-12 col-md-3 float-start status-label font-weight-bold">
-      {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
-    </div>
-    <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
-      {{statusData[statusKey]}}
-    </div>
-  </div>
-
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
-    <div *ngIf="(identifier.identifierType==='doi')">
+  @for (statusKey of statusDataKeys; track statusKey) {
+    <div class="w-100 pt-1">
       <div class="col-12 col-md-3 float-start status-label font-weight-bold">
-        {{identifier.identifierType.toLocaleUpperCase()}}
+        {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
+      </div>
+      <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
+        {{statusData[statusKey]}}
       </div>
-      <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
-        ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
-  </div>
+  }
+
+  @for (identifier of (identifiers$ | async); track identifier) {
+    <div class="w-100 pt-1">
+      @if ((identifier.identifierType==='doi')) {
+        <div>
+          <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+            {{identifier.identifierType.toLocaleUpperCase()}}
+          </div>
+          <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
+          ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
+        </div>
+      }
+    </div>
+  }
 
   <div class="col-12 col-md-3 float-start status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
@@ -26,8 +32,10 @@
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
-  <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
-    <ds-item-operation [operation]="operation"></ds-item-operation>
-  </div>
+  @for (operation of (operations$ | async); track operation) {
+    <div class="w-100" [ngClass]="{'pt-3': operation}">
+      <ds-item-operation [operation]="operation"></ds-item-operation>
+    </div>
+  }
 
 </div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index f86ab8c288..e1fc018ace 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -1,37 +1,39 @@
 <div [ngClass]="showThumbnails ? 'hide-modal-thumbnail-column' : ''">
-    <div class="modal-header">{{'virtual-metadata.delete-relationship.modal-head' | translate}}
-        <button type="button" class="btn-close" (click)="close.emit()" aria-label="Close">
-        </button>
-    </div>
-    <div class="modal-body">
-        <ng-container *ngFor="let itemDTO of itemDTOs$ | async; trackBy: trackItemDTO">
-            <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
-                 (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
-                 class="item d-flex flex-row">
-                <div class="m-2">
-                    <label>
-                        <input class="select" type="checkbox" [checked]="selected">
-                    </label>
-                </div>
-                <div class="flex-column">
-                    <ds-listable-object-component-loader [object]="itemDTO.item">
-                    </ds-listable-object-component-loader>
-                    <div *ngFor="let metadata of virtualMetadata.get(itemDTO.item.uuid)">
-                        <div class="fw-bold">
-                            {{metadata.metadataField}}
-                        </div>
-                        <div>
-                            {{metadata.metadataValue.value}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </ng-container>
-        <div class="d-flex flex-row-reverse m-2">
-            <button class="btn btn-primary save"
-                    (click)="save.emit()">
-                <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
-            </button>
+  <div class="modal-header">{{'virtual-metadata.delete-relationship.modal-head' | translate}}
+    <button type="button" class="btn-close" (click)="close.emit()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @for (itemDTO of itemDTOs$ | async; track trackItemDTO($index, itemDTO)) {
+      <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
+        (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
+        class="item d-flex flex-row">
+        <div class="m-2">
+          <label>
+            <input class="select" type="checkbox" [checked]="selected">
+          </label>
         </div>
+        <div class="flex-column">
+          <ds-listable-object-component-loader [object]="itemDTO.item">
+          </ds-listable-object-component-loader>
+          @for (metadata of virtualMetadata.get(itemDTO.item.uuid); track metadata) {
+            <div>
+              <div class="fw-bold">
+                {{metadata.metadataField}}
+              </div>
+              <div>
+                {{metadata.metadataValue.value}}
+              </div>
+            </div>
+          }
+        </div>
+      </div>
+    }
+    <div class="d-flex flex-row-reverse m-2">
+      <button class="btn btn-primary save"
+        (click)="save.emit()">
+        <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
+      </button>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index e9b6436d2f..c6c7d90bf4 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -1,44 +1,60 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
-  <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
-      <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
-      <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
-        <div class="d-flex flex-row">
-          <ds-item-page-title-field class="me-auto" [item]="item"></ds-item-page-title-field>
-          <ds-dso-edit-menu></ds-dso-edit-menu>
-        </div>
-        <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
-          <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
-            {{"item.page.link.simple" | translate}}
-          </a>
-        </div>
-        <div class="table-responsive">
-          <table class="table  table-striped">
-            <tbody>
-            <ng-container *ngFor="let mdEntry of (metadata$ | async) | keyvalue">
-              <tr *ngFor="let mdValue of mdEntry.value">
-                <td>{{mdEntry.key}}</td>
-                <td>{{mdValue.value}}</td>
-                <td>{{mdValue.language}}</td>
-              </tr>
-            </ng-container>
-            </tbody>
-          </table>
-        </div>
-        <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
-        <ds-item-page-collections [item]="item"></ds-item-page-collections>
-        <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
-        <div class="button-row bottom" *ngIf="fromSubmissionObject">
-          <div class="text-end">
-            <button class="btn btn-outline-secondary me-1" (click)="back()"><i
+  @if (itemRD?.hasSucceeded) {
+    <div class="item-page" @fadeInOut>
+      @if (itemRD?.payload; as item) {
+        <div>
+          <ds-item-alerts [item]="item"></ds-item-alerts>
+          <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
+          <ds-view-tracker [object]="item"></ds-view-tracker>
+          @if (!item.isWithdrawn || (isAdmin$|async)) {
+            <div class="full-item-info">
+              <div class="d-flex flex-row">
+                <ds-item-page-title-field class="me-auto" [item]="item"></ds-item-page-title-field>
+                <ds-dso-edit-menu></ds-dso-edit-menu>
+              </div>
+              @if (!fromSubmissionObject) {
+                <div class="simple-view-link my-3">
+                  <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
+                    {{"item.page.link.simple" | translate}}
+                  </a>
+                </div>
+              }
+              <div class="table-responsive">
+                <table class="table  table-striped">
+                  <tbody>
+                    @for (mdEntry of (metadata$ | async) | keyvalue; track mdEntry) {
+                      @for (mdValue of mdEntry.value; track mdValue) {
+                        <tr>
+                          <td>{{mdEntry.key}}</td>
+                          <td>{{mdValue.value}}</td>
+                          <td>{{mdValue.language}}</td>
+                        </tr>
+                      }
+                    }
+                  </tbody>
+                </table>
+              </div>
+              <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
+              <ds-item-page-collections [item]="item"></ds-item-page-collections>
+              <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
+              @if (fromSubmissionObject) {
+                <div class="button-row bottom">
+                  <div class="text-end">
+                    <button class="btn btn-outline-secondary me-1" (click)="back()"><i
                     class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
-          </div>
+                  </div>
+                </div>
+              }
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
-  </div>
-  <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.item' | translate}}"></ds-error>
+  }
+  @if (itemRD?.isLoading) {
+    <ds-loading message="{{'loading.item' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index eda90ed213..d2f7bc04b6 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,65 +1,180 @@
 <div class="container mb-5">
   <h1>{{'person.orcid.registry.auth' | translate}}</h1>
-  <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
+  @if ((isLinkedToOrcid() | async)) {
+    <div data-test="orcidLinked">
+      <div class="row">
+        @if ((hasOrcidAuthorizations() | async)) {
+          <div class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+            <div class="card h-100">
+              <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
+              <div class="card-body">
+                <div class="container p-0">
+                  <ul>
+                    @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                      <li data-test="orcidAuthorization">
+                        {{getAuthorizationDescription(auth) | translate}}
+                      </li>
+                    }
+                  </ul>
+                </div>
+              </div>
+            </div>
+          </div>
+        }
+        <div class="col-sm-6 mb-3">
+          <div class="card h-100">
+            <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
+            <div class="card-body">
+              <div class="container">
+                @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                  <ds-alert [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+                    {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                  </ds-alert>
+                }
+                @if ((hasMissingOrcidAuthorizations() | async)) {
+                  <ds-alert [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+                    {{'person.page.orcid.missing-authorizations-message' | translate}}
+                    <ul>
+                      @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                        <li data-test="missingOrcidAuthorization">
+                          {{getAuthorizationDescription(auth) | translate }}
+                        </li>
+                      }
+                    </ul>
+                  </ds-alert>
+                }
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+        <ds-alert
+          [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
+          {{ 'person.page.orcid.remove-orcid-message' | translate}}
+        </ds-alert>
+      }
+      @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+        <div class="row" data-test="unlinkOwner">
+          <div class="col">
+            <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
+              [dsBtnDisabled]="(unlinkProcessing | async)">
+              @if ((unlinkProcessing | async) !== true) {
+                <span><i
+                class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
+              }
+              @if ((unlinkProcessing | async)) {
+                <span><i
+                class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
+              }
+            </button>
+            @if ((hasMissingOrcidAuthorizations() | async)) {
+              <button type="submit"
+                class="btn btn-primary float-end" (click)="linkOrcid()">
+                <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
+              </button>
+            }
+          </div>
+        </div>
+      }
+    </div>
+  } @else {
+    <div data-test="orcidNotLinked">
+      <div class="row">
+        <div class="col-2"><img alt="orcid-logo" src="../../../../assets/images/orcid.logo.icon.svg"/></div>
+        <div class="col">
+          <ds-alert [type]="'alert-info'">{{ getOrcidNotLinkedMessage() | async }}</ds-alert>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
+          <button class="btn btn-primary float-end" (click)="linkOrcid()">
+            <i class="fas fa-link"></i>
+            {{'person.page.orcid.link' | translate}}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
 </div>
 
 <ng-template #orcidLinked>
   <div data-test="orcidLinked">
     <div class="row">
-      <div *ngIf="(hasOrcidAuthorizations() | async)" class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
-        <div class="card h-100">
-          <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
-          <div class="card-body">
-            <div class="container p-0">
-              <ul>
-                <li *ngFor="let auth of (getOrcidAuthorizations() | async)" data-test="orcidAuthorization">
-                  {{getAuthorizationDescription(auth) | translate}}
-                </li>
-              </ul>
+      @if ((hasOrcidAuthorizations() | async)) {
+        <div class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+          <div class="card h-100">
+            <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
+            <div class="card-body">
+              <div class="container p-0">
+                <ul>
+                  @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                    <li data-test="orcidAuthorization">
+                      {{getAuthorizationDescription(auth) | translate}}
+                    </li>
+                  }
+                </ul>
+              </div>
             </div>
           </div>
         </div>
-      </div>
+      }
       <div class="col-sm-6 mb-3">
         <div class="card h-100">
           <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container">
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
-                {{'person.page.orcid.no-missing-authorizations-message' | translate}}
-              </ds-alert>
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
-                {{'person.page.orcid.missing-authorizations-message' | translate}}
-                <ul>
-                  <li *ngFor="let auth of (getMissingOrcidAuthorizations() | async)" data-test="missingOrcidAuthorization">
-                    {{getAuthorizationDescription(auth) | translate }}
-                  </li>
-                </ul>
-              </ds-alert>
+              @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                <ds-alert [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+                  {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                </ds-alert>
+              }
+              @if ((hasMissingOrcidAuthorizations() | async)) {
+                <ds-alert [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+                  {{'person.page.orcid.missing-authorizations-message' | translate}}
+                  <ul>
+                    @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                      <li data-test="missingOrcidAuthorization">
+                        {{getAuthorizationDescription(auth) | translate }}
+                      </li>
+                    }
+                  </ul>
+                </ds-alert>
+              }
             </div>
           </div>
         </div>
       </div>
     </div>
-    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true"
-              [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
-      {{ 'person.page.orcid.remove-orcid-message' | translate}}
-    </ds-alert>
-    <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
-      <div class="col">
-        <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
-                [dsBtnDisabled]="(unlinkProcessing | async)">
-          <span *ngIf="(unlinkProcessing | async) !== true"><i
-            class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
-          <span *ngIf="(unlinkProcessing | async)"><i
-            class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
-        </button>
-        <button *ngIf="(hasMissingOrcidAuthorizations() | async)" type="submit"
-                class="btn btn-primary float-end" (click)="linkOrcid()">
-          <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
-        </button>
+    @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+      <ds-alert
+        [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
+        {{ 'person.page.orcid.remove-orcid-message' | translate}}
+      </ds-alert>
+    }
+    @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+      <div class="row" data-test="unlinkOwner">
+        <div class="col">
+          <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
+            [dsBtnDisabled]="(unlinkProcessing | async)">
+            @if ((unlinkProcessing | async) !== true) {
+              <span><i
+              class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
+            }
+            @if ((unlinkProcessing | async)) {
+              <span><i
+              class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
+            }
+          </button>
+          @if ((hasMissingOrcidAuthorizations() | async)) {
+            <button type="submit"
+              class="btn btn-primary float-end" (click)="linkOrcid()">
+              <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
+            </button>
+          }
+        </div>
       </div>
-    </div>
+    }
   </div>
 </ng-template>
 
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 472dc517fa..586f27bb3f 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,19 +1,29 @@
-<ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
-<div class="container" *ngIf="(processingConnection | async) !== true && (connectionStatus | async) !== true" data-test="error-box">
-  <ds-alert [type]="AlertType.Error">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
-</div>
-<ng-container *ngIf="(processingConnection | async) !== true && (item | async) && (connectionStatus | async)" >
+@if ((processingConnection | async)) {
+  <ds-loading [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
+}
+@if ((processingConnection | async) !== true && (connectionStatus | async) !== true) {
+  <div class="container" data-test="error-box">
+    <ds-alert [type]="AlertType.Error">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
+  </div>
+}
+@if ((processingConnection | async) !== true && (item | async) && (connectionStatus | async)) {
   <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
-  <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
-  <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
-</ng-container>
+  @if (isLinkedToOrcid()) {
+    <ds-orcid-sync-setting [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
+  }
+  @if (isLinkedToOrcid()) {
+    <ds-orcid-queue [item]="(item | async)"></ds-orcid-queue>
+  }
+}
 
-<div *ngIf="(processingConnection | async) !== true && (item | async)" class="container">
-  <div class="button-row bottom mb-3">
-    <div class="text-end">
-      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
-        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
-      </a>
+@if ((processingConnection | async) !== true && (item | async)) {
+  <div class="container">
+    <div class="button-row bottom mb-3">
+      <div class="text-end">
+        <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
+          <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
+        </a>
+      </div>
     </div>
   </div>
-</div>
+}
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
index bfba8eb75d..0d7ece9237 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
@@ -15,9 +15,11 @@
               <div class="mb-3 row">
                 <label class="form-label" for="syncMode">{{ 'person.page.orcid.synchronization-mode.label'| translate }}</label>
                 <select class="form-select" [(ngModel)]="currentSyncMode" name="syncMode" id="syncMode"
-                        required>
-                  <option *ngFor="let syncMode of syncModes"
-                          [value]="syncMode.value">{{ syncMode.label | translate }}</option>
+                  required>
+                  @for (syncMode of syncModes; track syncMode) {
+                    <option
+                    [value]="syncMode.value">{{ syncMode.label | translate }}</option>
+                  }
                 </select>
               </div>
             </div>
@@ -37,13 +39,15 @@
                 </ds-alert>
               </div>
               <div class="mb-3">
-                <div *ngFor="let option of syncPublicationOptions" class="row form-check">
-                  <input type="radio" [(ngModel)]="currentSyncPublications"
-                         name="syncPublications" id="publicationOption_{{option.value}}" [value]="option.value"
-                         required>
-                  <label for="publicationOption_{{option.value}}"
-                         class="ms-2 form-label">{{option.label | translate}}</label>
-                </div>
+                @for (option of syncPublicationOptions; track option) {
+                  <div class="row form-check">
+                    <input type="radio" [(ngModel)]="currentSyncPublications"
+                      name="syncPublications" id="publicationOption_{{option.value}}" [value]="option.value"
+                      required>
+                    <label for="publicationOption_{{option.value}}"
+                    class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
@@ -60,12 +64,14 @@
                 </ds-alert>
               </div>
               <div class="mb-3">
-                <div *ngFor="let option of syncFundingOptions" class="row form-check">
-                  <input type="radio" [(ngModel)]="currentSyncFunding"
-                         name="syncFundings" id="fundingOption_{{option.value}}" [value]="option.value"
-                         required>
-                  <label for="fundingOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
-                </div>
+                @for (option of syncFundingOptions; track option) {
+                  <div class="row form-check">
+                    <input type="radio" [(ngModel)]="currentSyncFunding"
+                      name="syncFundings" id="fundingOption_{{option.value}}" [value]="option.value"
+                      required>
+                    <label for="fundingOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
@@ -82,12 +88,14 @@
                 </ds-alert>
               </div>
               <div class="mb-3">
-                <div *ngFor="let option of syncProfileOptions" class="row form-check">
-                  <input type="checkbox" [(ngModel)]="option.checked"
-                         name="syncProfile_{{option.value}}" id="profileOption_{{option.value}}"
-                         [value]="option.value">
-                  <label for="profileOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
-                </div>
+                @for (option of syncProfileOptions; track option) {
+                  <div class="row form-check">
+                    <input type="checkbox" [(ngModel)]="option.checked"
+                      name="syncProfile_{{option.value}}" id="profileOption_{{option.value}}"
+                      [value]="option.value">
+                    <label for="profileOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 3348f55162..fda6d8ae88 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -1,21 +1,35 @@
 <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
-  <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
-    <div class="file-section">
-      <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
-        <span>
-          <span *ngIf="primaryBitsreamId === file.id" class="badge bg-primary">{{ 'item.page.bitstreams.primary' | translate }}</span>
-          {{ dsoNameService.getName(file) }}
-        </span>
-        <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
-        <span *ngIf="!last" innerHTML="{{separator}}"></span>
-      </ds-file-download-link>
-      <ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
-      <div *ngIf="!isLastPage" class="mt-1" id="view-more">
-        <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
+  @if (bitstreams?.length > 0) {
+    <ds-metadata-field-wrapper [label]="label | translate">
+      <div class="file-section">
+        @for (file of bitstreams; track file; let last = $last) {
+          <ds-file-download-link [bitstream]="file" [item]="item">
+            <span>
+              @if (primaryBitsreamId === file.id) {
+                <span class="badge bg-primary">{{ 'item.page.bitstreams.primary' | translate }}</span>
+              }
+              {{ dsoNameService.getName(file) }}
+            </span>
+            <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
+            @if (!last) {
+              <span innerHTML="{{separator}}"></span>
+            }
+          </ds-file-download-link>
+        }
+        @if (isLoading) {
+          <ds-loading message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
+        }
+        @if (!isLastPage) {
+          <div class="mt-1" id="view-more">
+            <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
+          </div>
+        }
+        @if (isLastPage && currentPage !== 1) {
+          <div class="mt-1" id="collapse">
+            <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
+          </div>
+        }
       </div>
-      <div *ngIf="isLastPage && currentPage !== 1" class="mt-1" id="collapse">
-        <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
-      </div>
-    </div>
-  </ds-metadata-field-wrapper>
+    </ds-metadata-field-wrapper>
+  }
 </ng-container>
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index c845deb450..058dd96952 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -1,20 +1,30 @@
 <ds-metadata-field-wrapper [label]="label">
-  <ng-container *ngFor="let objectPage of objects; let i = index">
+  @for (objectPage of objects; track objectPage; let i = $index) {
     <ng-container *ngVar="(objectPage | async) as representations">
-      <ds-metadata-representation-loader *ngFor="let rep of representations"
-                                         [mdRepresentation]="rep">
-      </ds-metadata-representation-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
-      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
-        <div *ngIf="(objects.length * incrementBy) < total" class="float-start">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
+      @for (rep of representations; track rep) {
+        <ds-metadata-representation-loader
+          [mdRepresentation]="rep">
+        </ds-metadata-representation-loader>
+      }
+      @if ((i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)) {
+        <ds-loading message="{{'loading.default' | translate}}"></ds-loading>
+      }
+      @if ((i + 1) === objects.length && representations?.length > 0) {
+        <div class="d-inline-block w-100 mt-2">
+          @if ((objects.length * incrementBy) < total) {
+            <div class="float-start">
+              <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
+              translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
+            </div>
+          }
+          @if (objects.length > 1) {
+            <div class="float-end">
+              <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
+              translate:{ amount: representations?.length } }}</button>
+            </div>
+          }
         </div>
-        <div *ngIf="objects.length > 1" class="float-end">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: representations?.length } }}</button>
-        </div>
-      </div>
+      }
     </ng-container>
-  </ng-container>
+  }
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index 16a1532fc0..afdb53b81d 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -1,22 +1,24 @@
-<ng-container *ngIf="(sources$ | async) as sources">
-  <ng-container *ngFor="let source of sources">
-    <div class="alert alert-info d-flex flex-row" *ngIf="source.totalEvents > 0">
-      <div class="source-logo-container">
-        <img class="source-logo"
-             src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
-             alt="{{source.id}} logo"
-             onerror="this.src='assets/images/dspace-logo.svg'">
-      </div>
-      <div class="w-100 d-flex justify-content-between">
-        <div class="ps-4 align-self-center">
-          {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+@if ((sources$ | async); as sources) {
+  @for (source of sources; track source) {
+    @if (source.totalEvents > 0) {
+      <div class="alert alert-info d-flex flex-row">
+        <div class="source-logo-container">
+          <img class="source-logo"
+            src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
+            alt="{{source.id}} logo"
+            onerror="this.src='assets/images/dspace-logo.svg'">
+          </div>
+          <div class="w-100 d-flex justify-content-between">
+            <div class="ps-4 align-self-center">
+              {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+            </div>
+            <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
+              [queryParams]="{ forward: true }"
+              class="btn btn-primary align-self-center">
+            {{'item.qa-event-notification-info.check.button' | translate}}
+          </button>
         </div>
-        <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
-                [queryParams]="{ forward: true }"
-                class="btn btn-primary align-self-center">
-                {{'item.qa-event-notification-info.check.button' | translate}}
-        </button>
       </div>
-    </div>
-  </ng-container>
-</ng-container>
+    }
+  }
+}
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index b49c91aed9..2bfe384bb4 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -1,20 +1,30 @@
 <ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass">
-  <ng-container *ngFor="let objectPage of objects; let i = index">
+  @for (objectPage of objects; track objectPage; let i = $index) {
     <ng-container *ngVar="(objectPage | async) as itemsRD">
-      <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
-                                           [object]="item" [viewMode]="viewMode">
-      </ds-listable-object-component-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
-      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
-        <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-start" id="view-more">
-          <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
+      @for (item of itemsRD?.payload?.page; track item) {
+        <ds-listable-object-component-loader
+          [object]="item" [viewMode]="viewMode">
+        </ds-listable-object-component-loader>
+      }
+      @if ((i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)) {
+        <ds-loading message="{{'loading.default' | translate}}"></ds-loading>
+      }
+      @if ((i + 1) === objects.length && itemsRD?.payload?.page?.length > 0) {
+        <div class="d-inline-block w-100 mt-2">
+          @if (itemsRD?.payload?.totalPages > objects.length) {
+            <div class="float-start" id="view-more">
+              <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+              translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
+            </div>
+          }
+          @if (objects.length > 1) {
+            <div class="float-end" id="view-less">
+              <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+              translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
+            </div>
+          }
         </div>
-        <div *ngIf="objects.length > 1" class="float-end" id="view-less">
-          <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
-        </div>
-      </div>
+      }
     </ng-container>
-  </ng-container>
+  }
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index 95f6ed8d6b..0608ee93cc 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -1,53 +1,60 @@
-    <div class="left-column">
-      <span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
-      <ng-template #versionNumberWithLink>
-        <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
-      </ng-template>
-      <ng-template #versionNumberWithoutLink>
-        {{version.version}}
-      </ng-template>
-      <span *ngIf="version?.id === itemVersion?.id">*</span>
+<div class="left-column">
+  @if ((workspaceId$ | async) || (workflowId$ | async)) {
+    {{version.version}}
+  } @else {
+    <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
+  }
+  @if (version?.id === itemVersion?.id) {
+    <span>*</span>
+  }
 
-      <span *ngIf="workspaceId$ | async" class="text-light badge bg-primary ms-3">
-                      {{ "item.version.history.table.workspaceItem" | translate }}
-                    </span>
+  @if (workspaceId$ | async) {
+    <span class="text-light badge bg-primary ms-3">
+      {{ "item.version.history.table.workspaceItem" | translate }}
+    </span>
+  }
 
-      <span *ngIf="workflowId$ | async" class="text-light badge bg-info ms-3">
-                      {{ "item.version.history.table.workflowItem" | translate }}
-                    </span>
+  @if (workflowId$ | async) {
+    <span class="text-light badge bg-info ms-3">
+      {{ "item.version.history.table.workflowItem" | translate }}
+    </span>
+  }
 
-    </div>
+</div>
 
-    <div class="right-column">
+<div class="right-column">
 
-      <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
-        <!--EDIT WORKSPACE ITEM-->
+  @if (displayActions) {
+    <div class="btn-group edit-field space-children-mr">
+      <!--EDIT WORKSPACE ITEM-->
+      @if (workspaceId$ | async) {
         <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                *ngIf="workspaceId$ | async"
-                (click)="editWorkspaceItem(workspaceId$)"
-                title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
+          (click)="editWorkspaceItem(workspaceId$)"
+          title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
           <i class="fas fa-pencil-alt fa-fw"></i>
         </button>
-        <!--CREATE-->
-        <ng-container *ngIf="canCreateVersion$ | async">
-          <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
-                  (click)="createNewVersion(version)"
-                  title="{{createVersionTitle | translate }}">
-            <i class="fas fa-code-branch fa-fw"></i>
-          </button>
-        </ng-container>
-        <!--DELETE-->
-        <ng-container *ngIf="canDeleteVersion$ | async">
-          <button class="btn btn-sm version-row-element-delete"
-                  [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [dsBtnDisabled]="isAnyBeingEdited()"
-                  (click)="deleteVersion(version, version.id === itemVersion.id)"
-                  title="{{'item.version.history.table.action.deleteVersion' | translate}}">
-            <i class="fas fa-trash fa-fw"></i>
-          </button>
-        </ng-container>
-      </div>
-
+      }
+      <!--CREATE-->
+      @if (canCreateVersion$ | async) {
+        <button class="btn btn-outline-primary btn-sm version-row-element-create"
+          [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
+          (click)="createNewVersion(version)"
+          title="{{createVersionTitle | translate }}">
+          <i class="fas fa-code-branch fa-fw"></i>
+        </button>
+      }
+      <!--DELETE-->
+      @if (canDeleteVersion$ | async) {
+        <button class="btn btn-sm version-row-element-delete"
+          [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
+          [dsBtnDisabled]="isAnyBeingEdited()"
+          (click)="deleteVersion(version, version.id === itemVersion.id)"
+          title="{{'item.version.history.table.action.deleteVersion' | translate}}">
+          <i class="fas fa-trash fa-fw"></i>
+        </button>
+      }
     </div>
+  }
+
+</div>
 
diff --git a/src/app/item-page/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
index 7b622744e2..ae1e862b07 100644
--- a/src/app/item-page/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
@@ -1,40 +1,42 @@
-<div *ngIf="(this.submitted$ | async) !== true; else waiting">
-  <div class="modal-header">{{'item.version.create.modal.header' | translate}}
-    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
-    </button>
-  </div>
-  <div class="modal-body">
-    <p class="pb-2">
-      {{ "item.version.create.modal.text" | translate }}
-      <span *ngIf="!firstVersion">
-        {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
-      </span>
-    </p>
-    <div class="mb-3">
-      <label for="summary" class="form-label">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
-      <input type="text" id="summary" class="form-control" [(ngModel)]="newVersionSummary"
-             (keyup.enter)="onModalSubmit()"
-             placeholder="{{'item.version.create.modal.form.summary.placeholder' | translate }}"/>
-<!--      (keyup.enter)="$event.preventDefault(); $event.stopImmediatePropagation()"-->
+@if ((this.submitted$ | async) !== true) {
+  <div>
+    <div class="modal-header">{{'item.version.create.modal.header' | translate}}
+      <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
+      </button>
     </div>
-  </div>
-  <div class="modal-footer space-children-mr">
+    <div class="modal-body">
+      <p class="pb-2">
+        {{ "item.version.create.modal.text" | translate }}
+        @if (!firstVersion) {
+          <span>
+            {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
+          </span>
+        }
+      </p>
+      <div class="mb-3">
+        <label for="summary" class="form-label">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
+        <input type="text" id="summary" class="form-control" [(ngModel)]="newVersionSummary"
+          (keyup.enter)="onModalSubmit()"
+          placeholder="{{'item.version.create.modal.form.summary.placeholder' | translate }}"/>
+        <!--      (keyup.enter)="$event.preventDefault(); $event.stopImmediatePropagation()"-->
+      </div>
+    </div>
+    <div class="modal-footer space-children-mr">
       <button class="btn btn-outline-secondary btn-sm ms-0"
-              type="button"
-              (click)="onModalClose()"
-              title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
+        type="button"
+        (click)="onModalClose()"
+        title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
         <i class="fas fa-times fa-fw"></i> {{'item.version.create.modal.button.cancel' | translate}}
       </button>
       <button class="btn btn-success btn-sm ms-0"
-              type="submit"
-              (click)="onModalSubmit()"
-              title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
+        type="submit"
+        (click)="onModalSubmit()"
+        title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
         <i class="fas fa-check fa-fw"></i> {{'item.version.create.modal.button.confirm' | translate}}
-    </button>
+      </button>
+    </div>
   </div>
-</div>
-
-<ng-template #waiting>
+} @else {
   <div class="modal-header">{{'item.version.create.modal.submitted.header' | translate}}</div>
   <div class="modal-body">
     <p>{{'item.version.create.modal.submitted.text' | translate}}</p>
@@ -42,4 +44,5 @@
       <ds-loading [showMessage]="false"></ds-loading>
     </div>
   </div>
-</ng-template>
+}
+
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index c90b2e545e..8df582fd1a 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,92 +1,114 @@
-<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion">
-  <div *ngIf="(versionRD$ | async)?.payload as itemVersion">
-    <div class="mb-2" *ngIf="versionsDTO.versionDTOs.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}</h2>
-      <ds-alert [type]="AlertTypeEnum.Info">
-        {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
-      </ds-alert>
-      <ds-pagination *ngIf="versionsDTO.versionDTOs.length > 0"
-                     (paginationChange)="onPageChange()"
-                     [hideGear]="true"
-                     [hidePagerWhenSinglePage]="true"
-                     [paginationOptions]="options"
-                     [collectionSize]="versionsDTO.totalElements"
-                     [retainScrollPosition]="true">
-        <table class="table table-striped table-bordered align-middle my-2">
-          <thead>
-          <tr>
-            <th scope="col">{{"item.version.history.table.version" | translate}}</th>
-            <th scope="col" *ngIf="(showSubmitter$ | async)">{{"item.version.history.table.editor" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.date" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let versionDTO of versionsDTO.versionDTOs" [id]="'version-row-' + versionDTO.version.id">
-            <td class="version-row-element-version">
-              <ds-item-versions-row-element-version [hasDraftVersion]="hasDraftVersion$ | async"
-                                                    [version]="versionDTO.version"
-                                                    [item]="item" [displayActions]="displayActions"
-                                                    [itemVersion]="itemVersion"
-                                                    [versionBeingEditedNumber]="versionBeingEditedNumber"
-                                                    (versionsHistoryChange)="getAllVersions($event)"
-              ></ds-item-versions-row-element-version>
-            </td>
-            <td class="version-row-element-editor" *ngIf="(showSubmitter$ | async)">
-              {{versionDTO.version.submitterName}}
-            </td>
-            <td class="version-row-element-date">
-              {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
-            </td>
-            <td class="version-row-element-summary">
-              <div class="float-start">
-                <ng-container *ngIf="isThisBeingEdited(versionDTO.version); then editSummary else showSummary"></ng-container>
-                <ng-template #showSummary>{{versionDTO.version.summary}}</ng-template>
-                <ng-template #editSummary>
-                  <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
-                         [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
-                         class="form-control" type="text"/>
-                </ng-template>
-              </div>
-
-              <div class="float-end btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
-                <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
-                  <!--DISCARD EDIT-->
-                  <button class="btn btn-sm btn-outline-warning"
-                          (click)="disableVersionEditing()"
-                          title="{{'item.version.history.table.action.discardSummary' | translate}}">
-                    <i class="fas fa-undo-alt fa-fw"></i>
-                  </button>
-                  <!--SAVE-->
-                  <button class="btn btn-outline-success btn-sm"
-                          (click)="onSummarySubmit()"
-                          title="{{'item.version.history.table.action.saveSummary' | translate}}">
-                    <i class="fas fa-check fa-fw"></i>
-                  </button>
-                </ng-container>
-                <ng-template #notThisBeingEdited>
-                  <!--EDIT-->
-                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          [dsBtnDisabled]="isAnyBeingEdited()"
-                          (click)="enableVersionEditing(versionDTO.version)"
-                          title="{{'item.version.history.table.action.editSummary' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                </ng-template>
-              </div>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-        <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
-      </ds-pagination>
-    </div>
+@if ((versionsDTO$ | async); as versionsDTO) {
+  <div>
+    @if ((versionRD$ | async)?.payload; as itemVersion) {
+      <div>
+        @if (versionsDTO.versionDTOs.length > 0 || displayWhenEmpty) {
+          <div class="mb-2">
+            @if (displayTitle) {
+              <h2 class="h4">{{"item.version.history.head" | translate}}</h2>
+            }
+            <ds-alert [type]="AlertTypeEnum.Info">
+              {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
+            </ds-alert>
+            @if (versionsDTO.versionDTOs.length > 0) {
+              <ds-pagination
+                (paginationChange)="onPageChange()"
+                [hideGear]="true"
+                [hidePagerWhenSinglePage]="true"
+                [paginationOptions]="options"
+                [collectionSize]="versionsDTO.totalElements"
+                [retainScrollPosition]="true">
+                <table class="table table-striped table-bordered align-middle my-2">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{"item.version.history.table.version" | translate}}</th>
+                      @if ((showSubmitter$ | async)) {
+                        <th scope="col">{{"item.version.history.table.editor" | translate}}</th>
+                      }
+                      <th scope="col">{{"item.version.history.table.date" | translate}}</th>
+                      <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (versionDTO of versionsDTO.versionDTOs; track versionDTO) {
+                      <tr [id]="'version-row-' + versionDTO.version.id">
+                        <td class="version-row-element-version">
+                          <ds-item-versions-row-element-version [hasDraftVersion]="hasDraftVersion$ | async"
+                            [version]="versionDTO.version"
+                            [item]="item" [displayActions]="displayActions"
+                            [itemVersion]="itemVersion"
+                            [versionBeingEditedNumber]="versionBeingEditedNumber"
+                            (versionsHistoryChange)="getAllVersions($event)"
+                          ></ds-item-versions-row-element-version>
+                        </td>
+                        @if ((showSubmitter$ | async)) {
+                          <td class="version-row-element-editor">
+                            {{versionDTO.version.submitterName}}
+                          </td>
+                        }
+                        <td class="version-row-element-date">
+                          {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
+                        </td>
+                        <td class="version-row-element-summary">
+                          <div class="float-start">
+                            @if (isThisBeingEdited(versionDTO.version)) {
+                              <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                                [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                                class="form-control" type="text"/>
+                            } @else {
+                              <span>{{versionDTO.version.summary}}</span>
+                            }
+                            <ng-template #editSummary>
+                              <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                                [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                                class="form-control" type="text"/>
+                            </ng-template>
+                          </div>
+                          @if (displayActions && versionDTO.canEditVersion | async) {
+                            <div class="float-end btn-group edit-field space-children-mr">
+                              @if (isThisBeingEdited(versionDTO.version)) {
+                                <!--DISCARD EDIT-->
+                                <button class="btn btn-sm btn-outline-warning"
+                                  (click)="disableVersionEditing()"
+                                  title="{{'item.version.history.table.action.discardSummary' | translate}}">
+                                  <i class="fas fa-undo-alt fa-fw"></i>
+                                </button>
+                                <!--SAVE-->
+                                <button class="btn btn-outline-success btn-sm"
+                                  (click)="onSummarySubmit()"
+                                  title="{{'item.version.history.table.action.saveSummary' | translate}}">
+                                  <i class="fas fa-check fa-fw"></i>
+                                </button>
+                              } @else {
+                                <!--EDIT-->
+                                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                                  [dsBtnDisabled]="isAnyBeingEdited()"
+                                  (click)="enableVersionEditing(versionDTO.version)"
+                                  title="{{'item.version.history.table.action.editSummary' | translate}}">
+                                  <i class="fas fa-edit fa-fw"></i>
+                                </button>
+                              }
+                            </div>
+                          }
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+                <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
+              </ds-pagination>
+            }
+          </div>
+        }
+      </div>
+    }
   </div>
-</div>
+} @else {
+  @if (displayWhenEmpty) {
+    <ds-alert
+      [content]="'item.version.history.empty'"
+      [type]="AlertTypeEnum.Info">
+    </ds-alert>
+  }
+}
 
-<ng-template #noItemVersion>
-  <ds-alert *ngIf="displayWhenEmpty"
-            [content]="'item.version.history.empty'"
-            [type]="AlertTypeEnum.Info">
-  </ds-alert>
-</ng-template>
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index ddb74f58f9..39565e6cdd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,26 +1,30 @@
-  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+@if ((moreThanOne$ | async) !== true) {
+  <div class="add">
     <button class="btn btn-lg btn-outline-primary mt-1 ms-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
-            (click)="openPage(singleEntity)" role="button"
-            title="{{'mydspace.new-submission-external' | translate}}">
+      [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
+      (click)="openPage(singleEntity)" role="button"
+      title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
     </button>
   </div>
+}
+@if ((moreThanOne$ | async)) {
   <div class="add w-100" display="dynamic" placement="bottom-right"
-       ngbDropdown
-       *ngIf="(moreThanOne$ | async)">
+    ngbDropdown
+    >
     <button class="btn btn-lg btn-outline-primary mt-1 ms-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate"
-            [attr.data-test]="'import-dropdown' | dsBrowserOnly"
-            title="{{'mydspace.new-submission-external' | translate}}">
+      type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
+      [attr.aria-label]="'mydspace.new-submission-external' | translate"
+      [attr.data-test]="'import-dropdown' | dsBrowserOnly"
+      title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
       <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="importControlsDropdownMenu"
-         aria-labelledby="dropdownImport">
+      class="dropdown-menu p-0"
+      id="importControlsDropdownMenu"
+      aria-labelledby="dropdownImport">
       <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
     </div>
   </div>
+}
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 1f20330c17..0e167475bf 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,24 +1,28 @@
-  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+@if ((moreThanOne$ | async) !== true) {
+  <div class="add">
     <button class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+      [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
+}
+@if ((moreThanOne$ | async)) {
   <div class="add w-100" display="dynamic" placement="bottom-right"
-       ngbDropdown
-       *ngIf="(moreThanOne$ | async)">
+    ngbDropdown
+    >
     <button class="btn btn-lg btn-primary mt-1 ms-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
-            [attr.aria-label]="'mydspace.new-submission' | translate"
-            [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
-            title="{{'mydspace.new-submission' | translate}}">
+      type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
+      [attr.aria-label]="'mydspace.new-submission' | translate"
+      [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
+      title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
       <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="entityControlsDropdownMenu"
-         aria-labelledby="dropdownSubmission">
+      class="dropdown-menu p-0"
+      id="entityControlsDropdownMenu"
+      aria-labelledby="dropdownSubmission">
       <ds-entity-dropdown [isSubmission]="true" (selectionChange)="openDialog($event)"></ds-entity-dropdown>
     </div>
   </div>
+}
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index c29412e004..f2deb49c9f 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -1,29 +1,30 @@
-<ng-container *ngIf="(sources$ | async)?.length > 0">
-  <ng-container *ngFor="let source of sources$ | async">
-    <div
-      class="alert alert-info d-flex flex-row"
-      *ngIf="source.totalEvents > 0"
-    >
-    <div class="source-logo-container">
-      <img
-        class="source-logo"
-        src="assets/images/qa-{{ source.id }}-logo.png"
-        onerror="this.src='assets/images/dspace-logo.svg'"
-        alt="{{ source.id }} logo"
-      />
-    </div>
-      <div class="w-100 d-flex justify-content-between">
-        <div class="ps-4 align-self-center">
-          {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
-        </div>
-        <button
-          [routerLink]="[getQualityAssuranceRoute(), source.id]"
-          [queryParams]="{ forward: true }"
-          class="btn btn-primary align-self-center"
+@if ((sources$ | async)?.length > 0) {
+  @for (source of sources$ | async; track source) {
+    @if (source.totalEvents > 0) {
+      <div
+        class="alert alert-info d-flex flex-row"
         >
-          {{ "mydspace.qa-event-notification-info.check.button" | translate }}
-        </button>
+        <div class="source-logo-container">
+          <img
+            class="source-logo"
+            src="assets/images/qa-{{ source.id }}-logo.png"
+            onerror="this.src='assets/images/dspace-logo.svg'"
+            alt="{{ source.id }} logo"
+            />
+        </div>
+        <div class="w-100 d-flex justify-content-between">
+          <div class="ps-4 align-self-center">
+            {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
+          </div>
+          <button
+            [routerLink]="[getQualityAssuranceRoute(), source.id]"
+            [queryParams]="{ forward: true }"
+            class="btn btn-primary align-self-center"
+            >
+            {{ "mydspace.qa-event-notification-info.check.button" | translate }}
+          </button>
+        </div>
       </div>
-    </div>
-  </ng-container>
-</ng-container>
+    }
+  }
+}
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 7ea2b700ec..479f206f90 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,19 +1,19 @@
 <nav [ngClass]="{'open': (menuCollapsed | async) !== true}"
-     [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-light navbar-expand-md px-md-0 navbar-container" role="navigation"
-     [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
+  [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+  class="navbar navbar-light navbar-expand-md px-md-0 navbar-container" role="navigation"
+  [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
   <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
   <div class="navbar-inner-container w-100" [class.container]="(isMobile$ | async) !== true">
     <div class="w-100">
       <div id="collapsingNav">
-        <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+        @if ((isMobile$ | async) && (isAuthenticated$ | async)) {
           <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-        </ng-container>
+        }
         <div class="navbar-nav align-items-md-center me-auto shadow-none gapx-3">
-          <ng-container *ngFor="let section of (sections | async)">
+          @for (section of (sections | async); track section) {
             <ng-container
-              *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-          </ng-container>
+            *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+          }
         </div>
       </div>
     </div>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index dbcafbde0e..d44fb29e7d 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -6,13 +6,17 @@
           {{'notifications.events.title'| translate}}
         </div>
       </h1>
-      <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
-        <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
-      </ds-alert>
-      <ds-alert *ngIf="targetId" [type]="'alert-info'">
-        <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
-        <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
-      </ds-alert>
+      @if (!targetId) {
+        <ds-alert  [type]="'alert-info'">
+          <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+        </ds-alert>
+      }
+      @if (targetId) {
+        <ds-alert [type]="'alert-info'">
+          <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+          <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
+        </ds-alert>
+      }
     </div>
   </div>
   <div class="row">
@@ -21,208 +25,271 @@
         {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
       </h2>
 
-      <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      @if ((isEventPageLoading | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
 
-      <ds-pagination *ngIf="(isEventPageLoading | async) !== true"
-                      [paginationOptions]="paginationConfig"
-                      [collectionSize]="(totalElements$ | async)"
-                      [sortOptions]="paginationSortConfig"
-                      (paginationChange)="getQualityAssuranceEvents()">
-
-        <ng-container>
-          <div *ngIf="(eventsUpdated$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'quality-assurance.noEvents' | translate}}
-          </div>
-          <div *ngIf="(eventsUpdated$ | async)?.length !== 0" class="table-responsive mt-2">
-            <table id="events" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
-                <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
-                <th *ngIf="hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1" scope="col" class="content-col">
-                  {{'quality-assurance.event.table.project-details' | translate}}
-                </th>
-                <ng-container *ngIf="hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)">
-                  <th scope="col" class="content-col">
-                    {{'quality-assurance.event.table.reasons' | translate}}
-                  </th>
-                  <th scope="col" class="content-col">
-                    {{'quality-assurance.event.table.person-who-requested' | translate}}
-                  </th>
-                </ng-container>
-                <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let eventElement of (eventsUpdated$ | async); let i = index">
-                  <td>{{eventElement?.event?.trust}}
-                  </td>
-                  <td><a *ngIf="eventElement?.target"
-                         target="_blank"
-                         rel="noopener noreferrer"
-                         [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
-                    <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
-                    <div *ngIf="eventElement?.event?.message?.serviceId">
-                      <span class="small pe-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
-                      <span [title]="eventElement.event.message.serviceId">
-                        <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
-                      </span>
-                    </div>
-                    <div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
-                      <span class="small pe-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
-                      <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
-                        <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
-                      </span>
-                    </div>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/PID') !== -1">
-                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.type}}</span></p>
-                    <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
-                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
-                        {{eventElement.event.message.value}}
-                      </a>
-                      <ng-template #noPID><span class="badge bg-info">{{eventElement.event.message.value}}</span></ng-template>
-                    </p>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/SUBJECT') !== -1">
-                    <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
-                       </span><br><span class="badge bg-info">{{eventElement.event.message.value}}</span></p>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/ABSTRACT') !== -1">
-                    <p class="abstract-container" [class.show]="showMore">
-                      <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
-                      <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
-                    </p>
-                    <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
-                      <i *ngIf="!showMore" class="fas fa-angle-down"></i>
-                      <i *ngIf="showMore" class="fas fa-angle-up"></i>
-                      {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
-                    </button>
-                  </td>
-                  <ng-container *ngIf="showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1">
-                    <td>
-                      <p>
-                        <span *ngIf="eventElement.event.message">
-                          <span>{{eventElement.event.message.reason}}</span><br>
-                        </span>
-                      </p>
-                    </td>
-                    <td>
-                      <p>
-                        <span *ngIf="eventElement.event.originalId">
-                          <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
-                        </span>
-                      </p>
-                    </td>
-                  </ng-container>
-
-                  <td *ngIf="showTopic.indexOf('/PROJECT') !== -1">
-                    <p>
-                      {{'quality-assurance.event.table.suggestedProject' | translate}}
-                    </p>
-                    <p>
-                      <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
-                      <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
-                    </p>
-                    <p>
-                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.acronym}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.code}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.funder}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.jurisdiction}}</span></span>
-                    </p>
-                    <hr>
-                    <div>
-                      {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
-                      <a target="_blank" rel="noopener noreferrer" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
-                      <div class="btn-group">
-                        <button *ngIf="!eventElement.hasProject"
-                                class="btn btn-outline-primary btn-sm"
+      @if ((isEventPageLoading | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [sortOptions]="paginationSortConfig"
+          (paginationChange)="getQualityAssuranceEvents()">
+          <ng-container>
+            @if ((eventsUpdated$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noEvents' | translate}}
+              </div>
+            }
+            @if ((eventsUpdated$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="events" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
+                      <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
+                      @if (hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1) {
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.project-details' | translate}}
+                        </th>
+                      }
+                      @if (hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)) {
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.reasons' | translate}}
+                        </th>
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.person-who-requested' | translate}}
+                        </th>
+                      }
+                      <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (eventElement of (eventsUpdated$ | async); track eventElement; let i = $index) {
+                      <tr>
+                        <td>{{eventElement?.event?.trust}}
+                        </td>
+                        <td>@if (eventElement?.target) {
+                          <a
+                            target="_blank"
+                            rel="noopener noreferrer"
+                          [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
+                        }
+                        @if (!eventElement?.target) {
+                          <span>{{eventElement.title}}</span>
+                        }
+                        @if (eventElement?.event?.message?.serviceId) {
+                          <div>
+                            <span class="small pe-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
+                            <span [title]="eventElement.event.message.serviceId">
+                              <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
+                            </span>
+                          </div>
+                        }
+                        @if (eventElement?.event?.message?.href) {
+                          <div class="d-flex align-items-center">
+                            <span class="small pe-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
+                            <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
+                              <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
+                            </span>
+                          </div>
+                        }
+                      </td>
+                      @if (showTopic.indexOf('/PID') !== -1) {
+                        <td>
+                          <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.type}}</span></p>
+                          <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
+                          @if (hasPIDHref(eventElement.event.message)) {
+                            <a href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
+                              {{eventElement.event.message.value}}
+                            </a>
+                          } @else {
+                            <span class="badge bg-info">{{eventElement.event.message.value}}</span>
+                          }
+                        </p>
+                      </td>
+                    }
+                    @if (showTopic.indexOf('/SUBJECT') !== -1) {
+                      <td>
+                        <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
+                          </span><br><span class="badge bg-info">{{eventElement.event.message.value}}</span></p>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/ABSTRACT') !== -1) {
+                        <td>
+                          <p class="abstract-container" [class.show]="showMore">
+                            <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
+                            <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
+                          </p>
+                          <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
+                            @if (!showMore) {
+                              <i class="fas fa-angle-down"></i>
+                            }
+                            @if (showMore) {
+                              <i class="fas fa-angle-up"></i>
+                            }
+                            {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
+                          </button>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1) {
+                        <td>
+                          <p>
+                            @if (eventElement.event.message) {
+                              <span>
+                                <span>{{eventElement.event.message.reason}}</span><br>
+                              </span>
+                            }
+                          </p>
+                        </td>
+                        <td>
+                          <p>
+                            @if (eventElement.event.originalId) {
+                              <span>
+                                <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
+                              </span>
+                            }
+                          </p>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/PROJECT') !== -1) {
+                        <td>
+                          <p>
+                            {{'quality-assurance.event.table.suggestedProject' | translate}}
+                          </p>
+                          <p>
+                            <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
+                            <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
+                          </p>
+                          <p>
+                            @if (eventElement.event.message.acronym) {
+                              <span><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.acronym}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.code) {
+                              <span><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.code}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.funder) {
+                              <span><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.funder}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.fundingProgram) {
+                              <span><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.jurisdiction) {
+                              <span><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.jurisdiction}}</span></span>
+                            }
+                          </p>
+                          <hr>
+                            <div>
+                              {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
+                              @if (eventElement.hasProject) {
+                                <a target="_blank" rel="noopener noreferrer" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
+                              }
+                              <div class="btn-group">
+                                @if (!eventElement.hasProject) {
+                                  <button
+                                    class="btn btn-outline-primary btn-sm"
+                                    [dsBtnDisabled]="eventElement.isRunning"
+                                    (click)="openModalLookup(eventElement); $event.stopPropagation();"
+                                    [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
+                                    >
+                                    <i class="fas fa-search"></i>
+                                  </button>
+                                }
+                                @if (eventElement.hasProject) {
+                                  <button
+                                    class="btn btn-outline-danger btn-sm"
+                                    [dsBtnDisabled]="eventElement.isRunning"
+                                    (click)="removeProject(eventElement)"
+                                    [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
+                                    >
+                                    <i class="fas fa-trash-alt"></i>
+                                  </button>
+                                }
+                              </div>
+                            </div>
+                          </td>
+                        }
+                        <td>
+                          @if ((isAdmin$ | async) || !isReinstateWithdrawnRequest) {
+                            <div class="btn-group button-width">
+                              @if (showTopic.indexOf('/PROJECT') !== -1) {
+                                <button
+                                  class="btn btn-outline-success btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
+                                  [attr.aria-label]="'quality-assurance.event.action.import' | translate"
+                                  >
+                                  <i class="fas fa-check"></i>
+                                </button>
+                              }
+                              @if (showTopic.indexOf('/PROJECT') === -1) {
+                                <button
+                                  class="btn btn-outline-success btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="executeAction('ACCEPTED', eventElement)"
+                                  [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
+                                  >
+                                  <i class="fas fa-check"></i>
+                                </button>
+                              }
+                              <button class="btn btn-outline-dark btn-sm button-width"
+                                ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
+                                container="body"
                                 [dsBtnDisabled]="eventElement.isRunning"
-                                (click)="openModalLookup(eventElement); $event.stopPropagation();"
-                                [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
-                        >
-                          <i class="fas fa-search"></i>
-                        </button>
-                        <button *ngIf="eventElement.hasProject"
-                                class="btn btn-outline-danger btn-sm"
+                                (click)="openModal('DISCARDED', eventElement, ignoreModal)"
+                                [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
+                                >
+                                <i class="fas fa-ban"></i>
+                              </button>
+                              @if ((isAdmin$ | async)) {
+                                <button class="btn btn-outline-danger btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="openModal('REJECTED', eventElement, rejectModal)"
+                                  [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
+                                  >
+                                  <i class="fas fa-trash-alt"></i>
+                                </button>
+                              }
+                              @if ((isAdmin$ | async) === false) {
+                                <button class="btn btn-outline-danger btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                                  (click)="openModal('UNDO', eventElement, undoModal)">
+                                  <i class="fas fa-trash-alt"></i>
+                                </button>
+                              }
+                            </div>
+                          }
+                          @if ((isAdmin$ | async) !== true && isReinstateWithdrawnRequest) {
+                            <div class="btn-group button-width">
+                              <button class="btn btn-outline-danger btn-sm button-width"
+                                ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
+                                container="body"
                                 [dsBtnDisabled]="eventElement.isRunning"
-                                (click)="removeProject(eventElement)"
-                                [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
-                        >
-                          <i class="fas fa-trash-alt"></i>
-                        </button>
-                      </div>
-                    </div>
-                  </td>
-                  <td>
-                    <div *ngIf="(isAdmin$ | async) || !isReinstateWithdrawnRequest" class="btn-group button-width">
-                      <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
-                              class="btn btn-outline-success btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.import' | translate"
-                      >
-                        <i class="fas fa-check"></i>
-                      </button>
-                      <button *ngIf="showTopic.indexOf('/PROJECT') === -1"
-                              class="btn btn-outline-success btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              (click)="executeAction('ACCEPTED', eventElement)"
-                              [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
-                      >
-                        <i class="fas fa-check"></i>
-                      </button>
-                      <button class="btn btn-outline-dark btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              (click)="openModal('DISCARDED', eventElement, ignoreModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
-                      >
-                        <i class="fas fa-ban"></i>
-                      </button>
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              *ngIf="(isAdmin$ | async)"
-                              ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              (click)="openModal('REJECTED', eventElement, rejectModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
-                      >
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              *ngIf="(isAdmin$ | async) === false"
-                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
-                              (click)="openModal('UNDO', eventElement, undoModal)">
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                    </div>
-                    <div *ngIf="(isAdmin$ | async) !== true && isReinstateWithdrawnRequest" class="btn-group button-width">
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
-                              container="body"
-                              [dsBtnDisabled]="eventElement.isRunning"
-                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
-                              (click)="openModal('UNDO', eventElement, undoModal)">
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+                                [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                                (click)="openModal('UNDO', eventElement, undoModal)">
+                                <i class="fas fa-trash-alt"></i>
+                              </button>
+                            </div>
+                          }
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          </ng-container>
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index 3a1ccbe7dc..6155b7901f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -1,58 +1,69 @@
 <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
-        <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12">
-        <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
-
-        <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
-        <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
-                       [paginationOptions]="paginationConfig"
-                       [collectionSize]="(totalElements$ | async)"
-                       [hideGear]="false"
-                       [hideSortOptions]="true"
-                       (paginationChange)="getQualityAssuranceSource()">
-
-          <ds-loading class="container" *ngIf="(isSourceProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
-          <ng-container *ngIf="(isSourceProcessing() | async) !== true">
-            <div *ngIf="(sources$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-              {{'quality-assurance.noSource' | translate}}
-            </div>
-            <div *ngIf="(sources$ | async)?.length !== 0" class="table-responsive mt-2">
-              <table id="epeople" class="table table-striped table-hover table-bordered">
-                <thead>
-                <tr>
-                  <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
-                  <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
-                  <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
-                </tr>
-                </thead>
-                <tbody>
-                  <tr *ngFor="let sourceElement of (sources$ | async); let i = index">
-                    <td>{{sourceElement.id}}</td>
-                    <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
-                    <td>
-                      <div class="btn-group edit-field">
-                        <button
-                                class="btn btn-outline-primary btn-sm"
-                                title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
-                                [routerLink]="[sourceElement.id]">
-                          <span class="badge bg-info">{{sourceElement.totalEvents}}</span>
-                          <i class="fas fa-info fa-fw"></i>
-                        </button>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </ng-container>
-        </ds-pagination>
-      </div>
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
+      <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
     </div>
   </div>
+  <div class="row">
+    <div class="col-12">
+      <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
+
+      @if ((isSourceLoading() | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
+      @if ((isSourceLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [hideSortOptions]="true"
+          (paginationChange)="getQualityAssuranceSource()">
+          @if ((isSourceProcessing() | async)) {
+            <ds-loading class="container" message="'quality-assurance.loading' | translate"></ds-loading>
+          }
+          @if ((isSourceProcessing() | async) !== true) {
+            @if ((sources$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noSource' | translate}}
+              </div>
+            }
+            @if ((sources$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (sourceElement of (sources$ | async); track sourceElement; let i = $index) {
+                      <tr>
+                        <td>{{sourceElement.id}}</td>
+                        <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
+                              [routerLink]="[sourceElement.id]">
+                              <span class="badge bg-info">{{sourceElement.totalEvents}}</span>
+                              <i class="fas fa-info fa-fw"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
+    </div>
+  </div>
+</div>
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index 4afc5e2185..84c91d2150 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -2,60 +2,75 @@
   <div class="row">
     <div class="col-12">
       <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
-      <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
-      <ds-alert *ngIf="targetId" [type]="'alert-info'">
-        {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
-        <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
-      </ds-alert>
+      @if (!targetId) {
+        <ds-alert [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
+      }
+      @if (targetId) {
+        <ds-alert [type]="'alert-info'">
+          {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
+          <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
+        </ds-alert>
+      }
     </div>
   </div>
   <div class="row">
     <div class="col-12">
       <h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>
 
-      <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
-      <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
-                     [paginationOptions]="paginationConfig"
-                     [collectionSize]="(totalElements$ | async)"
-                     [hideGear]="false"
-                     [hideSortOptions]="true"
-                     (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
-
-        <ds-loading class="container" *ngIf="(isTopicsProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
-        <ng-container *ngIf="(isTopicsProcessing() | async) !== true">
-          <div *ngIf="(topics$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'quality-assurance.noTopics' | translate}}
-          </div>
-          <div *ngIf="(topics$ | async)?.length !== 0" class="table-responsive mt-2">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
-                <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
-                <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let topicElement of (topics$ | async); let i = index">
-                  <td>{{topicElement.name}}</td>
-                  <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
-                  <td>
-                    <div class="btn-group edit-field">
-                      <button
+      @if ((isTopicsLoading() | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
+      @if ((isTopicsLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [hideSortOptions]="true"
+          (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
+          @if ((isTopicsProcessing() | async)) {
+            <ds-loading class="container" message="'quality-assurance.loading' | translate"></ds-loading>
+          }
+          @if ((isTopicsProcessing() | async) !== true) {
+            @if ((topics$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noTopics' | translate}}
+              </div>
+            }
+            @if ((topics$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (topicElement of (topics$ | async); track topicElement; let i = $index) {
+                      <tr>
+                        <td>{{topicElement.name}}</td>
+                        <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button
                               class="btn btn-outline-primary btn-sm"
                               title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
                               [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
-                        <span class="badge bg-info">{{topicElement.totalEvents}}</span>
-                        <i class="fas fa-info fa-fw"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+                              <span class="badge bg-info">{{topicElement.totalEvents}}</span>
+                              <i class="fas fa-info fa-fw"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index d262e746b1..96a0eb82e5 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -1,29 +1,35 @@
 <div class="d-inline">
   <div ngbDropdown class="d-inline">
-    <button *ngIf="isCollectionFixed; else chooseCollection" class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
-      <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
-    </button>
-    <ng-template #chooseCollection>
+    @if (isCollectionFixed) {
+      <button class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
+        <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+      </button>
+    } @else {
       <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
-              type="button">
+        type="button">
         <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
         <span class="caret"></span>
       </button>
-
       <div ngbDropdownMenu
-           class="dropdown-menu"
-           id="entityControlsDropdownMenu"
-           aria-labelledby="dropdownSubmission">
+        class="dropdown-menu"
+        id="entityControlsDropdownMenu"
+        aria-labelledby="dropdownSubmission">
         <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
       </div>
-    </ng-template>
+    }
 
   </div>
   <button (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
-    {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
+{{ ignoreSuggestionLabel() | translate}}</button>
+@if (!isBulk) {
+  <button (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
     <i class="fa fa-eye"></i>
-    <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
-    <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
+    @if (!seeEvidence) {
+      {{ 'suggestion.seeEvidence' | translate}}
+    }
+    @if (seeEvidence) {
+      {{ 'suggestion.hideEvidence' | translate}}
+    }
   </button>
+}
 </div>
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
index f21b469ccf..b04d3deaef 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.html
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -1,27 +1,32 @@
-<div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
-  <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
-    <button (click)="removePopup()"
-            type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-
-    <div class="d-flex flex-row">
-      <div class="d-flex flex-column justify-content-center align-items-center">
-        <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
-      </div>
-      <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
-        <ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
-          <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
-            <div *ngIf="suggestion.total > 0">
-              <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
-              {{ 'notification.suggestion.please' | translate }}
-              <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
-            </div>
-          </ng-container>
-        </ng-container>
+@if (suggestionsRD$ | async) {
+  <div class="notifications-wrapper position-fixed top right">
+    <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
+      <button (click)="removePopup()"
+        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <div class="d-flex flex-row">
+        <div class="d-flex flex-column justify-content-center align-items-center">
+          <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
+        </div>
+        <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+          @if ((suggestionsRD$ | async); as suggestions) {
+            @for (suggestion of suggestions; track suggestion) {
+              <ng-container class="alert alert-info">
+                @if (suggestion.total > 0) {
+                  <div>
+                    <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+                    {{ 'notification.suggestion.please' | translate }}
+                    <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+                  </div>
+                }
+              </ng-container>
+            }
+          }
+        </div>
       </div>
     </div>
   </div>
-</div>
+}
 
 
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index a60ba59ec4..d984df0e9b 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,106 +1,125 @@
-<div class="container" *ngIf="(processRD$ | async)?.payload as process">
+@if ((processRD$ | async)?.payload; as process) {
+  <div class="container">
     <div class="row">
       <div class="col-10">
         <h1 class="flex-grow-1">
           {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
         </h1>
       </div>
-      <div *ngIf="isRefreshing$ | async" class="col-2 refresh-counter">
-        {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
-      </div>
+      @if (isRefreshing$ | async) {
+        <div class="col-2 refresh-counter">
+          {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
+        </div>
+      }
     </div>
-
     <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
-        <div>{{ process?.scriptName }}</div>
+      <div>{{ process?.scriptName }}</div>
     </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments"
-                             [title]="'process.detail.arguments'">
-        <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
-    </ds-process-detail-field>
-
+    @if (process?.parameters && process?.parameters?.length > 0) {
+      <ds-process-detail-field id="process-arguments"
+        [title]="'process.detail.arguments'">
+        @for (argument of process?.parameters; track argument) {
+          <div>{{ argument?.name }} {{ argument?.value }}</div>
+        }
+      </ds-process-detail-field>
+    }
     <div *ngVar="(filesRD$ | async)?.payload?.page as files">
-        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files"
-                                 [title]="'process.detail.output-files'">
+      @if (files && files?.length > 0) {
+        <ds-process-detail-field id="process-files"
+          [title]="'process.detail.output-files'">
           <div class="d-flex flex-column">
-            <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
-              <span>{{getFileName(file)}}</span>
-              <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-            </ds-file-download-link>
+            @for (file of files; track file; let last = $last) {
+              <ds-file-download-link [bitstream]="file">
+                <span>{{getFileName(file)}}</span>
+                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+              </ds-file-download-link>
+            }
           </div>
         </ds-process-detail-field>
+      }
     </div>
-
-    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time"
-                             [title]="'process.detail.start-time' | translate">
+    @if (process && process.startTime) {
+      <ds-process-detail-field id="process-start-time"
+        [title]="'process.detail.start-time' | translate">
         <div>{{ process.startTime | date:dateFormat:'UTC' }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time"
-                             [title]="'process.detail.end-time' | translate">
+      </ds-process-detail-field>
+    }
+    @if (process && process.endTime) {
+      <ds-process-detail-field id="process-end-time"
+        [title]="'process.detail.end-time' | translate">
         <div>{{ process.endTime | date:dateFormat:'UTC' }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status"
-                             [title]="'process.detail.status' | translate">
+      </ds-process-detail-field>
+    }
+    @if (process && process.processStatus) {
+      <ds-process-detail-field id="process-status"
+        [title]="'process.detail.status' | translate">
         <div>{{ process.processStatus }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
-        <button *ngIf="!showOutputLogs && process?._links?.output?.href !== undefined" id="showOutputButton"
-                class="btn btn-primary" (click)="showProcessOutputLogs()">
+      </ds-process-detail-field>
+    }
+    @if (isProcessFinished(process)) {
+      <ds-process-detail-field id="process-output" [title]="'process.detail.output'">
+        @if (!showOutputLogs && process?._links?.output?.href !== undefined) {
+          <button id="showOutputButton"
+            class="btn btn-primary" (click)="showProcessOutputLogs()">
             {{ 'process.detail.logs.button' | translate }}
-        </button>
-        <ds-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
-                           message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
-        <pre class="fw-bold text-secondary bg-light p-3" tabindex="0"
-             *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
-        <p id="no-output-logs-message" *ngIf="((retrievingOutputLogs$ | async) !== true && showOutputLogs)
-      && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output">
+          </button>
+        }
+        @if (retrievingOutputLogs$ | async) {
+          <ds-loading class="ds-themed-loading"
+          message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
+        }
+        @if (showOutputLogs && (outputLogs$ | async)?.length > 0) {
+          <pre class="fw-bold text-secondary bg-light p-3" tabindex="0"
+          >{{ (outputLogs$ | async) }}</pre>
+        }
+        @if (((retrievingOutputLogs$ | async) !== true && showOutputLogs)
+          && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output) {
+          <p id="no-output-logs-message">
             {{ 'process.detail.logs.none' | translate }}
-        </p>
-    </ds-process-detail-field>
-
+          </p>
+        }
+      </ds-process-detail-field>
+    }
     <ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
-        <button class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
-                class="fas fa-plus pe-2"></i>{{'process.detail.create' | translate}}</button>
-        <button *ngIf="isProcessFinished(process)" id="delete" class="btn btn-danger"
-                (click)="openDeleteModal(deleteModal)">
-            <i class="fas fa-trash pe-2"></i>{{ 'process.detail.delete.button' | translate }}
+      <button class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
+      class="fas fa-plus pe-2"></i>{{'process.detail.create' | translate}}</button>
+      @if (isProcessFinished(process)) {
+        <button id="delete" class="btn btn-danger"
+          (click)="openDeleteModal(deleteModal)">
+          <i class="fas fa-trash pe-2"></i>{{ 'process.detail.delete.button' | translate }}
         </button>
+      }
     </ds-process-detail-field>
-
     <div style="text-align: right;">
-        <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
+      <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
     </div>
-</div>
+  </div>
+}
 
 <ng-template #deleteModal >
 
-    <div *ngIf="(processRD$ | async)?.payload as process">
-
-        <div class="modal-header">
-            <div>
-                <h4>{{'process.detail.delete.header' | translate }}</h4>
-            </div>
-            <button type="button" class="btn-close"
-                    (click)="closeModal()" aria-label="Close">
-                <span aria-hidden="true">×</span>
-            </button>
+  @if ((processRD$ | async)?.payload; as process) {
+    <div>
+      <div class="modal-header">
+        <div>
+          <h4>{{'process.detail.delete.header' | translate }}</h4>
         </div>
-
-        <div class="modal-body">
-            <div>{{'process.detail.delete.body' | translate }}</div>
-            <div class="mt-4">
-                <button class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-                <button id="delete-confirm" class="btn btn-danger"
-                        (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
-                </button>
-            </div>
+        <button type="button" class="btn-close"
+          (click)="closeModal()" aria-label="Close">
+          <span aria-hidden="true">×</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div>{{'process.detail.delete.body' | translate }}</div>
+        <div class="mt-4">
+          <button class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+          <button id="delete-confirm" class="btn btn-danger"
+            (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
+          </button>
         </div>
-
-
+      </div>
     </div>
+  }
 
 </ng-template>
 
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index c1d1c3a61c..3bb6a796c6 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -1,25 +1,31 @@
 <div class="container">
-    <div class="row">
-        <h1 class="col-12">
-            {{headerKey | translate}}
-        </h1>
-        <div class="col-12 col-md-6 mb-2">
-            <form #form="ngForm" (ngSubmit)="submitForm(form)">
-                <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
-                <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <a [routerLink]="['/processes']" class="btn btn-danger float-start">{{ 'process.new.cancel' | translate }}</a>
-                <button type="submit" class="btn btn-primary float-end">{{ 'process.new.submit' | translate }}</button>
-            </form>
-        </div>
-        <div class="col-12 col-md-6">
-            <ds-script-help *ngIf="selectedScript" [script]="selectedScript"></ds-script-help>
-        </div>
+  <div class="row">
+    <h1 class="col-12">
+      {{headerKey | translate}}
+    </h1>
+    <div class="col-12 col-md-6 mb-2">
+      <form #form="ngForm" (ngSubmit)="submitForm(form)">
+        <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
+        <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
+        <a [routerLink]="['/processes']" class="btn btn-danger float-start">{{ 'process.new.cancel' | translate }}</a>
+        <button type="submit" class="btn btn-primary float-end">{{ 'process.new.submit' | translate }}</button>
+      </form>
     </div>
+    <div class="col-12 col-md-6">
+      @if (selectedScript) {
+        <ds-script-help [script]="selectedScript"></ds-script-help>
+      }
+    </div>
+  </div>
 
-    <div *ngIf="missingParameters.length > 0" class="mt-3 alert alert-danger validation-error">
-        {{'process.new.parameter.required.missing' | translate}}
-        <ul>
-            <li *ngFor="let missing of missingParameters">{{missing}}</li>
-        </ul>
+  @if (missingParameters.length > 0) {
+    <div class="mt-3 alert alert-danger validation-error">
+      {{'process.new.parameter.required.missing' | translate}}
+      <ul>
+        @for (missing of missingParameters; track missing) {
+          <li>{{missing}}</li>
+        }
+      </ul>
     </div>
+  }
 </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index ee4714806c..1d82530f38 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,20 +1,26 @@
 <div class="row gap-2 mb-2 mx-0">
-    <select id="process-parameters"
-            class="form-select col"
-            name="parameter-{{index}}"
-            [attr.aria-label]="'process.new.select-parameter' | translate"
-            [(ngModel)]="selectedParameter"
-            #param="ngModel">
-        <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
-        <option *ngFor="let param of parameters" [ngValue]="param.name">
-            {{param.nameLong || param.name}}
-        </option>
-    </select>
-    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
-    <button *ngIf="removable" [attr.aria-label]="'process.new.delete-parameter' | translate"
-            (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
+  <select id="process-parameters"
+    class="form-select col"
+    name="parameter-{{index}}"
+    [attr.aria-label]="'process.new.select-parameter' | translate"
+    [(ngModel)]="selectedParameter"
+    #param="ngModel">
+    <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
+    @for (param of parameters; track param) {
+      <option [ngValue]="param.name">
+        {{param.nameLong || param.name}}
+      </option>
+    }
+  </select>
+  <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
+  @if (removable) {
+    <button [attr.aria-label]="'process.new.delete-parameter' | translate"
+      (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
       <i class="fas fa-trash"></i>
     </button>
-    <span *ngIf="!removable" class="col-1"></span>
+  }
+  @if (!removable) {
+    <span class="col-1"></span>
+  }
 </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index 85372acce0..101df27b69 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,13 +1,17 @@
 <label for="file-upload-{{index}}" class="form-label d-flex align-items-center m-0">
-    <span class="btn btn-primary">
-        {{'process.new.parameter.file.upload-button' | translate}}
-    </span>
-    <span class="file-name ms-1">{{fileObject?.name}}</span>
+  <span class="btn btn-primary">
+    {{'process.new.parameter.file.upload-button' | translate}}
+  </span>
+  <span class="file-name ms-1">{{fileObject?.name}}</span>
 </label>
 <input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
-<div *ngIf="file.invalid && (file.dirty || file.touched)"
-     class="alert alert-danger validation-error">
-    <div *ngIf="file.errors.required">
+@if (file.invalid && (file.dirty || file.touched)) {
+  <div
+    class="alert alert-danger validation-error">
+    @if (file.errors.required) {
+      <div>
         {{'process.new.parameter.file.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
index 5676da2a12..af82cac94b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.html
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -1,11 +1,14 @@
-<div class="mb-3" *ngIf="script?.parameters?.length" data-testID="parameters-select-container">
-  <label class="form-label">{{'process.new.select-parameters' | translate}}</label>
-  <ds-parameter-select
-    *ngFor="let value of parameterValues; let i = index; let last = last"
-    [parameters]="script.parameters"
-    [parameterValue]="value"
-    [removable]="!last"
-    [index]="i"
-    (removeParameter)="removeParameter(i)"
-    (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
-</div>
+@if (script?.parameters?.length) {
+  <div class="mb-3" data-testID="parameters-select-container">
+    <label class="form-label">{{'process.new.select-parameters' | translate}}</label>
+    @for (value of parameterValues; track value; let i = $index; let last = $last) {
+      <ds-parameter-select
+        [parameters]="script.parameters"
+        [parameterValue]="value"
+        [removable]="!last"
+        [index]="i"
+        (removeParameter)="removeParameter(i)"
+      (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index ffe0c7dc88..88ca77b07f 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -2,46 +2,51 @@
   <div>
     <div ngbDropdown class="d-flex">
       <input id="process-script"
-             class="form-select"
-             required
-             [ngModel]="selectedScript"
-             placeholder="{{'process.new.select-script.placeholder' | translate}}"
-             [ngModelOptions]="{standalone: true}"
-             ngbDropdownToggle
-             role="combobox"
-             #script="ngModel">
+        class="form-select"
+        required
+        [ngModel]="selectedScript"
+        placeholder="{{'process.new.select-script.placeholder' | translate}}"
+        [ngModelOptions]="{standalone: true}"
+        ngbDropdownToggle
+        role="combobox"
+        #script="ngModel">
       <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
-            role="menu"
-            (scroll)="onScroll($event)"
-            infiniteScroll
-            [infiniteScrollDistance]="5"
-            [infiniteScrollThrottle]="300"
-            [infiniteScrollUpDistance]="1.5"
-            [fromRoot]="true"
-            [scrollWindow]="false">
-            <button class="dropdown-item"
-                    *ngFor="let script of scripts"
-                    role="menuitem"
-                    type="button"
-                    title="{{ script.name }}"
-                    (click)="onSelect(script);">
-              <span class="text-truncate">{{ script.name }}</span>
-            </button>
-          <ng-container *ngIf="(isLoading$ | async)">
-            <button class="dropdown-item disabled" role="menuitem">
-              <ds-loading message="{{'loading.default' | translate}}">
-              </ds-loading>
-            </button>
-          </ng-container>
+        role="menu"
+        (scroll)="onScroll($event)"
+        infiniteScroll
+        [infiniteScrollDistance]="5"
+        [infiniteScrollThrottle]="300"
+        [infiniteScrollUpDistance]="1.5"
+        [fromRoot]="true"
+        [scrollWindow]="false">
+        @for (script of scripts; track script) {
+          <button class="dropdown-item"
+            role="menuitem"
+            type="button"
+            title="{{ script.name }}"
+            (click)="onSelect(script);">
+            <span class="text-truncate">{{ script.name }}</span>
+          </button>
+        }
+        @if ((isLoading$ | async)) {
+          <button class="dropdown-item disabled" role="menuitem">
+            <ds-loading message="{{'loading.default' | translate}}">
+            </ds-loading>
+          </button>
+        }
       </div>
     </div>
   </div>
   <div>
-    <div *ngIf="script.invalid && (script.dirty || script.touched)"
-         class="alert alert-danger validation-error">
-      <div *ngIf="script.errors.required">
-        {{ 'process.new.select-script.required' | translate }}
+    @if (script.invalid && (script.dirty || script.touched)) {
+      <div
+        class="alert alert-danger validation-error">
+        @if (script.errors.required) {
+          <div>
+            {{ 'process.new.select-script.required' | translate }}
+          </div>
+        }
       </div>
-    </div>
+    }
   </div>
 </div>
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 65100e79eb..ff46c26482 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,78 +1,86 @@
 <div class="container">
-    <div class="d-flex">
-        <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
-    </div>
-    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+  <div class="d-flex">
+    <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
+  </div>
+  <ng-container *ngTemplateOutlet="buttons"></ng-container>
 
-    <div class="sections">
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.RUNNING"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeStarted"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.SCHEDULED"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCreated"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.COMPLETED"
-                [sortField]="ProcessSortField.endTime"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.FAILED"
-                [sortField]="ProcessSortField.endTime"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
-    </div>
+  <div class="sections">
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.RUNNING"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeStarted"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.SCHEDULED"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCreated"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.COMPLETED"
+      [sortField]="ProcessSortField.endTime"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.FAILED"
+      [sortField]="ProcessSortField.endTime"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+  </div>
 
-    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+  <ng-container *ngTemplateOutlet="buttons"></ng-container>
 </div>
 
 <ng-template #buttons>
-    <div class="d-flex justify-content-end mb-2">
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary me-2"
-                (click)="processBulkDeleteService.clearAllProcesses()"><i
-                class="fas fa-undo pe-2"></i>{{'process.overview.delete.clear' | translate }}
-        </button>
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger me-2"
-                (click)="openDeleteModal(deleteModal)"><i
-                class="fas fa-trash pe-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
-        </button>
-        <button class="btn btn-success" routerLink="/processes/new"><i
-            class="fas fa-plus pe-2"></i>{{'process.overview.new' | translate}}</button>
-    </div>
+  <div class="d-flex justify-content-end mb-2">
+    @if (processBulkDeleteService.hasSelected()) {
+      <button class="btn btn-primary me-2"
+        (click)="processBulkDeleteService.clearAllProcesses()"><i
+      class="fas fa-undo pe-2"></i>{{'process.overview.delete.clear' | translate }}
+    </button>
+  }
+  @if (processBulkDeleteService.hasSelected()) {
+    <button class="btn btn-danger me-2"
+      (click)="openDeleteModal(deleteModal)"><i
+    class="fas fa-trash pe-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+  </button>
+}
+<button class="btn btn-success" routerLink="/processes/new"><i
+class="fas fa-plus pe-2"></i>{{'process.overview.new' | translate}}</button>
+</div>
 </ng-template>
 
 <ng-template #deleteModal>
 
-    <div>
+  <div>
 
-        <div class="modal-header">
-            <div>
-                <h4>{{'process.overview.delete.header' | translate }}</h4>
-            </div>
-            <button type="button" class="btn-close"
-                    (click)="closeModal()" aria-label="Close">
-                <span aria-hidden="true">×</span>
-            </button>
-        </div>
-
-        <div class="modal-body">
-            <div *ngIf="(processBulkDeleteService.isProcessing$() | async) !== true">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
-            <div *ngIf="processBulkDeleteService.isProcessing$() |async" class="alert alert-info">
-                <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-                <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
-            </div>
-            <div class="mt-4">
-                <button class="btn btn-primary me-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
-                        (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-                <button id="delete-confirm" class="btn btn-danger"
-                        [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
-                        (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
-                </button>
-            </div>
-        </div>
+    <div class="modal-header">
+      <div>
+        <h4>{{'process.overview.delete.header' | translate }}</h4>
+      </div>
+      <button type="button" class="btn-close"
+        (click)="closeModal()" aria-label="Close">
+        <span aria-hidden="true">×</span>
+      </button>
     </div>
 
+    <div class="modal-body">
+      @if ((processBulkDeleteService.isProcessing$() | async) !== true) {
+        <div>{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
+      }
+      @if (processBulkDeleteService.isProcessing$() |async) {
+        <div class="alert alert-info">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
+        </div>
+      }
+      <div class="mt-4">
+        <button class="btn btn-primary me-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
+        (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+        <button id="delete-confirm" class="btn btn-danger"
+          [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
+          (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
+        </button>
+      </div>
+    </div>
+  </div>
+
 
 </ng-template>
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index 69b3deea6f..a9aa922977 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -2,10 +2,12 @@
   <div class="d-flex" (click)="collapse.toggle()" [attr.aria-expanded]="!collapse.collapsed" role="button">
     <h2 class="flex-grow-1">
       {{'process.overview.table.' + processStatus.toLowerCase() + '.title' | translate}}
-      <span class="badge rounded-pill bg-primary badge-nb-processes ps-2 pe-2"
-            *ngIf="(processesRD$ | async) as processesRD">
-        {{processesRD?.payload?.totalElements}}
-      </span>
+      @if ((processesRD$ | async); as processesRD) {
+        <span class="badge rounded-pill bg-primary badge-nb-processes ps-2 pe-2"
+          >
+          {{processesRD?.payload?.totalElements}}
+        </span>
+      }
       <span class="ms-2 toggle-icon">
         <i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
       </span>
@@ -15,50 +17,55 @@
   <div ngbCollapse #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
 
     <ng-container *ngVar="(processesRD$ | async) as processesRD">
-      <ds-loading *ngIf="!processesRD || processesRD.isLoading"/>
+      @if (!processesRD || processesRD.isLoading) {
+        <ds-loading/>
+      }
 
-      <ds-pagination *ngIf="processesRD?.payload?.totalElements > 0"
-                     [paginationOptions]="(paginationOptions$ | async)"
-                     [collectionSize]="processesRD?.payload?.totalElements"
-                     [retainScrollPosition]="true"
-                     [hideGear]="true">
-
-        <div class="table-responsive mt-1">
-          <table class="table table-striped table-hover">
-            <thead>
-            <tr>
-              <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
-              <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
-              <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
-              <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
-              <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
-            </tr>
-            </thead>
-
-            <tbody>
-            <tr *ngFor="let tableEntry of processesRD?.payload?.page"
-                [class]="getRowClass(tableEntry.process)">
-              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
-              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
-              <td>{{tableEntry.user}}</td>
-              <td>{{tableEntry.info}}</td>
-              <td>
-                <button [attr.aria-label]="'process.overview.delete-process' | translate"
+      @if (processesRD?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="(paginationOptions$ | async)"
+          [collectionSize]="processesRD?.payload?.totalElements"
+          [retainScrollPosition]="true"
+          [hideGear]="true">
+          <div class="table-responsive mt-1">
+            <table class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
+                  <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
+                  <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
+                  <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
+                  <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (tableEntry of processesRD?.payload?.page; track tableEntry) {
+                  <tr
+                    [class]="getRowClass(tableEntry.process)">
+                    <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
+                    <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
+                    <td>{{tableEntry.user}}</td>
+                    <td>{{tableEntry.info}}</td>
+                    <td>
+                      <button [attr.aria-label]="'process.overview.delete-process' | translate"
                         (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
                         class="btn btn-outline-danger">
-                  <i class="fas fa-trash"></i>
-                </button>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                        <i class="fas fa-trash"></i>
+                      </button>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+
+      @if (processesRD?.payload?.totalElements === 0) {
+        <div>
+          <p>{{'process.overview.table.empty' | translate}}</p>
         </div>
-
-      </ds-pagination>
-
-      <div *ngIf="processesRD?.payload?.totalElements === 0">
-        <p>{{'process.overview.table.empty' | translate}}</p>
-      </div>
+      }
     </ng-container>
 
   </div>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index 841d65d61c..42a5267909 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -1,36 +1,38 @@
 <div>
   <div class="modal-header"><h4>{{'dso-selector.claim.item.head' | translate}}</h4>
-    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
-    </button>
+  <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+  </button>
+</div>
+<div class="modal-body">
+  <div class="alert alert-info" role="alert">
+    {{'dso-selector.claim.item.body' | translate}}
   </div>
-  <div class="modal-body">
-    <div class="alert alert-info" role="alert">
-      {{'dso-selector.claim.item.body' | translate}}
-    </div>
-    <div class="dropdown-divider"></div>
-    <div class="scrollable-menu list-group container">
-      <div *ngFor="let listEntry of (listEntries$ | async)?.payload.page" class="row">
+  <div class="dropdown-divider"></div>
+  <div class="scrollable-menu list-group container">
+    @for (listEntry of (listEntries$ | async)?.payload.page; track listEntry) {
+      <div class="row">
         <button class="list-group-item list-group-item-action border-0 list-entry"
-                title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
-                (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
+          title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
+          (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
           <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                               [linkType]=linkTypes.None></ds-listable-object-component-loader>
+          [linkType]=linkTypes.None></ds-listable-object-component-loader>
         </button>
       </div>
-      <div class="row">
-        <div class="col-md mt-2">
-        </div>
+    }
+    <div class="row">
+      <div class="col-md mt-2">
       </div>
     </div>
   </div>
-  <div class="modal-footer">
-    <div class="me-5">
-      <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
-      {{ 'dso-selector.claim.item.not-mine-label' | translate }}
-    </div>
-    <button type="submit" class="btn btn-primary ms-5 me-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
-      <i class="fas fa-plus"></i>
-      {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
-    </button>
-  </div>
+</div>
+<div class="modal-footer">
+  <div class="me-5">
+    <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
+    {{ 'dso-selector.claim.item.not-mine-label' | translate }}
+  </div>
+  <button type="submit" class="btn btn-primary ms-5 me-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
+    <i class="fas fa-plus"></i>
+    {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
+  </button>
+</div>
 </div>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index abff578acf..0190c36d0c 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -1,38 +1,52 @@
 <div *ngVar="(researcherProfile$ | async) as researcherProfile">
-  <div *ngIf="researcherProfile">
-    <p>{{'researcher.profile.associated' | translate}}</p>
-    <p class="align-items-center researcher-profile-switch" >
-      <span class="me-3">{{'researcher.profile.status' | translate}}</span>
-      <ui-switch [checkedLabel]="'researcher.profile.public.visibility' | translate"
-                 [uncheckedLabel]="'researcher.profile.private.visibility' | translate"
-                 [checked]="researcherProfile.visible"
-                 (change)="toggleProfileVisibility(researcherProfile)" ></ui-switch>
-    </p>
-  </div>
-  <div *ngIf="!researcherProfile">
-    <p>{{'researcher.profile.not.associated' | translate}}</p>
-  </div>
-  <button *ngIf="!researcherProfile" class="btn btn-primary me-2"
-          [dsBtnDisabled]="(isProcessingCreate() | async)"
-          (click)="createProfile()">
-    <span *ngIf="(isProcessingCreate() | async)">
-        <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
-    </span>
-    <span *ngIf="(isProcessingCreate() | async) !== true">
-        <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
-    </span>
-  </button>
-  <ng-container *ngIf="researcherProfile">
+  @if (researcherProfile) {
+    <div>
+      <p>{{'researcher.profile.associated' | translate}}</p>
+      <p class="align-items-center researcher-profile-switch" >
+        <span class="me-3">{{'researcher.profile.status' | translate}}</span>
+        <ui-switch [checkedLabel]="'researcher.profile.public.visibility' | translate"
+          [uncheckedLabel]="'researcher.profile.private.visibility' | translate"
+          [checked]="researcherProfile.visible"
+        (change)="toggleProfileVisibility(researcherProfile)" ></ui-switch>
+      </p>
+    </div>
+  }
+  @if (!researcherProfile) {
+    <div>
+      <p>{{'researcher.profile.not.associated' | translate}}</p>
+    </div>
+  }
+  @if (!researcherProfile) {
+    <button class="btn btn-primary me-2"
+      [dsBtnDisabled]="(isProcessingCreate() | async)"
+      (click)="createProfile()">
+      @if ((isProcessingCreate() | async)) {
+        <span>
+          <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
+        </span>
+      }
+      @if ((isProcessingCreate() | async) !== true) {
+        <span>
+          <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
+        </span>
+      }
+    </button>
+  }
+  @if (researcherProfile) {
     <button class="btn btn-primary me-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
     <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
-        <span *ngIf="(isProcessingDelete() | async)">
-            <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
+      @if ((isProcessingDelete() | async)) {
+        <span>
+          <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
-        <span *ngIf="(isProcessingDelete() | async) !== true">
-            <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
+      }
+      @if ((isProcessingDelete() | async) !== true) {
+        <span>
+          <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
         </span>
+      }
     </button>
-  </ng-container>
+  }
 </div>
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 59c6129ac6..eeb6f8e41c 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,72 +1,86 @@
 <ng-container *ngVar="(user$ | async) as user">
-  <div class="container" *ngIf="user">
-    <h1>{{'profile.title' | translate}}</h1>
-    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
-      <div class="card mb-4">
-        <div class="card-header">{{'profile.card.researcher' | translate}}</div>
-        <div class="card-body">
-          <div class="mb-4">
-            <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
+  @if (user) {
+    <div class="container">
+      <h1>{{'profile.title' | translate}}</h1>
+      @if (isResearcherProfileEnabled$ | async) {
+        <div class="card mb-4">
+          <div class="card-header">{{'profile.card.researcher' | translate}}</div>
+          <div class="card-body">
+            <div class="mb-4">
+              <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
+            </div>
+            <ds-suggestions-notification></ds-suggestions-notification>
           </div>
-          <ds-suggestions-notification></ds-suggestions-notification>
+        </div>
+      }
+      <div class="card mb-4">
+        <div class="card-header">{{'profile.card.identify' | translate}}</div>
+        <div class="card-body">
+          <ds-profile-page-metadata-form [user]="user"></ds-profile-page-metadata-form>
         </div>
       </div>
-    </ng-container>
-    <div class="card mb-4">
-      <div class="card-header">{{'profile.card.identify' | translate}}</div>
-      <div class="card-body">
-        <ds-profile-page-metadata-form [user]="user"></ds-profile-page-metadata-form>
+      @if (canChangePassword$ | async) {
+        <div class="card mb-4 security-section">
+          <div class="card-header">{{'profile.card.security' | translate}}</div>
+          <div class="card-body">
+            <ds-profile-page-security-form
+              [FORM_PREFIX]="'profile.security.form.'"
+              (isInvalid)="setInvalid($event)"
+              (passwordValue)="setPasswordValue($event)"
+              (currentPasswordValue)="setCurrentPasswordValue($event)"
+            ></ds-profile-page-security-form>
+          </div>
+        </div>
+      }
+      <div class="col-12 text-end pe-0">
+        <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
       </div>
+      @if ((groupsRD$ | async); as groupsRD;) {
+        <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+        <ng-template #content>
+          @if (groupsRD?.payload) {
+            <ds-pagination
+              [hideGear]="true"
+              [hidePagerWhenSinglePage]="true"
+              [hidePaginationDetail]="true"
+              [paginationOptions]="optionsGroupsPagination"
+              [collectionSize]="groupsRD?.payload?.totalElements">
+              @if (groupsRD?.payload?.page; as groups) {
+                @if (groups?.length > 0) {
+                  <div>
+                    <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+                    <ul class="list-group list-group-flush">
+                      @for (group of groups; track group) {
+                        <li class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+                      }
+                    </ul>
+                  </div>
+                }
+              }
+            </ds-pagination>
+          }
+        </ng-template>
+        <ng-template #loader>
+          <ds-loading [showMessage]="false"></ds-loading>
+        </ng-template>
+        @if (groupsRD?.hasFailed) {
+          <ds-error message="{{ 'error.profile-groups' | translate }}"></ds-error>
+        }
+      }
+      <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
+        @if (specialGroups?.length > 0) {
+          <div data-test="specialGroups">
+            <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
+            <ul class="list-group list-group-flush">
+              @for (specialGroup of specialGroups; track specialGroup) {
+                <li class="list-group-item">
+                  {{ dsoNameService.getName(specialGroup) }}
+                </li>
+              }
+            </ul>
+          </div>
+        }
+      </ng-container>
     </div>
-    <div *ngIf="canChangePassword$ | async" class="card mb-4 security-section">
-      <div class="card-header">{{'profile.card.security' | translate}}</div>
-      <div class="card-body">
-        <ds-profile-page-security-form
-                [FORM_PREFIX]="'profile.security.form.'"
-                (isInvalid)="setInvalid($event)"
-                (passwordValue)="setPasswordValue($event)"
-                (currentPasswordValue)="setCurrentPasswordValue($event)"
-        ></ds-profile-page-security-form>
-      </div>
-    </div>
-    <div class="col-12 text-end pe-0">
-      <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
-    </div>
-
-    <ng-container *ngIf="(groupsRD$ | async) as groupsRD;">
-      <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
-      <ng-template #content>
-        <ds-pagination *ngIf="groupsRD?.payload"
-                       [hideGear]="true"
-                       [hidePagerWhenSinglePage]="true"
-                       [hidePaginationDetail]="true"
-                       [paginationOptions]="optionsGroupsPagination"
-                       [collectionSize]="groupsRD?.payload?.totalElements">
-          <ng-container *ngIf="groupsRD?.payload?.page as groups">
-            <div *ngIf="groups?.length > 0">
-              <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
-              <ul class="list-group list-group-flush">
-                <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-              </ul>
-            </div>
-          </ng-container>
-        </ds-pagination>
-      </ng-template>
-      <ng-template #loader>
-        <ds-loading [showMessage]="false"></ds-loading>
-      </ng-template>
-      <ds-error *ngIf="groupsRD?.hasFailed" message="{{ 'error.profile-groups' | translate }}"></ds-error>
-    </ng-container>
-
-    <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
-      <div *ngIf="specialGroups?.length > 0" data-test="specialGroups">
-        <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
-            {{ dsoNameService.getName(specialGroup) }}
-          </li>
-        </ul>
-     </div>
-    </ng-container>
-  </div>
+  }
 </ng-container>
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index 43db6ac1f1..8171565766 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,66 +1,77 @@
 <div class="container">
-    <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
-    <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
+  <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
+  <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
-    <p *ngIf="validMailDomains.length !== 0 && typeRequest === TYPE_REQUEST_REGISTER">
+  @if (validMailDomains.length !== 0 && typeRequest === TYPE_REQUEST_REGISTER) {
+    <p>
       {{ MESSAGE_PREFIX + '.info.maildomain' | translate}} {{ validMailDomains.join(', ')}}
     </p>
+  }
 
-    <form [class]="'ng-invalid'" [formGroup]="form">
-
-        <div class="mb-3">
-            <div class="row">
-                <div class="col-12">
-                    <label class="fw-bold form-label"
-                           for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
-                    <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"
-                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
-                           [attr.aria-invalid]="email.invalid"/>
-                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
-                        {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
-                    </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
-                        {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
-                        <ng-container *ngIf="validMailDomains.length > 0">
-                          {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
-                        </ng-container>
-                    </span>
-                    </div>
-                </div>
-                <div class="col-12">
-                    {{MESSAGE_PREFIX + '.email.hint' |translate}}
-                </div>
+  <form [class]="'ng-invalid'" [formGroup]="form">
 
+    <div class="mb-3">
+      <div class="row">
+        <div class="col-12">
+          <label class="fw-bold form-label"
+          for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
+          <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+            type="text" id="email" formControlName="email"
+            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
+            [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
+            [attr.aria-invalid]="email.invalid"/>
+          @if (email.invalid && (email.dirty || email.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (email.errors && email.errors.required) {
+                <span id="email-errors-required">
+                  {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
+                </span>
+              }
+              @if (email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)) {
+                <span id="email-error-not-valid">
+                  {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
+                  @if (validMailDomains.length > 0) {
+                    {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
+                  }
+                </span>
+              }
             </div>
-
+          }
+        </div>
+        <div class="col-12">
+          {{MESSAGE_PREFIX + '.email.hint' |translate}}
         </div>
 
-    <ds-alert [type]="AlertTypeEnum.Warning" *ngIf="registrationVerification && !isRecaptchaCookieAccepted()">
-      <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
-      <p class="m-0"><a href="javascript:void(0);" (click)="this.orejimeService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
-    </ds-alert>
+      </div>
 
-    <div class="my-3" *ngIf="isRecaptchaCookieAccepted() && (googleRecaptchaService.captchaVersion() | async) === 'v2'">
-      <ds-google-recaptcha [captchaMode]="(googleRecaptchaService.captchaMode() | async)"
-                           (executeRecaptcha)="register($event)" (checkboxChecked)="onCheckboxChecked($event)"
-                           (showNotification)="showNotification($event)"></ds-google-recaptcha>
     </div>
 
-    <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
+    @if (registrationVerification && !isRecaptchaCookieAccepted()) {
+      <ds-alert [type]="AlertTypeEnum.Warning">
+        <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
+        <p class="m-0"><a href="javascript:void(0);" (click)="this.orejimeService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
+      </ds-alert>
+    }
+
+    @if (isRecaptchaCookieAccepted() && (googleRecaptchaService.captchaVersion() | async) === 'v2') {
+      <div class="my-3">
+        <ds-google-recaptcha [captchaMode]="(googleRecaptchaService.captchaMode() | async)"
+          (executeRecaptcha)="register($event)" (checkboxChecked)="onCheckboxChecked($event)"
+        (showNotification)="showNotification($event)"></ds-google-recaptcha>
+      </div>
+    }
+
+    @if ((!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'))) {
       <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
-    </ng-container>
-
-    <ng-template #v2Invisible>
+    } @else {
       <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
-    </ng-template>
-    </form>
+    }
+
+  </form>
 
 </div>
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index 800ffa2a70..987863ef27 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -1,91 +1,94 @@
-<div class="container" *ngIf="(registration$ |async)">
+@if ((registration$ |async)) {
+  <div class="container">
     <h3 class="mb-4">{{'register-page.create-profile.header' | translate}}</h3>
     <div class="card mb-4">
-        <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
-        <div class="card-body">
-            <div class="row">
+      <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
+      <div class="card-body">
+        <div class="row">
+          <div class="col-12">
+            <label class="fw-bold form-label me-4"
+            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
+            <span id="email">{{(registration$ |async).email}}</span></div>
+          </div>
+          <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
+            <div class="mb-3">
+              <div class="row">
                 <div class="col-12">
-                    <label class="fw-bold form-label me-4"
-                           for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
-                    <span id="email">{{(registration$ |async).email}}</span></div>
-            </div>
-            <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
-
-                <div class="mb-3">
-                    <div class="row">
-                        <div class="col-12">
-                            <label for="firstName" class="form-label">{{'register-page.create-profile.identification.first-name' | translate}}</label>
-                            <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
-                                   type="text" id="firstName" formControlName="firstName"/>
-                            <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)"
-                                 class="invalid-feedback show-feedback">
-                    <span *ngIf="firstName.errors && firstName.errors.required">
-                        {{ 'register-page.create-profile.identification.first-name.error' | translate }}
-                    </span>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label
-                                    for="lastName" class="form-label">{{'register-page.create-profile.identification.last-name' | translate}}</label>
-                            <input
-                                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
-                                    id="lastName" formControlName="lastName">
-                            <div *ngIf="lastName.invalid && (lastName.dirty || lastName.touched)"
-                                 class="invalid-feedback show-feedback">
-                    <span *ngIf="lastName.errors && lastName.errors.required">
-                        {{ 'register-page.create-profile.identification.last-name.error' | translate }}
-                    </span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label class="form-label"
-                                    for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
-                            <input class="form-control" id="contactPhone" formControlName="contactPhone">
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label class="form-label"
-                                    for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
-
-                            <select id="language" formControlName="language" class="form-select">
-                                <option [value]="''"></option>
-                                <option *ngFor="let lang of activeLangs" [value]="lang.code">{{lang.label}}</option>
-                            </select>
-                        </div>
+                  <label for="firstName" class="form-label">{{'register-page.create-profile.identification.first-name' | translate}}</label>
+                  <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
+                    type="text" id="firstName" formControlName="firstName"/>
+                  @if (firstName.invalid && (firstName.dirty || firstName.touched)) {
+                    <div
+                      class="invalid-feedback show-feedback">
+                      @if (firstName.errors && firstName.errors.required) {
+                        <span>
+                          {{ 'register-page.create-profile.identification.first-name.error' | translate }}
+                        </span>
+                      }
                     </div>
+                  }
                 </div>
-            </form>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label
+                  for="lastName" class="form-label">{{'register-page.create-profile.identification.last-name' | translate}}</label>
+                  <input
+                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
+                    id="lastName" formControlName="lastName">
+                  @if (lastName.invalid && (lastName.dirty || lastName.touched)) {
+                    <div
+                      class="invalid-feedback show-feedback">
+                      @if (lastName.errors && lastName.errors.required) {
+                        <span>
+                          {{ 'register-page.create-profile.identification.last-name.error' | translate }}
+                        </span>
+                      }
+                    </div>
+                  }
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label class="form-label"
+                  for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
+                  <input class="form-control" id="contactPhone" formControlName="contactPhone">
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label class="form-label"
+                  for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
+                  <select id="language" formControlName="language" class="form-select">
+                    <option [value]="''"></option>
+                    @for (lang of activeLangs; track lang) {
+                      <option [value]="lang.code">{{lang.label}}</option>
+                    }
+                  </select>
+                </div>
+              </div>
+            </div>
+          </form>
         </div>
-    </div>
-
-    <div class="card mb-4">
+      </div>
+      <div class="card mb-4">
         <div class="card-header">{{'register-page.create-profile.security.header' | translate}}</div>
         <div class="card-body">
-
-            <ds-profile-page-security-form
-                    [passwordCanBeEmpty]="false"
-                    [FORM_PREFIX]="'register-page.create-profile.security.'"
-                    (isInvalid)="setInValid($event)"
-                    (passwordValue)="setPasswordValue($event)"
-            ></ds-profile-page-security-form>
+          <ds-profile-page-security-form
+            [passwordCanBeEmpty]="false"
+            [FORM_PREFIX]="'register-page.create-profile.security.'"
+            (isInvalid)="setInValid($event)"
+            (passwordValue)="setPasswordValue($event)"
+          ></ds-profile-page-security-form>
         </div>
-    </div>
-
-
-    <div class="row">
+      </div>
+      <div class="row">
         <div class="col-12">
-            <button
-                    [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
-                    class="btn btn-default btn-primary"
-                    (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
+          <button
+            [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
+            class="btn btn-default btn-primary"
+          (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
+      </div>
     </div>
-
-
-</div>
+  }
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index a6d0187be9..50e3e73470 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -2,9 +2,11 @@
   <div class="mb-3">
     <label for="subject" class="form-label">{{ 'grant-deny-request-copy.email.subject' | translate }}</label>
     <input type="text" class="form-control" id="subject" [ngClass]="{'is-invalid': !subject || subject.length === 0}" [(ngModel)]="subject" name="subject">
-    <div *ngIf="!subject || subject.length === 0" class="invalid-feedback">
-      {{ 'grant-deny-request-copy.email.subject.empty' | translate }}
-    </div>
+    @if (!subject || subject.length === 0) {
+      <div class="invalid-feedback">
+        {{ 'grant-deny-request-copy.email.subject.empty' | translate }}
+      </div>
+    }
   </div>
   <div class="mb-3">
     <label for="message" class="form-label">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
@@ -13,14 +15,14 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [dsBtnDisabled]="!subject || subject.length === 0"
-            class="btn btn-primary"
-            title="{{'grant-deny-request-copy.email.send' | translate }}">
+      [dsBtnDisabled]="!subject || subject.length === 0"
+      class="btn btn-primary"
+      title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
     </button>
     <button (click)="return()"
-            class="btn btn-outline-secondary me-1"
-            title="{{'grant-deny-request-copy.email.back' | translate }}">
+      class="btn btn-outline-secondary me-1"
+      title="{{'grant-deny-request-copy.email.back' | translate }}">
       <i class="fas fa-arrow-left"></i> {{'grant-deny-request-copy.email.back' | translate }}
     </button>
   </div>
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 1a0710f924..1c1aec7a76 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -1,11 +1,12 @@
 <form #ngForm="ngForm">
-  <div *ngIf="showWarning" class="alert alert-warning">
-    {{'access-control-no-access-conditions-warning-message' | translate}}
-  </div>
+  @if (showWarning) {
+    <div class="alert alert-warning">
+      {{'access-control-no-access-conditions-warning-message' | translate}}
+    </div>
+  }
 
-  <ng-container *ngFor="let control of form.accessControls; trackBy: trackById">
+  @for (control of form.accessControls; track trackById($index, control)) {
     <div ngModelGroup="access-control-item-{{control.id}}" class="access-control-item mt-3">
-
       <div class="d-flex flex-column">
         <div>
           <label class="form-label" for="accesscontroloption-{{control.id}}">
@@ -19,92 +20,94 @@
             name="itemName-{{control.id}}"
             class="form-select">
             <option value=""></option>
-            <option *ngFor="let option of dropdownOptions" [value]="option.name">
-              {{ option.name }}
-            </option>
+            @for (option of dropdownOptions; track option) {
+              <option [value]="option.name">
+                {{ option.name }}
+              </option>
+            }
           </select>
           <small class="form-text text-muted">
             {{'access-control-option-note' | translate}}
           </small>
         </div>
-
-        <div *ngIf="control.hasStartDate" class="mt-3">
-          <label class="form-label" for="accesscontrolstartdate-{{control.id}}">
-            {{'access-control-option-start-date' | translate}}
-          </label>
-          <div class="input-group">
-            <input
-              id="accesscontrolstartdate-{{control.id}}"
-              class="form-control"
-              placeholder="yyyy-mm-dd"
-              [(ngModel)]="control.startDate"
-              name="startDate-{{control.id}}"
-              [maxDate]="control.maxStartDate | toDate"
-              ngbDatepicker
-              placement="top-start top-end bottom-start bottom-end"
-              #d="ngbDatepicker"
-            />
-            <div class="input-group-append">
-              <button
-                class="btn btn-outline-secondary fas fa-calendar"
-                [dsBtnDisabled]="ngForm.disabled"
-                (click)="d.toggle()" type="button">
-              </button>
+        @if (control.hasStartDate) {
+          <div class="mt-3">
+            <label class="form-label" for="accesscontrolstartdate-{{control.id}}">
+              {{'access-control-option-start-date' | translate}}
+            </label>
+            <div class="input-group">
+              <input
+                id="accesscontrolstartdate-{{control.id}}"
+                class="form-control"
+                placeholder="yyyy-mm-dd"
+                [(ngModel)]="control.startDate"
+                name="startDate-{{control.id}}"
+                [maxDate]="control.maxStartDate | toDate"
+                ngbDatepicker
+                placement="top-start top-end bottom-start bottom-end"
+                #d="ngbDatepicker"
+                />
+              <div class="input-group-append">
+                <button
+                  class="btn btn-outline-secondary fas fa-calendar"
+                  [dsBtnDisabled]="ngForm.disabled"
+                  (click)="d.toggle()" type="button">
+                </button>
+              </div>
             </div>
+            <small class="form-text text-muted">
+              {{'access-control-option-start-date-note' | translate}}
+            </small>
           </div>
-          <small class="form-text text-muted">
-            {{'access-control-option-start-date-note' | translate}}
-          </small>
-        </div>
-
-        <div *ngIf="control.hasEndDate" class="mt-3">
-          <label class="form-label" for="accesscontrolenddate-{{control.id}}">
-            {{'access-control-option-end-date' | translate}}
-          </label>
-          <div class="input-group">
-            <input
-              id="accesscontrolenddate-{{control.id}}"
-              class="form-control"
-              placeholder="yyyy-mm-dd"
-              [(ngModel)]="control.endDate"
-              name="endDate-{{control.id}}"
-              [maxDate]="control.maxEndDate | toDate"
-              ngbDatepicker
-              placement="top-start top-end bottom-start bottom-end"
-              #d1="ngbDatepicker"
-            />
-            <div class="input-group-append">
-              <button
-                type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [dsBtnDisabled]="ngForm.disabled"
-                (click)="d1.toggle()">
-              </button>
+        }
+        @if (control.hasEndDate) {
+          <div class="mt-3">
+            <label class="form-label" for="accesscontrolenddate-{{control.id}}">
+              {{'access-control-option-end-date' | translate}}
+            </label>
+            <div class="input-group">
+              <input
+                id="accesscontrolenddate-{{control.id}}"
+                class="form-control"
+                placeholder="yyyy-mm-dd"
+                [(ngModel)]="control.endDate"
+                name="endDate-{{control.id}}"
+                [maxDate]="control.maxEndDate | toDate"
+                ngbDatepicker
+                placement="top-start top-end bottom-start bottom-end"
+                #d1="ngbDatepicker"
+                />
+              <div class="input-group-append">
+                <button
+                  type="button" class="btn btn-outline-secondary fas fa-calendar"
+                  [dsBtnDisabled]="ngForm.disabled"
+                  (click)="d1.toggle()">
+                </button>
+              </div>
             </div>
+            <small class="form-text text-muted">
+              {{'access-control-option-end-date-note' | translate}}
+            </small>
           </div>
-          <small class="form-text text-muted">
-            {{'access-control-option-end-date-note' | translate}}
-          </small>
-        </div>
+        }
       </div>
-
       <div>
         <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
         <div class="input-group">
-
           <button type="button" class="btn btn-outline-danger"
-                  [attr.aria-label]="'access-control-remove' | translate"
-                  [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
-                  (click)="removeAccessControlItem(control.id)">
+            [attr.aria-label]="'access-control-remove' | translate"
+            [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
+            (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
         </div>
       </div>
     </div>
-  </ng-container>
+  }
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [dsBtnDisabled]="ngForm.disabled"
-          (click)="addAccessControlItem()">
+    [dsBtnDisabled]="ngForm.disabled"
+    (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
   </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index 119de6fe80..e4e43bafa9 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -1,12 +1,13 @@
 <div class="container">
   <div class="card border-0">
     <div class="card-body">
-      <ds-alert
-        *ngIf="titleMessage"
-        [type]="AlertType.Info"
-        [content]="titleMessage"
-        class="d-block pb-3">
-      </ds-alert>
+      @if (titleMessage) {
+        <ds-alert
+          [type]="AlertType.Info"
+          [content]="titleMessage"
+          class="d-block pb-3">
+        </ds-alert>
+      }
 
       <div class="row mt-5">
         <div class="col-12 col-md-6 border-end d-flex flex-column justify-content-between">
@@ -30,18 +31,18 @@
               <div class="col-12 col-md-8">
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
-                         name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
-                         [(ngModel)]="state.item.accessMode">
+                    name="itemMode" id="itemReplace" value="replace"
+                    [disabled]="!state.item.toggleStatus"
+                    [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
                   </label>
                 </div>
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
-                         name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
-                         [(ngModel)]="state.item.accessMode">
+                    name="itemMode" id="itemAdd" value="add"
+                    [disabled]="!state.item.toggleStatus"
+                    [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
                   </label>
@@ -75,42 +76,43 @@
               </ui-switch>
             </div>
 
-            <div *ngIf="showLimitToSpecificBitstreams" class="row mt-3">
-            <fieldset class="col-12">
-              <legend class="h4">
-                {{'access-control-limit-to-specific' | translate}}
-              </legend>
-              <div class="form-check">
-                <input class="form-check-input" type="radio"
-                       name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.changesLimit">
-                <label class="form-check-label" for="processAll">
-                  {{'access-control-process-all-bitstreams' | translate}}
-                </label>
+            @if (showLimitToSpecificBitstreams) {
+              <div class="row mt-3">
+                <fieldset class="col-12">
+                  <legend class="h4">
+                    {{'access-control-limit-to-specific' | translate}}
+                  </legend>
+                  <div class="form-check">
+                    <input class="form-check-input" type="radio"
+                      name="changesLimit" id="processAll" value="all"
+                      [disabled]="!state.bitstream.toggleStatus"
+                      [(ngModel)]="state.bitstream.changesLimit">
+                    <label class="form-check-label" for="processAll">
+                      {{'access-control-process-all-bitstreams' | translate}}
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input mt-2" type="radio"
+                      name="changesLimit" id="processSelected" value="selected"
+                      [disabled]="!state.bitstream.toggleStatus"
+                      [(ngModel)]="state.bitstream.changesLimit">
+                    <label class="form-check-label" for="processSelected">
+                      {{ state.bitstream.selectedBitstreams.length }}
+                      {{'access-control-bitstreams-selected' | translate}}
+                      @if (itemRD) {
+                        <button
+                          [attr.aria-label]="'access-control-bitstreams-select' | translate"
+                          [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                          (click)="openSelectBitstreamsModal(itemRD.payload)"
+                          class="btn btn-outline-dark border-0" type="button">
+                          <i class="fa fa-search"></i>
+                        </button>
+                      }
+                    </label>
+                  </div>
+                </fieldset>
               </div>
-              <div class="form-check">
-                <input class="form-check-input mt-2" type="radio"
-                       name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.changesLimit">
-                <label class="form-check-label" for="processSelected">
-                  {{ state.bitstream.selectedBitstreams.length }}
-                  {{'access-control-bitstreams-selected' | translate}}
-
-                  <button
-                    *ngIf="itemRD"
-                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
-                    (click)="openSelectBitstreamsModal(itemRD.payload)"
-                    class="btn btn-outline-dark border-0" type="button">
-                    <i class="fa fa-search"></i>
-                  </button>
-
-                </label>
-              </div>
-            </fieldset>
-            </div>
+            }
           </div>
 
           <fieldset class="row mt-3">
@@ -120,18 +122,18 @@
             <div class="col-12 col-md-8">
               <div class="form-check">
                 <input class="form-check-input" type="radio"
-                       name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.accessMode">
+                  name="bitstreamMode" id="bitstreamReplace" value="replace"
+                  [disabled]="!state.bitstream.toggleStatus"
+                  [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
                 </label>
               </div>
               <div class="form-check">
                 <input class="form-check-input" type="radio"
-                       name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.accessMode">
+                  name="bitstreamMode" id="bitstreamAdd" value="add"
+                  [disabled]="!state.bitstream.toggleStatus"
+                  [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
                 </label>
@@ -152,18 +154,22 @@
         </div>
       </div>
 
-      <hr *ngIf="showSubmit">
+      @if (showSubmit) {
+        <hr>
+        }
 
-      <div *ngIf="showSubmit" class="d-flex justify-content-end">
-        <button class="btn btn-outline-primary me-3" (click)="reset()" type="button">
-          {{ 'access-control-cancel' | translate }}
-        </button>
-        <button class="btn btn-primary"
-                [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
-                (click)="submit()" type="submit">
-          {{ 'access-control-execute' | translate }}
-        </button>
+        @if (showSubmit) {
+          <div class="d-flex justify-content-end">
+            <button class="btn btn-outline-primary me-3" (click)="reset()" type="button">
+              {{ 'access-control-cancel' | translate }}
+            </button>
+            <button class="btn btn-primary"
+              [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+              (click)="submit()" type="submit">
+              {{ 'access-control-execute' | translate }}
+            </button>
+          </div>
+        }
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
index 4aed6fe128..5773e9395a 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
@@ -3,32 +3,33 @@
     {{'access-control-select-bitstreams-modal.title' | translate}}
   </h4>
   <button type="button" class="btn-close" aria-label="Close"
-          (click)="activeModal.dismiss('Cross click')">
+    (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body">
-  <ng-container *ngIf="data$ | async as data">
-    <ds-viewable-collection
-      *ngIf="data.payload.page.length > 0"
-      [config]="paginationConfig"
-      [context]="context"
-      [objects]="data"
-      [selectable]="true"
-      [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
-      [showPaginator]="true"
-      (pageChange)="loadForPage($event)">
-    </ds-viewable-collection>
-
-    <div *ngIf="data && data.payload.page.length === 0"
-      class="alert alert-info w-100" role="alert">
-      {{'access-control-select-bitstreams-modal.no-items' | translate}}
-    </div>
-
-  </ng-container>
+  @if (data$ | async; as data) {
+    @if (data.payload.page.length > 0) {
+      <ds-viewable-collection
+        [config]="paginationConfig"
+        [context]="context"
+        [objects]="data"
+        [selectable]="true"
+        [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
+        [showPaginator]="true"
+        (pageChange)="loadForPage($event)">
+      </ds-viewable-collection>
+    }
+    @if (data && data.payload.page.length === 0) {
+      <div
+        class="alert alert-info w-100" role="alert">
+        {{'access-control-select-bitstreams-modal.no-items' | translate}}
+      </div>
+    }
+  }
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-outline-dark"
-          (click)="activeModal.close('Close click')">
+    (click)="activeModal.close('Close click')">
     {{'access-control-select-bitstreams-modal.close' | translate}}
   </button>
 </div>
diff --git a/src/app/shared/alert/alert.component.html b/src/app/shared/alert/alert.component.html
index 560dfa0794..ae5732b25a 100644
--- a/src/app/shared/alert/alert.component.html
+++ b/src/app/shared/alert/alert.component.html
@@ -1,8 +1,12 @@
-<div *ngIf="!dismissed" class="alert {{type}} alert-dismissible fade show w-100 p-3" role="alert" [@enterLeave]="animate">
-  <span *ngIf="content" [innerHTML]="content | translate"></span>
-
-  <ng-content></ng-content>
-
-  <button *ngIf="dismissible" type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
-  </button>
-</div>
+@if (!dismissed) {
+  <div class="alert {{type}} alert-dismissible fade show w-100 p-3" role="alert" [@enterLeave]="animate">
+    @if (content) {
+      <span [innerHTML]="content | translate"></span>
+    }
+    <ng-content></ng-content>
+    @if (dismissible) {
+      <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
+      </button>
+    }
+  </div>
+}
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 1b279bf16b..4dac66b749 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,52 +1,61 @@
-<div class="navbar-nav me-auto" *ngIf="(isMobile$ | async) !== true; else mobileButtons" data-test="auth-nav">
-  <div *ngIf="(isAuthenticated | async) !== true && (showAuth | async)"
-      class="nav-item"
-      (click)="$event.stopPropagation();">
-    <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
-         (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
-         role="menuitem"
-         aria-haspopup="menu"
-         aria-controls="loginDropdownMenu"
-         [attr.aria-expanded]="loginDrop.isOpen()"
-         ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
-      <div id="loginDropdownMenu" [ngClass]="{'ps-3 pe-3': (loading | async)}" ngbDropdownMenu
-           role="menu"
-           [attr.aria-label]="'nav.login' | translate">
-        <ds-log-in
-          [isStandalonePage]="false"></ds-log-in>
+@if ((isMobile$ | async) !== true) {
+  <div class="navbar-nav me-auto" data-test="auth-nav">
+    @if ((isAuthenticated | async) !== true && (showAuth | async)) {
+      <div
+        class="nav-item"
+        (click)="$event.stopPropagation();">
+        <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+          <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
+            (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
+            role="menuitem"
+            aria-haspopup="menu"
+            aria-controls="loginDropdownMenu"
+            [attr.aria-expanded]="loginDrop.isOpen()"
+          ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
+          <div id="loginDropdownMenu" [ngClass]="{'ps-3 pe-3': (loading | async)}" ngbDropdownMenu
+            role="menu"
+            [attr.aria-label]="'nav.login' | translate">
+            <ds-log-in
+            [isStandalonePage]="false"></ds-log-in>
+          </div>
+        </div>
       </div>
+    }
+    @if ((isAuthenticated | async) && (showAuth | async)) {
+      <div class="nav-item">
+        <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+          <a href="javascript:void(0);"
+            role="menuitem"
+            [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
+            aria-controls="user-menu-dropdown"
+            (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
+            class="dropdownLogout px-1"
+            [attr.data-test]="'user-menu' | dsBrowserOnly"
+            ngbDropdownToggle>
+            <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+            <div id="logoutDropdownMenu" ngbDropdownMenu>
+              <ds-user-menu [inExpandableNavbar]="false" (changedRoute)="loggedInDrop.close()"></ds-user-menu>
+            </div>
+          </div>
+        </div>
+      }
     </div>
-  </div>
-  <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);"
-         role="menuitem"
-         [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
-         aria-controls="user-menu-dropdown"
-         (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
-         class="dropdownLogout px-1"
-         [attr.data-test]="'user-menu' | dsBrowserOnly"
-         ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <div id="logoutDropdownMenu" ngbDropdownMenu>
-        <ds-user-menu [inExpandableNavbar]="false" (changedRoute)="loggedInDrop.close()"></ds-user-menu>
-      </div>
+  } @else {
+    <div data-test="auth-nav">
+      @if ((isAuthenticated | async) !== true) {
+        <a routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
+          {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
+        </a>
+      }
+      @if ((isAuthenticated | async)) {
+        <a role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+          <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
+          <span class="sr-only">(current)</span>
+        </a>
+      }
     </div>
-  </div>
-</div>
+  }
 
 
-<ng-template #mobileButtons>
-  <div data-test="auth-nav">
-    <a *ngIf="(isAuthenticated | async) !== true" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
-      {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
-    </a>
-    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
-      <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
-      <span class="sr-only">(current)</span>
-    </a>
-  </div>
-</ng-template>
 
-<!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
+  <!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 751f91fb7b..985de3dfd7 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,44 +1,54 @@
-<div *ngIf="searchField" class="mb-3 w-100 pe-2 ps-2 my-2">
-  <input type="search"
-         class="form-control w-100"
-         (click)="$event.stopPropagation();"
-         placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
-         [formControl]="searchField"
-         #searchFieldEl>
-</div>
+@if (searchField) {
+  <div class="mb-3 w-100 pe-2 ps-2 my-2">
+    <input type="search"
+      class="form-control w-100"
+      (click)="$event.stopPropagation();"
+      placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
+      [formControl]="searchField"
+      #searchFieldEl>
+  </div>
+}
 <div class="dropdown-divider m-0"></div>
 <ul class="scrollable-menu p-0 m-0"
-    role="menu"
-     (scroll)="onScroll($event)"
-     infiniteScroll
-     [infiniteScrollDistance]="1.5"
-     [infiniteScrollThrottle]="0"
-     [infiniteScrollUpDistance]="1.5"
-     [fromRoot]="true"
-     [scrollWindow]="false"
-     (scrolled)="onScrollDown()">
+  role="menu"
+  (scroll)="onScroll($event)"
+  infiniteScroll
+  [infiniteScrollDistance]="1.5"
+  [infiniteScrollThrottle]="0"
+  [infiniteScrollUpDistance]="1.5"
+  [fromRoot]="true"
+  [scrollWindow]="false"
+  (scrolled)="onScrollDown()">
 
-  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length === 0 && (isLoading | async) !== true">
-    {{'submission.sections.general.no-collection' | translate}}
-  </li>
-  <ng-container *ngIf="searchListCollection?.length > 0">
-    <li *ngFor="let listItem of searchListCollection"
-            class="dropdown-item collection-item"
-            role="menuitem"
-            title="{{ listItem.collection.name }}"
-            (click)="onSelect(listItem)">
-      <div class="list-unstyled mb-0">
-        <div class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
-          {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
-        </div>
-        <div class="list-item text-truncate text-primary fw-bold">{{ listItem.collection.name}}</div>
-      </div>
+  @if (searchListCollection?.length === 0 && (isLoading | async) !== true) {
+    <li class="dropdown-item disabled" role="menuitem">
+      {{'submission.sections.general.no-collection' | translate}}
     </li>
-  </ng-container>
-  <li *ngIf="(isLoading | async)">
-    <button class="dropdown-item disabled">
-      <ds-loading message="{{'loading.default' | translate}}">
-      </ds-loading>
-    </button>
-  </li>
+  }
+  @if (searchListCollection?.length > 0) {
+    @for (listItem of searchListCollection; track listItem) {
+      <li
+        class="dropdown-item collection-item"
+        role="menuitem"
+        title="{{ listItem.collection.name }}"
+        (click)="onSelect(listItem)">
+        <div class="list-unstyled mb-0">
+          @for (item of listItem.communities; track item) {
+            <div class="list-item text-truncate text-secondary">
+              {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
+            </div>
+          }
+          <div class="list-item text-truncate text-primary fw-bold">{{ listItem.collection.name}}</div>
+        </div>
+      </li>
+    }
+  }
+  @if ((isLoading | async)) {
+    <li>
+      <button class="dropdown-item disabled">
+        <ds-loading message="{{'loading.default' | translate}}">
+        </ds-loading>
+      </button>
+    </li>
+  }
 </ul>
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index d99e740b07..084efd2094 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -4,42 +4,52 @@
       <label class="form-label">{{type.value + '.edit.logo.label' | translate}}</label>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
-      <div class="col-12 d-inline-block alert" id="logo-section" *ngIf="logo">
-        <div class="row">
-          <div class="col-8 d-inline-block">
-            <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
-          </div>
-          <div class="col-4 d-inline-block">
-            <div *ngIf="logo" class="float-end">
-              <button
-                (click)="confirmLogoDeleteWithModal()"
-                class="btn btn-danger"
-                type="button">{{ 'community.edit.logo.delete.title' | translate }}
-              </button>
+      @if (logo) {
+        <div class="col-12 d-inline-block alert" id="logo-section">
+          <div class="row">
+            <div class="col-8 d-inline-block">
+              <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
+            </div>
+            <div class="col-4 d-inline-block">
+              @if (logo) {
+                <div class="float-end">
+                  <button
+                    (click)="confirmLogoDeleteWithModal()"
+                    class="btn btn-danger"
+                    type="button">{{ 'community.edit.logo.delete.title' | translate }}
+                  </button>
+                </div>
+              }
             </div>
           </div>
         </div>
-      </div>
-      <div *ngIf="!logo" class="col-12 d-inline-block">
-        <ds-uploader  *ngIf="initializedUploaderOptions | async"
-                      [ariaLabel]="type.value + '.browse.logo'"
-                      [dropMsg]="type.value + '.edit.logo.upload'"
-                      [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
-                      [enableDragOverDocument]="true"
-                      [uploadFilesOptions]="uploadFilesOptions"
-                      (onCompleteItem)="onCompleteItem()"
-                      (onUploadError)="onUploadError()"></ds-uploader>
-      </div>
+      }
+      @if (!logo) {
+        <div class="col-12 d-inline-block">
+          @if (initializedUploaderOptions | async) {
+            <ds-uploader
+              [ariaLabel]="type.value + '.browse.logo'"
+              [dropMsg]="type.value + '.edit.logo.upload'"
+              [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
+              [enableDragOverDocument]="true"
+              [uploadFilesOptions]="uploadFilesOptions"
+              (onCompleteItem)="onCompleteItem()"
+            (onUploadError)="onUploadError()"></ds-uploader>
+          }
+        </div>
+      }
     </ng-container>
   </div>
 </div>
-<ds-form *ngIf="formModel"
-         [formId]="'comcol-form-id'"
-         [formModel]="formModel"
-         [displayCancel]="false"
-         (submitForm)="onSubmit()">
-  <button (click)="back.emit()" before class="btn btn-outline-secondary" type="button">
-    <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
-  </button>
-</ds-form>
+@if (formModel) {
+  <ds-form
+    [formId]="'comcol-form-id'"
+    [formModel]="formModel"
+    [displayCancel]="false"
+    (submitForm)="onSubmit()">
+    <button (click)="back.emit()" before class="btn btn-outline-secondary" type="button">
+      <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
+    </button>
+  </ds-form>
+}
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index ac58bf79c7..b719f3080d 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -5,34 +5,38 @@
         <h1>{{ type + '.edit.head' | translate }}</h1>
         <div class="my-auto">
           <a class="btn btn-danger"
-             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
-             data-test="delete-button">
+            [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
+            data-test="delete-button">
             <i class="fas fa-trash" aria-hidden="true"></i> {{type + '.edit.delete' | translate}}</a>
-        </div>
-      </div>
-      <div class="pt-2">
-        <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
-          <li *ngFor="let page of pages" class="nav-item" role="presentation">
-            <a class="nav-link" role="tab"
-               [attr.aria-selected]="page === currentPage"
-               [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]"
-               [attr.data-test]="page">
-              {{ type + '.edit.tabs.' + page + '.head' | translate}}
-            </a>
-          </li>
-        </ul>
-        <div class="tab-pane active">
-          <div class="mb-4">
-            <router-outlet></router-outlet>
           </div>
-          <div class="col-12 text-end custom-alignment">
-            <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
-              <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
-            </a>
+        </div>
+        <div class="pt-2">
+          <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
+            @for (page of pages; track page) {
+              <li class="nav-item" role="presentation">
+                <a class="nav-link" role="tab"
+                  [attr.aria-selected]="page === currentPage"
+                  [ngClass]="{'active' : page === currentPage}"
+                  [routerLink]="['./' + page]"
+                  [attr.data-test]="page">
+                  {{ type + '.edit.tabs.' + page + '.head' | translate}}
+                </a>
+              </li>
+            }
+          </ul>
+          <div class="tab-pane active">
+            <div class="mb-4">
+              <router-outlet></router-outlet>
+            </div>
+            <div class="col-12 text-end custom-alignment">
+              @if (!hideReturnButton) {
+                <a [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
+                  <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
+                </a>
+              }
+            </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index 0ad9448099..c88bb16afc 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,30 +1,34 @@
 <h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
-<nav *ngIf="(allOptions$ | async) as allOptions" class="comcol-browse mb-4" aria-label="Browse Community or Collection">
-  <div class="d-none d-sm-block">
-
-    <div class="list-group list-group-horizontal" role="tablist">
-      <a *ngFor="let option of allOptions"
-         [attr.aria-current]="(currentOption$ | async)?.id === option.id"
-         class="list-group-item"
-         role="tab"
-         [routerLink]="option.routerLink"
-         [queryParams]="option.params"
-         [class.active]="(currentOption$ | async)?.id === option.id">
-        {{ option.label | translate }}
-      </a>
+@if ((allOptions$ | async); as allOptions) {
+  <nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
+    <div class="d-none d-sm-block">
+      <div class="list-group list-group-horizontal" role="tablist">
+        @for (option of allOptions; track option) {
+          <a
+            [attr.aria-current]="(currentOption$ | async)?.id === option.id"
+            class="list-group-item"
+            role="tab"
+            [routerLink]="option.routerLink"
+            [queryParams]="option.params"
+            [class.active]="(currentOption$ | async)?.id === option.id">
+            {{ option.label | translate }}
+          </a>
+        }
+      </div>
     </div>
-  </div>
-
-  <div class="d-block d-sm-none">
-    <select name="browse-type"
-            class="form-select"
-            aria-label="Browse Community or Collection"
-            (change)="onSelectChange($event)">
-      <option *ngFor="let option of allOptions"
-              [value]="option.id"
-              [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
-        {{ option.label | translate }}
-      </option>
-    </select>
-  </div>
-</nav>
+    <div class="d-block d-sm-none">
+      <select name="browse-type"
+        class="form-select"
+        aria-label="Browse Community or Collection"
+        (change)="onSelectChange($event)">
+        @for (option of allOptions; track option) {
+          <option
+            [value]="option.id"
+            [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
+            {{ option.label | translate }}
+          </option>
+        }
+      </select>
+    </div>
+  </nav>
+}
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
index 8f770b915a..7b299e8a37 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -1,55 +1,59 @@
-<div *ngIf="(this.submitted$ | async) !== true; else waiting">
-  <div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header">
-    {{ 'item.qa.withdrawn.modal.header' | translate }}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <div class="form-group">
-      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
-                                              : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
-      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
-                                              : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
-      <textarea class="form-control" id="reason"
-                rows="6"
-                [(ngModel)]="reason"
+@if ((this.submitted$ | async) !== true) {
+  <div>
+    @if (this.canWithdraw) {
+      <div class="modal-header">
+        {{ 'item.qa.withdrawn.modal.header' | translate }}
+        <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+          <span aria-hidden="true">×</span>
+        </button>
+      </div>
+    } @else {
+      @if (!this.canWithdraw) {
+        <div class="modal-header">
+          {{'item.qa.reinstate.modal.header' | translate}}
+          <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+      }
+    }
+    <div class="modal-body">
+      <div class="form-group">
+        <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
+        : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
+        <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
+        : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
+        <textarea class="form-control" id="reason"
+          rows="6"
+          [(ngModel)]="reason"
                 placeholder="{{ this.canWithdraw ? ('qa-withdrown.modal.form.summary.placeholder' | translate)
                                                  : ('qa-reinstate.modal.form.summary.placeholder' | translate) }}"
-                name="message"></textarea>
+        name="message"></textarea>
+      </div>
+    </div>
+    <div class="modal-footer space-children-mr">
+      <button class="btn btn-outline-secondary btn-sm ms-0"
+        type="button"
+        (click)="onModalClose()"
+        title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
+        <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
+      </button>
+      <button class="btn btn-success btn-sm ms-0"
+        type="submit"
+        (click)="onModalSubmit()"
+        title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
+        <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
+        : ('qa-reinstate.create.modal.button.confirm' | translate) }}
+      </button>
     </div>
   </div>
-  <div class="modal-footer space-children-mr">
-    <button class="btn btn-outline-secondary btn-sm ms-0"
-            type="button"
-            (click)="onModalClose()"
-            title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
-      <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
-    </button>
-    <button class="btn btn-success btn-sm ms-0"
-            type="submit"
-            (click)="onModalSubmit()"
-            title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
-      <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
-                                                             : ('qa-reinstate.create.modal.button.confirm' | translate) }}
-    </button>
-  </div>
-</div>
-
-<ng-template #waiting>
+} @else {
   <div class="modal-header">{{'item.qa.withdrawn.modal.submitted.header' | translate}}</div>
   <div class="modal-body">
     <div class="d-flex justify-content-center">
       <ds-loading [showMessage]="false"></ds-loading>
     </div>
   </div>
-</ng-template>
+}
+
 
-<ng-template #reinstateHeader>
-  <div *ngIf="!this.canWithdraw" class="modal-header">
-    {{'item.qa.reinstate.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-</ng-template>
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 3e8b8397af..c5fa369ceb 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -2,24 +2,26 @@
 
   <div ngbDropdown class="btn-group" (openChange)="toggled.emit($event)">
 
-  <span  *ngIf="label" id="dsSelectMenuLabel" class="input-group-text">
-    {{ label | translate }}
-  </span>
+    @if (label) {
+      <span  id="dsSelectMenuLabel" class="input-group-text">
+        {{ label | translate }}
+      </span>
+    }
 
     <button aria-describedby="dsSelectMenuLabel"
-            id="dsSelectMenuButton"
-            class="btn btn-outline-primary selection"
-            (blur)="close.emit($event)"
-            (click)="close.emit($event)"
-            [dsBtnDisabled]="disabled"
-            ngbDropdownToggle>
+      id="dsSelectMenuButton"
+      class="btn btn-outline-primary selection"
+      (blur)="close.emit($event)"
+      (click)="close.emit($event)"
+      [dsBtnDisabled]="disabled"
+      ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
-         id="dsSelectDropdownMenu"
-         aria-labelledby="dsSelectMenuButton">
+      class="dropdown-menu"
+      id="dsSelectDropdownMenu"
+      aria-labelledby="dsSelectMenuButton">
       <div>
         <ng-content select=".menu"></ng-content>
       </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 4e5f4d99d0..bbec6da207 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,21 +1,28 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
-    <div class="d-flex flex-row flex-nowrap"
-         [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
-        <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
-            <li class="nav-item nav-link d-flex flex-row" *ngFor="let subSection of (subSections$ | async)">
-                <div *ngIf="renderIcons$ | async" class="me-2">
-                    <i *ngIf="subSection.icon; else spacer" class="fas fa-{{subSection.icon}} fa-fw"></i>
-                    <ng-template #spacer><i class="fas fa-fw"></i></ng-template>
-                </div>
-                <ng-container
-                        *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
-                </ng-container>
-            </li>
-        </ul>
-    </div>
+  <div class="d-flex flex-row flex-nowrap"
+    [ngbTooltip]="itemModel.text | translate" container="body">
+    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
+      <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </button>
+    <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
+      @for (subSection of (subSections$ | async); track subSection) {
+        <li class="nav-item nav-link d-flex flex-row">
+          @if (renderIcons$ | async) {
+            <div class="me-2">
+              @if (subSection.icon) {
+                <i class="fas fa-{{subSection.icon}} fa-fw"></i>
+              } @else {
+                <i class="fas fa-fw"></i>
+              }
+            </div>
+          }
+          <ng-container
+            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
+          </ng-container>
+        </li>
+      }
+    </ul>
+  </div>
 </div>
 
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
index b5c51d4855..590d7945ec 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -1,6 +1,8 @@
 <div class="dso-edit-menu d-flex">
-    <div *ngFor="let section of (sections | async)" class="ms-1">
-        <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  @for (section of (sections | async); track section) {
+    <div class="ms-1">
+      <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
     </div>
+  }
 </div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index f13d7f70ca..cfe8da849f 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -1,10 +1,10 @@
 <div class="mb-3 w-100 pe-2 ps-2">
-    <input type="search"
-           class="form-control"
-           (click)="$event.stopPropagation();"
-           [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
-           placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
-           [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
+  <input type="search"
+    class="form-control"
+    (click)="$event.stopPropagation();"
+    [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
+    placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
+    [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
 <div id="scrollable-menu-dso-selector-{{randomSeed}}" class="scrollable-menu list-group">
@@ -15,25 +15,31 @@
     [infiniteScrollContainer]="'#scrollable-menu-dso-selector-' + randomSeed"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
-    <ng-container *ngIf="listEntries$ | async">
-      <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="(listEntries$ | async).length === 0">
-        {{'dso-selector.no-results' | translate: { type: typesString } }}
+    @if (listEntries$ | async) {
+      @if ((listEntries$ | async).length === 0) {
+        <button class="list-group-item list-group-item-action border-0 disabled"
+          >
+          {{'dso-selector.no-results' | translate: { type: typesString } }}
+        </button>
+      }
+      @for (listEntry of (listEntries$ | async); track listEntry) {
+        <button
+          class="list-group-item list-group-item-action border-0 list-entry"
+          [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
+          title="{{ getName(listEntry) }}"
+          dsHoverClass="ds-hover"
+          (click)="onClick(listEntry)" #listEntryElement>
+          <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
+          [linkType]=linkTypes.None [context]="getContext(listEntry['id'])"></ds-listable-object-component-loader>
+        </button>
+      }
+    }
+    @if (loading) {
+      <button
+        title="{{'loading.default' | translate}}"
+        class="list-group-item list-group-item-action border-0 list-entry">
+        <ds-loading [showMessage]="false"></ds-loading>
       </button>
-      <button *ngFor="let listEntry of (listEntries$ | async)"
-              class="list-group-item list-group-item-action border-0 list-entry"
-              [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
-              title="{{ getName(listEntry) }}"
-              dsHoverClass="ds-hover"
-              (click)="onClick(listEntry)" #listEntryElement>
-        <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                             [linkType]=linkTypes.None [context]="getContext(listEntry['id'])"></ds-listable-object-component-loader>
-      </button>
-    </ng-container>
-    <button *ngIf="loading"
-            title="{{'loading.default' | translate}}"
-            class="list-group-item list-group-item-action border-0 list-entry">
-      <ds-loading [showMessage]="false"></ds-loading>
-    </button>
+    }
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 2f04098e8b..8a7a4af89b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -1,20 +1,22 @@
 <div>
-    <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
-        </button>
-    </div>
-    <div class="modal-body">
-      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @if ((isAdmin$ | async)) {
+      <div data-test="admin-div">
         <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
         <div class="h3 position-relative py-1 my-3 fw-normal">
-            <hr>
+          <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
-                <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
+              <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
+          </div>
         </div>
-      </div>
-        <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+      }
+      <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
+      <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
-</div>
+  </div>
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index dc49fcaa8a..f86e9a2b08 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -50,7 +47,6 @@ import {
   imports: [
     AsyncPipe,
     DSOSelectorComponent,
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index dd73e82584..4f09f88352 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -1,32 +1,38 @@
 <ul class="scrollable-menu list-unstyled mb-0"
-    role="menu"
-    (scroll)="onScroll($event)"
-    infiniteScroll
-    [infiniteScrollDistance]="5"
-    [infiniteScrollThrottle]="300"
-    [infiniteScrollUpDistance]="1.5"
-    [fromRoot]="true"
-    [scrollWindow]="false"
-    (scrolled)="onScrollDown()">
-  <li *ngIf="searchListEntity?.length === 0 && (isLoadingList | async) !== true">
-    <button class="dropdown-item disabled" role="menuitem">
-      {{'submission.sections.general.no-entity' | translate}}
-    </button>
-  </li>
-  <li *ngFor="let listItem of searchListEntity" class="entity-item text-primary">
-    <button class="dropdown-item"
-            role="menuitem"
-            title="{{ listItem.label }}"
-            (click)="onSelect(listItem)">
-      <ul class="list-unstyled mb-0">
-        <li class="list-item text-truncate text-primary fw-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
-      </ul>
-    </button>
-  </li>
-  <li *ngIf="(isLoadingList | async)">
-    <button class="dropdown-item disabled" role="menuitem">
-      <ds-loading message="{{'loading.default' | translate}}">
-      </ds-loading>
-    </button>
-  </li>
+  role="menu"
+  (scroll)="onScroll($event)"
+  infiniteScroll
+  [infiniteScrollDistance]="5"
+  [infiniteScrollThrottle]="300"
+  [infiniteScrollUpDistance]="1.5"
+  [fromRoot]="true"
+  [scrollWindow]="false"
+  (scrolled)="onScrollDown()">
+  @if (searchListEntity?.length === 0 && (isLoadingList | async) !== true) {
+    <li>
+      <button class="dropdown-item disabled" role="menuitem">
+        {{'submission.sections.general.no-entity' | translate}}
+      </button>
+    </li>
+  }
+  @for (listItem of searchListEntity; track listItem) {
+    <li class="entity-item text-primary">
+      <button class="dropdown-item"
+        role="menuitem"
+        title="{{ listItem.label }}"
+        (click)="onSelect(listItem)">
+        <ul class="list-unstyled mb-0">
+          <li class="list-item text-truncate text-primary fw-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
+        </ul>
+      </button>
+    </li>
+  }
+  @if ((isLoadingList | async)) {
+    <li>
+      <button class="dropdown-item disabled" role="menuitem">
+        <ds-loading message="{{'loading.default' | translate}}">
+        </ds-loading>
+      </button>
+    </li>
+  }
 </ul>
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 5b47f6eb4a..e305d2a82b 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,9 +1,11 @@
 <a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out"
-   [queryParams]="(bitstreamPath$| async)?.queryParams"
-   [target]="isBlank ? '_blank': '_self'"
-   [ngClass]="cssClasses"
-   [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
-  <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pe-1"><i class="fas fa-lock"></i></span>
+  [queryParams]="(bitstreamPath$| async)?.queryParams"
+  [target]="isBlank ? '_blank': '_self'"
+  [ngClass]="cssClasses"
+  [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
+  @if ((canDownload$ |async) !== true) {
+    <span role="img" [attr.aria-label]="'file-download-link.restricted' | translate" class="pe-1"><i class="fas fa-lock"></i></span>
+  }
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 195c1b561e..606fee1a7e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,13 +1,15 @@
 <div [class.mb-3]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-3')"
-     [class.d-none]="model.hidden"
-     [formGroup]="group"
-     [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
-  <label *ngIf="!isCheckbox && hasLabel"
-         [id]="'label_' + model.id"
-         [for]="id"
-         class="form-label"
-         [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
-         [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
+  [class.d-none]="model.hidden"
+  [formGroup]="group"
+  [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
+  @if (!isCheckbox && hasLabel) {
+    <label
+      [id]="'label_' + model.id"
+      [for]="id"
+      class="form-label"
+      [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
+    [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
+  }
   <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: { $implicit: model };"></ng-container>
   <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
   <div [ngClass]="{'row': model.hasLanguages || isRelationship,
@@ -17,69 +19,87 @@
         <ng-container #componentViewContainer></ng-container>
       </div>
 
-      <small *ngIf="hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
+      @if (hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)) {
+<small
              class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+      }
       <!-- In case of repeatable fields show empty space for all elements except the first -->
-      <div *ngIf="context?.index !== null
-              && (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
+      @if (context?.index !== null
+        && (!showErrorMessages || errorMessages.length === 0)) {
+        <div class="clearfix w-100 mb-2"></div>
+      }
 
-      <div *ngIf="!model.hideErrorMessages && showErrorMessages" [id]="id + '_errors'"
-           [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
-        <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
+      @if (!model.hideErrorMessages && showErrorMessages) {
+        <div [id]="id + '_errors'"
+          [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
+          @for (message of errorMessages; track message) {
+            <small class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
+          }
+        </div>
+      }
+
+    </div>
+    @if (model.languageCodes && model.languageCodes.length > 0) {
+      <div class="col-xs-2" >
+        <select
+          #language="ngModel"
+          [disabled]="model.readOnly"
+          [(ngModel)]="model.language"
+          class="form-select"
+          (blur)="onBlur($event)"
+          (change)="onChangeLanguage($event)"
+          [ngModelOptions]="{standalone: true}"
+          required>
+          @for (lang of model.languageCodes; track lang) {
+            <option [value]="lang.code">{{lang.display}}</option>
+          }
+        </select>
       </div>
-
-    </div>
-    <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
-      <select
-        #language="ngModel"
-        [disabled]="model.readOnly"
-        [(ngModel)]="model.language"
-        class="form-select"
-        (blur)="onBlur($event)"
-        (change)="onChangeLanguage($event)"
-        [ngModelOptions]="{standalone: true}"
-        required>
-        <option *ngFor="let lang of model.languageCodes" [value]="lang.code">{{lang.display}}</option>
-      </select>
-    </div>
-    <div *ngIf="isRelationship" class="col-auto text-center">
-      <button class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.lookup-help' | translate}}"
-              [attr.aria-label]="'form.lookup-help' | translate"
-              placement="top"
-              data-test="lookup-button"
-              (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
-      </button>
-    </div>
+    }
+    @if (isRelationship) {
+      <div class="col-auto text-center">
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.lookup-help' | translate}}"
+          [attr.aria-label]="'form.lookup-help' | translate"
+          placement="top"
+          data-test="lookup-button"
+          (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
+        </button>
+      </div>
+    }
   </div>
   <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model"></ng-container>
-  <ng-container *ngIf="this.metadataService.isVirtual(value)">
-    <ds-existing-metadata-list-element
-      *ngIf="model.hasSelectableMetadata"
-      [reoRel]="relationshipValue$ | async"
-      [submissionItem]="item$ | async"
-      [listId]="listId"
-      [metadataFields]="model.metadataFields"
-      [submissionId]="model.submissionId"
-      [relationshipOptions]="model.relationship"
-      (remove)="onRemove()"
-    >
-    </ds-existing-metadata-list-element>
-    <ds-existing-relation-list-element
-      *ngIf="!model.hasSelectableMetadata"
-      [ngClass]="{'d-block pb-2 pt-2': !context?.index}"
-      [reoRel]="relationshipValue$ | async"
-      [submissionItem]="item$ | async"
-      [listId]="listId"
-      [metadataFields]="model.metadataFields"
-      [submissionId]="model.submissionId"
-      [relationshipOptions]="model.relationship"
-    >
-    </ds-existing-relation-list-element>
-    <small *ngIf="hasHint && (model.repeatable === false || context?.index === context?.context?.groups?.length - 1) && (!showErrorMessages || errorMessages.length === 0)"
-           class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+  @if (this.metadataService.isVirtual(value)) {
+    @if (model.hasSelectableMetadata) {
+      <ds-existing-metadata-list-element
+        [reoRel]="relationshipValue$ | async"
+        [submissionItem]="item$ | async"
+        [listId]="listId"
+        [metadataFields]="model.metadataFields"
+        [submissionId]="model.submissionId"
+        [relationshipOptions]="model.relationship"
+        (remove)="onRemove()"
+        >
+      </ds-existing-metadata-list-element>
+    }
+    @if (!model.hasSelectableMetadata) {
+      <ds-existing-relation-list-element
+        [ngClass]="{'d-block pb-2 pt-2': !context?.index}"
+        [reoRel]="relationshipValue$ | async"
+        [submissionItem]="item$ | async"
+        [listId]="listId"
+        [metadataFields]="model.metadataFields"
+        [submissionId]="model.submissionId"
+        [relationshipOptions]="model.relationship"
+        >
+      </ds-existing-relation-list-element>
+    }
+    @if (hasHint && (model.repeatable === false || context?.index === context?.context?.groups?.length - 1) && (!showErrorMessages || errorMessages.length === 0)) {
+      <small
+      class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+    }
     <div class="clearfix w-100 mb-2"></div>
-  </ng-container>
+  }
   <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 4daf1762a7..be92b7f74c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,15 +1,15 @@
 <div class="d-flex">
-    <span class="me-auto text-contents">
-        <ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
-            <ds-loading [showMessage]="false"></ds-loading>
-        </ng-container>
-        <ng-container *ngIf="(metadataRepresentation$ | async)">
-            <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
-        </ng-container>
-    </span>
-    <button type="button" class="btn btn-secondary"
-            title="{{'form.remove' | translate}}"
-            (click)="removeSelection()">
-        <i class="fas fa-trash" aria-hidden="true"></i>
-    </button>
+  <span class="me-auto text-contents">
+    @if ((metadataRepresentation$ | async) === undefined) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if ((metadataRepresentation$ | async)) {
+      <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
+    }
+  </span>
+  <button type="button" class="btn btn-secondary"
+    title="{{'form.remove' | translate}}"
+    (click)="removeSelection()">
+    <i class="fas fa-trash" aria-hidden="true"></i>
+  </button>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index e24144fbad..a308fc2385 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,14 +1,14 @@
 <div class="d-flex">
-    <div class="flex-grow-1 me-auto">
-        <ng-container *ngIf="(relatedItem$ | async) === undefined">
-            <ds-loading [showMessage]="false"></ds-loading>
-        </ng-container>
-        <ng-container *ngIf="(relatedItem$ | async)">
-            <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
-        </ng-container>
-    </div>
-    <button type="button" class="btn btn-secondary"
-            (click)="removeSelection()">
-        <i class="fas fa-trash" aria-hidden="true"></i>
-    </button>
+  <div class="flex-grow-1 me-auto">
+    @if ((relatedItem$ | async) === undefined) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if ((relatedItem$ | async)) {
+      <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
+    }
+  </div>
+  <button type="button" class="btn btn-secondary"
+    (click)="removeSelection()">
+    <i class="fas fa-trash" aria-hidden="true"></i>
+  </button>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index 150da83afd..5c6d50d6ab 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -1,54 +1,56 @@
 <ng-container [formGroup]="group">
-    <div [id]="id"
-         [formArrayName]="model.id"
-         [class.d-none]="model.hidden"
-         [ngClass]="getClass('element', 'control')">
+  <div [id]="id"
+    [formArrayName]="model.id"
+    [class.d-none]="model.hidden"
+    [ngClass]="getClass('element', 'control')">
 
-      <!-- Draggable Container -->
-      <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
-        <!-- Draggable Items -->
+    <!-- Draggable Container -->
+    <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <!-- Draggable Items -->
+      @for (groupModel of model.groups; track groupModel; let idx = $index; let length = $count) {
         <div #sortableElement
-             *ngFor="let groupModel of model.groups; let idx = index; let length = count"
-             class="drag-item-container"
-             role="group"
-             [formGroupName]="groupModel.index"
-             [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
-             cdkDrag
-             [cdkDragDisabled]="dragDisabled"
-             [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
-             [class.grey-background]="model.isInlineGroupArray">
+          class="drag-item-container"
+          role="group"
+          [formGroupName]="groupModel.index"
+          [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
+          cdkDrag
+          [cdkDragDisabled]="dragDisabled"
+          [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
+          [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
           <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
-               (focus)="addInstructionMessageToLiveRegion(sortableElement)"
-               (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
-               (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
-               (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
-               (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
-               (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
-               (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
+            (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+            (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+            (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+            (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+            (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+            (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+            (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
-          <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
-                                             [bindId]="false"
-                                             [formGroup]="group"
-                                             [formModel]="formModel"
-                                             [context]="groupModel"
-                                             [group]="getControlOfGroup(groupModel)"
-                                             [hidden]="_model.hidden"
-                                             [class.d-none]="_model.hidden"
-                                             [layout]="formLayout"
-                                             [model]="_model"
-                                             [templates]="templates"
-                                             [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                             (dfBlur)="onBlur($event)"
-                                             (dfChange)="onChange($event)"
-                                             (dfFocus)="onFocus($event)"
-                                             (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-
+          @for (_model of groupModel.group; track _model) {
+            <ds-dynamic-form-control-container
+              [bindId]="false"
+              [formGroup]="group"
+              [formModel]="formModel"
+              [context]="groupModel"
+              [group]="getControlOfGroup(groupModel)"
+              [hidden]="_model.hidden"
+              [class.d-none]="_model.hidden"
+              [layout]="formLayout"
+              [model]="_model"
+              [templates]="templates"
+              [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+              (dfBlur)="onBlur($event)"
+              (dfChange)="onChange($event)"
+              (dfFocus)="onFocus($event)"
+            (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+          }
           <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
         </div>
-      </div>
+      }
     </div>
+  </div>
 
 </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index f38cc079db..d8aea2d706 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -1,40 +1,44 @@
 <div [formGroup]="group" class="input-group">
 
-    <input ngbDatepicker class="form-control" #datepicker="ngbDatepicker"
-           [attr.aria-labelledby]="'label_' + model.id"
-           [class.is-invalid]="showErrorMessages"
-           [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])"
-           [id]="id"
-           [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])"
-           [formControlName]="model.id"
-           [maxDate]="model.max"
-           [minDate]="model.min"
-           [name]="model.name"
-           [navigation]="model.getAdditional('navigation', config['navigation'])"
-           [ngClass]="getClass('element', 'control')"
-           [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])"
-           [placeholder]="model.placeholder"
-           [placement]="model.getAdditional('placement', 'bottom-left')"
-           [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])"
-           [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])"
-           [startDate]="model.focusedDate"
-           (blur)="onBlur($event)"
-           (dateSelect)="onChange($event)"
-           (change)="onChange($event)"
-           (focus)="onFocus($event)">
+  <input ngbDatepicker class="form-control" #datepicker="ngbDatepicker"
+    [attr.aria-labelledby]="'label_' + model.id"
+    [class.is-invalid]="showErrorMessages"
+    [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])"
+    [id]="id"
+    [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])"
+    [formControlName]="model.id"
+    [maxDate]="model.max"
+    [minDate]="model.min"
+    [name]="model.name"
+    [navigation]="model.getAdditional('navigation', config['navigation'])"
+    [ngClass]="getClass('element', 'control')"
+    [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])"
+    [placeholder]="model.placeholder"
+    [placement]="model.getAdditional('placement', 'bottom-left')"
+    [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])"
+    [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])"
+    [startDate]="model.focusedDate"
+    (blur)="onBlur($event)"
+    (dateSelect)="onChange($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)">
 
 
-    <button class="btn btn-outline-secondary"
-            type="button"
-            [attr.aria-labelledby]="'label_' + model.id"
-            [class.disabled]="model.disabled"
-            [dsBtnDisabled]="model.disabled"
-            (click)="datepicker.toggle()">
+  <button class="btn btn-outline-secondary"
+    type="button"
+    [attr.aria-labelledby]="'label_' + model.id"
+    [class.disabled]="model.disabled"
+    [dsBtnDisabled]="model.disabled"
+    (click)="datepicker.toggle()">
 
-        <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
-        <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span>
+    @if (model.toggleIcon) {
+      <i class="{{model.toggleIcon}}" aria-hidden="true"></i>
+    }
+    @if (model.toggleLabel) {
+      <span>{{ model.toggleLabel }}</span>
+    }
 
-    </button>
+  </button>
 
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 3dab2d214a..5faf188165 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -1,57 +1,61 @@
 <div>
   <fieldset class="d-flex">
-    <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
-      {{model.placeholder}} <span *ngIf="model.required">*</span>
+    @if (!model.repeatable) {
+      <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
+        {{model.placeholder}} @if (model.required) {
+        <span>*</span>
+      }
     </legend>
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_year'"
-      [disabled]="model.disabled"
-      [min]="minYear"
-      [max]="maxYear"
-      [name]="'year'"
-      [size]="4"
-      [(ngModel)]="initialYear"
-      [value]="year"
-      [invalid]="showErrorMessages"
-      [placeholder]="'form.date-picker.placeholder.year' | translate"
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
+  }
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_year'"
+    [disabled]="model.disabled"
+    [min]="minYear"
+    [max]="maxYear"
+    [name]="'year'"
+    [size]="4"
+    [(ngModel)]="initialYear"
+    [value]="year"
+    [invalid]="showErrorMessages"
+    [placeholder]="'form.date-picker.placeholder.year' | translate"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
 
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_month'"
-      [min]="minMonth"
-      [max]="maxMonth"
-      [name]="'month'"
-      [size]="6"
-      [(ngModel)]="initialMonth"
-      [value]="month"
-      [placeholder]="'form.date-picker.placeholder.month' | translate"
-      [disabled]="!year || model.disabled"
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_month'"
+    [min]="minMonth"
+    [max]="maxMonth"
+    [name]="'month'"
+    [size]="6"
+    [(ngModel)]="initialMonth"
+    [value]="month"
+    [placeholder]="'form.date-picker.placeholder.month' | translate"
+    [disabled]="!year || model.disabled"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
 
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_day'"
-      [min]="minDay"
-      [max]="maxDay"
-      [name]="'day'"
-      [size]="2"
-      [(ngModel)]="initialDay"
-      [value]="day"
-      [placeholder]="'form.date-picker.placeholder.day' | translate"
-      [disabled]="!month || model.disabled"
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
-  </fieldset>
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_day'"
+    [min]="minDay"
+    [max]="maxDay"
+    [name]="'day'"
+    [size]="2"
+    [(ngModel)]="initialDay"
+    [value]="day"
+    [placeholder]="'form.date-picker.placeholder.day' | translate"
+    [disabled]="!month || model.disabled"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
+</fieldset>
 </div>
 
 <div class="clearfix"></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 360b37e31c..e246cf0c7e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -1,7 +1,6 @@
 import {
   DOCUMENT,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -40,7 +39,6 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
   templateUrl: './date-picker.component.html',
   imports: [
     NgClass,
-    NgIf,
     NumberPickerComponent,
     FormsModule,
     TranslateModule,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 86f997de29..c4aade2ed7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -1,67 +1,75 @@
 <div [formGroup]="group">
-  <div *ngIf="model.repeatable"
-       class="row"
-       [attr.tabindex]="model.tabIndex"
-       [id]="id"
-       [formGroupName]="model.id"
-       [ngClass]="model.layout.element?.control">
-
-    <div *ngFor="let columnItems of items" class="col-sm ms-3">
-
-      <div  *ngFor="let item of columnItems" class="custom-control custom-checkbox">
-
-          <input type="checkbox" class="custom-control-input"
-                 [attr.aria-labelledby]="'label_' + model.id"
-                 [attr.tabindex]="item.index"
-                 [checked]="item.value"
-                 [id]="item.id"
-                 [formControlName]="item.id"
-                 [name]="model.name"
-                 [value]="item.value"
-                 (blur)="onBlur($event)"
-                 (change)="onChange($event)"
-                 (focus)="onFocus($event)"/>
-        <label class="custom-control-label"
-               [class.disabled]="model.disabled"
-               [ngClass]="model.layout.element?.control"
-               [for]="item.id">
-          <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
-        </label>
-      </div>
-    </div>
-  </div>
-
-  <div *ngIf="!model.repeatable"
-       class="row"
-       ngbRadioGroup
-       [attr.tabindex]="model.tabIndex"
-       [id]="id"
-       [ngClass]="model.layout.element?.control"
-       (change)="onChange($event)">
-
-    <div *ngFor="let columnItems of items" class="col-sm ms-3">
-
-      <div  *ngFor="let item of columnItems" class="custom-control custom-radio">
-        <input type="radio" class="custom-control-input"
-               [checked]="item.value"
-               [id]="item.id"
-               [name]="model.id"
-               [required]="model.required"
-               [value]="item.index"
-               (blur)="onBlur($event)"
-               (focus)="onFocus($event)"/>
-        <label class="custom-control-label"
-               [class.disabled]="model.disabled"
-               [ngClass]="model.layout.element?.control"
+  @if (model.repeatable) {
+    <div
+      class="row"
+      [attr.tabindex]="model.tabIndex"
+      [id]="id"
+      [formGroupName]="model.id"
+      [ngClass]="model.layout.element?.control">
+      @for (columnItems of items; track columnItems) {
+        <div class="col-sm ms-3">
+          @for (item of columnItems; track item) {
+            <div  class="custom-control custom-checkbox">
+              <input type="checkbox" class="custom-control-input"
+                [attr.aria-labelledby]="'label_' + model.id"
+                [attr.tabindex]="item.index"
+                [checked]="item.value"
+                [id]="item.id"
+                [formControlName]="item.id"
+                [name]="model.name"
+                [value]="item.value"
+                (blur)="onBlur($event)"
+                (change)="onChange($event)"
+                (focus)="onFocus($event)"/>
+              <label class="custom-control-label"
+                [class.disabled]="model.disabled"
+                [ngClass]="model.layout.element?.control"
                 [for]="item.id">
-
-          <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
-        </label>
-      </div>
+                <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
+              </label>
+            </div>
+          }
+        </div>
+      }
     </div>
-  </div>
-  <div class="d-flex justify-content-center" *ngIf="(isLoading$ | async)">
-    <ds-loading></ds-loading>
-  </div>
+  }
+
+  @if (!model.repeatable) {
+    <div
+      class="row"
+      ngbRadioGroup
+      [attr.tabindex]="model.tabIndex"
+      [id]="id"
+      [ngClass]="model.layout.element?.control"
+      (change)="onChange($event)">
+      @for (columnItems of items; track columnItems) {
+        <div class="col-sm ms-3">
+          @for (item of columnItems; track item) {
+            <div  class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input"
+                [checked]="item.value"
+                [id]="item.id"
+                [name]="model.id"
+                [required]="model.required"
+                [value]="item.index"
+                (blur)="onBlur($event)"
+                (focus)="onFocus($event)"/>
+              <label class="custom-control-label"
+                [class.disabled]="model.disabled"
+                [ngClass]="model.layout.element?.control"
+                [for]="item.id">
+                <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
+              </label>
+            </div>
+          }
+        </div>
+      }
+    </div>
+  }
+  @if ((isLoading$ | async)) {
+    <div class="d-flex justify-content-center">
+      <ds-loading></ds-loading>
+    </div>
+  }
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 8861174bd7..99e757ed1d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -1,114 +1,126 @@
 <div ngbDropdown #sdRef="ngbDropdown"
-     (click)="$event.stopPropagation();"
-     (openChange)="openChange($event);">
+  (click)="$event.stopPropagation();"
+  (openChange)="openChange($event);">
 
   <div class="row align-items-center">
     <!--Simple lookup, first field -->
     <div class="col right-addon">
       <i dsAuthorityConfidenceState
-         class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pe-2"
-         aria-hidden="true"
-         [authorityValue]="model.value"
-         (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
+        class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pe-2"
+        aria-hidden="true"
+        [authorityValue]="model.value"
+      (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
       <input class="form-control"
-             [attr.aria-labelledby]="'label_' + model.id"
-             [attr.autoComplete]="model.autoComplete"
-             [class.is-invalid]="showErrorMessages"
-             [id]="model.id"
-             [name]="model.name"
-             [type]="model.inputType"
-             [(ngModel)]="firstInputValue"
-             [disabled]="isInputDisabled()"
-             [placeholder]="model.placeholder | translate"
-             [readonly]="model.readOnly"
-             (change)="onChange($event)"
-             (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
-             (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
-             (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
+        [attr.aria-labelledby]="'label_' + model.id"
+        [attr.autoComplete]="model.autoComplete"
+        [class.is-invalid]="showErrorMessages"
+        [id]="model.id"
+        [name]="model.name"
+        [type]="model.inputType"
+        [(ngModel)]="firstInputValue"
+        [disabled]="isInputDisabled()"
+        [placeholder]="model.placeholder | translate"
+        [readonly]="model.readOnly"
+        (change)="onChange($event)"
+        (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+        (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
+        (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
     </div>
 
     <!--Lookup-name, second field-->
-    <div *ngIf="isLookupName()" class="col" >
-      <input  class="form-control"
-              [ngClass]="{}"
-              [attr.aria-labelledby]="'label_' + model.id"
-              [attr.autoComplete]="model.autoComplete"
-              [class.is-invalid]="showErrorMessages"
-              [id]="id"
-              [name]="model.name + '_2'"
-              [type]="model.inputType"
-              [(ngModel)]="secondInputValue"
-              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
-              [placeholder]="model.secondPlaceholder | translate"
-              [readonly]="model.readOnly"
-              (change)="onChange($event)"
-              (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
-              (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
-              (click)="$event.stopPropagation(); sdRef.close();">
-    </div>
+    @if (isLookupName()) {
+      <div class="col" >
+        <input  class="form-control"
+          [ngClass]="{}"
+          [attr.aria-labelledby]="'label_' + model.id"
+          [attr.autoComplete]="model.autoComplete"
+          [class.is-invalid]="showErrorMessages"
+          [id]="id"
+          [name]="model.name + '_2'"
+          [type]="model.inputType"
+          [(ngModel)]="secondInputValue"
+          [disabled]="firstInputValue.length === 0 || isInputDisabled()"
+          [placeholder]="model.secondPlaceholder | translate"
+          [readonly]="model.readOnly"
+          (change)="onChange($event)"
+          (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+          (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
+          (click)="$event.stopPropagation(); sdRef.close();">
+      </div>
+    }
     <div class="col-auto text-center">
       <button ngbDropdownAnchor
-              class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.search-help' | translate}}"
-              placement="top"
-              [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
-              [hidden]="isInputDisabled()"
-              (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
-      </button>
-      <button *ngIf="isInputDisabled()" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.clear-help' | translate}}"
-              placement="top"
-              [dsBtnDisabled]="model.readOnly"
-              (click)="remove()">{{'form.clear' | translate}}
+        class="btn btn-secondary"
+        type="button"
+        ngbTooltip="{{'form.search-help' | translate}}"
+        placement="top"
+        [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
+        [hidden]="isInputDisabled()"
+        (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
+      @if (isInputDisabled()) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.clear-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="model.readOnly"
+          (click)="remove()">{{'form.clear' | translate}}
+        </button>
+      }
     </div>
     <div class="col-auto text-center">
-      <button *ngIf="!editMode" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.edit-help' | translate}}"
-              placement="top"
-              [dsBtnDisabled]="isEditDisabled()"
-              (click)="switchEditMode()">{{'form.edit' | translate}}
-      </button>
-      <button *ngIf="editMode" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.save-help' | translate}}"
-              placement="top"
-              [dsBtnDisabled]="!hasEmptyValue()"
-              (click)="saveChanges()">{{'form.save' | translate}}
-      </button>
+      @if (!editMode) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.edit-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="isEditDisabled()"
+          (click)="switchEditMode()">{{'form.edit' | translate}}
+        </button>
+      }
+      @if (editMode) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.save-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="!hasEmptyValue()"
+          (click)="saveChanges()">{{'form.save' | translate}}
+        </button>
+      }
     </div>
   </div>
 
   <div ngbDropdownMenu
-       class="dropdown-menu scrollable-dropdown-menu w-100"
-       aria-haspopup="true"
-       aria-expanded="false"
-       [attr.aria-labelledby]="'label_' + model.id">
+    class="dropdown-menu scrollable-dropdown-menu w-100"
+    aria-haspopup="true"
+    aria-expanded="false"
+    [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         infiniteScroll
-         [infiniteScrollDistance]="2"
-         [infiniteScrollThrottle]="50"
-         (scrolled)="onScroll()"
-         [scrollWindow]="false">
+      infiniteScroll
+      [infiniteScrollDistance]="2"
+      [infiniteScrollThrottle]="50"
+      (scrolled)="onScroll()"
+      [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" type="button"
-              *ngIf="optionsList && optionsList.length === 0"
-              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">
-        {{ 'form.no-results' | translate }}
-      </button>
-      <button class="dropdown-item lookup-item" type="button"
-              *ngFor="let listEntry of optionsList"
-              (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
-              title="{{ listEntry.display }}">
-        <ng-container
-          [ngTemplateOutlet]="(listEntry.hasOtherInformation()) ? hasInfo : noInfo"
-          [ngTemplateOutletContext]="{entry: listEntry}">
-        </ng-container>
-      </button>
-      <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
+      @if (optionsList && optionsList.length === 0) {
+        <button class="dropdown-item disabled" type="button"
+          (click)="$event.stopPropagation(); clearFields(); sdRef.close();">
+          {{ 'form.no-results' | translate }}
+        </button>
+      }
+      @for (listEntry of optionsList; track listEntry) {
+        <button class="dropdown-item lookup-item" type="button"
+          (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
+          title="{{ listEntry.display }}">
+          <ng-container
+            [ngTemplateOutlet]="(listEntry.hasOtherInformation()) ? hasInfo : noInfo"
+            [ngTemplateOutletContext]="{entry: listEntry}">
+          </ng-container>
+        </button>
+      }
+      @if (loading) {
+        <div class="scrollable-dropdown-loading text-center"><p>{{'form.loading' | translate}}</p></div>
+      }
     </div>
   </div>
 </div>
@@ -116,9 +128,11 @@
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
     <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
-    <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
-      {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
-    </li>
+    @for (item of entry.otherInformation | dsObjNgFor; track item) {
+      <li class="list-item text-truncate text-secondary" >
+        {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
+      </li>
+    }
   </ul>
 </ng-template>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 81b28ea5dd..43fdf7733e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -8,9 +8,11 @@
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
     <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
-    <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
-      {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
-    </li>
+    @for (item of entry.otherInformation | dsObjNgFor; track item) {
+      <li class="list-item text-truncate text-secondary" >
+        {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
+      </li>
+    }
   </ul>
 </ng-template>
 
@@ -20,59 +22,68 @@
   </ul>
 </ng-template>
 
-<div *ngIf="(isHierarchicalVocabulary() | async) !== true" class="position-relative right-addon">
-  <i *ngIf="searching || loadingInitialValue" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-  <i *ngIf="!searching && !loadingInitialValue"
-     dsAuthorityConfidenceState
-     class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
-     aria-hidden="true"
-     [authorityValue]="currentValue"
-     (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
-  <input #instance="ngbTypeahead"
-         class="form-control"
-         [attr.aria-labelledby]="'label_' + model.id"
-         [attr.autoComplete]="model.autoComplete"
-         [attr.aria-label]="model.label | translate"
-         [class.is-invalid]="showErrorMessages"
-         [id]="model.id"
-         [inputFormatter]="formatter"
-         [name]="model.name"
-         [ngbTypeahead]="search"
-         [placeholder]="model.placeholder"
-         [readonly]="model.readOnly"
-         [disabled]="model.readOnly"
-         [resultTemplate]="rt"
-         [type]="model.inputType"
-         [(ngModel)]="currentValue"
-         (blur)="onBlur($event)"
-         (focus)="onFocus($event)"
-         (change)="onChange($event)"
-         (input)="onInput($event)"
-         (selectItem)="onSelectItem($event)">
+@if ((isHierarchicalVocabulary() | async) !== true) {
+  <div class="position-relative right-addon">
+    @if (searching || loadingInitialValue) {
+      <i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+    }
+    @if (!searching && !loadingInitialValue) {
+      <i
+        dsAuthorityConfidenceState
+        class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
+        aria-hidden="true"
+        [authorityValue]="currentValue"
+      (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
+    }
+    <input #instance="ngbTypeahead"
+      class="form-control"
+      [attr.aria-labelledby]="'label_' + model.id"
+      [attr.autoComplete]="model.autoComplete"
+      [attr.aria-label]="model.label | translate"
+      [class.is-invalid]="showErrorMessages"
+      [id]="model.id"
+      [inputFormatter]="formatter"
+      [name]="model.name"
+      [ngbTypeahead]="search"
+      [placeholder]="model.placeholder"
+      [readonly]="model.readOnly"
+      [disabled]="model.readOnly"
+      [resultTemplate]="rt"
+      [type]="model.inputType"
+      [(ngModel)]="currentValue"
+      (blur)="onBlur($event)"
+      (focus)="onFocus($event)"
+      (change)="onChange($event)"
+      (input)="onInput($event)"
+      (selectItem)="onSelectItem($event)">
+    @if (searchFailed) {
+      <div class="invalid-feedback">Sorry, suggestions could not be loaded.</div>
+    }
+  </div>
+}
 
-  <div class="invalid-feedback" *ngIf="searchFailed">Sorry, suggestions could not be loaded.</div>
-</div>
-
-<div *ngIf="(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
-  <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
-     aria-hidden="true"></i>
-  <input class="form-control"
-         [attr.aria-labelledby]="'label_' + model.id"
-         [attr.autoComplete]="model.autoComplete"
-         [attr.aria-label]="model.label | translate"
-         [class.is-invalid]="showErrorMessages"
-         [class.tree-input]="!model.readOnly"
-         [id]="id"
-         [name]="model.name"
-         [placeholder]="model.placeholder"
-         [readonly]="true"
-         [disabled]="model.readOnly"
-         [type]="model.inputType"
-         [value]="currentValue?.display"
-         (focus)="onFocus($event)"
-         (change)="onChange($event)"
-         (click)="openTree($event)"
-         (keydown)="$event.preventDefault()"
-         (keypress)="$event.preventDefault()"
-         (keyup)="$event.preventDefault()">
-</div>
+@if ((isHierarchicalVocabulary() | async)) {
+  <div class="position-relative right-addon">
+    <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
+    aria-hidden="true"></i>
+    <input class="form-control"
+      [attr.aria-labelledby]="'label_' + model.id"
+      [attr.autoComplete]="model.autoComplete"
+      [attr.aria-label]="model.label | translate"
+      [class.is-invalid]="showErrorMessages"
+      [class.tree-input]="!model.readOnly"
+      [id]="id"
+      [name]="model.name"
+      [placeholder]="model.placeholder"
+      [readonly]="true"
+      [disabled]="model.readOnly"
+      [type]="model.inputType"
+      [value]="currentValue?.display"
+      (focus)="onFocus($event)"
+      (change)="onChange($event)"
+      (click)="openTree($event)"
+      (keydown)="$event.preventDefault()"
+      (keypress)="$event.preventDefault()"
+      (keyup)="$event.preventDefault()">
+  </div>
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 581ae72318..68afbaf19b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -1,75 +1,84 @@
-<a *ngIf="(formCollapsed | async) !== true"
-   class="close position-relative"
-   ngbTooltip="{{'form.group-collapse-help' | translate}}"
-   placement="left">
-  <span class="fas fa-angle-up fa-fw fa-2x"
-        aria-hidden="true"
-        (click)="collapseForm()"></span>
-</a>
-<a *ngIf="(formCollapsed | async)"
-   class="close position-relative"
-   ngbTooltip="{{'form.group-expand-help' | translate}}"
-   placement="left">
-  <span class="fas fa-angle-down fa-fw fa-2x"
-        aria-hidden="true"
-        (click)="expandForm()"></span>
-</a>
+@if ((formCollapsed | async) !== true) {
+  <a
+    class="close position-relative"
+    ngbTooltip="{{'form.group-collapse-help' | translate}}"
+    placement="left">
+    <span class="fas fa-angle-up fa-fw fa-2x"
+      aria-hidden="true"
+    (click)="collapseForm()"></span>
+  </a>
+}
+@if ((formCollapsed | async)) {
+  <a
+    class="close position-relative"
+    ngbTooltip="{{'form.group-expand-help' | translate}}"
+    placement="left">
+    <span class="fas fa-angle-down fa-fw fa-2x"
+      aria-hidden="true"
+    (click)="expandForm()"></span>
+  </a>
+}
 
 <div class="pt-2" [ngClass]="{'border-top': !showErrorMessages, 'border border-danger': showErrorMessages}">
-  <div *ngIf="(formCollapsed | async) !== true" class="ps-2 row"  @shrinkInOut>
-    <ds-form #formRef="formComponent"
-             class="col-sm-12 col-md-8 col-lg-9 col-xl-10 ps-0"
-             [formId]="formId"
-             [formModel]="formModel"
-             [displaySubmit]="false"
-             [displayCancel]="false"
-             [emitChange]="false"
-             (dfBlur)="onBlur($event)"
-             (dfFocus)="onFocus($event)"></ds-form>
-
-
-    <div *ngIf="(formCollapsed | async) !== true" class="col p-0 m-0 d-flex justify-content-center align-items-center">
-
-        <button type="button"
-                class="btn btn-link"
-                [dsBtnDisabled]="isMandatoryFieldEmpty()"
-                (click)="save()">
-          <i class="fas fa-save link-primary fa-2x"
-             aria-hidden="true"></i>
-        </button>
-        <button type="button"
-                class="btn btn-link"
-                [dsBtnDisabled]="!editMode"
-                (click)="delete()">
-          <i class="fas fa-trash link-danger fa-2x"
-             aria-hidden="true"></i>
-        </button>
-        <button type="button"
-                class="btn btn-link"
-                [dsBtnDisabled]="isMandatoryFieldEmpty()"
-                (click)="clear()">
-          <i class="fas fa-undo fa-2x"
-             aria-hidden="true"></i>
-        </button>
-
+  @if ((formCollapsed | async) !== true) {
+    <div class="ps-2 row"  @shrinkInOut>
+      <ds-form #formRef="formComponent"
+        class="col-sm-12 col-md-8 col-lg-9 col-xl-10 ps-0"
+        [formId]="formId"
+        [formModel]="formModel"
+        [displaySubmit]="false"
+        [displayCancel]="false"
+        [emitChange]="false"
+        (dfBlur)="onBlur($event)"
+      (dfFocus)="onFocus($event)"></ds-form>
+      @if ((formCollapsed | async) !== true) {
+        <div class="col p-0 m-0 d-flex justify-content-center align-items-center">
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="isMandatoryFieldEmpty()"
+            (click)="save()">
+            <i class="fas fa-save link-primary fa-2x"
+            aria-hidden="true"></i>
+          </button>
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="!editMode"
+            (click)="delete()">
+            <i class="fas fa-trash link-danger fa-2x"
+            aria-hidden="true"></i>
+          </button>
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="isMandatoryFieldEmpty()"
+            (click)="clear()">
+            <i class="fas fa-undo fa-2x"
+            aria-hidden="true"></i>
+          </button>
+        </div>
+      }
+      <div class="clearfix"></div>
     </div>
-    <div class="clearfix"></div>
-  </div>
+  }
 
   <div class="d-flex">
-    <ds-loading *ngIf="!chips" [showMessage]="false"></ds-loading>
-    <div *ngIf="chips && !chips.hasItems()">
-      <input type="text"
-             class="border-0 form-control-plaintext tag-input mt-1 mb-1 ps-2 text-muted"
-             readonly
-             tabindex="-1"
-             value="{{'form.no-value' | translate}}">
-    </div>
-    <ds-chips
-      *ngIf="chips && chips.hasItems()"
-      [chips]="chips"
-      [editable]="true"
-      [showIcons]="true"
+    @if (!chips) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if (chips && !chips.hasItems()) {
+      <div>
+        <input type="text"
+          class="border-0 form-control-plaintext tag-input mt-1 mb-1 ps-2 text-muted"
+          readonly
+          tabindex="-1"
+          value="{{'form.no-value' | translate}}">
+      </div>
+    }
+    @if (chips && chips.hasItems()) {
+      <ds-chips
+        [chips]="chips"
+        [editable]="true"
+        [showIcons]="true"
       (selected)="onChipSelected($event)"></ds-chips>
+    }
   </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 7a45c19007..f94fedc58d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -3,50 +3,56 @@
 </ng-template>
 
 
-  <ds-chips [chips]="chips"
-            [editable]="false"
-            [showIcons]="model.hasAuthority"
-            [wrapperClass]="'border-bottom border-light'">
+<ds-chips [chips]="chips"
+  [editable]="false"
+  [showIcons]="model.hasAuthority"
+  [wrapperClass]="'border-bottom border-light'">
 
-  <input *ngIf="!model.hasAuthority"
-         class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
-         type="text"
-         role="textbox"
-         [class.ps-3]="chips.hasItems()"
-         [placeholder]="model.placeholder"
-         [readonly]="model.readOnly"
-         [(ngModel)]="currentValue"
-         (blur)="onBlur($event)"
-         (keypress)="preventEventsPropagation($event)"
-         (keydown)="preventEventsPropagation($event)"
-         (keyup)="onKeyUp($event)" />
+  @if (!model.hasAuthority) {
+    <input
+      class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
+      type="text"
+      role="textbox"
+      [class.ps-3]="chips.hasItems()"
+      [placeholder]="model.placeholder"
+      [readonly]="model.readOnly"
+      [(ngModel)]="currentValue"
+      (blur)="onBlur($event)"
+      (keypress)="preventEventsPropagation($event)"
+      (keydown)="preventEventsPropagation($event)"
+      (keyup)="onKeyUp($event)" />
+  }
 
-  <div *ngIf="model.hasAuthority" class="position-relative right-addon">
-    <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-    <input class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
-           type="text"
-           [attr.aria-labelledby]="'label_' + model.id"
-           [(ngModel)]="currentValue"
-           [attr.autoComplete]="model.autoComplete"
-           [class.is-invalid]="showErrorMessages"
-           [class.ps-3]="chips.hasItems()"
-           [id]="id"
-           [inputFormatter]="formatter"
-           [name]="model.name"
-           [ngbTypeahead]="search"
-           [placeholder]="model.placeholder"
-           [readonly]="model.readOnly"
-           [resultTemplate]="rt"
-           [type]="model.inputType"
-           (blur)="onBlur($event)"
-           (focus)="onFocus($event)"
-           (change)="$event.stopPropagation()"
-           (input)="onInput($event)"
-           (selectItem)="onSelectItem($event)"
-           (keypress)="preventEventsPropagation($event)"
-           (keydown)="preventEventsPropagation($event)"
-           (keyup)="onKeyUp($event)"
-           #instance="ngbTypeahead"/>
+  @if (model.hasAuthority) {
+    <div class="position-relative right-addon">
+      @if (searching) {
+        <i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+      }
+      <input class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
+        type="text"
+        [attr.aria-labelledby]="'label_' + model.id"
+        [(ngModel)]="currentValue"
+        [attr.autoComplete]="model.autoComplete"
+        [class.is-invalid]="showErrorMessages"
+        [class.ps-3]="chips.hasItems()"
+        [id]="id"
+        [inputFormatter]="formatter"
+        [name]="model.name"
+        [ngbTypeahead]="search"
+        [placeholder]="model.placeholder"
+        [readonly]="model.readOnly"
+        [resultTemplate]="rt"
+        [type]="model.inputType"
+        (blur)="onBlur($event)"
+        (focus)="onFocus($event)"
+        (change)="$event.stopPropagation()"
+        (input)="onInput($event)"
+        (selectItem)="onSelectItem($event)"
+        (keypress)="preventEventsPropagation($event)"
+        (keydown)="preventEventsPropagation($event)"
+        (keyup)="onKeyUp($event)"
+        #instance="ngbTypeahead"/>
     </div>
-  </ds-chips>
+  }
+</ds-chips>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index e4838757d9..9e2a8fe513 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,95 +1,105 @@
 <div class="modal-header">
-    <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [dsBtnDisabled]="isPending" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
-            (click)="close()">
-    </button>
+  <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
+  <button type="button" [dsBtnDisabled]="isPending" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
+    (click)="close()">
+  </button>
 </div>
 <div class="modal-body">
-    <ds-loading *ngIf="!item || !collection"></ds-loading>
-    <ng-container *ngIf="item && collection">
-        <ul ngbNav #nav="ngbNav" class="nav-tabs">
-            <li ngbNavItem role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-search-tab
-                            [selection$]="selection$"
-                            [listId]="listId"
-                            [relationship]="relationshipOptions"
-                            [repeatable]="repeatable"
-                            [context]="context"
-                            [query]="query"
-                            [hiddenQuery]="hiddenQuery"
-                            [relationshipType]="relationshipType"
-                            [isLeft]="isLeft"
-                            [item]="item"
-                            [isEditRelationship]="isEditRelationship"
-                            [toRemove]="toRemove"
-                            (selectObject)="select($event)"
-                            (deselectObject)="deselect($event)"
-                            (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-search-tab>
-                </ng-template>
-            </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-external-source-tab
-                            [label]="label"
-                            [listId]="listId"
-                            [repeatable]="repeatable"
-                            [item]="item"
-                            [collection]="collection"
-                            [relationship]="relationshipOptions"
-                            [context]="context"
-                            [query]="query"
-                            [externalSource]="source"
-                            (importedObject)="imported($event)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-external-source-tab>
-                </ng-template>
-            </li>
-            <li ngbNavItem *ngIf="!isEditRelationship" role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-selection-tab
-                            [selection$]="selection$"
-                            [listId]="listId"
-                            [relationshipType]="relationshipOptions.relationshipType"
-                            [repeatable]="repeatable"
-                            [context]="context"
-                            (selectObject)="select($event)"
-                            (deselectObject)="deselect($event)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-selection-tab>
-                </ng-template>
-            </li>
-        </ul>
-        <div [ngbNavOutlet]="nav"></div>
-    </ng-container>
+  @if (!item || !collection) {
+    <ds-loading></ds-loading>
+  }
+  @if (item && collection) {
+    <ul ngbNav #nav="ngbNav" class="nav-tabs">
+      <li ngbNavItem role="presentation">
+        <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
+        <ng-template ngbNavContent>
+          <ds-dynamic-lookup-relation-search-tab
+            [selection$]="selection$"
+            [listId]="listId"
+            [relationship]="relationshipOptions"
+            [repeatable]="repeatable"
+            [context]="context"
+            [query]="query"
+            [hiddenQuery]="hiddenQuery"
+            [relationshipType]="relationshipType"
+            [isLeft]="isLeft"
+            [item]="item"
+            [isEditRelationship]="isEditRelationship"
+            [toRemove]="toRemove"
+            (selectObject)="select($event)"
+            (deselectObject)="deselect($event)"
+            (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
+            class="d-block pt-3">
+          </ds-dynamic-lookup-relation-search-tab>
+        </ng-template>
+      </li>
+      @for (source of (externalSourcesRD$ | async); track source; let idx = $index) {
+        <li ngbNavItem role="presentation">
+          <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
+          <ng-template ngbNavContent>
+            <ds-dynamic-lookup-relation-external-source-tab
+              [label]="label"
+              [listId]="listId"
+              [repeatable]="repeatable"
+              [item]="item"
+              [collection]="collection"
+              [relationship]="relationshipOptions"
+              [context]="context"
+              [query]="query"
+              [externalSource]="source"
+              (importedObject)="imported($event)"
+              class="d-block pt-3">
+            </ds-dynamic-lookup-relation-external-source-tab>
+          </ng-template>
+        </li>
+      }
+      @if (!isEditRelationship) {
+        <li ngbNavItem role="presentation">
+          <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
+          <ng-template ngbNavContent>
+            <ds-dynamic-lookup-relation-selection-tab
+              [selection$]="selection$"
+              [listId]="listId"
+              [relationshipType]="relationshipOptions.relationshipType"
+              [repeatable]="repeatable"
+              [context]="context"
+              (selectObject)="select($event)"
+              (deselectObject)="deselect($event)"
+              class="d-block pt-3">
+            </ds-dynamic-lookup-relation-selection-tab>
+          </ng-template>
+        </li>
+      }
+    </ul>
+    <div [ngbNavOutlet]="nav"></div>
+  }
 </div>
 <div class="modal-footer">
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-end space-children-mr">
     <div class="close-button">
-        <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
-            {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
+      <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+      {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
-    <ng-container *ngIf="isEditRelationship">
+    @if (isEditRelationship) {
       <button class="btn btn-danger discard"
-              [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
-              (click)="discardEv()">
-              <i class="fas fa-times"></i>
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        (click)="discardEv()">
+        <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
-              (click)="submitEv()">
-              <span *ngIf="isPending" class="spinner-border spinner-border-sm me-1" role="status"
-                              aria-hidden="true"></span>
-              <i *ngIf="!isPending" class="fas fa-save"></i>
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        (click)="submitEv()">
+        @if (isPending) {
+          <span class="spinner-border spinner-border-sm me-1" role="status"
+          aria-hidden="true"></span>
+        }
+        @if (!isPending) {
+          <i class="fas fa-save"></i>
+        }
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
       </button>
-    </ng-container>
+    }
   </div>
 </div>
diff --git a/src/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.html b/src/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.html
index be8f049632..dc818311c9 100644
--- a/src/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.html
+++ b/src/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.html
@@ -1,14 +1,16 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
   <button type="button" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
-          (click)="modal.dismiss()">
+    (click)="modal.dismiss()">
   </button>
 </div>
 <div class="modal-body">
   <h4>{{ (labelPrefix + 'head.' + externalSourceEntry.externalSource | translate) }}</h4>
   <div id="external-source-entry-information" class="mb-3">
     <div><span>{{externalSourceEntry.display}}</span></div>
-    <div *ngIf="uri"><a href="{{uri.value}}">{{uri.value}}</a></div>
+    @if (uri) {
+      <div><a href="{{uri.value}}">{{uri.value}}</a></div>
+    }
   </div>
 
   <h4>{{ (labelPrefix + 'select' | translate) }}</h4>
@@ -16,32 +18,35 @@
   <div id="external-source-entry-entities" class="mb-3">
     <h5 class="fw-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
 
-    <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0"
-                       [searchResults]="(localEntitiesRD$ | async)"
-                       [sortConfig]="this.lookupRelationService.searchConfig?.sort"
-                       [searchConfig]="this.lookupRelationService.searchConfig"
-                       [selectable]="true"
-                       [disableHeader]="true"
-                       [hidePaginationDetail]="true"
-                       [selectionConfig]="{ repeatable: false, listId: entityListId }"
-                       [linkType]="linkTypes.ExternalLink"
-                       [context]="context"
-                       (deselectObject)="deselectEntity()"
-                       (selectObject)="selectEntity($event)">
-    </ds-search-results>
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length > 0) {
+      <ds-search-results
+        [searchResults]="(localEntitiesRD$ | async)"
+        [sortConfig]="this.lookupRelationService.searchConfig?.sort"
+        [searchConfig]="this.lookupRelationService.searchConfig"
+        [selectable]="true"
+        [disableHeader]="true"
+        [hidePaginationDetail]="true"
+        [selectionConfig]="{ repeatable: false, listId: entityListId }"
+        [linkType]="linkTypes.ExternalLink"
+        [context]="context"
+        (deselectObject)="deselectEntity()"
+        (selectObject)="selectEntity($event)">
+      </ds-search-results>
+    }
     <div class="ms-4 form-check">
       <input class="form-check-input" type="radio" name="new-entity" id="new-entity" value="new-entity" (click)="selectNewEntity()" [checked]="selectedImportType === importType.NewEntity" />
       <label class="form-check-label" for="new-entity">{{ (labelPrefix + 'entities.new' | translate) }}</label>
     </div>
   </div>
-  <div id="external-source-entry-authority" *ngIf="authorityEnabled">
-    <h5 class="fw-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
-
-    <div class="ms-4 form-check">
-      <input class="form-check-input" type="radio" name="new-authority" id="new-authority" value="new-authority" (click)="selectNewAuthority()" [checked]="selectedImportType === importType.NewAuthority" />
-      <label class="form-check-label" for="new-authority">{{ (labelPrefix + 'authority.new' | translate) }}</label>
+  @if (authorityEnabled) {
+    <div id="external-source-entry-authority">
+      <h5 class="fw-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
+      <div class="ms-4 form-check">
+        <input class="form-check-input" type="radio" name="new-authority" id="new-authority" value="new-authority" (click)="selectNewAuthority()" [checked]="selectedImportType === importType.NewAuthority" />
+        <label class="form-check-label" for="new-authority">{{ (labelPrefix + 'authority.new' | translate) }}</label>
+      </div>
     </div>
-  </div>
+  }
 </div>
 <div class="modal-footer">
   <div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index f5928a68cb..b99c2f93da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -1,44 +1,49 @@
-<ds-search *ngIf="this.relationship.searchConfiguration && context"
-           [configuration]="this.relationship.searchConfiguration"
-           [context]="context"
-           [fixedFilterQuery]="this.relationship.filter"
-           [hiddenQuery]="hiddenQuery"
-           [inPlaceSearch]="true"
-           [linkType]="linkTypes.ExternalLink"
-           [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
-           [selectable]="true"
-           [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-           [showScopeSelector]="false"
-           [showViewModes]="false"
-           [query]="query"
-           (resultFound)="onResultFound($event)"
-           (deselectObject)="deselectObject.emit($event)"
-           (selectObject)="selectObject.emit($event)">
-  <div additionalSearchOptions *ngIf="repeatable" class="position-absolute">
-    <div class="input-group mb-3">
-      <div ngbDropdown class="input-group dropdown-button">
-        <button *ngIf="selectAllLoading" type="button"
+@if (this.relationship.searchConfiguration && context) {
+  <ds-search
+    [configuration]="this.relationship.searchConfiguration"
+    [context]="context"
+    [fixedFilterQuery]="this.relationship.filter"
+    [hiddenQuery]="hiddenQuery"
+    [inPlaceSearch]="true"
+    [linkType]="linkTypes.ExternalLink"
+    [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
+    [selectable]="true"
+    [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+    [showScopeSelector]="false"
+    [showViewModes]="false"
+    [query]="query"
+    (resultFound)="onResultFound($event)"
+    (deselectObject)="deselectObject.emit($event)"
+    (selectObject)="selectObject.emit($event)">
+    @if (repeatable) {
+      <div additionalSearchOptions class="position-absolute">
+        <div class="input-group mb-3">
+          <div ngbDropdown class="input-group dropdown-button">
+            @if (selectAllLoading) {
+              <button type="button"
                 class="btn btn-outline-secondary rounded-end">
-                            <span class="spinner-border spinner-border-sm" role="status"
-                                  aria-hidden="true"></span>
-          <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
-        </button>
-        <button id="resultdropdown" type="button"
-                ngbDropdownToggle
-                class="btn btn-outline-secondary dropdown-toggle-split"
-                data-toggle="dropdown" aria-haspopup="true"
-                aria-expanded="false"
-                [hidden]="selectAllLoading">
-          <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
-        </button>
-        <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
-          <button class="dropdown-item"
-                  (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
-          <button class="dropdown-item"
-                  (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
+                <span class="spinner-border spinner-border-sm" role="status"
+                aria-hidden="true"></span>
+                <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
+              </button>
+            }
+            <button id="resultdropdown" type="button"
+              ngbDropdownToggle
+              class="btn btn-outline-secondary dropdown-toggle-split"
+              data-toggle="dropdown" aria-haspopup="true"
+              aria-expanded="false"
+              [hidden]="selectAllLoading">
+              <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
+            </button>
+            <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
+              <button class="dropdown-item"
+              (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
+              <button class="dropdown-item"
+              (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
+            </div>
+          </div>
         </div>
       </div>
-    </div>
-  </div>
-
-</ds-search>
+    }
+  </ds-search>
+}
diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index f3c0e0d4b5..fa9a655d23 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -1,44 +1,51 @@
 <div [className]="'float-start w-100 ' + wrapperClass">
   <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="onDrop($event)">
     <ng-template #tipContent>
-        <p class="text-start p-0 m-0" *ngFor="let tip of tipText">
-        {{tip}}
-      </p>
+      @for (tip of tipText; track tip) {
+        <p class="text-start p-0 m-0">
+          {{tip}}
+        </p>
+      }
     </ng-template>
-    <div role="listitem" class="nav-item me-2 mb-1"
-           *ngFor="let c of chips.getChips(); let i = index"
-           #t="ngbTooltip"
-           triggers="manual"
-           [ngbTooltip]="tipContent"
-           (mouseover)="showTooltip(t, i)"
-           (mouseout)="t.close()">
+    @for (c of chips.getChips(); track c; let i = $index) {
+      <div role="listitem" class="nav-item me-2 mb-1"
+        #t="ngbTooltip"
+        triggers="manual"
+        [ngbTooltip]="tipContent"
+        (mouseover)="showTooltip(t, i)"
+        (mouseout)="t.close()">
         <a class="flex-sm-fill text-sm-center nav-link active bg-info"
-           cdkDrag
-           (cdkDragStarted)="onDrag(i)"
-           href="javascript:void(0);"
-           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
-           (click)="chipsSelected($event, i);">
+          cdkDrag
+          (cdkDragStarted)="onDrag(i)"
+          href="javascript:void(0);"
+          [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
+          (click)="chipsSelected($event, i);">
           <span>
-            <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true">&nbsp;</i>
-            <ng-container *ngIf="showIcons && c.hasVisibleIcons()">
-              <i *ngFor="let icon of c.icons; let l = last"
-                 [ngbTooltip]="tipContent"
-                 triggers="manual"
-                 #t="ngbTooltip"
-                 class="{{icon.style}}"
-                 [class.me-1]="!l"
-                 [class.me-2]="l"
-                 dsAuthorityConfidenceState
-                 [authorityValue]="c.item[icon.metadata] || c.item"
-                 [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty"
-                 aria-hidden="true"
-                 (mouseover)="showTooltip(t, i, icon.metadata)"
-                 (mouseout)="t.close()"></i>
-            </ng-container>
+            @if (showIcons && !c.isNestedItem()) {
+              <i dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true">&nbsp;</i>
+            }
+            @if (showIcons && c.hasVisibleIcons()) {
+              @for (icon of c.icons; track icon; let l = $last) {
+                <i
+                  [ngbTooltip]="tipContent"
+                  triggers="manual"
+                  #t="ngbTooltip"
+                  class="{{icon.style}}"
+                  [class.me-1]="!l"
+                  [class.me-2]="l"
+                  dsAuthorityConfidenceState
+                  [authorityValue]="c.item[icon.metadata] || c.item"
+                  [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty"
+                  aria-hidden="true"
+                  (mouseover)="showTooltip(t, i, icon.metadata)"
+                (mouseout)="t.close()"></i>
+              }
+            }
             <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ms-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
           </span>
         </a>
       </div>
+    }
     <div [class.chips-sort-ignore]="(isDragging | async)" class="flex-grow-1">
       <ng-content ></ng-content>
     </div>
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index b1737a9339..47fca83642 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -13,63 +13,77 @@
       (ngbEvent)="onCustomEvent($event)">
       <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
         <!--Array with repeatable items-->
-        <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index) && group.context.groups.length !== 1 && !isItemReadOnly(context, index)"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+        @if ((!context.notRepeatable) && !isVirtual(context, index) && group.context.groups.length !== 1 && !isItemReadOnly(context, index)) {
+          <div
+            class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
             <button type="button" class="btn btn-secondary" role="button"
-                    title="{{'form.remove' | translate}}"
-                    [attr.aria-label]="'form.remove' | translate"
-                    (click)="removeItem($event, context, index)">
+              title="{{'form.remove' | translate}}"
+              [attr.aria-label]="'form.remove' | translate"
+              (click)="removeItem($event, context, index)">
               <span><i class="fas fa-trash" aria-hidden="true"></i></span>
             </button>
-        </div>
-        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix ps-4 w-100">
-          <div class="btn-group" role="group">
-            <button type="button" role="button" class="ds-form-add-more btn btn-link"
-                    title="{{'form.add' | translate}}"
-                    attr.aria-label="{{'form.add' | translate}}"
-                    (click)="insertItem($event, group.context, group.context.groups.length)">
-              <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
-            </button>
           </div>
-        </div>
+        }
+        @if ((!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)) {
+          <div class="clearfix ps-4 w-100">
+            <div class="btn-group" role="group">
+              <button type="button" role="button" class="ds-form-add-more btn btn-link"
+                title="{{'form.add' | translate}}"
+                attr.aria-label="{{'form.add' | translate}}"
+                (click)="insertItem($event, group.context, group.context.groups.length)">
+                <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
+              </button>
+            </div>
+          </div>
+        }
 
         <!--Array with non repeatable items - Only discard button-->
-        <div *ngIf="context.notRepeatable && context.showButtons && group.context.groups.length > 1"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="button">
-            <button type="button" class="btn btn-secondary"
-                    title="{{'form.discard' | translate}}"
-                    attr.aria-label="{{'form.discard' | translate}}"
-                    (click)="removeItem($event, context, index)"
-                    [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <span>{{'form.discard' | translate}}</span>
-            </button>
+        @if (context.notRepeatable && context.showButtons && group.context.groups.length > 1) {
+          <div
+            class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+            <div class="btn-group" role="button">
+              <button type="button" class="btn btn-secondary"
+                title="{{'form.discard' | translate}}"
+                attr.aria-label="{{'form.discard' | translate}}"
+                (click)="removeItem($event, context, index)"
+                [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                <span>{{'form.discard' | translate}}</span>
+              </button>
+            </div>
           </div>
-        </div>
+        }
       </ng-template>
 
     </ds-dynamic-form>
-        <ng-content select="[additional]"></ng-content>
-        <ng-content *ngIf="!displaySubmit && !displayCancel"></ng-content>
+    <ng-content select="[additional]"></ng-content>
+    @if (!displaySubmit && !displayCancel) {
+      <ng-content></ng-content>
+    }
 
-    <div *ngIf="displaySubmit || displayCancel">
-      <hr>
-      <div class="mb-3 row">
-        <div class="col text-end space-children-mr">
-          <ng-content select="[before]"></ng-content>
-            <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
-              <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
-            </button>
-            <ng-content select="[between]"></ng-content>
-            <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [dsBtnDisabled]="(isValid() | async) !== true">
-              <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
-            </button>
-            <ng-content select="[after]"></ng-content>
+    @if (displaySubmit || displayCancel) {
+      <div>
+        <hr>
+          <div class="mb-3 row">
+            <div class="col text-end space-children-mr">
+              <ng-content select="[before]"></ng-content>
+              @if (displayCancel) {
+                <button type="reset" class="btn btn-outline-secondary" (click)="reset()">
+                  <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
+                </button>
+              }
+              <ng-content select="[between]"></ng-content>
+              @if (displaySubmit) {
+                <button type="submit" class="btn btn-primary" (click)="onSubmit()"
+                  [dsBtnDisabled]="(isValid() | async) !== true">
+                  <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
+                </button>
+              }
+              <ng-content select="[after]"></ng-content>
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
+      }
 
-  </form>
+    </form>
 
-</div>
+  </div>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 6aceab7171..1aa293ed77 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,25 +1,29 @@
-<ds-alert *ngIf="description" [content]="description" [type]="AlertType.Info"></ds-alert>
+@if (description) {
+  <ds-alert [content]="description" [type]="AlertType.Info"></ds-alert>
+}
 <div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
       <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
-             [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
-             [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
+        [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
+        [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
         <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()"
-                [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
+          [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
         <button class="btn btn-outline-secondary" type="button" (click)="reset()"
-                [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
+          [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()"
-                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
-          {{'vocabulary-treeview.search.form.add' | translate}}
-        </button>
+        @if (showAdd && this.vocabularyOptions.closed) {
+          <button class="btn btn-outline-primary" type="button" (click)="add()"
+            [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
+            {{'vocabulary-treeview.search.form.add' | translate}}
+          </button>
+        }
         <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed"
-                [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
+          [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -27,85 +31,97 @@
   </div>
 </div>
 <div class="treeview-container">
-  <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
+  @if (loading | async) {
+    <ds-loading [showMessage]="false"></ds-loading>
+  }
   <div aria-live="polite">
-    <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
-      <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-    </h2>
+    @if ((loading | async) !== true && dataSource.data.length === 0) {
+      <h2 class="h4 text-center text-muted mt-4" >
+        <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+      </h2>
+    }
   </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-            <span aria-hidden="true" type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
-                <i class="fas fa-fw fa-angle-right invisible"></i>
-            </span>
-            <label *ngIf="multiSelect" class="form-label d-flex align-items-center m-0 p-0 form-check"
-                 [class.text-success]="node.isSelected"
-                 [ngbTooltip]="node.item?.otherInformation?.note"
-                 [openDelay]="500"
-                 container="body"
+      <span aria-hidden="true" type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
+        <i class="fas fa-fw fa-angle-right invisible"></i>
+      </span>
+      @if (multiSelect) {
+        <label class="form-label d-flex align-items-center m-0 p-0 form-check"
+          [class.text-success]="node.isSelected"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
           >
-                <input class="me-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
-                   [(ngModel)]="node.isSelected"
-                   [checked]="node.isSelected"
-                   (change)="onSelect(node.item)"
+          <input class="me-2" type="checkbox"
+            [disabled]="!node.item?.selectable"
+            [(ngModel)]="node.isSelected"
+            [checked]="node.isSelected"
+            (change)="onSelect(node.item)"
             >
-            <span>{{node.item.display}}</span>
-          </label>
-            <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-start"
-                  [class.text-success]="node.isSelected"
-                  [dsBtnDisabled]="!node.item?.selectable"
-                  [ngbTooltip]="node.item?.otherInformation?.note"
-                  [openDelay]="500"
-                  container="body"
-                  (click)="onSelect(node.item)">
+          <span>{{node.item.display}}</span>
+        </label>
+      }
+      @if (!multiSelect) {
+        <button class="btn btn-outline-link btn-sm text-start"
+          [class.text-success]="node.isSelected"
+          [dsBtnDisabled]="!node.item?.selectable"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
+          (click)="onSelect(node.item)">
           <span>{{node.item.display}}</span>
         </button>
+      }
     </cdk-tree-node>
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle
-                [attr.aria-label]="'toggle ' + node.name"
-                (click)="loadChildren(node)">
-          <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
-        </button>
+      <button type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle
+        [attr.aria-label]="'toggle ' + node.name"
+        (click)="loadChildren(node)">
+        <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
+      </button>
 
-            <label *ngIf="multiSelect" class="form-label d-flex align-items-center m-0 p-0 form-check"
-                [class.text-success]="node.isSelected"
-                [ngbTooltip]="node.item?.otherInformation?.note"
-                [openDelay]="500"
-                container="body">
-                <input class="me-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
-                   [(ngModel)]="node.isSelected"
-                   [checked]="node.isSelected"
-                   (change)="onSelect(node.item)"
+      @if (multiSelect) {
+        <label class="form-label d-flex align-items-center m-0 p-0 form-check"
+          [class.text-success]="node.isSelected"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body">
+          <input class="me-2" type="checkbox"
+            [disabled]="!node.item?.selectable"
+            [(ngModel)]="node.isSelected"
+            [checked]="node.isSelected"
+            (change)="onSelect(node.item)"
             >
-            <span>{{node.item.display}}</span>
-          </label>
-            <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-start"
-                  [class.text-success]="node.isSelected"
-                  [dsBtnDisabled]="!node.item?.selectable"
-                  [ngbTooltip]="node.item?.otherInformation?.note"
-                  [openDelay]="500"
-                  container="body"
-                  (click)="onSelect(node.item)">
-            <span>{{node.item.display}}</span>
-          </button>
+          <span>{{node.item.display}}</span>
+        </label>
+      }
+      @if (!multiSelect) {
+        <button class="btn btn-outline-link btn-sm text-start"
+          [class.text-success]="node.isSelected"
+          [dsBtnDisabled]="!node.item?.selectable"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
+          (click)="onSelect(node.item)">
+          <span>{{node.item.display}}</span>
+        </button>
+      }
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
       <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
-              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
       <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
-              [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 719e76b30f..45a21d73ac 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -1,35 +1,47 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
   <div class="mb-3 mb-0">
-    <label class="form-label" *ngIf="label; else searchInput" class="mb-0 w-100">
-      <span class="fw-bold">
-        {{label}}
-      </span>
-      <ng-container *ngTemplateOutlet="searchInput"></ng-container>
-    </label>
+    @if (label) {
+      <label class="form-label" class="mb-0 w-100">
+        <span class="fw-bold">
+          {{label}}
+        </span>
+        <ng-container *ngTemplateOutlet="searchInput"></ng-container>
+      </label>
+    } @else {
+      <input #inputField type="text" [(ngModel)]="value" [name]="name"
+        class="form-control suggestion_input"
+        [ngClass]="{'is-invalid': !valid}"
+        [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+        [placeholder]="placeholder"
+        [ngModelOptions]="{standalone: true}" autocomplete="off"
+        />
+    }
   </div>
   <ng-template #searchInput>
     <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"
-    />
+      class="form-control suggestion_input"
+      [ngClass]="{'is-invalid': !valid}"
+      [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+      [placeholder]="placeholder"
+      [ngModelOptions]="{standalone: true}" autocomplete="off"
+      />
   </ng-template>
   <button class="sr-only" type="submit">
     {{'search.filters.search.submit' | translate}}
   </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
-      <div *ngFor="let suggestionOption of suggestions">
-        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-          <span [innerHTML]="suggestionOption.displayValue"></span>
-        </a>
-      </div>
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
+        </div>
+      }
     </div>
   </div>
 </form>
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index e12a0d9444..f47f569955 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,18 +1,24 @@
-<div *ngIf="!spinner">
-  <label class="form-label" *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
-  <div class="loader" aria-hidden="true">
-    <span class="l-1"></span>
-    <span class="l-2"></span>
-    <span class="l-3"></span>
-    <span class="l-4"></span>
-    <span class="l-5"></span>
-    <span class="l-6"></span>
-    <span class="l-7"></span>
-    <span class="l-8"></span>
-    <span class="l-9"></span>
-    <span class="l-10"></span>
+@if (!spinner) {
+  <div>
+    @if (showMessage && message) {
+      <label class="form-label" aria-live="polite">{{ message }}</label>
+    }
+    <div class="loader" aria-hidden="true">
+      <span class="l-1"></span>
+      <span class="l-2"></span>
+      <span class="l-3"></span>
+      <span class="l-4"></span>
+      <span class="l-5"></span>
+      <span class="l-6"></span>
+      <span class="l-7"></span>
+      <span class="l-8"></span>
+      <span class="l-9"></span>
+      <span class="l-10"></span>
+    </div>
   </div>
-</div>
-<div *ngIf='spinner' class="spinner spinner-border" role="status" aria-live="polite">
-  <span class="sr-only">{{ message }}</span>
-</div>
+}
+@if (spinner) {
+  <div class="spinner spinner-border" role="status" aria-live="polite">
+    <span class="sr-only">{{ message }}</span>
+  </div>
+}
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 089f4c8de8..52685c361c 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,37 +1,45 @@
 <form class="form-login"
-      (ngSubmit)="submit()"
-      [formGroup]="form" novalidate>
+  (ngSubmit)="submit()"
+  [formGroup]="form" novalidate>
   <input [attr.aria-label]="'login.form.email' |translate"
-         autocomplete="username"
-         autofocus
-         class="form-control form-control-lg position-relative"
-         formControlName="email"
-         placeholder="{{'login.form.email' | translate}}"
-         required
-         type="email"
-         [attr.data-test]="'email' | dsBrowserOnly">
+    autocomplete="username"
+    autofocus
+    class="form-control form-control-lg position-relative"
+    formControlName="email"
+    placeholder="{{'login.form.email' | translate}}"
+    required
+    type="email"
+    [attr.data-test]="'email' | dsBrowserOnly">
   <input [attr.aria-label]="'login.form.password' |translate"
-         autocomplete="current-password"
-         class="form-control form-control-lg position-relative mb-3"
-         placeholder="{{'login.form.password' | translate}}"
-         formControlName="password"
-         required
-         type="password"
-         [attr.data-test]="'password' | dsBrowserOnly">
-  <div *ngIf="(error | async) && hasError" class="alert alert-danger" role="alert"
-       @fadeOut>{{ (error | async) | translate }}</div>
-  <div *ngIf="(message | async) && hasMessage" class="alert alert-info" role="alert"
-       @fadeOut>{{ (message | async) | translate }}</div>
+    autocomplete="current-password"
+    class="form-control form-control-lg position-relative mb-3"
+    placeholder="{{'login.form.password' | translate}}"
+    formControlName="password"
+    required
+    type="password"
+    [attr.data-test]="'password' | dsBrowserOnly">
+  @if ((error | async) && hasError) {
+    <div class="alert alert-danger" role="alert"
+    @fadeOut>{{ (error | async) | translate }}</div>
+  }
+  @if ((message | async) && hasMessage) {
+    <div class="alert alert-info" role="alert"
+    @fadeOut>{{ (message | async) | translate }}</div>
+  }
 
   <button class="btn btn-lg btn-primary w-100" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
-</form>
+    [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+  </form>
 
-<ng-container *ngIf="canShowDivider$ | async">
-  <div class="mt-2">
-    <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
-       [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
-    <a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
-       [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
-  </div>
-</ng-container>
+  @if (canShowDivider$ | async) {
+    <div class="mt-2">
+      @if (canRegister$ | async) {
+        <a class="dropdown-item" [routerLink]="[getRegisterRoute()]"
+        [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
+      }
+      @if (canForgot$ | async) {
+        <a class="dropdown-item" [routerLink]="[getForgotRoute()]"
+        [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
+      }
+    </div>
+  }
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index fa65a12dd5..82721fb828 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,19 +1,23 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
-        [ngbTooltip]="rejectTipContent"
-        [dsBtnDisabled]="processing$ | async"
-        (click)="openRejectModal(rejectModal)" >
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
+  [ngbTooltip]="rejectTipContent"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="openRejectModal(rejectModal)" >
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
+  }
 </button>
 
 <ng-template #rejectModal let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.workflow.tasks.claimed.reject.reason.title' | translate}}</h4>
     <button type="button"
-            class="btn-close"
-            aria-label="Close"
-            (click)="d('Cross click')">
+      class="btn-close"
+      aria-label="Close"
+      (click)="d('Cross click')">
     </button>
   </div>
   <div class="modal-body">
@@ -22,15 +26,19 @@
     </div>
     <form (ngSubmit)="submitTask();" [formGroup]="rejectForm" >
       <textarea style="width: 100%"
-                formControlName="reason"
-                rows="4"
-                placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
+        formControlName="reason"
+        rows="4"
+      placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
-              class="btn btn-danger btn-lg btn-block w-100 mt-3"
-              [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
-              type="submit">
-        <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-        <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
+        class="btn btn-danger btn-lg btn-block w-100 mt-3"
+        [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
+        type="submit">
+        @if (processing$ | async) {
+          <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+        }
+        @if ((processing$ | async) !== true) {
+          <span>{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
+        }
       </button>
     </form>
   </div>
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index ce6297904a..dac3e03f7a 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -1,14 +1,18 @@
 <div class="notification alert {{notification.type}} alert-dismissible m-3 shadow" role="alert"
-     [@enterLeave]="animate">
+  [@enterLeave]="animate">
 
-  <div class="notification-progress-loader position-absolute w-100" *ngIf="showProgressBar">
-    <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-start"></span>
-  </div>
+  @if (showProgressBar) {
+    <div class="notification-progress-loader position-absolute w-100">
+      <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-start"></span>
+    </div>
+  }
 
-    <button *ngIf="notification.options.clickToClose"
-            (click)="remove()"
-            type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-dismiss="alert" aria-label="Close">
+  @if (notification.options.clickToClose) {
+    <button
+      (click)="remove()"
+      type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-dismiss="alert" aria-label="Close">
     </button>
+  }
 
 
   <div class="d-flex flex-row">
@@ -22,34 +26,43 @@
       }"></i></div>
     </div>
     <div class="d-flex flex-column justify-content-center align-content-stretch">
-      <div class="p-2 me-3"  *ngIf="title">
-        <strong>
-          <div class="notification-title ps-1" *ngIf="titleIsTemplate; else regularTitle">
-            <ng-container *ngTemplateOutlet="title"></ng-container>
-          </div>
-          <ng-template #regularTitle>
-            <div class="notification-title ps-1">{{(title | async)}}</div>
-          </ng-template>
-        </strong>
-      </div>
-
-      <div class="p-2 me-3"  *ngIf="content && !html">
-        <div class="notification-content ps-1" *ngIf="contentIsTemplate; else regularContent">
-          <ng-container *ngTemplateOutlet="content"></ng-container>
+      @if (title) {
+        <div class="p-2 me-3" >
+          <strong>
+            @if (titleIsTemplate) {
+              <div class="notification-title ps-1">
+                <ng-container *ngTemplateOutlet="title"></ng-container>
+              </div>
+            } @else {
+              <div class="notification-title ps-1">{{(title | async)}}</div>
+            }
+          </strong>
         </div>
-        <ng-template #regularContent>
-          <div class="notification-content ps-1">{{(content | async)}}</div>
-        </ng-template>
-      </div>
+      }
 
-      <div class="p-2 me-3" *ngIf="content && html">
-        <div class="notification-html ps-1" *ngIf="contentIsTemplate; else regularHtml">
-          <ng-container *ngTemplateOutlet="content"></ng-container>
+      @if (content && !html) {
+        <div class="p-2 me-3" >
+          @if (contentIsTemplate) {
+            <div class="notification-content ps-1">
+              <ng-container *ngTemplateOutlet="content"></ng-container>
+            </div>
+          } @else {
+            <div class="notification-content ps-1">{{(content | async)}}</div>
+          }
         </div>
-        <ng-template #regularHtml>
-          <div class="notification-html ps-1" [innerHTML]="content"></div>
-        </ng-template>
-      </div>
+      }
+
+      @if (content && html) {
+        <div class="p-2 me-3">
+          @if (contentIsTemplate) {
+            <div class="notification-html ps-1">
+              <ng-container *ngTemplateOutlet="content"></ng-container>
+            </div>
+          } @else {
+            <div class="notification-html ps-1" [innerHTML]="content"></div>
+          }
+        </div>
+      }
     </div>
   </div>
 
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
index 32adab29c7..16d1bfde58 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -1,5 +1,7 @@
-<ng-container *ngIf="showAccessStatus">
-  <span *ngIf="accessStatus$ | async as accessStatus">
-    <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
-  </span>
-</ng-container>
+@if (showAccessStatus) {
+  @if (accessStatus$ | async; as accessStatus) {
+    <span>
+      <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
+    </span>
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.html b/src/app/shared/object-collection/shared/badges/badges.component.html
index 46e2555a9a..5c35ff680b 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.html
+++ b/src/app/shared/object-collection/shared/badges/badges.component.html
@@ -1,10 +1,10 @@
 <ds-status-badge [object]="object"></ds-status-badge>
-<ng-container *ngIf="isMyDSpaceStatus">
-    <ds-my-dspace-status-badge [context]="context"></ds-my-dspace-status-badge>
-</ng-container>
+@if (isMyDSpaceStatus) {
+  <ds-my-dspace-status-badge [context]="context"></ds-my-dspace-status-badge>
+}
 <div>
-    <ds-type-badge class="pe-1" [object]="object"></ds-type-badge>
-    <ng-container *ngIf="showAccessStatus">
-        <ds-access-status-badge [object]="object"></ds-access-status-badge>
-    </ng-container>
+  <ds-type-badge class="pe-1" [object]="object"></ds-type-badge>
+  @if (showAccessStatus) {
+    <ds-access-status-badge [object]="object"></ds-access-status-badge>
+  }
 </div>
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
index 5175848f8d..8eb3cc0bf3 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
@@ -1,6 +1,10 @@
-<div *ngIf="privateBadge" class="private-badge">
+@if (privateBadge) {
+  <div class="private-badge">
     <span class="badge bg-danger">{{ "item.badge.private" | translate }}</span>
-</div>
-<div *ngIf="withdrawnBadge" class="withdrawn-badge">
+  </div>
+}
+@if (withdrawnBadge) {
+  <div class="withdrawn-badge">
     <span class="badge bg-warning">{{ "item.badge.withdrawn" | translate }}</span>
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
index c0a173dfe8..78fc9ba832 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
@@ -1,3 +1,5 @@
-<span *ngIf="typeMessage">
-  <span class="badge bg-info">{{ typeMessage | translate }}</span>
-</span>
+@if (typeMessage) {
+  <span>
+    <span class="badge bg-info">{{ typeMessage | translate }}</span>
+  </span>
+}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
index 5256b87cc1..9f6ad28a87 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
@@ -1,7 +1,9 @@
-<div class="mt-2 mb-2" *ngIf="(collection$ | async)">
-  <span class="link-muted">{{'collection.listelement.badge' | translate}}:
-    <a [routerLink]="['/collections', (collection$ | async)?.id]">
-      {{ dsoNameService.getName(collection$ | async) }}
-    </a>
+@if ((collection$ | async)) {
+  <div class="mt-2 mb-2">
+    <span class="link-muted">{{'collection.listelement.badge' | translate}}:
+      <a [routerLink]="['/collections', (collection$ | async)?.id]">
+        {{ dsoNameService.getName(collection$ | async) }}
+      </a>
     </span>
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index c1154be723..d7b5b71007 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -2,12 +2,11 @@
   <span class="text-muted">
     {{'submission.workflow.tasks.generic.submitter' | translate}}:
     <span class="badge bg-info">
-      <ng-container *ngIf="submitter$ | async as submitter; else noSubmitter">
+      @if (submitter$ | async; as submitter) {
         {{ dsoNameService.getName(submitter) }}
-      </ng-container>
-      <ng-template #noSubmitter>
+      } @else {
         {{ 'submitter.empty' | translate }}
-      </ng-template>
+      }
     </span>
   </span>
 </div>
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index 58de45d81c..07f9802df9 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,16 +1,20 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <span class="form-check">
-        <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
-           [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
-           [name]="'checkbox' + index"
-           [id]="'object' + index"
-           [ngModel]="selected$ | async"
-           (ngModelChange)="selectCheckbox($event)">
-    <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
-           [attr.aria-label]="'selectable-list-item-control.select' | translate"
-           [name]="'radio' + index"
-           [id]="'object' + index"
-           [checked]="selected$ | async"
-           (click)="selectRadio(!checked)">
-    </span>
+  <span class="form-check">
+    @if (selectionConfig.repeatable) {
+      <input #selectListItemCheckbox class="form-check-input" type="checkbox"
+        [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
+        [name]="'checkbox' + index"
+        [id]="'object' + index"
+        [ngModel]="selected$ | async"
+        (ngModelChange)="selectCheckbox($event)">
+    }
+    @if (!selectionConfig.repeatable) {
+      <input class="form-check-input mt-2" type="radio"
+        [attr.aria-label]="'selectable-list-item-control.select' | translate"
+        [name]="'radio' + index"
+        [id]="'object' + index"
+        [checked]="selected$ | async"
+        (click)="selectRadio(!checked)">
+    }
+  </span>
 </ng-container>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 374c7f2acb..ca001c348c 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -1,44 +1,60 @@
-  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-    <div class="position-absolute ms-1">
-        <ng-content></ng-content>
-    </div>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-        <div>
-              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-              </ds-thumbnail>
-        </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-        <div>
-              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-              </ds-thumbnail>
-        </div>
-    </span>
-    <div class="card-body">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
-        <ds-truncatable [id]="dso.id">
-            <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
-                <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
-            </ds-truncatable-part>
-            <ds-truncatable-part [id]="dso.id" [minLines]="1" *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">
-                <p class="item-authors card-text text-muted">
-                    <span *ngIf="dso.hasMetadata('dc.date.issued')" class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
-                    <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
-                        <span [innerHTML]="author"></span>
-                    </span>
-                </p>
-            </ds-truncatable-part>
-            <ds-truncatable-part *ngIf="dso.hasMetadata('dc.description.abstract')" [id]="dso.id" [minLines]="3">
-                <p class="item-abstract card-text">
-                    <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-                </p>
-            </ds-truncatable-part>
-        </ds-truncatable>
-        <div *ngIf="linkType !== linkTypes.None" class="text-center">
-            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-                class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-        </div>
-    </div>
+<div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+  <div class="position-absolute ms-1">
     <ng-content></ng-content>
   </div>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+      <div>
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-thumbnail>
+      </div>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top full-width">
+      <div>
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-thumbnail>
+      </div>
+    </span>
+  }
+  <div class="card-body">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+    }
+    <ds-truncatable [id]="dso.id">
+      <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
+        <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
+      </ds-truncatable-part>
+      @if (dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <p class="item-authors card-text text-muted">
+            @if (dso.hasMetadata('dc.date.issued')) {
+              <span class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
+            }
+            @for (author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author) {
+              <span>,
+                <span [innerHTML]="author"></span>
+              </span>
+            }
+          </p>
+        </ds-truncatable-part>
+      }
+      @if (dso.hasMetadata('dc.description.abstract')) {
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <p class="item-abstract card-text">
+            <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+          </p>
+        </ds-truncatable-part>
+      }
+    </ds-truncatable>
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
+  </div>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index b6349fd83c..e0bae4ec57 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -1,10 +1,14 @@
 <div class="d-flex flex-row">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
-        {{object.value}}
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
+      {{object.value}}
     </a>
-    <span *ngIf="linkType === linkTypes.None" class="lead">
-        {{object.value}}
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{object.value}}
     </span>
-    <span class="pe-2">&nbsp;</span>
-    <span class="badge rounded-pill bg-secondary align-self-center ps-2 pe-2">{{object.count}}</span>
+  }
+  <span class="pe-2">&nbsp;</span>
+  <span class="badge rounded-pill bg-secondary align-self-center ps-2 pe-2">{{object.count}}</span>
 </div>
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
index 5d965ca47d..74f77225c1 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -1,13 +1,21 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
+      {{ dsoNameService.getName(object) }}
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{ dsoNameService.getName(object) }}
+    </span>
+  }
   <span class="pe-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  @if (object.archivedItemsCount >= 0) {
+    <span class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  }
 </div>
-<div *ngIf="object.shortDescription" class="text-muted abstract-text">
+@if (object.shortDescription) {
+  <div class="text-muted abstract-text">
     {{object.shortDescription}}
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
index 234dc4f859..3c7faf3dab 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.html
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -1,13 +1,21 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
+      {{ dsoNameService.getName(object) }}
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{ dsoNameService.getName(object) }}
+    </span>
+  }
   <span class="pe-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  @if (object.archivedItemsCount >= 0) {
+    <span class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  }
 </div>
-<div *ngIf="object.shortDescription" class="text-muted abstract-text">
+@if (object.shortDescription) {
+  <div class="text-muted abstract-text">
     {{object.shortDescription}}
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index cdd650ce65..d75b1ee685 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -1,15 +1,16 @@
-<ng-container *ngIf="derivedSearchResult$ | async">
-    <ds-listable-object-component-loader
-            [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
-            [context]="badgeContext"></ds-listable-object-component-loader>
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  col-9 col-md-10 ps-3' : ''">
-            <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
-        </div>
+@if (derivedSearchResult$ | async) {
+  <ds-listable-object-component-loader
+    [viewMode]="ViewModes.ListElement"
+    [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+  [context]="badgeContext"></ds-listable-object-component-loader>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  col-9 col-md-10 ps-3' : ''">
+      <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
     </div>
-</ng-container>
+  </div>
+}
 
-<ds-loading
-        *ngIf="(derivedSearchResult$ | async) === undefined"
-        [showMessage]="false"></ds-loading>
+@if ((derivedSearchResult$ | async) === undefined) {
+  <ds-loading
+  [showMessage]="false"></ds-loading>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 91e8d92f29..f081a4694f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -1,14 +1,15 @@
-<ng-container *ngIf="derivedSearchResult$ | async">
-    <ds-listable-object-component-loader
-            [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
-            [context]="badgeContext"></ds-listable-object-component-loader>
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
-            <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
-        </div>
+@if (derivedSearchResult$ | async) {
+  <ds-listable-object-component-loader
+    [viewMode]="ViewModes.ListElement"
+    [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+  [context]="badgeContext"></ds-listable-object-component-loader>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
+      <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
     </div>
-</ng-container>
-<ds-loading
-        *ngIf="(derivedSearchResult$ | async) === undefined"
-        [showMessage]="false"></ds-loading>
+  </div>
+}
+@if ((derivedSearchResult$ | async) === undefined) {
+  <ds-loading
+  [showMessage]="false"></ds-loading>
+}
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 2447366d00..c506050ece 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,8 +1,16 @@
 <div class="row">
   <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    @if (linkType !== linkTypes.None) {
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="lead" [innerHTML]="dsoTitle"></span>
+    }
+    @if (dso.shortDescription) {
+      <div class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index 8547f2b848..392a369efb 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,8 +1,16 @@
 <div class="row">
   <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    @if (linkType !== linkTypes.None) {
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="lead" [innerHTML]="dsoTitle"></span>
+    }
+    @if (dso.shortDescription) {
+      <div class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
index 64a063ae4f..55f8b6d4e9 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
@@ -1,14 +1,16 @@
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
   <div [ngClass]="isCurrent() ? 'text-light' : 'text-body'"
-       [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
+  [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
 </ds-truncatable-part>
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
   <div class="fw-bold"
-       [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
-       [innerHTML]="dsoTitle"></div>
-</ds-truncatable-part>
-<ds-truncatable-part *ngIf="description" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
-  <div class="text-secondary"
-       [ngClass]="isCurrent() ? 'text-light' : 'text-secondary'"
-       [innerHTML]="description"></div>
+    [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
+  [innerHTML]="dsoTitle"></div>
 </ds-truncatable-part>
+@if (description) {
+  <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
+    <div class="text-secondary"
+      [ngClass]="isCurrent() ? 'text-light' : 'text-secondary'"
+    [innerHTML]="description"></div>
+  </ds-truncatable-part>
+}
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index f341060c81..93bff0f8e0 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -1,41 +1,50 @@
 <ng-container *ngVar="(dsoRD$ | async) as collectionsRD">
-  <ds-pagination
-    *ngIf="collectionsRD?.payload?.totalElements > 0 || collectionsRD?.payload?.page?.length > 0"
-    [paginationOptions]="paginationOptions"
-    [sortOptions]="sortOptions"
-    [collectionSize]="collectionsRD?.payload?.totalElements"
-    [hidePagerWhenSinglePage]="true"
-    [hideGear]="true">
-    <div class="table-responsive mt-2">
-      <table id="collection-select" class="table table-striped table-hover">
-        <thead>
-          <tr>
-            <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
-            <th scope="col">{{'collection.select.table.title' | translate}}</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
-            <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
-          </tr>
-        </tbody>
-      </table>
+  @if (collectionsRD?.payload?.totalElements > 0 || collectionsRD?.payload?.page?.length > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [sortOptions]="sortOptions"
+      [collectionSize]="collectionsRD?.payload?.totalElements"
+      [hidePagerWhenSinglePage]="true"
+      [hideGear]="true">
+      <div class="table-responsive mt-2">
+        <table id="collection-select" class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
+              <th scope="col">{{'collection.select.table.title' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (selectCollection of selectCollections$ | async; track selectCollection) {
+              <tr>
+                <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+                <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
+  @if (collectionsRD?.payload?.totalElements === 0 || collectionsRD?.payload?.page?.length === 0) {
+    <div class="alert alert-info w-100" role="alert">
+      {{'collection.select.empty' | translate}}
     </div>
-  </ds-pagination>
-  <div *ngIf="collectionsRD?.payload?.totalElements === 0 || collectionsRD?.payload?.page?.length === 0" class="alert alert-info w-100" role="alert">
-    {{'collection.select.empty' | translate}}
-  </div>
-  <ds-error *ngIf="collectionsRD?.hasFailed" message="{{'error.collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="!collectionsRD || collectionsRD?.isLoading" message="{{'loading.collections' | translate}}"></ds-loading>
+  }
+  @if (collectionsRD?.hasFailed) {
+    <ds-error message="{{'error.collections' | translate}}"></ds-error>
+  }
+  @if (!collectionsRD || collectionsRD?.isLoading) {
+    <ds-loading message="{{'loading.collections' | translate}}"></ds-loading>
+  }
   <div class="space-children-mr float-end" *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn btn-outline-secondary collection-cancel" (click)="onCancel()">
       <i class="fas fa-times"></i> {{cancelButton | translate}}
     </button>
     <button class="btn collection-confirm"
-            [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsBtnDisabled]="selectedIds?.length === 0"
-            (click)="confirmSelected()">
+      [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
+      [dsBtnDisabled]="selectedIds?.length === 0"
+      (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
   </div>
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 8a369446cf..5c3a908038 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -1,49 +1,66 @@
 <ng-container *ngVar="(dsoRD$ | async) as itemsRD">
-  <ds-pagination
-    *ngIf="itemsRD?.payload?.totalElements > 0"
-    [paginationOptions]="paginationOptions"
-    [sortOptions]="sortOptions"
-    [collectionSize]="itemsRD?.payload?.totalElements"
-    [hidePagerWhenSinglePage]="true"
-    [hideGear]="true">
-    <div class="table-responsive mt-2">
-      <table id="item-select" class="table table-striped table-hover">
-        <thead>
-        <tr>
-          <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
-          <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
-          <th scope="col">{{'item.select.table.author' | translate}}</th>
-          <th scope="col">{{'item.select.table.title' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
-          <td *ngIf="!hideCollection">
-            <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
-              <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
-                {{ dsoNameService.getName(collection) }}
-              </a>
-            </span>
-          </td>
-          <td><span *ngIf="selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">{{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span></td>
-          <td><a [routerLink]="selectItem.route">{{ dsoNameService.getName(selectItem.dso) }}</a></td>
-        </tr>
-        </tbody>
-      </table>
+  @if (itemsRD?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [sortOptions]="sortOptions"
+      [collectionSize]="itemsRD?.payload?.totalElements"
+      [hidePagerWhenSinglePage]="true"
+      [hideGear]="true">
+      <div class="table-responsive mt-2">
+        <table id="item-select" class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
+              @if (!hideCollection) {
+                <th scope="col">{{'item.select.table.collection' | translate}}</th>
+              }
+              <th scope="col">{{'item.select.table.author' | translate}}</th>
+              <th scope="col">{{'item.select.table.title' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (selectItem of selectItems$ | async; track selectItem) {
+              <tr>
+                <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+                @if (!hideCollection) {
+                  <td>
+                    <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
+                      @if (collection) {
+                        <a [routerLink]="['/collections', collection?.id]">
+                          {{ dsoNameService.getName(collection) }}
+                        </a>
+                      }
+                    </span>
+                  </td>
+                }
+                <td>@if (selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
+                  <span>{{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span>
+                }</td>
+                <td><a [routerLink]="selectItem.route">{{ dsoNameService.getName(selectItem.dso) }}</a></td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
+  @if (itemsRD?.payload?.totalElements === 0 || itemsRD?.payload?.page?.length === 0) {
+    <div class="alert alert-info w-100" role="alert">
+      {{'item.select.empty' | translate}}
     </div>
-  </ds-pagination>
-  <div *ngIf="itemsRD?.payload?.totalElements === 0 || itemsRD?.payload?.page?.length === 0" class="alert alert-info w-100" role="alert">
-    {{'item.select.empty' | translate}}
-  </div>
-  <ds-error *ngIf="itemsRD?.hasFailed" message="{{'error.items' | translate}}"></ds-error>
-  <ds-loading *ngIf="!itemsRD || itemsRD?.isLoading" message="{{'loading.items' | translate}}"></ds-loading>
+  }
+  @if (itemsRD?.hasFailed) {
+    <ds-error message="{{'error.items' | translate}}"></ds-error>
+  }
+  @if (!itemsRD || itemsRD?.isLoading) {
+    <ds-loading message="{{'loading.items' | translate}}"></ds-loading>
+  }
   <div *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn btn-outline-secondary item-cancel float-start" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-end"
-            [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [dsBtnDisabled]="selectedIds?.length === 0"
-            (click)="confirmSelected()">
+      [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
+      [dsBtnDisabled]="selectedIds?.length === 0"
+      (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
   </div>
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index d5e9ee41bd..21d8909800 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,71 +1,89 @@
-<div *ngIf="currentPageState === undefined || currentPageState === (currentPage$|async)" [id]="'p-' + id">
-  <div *ngIf="(!hidePaginationDetail && collectionSize > 0) || !hideGear" class="pagination-masked clearfix top">
-    <div class="row">
-      <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
-          <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
-          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
-      </div>
-      <div class="col">
-        <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-end">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
-            <li role="menuitem">
-              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
-              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
-                <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
-                  <button (click)="doPageSizeChange(item)" class="dropdown-item">
-                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
-                  </button>
-                </li>
-              </ul>
-            </li>
-            <li *ngIf="hideSortOptions === false" role="menuitem">
-              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
-              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
-                <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
-                  <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
-                    <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
-                  </button>
-                </li>
-              </ul>
-            </li>
-          </ul>
+@if (currentPageState === undefined || currentPageState === (currentPage$|async)) {
+  <div [id]="'p-' + id">
+    @if ((!hidePaginationDetail && collectionSize > 0) || !hideGear) {
+      <div class="pagination-masked clearfix top">
+        <div class="row">
+          @if (!hidePaginationDetail && collectionSize > 0) {
+            <div class="col-auto pagination-info">
+              <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
+              <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
+            </div>
+          }
+          <div class="col">
+            @if (!hideGear) {
+              <div ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-end">
+                <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
+                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+                  <li role="menuitem">
+                    <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                      @for (item of pageSizeOptions; track item) {
+                        <li role="option" [attr.aria-selected]="item === (pageSize$ | async)">
+                          <button (click)="doPageSizeChange(item)" class="dropdown-item">
+                            <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                          </button>
+                        </li>
+                      }
+                    </ul>
+                  </li>
+                  @if (hideSortOptions === false) {
+                    <li role="menuitem">
+                      <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+                      <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+                        @for (direction of (sortDirections | dsKeys); track direction) {
+                          <li [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
+                            <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
+                              <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
+                            </button>
+                          </li>
+                        }
+                      </ul>
+                    </li>
+                  }
+                </ul>
+              </div>
+            }
+            <ds-rss></ds-rss>
+          </div>
         </div>
-        <ds-rss></ds-rss>
       </div>
-    </div>
-  </div>
-  <ng-content></ng-content>
-
-  <div *ngIf="shouldShowBottomPager | async">
-    <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
-                      [boundaryLinks]="paginationOptions.boundaryLinks"
-                      [collectionSize]="collectionSize"
-                      [disabled]="paginationOptions.disabled"
-                      [ellipses]="paginationOptions.ellipses"
-                      [maxSize]="(isXs)?5:paginationOptions.maxSize"
-                      [page]="(currentPage$|async)"
-                      (pageChange)="doPageChange($event)"
-                      [pageSize]="(pageSize$ |async)"
-                      [rotate]="paginationOptions.rotate"
-                      [size]="(isXs)?'sm':paginationOptions.size">
-      </ngb-pagination>
-    </div>
-
-    <div *ngIf="!showPaginator" class="d-flex justify-content-between">
-        <button id="nav-prev" type="button" class="btn btn-outline-primary float-start"
-                (click)="goPrev()"
-                [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
-          <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
-        </button>
-      <button id="nav-next" type="button" class="btn btn-outline-primary float-end"
+    }
+    <ng-content></ng-content>
+    @if (shouldShowBottomPager | async) {
+      <div>
+        @if (showPaginator) {
+          <div class="pagination justify-content-center clearfix bottom">
+            <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+              [boundaryLinks]="paginationOptions.boundaryLinks"
+              [collectionSize]="collectionSize"
+              [disabled]="paginationOptions.disabled"
+              [ellipses]="paginationOptions.ellipses"
+              [maxSize]="(isXs)?5:paginationOptions.maxSize"
+              [page]="(currentPage$|async)"
+              (pageChange)="doPageChange($event)"
+              [pageSize]="(pageSize$ |async)"
+              [rotate]="paginationOptions.rotate"
+              [size]="(isXs)?'sm':paginationOptions.size">
+            </ngb-pagination>
+          </div>
+        }
+        @if (!showPaginator) {
+          <div class="d-flex justify-content-between">
+            <button id="nav-prev" type="button" class="btn btn-outline-primary float-start"
+              (click)="goPrev()"
+              [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+              <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
+            </button>
+            <button id="nav-next" type="button" class="btn btn-outline-primary float-end"
               (click)="goNext()"
               [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
-          <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
-            <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
-          </span>
-      </button>
-    </div>
+              <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
+                <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
+              </span>
+            </button>
+          </div>
+        }
+      </div>
+    }
   </div>
-</div>
+}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 65c67f4159..2e445a69a7 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -1,10 +1,12 @@
 <div>
-  <ds-form *ngIf="formModel"
-           #formRef="formComponent"
-           [formId]="formId"
-           [formModel]="formModel"
-           [displaySubmit]="false"
-           [displayCancel]="false"></ds-form>
+  @if (formModel) {
+    <ds-form
+      #formRef="formComponent"
+      [formId]="formId"
+      [formModel]="formModel"
+      [displaySubmit]="false"
+    [displayCancel]="false"></ds-form>
+  }
   <div class="container-fluid">
     <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
     <input id="ResourcePolicyObject" class="form-control mb-3" type="text" [value]="resourcePolicyTargetName$ | async">
@@ -19,57 +21,61 @@
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.group' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list [isListOfEPerson]="false"
-                                 (select)="updateObjectSelected($event, false)"></ds-eperson-group-list>
+          (select)="updateObjectSelected($event, false)"></ds-eperson-group-list>
         </ng-template>
       </li>
     </ul>
     <div [ngbNavOutlet]="nav"></div>
     <div>
       <hr>
-      <div class="mb-3 row">
+        <div class="mb-3 row">
 
-        <div class="col text-end">
-          <button type="reset"
-                  class="btn btn-default"
-                  [dsBtnDisabled]="(isProcessing | async)"
-                  (click)="onReset()">{{'form.cancel' | translate}}</button>
-          <button type="button"
-                  class="btn btn-primary"
-                  [dsBtnDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
-                  (click)="onSubmit()">
-            <span *ngIf="(isProcessing | async)">
+          <div class="col text-end">
+            <button type="reset"
+              class="btn btn-default"
+              [dsBtnDisabled]="(isProcessing | async)"
+            (click)="onReset()">{{'form.cancel' | translate}}</button>
+            <button type="button"
+              class="btn btn-primary"
+              [dsBtnDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+              (click)="onSubmit()">
+              @if ((isProcessing | async)) {
+                <span>
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
-            <span *ngIf="(isProcessing | async) !== true">
+              }
+              @if ((isProcessing | async) !== true) {
+                <span>
                   {{'form.submit' | translate}}
                 </span>
-          </button>
+              }
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
 
 
-<ng-template #content let-modal>
-  <div class="modal-header">
-    <h4 class="modal-title" id="modal-basic-title">{{ 'resource-policies.form.eperson-group-list.modal.header' | translate }}</h4>
-    <button type="button" class="btn-close" aria-label="Close" (click)="modal.close()">
-    </button>
-  </div>
-  <div class="modal-body">
-    <div class="d-flex flex-row">
-      <div class="me-3">
-        <i class="fas fa-info-circle fa-2x text-info"></i>
-      </div>
-      <div>
+  <ng-template #content let-modal>
+    <div class="modal-header">
+      <h4 class="modal-title" id="modal-basic-title">{{ 'resource-policies.form.eperson-group-list.modal.header' | translate }}</h4>
+      <button type="button" class="btn-close" aria-label="Close" (click)="modal.close()">
+      </button>
+    </div>
+    <div class="modal-body">
+      <div class="d-flex flex-row">
+        <div class="me-3">
+          <i class="fas fa-info-circle fa-2x text-info"></i>
+        </div>
+        <div>
       <p [innerHTML]="(navActiveId === 'eperson' ? 'resource-policies.form.eperson-group-list.modal.text1.toGroup' :
        'resource-policies.form.eperson-group-list.modal.text1.toEPerson') | translate" class="fw-bold"></p>
-      <p [innerHTML]="'resource-policies.form.eperson-group-list.modal.text2' | translate"></p>
+          <p [innerHTML]="'resource-policies.form.eperson-group-list.modal.text2' | translate"></p>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" (click)="modal.close()">{{ 'resource-policies.form.eperson-group-list.modal.close' | translate }}</button>
-  </div>
-</ng-template>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-secondary" (click)="modal.close()">{{ 'resource-policies.form.eperson-group-list.modal.close' | translate }}</button>
+    </div>
+  </ng-template>
diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html
index 079441132e..9bca53b8c8 100644
--- a/src/app/shared/rss-feed/rss.component.html
+++ b/src/app/shared/rss-feed/rss.component.html
@@ -1,9 +1,10 @@
-<ng-container
-  *ngIf="(isEnabled$ | async) && (isActivated$ | async)">
-  <div *ngIf="route$ | async as route" class="d-inline-block float-end margin-right">
-    <a target="_blank" rel="noopener noreferrer" [href]="route" class="btn btn-secondary"
-      [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate">
-      <i class="fas fa-rss-square"></i>
-    </a>
-  </div>
-</ng-container>
+@if ((isEnabled$ | async) && (isActivated$ | async)) {
+  @if (route$ | async; as route) {
+    <div class="d-inline-block float-end margin-right">
+      <a target="_blank" rel="noopener noreferrer" [href]="route" class="btn btn-secondary"
+        [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate">
+        <i class="fas fa-rss-square"></i>
+      </a>
+    </div>
+  }
+}
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index f1c882dbe2..1f887c1ba6 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -1,15 +1,17 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(form.value)" action="/search">
-    <div>
-        <div class="mb-3 input-group">
-                <button *ngIf="showScopeSelector" class="scope-button btn btn-outline-secondary text-truncate"
-                        [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
-                        (click)="openScopeModal()">
-                  {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
-                </button>
-            <input type="text" [(ngModel)]="query" name="query" class="form-control"
-                   [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
-                   [placeholder]="searchPlaceholder">
-            <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
-        </div>
+  <div>
+    <div class="mb-3 input-group">
+      @if (showScopeSelector) {
+        <button class="scope-button btn btn-outline-secondary text-truncate"
+          [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
+          (click)="openScopeModal()">
+          {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
+        </button>
+      }
+      <input type="text" [(ngModel)]="query" name="query" class="form-control"
+        [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
+        [placeholder]="searchPlaceholder">
+      <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
     </div>
+  </div>
 </form>
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index 716de88eef..b25a602996 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -1,31 +1,40 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-end" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl></ds-filter-input-suggestions>
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl></ds-filter-input-suggestions>
+  }
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 92e6e0631f..c5abc198a6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -1,21 +1,29 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-      <ng-container *ngFor="let page of (facetValues$ | async)">
-        <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-        </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-end" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
 
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 5dd12829eb..75387550b2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,14 +1,15 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-   [tabIndex]="-1"
-   [routerLink]="[searchLink]"
-   [queryParams]="addQueryParams$ | async"
-   (click)="announceFilter(); filterService.minimizeAll()">
-  <label class="mb-0 d-flex w-100">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="w-100 ps-1 break-facet">
-      <span class="float-end badge bg-secondary rounded-pill mt-1 ms-1">{{filterValue.count | dsShortNumber}}</span>
-      {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
-    </span>
-  </label>
-
-</a>
+@if (isVisible | async) {
+  <a class="d-flex flex-row"
+    [tabIndex]="-1"
+    [routerLink]="[searchLink]"
+    [queryParams]="addQueryParams$ | async"
+    (click)="announceFilter(); filterService.minimizeAll()">
+    <label class="mb-0 d-flex w-100">
+      <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+      <span class="w-100 ps-1 break-facet">
+        <span class="float-end badge bg-secondary rounded-pill mt-1 ms-1">{{filterValue.count | dsShortNumber}}</span>
+        {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
+      </span>
+    </label>
+  </a>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 30ab17b7db..595609d5a4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -1,9 +1,11 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-   (click)="filterService.minimizeAll()"
-   [routerLink]="[searchLink]"
-   [queryParams]="changeQueryParams" queryParamsHandling="merge">
-  <span class="filter-value px-1">{{filterValue.label}}</span>
-  <span class="float-end filter-value-count ms-auto">
-    <span class="badge bg-secondary rounded-pill">{{filterValue.count | dsShortNumber}}</span>
-  </span>
-</a>
+@if (isVisible | async) {
+  <a class="d-flex flex-row"
+    (click)="filterService.minimizeAll()"
+    [routerLink]="[searchLink]"
+    [queryParams]="changeQueryParams" queryParamsHandling="merge">
+    <span class="filter-value px-1">{{filterValue.label}}</span>
+    <span class="float-end filter-value-count ms-auto">
+      <span class="badge bg-secondary rounded-pill">{{filterValue.count | dsShortNumber}}</span>
+    </span>
+  </a>
+}
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 a4fe34b50e..1774aba0a0 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
@@ -1,39 +1,50 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-end" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+      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>
+@if (vocabularyExists$ | async) {
+  <a
+    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/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 67c2be4e4f..3e0a80875e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -1,51 +1,53 @@
 <div>
-    <div class="filters py-2">
-        <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
-              [action]="currentUrl">
-            <div class="col-6 mb-3 mb-0">
-                <label class="form-label">
-                  <span class="fw-bold">
-                    {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
-                  </span>
-                  <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control"
-                         [attr.aria-label]="minLabel"
-                         [placeholder]="minLabel"
-                  />
-                </label>
-            </div>
-            <div class="col-6">
-                <label class="form-label">
-                    <span class="fw-bold">
-                      {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
-                    </span>
-                    <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control"
-                           [attr.aria-label]="maxLabel"
-                           [placeholder]="maxLabel"
-                    />
-                </label>
-            </div>
-            <button class="sr-only" type="submit">
-                {{'search.filters.search.submit' | translate}}
-            </button>
-        </form>
+  <div class="filters py-2">
+    <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
+      [action]="currentUrl">
+      <div class="col-6 mb-3 mb-0">
+        <label class="form-label">
+          <span class="fw-bold">
+            {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
+          </span>
+          <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
+            class="form-control"
+            [attr.aria-label]="minLabel"
+            [placeholder]="minLabel"
+            />
+        </label>
+      </div>
+      <div class="col-6">
+        <label class="form-label">
+          <span class="fw-bold">
+            {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
+          </span>
+          <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
+            class="form-control"
+            [attr.aria-label]="maxLabel"
+            [placeholder]="maxLabel"
+            />
+        </label>
+      </div>
+      <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+      </button>
+    </form>
 
-        <ng-container *ngIf="shouldShowSlider()">
-            <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250"
-                        (change)="onSliderChange($event)"
-                        (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
-                        [(ngModel)]="range" ngDefaultControl>
-            </nouislider>
-        </ng-container>
-      <ng-container *ngFor="let page of (facetValues$ | async)">
-        <div [@facetLoad]="animationState">
-          <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
-          </div>
-        </ng-container>
-        <button (click)="onSubmit()" class="btn btn-primary">
-          {{'search.filters.search.submit' | translate}}
-        </button>
-    </div>
+    @if (shouldShowSlider()) {
+      <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
+        [dsDebounce]="250"
+        (change)="onSliderChange($event)"
+        (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
+        [(ngModel)]="range" ngDefaultControl>
+      </nouislider>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-range-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
+        }
+      </div>
+    }
+    <button (click)="onSubmit()" class="btn btn-primary">
+      {{'search.filters.search.submit' | translate}}
+    </button>
+  </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index 776680c2cd..b25a602996 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -1,31 +1,40 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-start" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-end" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl></ds-filter-input-suggestions>
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl></ds-filter-input-suggestions>
+  }
 </div>
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
index ea8fbc392b..1eb83e071b 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
@@ -1,22 +1,26 @@
-<a *ngIf="min !== '*'"
-   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate, value: min }"
-   [routerLink]="searchLink"
-   [queryParams]="(removeParametersMin$ | async)"
-   (click)="searchFilterService.minimizeAll()"
-   class="badge bg-primary">
-  <span class="d-flex">
-    <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
-    <span class="ps-1" aria-hidden="true">×</span>
-  </span>
-</a>
-<a *ngIf="max !== '*'"
-   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate, value: max }"
-   [routerLink]="searchLink"
-   [queryParams]="(removeParametersMax$ | async)"
-   (click)="searchFilterService.minimizeAll()"
-   class="badge bg-primary">
-  <span class="d-flex">
-    <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
-    <span class="ps-1" aria-hidden="true">×</span>
-  </span>
-</a>
+@if (min !== '*') {
+  <a
+    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate, value: min }"
+    [routerLink]="searchLink"
+    [queryParams]="(removeParametersMin$ | async)"
+    (click)="searchFilterService.minimizeAll()"
+    class="badge bg-primary">
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
+      <span class="ps-1" aria-hidden="true">×</span>
+    </span>
+  </a>
+}
+@if (max !== '*') {
+  <a
+    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate, value: max }"
+    [routerLink]="searchLink"
+    [queryParams]="(removeParametersMax$ | async)"
+    (click)="searchFilterService.minimizeAll()"
+    class="badge bg-primary">
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
+      <span class="ps-1" aria-hidden="true">×</span>
+    </span>
+  </a>
+}
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index e8f66d01f9..421f361bc0 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -60,7 +57,6 @@ export interface SelectionConfig {
   imports: [
     AsyncPipe,
     ErrorComponent,
-    NgIf,
     NgxSkeletonLoaderModule,
     ObjectCollectionComponent,
     RouterLink,
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index c52d8b1d4a..9c9e4a9001 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -1,38 +1,46 @@
 <div>
-    <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
-        <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
-        <button (click)="toggleSidebar.emit()"
-                [attr.aria-label]="'search.sidebar.close' | translate"
-                aria-controls="search-content"
-                class="btn btn-outline-primary float-end close-sidebar"><i
-                class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
-        </button>
-    </div>
-    <div id="search-sidebar-content">
-        <ds-view-mode-switch *ngIf="showViewModes" class="d-none d-md-block"
-                             [viewModeList]="viewModeList"
-                             (changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
-        <div class="sidebar-content">
-            <ds-search-switch-configuration *ngIf="configurationList"
-                                            [configurationList]="configurationList"
-                                            [defaultConfiguration]="configuration"
-                                            [inPlaceSearch]="inPlaceSearch"
-                                            (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
-            <ds-search-filters [currentScope]="currentScope"
-                               [currentConfiguration]="configuration"
-                               [filters]="filters"
-                               [refreshFilters]="refreshFilters"
-                               [inPlaceSearch]="inPlaceSearch">
-            </ds-search-filters>
-            <ds-advanced-search *ngIf="inPlaceSearch && (this.showAdvancedSearch$ | async) === true"
-                                [configuration]="configuration"
-                                [filtersConfig]="(filters | async)?.payload"
-                                [scope]="currentScope">
-            </ds-advanced-search>
-            <ds-search-settings *ngIf="inPlaceSearch"
-                                [currentSortOption]="currentSortOption"
-                                [sortOptionsList]="sortOptionsList">
-            </ds-search-settings>
-        </div>
-    </div>
+  <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
+    <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
+    <button (click)="toggleSidebar.emit()"
+      [attr.aria-label]="'search.sidebar.close' | translate"
+      aria-controls="search-content"
+      class="btn btn-outline-primary float-end close-sidebar"><i
+    class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
+  </button>
+</div>
+<div id="search-sidebar-content">
+  @if (showViewModes) {
+    <ds-view-mode-switch class="d-none d-md-block"
+      [viewModeList]="viewModeList"
+    (changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
+  }
+  <div class="sidebar-content">
+    @if (configurationList) {
+      <ds-search-switch-configuration
+        [configurationList]="configurationList"
+        [defaultConfiguration]="configuration"
+        [inPlaceSearch]="inPlaceSearch"
+      (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
+    }
+    <ds-search-filters [currentScope]="currentScope"
+      [currentConfiguration]="configuration"
+      [filters]="filters"
+      [refreshFilters]="refreshFilters"
+      [inPlaceSearch]="inPlaceSearch">
+    </ds-search-filters>
+    @if (inPlaceSearch && (this.showAdvancedSearch$ | async) === true) {
+      <ds-advanced-search
+        [configuration]="configuration"
+        [filtersConfig]="(filters | async)?.payload"
+        [scope]="currentScope">
+      </ds-advanced-search>
+    }
+    @if (inPlaceSearch) {
+      <ds-search-settings
+        [currentSortOption]="currentSortOption"
+        [sortOptionsList]="sortOptionsList">
+      </ds-search-settings>
+    }
+  </div>
+</div>
 </div>
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index 87546b6c76..e4ac701043 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,14 +1,16 @@
-<div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
-
-  <select class="form-select"
-          aria-labelledby="configuration-switch"
-          [compareWith]="compare"
-          [(ngModel)]="selectedOption"
-          (change)="onSelect()">
-    <option *ngFor="let option of configurationList;" [ngValue]="option">
-      {{option.label | translate}}
-    </option>
-  </select>
-
-</div>
+@if (configurationList?.length > 1) {
+  <div class="search-switch-configuration">
+    <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
+    <select class="form-select"
+      aria-labelledby="configuration-switch"
+      [compareWith]="compare"
+      [(ngModel)]="selectedOption"
+      (change)="onSelect()">
+      @for (option of configurationList; track option) {
+        <option [ngValue]="option">
+          {{option.label | translate}}
+        </option>
+      }
+    </select>
+  </div>
+}
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index 07b9ea5cf2..e0f778e55d 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -1,106 +1,122 @@
-<div class="container" *ngIf="searchEnabled && (isXsOrSm$ | async)">
+@if (searchEnabled && (isXsOrSm$ | async)) {
+  <div class="container">
     <div class="row">
-        <div class="col-12">
-            <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-        </div>
+      <div class="col-12">
+        <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+      </div>
     </div>
-</div>
+  </div>
+}
 
-<div *ngIf="!showSidebar && (initialized$ | async)">
-  <ng-template *ngTemplateOutlet="searchContent"></ng-template>
-</div>
+@if (!showSidebar && (initialized$ | async)) {
+  <div>
+    <ng-template *ngTemplateOutlet="searchContent"></ng-template>
+  </div>
+}
 
-<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sideBarWidth]="sideBarWidth"
+@if (showSidebar && (initialized$ | async)) {
+  <ds-page-with-sidebar [id]="'search-page'" [sideBarWidth]="sideBarWidth"
     [sidebarContent]="sidebarContent">
     <ng-template *ngTemplateOutlet="searchContent"></ng-template>
-</ds-page-with-sidebar>
+  </ds-page-with-sidebar>
+}
 
 <ng-template #searchContent>
-    <div class="row">
-        <div class="col-12" *ngIf="(isXsOrSm$ | async) !== true">
-            <ng-container *ngIf="searchEnabled">
-                <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-            </ng-container>
-            <ng-content select="[additionalSearchOptions]"></ng-content>
-        </div>
-        <div id="search-content" class="col-12">
-            <div class="d-block d-md-none search-controls clearfix">
-                <ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
-                    [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-                <button (click)="openSidebar()" aria-controls="#search-body"
-                        class="btn btn-outline-primary float-end open-sidebar"><i
-                        class="fas fa-sliders"></i> {{"search.sidebar.open"
-                       | translate}}
-                </button>
-            </div>
-            <ng-content select="[searchContentTop]"></ng-content>
-            <ds-search-results *ngIf="inPlaceSearch"
-                                      [searchResults]="resultsRD$ | async"
-                                      [searchConfig]="searchOptions$ | async"
-                                      [configuration]="(currentConfiguration$ | async)"
-                                      [disableHeader]="!searchEnabled"
-                                      [linkType]="linkType"
-                                      [context]="(currentContext$ | async)"
-                                      [selectable]="selectable"
-                                      [selectionConfig]="selectionConfig"
-                                      [showCsvExport]="showCsvExport"
-                                      [showThumbnails]="showThumbnails"
-                                      (contentChange)="onContentChange($event)"
-                                      (deselectObject)="deselectObject.emit($event)"
-                                      (selectObject)="selectObject.emit($event)"></ds-search-results>
-        </div>
+  <div class="row">
+    @if ((isXsOrSm$ | async) !== true) {
+      <div class="col-12">
+        @if (searchEnabled) {
+          <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+        }
+        <ng-content select="[additionalSearchOptions]"></ng-content>
+      </div>
+    }
+    <div id="search-content" class="col-12">
+      <div class="d-block d-md-none search-controls clearfix">
+        @if (inPlaceSearch && showViewModes) {
+          <ds-view-mode-switch [viewModeList]="viewModeList"
+          [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+        }
+        <button (click)="openSidebar()" aria-controls="#search-body"
+          class="btn btn-outline-primary float-end open-sidebar"><i
+        class="fas fa-sliders"></i> {{"search.sidebar.open"
+        | translate}}
+      </button>
     </div>
+    <ng-content select="[searchContentTop]"></ng-content>
+    @if (inPlaceSearch) {
+      <ds-search-results
+        [searchResults]="resultsRD$ | async"
+        [searchConfig]="searchOptions$ | async"
+        [configuration]="(currentConfiguration$ | async)"
+        [disableHeader]="!searchEnabled"
+        [linkType]="linkType"
+        [context]="(currentContext$ | async)"
+        [selectable]="selectable"
+        [selectionConfig]="selectionConfig"
+        [showCsvExport]="showCsvExport"
+        [showThumbnails]="showThumbnails"
+        (contentChange)="onContentChange($event)"
+        (deselectObject)="deselectObject.emit($event)"
+      (selectObject)="selectObject.emit($event)"></ds-search-results>
+    }
+  </div>
+</div>
 </ng-template>
 
 <ng-template #sidebarContent>
-    <ds-search-sidebar id="search-sidebar" *ngIf="(isXsOrSm$ | async) !== true"
-                       [configurationList]="configurationList"
-                       [configuration]="(currentConfiguration$ | async)"
-                       [currentScope]="(currentScope$ | async)"
-                       [filters]="filtersRD$.asObservable()"
-                       [refreshFilters]="refreshFilters"
-                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                       [searchOptions]="(searchOptions$ | async)"
-                       [sortOptionsList]="(sortOptionsList$ | async)"
-                       [currentSortOption]="(currentSortOptions$ | async)"
-                       [inPlaceSearch]="inPlaceSearch"
-                       [viewModeList]="viewModeList"
-                       [showViewModes]="showViewModes"
-                       (changeConfiguration)="changeContext($event.context)"
-                       (changeViewMode)="changeViewMode()"></ds-search-sidebar>
-    <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
-                       [configurationList]="configurationList"
-                       [configuration]="(currentConfiguration$ | async)"
-                       [currentScope]="(currentScope$ | async)"
-                       [filters]="filtersRD$.asObservable()"
-                       [refreshFilters]="refreshFilters"
-                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                       [searchOptions]="(searchOptions$ | async)"
-                       [sortOptionsList]="(sortOptionsList$ | async)"
-                       [currentSortOption]="(currentSortOptions$ | async)"
-                       [inPlaceSearch]="inPlaceSearch"
-                       [viewModeList]="viewModeList"
-                       [showViewModes]="showViewModes"
-                       (toggleSidebar)="closeSidebar()"
-                       (changeConfiguration)="changeContext($event.context)"
-                       (changeViewMode)="changeViewMode()">
+  @if ((isXsOrSm$ | async) !== true) {
+    <ds-search-sidebar id="search-sidebar"
+      [configurationList]="configurationList"
+      [configuration]="(currentConfiguration$ | async)"
+      [currentScope]="(currentScope$ | async)"
+      [filters]="filtersRD$.asObservable()"
+      [refreshFilters]="refreshFilters"
+      [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+      [searchOptions]="(searchOptions$ | async)"
+      [sortOptionsList]="(sortOptionsList$ | async)"
+      [currentSortOption]="(currentSortOptions$ | async)"
+      [inPlaceSearch]="inPlaceSearch"
+      [viewModeList]="viewModeList"
+      [showViewModes]="showViewModes"
+      (changeConfiguration)="changeContext($event.context)"
+    (changeViewMode)="changeViewMode()"></ds-search-sidebar>
+  }
+  @if ((isXsOrSm$ | async)) {
+    <ds-search-sidebar id="search-sidebar-sm"
+      [configurationList]="configurationList"
+      [configuration]="(currentConfiguration$ | async)"
+      [currentScope]="(currentScope$ | async)"
+      [filters]="filtersRD$.asObservable()"
+      [refreshFilters]="refreshFilters"
+      [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+      [searchOptions]="(searchOptions$ | async)"
+      [sortOptionsList]="(sortOptionsList$ | async)"
+      [currentSortOption]="(currentSortOptions$ | async)"
+      [inPlaceSearch]="inPlaceSearch"
+      [viewModeList]="viewModeList"
+      [showViewModes]="showViewModes"
+      (toggleSidebar)="closeSidebar()"
+      (changeConfiguration)="changeContext($event.context)"
+      (changeViewMode)="changeViewMode()">
     </ds-search-sidebar>
+  }
 </ng-template>
 
 <ng-template #searchForm>
-    <ds-search-form id="search-form"
-                    [query]="(searchOptions$ | async)?.query"
-                    [scope]="(searchOptions$ | async)?.scope"
-                    [hideScopeInUrl]="hideScopeInUrl"
-                    [currentUrl]="searchLink"
-                    [showScopeSelector]="showScopeSelector"
-                    [inPlaceSearch]="inPlaceSearch"
-                    [searchPlaceholder]="searchFormPlaceholder | translate">
-    </ds-search-form>
-    <div class="row mb-3 mb-md-1">
-        <div class="labels col-12">
-            <ds-search-labels [inPlaceSearch]="inPlaceSearch">
-            </ds-search-labels>
-        </div>
+  <ds-search-form id="search-form"
+    [query]="(searchOptions$ | async)?.query"
+    [scope]="(searchOptions$ | async)?.scope"
+    [hideScopeInUrl]="hideScopeInUrl"
+    [currentUrl]="searchLink"
+    [showScopeSelector]="showScopeSelector"
+    [inPlaceSearch]="inPlaceSearch"
+    [searchPlaceholder]="searchFormPlaceholder | translate">
+  </ds-search-form>
+  <div class="row mb-3 mb-md-1">
+    <div class="labels col-12">
+      <ds-search-labels [inPlaceSearch]="inPlaceSearch">
+      </ds-search-labels>
     </div>
+  </div>
 </ng-template>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index c558d97f1f..24d7a2f038 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -1,15 +1,17 @@
 <div class="container">
   <div class="row">
     <div class="row-with-sidebar row-offcanvas row-offcanvas-left px-0"
-         [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
-      <div *ngIf="sideBarWidth > 0" id="{{id}}-sidebar-content"
-           [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
-           class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
-        <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
-      </div>
+      [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+      @if (sideBarWidth > 0) {
+        <div id="{{id}}-sidebar-content"
+          [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
+          class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
+          <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
+        </div>
+      }
       <div class="col-12 col-md-{{12 - sideBarWidth}}"
-           [class.px-0]="sideBarWidth === 0"
-           [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
+        [class.px-0]="sideBarWidth === 0"
+        [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index fcc0986003..cd07a898c0 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -1,35 +1,39 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
-    <div class="row">
+  <div class="row">
     <span class="col-12 fw-bold mb-1">
       {{ 'browse.startsWith.jump' | translate }}
     </span>
-        <div class="col-6 col-md-2">
-            <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
-                <option [value]="-1" [selected]="!startsWithYear">
-                    {{ 'browse.startsWith.choose_year' | translate }}
-                </option>
-                <option *ngFor="let option of startsWithOptions"
-                        [value]="option"
-                        [selected]="option === startsWithYear ? 'selected': null">
-                    {{ option }}
-                </option>
-            </select>
-        </div>
-        <div class="col-6 col-md-2">
-            <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
-                <option *ngFor="let option of monthOptions"
-                        [value]="option"
-                        [selected]="option === startsWithMonth ? 'selected': null">
-                    {{ 'browse.startsWith.months.' + option | translate }}
-                </option>
-            </select>
-        </div>
-        <div class="col-12 col-md-6">
-            <div class="mb-3 input-group pt-1 pt-md-0">
-                <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith"
-                       formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''"/>
-                <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{ 'browse.startsWith.submit' | translate }}</button>
-            </div>
-        </div>
+    <div class="col-6 col-md-2">
+      <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
+        <option [value]="-1" [selected]="!startsWithYear">
+          {{ 'browse.startsWith.choose_year' | translate }}
+        </option>
+        @for (option of startsWithOptions; track option) {
+          <option
+            [value]="option"
+            [selected]="option === startsWithYear ? 'selected': null">
+            {{ option }}
+          </option>
+        }
+      </select>
     </div>
+    <div class="col-6 col-md-2">
+      <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
+        @for (option of monthOptions; track option) {
+          <option
+            [value]="option"
+            [selected]="option === startsWithMonth ? 'selected': null">
+            {{ 'browse.startsWith.months.' + option | translate }}
+          </option>
+        }
+      </select>
+    </div>
+    <div class="col-12 col-md-6">
+      <div class="mb-3 input-group pt-1 pt-md-0">
+        <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith"
+          formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''"/>
+        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{ 'browse.startsWith.submit' | translate }}</button>
+      </div>
+    </div>
+  </div>
 </form>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 926ae08c2f..0037f44092 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -1,45 +1,63 @@
-<form *ngIf="subscriptionForm" [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
-  <div class="modal-header">
-    <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
-    <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.close()">
-    </button>
-  </div>
-  <div class="modal-body">
-    <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
-      <span *ngIf="!!dso" class="float-end"><ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge></span>
+@if (subscriptionForm) {
+  <form [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
+    <div class="modal-header">
+      <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
+      <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.close()">
+      </button>
+    </div>
+    <div class="modal-body">
+      <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
+      @if (!!dso) {
+        <span class="float-end">@if (!!dso) {
+          <ds-type-badge [object]="dso"></ds-type-badge>
+        }</span>
+      }
     </p>
     <div>
-      <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="mb-3 row">
-        <legend class="col-md-4 col-form-label float-md-left pt-0">
-          {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
-        </legend>
-        <div class="col-md-8">
-          <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
-          <div class="form-check" formGroupName="frequencies" *ngFor="let frequency of frequencyDefaultValues">
-            <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency"/>
-            <label class="form-check-label"
-                   [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}</label>
+      @for (subscriptionType of subscriptionForm?.controls | keyvalue; track subscriptionType) {
+        <fieldset formGroupName="{{subscriptionType.key}}" class="mb-3 row">
+          <legend class="col-md-4 col-form-label float-md-left pt-0">
+            {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
+          </legend>
+          <div class="col-md-8">
+            <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
+            @for (frequency of frequencyDefaultValues; track frequency) {
+              <div class="form-check" formGroupName="frequencies">
+                <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency"/>
+                <label class="form-check-label"
+                [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}</label>
+              </div>
+            }
           </div>
-        </div>
-        <ds-alert *ngIf="!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required" [type]="'alert-danger'">
-          {{ 'context-menu.actions.subscription.frequency.required' | translate }}
-        </ds-alert>
-      </fieldset>
+          @if (!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required) {
+            <ds-alert [type]="'alert-danger'">
+              {{ 'context-menu.actions.subscription.frequency.required' | translate }}
+            </ds-alert>
+          }
+        </fieldset>
+      }
     </div>
-    <p class="text-muted" *ngIf="(showDeleteInfo$ | async)">{{'subscriptions.modal.delete-info' | translate}}</p>
+    @if ((showDeleteInfo$ | async)) {
+      <p class="text-muted">{{'subscriptions.modal.delete-info' | translate}}</p>
+    }
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-secondary"
-            (click)="activeModal.close()">
+      (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
     <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
-        <span *ngIf="(processing$ | async)">
+      @if ((processing$ | async)) {
+        <span>
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
-      <span *ngIf="(processing$ | async) !== true">
-        {{'subscriptions.modal.new-subscription-form.submit' | translate}}
-      </span>
+      }
+      @if ((processing$ | async) !== true) {
+        <span>
+          {{'subscriptions.modal.new-subscription-form.submit' | translate}}
+        </span>
+      }
     </button>
   </div>
 </form>
+}
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 95b00acdbd..79d3b2ca90 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,27 +1,31 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone position-fixed h-100 w-100"
-     [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
-     [uploader]="uploader"
-     (onFileDrop)="setFile($event)"
-     (fileOver)="fileOverDocument($event)">
+  class="ds-document-drop-zone position-fixed h-100 w-100"
+  [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
+  [uploader]="uploader"
+  (onFileDrop)="setFile($event)"
+  (fileOver)="fileOverDocument($event)">
 </div>
-<div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+@if ((isOverDocumentDropZone | async)) {
   <div
-    class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
-    <p class="text-primary">{{ dropMessageLabel | translate}}</p>
+    class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+    <div
+      class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
+      <p class="text-primary">{{ dropMessageLabel | translate}}</p>
+    </div>
   </div>
-</div>
+}
 <div class="well ds-base-drop-zone mt-1 mb-3 text-muted p-2">
-  <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
-     *ngIf="fileObject">  {{ fileObject?.name }} </p>
+  @if (fileObject) {
+    <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
+    >  {{ fileObject?.name }} </p>
+  }
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
-      <span><i class="fas fa-cloud-upload"
-               aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
+    <span><i class="fas fa-cloud-upload"
+    aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ms-1">
       <input class="form-control-file d-none" type="file" name="file-upload"
-             id="file-upload"
-             (change)="handleFileInput($event)">
+        id="file-upload"
+        (change)="handleFileInput($event)">
       {{'uploader.browse' | translate}}
     </label>
   </p>
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 5b2f3f9672..44b90d8189 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -1,55 +1,68 @@
-<div ng2FileDrop
-     *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone position-fixed h-100 w-100"
-     [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
-     [uploader]="uploader"
-     (fileOver)="fileOverDocument($event)">
-</div>
-<div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
-  <div class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
-    <p class="text-primary">{{dropOverDocumentMsg | translate}}</p>
+@if ((isOverDocumentDropZone | async)) {
+  <div ng2FileDrop
+    class="ds-document-drop-zone position-fixed h-100 w-100"
+    [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
+    [uploader]="uploader"
+    (fileOver)="fileOverDocument($event)">
   </div>
-</div>
+}
+@if ((isOverDocumentDropZone | async)) {
+  <div
+    class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+    <div class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
+      <p class="text-primary">{{dropOverDocumentMsg | translate}}</p>
+    </div>
+  </div>
+}
 <div [attr.id]="uploaderId" class="row">
   <div class="col-md-12">
     <div ng2FileDrop
-         [ngClass]="{'ds-base-drop-zone-file-over': (isOverBaseDropZone | async)}"
-         [uploader]="uploader"
-         (fileOver)="fileOverBase($event)"
-         class="well ds-base-drop-zone mt-1 mb-3 text-muted">
-      <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span class="d-flex align-items-center">
-          <i class="fas fa-upload pe-1" aria-hidden="true"></i>
-          {{dropMsg | translate}}{{'uploader.or' | translate}}
-          <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ms-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
-            <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
-          </label>
-          <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
-        </span>
-      </div>
-      <div *ngIf="(isOverBaseDropZone | async) || uploader?.queue?.length !== 0">
-        <div class="m-1">
-          <div class="upload-item-top">
-            <span class="filename">
-              <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
-            </span>
-            <div class="btn-group btn-group-sm float-end" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
-                <i class="fas fa-trash" aria-hidden="true"></i>
-              </button>
-            </div>
-            <span *ngIf="uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)" class="float-end me-3">{{ uploader.progress }}%</span>
-            <span *ngIf="uploader.progress === 100" class="float-end me-3">{{'uploader.processing' | translate}}</span>
-          </div>
-          <div class="ds-base-drop-zone-progress clearfix mt-2">
-            <div role="progressbar"
-                 style="height: 5px; width: 0;"
-                 [ngStyle]="{ 'width': uploader.progress + '%' }"
-                 [ngClass]="{'progress-bar': true, 'bg-success progress-bar-striped progress-bar-animated': uploader.progress === 100}"></div>
-          </div>
+      [ngClass]="{'ds-base-drop-zone-file-over': (isOverBaseDropZone | async)}"
+      [uploader]="uploader"
+      (fileOver)="fileOverBase($event)"
+      class="well ds-base-drop-zone mt-1 mb-3 text-muted">
+      @if (uploader?.queue?.length === 0) {
+        <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center">
+          <span class="d-flex align-items-center">
+            <i class="fas fa-upload pe-1" aria-hidden="true"></i>
+            {{dropMsg | translate}}{{'uploader.or' | translate}}
+            <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ms-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
+              <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
+            </label>
+            <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
+          </span>
         </div>
+      }
+      @if ((isOverBaseDropZone | async) || uploader?.queue?.length !== 0) {
+        <div>
+          <div class="m-1">
+            <div class="upload-item-top">
+              <span class="filename">
+                @if (!uploader.options.disableMultipart) {
+                  <span>{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>
+                  }{{ uploader?.queue[0]?.file.name }}
+                </span>
+                <div class="btn-group btn-group-sm float-end" role="group">
+                  <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
+                    <i class="fas fa-trash" aria-hidden="true"></i>
+                  </button>
+                </div>
+                @if (uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)) {
+                  <span class="float-end me-3">{{ uploader.progress }}%</span>
+                }
+                @if (uploader.progress === 100) {
+                  <span class="float-end me-3">{{'uploader.processing' | translate}}</span>
+                }
+              </div>
+              <div class="ds-base-drop-zone-progress clearfix mt-2">
+                <div role="progressbar"
+                  style="height: 5px; width: 0;"
+                  [ngStyle]="{ 'width': uploader.progress + '%' }"
+                [ngClass]="{'progress-bar': true, 'bg-success progress-bar-striped progress-bar-animated': uploader.progress === 100}"></div>
+              </div>
+            </div>
+          </div>
+        }
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 2795686501..4888ecad0f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,37 +1,42 @@
 <div>
-  <div
-    *ngIf="(available$ | async) !== true"
-    class="input-group mb-3">
-  <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
-  <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
-  </div>
-  <div
-    ngbDropdown
-    #collectionControls="ngbDropdown"
-    *ngIf="(available$ | async)"
-    class="btn-group input-group"
-    (openChange)="toggled($event)">
-  <span id="collectionControlsMenuLabel" class="input-group-text">
-    {{ 'submission.sections.general.collection' | translate }}
-  </span>
-    <button aria-describedby="collectionControlsMenuLabel"
-            id="collectionControlsMenuButton"
-            class="btn btn-outline-primary"
-            (blur)="onClose()"
-            (click)="onClose()"
-            [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
-            ngbDropdownToggle>
-      <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
-      <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
-    </button>
-
-    <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="collectionControlsDropdownMenu"
-         aria-labelledby="collectionControlsMenuButton">
-      <ds-collection-dropdown
-        (selectionChange)="onSelect($event)">
-      </ds-collection-dropdown>
+  @if ((available$ | async) !== true) {
+    <div
+      class="input-group mb-3">
+      <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
+      <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
     </div>
-  </div>
+  }
+  @if ((available$ | async)) {
+    <div
+      ngbDropdown
+      #collectionControls="ngbDropdown"
+      class="btn-group input-group"
+      (openChange)="toggled($event)">
+      <span id="collectionControlsMenuLabel" class="input-group-text">
+        {{ 'submission.sections.general.collection' | translate }}
+      </span>
+      <button aria-describedby="collectionControlsMenuLabel"
+        id="collectionControlsMenuButton"
+        class="btn btn-outline-primary"
+        (blur)="onClose()"
+        (click)="onClose()"
+        [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+        ngbDropdownToggle>
+        @if ((processingChange$ | async)) {
+          <span><i class='fas fa-circle-notch fa-spin'></i></span>
+        }
+        @if ((processingChange$ | async) !== true) {
+          <span>{{ selectedCollectionName$ | async }}</span>
+        }
+      </button>
+      <div ngbDropdownMenu
+        class="dropdown-menu p-0"
+        id="collectionControlsDropdownMenu"
+        aria-labelledby="collectionControlsMenuButton">
+        <ds-collection-dropdown
+          (selectionChange)="onSelect($event)">
+        </ds-collection-dropdown>
+      </div>
+    </div>
+  }
 </div>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index dbbef546df..1001d4c619 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -1,59 +1,75 @@
-<div class="row" *ngIf="!!submissionId">
-  <div class="col">
-    <button *ngIf="(showDepositAndDiscard | async)"
+@if (!!submissionId) {
+  <div class="row">
+    <div class="col">
+      @if ((showDepositAndDiscard | async)) {
+        <button
+          type="button"
+          id="discard"
+          [attr.data-test]="'discard' | dsBrowserOnly"
+          class="btn btn-danger"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          (click)="$event.preventDefault();confirmDiscard(content)">
+          <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
+        </button>
+      }
+    </div>
+    <div class="col text-end d-flex justify-content-end align-items-center">
+      @if ((hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true) {
+        <span>
+          <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
+        </span>
+      }
+      @if ((hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true) {
+        <span>
+          <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
+        </span>
+      }
+      @if ((processingSaveStatus | async) || (processingDepositStatus | async)) {
+        <div class="col d-flex justify-content-end align-items-center">
+          <div class="progress w-75">
+            @if ((processingSaveStatus | async)) {
+              <div class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
+            }
+            @if ((processingDepositStatus | async)) {
+              <div class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
+            }
+          </div>
+        </div>
+      }
+      <div class="ms-2 space-children-mr">
+        <button type="button"
+          class="btn btn-secondary"
+          id="save"
+          [attr.data-test]="'save' | dsBrowserOnly"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+          (click)="save($event)">
+          <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
+        </button>
+        <button type="button"
+          [class.btn-primary]="(showDepositAndDiscard | async) !== true"
+          [class.btn-secondary]="(showDepositAndDiscard | async)"
+          class="btn"
+          id="saveForLater"
+          [attr.data-test]="'save-for-later' | dsBrowserOnly"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          (click)="saveLater($event)">
+          <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
+        </button>
+        @if ((showDepositAndDiscard | async)) {
+          <button
             type="button"
-            id="discard"
-            [attr.data-test]="'discard' | dsBrowserOnly"
-            class="btn btn-danger"
+            id="deposit"
+            [attr.data-test]="'deposit' | dsBrowserOnly"
+            class="btn btn-success"
             [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-            (click)="$event.preventDefault();confirmDiscard(content)">
-      <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
-    </button>
-  </div>
-  <div class="col text-end d-flex justify-content-end align-items-center">
-    <span *ngIf="(hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
-      <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
-    </span>
-    <span *ngIf="(hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
-      <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
-    </span>
-    <div *ngIf="(processingSaveStatus | async) || (processingDepositStatus | async)" class="col d-flex justify-content-end align-items-center">
-      <div class="progress w-75">
-        <div *ngIf="(processingSaveStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
-        <div *ngIf="(processingDepositStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
+            (click)="deposit($event)">
+            <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
+          </button>
+        }
       </div>
     </div>
-    <div class="ms-2 space-children-mr">
-      <button type="button"
-              class="btn btn-secondary"
-              id="save"
-              [attr.data-test]="'save' | dsBrowserOnly"
-              [dsBtnDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
-              (click)="save($event)">
-        <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
-      </button>
-      <button type="button"
-              [class.btn-primary]="(showDepositAndDiscard | async) !== true"
-              [class.btn-secondary]="(showDepositAndDiscard | async)"
-              class="btn"
-              id="saveForLater"
-              [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-              (click)="saveLater($event)">
-        <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
-      </button>
-      <button *ngIf="(showDepositAndDiscard | async)"
-              type="button"
-              id="deposit"
-              [attr.data-test]="'deposit' | dsBrowserOnly"
-              class="btn btn-success"
-              [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-              (click)="deposit($event)">
-        <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
-      </button>
-    </div>
   </div>
-</div>
+}
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 27b1c0c545..802d0e1c4c 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -1,42 +1,49 @@
 <div class="container-fluid">
-    <div *ngIf="(isLoading() | async) !== true" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
-        <div *ngIf="(uploadEnabled$ | async)" class="w-100">
-            <ds-submission-upload-files [submissionId]="submissionId"
-                                        [collectionId]="collectionId"
-                                        [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
-            <div class="clearfix"></div>
+  @if ((isLoading() | async) !== true) {
+    <div class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
+      @if ((uploadEnabled$ | async)) {
+        <div class="w-100">
+          <ds-submission-upload-files [submissionId]="submissionId"
+            [collectionId]="collectionId"
+          [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
+          <div class="clearfix"></div>
         </div>
-
-        <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
-          <ng-container *ngIf="!isSectionHidden">
-            <ds-submission-form-collection
+      }
+      <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
+        @if (!isSectionHidden) {
+          <ds-submission-form-collection
             [currentCollectionId]="collectionId"
-                                           [currentDefinition]="definitionId"
-                                           [submissionId]="submissionId"
-                                           [collectionModifiable]="collectionModifiable"
-                                           [isReadonly]="isSectionReadonly"
-                                           (collectionChange)="onCollectionChange($event)">
-            </ds-submission-form-collection>
-          </ng-container>
-        </div>
-        <div class="submission-form-header-item text-end">
-            <ds-submission-form-section-add [collectionId]="collectionId"
-                                            [submissionId]="submissionId">
-            </ds-submission-form-section-add>
-        </div>
+            [currentDefinition]="definitionId"
+            [submissionId]="submissionId"
+            [collectionModifiable]="collectionModifiable"
+            [isReadonly]="isSectionReadonly"
+            (collectionChange)="onCollectionChange($event)">
+          </ds-submission-form-collection>
+        }
+      </div>
+      <div class="submission-form-header-item text-end">
+        <ds-submission-form-section-add [collectionId]="collectionId"
+          [submissionId]="submissionId">
+        </ds-submission-form-section-add>
+      </div>
     </div>
+  }
 
-    <div class="submission-form-content">
-        <ds-loading *ngIf="(isLoading() | async)" message="Loading..."></ds-loading>
-        <ng-container *ngFor="let object of $any(submissionSections | async)">
-            <ds-submission-section-container [collectionId]="collectionId"
-                                             [submissionId]="submissionId"
-                                             [sectionData]="$any(object)">
-            </ds-submission-section-container>
-        </ng-container>
-    </div>
-    <div *ngIf="(isLoading() | async) !== true" class="submission-form-footer mt-3 mb-3 position-sticky">
-        <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
+  <div class="submission-form-content">
+    @if ((isLoading() | async)) {
+      <ds-loading message="Loading..."></ds-loading>
+    }
+    @for (object of $any(submissionSections | async); track object) {
+      <ds-submission-section-container [collectionId]="collectionId"
+        [submissionId]="submissionId"
+        [sectionData]="$any(object)">
+      </ds-submission-section-container>
+    }
+  </div>
+  @if ((isLoading() | async) !== true) {
+    <div class="submission-form-footer mt-3 mb-3 position-sticky">
+      <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
     </div>
+  }
 </div>
 
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index b386f3c8cb..02bcc78bf4 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -1,7 +1,7 @@
 <div class="modal-header">
   <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h2>
   <button type="button" class="btn-close"
-          (click)="closeMetadataModal()" aria-label="Close">
+    (click)="closeMetadataModal()" aria-label="Close">
   </button>
 </div>
 <div class="modal-body">
@@ -14,27 +14,29 @@
     <div class="row">
       <div class="col-md-12">
         <hr>
+        </div>
+      </div>
+      @for (metadata of metadataList; track metadata) {
+        <div class="row">
+          <p class="col-md-12">
+            <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
+            @for (metadatum of metadata.values; track metadatum) {
+              <span>{{metadatum.value}}</span><br>
+            }
+          </p>
+        </div>
+      }
+      <div class="row">
+        <div class="col-md-12">
+          <hr>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12 text-end">
+            <button class="btn btn-success" (click)="import()" role="button">
+              <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
+            </button>
+          </div>
+        </div>
       </div>
     </div>
-    <div *ngFor="let metadata of metadataList" class="row">
-      <p class="col-md-12">
-        <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
-        <ng-container *ngFor="let metadatum of metadata.values">
-          <span>{{metadatum.value}}</span><br>
-        </ng-container>
-      </p>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <hr>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12 text-end">
-        <button class="btn btn-success" (click)="import()" role="button">
-          <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index c90adbea07..3dfbea992b 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,14 +1,18 @@
-<div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
+@if ((isXsOrSm$ | async)) {
+  <div class="input-group mb-2">
     <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}"
-           [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
-</div>
+      [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  </div>
+}
 <div class="input-group mb-5">
-  <input *ngIf="(isXsOrSm$ | async) !== true" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  @if ((isXsOrSm$ | async) !== true) {
+    <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  }
   <div [ngClass]="{'input-group-append': (isXsOrSm$ | async) !== true}" ngbDropdown role="group">
     <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
-            class="btn btn-outline-secondary w-fx"
-            title="{{'submission.import-external.search.source.hint' |translate}}"
-            ngbDropdownToggle>
+      class="btn btn-outline-secondary w-fx"
+      title="{{'submission.import-external.search.source.hint' |translate}}"
+      ngbDropdownToggle>
       {{'submission.import-external.source.' + selectedElement?.name | translate}}
     </button>
     <ul ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
@@ -20,13 +24,17 @@
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-            <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
-                    *ngFor="let source of sourceList">{{ 'submission.import-external.source.' + source?.name | translate }}
-            </button>
-        <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
-        </li>
+        @for (source of sourceList; track source) {
+          <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
+            >{{ 'submission.import-external.source.' + source?.name | translate }}
+          </button>
+        }
+        @if (sourceListLoading) {
+          <div ngbDropdownItem class="scrollable-dropdown-loading text-center"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
+        }
+      </li>
     </ul>
     <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''"
-            [dsBtnDisabled]="searchString === ''" (click)="search()">{{ 'submission.import-external.search.button' | translate }}
+      [dsBtnDisabled]="searchString === ''" (click)="search()">{{ 'submission.import-external.search.button' | translate }}
     </button>
-</div>
+  </div>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index cf2e68e87b..2a7ff552af 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -2,22 +2,22 @@
   <div class="mb-4 ccLicense-select">
     <div ngbDropdown>
       <input id="cc-license-dropdown"
-             class="form-control"
-             [(ngModel)]="selectedCcLicense.name"
-             placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
-             [ngModelOptions]="{standalone: true}"
-             ngbDropdownToggle
-             role="combobox"
-             #script="ngModel">
+        class="form-control"
+        [(ngModel)]="selectedCcLicense.name"
+        placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+        [ngModelOptions]="{standalone: true}"
+        ngbDropdownToggle
+        role="combobox"
+        #script="ngModel">
       <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
-           role="menu"
-           infiniteScroll
-           (scroll)="onScroll($event)"
-           [infiniteScrollDistance]="5"
-           [infiniteScrollThrottle]="300"
-           [infiniteScrollUpDistance]="1.5"
-           [fromRoot]="true"
-           [scrollWindow]="false">
+        role="menu"
+        infiniteScroll
+        (scroll)="onScroll($event)"
+        [infiniteScrollDistance]="5"
+        [infiniteScrollThrottle]="300"
+        [infiniteScrollUpDistance]="1.5"
+        [fromRoot]="true"
+        [scrollWindow]="false">
 
         @if(submissionCcLicenses?.length === 0) {
           <button class="dropdown-item disabled">
@@ -31,115 +31,121 @@
           }
         }
       </div>
-  </div>
+    </div>
   </div>
 }
 
-<ng-container *ngIf="getSelectedCcLicense()">
-
-  <div *ngFor="let field of getSelectedCcLicense().fields"
-       class="mb-4">
-
-    <div class="d-flex flex-row">
-      <div class="fw-bold {{ field.id }}">
-        {{ field.label }}
-      </div>
-      <button
-        class="btn btn-outline-info btn-sm ms-2"
-        (click)="openInfoModal(infoModal)">
-        <i class="fas fa-question"></i>
-      </button>
-    </div>
-
-    <ng-template #infoModal>
-
-      <div>
-
-        <div class="modal-header mb-4 ">
-          <div>
-            <h4>
-              {{ field.label }}
-            </h4>
-            <div [innerHTML]="field.description"></div>
-          </div>
-          <button type="button" class="btn-close"
-                  (click)="closeInfoModal()" aria-label="Close">
-          </button>
+@if (getSelectedCcLicense()) {
+  @for (field of getSelectedCcLicense().fields; track field) {
+    <div
+      class="mb-4">
+      <div class="d-flex flex-row">
+        <div class="fw-bold {{ field.id }}">
+          {{ field.label }}
         </div>
-
-        <div class="modal-body">
-          <div *ngFor="let value of field.enums"
-               class="mb-4">
-            <h5>
-              {{ value.label }}
-            </h5>
-            <div [innerHTML]="value.description" class="fw-light"></div>
+        <button
+          class="btn btn-outline-info btn-sm ms-2"
+          (click)="openInfoModal(infoModal)">
+          <i class="fas fa-question"></i>
+        </button>
+      </div>
+      <ng-template #infoModal>
+        <div>
+          <div class="modal-header mb-4 ">
+            <div>
+              <h4>
+                {{ field.label }}
+              </h4>
+              <div [innerHTML]="field.description"></div>
+            </div>
+            <button type="button" class="btn-close"
+              (click)="closeInfoModal()" aria-label="Close">
+            </button>
+          </div>
+          <div class="modal-body">
+            @for (value of field.enums; track value) {
+              <div
+                class="mb-4">
+                <h5>
+                  {{ value.label }}
+                </h5>
+                <div [innerHTML]="value.description" class="fw-light"></div>
+              </div>
+            }
           </div>
         </div>
-
-      </div>
-
-    </ng-template>
-
-    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
-      <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
-        <span *ngIf="option">
-          {{ option.label }}
-        </span>
-        <span *ngIf="!option">
-          {{ 'submission.sections.ccLicense.option.select' | translate }}
-        </span>
-      </ng-container>
-      <ng-container class="menu">
-        <div class="options-select-menu overflow-auto">
-          <button *ngFor="let option of field.enums"
+      </ng-template>
+      @if (field.enums?.length > 5) {
+        <ds-select [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+          <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
+            @if (option) {
+              <span>
+                {{ option.label }}
+              </span>
+            }
+            @if (!option) {
+              <span>
+                {{ 'submission.sections.ccLicense.option.select' | translate }}
+              </span>
+            }
+          </ng-container>
+          <ng-container class="menu">
+            <div class="options-select-menu overflow-auto">
+              @for (option of field.enums; track option) {
+                <button
                   class="dropdown-item"
                   (click)="selectOption(getSelectedCcLicense(), field, option)">
-            {{ option.label }}
-          </button>
-        </div>
-      </ng-container>
-    </ds-select>
+                  {{ option.label }}
+                </button>
+              }
+            </div>
+          </ng-container>
+        </ds-select>
+      }
+      @if (field.enums?.length <= 5) {
+        @for (option of field.enums; track option) {
+          <div
+            class="d-flex flex-row m-1">
+            <div (click)="selectOption(getSelectedCcLicense(), field, option)">
+              <input type="radio"
+                title="{{ option.label }}"
+                class="me-1"
+                [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
+              <span>{{ option.label }}</span>
+            </div>
+          </div>
+        }
+      }
+    </div>
+  }
+}
 
-    <ng-container *ngIf="field.enums?.length <= 5">
-      <div *ngFor="let option of field.enums"
-           class="d-flex flex-row m-1">
-        <div (click)="selectOption(getSelectedCcLicense(), field, option)">
-          <input type="radio"
-                 title="{{ option.label }}"
-                 class="me-1"
-                 [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
-          <span>{{ option.label }}</span>
-        </div>
-      </div>
-    </ng-container>
-
-  </div>
-
-</ng-container>
-
-<ng-container *ngIf="getCcLicenseLink$()">
+@if (getCcLicenseLink$()) {
   <ng-container *ngVar="getCcLicenseLink$() | async as licenseLink">
-    <div *ngIf="!licenseLink">
-      <ds-loading></ds-loading>
-    </div>
-    <div *ngIf="licenseLink"
-         class="mt-2 p-4 bg-light text-dark">
+    @if (!licenseLink) {
       <div>
-        {{ 'submission.sections.ccLicense.link' | translate }}
+        <ds-loading></ds-loading>
       </div>
-      <a class="license-link" href="{{ licenseLink }}" target="_blank" rel="noopener noreferrer">
-        {{ licenseLink }}
-      </a>
-      <div class="m-2">
-        <div (click)="setAccepted(!accepted)">
-          <input type="checkbox"
-                 class="me-2"
-                 title="accepted"
-                 [checked]="accepted">
-          <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
+    }
+    @if (licenseLink) {
+      <div
+        class="mt-2 p-4 bg-light text-dark">
+        <div>
+          {{ 'submission.sections.ccLicense.link' | translate }}
+        </div>
+        <a class="license-link" href="{{ licenseLink }}" target="_blank" rel="noopener noreferrer">
+          {{ licenseLink }}
+        </a>
+        <div class="m-2">
+          <div (click)="setAccepted(!accepted)">
+            <input type="checkbox"
+              class="me-2"
+              title="accepted"
+              [checked]="accepted">
+            <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
-</ng-container>
+}
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 4f76af8c4c..cb31d2766c 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -2,44 +2,60 @@
   class="mb-2"
   [ngClass]="{ 'section-focus' : sectionRef.isSectionActive() }" [mandatory]="sectionData.mandatory"
   [submissionId]="submissionId" [sectionType]="sectionData.sectionType" [sectionId]="sectionData.id">
-  <ngb-accordion #acc="ngbAccordion" *ngIf="(sectionRef.isEnabled() | async)"
-    (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
-    <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
-      <ng-template ngbPanelTitle class="d-flex">
-        <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
-          'submission.sections.'+sectionData.header | translate
+  @if ((sectionRef.isEnabled() | async)) {
+    <ngb-accordion #acc="ngbAccordion"
+      (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
+      <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
+        <ng-template ngbPanelTitle class="d-flex">
+          <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
+            'submission.sections.'+sectionData.header | translate
           }}</span>
-        <div class="d-inline-block">
-          <i *ngIf="(sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-warning me-3"
-            title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
-          <i *ngIf="(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-danger me-3"
-            title="{{'submission.sections.status.errors.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.errors.aria' | translate"></i>
-          <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-check-circle text-success me-3"
-            title="{{'submission.sections.status.valid.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
-          <i *ngIf="sectionRef.isInfo()" class="fas fa-info-circle me-3 text-white"
-            title="{{'submission.sections.status.info.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
-          <a href="javascript:void(0);" class="me-3" *ngIf="!sectionRef.isMandatory()"
-            (click)="removeSection($event)">
-            <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
-          </a>
-        </div>
-      </ng-template>
-      <ng-template ngbPanelContent>
-        <div id="sectionGenericError_{{sectionData.id}}" *ngIf="sectionRef.hasGenericErrors()">
-          <ds-alert *ngFor="let error of sectionRef.getErrors(); let i = index" [content]="error" [dismissible]="true"
-            [type]="AlertTypeEnum.Error" (close)="sectionRef.removeError(i)"></ds-alert>
-        </div>
-        <div id="sectionContent_{{sectionData.id}}" (click)="sectionRef.setFocus($event)">
-          <ng-container *ngComponentOutlet="getSectionContent(); injector: objectInjector;"></ng-container>
-        </div>
-      </ng-template>
-    </ngb-panel>
-  </ngb-accordion>
+          <div class="d-inline-block">
+            @if ((sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-exclamation-circle text-warning me-3"
+                title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
+            }
+            @if ((sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-exclamation-circle text-danger me-3"
+                title="{{'submission.sections.status.errors.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.errors.aria' | translate"></i>
+            }
+            @if ((sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-check-circle text-success me-3"
+                title="{{'submission.sections.status.valid.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
+            }
+            @if (sectionRef.isInfo()) {
+              <i class="fas fa-info-circle me-3 text-white"
+                title="{{'submission.sections.status.info.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
+            }
+            @if (!sectionRef.isMandatory()) {
+              <a href="javascript:void(0);" class="me-3"
+                (click)="removeSection($event)">
+                <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
+              </a>
+            }
+          </div>
+        </ng-template>
+        <ng-template ngbPanelContent>
+          @if (sectionRef.hasGenericErrors()) {
+            <div id="sectionGenericError_{{sectionData.id}}">
+              @for (error of sectionRef.getErrors(); track error; let i = $index) {
+                <ds-alert [content]="error" [dismissible]="true"
+                [type]="AlertTypeEnum.Error" (close)="sectionRef.removeError(i)"></ds-alert>
+              }
+            </div>
+          }
+          <div id="sectionContent_{{sectionData.id}}" (click)="sectionRef.setFocus($event)">
+            <ng-container *ngComponentOutlet="getSectionContent(); injector: objectInjector;"></ng-container>
+          </div>
+        </ng-template>
+      </ngb-panel>
+    </ngb-accordion>
+  }
 </div>
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
index 9f3110d965..ecd66f1d4d 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -1,149 +1,168 @@
 <div class="container-fluid">
-  <ng-container *ngIf="patterns?.length > 0 ">
-    <div *ngFor="let ldnPattern of patterns; let i = index" class="col">
-      <div *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0">
-        <label class="row col-form-label">
-          {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
-        </label
-        >
-        <div *ngIf="ldnServiceByPattern[ldnPattern.pattern]?.services.length">
-          <div
-            *ngFor="
-            let service of ldnServiceByPattern[ldnPattern.pattern].services;
-            let serviceIndex = index
-          "
-          >
-            <div class="row">
-              <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
-                <div class="position-relative right-addon"
-                     [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
-                  <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
-                     aria-hidden="true"></i>
-                  <input
-                    [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
-                    type="text"
-                    [readonly]="true"
-                    [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
-                    class="form-control w-100 scrollable-dropdown-input"
-                    [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
-                    (click)="myDropdown.open()"
-                  />
-                </div>
-                <div
-                  ngbDropdownMenu
-                  class="dropdown-menu scrollable-dropdown-menu w-100"
-                  aria-haspopup="true"
-                  aria-expanded="false"
-                >
-                  <div
-                    class="scrollable-menu"
-                    role="listbox"
-                    infiniteScroll
-                    [infiniteScrollDistance]="2"
-                    [infiniteScrollThrottle]="50"
-                    [scrollWindow]="false"
-                  >
-                    <button
-                      *ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
-                      class="dropdown-item collection-item text-truncate w-100"
-                    >
-                      {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
-                    </button>
-                    <button
-                      *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0"
-                      class="dropdown-item collection-item text-truncate w-100"
-                      (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
-                    >
-                      {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
-                    </button>
-                    <button
-                      *ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async"
-                      [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
-                      class="dropdown-item collection-item text-truncate w-100"
-                      (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
-                    >
-                      <b>
-                        {{ serviceOption.name }}
-                      </b>
-                      <br />
-                      {{ serviceOption.description }}
-                    </button>
-                  </div>
-                </div>
-              </div>
-              <button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
-                      type="button" [class.mt-2]="serviceIndex > 0"
-                      class="btn btn-secondary ms-2"
-                      role="button"
-                      title="{{'form.remove' | translate}}"
-                      [attr.aria-label]="'form.remove' | translate"
-                      (click)="removeService(ldnPattern, serviceIndex)"
+  @if (patterns?.length > 0 ) {
+    @for (ldnPattern of patterns; track ldnPattern; let i = $index) {
+      <div class="col">
+        @if ((filterServices(ldnPattern.pattern ) | async)?.length > 0) {
+          <div>
+            <label class="row col-form-label">
+              {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
+              </label
               >
-                <span><i class="fas fa-trash" aria-hidden="true"></i></span>
-              </button>
-            </div>
-
-            <small
-              class="row text-muted"
-              *ngIf="!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
-                    serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1"
-            >
-              {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
-            </small>
-            <ng-container *ngIf="(getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0">
-              <small class="row text-danger" *ngFor="let error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)">
-                {{ error.message | translate}}
-              </small>
-            </ng-container>
-            <div
-              class="row mt-1"
-              *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]"
-            >
-              <div
-                class="alert alert-info w-100 d-flex align-items-center flex-row"
-              >
-                <i class="fa-solid fa-circle-info fa-xl ms-2"></i>
-                <div class="ms-4">
-                  <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
-                  <div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
-                    {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
-                  </div>
-                  <ng-template #noDesc>
-                <span class="text-muted">
-                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
-                </span>
-                  </ng-template>
+              @if (ldnServiceByPattern[ldnPattern.pattern]?.services.length) {
+                <div>
+                  @for (
+                    service of ldnServiceByPattern[ldnPattern.pattern].services; track
+                    service; let serviceIndex = $index) {
+                    <div
+                      >
+                      <div class="row">
+                        <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
+                          <div class="position-relative right-addon"
+                            [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
+                            <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+                            aria-hidden="true"></i>
+                            <input
+                              [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
+                              type="text"
+                              [readonly]="true"
+                              [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
+                              class="form-control w-100 scrollable-dropdown-input"
+                              [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
+                              (click)="myDropdown.open()"
+                              />
+                          </div>
+                          <div
+                            ngbDropdownMenu
+                            class="dropdown-menu scrollable-dropdown-menu w-100"
+                            aria-haspopup="true"
+                            aria-expanded="false"
+                            >
+                            <div
+                              class="scrollable-menu"
+                              role="listbox"
+                              infiniteScroll
+                              [infiniteScrollDistance]="2"
+                              [infiniteScrollThrottle]="50"
+                              [scrollWindow]="false"
+                              >
+                              @if ((filterServices(ldnPattern.pattern) | async)?.length === 0) {
+                                <button
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  >
+                                  {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
+                                </button>
+                              }
+                              @if ((filterServices(ldnPattern.pattern ) | async)?.length > 0) {
+                                <button
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
+                                  >
+                                  {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
+                                </button>
+                              }
+                              @for (serviceOption of filterServices(ldnPattern.pattern ) | async; track serviceOption) {
+                                <button
+                                  [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
+                                  >
+                                  <b>
+                                    {{ serviceOption.name }}
+                                  </b>
+                                  <br />
+                                  {{ serviceOption.description }}
+                                </button>
+                              }
+                            </div>
+                          </div>
+                        </div>
+                        @if (ldnServiceByPattern[ldnPattern.pattern].services.length > 1) {
+                          <button
+                            type="button" [class.mt-2]="serviceIndex > 0"
+                            class="btn btn-secondary ms-2"
+                            role="button"
+                            title="{{'form.remove' | translate}}"
+                            [attr.aria-label]="'form.remove' | translate"
+                            (click)="removeService(ldnPattern, serviceIndex)"
+                            >
+                            <span><i class="fas fa-trash" aria-hidden="true"></i></span>
+                          </button>
+                        }
+                      </div>
+                      @if (!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
+                        serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1) {
+                        <small
+                          class="row text-muted"
+                          >
+                          {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
+                        </small>
+                      }
+                      @if ((getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0) {
+                        @for (error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async); track error) {
+                          <small class="row text-danger">
+                            {{ error.message | translate}}
+                          </small>
+                        }
+                      }
+                      @if (ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]) {
+                        <div
+                          class="row mt-1"
+                          >
+                          <div
+                            class="alert alert-info w-100 d-flex align-items-center flex-row"
+                            >
+                            <i class="fa-solid fa-circle-info fa-xl ms-2"></i>
+                            <div class="ms-4">
+                              <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
+                              @if (ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description) {
+                                <div>
+                                  {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
+                                </div>
+                              } @else {
+                                <span class="text-muted">
+                                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
+                                </span>
+                              }
+                            </div>
+                          </div>
+                        </div>
+                      }
+                      @if ((getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0) {
+                        <div class="row">
+                          <div
+                            class="alert alert-danger w-100 d-flex align-items-center flex-row"
+                            >
+                            <div class="ms-4">
+                              <span>
+                                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      }
+                      <div class="row">
+                        @if (ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)) {
+                          <div
+                            (click)="addNewService(ldnPattern)"
+                            class="btn btn-link mt-2 ps-0"
+                            >
+                            <i class="fas fa-plus"></i>
+                            {{ 'submission.sections.general.add-more' | translate }}
+                          </div>
+                        }
+                      </div>
+                    </div>
+                  }
                 </div>
-              </div>
+              }
             </div>
-            <div class="row" *ngIf="(getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0">
-              <div
-                class="alert alert-danger w-100 d-flex align-items-center flex-row"
-              >
-                <div class="ms-4">
-              <span>
-                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
-              </span>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
-                   (click)="addNewService(ldnPattern)"
-                   class="btn btn-link mt-2 ps-0"
-              >
-                <i class="fas fa-plus"></i>
-                {{ 'submission.sections.general.add-more' | translate }}
-              </div>
-            </div>
-          </div>
+          }
         </div>
-      </div>
-    </div>
-  </ng-container>
-    <ng-container *ngIf="!hasSectionData">
-    <p>
-      {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
-    </p>
-  </ng-container>
-</div>
+      }
+    }
+    @if (!hasSectionData) {
+      <p>
+        {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
+      </p>
+    }
+  </div>
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
index 74d69dfaf8..1d436e1ab8 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
@@ -1,90 +1,119 @@
 <div class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
-        <div class="d-flex">
-            <button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
-                translate
-                }}
-            </button>
-            <div>
-                <span *ngIf="!!version?.embargo && !!version?.embargo.amount;else noEmbargoTitle"> <i
-                        class="fas fa-hourglass-half"></i> {{version.embargo.amount}}
-                    {{version.embargo?.units[0]}}</span>
-                <ng-template #noEmbargoTitle>
-                    <span><i class="fas fa-hourglass-half"></i> {{
-                        'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
-                </ng-template>
+  <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="d-flex">
+      <button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
+        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+        {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
+        translate
+        }}
+      </button>
+      <div>
+        @if (!!version?.embargo && !!version?.embargo.amount) {
+          <span> <i
+          class="fas fa-hourglass-half"></i> {{version.embargo.amount}}
+        {{version.embargo?.units[0]}}</span>
+      } @else {
+        <span><i class="fas fa-hourglass-half"></i> {{
+      'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
+    }
 
-                <span class="m-1 ms-4">
-                    <i class="far fa-folder-open"></i>
-                    <span *ngIf="!!version?.locations && version.locations.length > 0; else noLocations">
-                        {{version.locations[0]}} <span
-                            *ngIf="version.locations.length > 1">+{{version.locations.length-1}}</span>
-                    </span>
-                    <ng-template #noLocations>
-                        <span>{{
-                            'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
-                    </ng-template>
-                </span>
-            </div>
-        </div>
-        <div class="d-inline-block">
-            <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-            <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-        </div>
-    </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-        <div *ngIf="!!version" class="ms-4">
-            <div class="row" *ngIf="!!version?.embargo && !!version?.embargo.amount">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
-                        'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngIf="!!version.embargo;else noEmbargo">{{version.embargo.amount}}
-                        {{version.embargo.units}}</p>
-                    <ng-template #noEmbargo>
-                        <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
-                    </ng-template>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.licenses && version.licenses.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-certificate"></i> {{
-                        'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let license of version.licenses">{{license}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.prerequisites && version.prerequisites.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
-                        'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let prerequisite of version.prerequisites">{{prerequisite}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.locations && version.locations.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="far fa-folder-open"></i> {{
-                        'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let location of version.locations">{{location}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.conditions && version.conditions.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-tasks"></i> {{
-                        'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let condition of version.conditions">{{condition}}</p>
-                </div>
-            </div>
-        </div>
-    </div>
+    <span class="m-1 ms-4">
+      <i class="far fa-folder-open"></i>
+      @if (!!version?.locations && version.locations.length > 0) {
+        <span>
+          {{version.locations[0]}} @if (version.locations.length > 1) {
+          <span
+          >+{{version.locations.length-1}}</span>
+        }
+      </span>
+    } @else {
+      <span>{{
+      'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
+    }
+  </span>
+</div>
+</div>
+<div class="d-inline-block">
+  @if (collapse.collapsed) {
+    <span class="fas fa-chevron-down"></span>
+  }
+  @if (!collapse.collapsed) {
+    <span class="fas fa-chevron-up"></span>
+  }
+</div>
+</div>
+<div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+  @if (!!version) {
+    <div class="ms-4">
+      @if (!!version?.embargo && !!version?.embargo.amount) {
+        <div class="row">
+          <div class="col-4">
+            <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
+          'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
+        </div>
+        <div class="col-6">
+          @if (!!version.embargo) {
+            <p class="m-1">{{version.embargo.amount}}
+            {{version.embargo.units}}</p>
+          } @else {
+            <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
+          }
+        </div>
+      </div>
+    }
+    @if (!!version?.licenses && version.licenses.length > 0) {
+      <div class="row">
+        <div class="col-4">
+          <p class="m-1"><i class="fas fa-certificate"></i> {{
+        'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
+      </div>
+      <div class="col-6">
+        @for (license of version.licenses; track license) {
+          <p class="m-1">{{license}}</p>
+        }
+      </div>
+    </div>
+  }
+  @if (!!version?.prerequisites && version.prerequisites.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
+      'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
+    </div>
+    <div class="col-6">
+      @for (prerequisite of version.prerequisites; track prerequisite) {
+        <p class="m-1">{{prerequisite}}</p>
+      }
+    </div>
+  </div>
+}
+@if (!!version?.locations && version.locations.length > 0) {
+  <div class="row">
+    <div class="col-4">
+      <p class="m-1"><i class="far fa-folder-open"></i> {{
+    'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
+  </div>
+  <div class="col-6">
+    @for (location of version.locations; track location) {
+      <p class="m-1">{{location}}</p>
+    }
+  </div>
+</div>
+}
+@if (!!version?.conditions && version.conditions.length > 0) {
+  <div class="row">
+    <div class="col-4">
+      <p class="m-1"><i class="fas fa-tasks"></i> {{
+    'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
+  </div>
+  <div class="col-6">
+    @for (condition of version.conditions; track condition) {
+      <p class="m-1">{{condition}}</p>
+    }
+  </div>
+</div>
+}
+</div>
+}
+</div>
 </div>
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
index 36b9581182..f63c1dbe0b 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
@@ -1,39 +1,47 @@
 <div class="ms-4">
-    <div class="row" *ngIf="!!metadata?.id">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.id' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.id}}
-            </p>
-        </div>
+  @if (!!metadata?.id) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.id' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.id}}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.dateCreated">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.created' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.dateCreated | date: 'd MMMM Y H:mm:ss zzzz' }}
-            </p>
-        </div>
+  }
+  @if (!!metadata?.dateCreated) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.created' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.dateCreated | date: 'd MMMM Y H:mm:ss zzzz' }}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.dateModified">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.modified' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.dateModified| date: 'd MMMM Y H:mm:ss zzzz' }}
-            </p>
-        </div>
+  }
+  @if (!!metadata?.dateModified) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.modified' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.dateModified| date: 'd MMMM Y H:mm:ss zzzz' }}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.uri">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.uri' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">
-                <a [href]="metadata.uri" target="_blank">{{metadata.uri}}</a>
-            </p>
-        </div>
+  }
+  @if (!!metadata?.uri) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.uri' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">
+          <a [href]="metadata.uri" target="_blank">{{metadata.uri}}</a>
+        </p>
+      </div>
     </div>
+  }
 </div>
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
index 26da914ead..3f11712354 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
@@ -1,64 +1,82 @@
 <div class="ms-4">
-    <div class="row" *ngIf="!!journal?.titles && journal.titles.length > 0">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.title' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1" *ngFor="let title of journal.titles">{{title}}
-            </p>
-        </div>
+  @if (!!journal?.titles && journal.titles.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.title' | translate}}</p>
+      </div>
+      <div class="col-4">
+        @for (title of journal.titles; track title) {
+          <p class="m-1">{{title}}
+          </p>
+        }
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.issns && journal.issns.length > 0">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.issns' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1" *ngFor="let issn of journal.issns">{{issn}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.issns && journal.issns.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.issns' | translate}}</p>
+      </div>
+      <div class="col-4">
+        @for (issn of journal.issns; track issn) {
+          <p class="m-1">{{issn}}
+          </p>
+        }
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.url">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.url' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                <a href="{{journal.url}}" target="_blank" rel="noopener noreferrer">
-                    {{journal.url}}
-                </a>
-            </p>
-        </div>
+  }
+  @if (!!journal?.url) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.url' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          <a href="{{journal.url}}" target="_blank" rel="noopener noreferrer">
+            {{journal.url}}
+          </a>
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.publishers && journal.publishers.length > 0">
+  }
+  @if (!!journal?.publishers && journal.publishers.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.publishers' | translate}}</p>
+      </div>
+      @for (publisher of journal.publishers; track publisher) {
         <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.publishers' | translate}}</p>
-        </div>
-        <div class="col-4" *ngFor="let publisher of journal.publishers">
-            <p class="m-1">
-                <a href="{{publisher.uri}}" target="_blank" rel="noopener noreferrer">
-                    {{publisher.name}}
-                </a>
-            </p>
+          <p class="m-1">
+            <a href="{{publisher.uri}}" target="_blank" rel="noopener noreferrer">
+              {{publisher.name}}
+            </a>
+          </p>
         </div>
+      }
     </div>
-    <div class="row" *ngIf="!!journal?.romeoPub">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.romeoPub' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                {{journal.romeoPub}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.romeoPub) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.romeoPub' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          {{journal.romeoPub}}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.zetoPub">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                {{journal.zetoPub}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.zetoPub) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          {{journal.zetoPub}}
+        </p>
+      </div>
     </div>
+  }
 </div>
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
index 4e89a98aab..89eb987730 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
@@ -1,16 +1,22 @@
 <div class="ms-4">
-    <ds-content-accordion *ngFor="let permittedVersions of policy.permittedVersions" [version]="permittedVersions">
+  @for (permittedVersions of policy.permittedVersions; track permittedVersions) {
+    <ds-content-accordion [version]="permittedVersions">
     </ds-content-accordion>
-    <div class="row" *ngIf="!!policy?.urls">
-        <div class="col-12">
-            <p class="m-1">
-                {{'submission.sections.sherpa.publisher.policy.more.information' | translate}}
-            </p>
-            <ul>
-                <li *ngFor="let url of policy.urls | keyvalue">
-                    <a href="{{url.key}}" target="_blank" rel="noopener noreferrer">{{url.value}}</a>
-                </li>
-            </ul>
-        </div>
+  }
+  @if (!!policy?.urls) {
+    <div class="row">
+      <div class="col-12">
+        <p class="m-1">
+          {{'submission.sections.sherpa.publisher.policy.more.information' | translate}}
+        </p>
+        <ul>
+          @for (url of policy.urls | keyvalue; track url) {
+            <li>
+              <a href="{{url.key}}" target="_blank" rel="noopener noreferrer">{{url.value}}</a>
+            </li>
+          }
+        </ul>
+      </div>
     </div>
+  }
 </div>
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
index 7b3da2d020..c13f2c71e9 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
@@ -1,72 +1,89 @@
-<ds-alert [type]="'alert-info'" *ngIf="hasNoData()" [content]="'submission.sections.sherpa-policy.title-empty'">
-</ds-alert>
-
-<div *ngIf="!hasNoData()" class="d-flex flex-column flex-nowrap mt-2 mb-4">
-  <ds-alert [type]="'alert-info'" >
-    {{'submission.sections.sherpa.publisher.policy.description' | translate}}
+@if (hasNoData()) {
+  <ds-alert [type]="'alert-info'" [content]="'submission.sections.sherpa-policy.title-empty'">
   </ds-alert>
-  <div>
-    <button type="button" class="btn btn-secondary float-end" (click)="refresh()" data-test="refresh-btn">
-      <span><i class="fas fa-sync"></i> {{'submission.sections.sherpa.publisher.policy.refresh' | translate}} </span>
-    </button>
+}
+
+@if (!hasNoData()) {
+  <div class="d-flex flex-column flex-nowrap mt-2 mb-4">
+    <ds-alert [type]="'alert-info'" >
+      {{'submission.sections.sherpa.publisher.policy.description' | translate}}
+    </ds-alert>
+    <div>
+      <button type="button" class="btn btn-secondary float-end" (click)="refresh()" data-test="refresh-btn">
+        <span><i class="fas fa-sync"></i> {{'submission.sections.sherpa.publisher.policy.refresh' | translate}} </span>
+      </button>
+    </div>
   </div>
-</div>
+}
 
 <ng-container *ngVar="(sherpaPoliciesData$ | async)?.sherpaResponse as sherpaData">
-    <ng-container *ngIf="!hasNoData() && (!!sherpaData && !sherpaData.error)">
-        <ng-container *ngFor="let journal of sherpaData.journals;let j=index;">
-            <div class="mb-3 border-bottom" data-test="collapse">
-                <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                    <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                        {{'submission.sections.sherpa.publication.information' | translate}}
-                    </button>
-                    <div class="d-inline-block">
-                        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                    </div>
-                </div>
-                <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                    <ds-publication-information [journal]="journal"></ds-publication-information>
-                </div>
-            </div>
-            <div *ngFor="let policy of journal.policies; let p=index;" class="mb-3 border-bottom" data-test="collapse">
-                <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                    <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                        {{'submission.sections.sherpa.publisher.policy' | translate}}
-                    </button>
-                    <div class="d-inline-block">
-                        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                    </div>
-                </div>
-                <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                    <ds-publisher-policy [policy]="policy"></ds-publisher-policy>
-                </div>
-            </div>
-        </ng-container>
-
-        <div class="mb-3 border-bottom" data-test="collapse">
-            <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                    [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                    {{'submission.sections.sherpa.record.information' | translate}}
-                </button>
-                <div class="d-inline-block">
-                    <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                    <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                </div>
-            </div>
-            <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                <ds-metadata-information [metadata]="sherpaData.metadata"></ds-metadata-information>
-            </div>
+  @if (!hasNoData() && (!!sherpaData && !sherpaData.error)) {
+    @for (journal of sherpaData.journals; track journal; let j = $index) {
+      <div class="mb-3 border-bottom" data-test="collapse">
+        <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+            [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+            {{'submission.sections.sherpa.publication.information' | translate}}
+          </button>
+          <div class="d-inline-block">
+            @if (collapse.collapsed) {
+              <span class="fas fa-chevron-down"></span>
+            }
+            @if (!collapse.collapsed) {
+              <span class="fas fa-chevron-up"></span>
+            }
+          </div>
         </div>
-    </ng-container>
+        <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+          <ds-publication-information [journal]="journal"></ds-publication-information>
+        </div>
+      </div>
+      @for (policy of journal.policies; track policy; let p = $index) {
+        <div class="mb-3 border-bottom" data-test="collapse">
+          <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+            <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+              [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+              {{'submission.sections.sherpa.publisher.policy' | translate}}
+            </button>
+            <div class="d-inline-block">
+              @if (collapse.collapsed) {
+                <span class="fas fa-chevron-down"></span>
+              }
+              @if (!collapse.collapsed) {
+                <span class="fas fa-chevron-up"></span>
+              }
+            </div>
+          </div>
+          <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+            <ds-publisher-policy [policy]="policy"></ds-publisher-policy>
+          </div>
+        </div>
+      }
+    }
+    <div class="mb-3 border-bottom" data-test="collapse">
+      <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+          [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+          {{'submission.sections.sherpa.record.information' | translate}}
+        </button>
+        <div class="d-inline-block">
+          @if (collapse.collapsed) {
+            <span class="fas fa-chevron-down"></span>
+          }
+          @if (!collapse.collapsed) {
+            <span class="fas fa-chevron-up"></span>
+          }
+        </div>
+      </div>
+      <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+        <ds-metadata-information [metadata]="sherpaData.metadata"></ds-metadata-information>
+      </div>
+    </div>
+  }
 
-    <ng-container *ngIf="!!sherpaData && sherpaData.error">
-        <ds-alert [type]="AlertTypeEnum.Error"
-            [content]="!!sherpaData.message ? sherpaData.message : 'submission.sections.sherpa.error.message'| translate">
-        </ds-alert>
-    </ng-container>
+  @if (!!sherpaData && sherpaData.error) {
+    <ds-alert [type]="AlertTypeEnum.Error"
+      [content]="!!sherpaData.message ? sherpaData.message : 'submission.sections.sherpa.error.message'| translate">
+    </ds-alert>
+  }
 </ng-container>
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
index ddfe3e27ce..cb2bdfcbd5 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
@@ -1,8 +1,14 @@
-<ng-container *ngFor="let accessCondition of accessConditionsList">
-  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge bg-primary mt-3 me-2">
-    {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
-  </span>
-  <span *ngIf="accessCondition.name === 'lease'" class="badge bg-primary mt-3 me-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
-  <span *ngIf="accessCondition.name === 'embargo'" class="badge bg-dark mt-3 me-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+@for (accessCondition of accessConditionsList; track accessCondition) {
+  @if (accessCondition.action === 'DEFAULT_BITSTREAM_READ') {
+    <span class="badge bg-primary mt-3 me-2">
+      {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
+    </span>
+  }
+  @if (accessCondition.name === 'lease') {
+    <span class="badge bg-primary mt-3 me-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
+  }
+  @if (accessCondition.name === 'embargo') {
+    <span class="badge bg-dark mt-3 me-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+  }
   <br>
-</ng-container>
+  }
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index da1200b8e4..876d00cd0f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,18 +1,22 @@
-<ng-container *ngIf="fileData">
+@if (fileData) {
   <div class="row">
     <!-- Default switch -->
     <div class="col-md-2 d-flex justify-content-center align-items-center" >
       <div class="custom-control custom-switch">
         <input
-        type="checkbox"
-        class="custom-control-input"
-        id="primaryBitstream{{fileIndex}}"
-        [disabled]="processingSaveStatus$ | async"
-        [checked]="isPrimary"
-        (change)="togglePrimaryBitstream($event)">
+          type="checkbox"
+          class="custom-control-input"
+          id="primaryBitstream{{fileIndex}}"
+          [disabled]="processingSaveStatus$ | async"
+          [checked]="isPrimary"
+          (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
-          <span class="sr-only" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
-          <span class="sr-only" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+          @if (!isPrimary) {
+            <span class="sr-only">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          }
+          @if (isPrimary) {
+            <span class="sr-only">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+          }
         </label>
       </div>
     </div>
@@ -23,29 +27,33 @@
       <div class="float-end w-15">
         <ng-container>
           <ds-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
-                                        [bitstream]="getBitstream()" [enableRequestACopy]="false">
+            [bitstream]="getBitstream()" [enableRequestACopy]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-file-download-link>
           <button class="btn btn-link-focus"
-                  [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
-                  title="{{ 'submission.sections.upload.edit.title' | translate }}"
-                  (click)="$event.preventDefault();editBitstreamData();">
+            [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
+            title="{{ 'submission.sections.upload.edit.title' | translate }}"
+            (click)="$event.preventDefault();editBitstreamData();">
             <i class="fa fa-edit fa-2x text-normal"></i>
           </button>
           <button class="btn btn-link-focus"
-                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
-                  title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [dsBtnDisabled]="(processingDelete$ | async)"
-                  (click)="$event.preventDefault();confirmDelete(content);">
-            <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x link-danger"></i>
-            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x link-danger"></i>
+            [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
+            title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
+            [dsBtnDisabled]="(processingDelete$ | async)"
+            (click)="$event.preventDefault();confirmDelete(content);">
+            @if ((processingDelete$ | async)) {
+              <i class="fas fa-circle-notch fa-spin fa-2x link-danger"></i>
+            }
+            @if ((processingDelete$ | async) !== true) {
+              <i class="fa fa-trash fa-2x link-danger"></i>
+            }
           </button>
         </ng-container>
       </div>
       <div class="clearfix"></div>
     </div>
   </div>
-</ng-container>
+}
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
@@ -58,8 +66,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-secondary"
-            (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
+    (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
     <button type="button" class="btn btn-danger"
-            (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
+    (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index 102987a9dd..1e3ee6333e 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,21 +1,31 @@
-<div *ngIf="(systemWideAlert$ |async)?.active">
+@if ((systemWideAlert$ |async)?.active) {
+  <div>
     <div class="rounded-0 alert alert-warning w100 m-0 px-1">
-        <div class="container">
-            <span class="fw-bold">
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0">
-                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
-                </span>
+      <div class="container">
+        <span class="fw-bold">
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
             </span>
-            <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
-        </div>
+          }
+          @if ((countDownDays|async) > 0) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
+            </span>
+          }
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
+            </span>
+          }
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
+            </span>
+          }
+        </span>
+        <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
+      </div>
     </div>
-</div>
+  </div>
+}
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 92dd91227b..f6a5573a74 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,94 +1,110 @@
 <div class="container">
-    <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
-    <div [formGroup]="alertForm" [class]="'ng-invalid'">
-        <div class="mb-3">
-            <div class="row mb-2">
-                <div class="col">
-                    <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
-                        [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
-                        [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <label class="form-label" for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
-                    <textarea id="formMessage" rows="5"
-                        [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
-                        formControlName="formMessage">
-                </textarea>
-                    <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
-                        class="invalid-feedback show-feedback">
-                        <span *ngIf="formMessage.errors">
-                            {{ 'system-wide-alert.form.error.message' | translate }}
-                        </span>
-                    </div>
-                </div>
-            </div>
+  <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
+  <div [formGroup]="alertForm" [class]="'ng-invalid'">
+    <div class="mb-3">
+      <div class="row mb-2">
+        <div class="col">
+          <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
+            [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
+          [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
         </div>
-    </div>
-    <div class="row">
-        <div class="col mb-2 d-flex align-items-end">
-            <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
-                [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
-            <span class="ms-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+      </div>
+      <div class="row">
+        <div class="col">
+          <label class="form-label" for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
+          <textarea id="formMessage" rows="5"
+            [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
+            formControlName="formMessage">
+          </textarea>
+          @if (formMessage.invalid && (formMessage.dirty || formMessage.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (formMessage.errors) {
+                <span>
+                  {{ 'system-wide-alert.form.error.message' | translate }}
+                </span>
+              }
+            </div>
+          }
         </div>
+      </div>
     </div>
-    <div *ngIf="counterEnabled$ |async">
-        <div class="row">
-            <div class="col-sm-12 col-md-6">
-                <div class="input-group">
-                    <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
-                        [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
-                    <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
-                        (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
-                    </button>
-                </div>
-            </div>
-            <div class="col-12 d-md-none">
-                <div class="input-group">
-                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
-                </div>
-            </div>
-            <div class="d-none d-md-block col-md-6 timepicker-margin">
-                <div class="input-group">
-                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
-                </div>
-            </div>
+  </div>
+  <div class="row">
+    <div class="col mb-2 d-flex align-items-end">
+      <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
+      [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
+      <span class="ms-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+    </div>
+  </div>
+  @if (counterEnabled$ |async) {
+    <div>
+      <div class="row">
+        <div class="col-sm-12 col-md-6">
+          <div class="input-group">
+            <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
+              [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
+            <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
+              (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+            </button>
+          </div>
         </div>
-    </div>
-    <div class="mb-2">
-        <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
-    </div>
-    <div *ngIf="formMessage.value">
-        <div class="row">
-            <div class="col">
-                <label class="form-label">{{ 'system-wide-alert.form.label.preview' | translate }}</label>
-            </div>
+        <div class="col-12 d-md-none">
+          <div class="input-group">
+            <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+          </div>
         </div>
-        <div class="rounded-0 alert alert-warning">
-            <span class="fw-bold">
-                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
-                </span>
-                <span *ngIf="previewDays > 0">
-                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
-                </span>
-                <span *ngIf="previewDays > 0 || previewHours > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
-                </span>
-                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
-                </span>
+        <div class="d-none d-md-block col-md-6 timepicker-margin">
+          <div class="input-group">
+            <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+          </div>
+        </div>
+      </div>
+    </div>
+  }
+  <div class="mb-2">
+    <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
+  </div>
+  @if (formMessage.value) {
+    <div>
+      <div class="row">
+        <div class="col">
+          <label class="form-label">{{ 'system-wide-alert.form.label.preview' | translate }}</label>
+        </div>
+      </div>
+      <div class="rounded-0 alert alert-warning">
+        <span class="fw-bold">
+          @if (previewDays > 0 || previewHours > 0 || previewMinutes > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
             </span>
-            <span [innerHTML]="formMessage.value"></span>
-        </div>
-    </div>
-    <div class="btn-row float-end space-children-mr mt-2">
-        <button (click)="back()" class="btn btn-outline-secondary">
-            <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
-        </button>
-        <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
-            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
-        </button>
+          }
+          @if (previewDays > 0) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
+            </span>
+          }
+          @if (previewDays > 0 || previewHours > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
+            </span>
+          }
+          @if (previewDays > 0 || previewHours > 0 || previewMinutes > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
+            </span>
+          }
+        </span>
+        <span [innerHTML]="formMessage.value"></span>
+      </div>
     </div>
+  }
+  <div class="btn-row float-end space-children-mr mt-2">
+    <button (click)="back()" class="btn btn-outline-secondary">
+      <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
+    </button>
+    <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
+      <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
+    </button>
+  </div>
 </div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
index bd2ec5115b..4fe2049d97 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
@@ -1,43 +1,56 @@
 <div *ngVar="getAdvancedInfo(workflowAction$ | async) as advancedInfo">
-  <p *ngIf="advancedInfo?.descriptionRequired">
-    {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }}
-  </p>
-  <p *ngIf="!advancedInfo?.descriptionRequired">
-    {{ 'advanced-workflow-action.rating.description' | translate }}
-  </p>
+  @if (advancedInfo?.descriptionRequired) {
+    <p>
+      {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }}
+    </p>
+  }
+  @if (!advancedInfo?.descriptionRequired) {
+    <p>
+      {{ 'advanced-workflow-action.rating.description' | translate }}
+    </p>
+  }
 
-  <form (ngSubmit)="performAction()" *ngIf="ratingForm" [formGroup]="ratingForm">
-    <div class="mb-3">
-      <label class="control-label">
-        <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
-        <span *ngIf="advancedInfo?.descriptionRequired">*</span>
-      </label>
-      <textarea [ngClass]="{ 'is-invalid' : isInvalid('review') }"
-                [required]="advancedInfo?.descriptionRequired" class="form-control" formControlName="review">
-      </textarea>
-      <small *ngIf="isInvalid('review')" class="invalid-feedback d-block">
-        {{ 'advanced-workflow-action.rating.form.review.error' | translate }}
-      </small>
-    </div>
-
-    <div class="mb-3">
-      <label class="control-label mb-1">
-        {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
-      </label>
-      <div class="d-block">
-        <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
-                    formControlName="rating">
-        </ngb-rating>
+  @if (ratingForm) {
+    <form (ngSubmit)="performAction()" [formGroup]="ratingForm">
+      <div class="mb-3">
+        <label class="control-label">
+          <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
+          @if (advancedInfo?.descriptionRequired) {
+            <span>*</span>
+          }
+        </label>
+        <textarea [ngClass]="{ 'is-invalid' : isInvalid('review') }"
+          [required]="advancedInfo?.descriptionRequired" class="form-control" formControlName="review">
+        </textarea>
+        @if (isInvalid('review')) {
+          <small class="invalid-feedback d-block">
+            {{ 'advanced-workflow-action.rating.form.review.error' | translate }}
+          </small>
+        }
       </div>
-      <small *ngIf="isInvalid('rating')" class="invalid-feedback d-block">
-        {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
-      </small>
-    </div>
-  </form>
+      <div class="mb-3">
+        <label class="control-label mb-1">
+          {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
+        </label>
+        <div class="d-block">
+          <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
+            formControlName="rating">
+          </ngb-rating>
+        </div>
+        @if (isInvalid('rating')) {
+          <small class="invalid-feedback d-block">
+            {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
+          </small>
+        }
+      </div>
+    </form>
+  }
 
-  <ds-modify-item-overview *ngIf="item$ | async"
-                           [item]="item$ | async">
-  </ds-modify-item-overview>
+  @if (item$ | async) {
+    <ds-modify-item-overview
+      [item]="item$ | async">
+    </ds-modify-item-overview>
+  }
 
   <div class="d-flex flex-wrap justify-content-end">
     <button (click)="previousPage()" class="btn btn-default">
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
index ffcb504a7f..e6f40363da 100644
--- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,6 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 9b29bf93be..2d3137541e 100644
--- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,6 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
index 6a3b612b57..96e3dec322 100644
--- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,6 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index 68292450fc..e5953f5ff2 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -31,8 +29,6 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     TranslateModule,
     ProfilePageResearcherFormComponent,
     VarDirective,
-    NgIf,
-    NgForOf,
     SuggestionsNotificationComponent,
     NgTemplateOutlet,
     PaginationComponent,
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index d1d2a4a1f0..7d0b39b9e7 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,6 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../.
   imports: [
     AsyncPipe,
     DSOSelectorComponent,
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index b7c84f0fcc..0c831f7520 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +27,6 @@ import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/sea
   imports: [
     AsyncPipe,
     ErrorComponent,
-    NgIf,
     NgxSkeletonLoaderModule,
     ObjectCollectionComponent,
     RouterLink,
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index 45e39d11ab..18de5dae5a 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
   standalone: true,
-  imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
+  imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule],
   animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index 27a506eb19..7007954e7d 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -2,15 +2,17 @@
   <div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
     <!-- Logo and navbar wrapper -->
     <div id="header-left"
-         [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
-         [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
-         class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
+      [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
+      [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
+      class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
       <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
         <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
-      <nav *ngIf="(isMobile$ | async) !== true" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
-        <ds-navbar></ds-navbar>
-      </nav>
+      @if ((isMobile$ | async) !== true) {
+        <nav class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
+          <ds-navbar></ds-navbar>
+        </nav>
+      }
     </div>
     <!-- Search bar and other menus -->
     <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ms-auto">
@@ -22,12 +24,14 @@
         <ds-auth-nav-menu></ds-auth-nav-menu>
       </div>
 
-      <div id="mobile-navbar-toggler" class="d-block d-lg-none ms-3" *ngIf="(isMobile$ | async)">
-        <button id="navbar-toggler" class="btn btn-transparent" type="button" (click)="toggleNavbar()"
-                [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
-          <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
-        </button>
-      </div>
+      @if ((isMobile$ | async)) {
+        <div id="mobile-navbar-toggler" class="d-block d-lg-none ms-3">
+          <button id="navbar-toggler" class="btn btn-transparent" type="button" (click)="toggleNavbar()"
+            [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
+            <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
+          </button>
+        </div>
+      }
     </div>
   </div>
 </header>
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 8cce626006..50ef8e21cf 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -22,7 +20,7 @@ import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/us
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }

From b6a507d2a299a62dcfe47829fa59503385b227b1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 10 Mar 2025 14:22:47 -0500
Subject: [PATCH 1285/1286] Reenable accessibility test which is now fixed

---
 cypress/e2e/admin-sidebar.cy.ts | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/cypress/e2e/admin-sidebar.cy.ts b/cypress/e2e/admin-sidebar.cy.ts
index 318bf2b27e..91e99b8f97 100644
--- a/cypress/e2e/admin-sidebar.cy.ts
+++ b/cypress/e2e/admin-sidebar.cy.ts
@@ -1,5 +1,4 @@
 import { testA11y } from 'cypress/support/utils';
-import { Options } from 'cypress-axe';
 
 describe('Admin Sidebar', () => {
   beforeEach(() => {
@@ -16,13 +15,6 @@ describe('Admin Sidebar', () => {
     cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
 
     // Analyze <ds-admin-sidebar> for accessibility
-    testA11y('ds-admin-sidebar',
-        {
-          rules: {
-            // Currently all expandable sections have nested interactive elements
-            // See https://github.com/DSpace/dspace-angular/issues/2178
-            'nested-interactive': { enabled: false },
-          },
-        } as Options);
+    testA11y('ds-admin-sidebar');
   });
 });

From 308f0751cf2b589c24b7117b9e74217b22013921 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 10 Mar 2025 14:23:05 -0500
Subject: [PATCH 1286/1286] Fix issues in IDEs (especially VS Code) with
 recognizing Cypress Typescript files.

---
 cypress/tsconfig.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index 51237b5e95..e7b70a29b7 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -1,10 +1,16 @@
 {
   "extends": "../tsconfig.json",
   "include": [
-    "**/*.ts"
+    "**/*.ts",
+    "../cypress.config.ts"
   ],
   "compilerOptions": {
     "sourceMap": false,
+    "typeRoots": [
+      "../node_modules",
+      "../node_modules/@types",
+      "../src/typings.d.ts"
+    ],
     "types": [
       "cypress",
       "cypress-axe",